Merge pull request #21 from tst2005/missinglocalprefix

Missing local prefix
Overtorment · Jul 28, 2016 · 3aad29a · 3aad29a
2 parents eb4ac2c + 23d758c
commit 3aad29a
Show file tree

Hide file tree

Showing 11 changed files with 145 additions and 150 deletions.
diff --git a/README.md b/README.md
@@ -26,19 +26,19 @@ START SERVER
 
 INITIALIZE
 ```lua
-        hub = noobhub.new({ server = "127.0.0.1"; port = 1337; }); 
+        hub = noobhub.new({ server = "127.0.0.1"; port = 1337; });
 ```
 
 SUBSCRIBE TO A CHANNEL AND RECEIVE CALLBACKS WHEN NEW JSON MESSAGES ARRIVE
 ```lua
         hub:subscribe({
-          channel = "hello-world";	
+          channel = "hello-world";
         	callback = function(message)
-        
-        		if(message.action == "ping")   then 
+
+        		if(message.action == "ping")   then
         			print("Pong!")
         		end;
-        
+
         	end;
         });
 ```

diff --git a/client/javascript-node-js/client.benchmarks.js b/client/javascript-node-js/client.benchmarks.js
@@ -3,7 +3,7 @@ var echo  = (process.argv && process.argv[2] == 'echo')
 , crypto = require('crypto')
 
 , Trololo = new function() {
-	
+
 	var host  = 'localhost'
 	  , port  = '1337'
 	  , self = this
@@ -14,61 +14,59 @@ var echo  = (process.argv && process.argv[2] == 'echo')
 	  , startTime = 0
 	  , triesMax = 1000
 	  , tryCurrent = 0
-	  , stats = { 
+	  , stats = {
 			max: 0,
 			min: 10000,
 			average: 0,
 			data: []
 	   };
-	
+
 	this.send = function() {
 		console.log('[BENCHMARKING MODE]');
 		self._connectAndSubscribe(function(){
 			socket.on('data', self._measure);
 			self._ping();
 		});
-
 	}
-			
+
 	this._ping = function() {
-
 		hash = String( Math.random() * 1000 );
 		console.log('sending hash ', hash);
 		startTime = new Date().getTime();
 		socket.write("__JSON__START__" + hash + "__JSON__END__");
 	}
-	
+
 	this._measure = function(data) {
-		console.log('got data ', String(data));	
-		
+		console.log('got data ', String(data));
+
 		var str = String(data).replace(/__JSON__START__|__JSON__END__|\r|\n/g, '');
 
-		if (str == hash) {	
+		if (str == hash) {
 			var lat = new Date().getTime() - startTime;
 			console.log('latency ', lat);
 			stats.data.push(lat);
 			var summ = 0;
 			if (++tryCurrent == triesMax) {
-				
+
 				for (var i=0, l=stats.data.length; i<l; i++) {
-					
+
 					if (stats.data[i] > stats.max) {
 						stats.max = stats.data[i]
-					} 
-					
+					}
+
 					if (stats.data[i] < stats.min) {
 						stats.min = stats.data[i]
 					}
 					summ += stats.data[i];
 				}
-				
+
 				stats.average = Number(summ / triesMax).toFixed(2);
-				
+
 				console.log('[RESULTS]');
 				console.log('max latency : ' + stats.max);
 				console.log('min latency : ' + stats.min);
 				console.log('average : ' + stats.average);
-				
+
 			} else {
 				self._ping();
 			}
@@ -77,35 +75,35 @@ var echo  = (process.argv && process.argv[2] == 'echo')
 			//console.log(str + " != " + hash);
 		}
 	}
-	
+
 	this.listen = function() {
 		console.log('[ECHO MODE]');
 		self._connectAndSubscribe();
-		
+
 		var lastResponse = null;
 		socket.on('data', function(data){
-			
+
 			if (String(data) != String(lastResponse)) {
 				console.log('incoming data', data);
 				lastResponse = data;
 				socket.write("__JSON__START__" + data + "__JSON__END__");
 			}
 		})
 	}
-	
+
 	this._connectAndSubscribe = function(cb) {
 		socket = new net.createConnection(port, host);
 		socket.setNoDelay(true);
-		
+
 		socket.on('connect', function(){
 			console.log('connected to ', host, port);
 			console.log(arguments);
-			
+
 			socket.write("__SUBSCRIBE__" + channel + "__ENDSUBSCRIBE__");
-			
+
 			if (typeof(cb) == "function") cb();
 		})
 	}
 }
 
-echo ? Trololo.listen() : Trololo.send();
+echo ? Trololo.listen() : Trololo.send();
diff --git a/client/javascript-node-js/client.js b/client/javascript-node-js/client.js
@@ -80,7 +80,7 @@ var Nbhb = exports.Nbhb = function() {
 	    var s = String(str).replace(/}{|\r|\n/g, '}<splitHere>{');
 
         if (s == str){
-	
+
             if (typeof(self.messageCallback) === "function")
                 self.messageCallback(str);
         }

diff --git a/client/javascript-node-js/client.test.js b/client/javascript-node-js/client.test.js
@@ -13,11 +13,9 @@ noobhub.subscribe(
     }
     , function(s){
         console.log('subscribed callback');
-
 		noobhub.publish({ a : Math.random() }, function(){
 			console.log("data sent");
 		});
-
     }
     , function(data) {
         console.log("get data callback: " + data);

diff --git a/client/javascript-node-js/perf.js b/client/javascript-node-js/perf.js
@@ -53,18 +53,18 @@ var z = function(idx) {
                 server: 'localhost',
                 channel: channel
             }, function() { isAlive = 1; return _onSubscribed(idx); }
-            , function(msg) { 
+            , function(msg) {
                 if (msg === _myMessage) {
                     var lat = Date.now() - startTime;
                     console.log(idx + 'latency is : ',  lat);
                     _sendMetrics('latency:'+lat+'|ms');
                 }
-                return _onMessage(idx, msg); 
+                return _onMessage(idx, msg);
             }
-            , function(err) { 
-                isAlive = 0; 
-                clearInterval(_interval); 
-                clearInterval(_changeChannel); 
+            , function(err) {
+                isAlive = 0;
+                clearInterval(_interval);
+                clearInterval(_changeChannel);
                 return _onError(idx, err);
             }
             );
@@ -93,7 +93,7 @@ var z = function(idx) {
                clearInterval(_interval);
                clearInterval(_changeChannel);
                 n.unsubscribe();
-                n = null; 
+                n = null;
             }
         };
 
@@ -114,4 +114,4 @@ for (var i=0, l=config.zerlings; i<l; i++) {
     (function(idx){
         return z(idx);
     }(i));
-}
+}
diff --git a/client/javascript-node-js/perf_single_channel_load.js b/client/javascript-node-js/perf_single_channel_load.js
@@ -18,7 +18,7 @@ var zergsAlive = config.zerglings;
 
 var _sendMetrics = function(msg) {
    return false;
-    
+
 
  var cfg = config.statsd;
     var message = new Buffer(cfg.prefix + msg);
@@ -63,18 +63,18 @@ var z = function(idx) {
                 server: 'localhost',
                 channel: channel
             }, function() { isAlive = 1; return _onSubscribed(idx); }
-            , function(msg) { 
+            , function(msg) {
                 if (msg === _myMessage) {
                     var lat = Date.now() - startTime;
                     console.log(idx + 'latency is : ',  lat);
                     //_sendMetrics('latency:'+lat+'|ms');
                 }
-                return _onMessage(idx, msg); 
+                return _onMessage(idx, msg);
             }
-            , function(err) { 
-                isAlive = 0; 
-                clearInterval(_interval); 
-                clearInterval(_changeChannel); 
+            , function(err) {
+                isAlive = 0;
+                clearInterval(_interval);
+                clearInterval(_changeChannel);
                 return _onError(idx, err);
             }
             );

diff --git a/client/lua-corona/noobhub.lua b/client/lua-corona/noobhub.lua
@@ -87,7 +87,7 @@ noobhub = {
 
 					local got_something_new = false
 					while  true  do
-						skt, e, p = v:receive()
+						local skt, e, p = v:receive()
 						if (skt) then  self.buffer = self.buffer .. skt;  got_something_new=true;  end
 						if (p) then  self.buffer = self.buffer .. p;  got_something_new=true;  end
 						if (not skt) then break; end
@@ -137,4 +137,4 @@ noobhub = {
 
 		return self
 	end -- /new
-}
+}