total5 0.0.16 → 0.0.17-1

package/changelog.txt

@@ -1,3 +1,15 @@
+========================
+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
+
 ========================
 0.0.16
 ========================

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

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-1",
   "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)) {