total5 0.0.1-3 → 0.0.1-30

package/api.js

@@ -132,7 +132,7 @@ APICallProto.error = APICallProto.err = function(err, reverse) {
 
 APICallProto.callback = function($) {
 	var t = this;
-	t.$callback = typeof($) === 'function' ? $ : $.callback;
+	t.$callback = typeof($) === 'function' ? $ : $.callback();
 	return t;
 };
 
@@ -208,7 +208,7 @@ exports.newapi('TotalAPI,TAPI', function(opt, next) {
 	req.type = 'json';
 	req.timeout = 60000;
 	req.keepalive = true;
-	req.headers = { 'x-token': opt.token || F.config.secret_totalapi || F.config.$tapisecret || '-', 'x-app': encodeURIComponent(F.config.name) };
+	req.headers = { 'x-token': opt.token || F.config.totalapi || F.config.secret_totalapi || F.config.$tapisecret || '-', 'x-app': encodeURIComponent(F.config.name) };
 	req.custom = true;
 
 	req.callback = function(err, response) {
@@ -279,10 +279,7 @@ exports.newapi('TotalAPI,TAPI', function(opt, next) {
 
 		var writer = F.Fs.createWriteStream(opt.output);
 		response.stream.pipe(writer);
-		F.cleanup(writer, function() {
-			opt.next(null, opt.output);
-		});
-
+		F.cleanup(writer, () => opt.next(null, opt.output));
 	};
 
 	F.TUtils.request(req);

package/builders.js

@@ -5,6 +5,7 @@
 'use strict';
 
 const REG_ARGS = /\{{1,2}[a-z0-9_.-\s]+\}{1,2}/gi;
+const SESSIONSEPARATOR = '\0';
 
 var transforms = { error: {}, restbuilder: {} };
 var restbuilderupgrades = [];
@@ -23,7 +24,11 @@ Options.prototype = {
 	},
 
 	get websocket() {
-		return this.controller.parent;
+		return this.controller && this.controller.iswebsocket ? this.controller : null;
+	},
+
+	get sessionid() {
+		return this.controller ? this.controller.sessionid : null;
 	},
 
 	get value() {
@@ -51,15 +56,15 @@ Options.prototype = {
 	},
 
 	get path() {
-		return (this.controller ? this.controller.pathname : EMPTYARRAY);
+		return this.controller ? this.controller.pathname : EMPTYARRAY;
 	},
 
 	get split() {
-		return (this.controller ? this.controller.split : EMPTYARRAY);
+		return this.controller ? this.controller.split : EMPTYARRAY;
 	},
 
 	get split2() {
-		return (this.controller ? this.controller.split2 : EMPTYARRAY);
+		return this.controller ? this.controller.split2 : EMPTYARRAY;
 	},
 
 	get language() {
@@ -98,7 +103,7 @@ Options.prototype.action = function(schema, payload) {
 Options.prototype.publish = function(value) {
 	var self = this;
 	var name = self.id;
-	if (F.TMS.cache.socket && F.TMS.cache.pcache[name] && F.TMS.cache.publishers[name]) {
+	if (F.TTMS.cache.socket && F.TTMS.cache.pcache[name]) {
 
 		var tmp = {};
 		if (tmp) {
@@ -109,7 +114,7 @@ Options.prototype.publish = function(value) {
 		}
 
 		F.stats.performance.publish++;
-		F.TMS.cache.socket.send({ type: 'publish', id: name, data: tmp }, client => client.tmsready);
+		F.TTMS.cache.socket.send({ type: 'publish', id: name, data: tmp }, client => client.tmsready && client.$subscribers[name]);
 	}
 	return self;
 };
@@ -148,8 +153,14 @@ Options.prototype.cancel = function() {
 };
 
 Options.prototype.redirect = function(url) {
-	this.redirect(url);
-	this.cancel();
+	var self = this;
+	self.$callback = null;
+	if (self.controller) {
+		self.controller.redirect(url);
+		self.controller.destroyed = true;
+	}
+	self.cancel();
+	return self;
 };
 
 Options.prototype.audit = function(message, type) {
@@ -164,6 +175,16 @@ Options.prototype.success = function(value) {
 		self.callback(DEF.onSuccess(value));
 };
 
+Options.prototype.successful = function(callback) {
+	var self = this;
+	return function(err, a, b, c) {
+		if (err)
+			self.invalid(err);
+		else
+			callback.call(self, a, b, c);
+	};
+};
+
 Options.prototype.callback = function(value) {
 
 	var self = this;
@@ -182,8 +203,8 @@ Options.prototype.done = function(arg) {
 	var self = this;
 	return function(err, response) {
 		if (err) {
-			err && self.error.push(err);
-			self.callback();
+			self.error.push(err);
+			self.callback(null);
 		} else {
 			if (self.TYPE === 'auth')
 				self.callback(arg === true ? response : arg);
@@ -196,7 +217,7 @@ Options.prototype.done = function(arg) {
 Options.prototype.invalid = function(error, path, index) {
 	var self = this;
 	self.error.push(error, path, index);
-	self.$callback(error);
+	self.$callback(true);
 };
 
 Options.prototype.cookie = function(name, value, expire, options) {
@@ -262,6 +283,11 @@ ErrorBuilder.prototype = {
 	}
 };
 
+ErrorBuilder.prototype.reject = function(language) {
+	var self = this;
+	return new Error(self.toString(language, ''));
+};
+
 ErrorBuilder.prototype.push = function(err, path, index) {
 	var self = this;
 
@@ -316,8 +342,10 @@ ErrorBuilder.prototype.output = function(language = 'default') {
 
 		let err = m.error;
 
-		if (err[0] == '@')
+		if (err == '@')
 			err = F.resource(language, 'T' + (err === '@' ? m.name : err.substring(1)).hash(true).toString(36)) || 'The field "' + m.name + '" is invalid';
+		else if (err[0] === '@')
+			err = F.translate(language, err);
 
 		if (self.replacer) {
 			for (let key in self.replacer)
@@ -333,12 +361,12 @@ ErrorBuilder.prototype.output = function(language = 'default') {
 	return output;
 };
 
-ErrorBuilder.prototype.toString = function(language = 'default') {
+ErrorBuilder.prototype.toString = function(language = 'default', divider = '\n') {
 	var self = this;
 	var output = self.output(language);
 	var str = '';
 	for (let err of output)
-		str += (str ? '\n' : '') + err.error;
+		str += (str ? divider : '') + err.error;
 	return str;
 };
 
@@ -710,6 +738,9 @@ RESTP.callback = function(fn) {
 
 	var self = this;
 
+	if (fn instanceof Options)
+		fn = fn.callback();
+
 	if (typeof(fn) === 'function') {
 		setImmediate(execrestbuilder, self, fn);
 		return self;
@@ -1147,20 +1178,24 @@ exports.newaction = function(name, obj) {
 			}
 		}
 
-		F.TMS.newpublish(name, tmsschema);
+		F.TTMS.newpublish(name, tmsschema);
 	}
 
 	F.makesourcemap && F.makesourcemap();
 	return obj;
 };
 
+function ActionCallerExec(self) {
+	self.exec();
+}
+
 function ActionCaller() {
 	var self = this;
 	self.$ = new Options();
 	self.error = new ErrorBuilder();
 	self.options = {};
 	self.actions = [];
-	setImmediate(self => self.exec(), self);
+	setImmediate(ActionCallerExec, self);
 }
 
 ActionCaller.prototype.debug = function() {
@@ -1219,7 +1254,7 @@ ActionCaller.prototype.exec = function() {
 	var type = meta.payload || (action.input ? '+' : '-');
 	var $ = self.$;
 
-	$.id = id;
+	$.id = action.id;
 	$.error = self.error;
 	$.controller = self.controller;
 	$.fields = action.fields;
@@ -1272,7 +1307,8 @@ ActionCaller.prototype.exec = function() {
 			return;
 		}
 		$.query = response.response;
-	}
+	} else
+		$.query = query;
 
 	if (action.jsparams) {
 		self.error.prefix = 'params.';
@@ -1283,16 +1319,18 @@ ActionCaller.prototype.exec = function() {
 			return;
 		}
 		$.params = response.response;
-	}
+	} else
+		$.params = params;
 
 	if (action.jsinput && type !== '-') {
-		response = action.jsinput.transform(payload, type === '%', self.error);
+		response = action.jsinput.transform(payload, action.partial, self.error);
 		if (response.error) {
 			self.cancel();
 			return;
 		}
 		$.payload = response.response;
-	}
+	} else
+		$.payload = payload;
 
 	action.action($, $.payload);
 };
@@ -1363,7 +1401,7 @@ ActionCaller.prototype.promise = function($) {
 				if ($ && $.invalid)
 					$.invalid(err);
 				else
-					reject(err);
+					reject(err.reject());
 			} else
 				resolve(response);
 		};
@@ -1421,15 +1459,281 @@ exports.action = function(name, payload, controller) {
 };
 
 exports.newschema = function(name, callback) {
+
+	if (name[0] === '@')
+		name = name.substring(1);
+
+	if (typeof(callback) === 'string')
+		return F.jsonschemas[name] = F.TUtils.jsonschema(callback, true);
+
 	var $ = {};
 	$.name = name;
 	$.actions = {};
 	$.action = function(aname, meta) {
 		return $.actions[aname] = F.newaction(name + '/' + aname, meta);
 	};
+
 	callback($);
 };
 
+exports.builtinauth = function(opt) {
+
+	// opt.secret {String}
+	// opt.ddos {Number}
+	// opt.expire {String}
+	// opt.cookie {String} A cookie name
+	// opt.header {String} A header name
+	// opt.options {Object} A cookie options
+	// opt.strict {Boolean}
+
+	if (opt.strict == null)
+		opt.strict = true;
+
+	// Delegates
+	// opt.onddos = function($)
+	// opt.onread = function({ sessionid: String, userid: String, ua: String }, callback(USER_DATA), $)
+	// opt.onfree = function({ sessions: Array, users: Array })
+	// opt.onlogout = function(sessionid, userid)
+	// opt.onauthorize = function($) must return true for canceling of processing
+
+	opt.sessions = {};
+	opt.blocked = {};
+	opt.pending = {};
+
+	if (!opt.cleaner)
+		opt.cleaner = 5;
+
+	if (!opt.secret)
+		opt.secret = F.secret;
+
+	opt.logout = function($) {
+
+		var id = $;
+
+		if (typeof(id) === 'object')
+			id = $.sessionid;
+
+		if (id) {
+			for (var key in opt.sessions) {
+				var session = opt.sessions[key];
+				if (session.sessionid === id) {
+					delete opt.sessions[key];
+					opt.onlogout && opt.onlogout(session);
+					opt.cookie && !$.controller.parent && $.controller.cookie && $.controller.cookie(opt.cookie, '', '-1 year', opt.options);
+					return true;
+				}
+			}
+		}
+	};
+
+	opt.update = function(userid, fn) {
+		var count = 0;
+		for (var key in opt.sessions) {
+			var session = opt.sessions[key];
+			if (session.userid === userid) {
+				count++;
+				fn(session.data, session);
+			}
+		}
+		return count;
+	};
+
+	opt.refresh = function(userid, exceptsessionid) {
+		var count = 0;
+		for (var key in opt.sessions) {
+			var session = opt.sessions[key];
+			if (session.userid === userid && session.sessionid !== exceptsessionid) {
+				count++;
+				delete opt.sessions[key];
+			}
+		}
+		return count;
+	};
+
+	opt.sign = function(sessionid, userid) {
+		return (sessionid + SESSIONSEPARATOR + userid + SESSIONSEPARATOR + Date.now().toString(36)).encrypt(opt.secret);
+	};
+
+	opt.authcookie = function($, sessionid, userid, expiration, options) {
+		if (!options)
+			options = opt.options;
+		var ctrl = $.controller ? $.controller : $;
+		ctrl.cookie && !ctrl.parent && $.cookie(opt.cookie, opt.sign(sessionid, userid), expiration, options);
+	};
+
+	if (!opt.expire)
+		opt.expire = '5 minutes';
+
+	var callpending = function(pending, data) {
+		for (var i = 0; i < pending.length; i++) {
+			if (data)
+				pending[i].success(data);
+			else
+				pending[i].invalid();
+		}
+	};
+
+	opt.auth = function($) {
+
+		if (opt.onauthorize && opt.onauthorize($))
+			return;
+
+		var sessionid = opt.cookie ? $.cookie(opt.cookie) : null;
+		if (!sessionid && opt.header)
+			sessionid = $.controller.headers[opt.header];
+
+		var localize = opt.locale || opt.localize;
+
+		if (!sessionid) {
+
+			if (localize)
+				$.controller.language = localize(null, $.controller);
+
+			$.invalid();
+			return;
+		}
+
+		var id = sessionid.decrypt(opt.secret);
+		if (id) {
+
+			id = id.split(SESSIONSEPARATOR);
+
+			if (!id[0] || !id[1] || !id[2])
+				id = null;
+
+			if (id) {
+				var session = opt.sessions[id[0]];
+				if (session && session.data) {
+					if (!opt.strict || session.ua === $.controller.ua) {
+						$.controller.session = session;
+						$.controller.sessionid = session.sessionid;
+						if (!opt.onsession || !opt.onsession(session, $)) {
+							if (localize)
+								$.controller.language = localize(session.data, $.controller);
+							$.success(session.data);
+						}
+					} else {
+
+						if (localize)
+							$.controller.language = localize(null, $.controller);
+
+						$.invalid();
+						sessionid = null;
+					}
+					return;
+				}
+			}
+		}
+
+		if (opt.ddos && opt.blocked[$.controller.ip] > opt.ddos) {
+			opt.onddos && opt.onddos($);
+			$.invalid();
+			return;
+		}
+
+		if (!id) {
+
+			if (opt.ddos) {
+				if (opt.blocked[$.controller.ip])
+					opt.blocked[$.controller.ip]++;
+				else
+					opt.blocked[$.controller.ip] = 1;
+			}
+
+			opt.cookie && $.controller && !$.controller.parent && $.controller.cookie && $.controller.cookie(opt.cookie, '', '-1 year', opt.options);
+			$.invalid();
+			return;
+		}
+
+		var meta = { ip: $.controller.ip, ua: $.controller.ua, sessionid: id[0], userid: id[1] };
+
+		if (opt.pending[meta.sessionid]) {
+			opt.pending[meta.sessionid].push($);
+			return;
+		}
+
+		opt.pending[meta.sessionid] = [];
+		opt.onread(meta, function(err, data) {
+
+			var pending = opt.pending[meta.sessionid];
+			delete opt.pending[meta.sessionid];
+
+			if (!err && data) {
+
+				$.controller.session = opt.sessions[meta.sessionid] = { sessionid: meta.sessionid, userid: meta.userid, data: data, ua: $.controller.ua, expire: NOW.add(opt.expire) };
+				$.controller.sessionid = meta.sessionid;
+
+				if (localize)
+					$.controller.language = localize(data, $.controller);
+
+				if (!opt.onsession || !opt.onsession($.controller.session, $, true))
+					$.success(data);
+
+				if (pending.length)
+					setImmediate(callpending, pending, data);
+
+			} else {
+
+				if (opt.ddos) {
+					if (opt.blocked[$.controller.ip])
+						opt.blocked[$.controller.ip]++;
+					else
+						opt.blocked[$.controller.ip] = 1;
+				}
+
+				opt.cookie && !$.controller.parent && $.controller.cookie && $.controller.cookie(opt.cookie, '', '-1 year', opt.options);
+				$.invalid();
+
+				if (pending.length)
+					setImmediate(callpending, pending);
+			}
+
+		}, $);
+
+	};
+
+	F.def.onAuthorize = opt.auth;
+
+	F.on('service', function(counter) {
+
+		if (counter % opt.cleaner)
+			return;
+
+		var expired = [];
+		var users_expired = {};
+		var users_live = {};
+
+		for (var key in opt.sessions) {
+			var session = opt.sessions[key];
+			if (session.expire < NOW) {
+				expired.push(key);
+				delete opt.sessions[key];
+				users_expired[session.userid] = 1;
+			} else
+				users_live[session.userid] = 1;
+		}
+
+		if (expired.length) {
+			for (var key in users_expired) {
+				if (users_live[key])
+					delete users_expired[key];
+			}
+		}
+
+		if (expired.length && opt.onfree) {
+			var meta = {};
+			meta.sessions = expired;
+			meta.users = expired.length ? Object.keys(users_expired) : null;
+			opt.onfree && opt.onfree(meta);
+		}
+
+		opt.blocked = {};
+
+	});
+
+	return opt;
+};
+
 exports.RESTBuilder = RESTBuilder;
 exports.ErrorBuilder = ErrorBuilder;
 exports.Options = Options;

package/bundles.js

@@ -400,7 +400,7 @@ exports.extract = function(callback, skip) {
 	try {
 
 		if (F.Fs.readFileSync('bundles.debug')) {
-			F.isbundle = true;
+			F.isBundle = true;
 			F.dir(F.path.root('/.src/'));
 			callback();
 			return;
@@ -428,7 +428,7 @@ exports.extract = function(callback, skip) {
 			});
 		}, function() {
 			extract(function() {
-				F.isbundle = true;
+				F.isBundle = true;
 				F.dir(F.path.root('/.src/'));
 				callback();
 			});
@@ -436,21 +436,11 @@ exports.extract = function(callback, skip) {
 	};
 
 	try {
-
 		var files = F.Fs.readdirSync(bundles);
 		if (files.length)
 			extractbundles();
 		else
 			callback();
-
-		/*
-		if (F.$bundling) {
-			makebundle();
-			return;
-		} else {
-			F.isbundle = true;
-			F.dir(F.path.root('/.src/'));
-		}*/
 	} catch(e) {
 		callback();
 	}

package/cms.js

@@ -4,7 +4,7 @@
 
 'use strict';
 
-const SKIP_CLASSES = { CMS_hidden: 1, CMS_mv: 1, CMS_mh: 1, CMS_expression: 1, CMS_multiple: 1 };
+const SKIP_CLASSES = { CMS_hidden: 1, CMS_mv: 1, CMS_mh: 1, CMS_expression: 1, CMS_multiple: 1, CMS_keyword: 1, CMS_monospace: 1 };
 const VERSION = 1;
 
 function clean(html) {
@@ -22,12 +22,20 @@ function expressions_multiple(body) {
 	while (true) {
 
 		index = body.indexOf('CMS_multiple', index + 12);
-
 		if (index === -1)
 			break;
 
-		var b = body.lastIndexOf('<', index);
-		var tag = body.substring(b + 1, body.indexOf(' ', b));
+		var b = findstart(body, index);
+		if (b === -1)
+			break;
+
+		var end = body.indexOf(' ', b);
+		if (end === -1) {
+			index += 13;
+			continue;
+		}
+
+		var tag = body.substring(b + 1, end);
 
 		var e = body.indexOf('</' + tag + '>', index);
 		var size = e + 3 + tag.length;
@@ -53,6 +61,25 @@ function expressions_multiple(body) {
 	return arr;
 }
 
+function findstart(body, index) {
+
+	var notallowed = [';', '.', '>', ':', '\n', '\r', '\t'];
+
+	for (let i = index; i > -1; i--) {
+
+		let c = body[i];
+		if (c === '<')
+			return i;
+
+		if (notallowed.includes(c))
+			break;
+	}
+
+
+	return -1;
+
+}
+
 function expressions(body) {
 
 	var index = 0;
@@ -65,9 +92,17 @@ function expressions(body) {
 		if (index === -1)
 			break;
 
-		var b = body.lastIndexOf('<', index);
-		var tag = body.substring(b + 1, body.indexOf(' ', b));
+		var b = findstart(body, index);
+		if (b === -1)
+			break;
+
+		var end = body.indexOf(' ', b);
+		if (end === -1) {
+			index += 15;
+			continue;
+		}
 
+		var tag = body.substring(b + 1, end);
 		var e = body.indexOf('</' + tag + '>', index);
 		var size = e + 3 + tag.length;
 		var obj = {};
@@ -90,12 +125,27 @@ function trash(body) {
 
 			index = body.indexOf(t, index + t.length);
 
-			if (index === -1) {
+			if (index === -1)
+				break;
+
+			var b = findstart(body, index);
+			if (b === -1)
 				break;
+
+			var end = body.indexOf(' ', b);
+
+			if (end === -1) {
+				index += t.length + 1;
+				continue;
+			}
+
+			var tag = body.substring(b + 1, end);
+
+			if (tag.length > 10) {
+				index += tag.length;
+				continue;
 			}
 
-			var b = body.lastIndexOf('<', index);
-			var tag = body.substring(b + 1, body.indexOf(' ', b));
 			var e = body.indexOf('</' + tag + '>', index);
 			var size = e + 3 + tag.length;
 			body = body.replace(body.substring(b, size), '');
@@ -347,7 +397,7 @@ exports.compile = function(html, widgets, used) {
 		opt.id = id;
 		opt.indexer = indexer;
 		opt.body = tidy(clean(body));
-		opt.text = body.substring(body.lastIndexOf('~BEG~') + 5, body.lastIndexOf('~END~'));
+		opt.html = body.substring(body.lastIndexOf('~BEG~') + 5, body.lastIndexOf('~END~'));
 		opt.config = config || EMPTYOBJECT;
 		opt.render = widget.render;
 		opt.beg = opt.body.substring(0, opt.body.indexOf('>') + 1);
@@ -577,7 +627,7 @@ CMSRender.prototype._render = function(meta, layout, callback) {
 		}
 
 		render(opt, function(response, replace, cache) {
-			widgets[item.indexer] = replace === true ? response == null ? '' : (response + '').replace(/~(BEG|END)~/g, '') : (item.beg + (response || '') + item.end);
+			widgets[item.indexer] = replace === true ? (response == null || response == '' ? '' : (response + '').replace(/~(BEG|END)~/g, '')) : (item.beg + (response || '') + item.end);
 			if (cache)
 				self.cache[opt.cacheid] = widgets[item.indexer];
 			next();