total5 0.0.9-1 → 0.0.9-3

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

@@ -5,6 +5,12 @@
 - 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`
+- improved user-agent parser
 
 ========================
 0.0.8

package/controller.js

@@ -143,7 +143,9 @@ Controller.prototype = {
 	get ua() {
 		if (this.$ua != null)
 			return this.$ua;
-		this.$ua = F.TUtils.parseUA(this.headers);
+		this.$ua = this.headers['user-agent'] || '';
+		if (this.$ua)
+			this.$ua = this.$ua.parseUA();
 		return this.$ua;
 	},
 

package/edit.js

@@ -62,14 +62,11 @@ exports.init = function(url, dir) {
 	});
 
 	client.on('open', function() {
-		console.log(new Date().toString('yyyy-MM-dd HH:mm:ss'), 'open');
 		client.send({ TYPE: 'init', version: VERSION });
 	});
 
 	client.on('close', function(e) {
 
-		console.log(new Date().toString('yyyy-MM-dd HH:mm:ss'), 'closed', e);
-
 		initilaized = false;
 
 		if (e === 4004) {
@@ -88,7 +85,6 @@ exports.init = function(url, dir) {
 	});
 
 	client.on('error', function(err) {
-		console.log(new Date().toString('yyyy-MM-dd HH:mm:ss'), 'error', err);
 		console.log(HEADER + ':', err.message);
 	});
 

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/package.json

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

package/utils.js

@@ -75,6 +75,10 @@ const REG_HEADERPARSER = /(name|filename)=".*?"|content-type:\s[a-z0-9-./+]+/ig;
 const HEADEREND = Buffer.from('\r\n\r\n', 'ascii');
 const JSCHEMAS_NULLABLE = { json: 1, base64: 1, guid: 1, datauri: 1, uid: 1, string2: 1 };
 
+const ARR_UA_OS = ['android', 'windows', 'ios', 'iphone', 'ubuntu', 'fedora', 'linux', 'mac os'];
+const ARR_UA_BROWSER = ['xbox', 'playstation', 'nintendo', 'appletv', 'fxios', 'opera', 'edge', 'vivaldi', 'chrome', 'firefox', 'kindle', 'safari'];
+const REG_UA_MOBILE = /iphone|android|mobile/i;
+
 exports.MONTHS = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
 exports.DAYS = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
 
@@ -1587,18 +1591,7 @@ exports.filestreamer = function(filename, onbuffer, onend, size) {
 
 exports.parseUA = function(headers, structured) {
 	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');
-		let browser = ua.substring(1, index);
-		if (platform)
-			platform = platform.substring(1, platform.length - 1);
-		return structured ? { os: platform, browser: browser, device: mobile ? 'mobile' : 'desktop' } : ((platform ? (platform + ' ') : '') + browser + (mobile ? ' Mobile' : ''));
-	}
+	return ua ? ua.parseUA(structured) : structured ? {} : ua;
 };
 
 exports.parseInt = function(obj, def) {
@@ -2689,165 +2682,36 @@ SP.parseUA = function(structured) {
 	if (!ua)
 		return '';
 
-	var arr = ua.match(REG_UA);
-	var uid = '';
-
-	if (arr) {
-
-		var data = {};
-
-		for (var i = 0; i < arr.length; i++) {
+	let lowered = ua.toLowerCase();
+	let os = '';
+	let device = '';
+	let browser = '';
 
-			if (arr[i] === 'like' && arr[i + 1] === 'Gecko') {
-				i += 1;
-				continue;
-			}
-
-			var key = arr[i].toLowerCase();
-			if (key === 'like')
-				break;
+	for (let m of ARR_UA_OS) {
+		let index = lowered.indexOf(m);
+		if (index !== -1) {
+			os = ua.substring(index, index + m.length);
+			break;
+		}
+	}
 
-			switch (key) {
-				case 'linux':
-				case 'windows':
-				case 'mac':
-				case 'symbian':
-				case 'symbos':
-				case 'tizen':
-				case 'android':
-					data[arr[i]] = 2;
-					if (key === 'tizen' || key === 'android')
-						data.Mobile = 1;
-					break;
-				case 'webos':
-					data.WebOS = 2;
-					break;
-				case 'media':
-				case 'center':
-				case 'tv':
-				case 'smarttv':
-				case 'smart':
-					data[arr[i]] = 5;
-					break;
-				case 'iemobile':
-				case 'mobile':
-					data[arr[i]] = 1;
-					data.Mobile = 3;
-					break;
-				case 'ipad':
-				case 'ipod':
-				case 'iphone':
-					data.iOS = 2;
-					data.Mobile = 3;
-					data[arr[i]] = 1;
-					if (key === 'ipad')
-						data.Tablet = 4;
-					break;
-				case 'phone':
-					data.Mobile = 3;
-					break;
-				case 'tizenbrowser':
-				case 'blackberry':
-				case 'mini':
-					data.Mobile = 3;
-					data[arr[i]] = 1;
-					break;
-				case 'samsungbrowser':
-				case 'chrome':
-				case 'firefox':
-				case 'msie':
-				case 'opera':
-				case 'brave':
-				case 'vivaldi':
-				case 'outlook':
-				case 'safari':
-				case 'mail':
-				case 'edge':
-				case 'maxthon':
-				case 'electron':
-					data[arr[i]] = 1;
-					break;
-				case 'trident':
-					data.MSIE = 1;
-					break;
-				case 'opr':
-					data.Opera = 1;
+	for (let m of ARR_UA_BROWSER) {
+		let index = lowered.lastIndexOf(m);
+		if (index !== -1) {
+			switch (m) {
+				case 'fxios':
+					browser = 'Firefox';
 					break;
-				case 'tablet':
-					data.Tablet = 4;
+				default:
+					browser = ua.substring(index, index + m.length);
 					break;
 			}
+			break;
 		}
-
-		if (data.MSIE) {
-			data.IE = 1;
-			delete data.MSIE;
-		}
-
-		if (data.WebOS || data.Android)
-			delete data.Linux;
-
-		if (data.IEMobile) {
-			if (data.Android)
-				delete data.Android;
-			if (data.Safari)
-				delete data.Safari;
-			if (data.Chrome)
-				delete data.Chrome;
-		} else if (data.MSIE) {
-			if (data.Chrome)
-				delete data.Chrome;
-			if (data.Safari)
-				delete data.Safari;
-		} else if (data.Edge) {
-			if (data.Chrome)
-				delete data.Chrome;
-			if (data.Safari)
-				delete data.Safari;
-		} else if (data.Opera || data.Electron) {
-			if (data.Chrome)
-				delete data.Chrome;
-			if (data.Safari)
-				delete data.Safari;
-		} else if (data.Chrome) {
-			if (data.Safari)
-				delete data.Safari;
-			if (data.SamsungBrowser)
-				delete data.SamsungBrowser;
-		} else if (data.SamsungBrowser) {
-			if (data.Safari)
-				delete data.Safari;
-		}
-
-		if (structured) {
-			var output = { os: '', browser: '', device: 'desktop' };
-
-			if (data.Tablet)
-				output.device = 'tablet';
-			else if (data.Mobile)
-				output.device = 'mobile';
-
-			for (var key in data) {
-				var val = data[key];
-				switch (val) {
-					case 1:
-						output.browser += (output.browser ? ' ' : '') + key;
-						break;
-					case 2:
-						output.os += (output.os ? ' ' : '') + key;
-						break;
-					case 5:
-						output.device = 'tv';
-						break;
-				}
-			}
-			return output;
-		}
-
-		uid = Object.keys(data).join(' ');
 	}
 
-	return uid;
+	device = REG_UA_MOBILE.test(lowered) ? 'mobile' : 'desktop';
+	return structured ? { os, browser, device } : ((os ? (os + ' ') : '') + (browser ? (browser + ' ') : '')).trim();
 };
 
 SP.parseCSV = function(delimiter) {
@@ -4230,8 +4094,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());
@@ -70,7 +71,9 @@ Controller.prototype = {
 	get ua() {
 		if (this.$ua != null)
 			return this.$ua;
-		this.$ua = F.TUtils.parseUA(this.headers);
+		this.$ua = this.headers['user-agent'] || '';
+		if (this.$ua)
+			this.$ua = this.$ua.parseUA();
 		return this.$ua;
 	},
 
@@ -91,6 +94,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 +603,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);