total5 0.0.17-1 → 0.0.17-2

package/changelog.txt

@@ -9,6 +9,9 @@
 - fixed `mail` priority
 - fixed `kB` and `GB` units in the routing as upload limits
 - `DEBUG` is set according to the `process.env.NODE_ENV` variable
+- fixed server pinging of all WebSocket connections
+- improved code
+- fixed typo in send method data assignment
 
 ========================
 0.0.16

package/components.js

@@ -233,7 +233,7 @@ Instance.prototype.input = function(input, data, callback) {
 Instance.prototype.send = function(output, data) {
 	let msg = data instanceof Message ? data : this.newmessage();
 	msg.output = output;
-	msg.data = data;x
+	msg.data = data;
 	msg.send(output);
 };
 

package/index.js

@@ -1148,10 +1148,10 @@ F.console = function() {
 	if (!F.config.$imprint)
 		return;
 
-	var memory = process.memoryUsage();
-	var nodemodules = require.resolve('./index');
+	let memory = process.memoryUsage();
+	let nodemodules = require.resolve('./index');
 
-	nodemodules = nodemodules.substring(0, nodemodules.length - (8 + 7));
+	nodemodules = F.Path.dirname(nodemodules);
 
 	print('====================================================');
 	print('PID           : ' + process.pid);
@@ -1171,19 +1171,19 @@ F.console = function() {
 	// global.THREAD && print('Thread        : ' + global.THREAD);
 	print('====================================================');
 	F.config.$root && print('Root          : ' + F.config.$root);
-	print('Directory     : ' + process.cwd());
-	print('node_modules  : ' + nodemodules);
+	print('Directory     : ' + F.Path.join(process.cwd(), F.Path.sep));
+	print('node_modules  : ' + F.Path.join(nodemodules, F.Path.sep));
 	print('====================================================\n');
 
 	if (!F.isWorker && F.server) {
 
-		var hostname = F.unixsocket ? ('Socket: ' + F.unixsocket) : '{2}://{0}:{1}/'.format(F.config.$ip, F.config.$port, F.isHTTPS ? 'https' : 'http');
+		let hostname = F.unixsocket ? ('Socket: ' + F.unixsocket) : '{2}://{0}:{1}/'.format(F.config.$ip, F.config.$port, F.isHTTPS ? 'https' : 'http');
 
 		if (!F.unixsocket && F.ip === '0.0.0.0') {
-			var ni = F.Os.networkInterfaces();
+			let ni = F.Os.networkInterfaces();
 			if (ni.en0) {
-				for (var i = 0; i < ni.en0.length; i++) {
-					var nii = ni.en0[i];
+				for (let i = 0; i < ni.en0.length; i++) {
+					let nii = ni.en0[i];
 					// nii.family === 'IPv6' ||
 					if (nii.family === 'IPv4') {
 						hostname += '\n{2}://{0}:{1}/'.format(nii.address, F.port, F.isHTTPS ? 'https' : 'http');
@@ -1215,7 +1215,7 @@ F.loadservices = function() {
 				flow.service(F.internal.ticks);
 		}
 
-		if (F.internal.ticks == 6 || F.internal.ticks == 12)
+		if (F.internal.ticks == 3 || F.internal.ticks == 6 || F.internal.ticks == 12)
 			F.TWebSocket.ping();
 
 		// 1 minute

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "total5",
-  "version": "0.0.17-1",
+  "version": "0.0.17-2",
   "description": "Total.js framework v5",
   "main": "index.js",
   "directories": {

package/websocket.js

@@ -605,10 +605,11 @@ Controller.prototype.senddeflate = function() {
 };
 
 Controller.prototype.ping = function(ts) {
-	var ctrl = this;
+	let ctrl = this;
+	ctrl.$ping = ts || Date.now();
+	ctrl.latency = null;
 	if (!ctrl.isclosed) {
 		try {
-			ctrl.$ping = ts || Date.now();
 			ctrl.socket.write(getWebSocketFrame(0, 'PING', 0x09, false, ctrl.masking));
 		} catch (e) {
 			// Socket error
@@ -1366,10 +1367,10 @@ WebSocketClient.prototype.connectforce = function(self, url, protocol, origin) {
 
 WebSocketClient.prototype.ping = function(timeout) {
 	var self = this;
+	self.$ping = Date.now();
 	if (!self.isclosed && !self.timeout) {
 		self.timeout = setTimeout(wsclient_timeout, timeout || 3000, self);
 		self.socket.write(getWebSocketFrame(0, 'PING', 0x09, false, self.options.masking));
-		self.$ping = Date.now();
 	}
 	return self;
 };