total5 0.0.8 → 0.0.9-2

package/builders.js

@@ -47,11 +47,6 @@ Options.prototype = {
 		this.payload = value;
 	},
 
-	get hostname() {
-		let ctrl = this.controller;
-		return ctrl ? ((ctrl.protocol || 'https') + '://' + ctrl.headers.host) : null;
-	},
-
 	get url() {
 		return (this.controller ? this.controller.url : '') || '';
 	},
@@ -105,6 +100,11 @@ Options.prototype = {
 	}
 };
 
+Options.prototype.hostname = function(path) {
+	let ctrl = this.controller;
+	return ctrl ? ctrl.hostname(path) : path;
+};
+
 Options.prototype.unauthorized = function() {
 	var args = [this];
 	for (let i = 0; i < arguments.length; i++)

package/changelog.txt

@@ -1,3 +1,16 @@
+========================
+0.0.9
+========================
+
+- added missing method `NEWMIDDLEWARE()`
+- fixed parsing `user-agent`
+- fixed `Message-ID` generator for email messages
+- improved `Number.round()` by [Tomáš Novák](https://github.com/tomee03)
+- added missing `$.hostname()` method in the `WebSocketController`
+- added missing `$.address` property in the `WebSocketController`
+- replaced `$.hostname` property with a method in the Schema/Auth Options
+- __critital__ fixed cloning buffers in the `FlowStream`
+
 ========================
 0.0.8
 ========================

package/flowstream.js

@@ -438,14 +438,8 @@ MP.send = function(outputindex, data, clonedata) {
 				if (data != undefined)
 					message.data = data;
 
-				if (clonedata && message.data && typeof(message.data) === 'object') {
-					if (message.data instanceof Buffer) {
-						let buf = Buffer.alloc(message.data.length);
-						buf.copy(message.data);
-						message.data = buf;
-					} else
-						message.data = F.TUtils.clone(message.data);
-				}
+				if (clonedata && message.data && typeof(message.data) === 'object')
+					message.data = message.data instanceof Buffer ? Buffer.from(message.data) : F.TUtils.clone(message.data);
 
 				message.used++;
 				message.instance = schema;
@@ -1120,14 +1114,8 @@ FP.ontrigger = function(outputindex, data, controller, events) {
 						message.used = 1;
 					}
 
-					if (i && (self.cloning != false) && message.data && typeof(message.data) === 'object') {
-						if (message.data instanceof Buffer) {
-							var buf = Buffer.alloc(message.data.length);
-							buf.copy(message.data);
-							message.data = buf;
-						} else
-							message.data = F.TUtils.clone(message.data);
-					}
+					if (i && (self.cloning != false) && message.data && typeof(message.data) === 'object')
+						message.data = message.data instanceof Buffer ? Buffer.from(message.data) : F.TUtils.clone(message.data);
 
 					message.main = self;
 					message.controller = controller;

package/global.js

@@ -42,6 +42,7 @@ global.CACHE = F.cache;
 global.NEWACTION = F.TBuilders.newaction;
 global.NEWCOMPONENT = F.newcomponent;
 global.NEWSCHEMA = F.TBuilders.newschema;
+global.NEWMIDDLEWARE = F.middleware;
 global.ACTION = global.EXEC = F.TBuilders.action;
 global.TEMPLATE = F.template;
 global.FILESTORAGE = F.filestorage;

package/index.js

@@ -36,7 +36,7 @@ global.DEF = {};
 
 	F.id = '';
 	F.clusterid = '';
-	F.is5 = F.version = 5008;
+	F.is5 = F.version = 5009;
 	F.isBundle = false;
 	F.isLoaded = false;
 	F.version_header = '5';

package/mail.js

@@ -567,7 +567,11 @@ Mailer.$writemessage = function(obj, buffer) {
 
 	message.push('MIME-Version: 1.0');
 	buffer.push('MAIL FROM: <' + msg.email_from + '>');
-	message.push('Message-ID: <total5X' + dt.toString(36) + 'X' + (INDEXATTACHMENT++) + 'X' + (INDEXATTACHMENT) + '>');
+
+	if (!Mailer.domain)
+		Mailer.domain = msg.email_from.substring(msg.email_from.lastIndexOf('@'));
+
+	message.push('Message-ID: <total5X' + dt.toString(36) + 'X' + (INDEXATTACHMENT++) + 'X' + (INDEXATTACHMENT) + Mailer.domain + '>');
 
 	self.$priority && message.push('X-Priority: ' + self.$priority);
 	self.$confidential && message.push('Sensitivity: Company-Confidential');

package/package.json

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

package/utils.js

@@ -1586,8 +1586,11 @@ exports.filestreamer = function(filename, onbuffer, onend, size) {
 };
 
 exports.parseUA = function(headers, structured) {
-	let ua = headers['sec-ch-ua'];
+	let ua = (headers['user-agent'] || '');
 	if (ua) {
+		return ua ? ua.parseUA(structured) : ua;
+	} else {
+		ua = headers['sec-ch-ua'];
 		let platform = headers['sec-ch-ua-platform'] || '';
 		let mobile = headers['sec-ch-ua-mobile'] === '?1';
 		let index = ua.indexOf('";v');
@@ -1595,9 +1598,6 @@ exports.parseUA = function(headers, structured) {
 		if (platform)
 			platform = platform.substring(1, platform.length - 1);
 		return structured ? { os: platform, browser: browser, device: mobile ? 'mobile' : 'desktop' } : ((platform ? (platform + ' ') : '') + browser + (mobile ? ' Mobile' : ''));
-	} else {
-		ua = (headers['user-agent'] || '');
-		return ua ? ua.parseUA(structured) : ua;
 	}
 };
 
@@ -4230,8 +4230,8 @@ NP.padRight = function(max, c) {
 };
 
 NP.round = function(precision) {
-	var m = Math.pow(10, precision) || 1;
-	return Math.round(this * m) / m;
+	var m = Math.round(this + 'e' + precision);
+	return Number(m + 'e-' + precision);
 };
 
 NP.currency = function(currency, a, b, c) {

package/websocket.js

@@ -48,6 +48,7 @@ function Controller(req, socket, head) {
 	ctrl.current = {};
 	ctrl.masking = false;
 	ctrl.iswebsocket = true;
+	ctrl.protocol = req.connection.encrypted || req.headers['x-forwarded-ssl'] === 'on' || req.headers['x-forwarded-port'] === '443' || (req.headers['x-forwarded-proto'] || req.headers['x-forwarded-protocol']) === 'https' ? 'https' : 'http';
 
 	for (let path of ctrl.split)
 		ctrl.split2.push(path.toLowerCase());
@@ -91,6 +92,14 @@ Controller.prototype = {
 
 	get referrer() {
 		return this.headers.referer;
+	},
+
+	get host() {
+		return this.headers.host;
+	},
+
+	get address() {
+		return (this.protocol + '://' + this.headers?.host || '') + (this.req?.url || '');
 	}
 
 };
@@ -592,6 +601,11 @@ Controller.prototype.ping = function(ts) {
 	return ctrl;
 };
 
+Controller.prototype.hostname = function(path) {
+	var ctrl = this;
+	return ctrl.protocol + '://' + ctrl.headers.host + (path ? path : '');
+};
+
 function websocketclientdestroy(ctrl) {
 	ctrl.socket.destroy();
 	F.TUtils.destroystream(ctrl.socket);