total5 0.0.1-7 → 0.0.1-8

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 = [];
@@ -98,7 +99,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 +110,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;
 };
@@ -1154,7 +1155,7 @@ exports.newaction = function(name, obj) {
 			}
 		}
 
-		F.TMS.newpublish(name, tmsschema);
+		F.TTMS.newpublish(name, tmsschema);
 	}
 
 	F.makesourcemap && F.makesourcemap();
@@ -1277,7 +1278,6 @@ ActionCaller.prototype.exec = function() {
 	if (action.jsquery) {
 		self.error.prefix = 'query.';
 		response = action.jsquery.transform(query, false, self.error);
-		console.log(query, response, action);
 		self.error.prefix = '';
 		if (response.error) {
 			self.cancel();
@@ -1300,7 +1300,7 @@ ActionCaller.prototype.exec = function() {
 		$.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;
@@ -1436,6 +1436,15 @@ exports.action = function(name, payload, controller) {
 };
 
 exports.newschema = function(name, callback) {
+
+	if (name[0] === '@')
+		name = name.substring(1);
+
+	if (typeof(callback) === 'string') {
+		F.jsonschemas[name] = F.TUtils.jsonschema(callback, true);
+		return;
+	}
+
 	var $ = {};
 	$.name = name;
 	$.actions = {};
@@ -1445,6 +1454,262 @@ exports.newschema = function(name, callback) {
 	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];
+
+		if (!sessionid) {
+
+			if (opt.locale)
+				$.controller.language = opt.locale(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 (opt.locale)
+								$.controller.language = opt.locale(session.data, $.controller);
+							$.success(session.data);
+						}
+					} else {
+
+						if (opt.locale)
+							$.controller.language = opt.locale(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 (opt.locale)
+					$.controller.language = opt.locale(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/cms.js

@@ -577,7 +577,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();

package/controller.js

@@ -36,6 +36,7 @@ function Controller(req, res) {
 	ctrl.url = ctrl.uri.key;
 	ctrl.released = false;
 	ctrl.downloaded = false;
+	ctrl.protocol = req.connection.encrypted || (req.headers['x-forwarded-protocol'] || req.headers['x-forwarded-proto']) === 'https' ? 'https' : 'http';
 
 	for (let path of ctrl.split)
 		ctrl.split2.push(path.toLowerCase());
@@ -120,6 +121,10 @@ Controller.prototype = {
 		return this.headers['x-requested-with'] === 'XMLHttpRequest';
 	},
 
+	get extension() {
+		return this.ext;
+	},
+
 	get ua() {
 		if (this.$ua != null)
 			return this.$ua;
@@ -772,7 +777,7 @@ Controller.prototype.free = function() {
 
 Controller.prototype.hostname = function(path) {
 	var ctrl = this;
-	return ctrl.headers.host + ctrl.uri.pathname + (path ? path : '');
+	return ctrl.protocol + '://' + ctrl.headers.host + (path ? path : '');
 };
 
 Controller.prototype.$route = function() {
@@ -915,7 +920,7 @@ function multipart(ctrl) {
 	}
 
 	var boundary = type.substring(index + 9, end);
-	var parser = F.TUtils.multipartparser(boundary, ctrl, function(err, meta) {
+	var parser = F.TUtils.multipartparser(boundary, ctrl.req, function(err, meta) {
 
 		F.stats.performance.download += meta.size / 1024 / 1024;
 
@@ -957,13 +962,14 @@ function multipart(ctrl) {
 	});
 
 	parser.skipcheck = !F.config.$httpchecktypes;
-	parser.limits.total = ctrl.route.size;
+	parser.limits.total = ctrl.route.size * 1024; // to bytes
 }
 
 function authorize(ctrl) {
 	if (F.def.onAuthorize) {
 		var opt = new F.TBuilders.Options(ctrl);
 		opt.TYPE = 'auth'; // important
+		opt.query = ctrl.query;
 		opt.next = opt.callback;
 		opt.$callback = function(err, user) {
 			let auth = user ? 1 : 2;
@@ -992,6 +998,9 @@ function execute(ctrl) {
 		ctrl.params[param.name] = value;
 	}
 
+	if (!ctrl.language && F.def.onLocalize)
+		ctrl.language = F.def.onLocalize(ctrl);
+
 	if (ctrl.route.middleware.length) {
 		middleware(ctrl);
 	} else {
@@ -1029,6 +1038,10 @@ function execute(ctrl) {
 			if (ctrl.route.actions) {
 				F.action(ctrl.route.actions, ctrl.body, ctrl).autorespond();
 			} else {
+				if (ctrl.route.view) {
+					ctrl.view(ctrl.route.view);
+					return;
+				}
 				let action = ctrl.route.action;
 				if (!action)
 					action = auto_view;
@@ -1039,7 +1052,7 @@ function execute(ctrl) {
 }
 
 function auto_view(ctrl) {
-	ctrl.view(ctrl.split[0] || 'index', ctrl.body);
+	ctrl.view(ctrl.split[0] || 'index');
 }
 
 function send_html(ctrl, path) {
@@ -1063,6 +1076,9 @@ function send_html(ctrl, path) {
 			return;
 		}
 
+		if (!ctrl.language && F.def.onLocalize)
+			ctrl.language = F.def.onLocalize(ctrl);
+
 		output.body = F.translate(ctrl.language, output.body);
 
 		if (ctrl.response.minify && F.config.$minifyhtml)
@@ -1308,6 +1324,9 @@ function HttpFile(meta) {
 }
 
 HttpFile.prototype = {
+	get extension() {
+		return this.ext;
+	},
 	get isImage() {
 		return this.type.indexOf('image/') !== -1;
 	},

package/filestorage.js

@@ -94,14 +94,14 @@ FP.readjson = function(id, callback) {
 	});
 };
 
-FP.save = FP.insert = function(id, name, filename, callback, custom, expire, headers) {
+FP.save = FP.insert = function(id, name, filename, custom, callback, expire, headers) {
 	var self = this;
 
-	if (callback && typeof(callback) !== 'function') {
+	if (typeof(custom) === 'function') {
 		headers = expire;
-		expire = custom;
-		custom = callback;
-		callback = null;
+		expire = callback;
+		callback = custom;
+		custom = null;
 	}
 
 	if (callback)

package/flow-flowstream.js

@@ -945,7 +945,7 @@ function httprequest(self, opt, callback) {
 }
 
 function killprocess() {
-	console.error('Main process doesn\'t respond');
+	// console.error('Main process doesn\'t respond');
 	process.exit(1);
 }
 
@@ -3164,32 +3164,6 @@ TMS.refresh2 = function(fs) {
 	setTimeout2('tms_refresh_' + fs.name, fs => TMS.refresh(fs), 500, null, fs);
 };
 
-isFLOWSTREAMWORKER = W.workerData || process.argv.indexOf('--fork') !== -1;
-
-// Runs the worker
-if (W.workerData) {
-	F.dir(F.path.join(__dirname, '../'));
-	exports.init(W.workerData);
-}
-
-if (process.argv.includes('--fork')) {
-
-	process.once('message', function(msg) {
-		if (msg.TYPE === 'init') {
-			Parent = process;
-			if (!Parent.postMessage)
-				Parent.postMessage = process.send;
-			F.dir(process.argv[2]);
-			exports.init(msg.data);
-		}
-	});
-
-	F.on('error', function(obj) {
-		if (obj.error.indexOf('ERR_IPC_CHANNEL_CLOSED') !== -1)
-			process.exit(1);
-	});
-}
-
 function initrunning() {
 
 	if (isrunning)
@@ -3214,4 +3188,34 @@ function initrunning() {
 		}
 	});
 
+}
+
+if (process.argv[1].endsWith('flow-flowstream.js')) {
+
+	isFLOWSTREAMWORKER = W.workerData || process.argv.indexOf('--fork') !== -1;
+
+	// Runs the worker
+	if (W.workerData) {
+		F.dir(F.path.join(__dirname, '../'));
+		exports.init(W.workerData);
+	}
+
+	if (process.argv.includes('--fork')) {
+
+		process.once('message', function(msg) {
+			if (msg.TYPE === 'init') {
+				Parent = process;
+				if (!Parent.postMessage)
+					Parent.postMessage = process.send;
+				F.dir(process.argv[2]);
+				exports.init(msg.data);
+			}
+		});
+
+		F.on('error', function(obj) {
+			if (obj.error.indexOf('ERR_IPC_CHANNEL_CLOSED') !== -1)
+				process.exit(1);
+		});
+	}
+
 }

package/flow.js

@@ -8,7 +8,7 @@ const REG_BK = /-bk|_bk/i;
 var FS = exports;
 
 FS.module = require('./flow-flowstream');
-FS.version = 1;
+FS.version = 40;
 FS.db = {};
 FS.worker = false;
 FS.instances = {};

package/global.js

@@ -17,6 +17,7 @@ global.NPMINSTALL = F.npminstall;
 global.COMPONENTATOR = F.componentator;
 global.MERGE = F.merge;
 global.TOUCH = F.touch;
+global.LOCALIZE = F.localize;
 global.AUTH = F.auth;
 global.CLEANUP = F.cleanup;
 global.NEWDB = F.newdb;
@@ -27,12 +28,14 @@ global.SUCCESS = value => DEF.onSuccess(value);
 global.MEMORIZE = F.memorize;
 global.AUDIT = F.audit;
 global.TRANSLATE = F.translate;
+global.TRANSFORM = F.transform;
+global.NEWTRANSFORM = F.newtransform;
 global.DATA = new F.TQueryBuilder.Controller(true);
 global.DB = () => new F.TQueryBuilder.Controller();
 global.CACHE = F.cache;
 global.NEWACTION = F.TBuilders.newaction;
 global.NEWSCHEMA = F.TBuilders.newschema;
-global.ACTION = F.TBuilders.action;
+global.ACTION = global.EXEC = F.TBuilders.action;
 global.TEMPLATE = F.template;
 global.FILESTORAGE = F.filestorage;
 global.WEBSOCKETCLIENT = F.websocketclient;
@@ -51,6 +54,7 @@ global.MAIL = F.mail;
 global.Mail = F.TMail.Mailer;
 global.RESTBuilder = F.TBuilders.RESTBuilder;
 global.ErrorBuilder = F.TBuilders.ErrorBuilder;
+global.DOWNLOAD = F.download;
 
 global.BLOCKED = function($, limit, expire) {
 

package/index.js

@@ -223,6 +223,7 @@ global.DEF = {};
 	F.path.plugins = path => path ? F.path.$join(F.temporary.directories.plugins, path) : F.temporary.directories.plugins;
 	F.path.directory = (type, path) => path ? F.path.$join(F.temporary.directories[type], path) : F.temporary.directories[type];
 	F.path.tmp = F.path.temp = path => path ? F.path.$join(F.temporary.directories.tmp, path) : F.temporary.directories.tmp;
+	F.path.exists = (path, callback) => callback ? (F.Fs.lstat(path, (err, stats) => callback(err ? false : true, stats ? stats.size : 0, stats ? stats.isFile() : false))) : new Promise(resolve => F.path.exists(path, resolve));
 
 	F.path.$join = function(directory, path) {
 		var key = '$' + directory;
@@ -611,10 +612,10 @@ F.loadresource = function(name, value) {
 			if (response && (response instanceof Array || typeof(response) === 'object')) {
 				if (response instanceof Array) {
 					for (let item of response)
-						LOADRESOURCE(item.id || item.key || item.code || item.language, item.value || item.name || item.text || item.body);
+						F.loadresource(item.id || item.key || item.code || item.language, item.value || item.name || item.text || item.body);
 				} else {
 					for (let key in response)
-						LOADRESOURCE(key, response[key]);
+						F.loadresource(key, response[key]);
 				}
 			}
 
@@ -696,8 +697,15 @@ F.resource = function(language, key) {
 	return language === 'default' ? '' : F.resource('default', key);
 };
 
+F.localize = function(fn) {
+	F.def.onLocalize = fn;
+};
+
 F.auth = function(fn) {
-	F.def.onAuthorize = fn;
+	if (typeof(fn) === 'object')
+		F.TBuilders.builtinauth(fn);
+	else
+		F.def.onAuthorize = fn;
 };
 
 F.load = async function(types, callback) {
@@ -709,6 +717,8 @@ F.load = async function(types, callback) {
 	await F.TBundles.extract();
 	await F.clear(true);
 
+	process.send && process.send('total:ready');
+
 	if (typeof(types) === 'string')
 		types = types.split(',').trim();
 
@@ -851,7 +861,6 @@ F.load = async function(types, callback) {
 	F.stats.compiled = files.length;
 	F.isloaded = true;
 	DEBUG && F.TSourceMap.refresh();
-	process.send && process.send('total:ready');
 	callback && callback();
 
 	F.emit('ready');

package/jsonschema.js

@@ -312,7 +312,8 @@ function read_def(ref, definitions) {
 				return obj;
 			}
 		}
-	}
+	} else
+		return F.jsonschemas[ref];
 }
 
 function check_array(meta, error, value, stop, definitions, path) {
@@ -422,11 +423,12 @@ function check_array(meta, error, value, stop, definitions, path) {
 			if (meta.items.$ref) {
 				var ref = read_def(meta.items.$ref, definitions);
 				if (ref) {
-					var newerror = [];
-					tmp = transform(ref, newerror, val);
-					if (newerror.length) {
-						for (var err of newerror)
-							error.push2(ref.$$ID + '.' + err, path, i);
+					var newerror = new F.ErrorBuilder();
+					tmp = transform(ref, newerror, val, false, currentpath + '[' + i + ']');
+					if (newerror.items.length) {
+						for (var err of newerror.items) {
+							error.push2(err.name, err.path, i);
+						}
 					} else if (tmp != null && (!meta.uniqueItems || response.indexOf(tmp) === -1))
 						response.push(tmp);
 					continue;
@@ -574,6 +576,7 @@ function check_object(meta, error, value, response, stop, definitions, path) {
 				}
 				break;
 			case 'object':
+
 				if (prop.properties) {
 					tmp = check_object(prop, error, val, null, null, definitions, currentpath);
 					if (tmp != null) {
@@ -586,11 +589,12 @@ function check_object(meta, error, value, response, stop, definitions, path) {
 					if (prop.$ref) {
 						var ref = read_def(prop.$ref, definitions);
 						if (ref) {
-							var newerror = new ErrorBuilder();
-							tmp = transform(ref, newerror, val);
+							var newerror = new F.ErrorBuilder();
+							tmp = transform(ref, newerror, val, false, currentpath);
 							if (newerror.items.length) {
-								for (var err of newerror.items)
-									error.push(ref.$$ID + '.' + err, '@');
+								for (var err of newerror.items) {
+									error.push2(err.name, err.path);
+								}
 							} else
 								response[key] = tmp;
 							continue;

package/mail.js

@@ -225,10 +225,12 @@ Message.prototype.send2 = function(callback) {
 	Mailer.send(F.config.smtp, self, callback);
 };
 
-Message.prototype.send = function(smtp, options, callback) {
-	this.$callback2 = callback;
-	Mailer.send(smtp, options, this);
-	return this;
+Message.prototype.send = function(smtp, options, callback, cache) {
+	var self = this;
+	self.$callback2 = callback;
+	options.server = smtp;
+	Mailer.send(options, self, callback, cache);
+	return self;
 };
 
 Mailer.tls = function(obj, opt) {
@@ -396,12 +398,12 @@ function writeattachmentbytes(chunk) {
 	}
 }
 
-Mailer.try = function(smtp, options, callback) {
+Mailer.try = function(options, callback) {
 	var self = this;
 	if (callback)
-		return self.send(smtp, options, undefined, callback);
+		self.send(options, undefined, callback);
 	else
-		return new Promise((resolve, reject) => self.send(smtp, options, undefined, err => err ? reject(err) : resolve()));
+		return new Promise((resolve, reject) => self.send(options, undefined, err => err ? reject(err) : resolve()));
 };
 
 Mailer.send2 = function(messages, callback) {

package/nosql-builder.js

@@ -253,7 +253,7 @@ NoSQLQueryBuilder.prototype.sort = function(sort) {
 
 	if (self.$fields && self.$fields.length) {
 		// Internal hack
-		var meta = F.temporary.other['sort_' + sort];
+		var meta = F.temporary.utils['sort_' + sort];
 		for (var i = 0; i < meta.length; i++) {
 			var sort = meta[i];
 			if (!self.$fieldsall[sort.name]) {

package/nosql.js

@@ -93,6 +93,17 @@ NoSQL.prototype.find = function(builder) {
 	return builder;
 };
 
+NoSQL.prototype.update = function(builder) {
+	var self = this;
+	if (builder instanceof NoSQLQueryBuilder)
+		builder.db = self;
+	else
+		builder = new NoSQLQueryBuilder(self);
+	self.pending_update.push(builder);
+	setImmediate(next_operation, self, 2);
+	return builder;
+};
+
 NoSQL.prototype.find2 = function(builder) {
 	var self = this;
 	if (builder instanceof NoSQLQueryBuilder)

package/package.json

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

package/routing.js

@@ -149,13 +149,16 @@ function Route(url, action, size) {
 
 	t.priority = 100;
 	t.type = t.method === 'WEBSOCKET' || t.method === 'SOCKET' ? 'websocket' : t.method === 'FILE' ? 'file' : 'route';
+	t.partial = t.method === 'PATCH';
 
 	var endpoint = '';
 
 	if (t.method === 'API') {
 		t.method = 'POST';
-		url = url.replace(/(\*|\+|-)?[a-z0-9-_/{}]+/i, function(text) {
-			endpoint = text.trim().substring(1);
+		url = url.replace(/(\*|\+|-|%)?[a-z0-9-_/{}]+/i, function(text) {
+			let tmp = text.trim();
+			endpoint = tmp.substring(1);
+			t.partial = tmp[0] === '%';
 			return text;
 		});
 	}
@@ -199,9 +202,12 @@ function Route(url, action, size) {
 		parent = F.routes.routes.findItem('id', t.id);
 
 		var apiroute = { auth: t.auth, params: params, actions: t.actions.join(',') };
+
+		t.apiendpoint = arr[0];
 		if (parent) {
 			parent.api[arr[0]] = apiroute;
 			t.skip = true;
+			t.parent = parent;
 		} else {
 			if (!t.api)
 				t.api = {};
@@ -228,6 +234,11 @@ function Route(url, action, size) {
 	if (parent && parent.size < t.size)
 		parent.size = t.size;
 
+	if (typeof(t.action) === 'string') {
+		t.view = t.action;
+		t.action = null;
+	}
+
 	if (t.wildcard)
 		t.priority -= 50;
 }
@@ -261,10 +272,27 @@ Route.prototype.remove = function() {
 				F.routes.files.splice(index);
 			break;
 		default:
-			index = F.routes.routes.indexOf(self);
-			if (index !== -1)
-				F.routes.routes.splice(index);
-			delete F.routes.api[self.url.join('/')];
+			if (self.apiendpoint) {
+				if (self.parent) {
+					delete self.parent.api[self.apiendpoint];
+					if (Object.keys(self.parent.api).length == 0) {
+						index = F.routes.routes.indexOf(self.parent);
+						if (index !== -1)
+							F.routes.routes.splice(index);
+					}
+				} 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);
+					}
+				}
+			} else {
+				index = F.routes.routes.indexOf(self);
+				if (index !== -1)
+					F.routes.routes.splice(index, 1);
+			}
 			break;
 	}
 
@@ -405,7 +433,7 @@ function compareflags(ctrl, routes, auth) {
 		if (route.flags.xhr && !ctrl.xhr)
 			continue;
 
-		if (route.flags.upload && ctrl.datatype !== 'upload')
+		if (route.flags.upload && ctrl.datatype !== 'multipart')
 			continue;
 
 		if (route.flags.mobile && !ctrl.mobile)

package/utils.js

@@ -3958,6 +3958,12 @@ SP.base64ToBuffer = function() {
 	return Buffer.from(self.substring(index), 'base64');
 };
 
+SP.parseDataURI = function() {
+	var self = this;
+	var index = self.indexOf(';');
+	return index == -1 ? null : { type: self.substring(5, index), buffer: Buffer.from(self.substring(self.indexOf(',', index) + 1), 'base64') };
+};
+
 SP.base64ContentType = function() {
 	var self = this;
 	var index = self.indexOf(';');
@@ -5864,7 +5870,7 @@ exports.connect = function(opt, callback) {
 	meta.socket1.on('clientError', error);
 };
 
-String.prototype.toJSONSchema = function(name, url) {
+String.prototype.toJSONSchema = String.prototype.parseSchema = function(name, url) {
 
 	var obj = {};
 	var p = (url || CONF.url || 'https://schemas.totaljs.com/');
@@ -5906,7 +5912,8 @@ String.prototype.toJSONSchema = function(name, url) {
 			required.push(arr[0]);
 		}
 
-		var type = (arr[1] || 'string').toLowerCase().trim();
+		var type = (arr[1] || 'string').trim();
+		// var type = typename.toLowerCase().trim();
 		var size = 0;
 		var isarr = type[0] === '[';
 		if (isarr)
@@ -5960,20 +5967,11 @@ String.prototype.toJSONSchema = function(name, url) {
 				type = type.toLowerCase();
 
 		} else if (type[0] === '@') {
-
-			// other schema
-			var subname = type.substring(1);
-			var schema =  F.jsonschemas[subname];
-
-			if (schema)
-				nestedschema = schema;
-			else
-				throw new Error('Schema "' + subname + '" not found');
-
+			nestedschema = type.substring(1);
 			type = 'object';
 		}
 
-		switch (type) {
+		switch (type.toLowerCase()) {
 			case 'string':
 			case 'uid':
 			case 'guid':
@@ -6053,11 +6051,11 @@ String.prototype.toJSONSchema = function(name, url) {
 
 				if (isarr) {
 					tmp.type = 'array';
-					tmp.items = nestedschema || { type: 'object' };
-				} else if (nestedschema)
-					tmp = nestedschema;
-				else
+					tmp.items = { type: 'object', $ref: nestedschema };
+				} else {
 					tmp.type = 'object';
+					tmp.$ref = nestedschema;
+				}
 
 				break;
 			case 'enum':

package/viewengine.js

@@ -796,12 +796,12 @@ View.prototype.import = function() {
 				}
 
 				if (m.indexOf('+') === -1) {
-					let key = '/' + m;
+					let absolute = m[0] === '/';
+					let key = absolute ? m : ('/' + m);
 					if (REG_CHECKCSS.test(m)) {
-						tmp = '<link rel="stylesheet" href="/' + (F.routes.virtual[key] ? '' : 'css/') + m + '" />';
+						tmp = '<link rel="stylesheet" href="' + (absolute ? m : ('/' + (F.routes.virtual[key] ? '' : 'css/') + m)) + '" />';
 					} else {
-
-						tmp = '<scri' + 'pt src="/' + (F.routes.virtual[key] ? '' : 'js/') + m + '"></scr' + 'ipt>';
+						tmp = '<scri' + 'pt src="' + (absolute ? m : ('/' + (F.routes.virtual[key] ? '' : 'js/') + m)) + '"></scr' + 'ipt>';
 					}
 				} else {
 					let iscss = REG_CHECKCSS.test(m);

package/websocket.js

@@ -836,6 +836,7 @@ function authorize(ctrl) {
 	if (F.def.onAuthorize) {
 		var opt = new F.TBuilders.Options(ctrl);
 		opt.TYPE = 'auth'; // important
+		opt.query = ctrl.query;
 		opt.iswebsocket = true;
 		opt.next = opt.callback;
 		opt.$callback = function(err, user) {
@@ -960,8 +961,8 @@ function execute(ctrl) {
 		ctrl.params[param.name] = value;
 	}
 
-	if (F.def.onLocale)
-		ctrl.language = F.def.onLocale(ctrl);
+	if (F.def.onLocalize)
+		ctrl.language = F.def.onLocalize(ctrl);
 
 	if (ctrl.route.flags.binary)
 		ctrl.datatype = 'binary';

package/workers.js

@@ -49,7 +49,7 @@ function process_thread() {
 exports.createthread = function(name, data) {
 	if (!name)
 		return process_thread();
-	var filename = name === '~' ? name.substring(1) : F.path.root('workers/' + name + '.js');
+	var filename = name[0] === '~' ? name.substring(1) : F.path.root('workers/' + name + '.js');
 	var worker = new F.Worker.Worker(filename, { workerData: data, cwd: HEADER, argv: ['--worker'] });
 	worker.kill = worker.exit = () => worker.terminate();
 	return worker;
@@ -60,7 +60,7 @@ exports.createfork = function(name) {
 	if (!name)
 		return process_thread();
 
-	var filename = name === '~' ? name.substring(1) : F.path.root('workers/' + name + '.js');
+	var filename = name[0] === '~' ? name.substring(1) : F.path.root('workers/' + name + '.js');
 	var fork = new F.Child.fork(filename, { cwd: HEADER, argv: ['--worker'] });
 	fork.postMessage = fork.send;
 	fork.terminate = () => fork.kill('SIGTERM');