total5 0.0.16 → 0.0.17-2

package/changelog.txt

@@ -1,3 +1,18 @@
+========================
+0.0.17
+========================
+
+- fixed error handling in emails
+- improved returing `origin` in the CORS
+- fixed removing routes via `route.remove()` method
+- fixed `beautify` and `replacer` arguments in the `controller.json()`
+- 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/controller.js

@@ -49,7 +49,6 @@ function Controller(req, res) {
 		ctrl.split2.push(path.toLowerCase());
 
 	ctrl.params = {};
-	ctrl.query = ctrl.uri.search.parseEncoded();
 	ctrl.files = [];
 	ctrl.body = {};
 
@@ -173,7 +172,7 @@ Controller.prototype = {
 	},
 
 	get address() {
-		return (this.protocol + '://' + this.headers?.host || '') + (this.req?.url || '');
+		return this.protocol + '://' + (this.headers?.host || '') + (this.req?.url || '');
 	}
 
 };
@@ -300,7 +299,7 @@ Controller.prototype.json = function(value, beautify, replacer) {
 	response.headers['cache-control'] = NOCACHE;
 	response.headers.vary = 'Accept-Encoding, Last-Modified, User-Agent';
 	response.headers.expires = '-1';
-	response.value = JSON.stringify(value, beautify ? '\t' : null, replacer);
+	response.value = JSON.stringify(value, replacer, beautify ? '\t' : null);
 	ctrl.flush();
 	F.stats.response.json++;
 };

package/http.js

@@ -27,7 +27,7 @@ exports.listen = function(req, res) {
 		return;
 	}
 
-	if (F.config.$blacklist && F.config.$blacklist.indexOf(ctrl.ip) !== -1) {
+	if (F.config.$blacklist && F.config.$blacklist.includes(ctrl.ip)) {
 		F.stats.request.blocked++;
 		ctrl.fallback(400, 'IP address is blocked');
 		return;

package/index.js

@@ -23,7 +23,7 @@ Object.freeze(EMPTYARRAY);
 
 // Globals
 global.F = global.Total = {};
-global.DEBUG = true;
+global.DEBUG = process.env.NODE_ENV !== 'production';
 global.CONF = {};
 global.REPO = {};
 global.MAIN = {};
@@ -38,7 +38,7 @@ global.DEF = {};
 
 	F.id = '';
 	F.clusterid = '';
-	F.is5 = F.version = 5016;
+	F.is5 = F.version = 5017;
 	F.isBundle = false;
 	F.isLoaded = false;
 	F.version_header = '5';
@@ -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/mail.js

@@ -212,7 +212,7 @@ Message.prototype.send2 = function(callback) {
 		data.subject = self.subject;
 		data.type = self.type;
 		data.body = self.body;
-		data.priority = self.$priotity;
+		data.priority = self.$priority;
 		data.unsubscribe = self.$unsubscribe;
 		data.confidential = self.$confidential;
 
@@ -486,9 +486,25 @@ Mailer.send = function(opt, messages, callback) {
 		opt.port = 465;
 
 	if (!opt.server)  {
-		var err = new Error('No SMTP server configuration.');
-		callback && callback(err);
-		F.error(err, 'mail_smtp');
+		const err = new Error('No SMTP server configuration.');
+		let iscallback = false;
+
+
+		if (callback) {
+			iscallback = true;
+			callback(err);
+		}
+
+		for (let m of obj.messages) {
+			if (m.$callback) {
+				iscallback = true;
+				m.$callback(err);
+			}
+		}
+
+		if (!iscallback)
+			F.error(err, 'mail_smtp');
+
 		return self;
 	}
 
@@ -529,8 +545,17 @@ Mailer.send = function(opt, messages, callback) {
 		if (obj.try || err.stack.indexOf('ECONNRESET') !== -1)
 			return;
 
-		if (!obj.try && !is)
-			F.error(err, 'mail_smtp', opt.server);
+		if (!obj.try && !is) {
+			let iscallback = false;
+			for (let m of obj.messages) {
+				if (m.$callback) {
+					iscallback = true;
+					m.$callback(err);
+				}
+			}
+			if (!iscallback)
+				F.error(err, 'mail_smtp', opt.server);
+		}
 
 		if (obj === F.temporary.smtp[opt.server])
 			delete F.temporary.smtp[opt.server];
@@ -542,8 +567,17 @@ Mailer.send = function(opt, messages, callback) {
 
 		Mailer.destroy(obj);
 
-		if (!obj.try && !obj.callback)
-			F.error(err, 'mail_smtp', opt.server);
+		if (!obj.try && !obj.callback) {
+			let iscallback = false;
+			for (let m of obj.messages) {
+				if (m.$callback) {
+					iscallback = true;
+					m.$callback(err);
+				}
+			}
+			if (!iscallback)
+				F.error(err, 'mail_smtp', opt.server);
+		}
 
 		obj.callback && obj.callback(err);
 		obj.callback = null;
@@ -561,8 +595,17 @@ Mailer.send = function(opt, messages, callback) {
 			var err = F.TUtils.httpstatus(408);
 			Mailer.destroy(obj);
 
-			if (!obj.try && !obj.callback)
-				F.error(err, 'mail_smtp', opt.server);
+			if (!obj.try && !obj.callback) {
+				let iscallback = false;
+				for (let m of obj.messages) {
+					if (m.$callback) {
+						iscallback = true;
+						m.$callback(err);
+					}
+				}
+				if (!iscallback)
+					F.error(err, 'mail_smtp', opt.server);
+			}
 
 			obj.callback && obj.callback(err);
 			obj.callback = null;
@@ -850,11 +893,15 @@ Mailer.$send = function(obj, options, autosend) {
 					obj.logged = true;
 					Mailer.$writeline(obj, value);
 				} else {
-					var err = new Error('Forbidden.');
+					const err2 = new Error('Forbidden.');
 					Mailer.destroy(obj);
-					obj.callback && obj.callback(err);
+					obj.callback && obj.callback(err2);
 					obj.callback = null;
-					Mailer.$events.error && !obj.try && Mailer.emit('error', err, obj);
+					for (let m of obj.messages) {
+						if (m.$callback)
+							m.$callback(err2);
+					}
+					Mailer.$events.error && !obj.try && Mailer.emit('error', err2, obj);
 				}
 
 				return;
@@ -876,23 +923,34 @@ Mailer.$send = function(obj, options, autosend) {
 					return;
 				}
 
-				var err = line;
+				const err = line;
+				let iscallback = false;
 
 				Mailer.$events.error && !obj.try && Mailer.emit('error', err, obj);
 
 				if (obj.messagecallback) {
+					iscallback = true;
 					obj.messagecallback(err, obj.instance);
 					obj.messagecallback = null;
 				}
 
 				if (obj.messagecallback2) {
+					iscallback = true;
 					obj.messagecallback2(err, obj.instance);
 					obj.messagecallback2 = null;
 				}
 
 				if (obj.messages.length) {
 
-					F.error(err, 'SMTP error');
+					for (let m of obj.messages) {
+						if (m.$callback) {
+							iscallback = true;
+							m.$callback(err);
+						}
+					}
+
+					if (!iscallback)
+						F.error(err, 'SMTP error');
 
 					// a problem
 					obj.buffer = [];

package/package.json

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

package/routing.js

@@ -37,12 +37,12 @@ function parseSizeTimeout(route, value) {
 				route.size = number;
 			break;
 		case 'kb':
-			number = number / 1024;
+			number = number * 1024;
 			if (route.size < number)
 				route.size = number;
 			break;
 		case 'gb':
-			number = (number * 1024 * 1024) * 1000;
+			number = number * 1024 * 1024 * 1024;
 			if (route.size < number)
 				route.size = number;
 			break;
@@ -321,14 +321,14 @@ Route.prototype.remove = function() {
 		case 'websocket':
 			index = F.routes.websockets.indexOf(self);
 			if (index !== -1)
-				F.routes.websockets.splice(index);
+				F.routes.websockets.splice(index, 1);
 			for (let conn of self.connections)
 				conn.destroy();
 			break;    
 		case 'file':
 			index = F.routes.files.indexOf(self);
 			if (index !== -1)
-				F.routes.files.splice(index);
+				F.routes.files.splice(index, 1);
 			break;
 		default:
 			if (self.apiendpoint) {
@@ -337,14 +337,14 @@ Route.prototype.remove = function() {
 					if (Object.keys(self.parent.api).length == 0) {
 						index = F.routes.routes.indexOf(self.parent);
 						if (index !== -1)
-							F.routes.routes.splice(index);
+							F.routes.routes.splice(index, 1);
 					}
 				} else {
 					delete self.api[self.apiendpoint];
 					if (Object.keys(self.api).length == 0) {
 						index = F.routes.routes.indexOf(self);
 						if (index !== -1)
-							F.routes.routes.splice(index);
+							F.routes.routes.splice(index, 1);
 					}
 				}
 			} else {
@@ -645,7 +645,7 @@ exports.lookupcors = function(ctrl) {
 		return false;
 	}
 
-	let origin = ctrl.headers.origin;
+	let origin = ctrl.headers.origin || '';
 
 	if (F.config.$cors !== '*' && !origin.endsWith(ctrl.headers.host)) {
 

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;
 };