total5 0.0.7-1 → 0.0.7-3

package/builders.js

@@ -75,6 +75,10 @@ Options.prototype = {
 		return this.controller ? this.controller.ip : null;
 	},
 
+	get address() {
+		return this.controller ? this.controller.address : null;
+	},
+
 	get files() {
 		return this.controller ? this.controller.files : null;
 	},
@@ -1457,6 +1461,11 @@ ActionCaller.prototype.error = function(value) {
 	return this;
 };
 
+ActionCaller.prototype.ctrl = function(ctrl) {
+	this.controller = ctrl ? (ctrl.controller || ctrl) : null;
+	return this;
+};
+
 ActionCaller.prototype.done = function($, fn) {
 	this.options.callback = function(err, response) {
 		if (err)

package/changelog.txt

@@ -3,6 +3,16 @@
 ========================
 
 - improved user-agent parser (added support for new headers `Sec-CH-UA`)
+- improved `Number.pluralize()` method
+- reduced DNS cache flush time to 3 minutes
+- added `$.address` property with the absolute URL address
+- added `$.ctrl(ctrl_instance)` method
+- extended `Mail.from(email, [name])` method by adding `name` argument by [Marek Mráz](https://github.com/Mrazbb)
+- added `CONF.mail_from_name {String}` option
+- improved `$.query` parser
+- improved `Total.run()` method
+- added a new method `NEWCOMPONENT(html, [callback])`
+	- it compiles a FlowStream component to a method
 
 ========================
 0.0.6

package/components.js

@@ -0,0 +1,318 @@
+'use strict';
+
+const REG_ARGS = /\{{1,2}[a-z0-9_.-\s]+\}{1,2}/gi;
+
+function variables(str, data, encoding) {
+
+	if (typeof(str) === 'object') {
+		var obj = {};
+		for (var key in str) {
+			var val = str[key];
+			if (typeof(val) === 'string')
+				obj[key] = variables.call(this, val, data, encoding);
+			else
+				obj[key] = val;
+		}
+		return obj;
+	}
+
+	if (typeof(str) !== 'string' || str.indexOf('{') === -1)
+		return str;
+
+	var main = this.instance ? this.instance.module : (this.module || this);
+
+	if (data == null || data == true)
+		data = this;
+
+	return str.replace(REG_ARGS, function(text) {
+
+		var l = text[1] === '{' ? 2 : 1;
+		var key = text.substring(l, text.length - l).trim();
+		var val = null;
+
+		if (main.variables)
+			val = main.variables[key];
+
+		if (!val && main.variables2)
+			val = main.variables2[key];
+
+		if (!val && main.secrets)
+			val = main.secrets[key];
+
+		/*
+		if (!val && key === 'hostname') {
+			val = '';
+			if (val[val.length - 1] === '/')
+				val = val.substring(0, val.length - 1);
+		}*/
+
+		var customencoding = typeof(encoding) === 'function';
+
+		if (!val && data != null && typeof(data) === 'object') {
+			var nested = key.indexOf('.') !== -1;
+			val = nested ? F.TUtils.get(data, key) : data[key];
+		}
+
+		if (customencoding) {
+
+			val = encoding(val, key);
+
+		} else {
+
+			if (encoding !== 'json') {
+				if (val instanceof Date)
+					val = val.format();
+			}
+
+			switch (encoding) {
+				case 'urlencoded':
+				case 'url':
+					val = encodeURIComponent(val);
+					break;
+				case 'json':
+					val = JSON.stringify(val);
+					break;
+				case 'querify':
+					val = F.TUtils.querify(val).substring(1);
+					break;
+			}
+		}
+
+		return val == null ? text : val;
+
+	});
+}
+
+function Component() {
+	let t = this;
+	t.variables = t.variables2 = {};
+	t.secrets = {};
+	t.instances = [];
+}
+
+Component.prototype.service = function(counter) {
+	for (let m of this.instances)
+		m.service && m.service(counter);
+};
+
+Component.prototype.status = function(instance, msg) {
+	console.log('STATUS', this.name, msg);
+};
+
+Component.prototype.debug = function(instance, msg) {
+	console.log('DEBUG', this.name + ':', msg);
+};
+
+Component.prototype.dashboard = function(instance, msg) {
+	console.log('DASHBOARD', this.name + ':', msg);
+};
+
+Component.prototype.throw = function(instance, err) {
+	console.log('ERROR', this.name + ':', err);
+};
+
+Component.prototype.output = function(instance, response) {
+	console.log('OUTPUT', this.name + ' | ' + response.output + ':', response.data);
+};
+
+Component.prototype.create = function(opt, status) {
+
+	let t = this;
+	let instance = new Instance();
+	instance.id = U.random_text(8);
+	instance.config = t.config ? F.TUtils.clone(t.config) : {};
+	instance.module = t;
+
+	if (opt) {
+		for (let key in opt)
+			instance.config[key] = opt[key];
+	}
+
+	t.instances.push(instance);
+	t.make.call(instance, instance, instance.config, status);
+	t.oncreate && setImmediate(() => t.oncreate(instance));
+	return instance;
+};
+
+Component.prototype.remove = function() {
+	let t = this;
+	t.instances.wait(function(instance, next) {
+		instance.remove();
+		setImmediate(next);
+	}, function() {
+		t.uninstall && t.uninstall.call(t, t);
+	});
+};
+
+Component.prototype.save = function(instance) {
+	// save state
+};
+
+function Message() {
+	let t = this;
+	t.repo = {};
+	t.vars = {};
+	t.used = 1;
+	t.main = null;
+	t.processed = 0;
+}
+
+Message.prototype.replace = variables;
+
+Message.prototype.send = function(output, data) {
+	let t = this;
+	if (!t.instance)
+		return;
+	if (data != null)
+		t.data = data;
+	t.output = output;
+	t.instance.output && t.instance.output(t);
+};
+
+Message.prototype.end = Message.prototype.destroy = function() {
+	let t = this;
+	t.data = null;
+	t.fromcomponent = null;
+	t.instance = null;
+	t.vars = null;
+	t.repo = null;
+	t.refs = null;
+}
+
+function Instance() {
+	let t = this;
+	t.id = U.random_text(8);
+	t.cache = {};
+	t.middleware = NOOP;
+	t.transform = NOOP;
+	t.replace = variables;
+	t.instances = EMPTYOBJECT;
+	t.components = EMPTYOBJECT;
+}
+
+Instance.prototype.replace = variables;
+
+Instance.prototype.remove = function() {
+	let t = this;
+	t.close && t.close.call(t, true);
+	t.destroy && t.destroy.call(t);
+	t.module.onremove && t.module.onremove(t);
+	let index = t.module.instances.indexOf(t);
+	t.module.instances.splice(index, 1);
+};
+
+Instance.prototype.input = function(input, data) {
+	let t = this;
+	if (t.message) {
+		let msg = t.newmessage(data);
+		msg.input = input;
+		t.message(msg);
+	}
+};
+
+Instance.prototype.send = function(output, data) {
+	let msg = data instanceof Message ? data : this.newmessage();
+	msg.output = output;
+	msg.data = data;
+	msg.send(output);
+};
+
+Instance.prototype.newmessage = function(data) {
+	var t = this;
+	var msg = new Message();
+	msg.from = msg.instance = t;
+	msg.fromid = msg.id;
+	msg.fromcomponent = msg.component;
+	msg.data = data instanceof Message ? data.data : data;
+	return msg;
+};
+
+Instance.prototype.save = function() {
+	this.module.save(this);
+};
+
+Instance.prototype.output = function(response) {
+	this.module.output(this, response);
+};
+
+Instance.prototype.debug = function(msg) {
+	this.module.debug(this, msg);
+};
+
+Instance.prototype.throw = function(err) {
+	this.module.throw(this, error);
+};
+
+Instance.prototype.dashboard = function(msg) {
+	this.module.dashboard(this, msg);
+};
+
+Instance.prototype.reconfigure = function(opt) {
+	let t = this;
+	for (let key in opt)
+		t.config[key] = opt[key];
+	t.configure && t.configure(t.config);
+	t.save();
+};
+
+Instance.prototype.status = function(msg) {
+	this.module.status(this, msg);
+};
+
+Instance.prototype.logger = NOOP;
+Instance.prototype.transform = NOOP;
+Instance.prototype.middleware = NOOP;
+
+exports.compile = function(html, callback) {
+
+	if (callback == null) {
+		return new Promise(function(resolve, reject) {
+			exports.compile(html, function(err, com) {
+				if (err)
+					reject(err);
+				else
+					resolve(com);
+			});
+		})
+	}
+
+	var meta = html.parseComponent({ readme: '<readme>', settings: '<settings>', css: '<style>', be: '<script total>', be2: '<script node>', js: '<script>', html: '<body>', schema: '<schema>', template: '<template>' });
+	var node = (meta.be || meta.be2 || '').trim().replace(/\n\t/g, '\n');
+
+	if (!meta.be && !meta.be2) {
+		var e = new Error('Invalid component content');
+		callback(e);
+		return;
+	}
+
+	var fn = null;
+	var com = new Component();
+
+	delete meta.be;
+	delete meta.be2;
+	com.ui = meta;
+
+	try {
+		fn = new Function('exports', 'require', node);
+		fn(com, F.require);
+	} catch (e) {
+		callback(e);
+		return;
+	}
+
+	var errors = [];
+
+	(com.npm || EMPTYARRAY).wait(function(name, next) {
+		NPMINSTALL(name, function(err) {
+			if (err) {
+				callback(err);
+				next = null;
+			} else
+				next();
+		});
+	}, function() {
+		com.install && com.install.call(com, com);
+		callback(null, com);
+	});
+
+};

package/controller.js

@@ -42,7 +42,7 @@ function Controller(req, res) {
 	ctrl.url = ctrl.uri.pathname;
 	ctrl.released = false;
 	ctrl.downloaded = false;
-	ctrl.protocol = req.connection.encrypted || (req.headers['x-forwarded-protocol'] || req.headers['x-forwarded-proto']) === 'https' ? 'https' : 'http';
+	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());
@@ -113,6 +113,14 @@ function Controller(req, res) {
 
 Controller.prototype = {
 
+	get query() {
+		return this.$query || (this.$query = ctrl.uri.search.parseEncoded());
+	},
+
+	set query(val) {
+		this.$query = val;
+	},
+
 	get mobile() {
 		let ua = this.headers['user-agent'];
 		return ua ? REG_MOBILE.test(ua) : false;
@@ -159,6 +167,10 @@ Controller.prototype = {
 
 	get host() {
 		return this.headers.host;
+	},
+
+	get address() {
+		return (this.protocol + '://' + this.headers?.host || '') + (this.req?.url || '');
 	}
 
 };
@@ -1013,12 +1025,16 @@ Controller.prototype.$route = function() {
 
 				ctrl.payload = Buffer.concat(ctrl.payload);
 				F.stats.performance.download += ctrl.payload.length / 1024 / 1024;
+				let val;
+
 				switch (ctrl.datatype) {
 					case 'json':
-						ctrl.body = F.def.parsers.json(ctrl.payload.toString('utf8'));
+						val = ctrl.payload.toString('utf8');
+						ctrl.body = val ? F.def.parsers.json(val) : null;
 						break;
 					case 'urlencoded':
-						ctrl.body = F.def.parsers.urlencoded(ctrl.payload.toString('utf8'));
+						val = ctrl.payload.toString('utf8');
+						ctrl.body = val ? F.def.parsers.urlencoded(val) : {};
 						break;
 				}
 

package/flowstream.js

@@ -999,7 +999,6 @@ function newmessage(data) {
 	msg.data = data instanceof Message ? data.data : data;
 	msg.cloned = 0;
 	msg.count = 0;
-	msg.instance = self;
 	msg.duration = msg.ts = Date.now();
 	msg.used = 1;
 	msg.main = self instanceof FlowStream ? self : self.main;

package/global.js

@@ -40,6 +40,7 @@ global.DATA = new F.TQueryBuilder.Controller(true);
 global.DB = () => new F.TQueryBuilder.Controller();
 global.CACHE = F.cache;
 global.NEWACTION = F.TBuilders.newaction;
+global.NEWCOMPONENT = F.newcomponent;
 global.NEWSCHEMA = F.TBuilders.newschema;
 global.ACTION = global.EXEC = F.TBuilders.action;
 global.TEMPLATE = F.template;

package/index.js

@@ -460,7 +460,7 @@ function unlink(arr, callback) {
 		} else
 			msg.to(email);
 
-		msg.from(F.config.mail_from || F.config.smtp.from || F.config.smtp.user);
+		msg.from(F.config.mail_from || F.config.smtp.from || F.config.smtp.user, F.config.mail_from_name || F.config.smtp.name);
 		callback && msg.callback(callback);
 
 		if (reply)
@@ -1243,6 +1243,11 @@ F.httpload = function(opt) {
 	F.server = F.Http.createServer(F.THttp.listen);
 	F.server.on('upgrade', F.TWebSocket.listen);
 
+	CONF.$performance && F.server.on('connection', function(socket) {
+		socket.setNoDelay(true);
+		socket.setKeepAlive(true, 10);
+	});
+
 	var unixsocket = opt.unixsocket || F.config.$unixsocket;
 	if (unixsocket) {
 
@@ -1724,7 +1729,7 @@ F.service = function(count) {
 	if (count % F.config.$tmsclearblocked === 0)
 		F.temporary.tmsblocked = {};
 
-	if (count % 30 === 0)
+	if (count % 3 === 0)
 		F.temporary.dnscache = {};
 
 	let blocked = F.temporary.blocked;
@@ -2499,7 +2504,7 @@ F.filestorage = function(name) {
 
 F.encryptreq = function(ctrl, val, key, strict) {
 	var obj = {};
-	obj.ua = ctrl.ua;
+	obj.ua = HASH(ctrl.headers['user-agent'] || '').toString(36);
 	if (strict)
 		obj.ip = ctrl.ip;
 	obj.data = val;
@@ -2510,7 +2515,7 @@ F.decryptreq = function(ctrl, val, key) {
 	if (!val)
 		return;
 	var obj = F.decrypt(val, key || '', true);
-	if (!obj || (obj.ip && obj.ip !== ctrl.ip) || (obj.ua !== ctrl.ua))
+	if (!obj || (obj.ip && obj.ip !== ctrl.ip) || (obj.ua !== HASH(ctrl.headers['user-agent'] || '').toString(36)))
 		return;
 	return obj.data;
 };
@@ -2572,6 +2577,8 @@ F.dir = function(val) {
 };
 
 F.run = function(opt) {
+	if (!opt)
+		opt = {};
 	var type = opt.watcher === false ? 'release' : 'debug';
 	opt.watcher = false;
 	require('./' + type)(opt);
@@ -2648,6 +2655,10 @@ F.datauri = function(path) {
 	}));
 };
 
+F.newcomponent = function(html, callback) {
+	return require('./components').compile(html, callback);
+};
+
 F.loadstats = function() {
 
 	var main = {};

package/mail.js

@@ -60,8 +60,9 @@ Message.prototype.callback = function(fn) {
 	return this;
 };
 
-Message.prototype.sender = Message.prototype.from = function(email) {
+Message.prototype.sender = Message.prototype.from = function(email, name) {
 	this.email_from = email;
+	this.email_from_name = name;
 	return this;
 };
 
@@ -571,7 +572,7 @@ Mailer.$writemessage = function(obj, buffer) {
 	self.$priority && message.push('X-Priority: ' + self.$priority);
 	self.$confidential && message.push('Sensitivity: Company-Confidential');
 
-	message.push('From: <' + msg.email_from + '>');
+	message.push('From: ' + (msg.email_from_name ? (unicode_encode(msg.email_from_name) + ' <' + msg.email_from + '>') : msg.email_from));
 
 	if (msg.headers) {
 		for (let key in msg.headers)

package/package.json

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

package/utils.js

@@ -4319,13 +4319,7 @@ NP.pluralize = function(zero, one, few, other) {
 	else
 		value = other;
 
-	var beg = value.indexOf('#');
-	if (beg === -1)
-		return value;
-
-	var end = value.lastIndexOf('#');
-	var format = value.substring(beg, end + 1);
-	return num.format(format) + value.replace(format, '');
+	return value.replace('#', num.toString());
 };
 
 NP.VAT = NP.TAX = function(percentage, decimals, includedVAT) {