total5 0.0.1-2 → 0.0.1-21

package/minificators.js

@@ -167,7 +167,7 @@ exports.js = function(value) {
 			}
 		}
 
-		if ((c === '}' && last === ';') || ((c === '}' || c === ']') && output[output.length - 1] === ' ' && alpha.test(output[output.length - 2])))
+		if (!scope && (c === '}' && last === ';') || ((c === '}' || c === ']') && output[output.length - 1] === ' ' && alpha.test(output[output.length - 2])))
 			output.pop();
 
 		output.push(c);

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/openclient.js

@@ -197,7 +197,7 @@ exports.create = function(url, id) {
 	opt.ws = F.openclients[url];
 
 	if (!opt.ws) {
-		opt.ws = require('./websocketclient').create();
+		opt.ws = F.websocketclient();
 		setImmediate(() => opt.ws.connect(url));
 		F.openclients[url] = opt.ws;
 		opt.ws.options.reconnectserver = true;

package/package.json

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

package/querybuilder.js

@@ -155,7 +155,7 @@ CTP.next = function(t) {
 
 CTP.callback = function($) {
 	var t = this;
-	t.$callback = typeof($) === 'function' ? $ : $.callback;
+	t.$callback = typeof($) === 'function' ? $ : $.callback();
 	return t;
 };
 
@@ -380,7 +380,6 @@ CTP.command = function(table, name) {
 };
 
 DBP.evaluate = function(err, response) {
-
 	var t = this;
 
 	if (t.options.first && response instanceof Array)
@@ -501,7 +500,7 @@ QBP.set = function(name) {
 
 QBP.callback = function($) {
 	var t = this;
-	t.main.callback = typeof($) === 'function' ? $ : $.callback;
+	t.main.callback = typeof($) === 'function' ? $ : $.callback();
 	return t;
 };
 

package/routing.js

@@ -28,17 +28,17 @@ function parseSizeTimeout(route, value) {
 			route.timeout = number * 60 * 60;
 			break;
 		case 'b':
-			route.size = number / 1024;
+			route.size = number;
 			break;
 		case 'kb':
-			route.size = number;
+			route.size = number / 1024;
 			break;
 		case 'gb':
-			route.size = (number * 1024) * 1000;
+			route.size = (number * 1024 * 1024) * 1000;
 			break;
 		case 'mb':
 		default:
-			route.size = number * 1024;
+			route.size = number * 1024 * 1024;
 			break;
 	}
 }
@@ -100,6 +100,7 @@ function Route(url, action, size) {
 	}
 
 	if (t.method === 'FILE') {
+
 		let types = t.url[t.url.length - 1];
 
 		// fixed filename
@@ -117,6 +118,7 @@ function Route(url, action, size) {
 			for (let type of types)
 				t.ext[type] = 1;
 		}
+
 	} else {
 		t.params = [];
 		index = 0;
@@ -149,13 +151,19 @@ 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 = '';
+	var isapi = false;
 
 	if (t.method === 'API') {
 		t.method = 'POST';
-		url = url.replace(/(\*|\+|-)?[a-z0-9-_/{}]+/i, function(text) {
-			endpoint = text.trim().substring(1);
+		isapi = true;
+		t.id = t.id.replace(/^(\+|-)/, '');
+		url = url.replace(/(\*|\+|-|%)?[a-z0-9-_/{}]+/i, function(text) {
+			let tmp = text.trim();
+			endpoint = tmp.substring(1);
+			t.partial = tmp[0] === '%';
 			return text;
 		});
 	}
@@ -181,8 +189,14 @@ function Route(url, action, size) {
 			t.actions.push(text.trim());
 			return '';
 		}).trim();
-	} else
-		t.actions = url.substring(0, index + 3).replace(/\s{2,}/g, ' ').split(/\s|,/);
+	} else {
+		if (isapi)
+			t.actions = [url.replace(/\+|-|%|#/g, '').trim()];
+		else
+			t.actions = url.substring(0, index + 3).replace(/\s{2,}/g, ' ').split(/\s|,/);
+	}
+
+	var parent = null;
 
 	if (endpoint) {
 
@@ -194,12 +208,15 @@ function Route(url, action, size) {
 			params.push({ index: i, name: param });
 		}
 
-		var route = F.routes.routes.findItem('id', t.id);
+		parent = F.routes.routes.findItem('id', t.id);
+
 		var apiroute = { auth: t.auth, params: params, actions: t.actions.join(',') };
 
-		if (route) {
-			route.api[arr[0]] = apiroute;
+		t.apiendpoint = arr[0];
+		if (parent) {
+			parent.api[arr[0]] = apiroute;
 			t.skip = true;
+			t.parent = parent;
 		} else {
 			if (!t.api)
 				t.api = {};
@@ -207,6 +224,10 @@ function Route(url, action, size) {
 		}
 
 		delete t.actions;
+
+		// Reset auth
+		t.auth = 0;
+
 	} else
 		t.actions = t.actions.join(',');
 
@@ -214,17 +235,29 @@ function Route(url, action, size) {
 	if (!t.size) {
 		switch (t.type) {
 			case 'websocket':
-				t.size = F.config.$wsmaxsize;
+				t.size = F.config.$wsmaxsize * 1024;
 				t.connections = [];
 				break;
 			case 'route':
-				t.size = F.config.$httpmaxsize;
+				t.size = F.config.$httpmaxsize * 1024;
 				break;
 		}
 	}
 
+	if (parent && parent.size < t.size)
+		parent.size = t.size;
+
+	if (typeof(t.action) === 'string') {
+		t.view = t.action;
+		t.action = null;
+	}
+
+	if (!t.view && !t.action && t.method !== 'FILE' && t.method !== 'SOCKET')
+		t.view = t.url[0] && t.url[0] !== '/' ? t.url[0] : 'index';
+
 	if (t.wildcard)
 		t.priority -= 50;
+
 }
 
 Route.prototype.compare = function(ctrl) {
@@ -256,10 +289,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;
 	}
 
@@ -363,6 +413,10 @@ exports.sort = function() {
 
 		tmp = cache;
 		let key = route.url.join('/');
+
+		if (route.wildcard)
+			key += '/*';
+
 		if (cache[key])
 			cache[key].push(route);
 		else
@@ -400,7 +454,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)
@@ -413,7 +467,7 @@ function compareflags(ctrl, routes, auth) {
 	}
 }
 
-exports.lookup = function(ctrl, auth, skip) {
+exports.lookup = function(ctrl, auth = 0, skip = false) {
 
 	// auth 0: does not matter
 	// auth 1: logged
@@ -444,8 +498,7 @@ exports.lookup = function(ctrl, auth, skip) {
 
 	// Dynamic routes
 	if (tmp.D && !(length === 1 && arr[0] === '/')) {
-		for (var i = 0; i < tmp.D.length; i++) {
-			var r = tmp.D[i];
+		for (let r of tmp.D) {
 			if (r.url.length === length || r.wildcard) {
 				if (r.compare(ctrl)) {
 					if (!routes)
@@ -537,11 +590,30 @@ exports.lookupcors = function(ctrl) {
 		return false;
 	}
 
-	var origin = ctrl.headers.origin;
+	let origin = ctrl.headers.origin;
 
-	if (!F.config.$cors || (F.config.$cors != '*' && F.config.$cors.indexOf(origin) == -1)) {
-		ctrl.system(400, 'Invalid origin (CORS)');
-		return false;
+	if (F.config.$cors !== '*' && !origin.endsWith(ctrl.headers.host)) {
+
+		let resume = false;
+		let cors = F.temporary.cors;
+
+		if (cors) {
+			if (cors.strict.length && cors.strict.includes(origin)) {
+				resume = true;
+			} else if (cors.wildcard.length) {
+				for (let m of cors.wildcard) {
+					if (origin.includes(m)) {
+						resume = true;
+						break;
+					}
+				}
+			}
+		}
+
+		if (!resume) {
+			ctrl.fallback(400, 'Invalid origin (CORS)');
+			return false;
+		}
 	}
 
 	ctrl.response.headers['access-control-allow-origin'] = origin;
@@ -560,7 +632,7 @@ exports.lookupcors = function(ctrl) {
 
 };
 
-exports.lookupfile = function(ctrl, auth) {
+exports.lookupfile = function(ctrl, auth = 0) {
 	if (F.routes.files.length) {
 
 		// fixed
@@ -571,14 +643,24 @@ exports.lookupfile = function(ctrl, auth) {
 		let key = '';
 		for (let i = 0; i < ctrl.split2.length - 1; i++)
 			key += (i ? '/' : '') + ctrl.split2[i];
-
 		let routes = F.routes.filescache[key];
 		if (routes)
 			return compareflags(ctrl, routes, auth);
+
+		// Wildcard
+		let length = ctrl.split2.length;
+		routes = [];
+
+		for (let i = 0; i < length; i++) {
+			let url = ctrl.split2.slice(0, length - i).join('/') + '/*';
+			item = F.routes.filescache[url];
+			if (item)
+				return item[0];
+		}
 	}
 };
 
-exports.lookupwebsocket = function(ctrl, auth, skip = false) {
+exports.lookupwebsocket = function(ctrl, auth = 0, skip = false) {
 
 	// auth 0: does not matter
 	// auth 1: logged
@@ -715,7 +797,7 @@ Proxy.prototype.remove = function() {
 exports.proxy = function(url, target) {
 
 	if (!target) {
-		let index = F.routes.proxies.findIndex('url', url.toLowerCase());
+		let index = F.routes.proxies.TfindIndex('url', url.toLowerCase());
 		if (index !== -1)
 			F.routes.proxies.splice(index, 1);
 		return;
@@ -774,11 +856,11 @@ function proxycreate(proxy, ctrl) {
 	ctrl.$proxy = proxy;
 
 	if (uri.socketPath) {
-		uri.path = proxy.copypath == 'none' || proxy.copypath === 'replace' ? ctrl.url.substring(proxy.url.length - 1) : ctrl.uri.pathname;
+		uri.path = (proxy.copypath == 'none' || proxy.copypath === 'replace' ? ctrl.url.substring(proxy.url.length - 1) : ctrl.uri.pathname) + (ctrl.uri.search ? ((proxy.uri.search && proxy.uri.search.length > 1 ? '&' : '?') + ctrl.uri.search) : '');
 	} else {
 
 		if (proxy.copypath === 'none') {
-			uri.path = proxy.uri.path;
+			uri.path = proxy.uri.path + (ctrl.uri.search ? ((proxy.uri.search && proxy.uri.search.length > 1 ? '&' : '?') + ctrl.uri.search) : '');
 		} else if (proxy.copypath === 'replace')
 			uri.path = ctrl.url.substring(proxy.url.length - 1);
 		else if (proxy.copypath === 'extend') {

package/sourcemap.js

@@ -66,7 +66,7 @@ exports.create = function() {
 
 		if (route.flags.upload) {
 			m.upload = true;
-			m.limit = route.size / 1024;
+			m.limit = route.size;
 		}
 
 		if (route.api) {

package/test.js

@@ -0,0 +1,48 @@
+// Total.js Tests
+// The MIT License
+// Copyright 2023 (c) Peter Širka <petersirka@gmail.com>
+
+var Test = { items: [], count: 0 };
+
+Test.start = function(message) {
+	var divider = '------------------------------------------------';
+
+	if (Test.count)
+		console.log('');
+
+	console.log(divider);
+	console.log('| ' + message.padRight(divider.length - 4) + ' |');
+	console.log(divider);
+};
+
+Test.print = function(message, err) {
+	console.log('[' + (err ? 'FAIL' : 'OK') + ']', message);
+	Test.count++;
+	if (err) {
+		setTimeout(() => process.exit(1), 1);
+		if (err instanceof Error)
+			throw err;
+		else
+			throw new Error(err.toString());
+	}
+};
+
+Test.push = function(name, fn) {
+	Test.items.push({ name: name, fn: fn });
+};
+
+Test.run = function(callback) {
+	console.time('Time');
+	Test.items.wait(function(item, next) {
+		Test.start(item.name);
+		item.fn(next);
+	}, function() {
+		console.log('');
+		console.log('Tests:', Test.count);
+		console.timeEnd('Time');
+		console.log('');
+		callback && callback();
+	});
+};
+
+global.Test = Test;

package/tms.js

@@ -8,7 +8,6 @@ var Cache = {
 	subscribers: {},
 	swatchers: {},    // watchers for subscribers
 	scache: {},       // cache for subscribers
-	publishers: {},
 	pcache: {},       // cache for publishers
 	calls: {},
 	socket: null,
@@ -46,7 +45,7 @@ function tmscontroller($) {
 		}
 
 		delete temporary.tmsblocked[client.ip];
-		Cache.publishers = {};
+		client.$subscribers = {};
 		client.tmsready = true;
 		refresh(client);
 	});
@@ -71,9 +70,9 @@ function tmscontroller($) {
 						F.TTMS.subscribe(msg.id, response, client);
 				}
 			} else if (msg.type === 'subscribers' && msg.subscribers instanceof Array) {
-				Cache.publishers = {};
-				for (var i = 0; i < msg.subscribers.length; i++)
-					Cache.publishers[msg.subscribers[i]] = 1;
+				client.$subscribers = {};
+				for (let sub of msg.subscribers)
+					client.$subscribers[sub] = true;
 			} else if (msg.type === 'call' && msg.id) {
 				var tmp = Cache.calls[msg.id];
 				if (tmp) {
@@ -240,19 +239,15 @@ function refresh(client) {
 		var subscribed = [];
 		var published = [];
 
-		for (let key in Cache.pcache) {
-			let schema = F.jsonschemas[Cache.pcache[key]];
-			published.push({ id: key, schema: schema });
-		}
+		for (let key in Cache.pcache)
+			published.push({ id: key, schema: Cache.pcache[key] });
 
-		for (let key in Cache.scache) {
-			let schema = F.jsonschemas[Cache.scache[key]];
-			subscribed.push({ id: key, schema: schema });
-		}
+		for (let key in Cache.scache)
+			subscribed.push({ id: key, schema: Cache.scache[key] });
 
 		var calls = [];
 		for (let key in Cache.calls)
-			calls.push({ id: key, schema: F.jsonschemas[Cache.calls[key].schema] });
+			calls.push({ id: key, schema: Cache.calls[key].schema });
 
 		var msg = { type: 'meta', name: F.config.name, subscribe: subscribed, publish: published, subscribers: Object.keys(Cache.subscribers), call: calls };
 		if (client)
@@ -315,9 +310,9 @@ exports.newsubscribe = function(name, schema, callback) {
 };
 
 exports.publish = function(name, value) {
-	if (Cache.socket && Cache.pcache[name] && Cache.publishers[name]) {
+	if (Cache.socket && Cache.pcache[name]) {
 		F.stats.performance.publish++;
-		Cache.socket.send({ type: 'publish', id: name, data: value }, client => client.tmsready);
+		Cache.socket.send({ type: 'publish', id: name, data: value }, client => client.tmsready && client.$subscribers[name]);
 	}
 };
 
@@ -361,7 +356,7 @@ exports.unsubscribe = function(name, callback) {
 	return false;
 };
 
-F.on('@tms', function() {
+F.on('$tms', function() {
 
 	var endpoint = F.config.$tmsurl;
 	var is = Cache.url !== endpoint;
@@ -372,7 +367,7 @@ F.on('@tms', function() {
 	}
 
 	if ((is && endpoint && F.config.$tms) || (endpoint && F.config.$tms && !Cache.route))
-		Cache.route = F.route('SOCKET ' + endpoint, tmscontroller, F.config.$tmsmaxsize);
+		Cache.route = F.route('SOCKET ' + endpoint, tmscontroller, F.config.$tmsmaxsize * 1024);
 
 	Cache.url = endpoint;
 

package/tmsclient.js

@@ -1,3 +1,7 @@
+// Total.js TMS Client
+// The MIT License
+// Copyright 2022-2023 (c) Peter Širka <petersirka@gmail.com>
+
 exports.create = function(url, token, callback) {
 
 	if (typeof(token) === 'function') {

package/uibuilder.js

@@ -7,6 +7,12 @@ const REG_STRING = /'|"/g;
 
 exports.compile = async function(opt, callback) {
 
+	// opt.schema {String/Object}
+	// |--- opt.schema.origin {String}
+	// opt.local {Boolean}
+	// opt.download {Boolean}
+	// opt.origin {String}
+
 	if (!callback)
 		return new Promise((resolve, reject) => exports.compile(opt, (err, response) => err ? reject(err) : resolve(response)));
 
@@ -24,7 +30,7 @@ exports.compile = async function(opt, callback) {
 	if (opt.local) {
 		response.components = used;
 	} else {
-		let components = await getComponents(schema, used, opt.download);
+		let components = await getComponents(opt, used);
 		response.components = components;
 	}
 
@@ -55,7 +61,7 @@ exports.download = async function(opt, callback) {
 		return new Promise((resolve, reject) => exports.download(opt, (err, response) => err ? reject(err) : resolve(response)));
 
 	try {
-		let response = await getComponents2(opt.components, opt.origin);
+		let response = await getComponents2(opt);
 		callback(null, response);
 	} catch (e) {
 		callback(e);
@@ -81,22 +87,44 @@ function getInstances(schema) {
 	return response;
 }
 
-async function Download(url) {
+async function Download(url, local = false) {
 	return new Promise(function(resolve) {
-		let opt = {};
-		opt.url = url;
-		opt.method = 'GET';
-		opt.keepalive = true;
-		opt.insecure = true;
-		opt.callback = function(err, response) {
-			resolve(response.status === 200 ? (response.body.isJSON() ? response.body.parseJSON(true) : response.body) : '');
-		};
-		REQUEST(opt);
+
+		if (local && url[0] === '~') {
+			// File on HDD (potential dangerous)
+			F.Fs.readFile(url.substring(1), 'utf8', function(err, response) {
+				resolve(err ? '' : (response.isJSON() ? response.parseJSON(true) : response));
+			});
+		} else {
+			let opt = {};
+			opt.url = url;
+			opt.method = 'GET';
+			opt.keepalive = true;
+			opt.insecure = true;
+			opt.callback = function(err, response) {
+				resolve(response.status === 200 ? (response.body.isJSON() ? response.body.parseJSON(true) : response.body) : '');
+			};
+			REQUEST(opt);
+		}
 	});
 }
 
-async function getComponents(schema, used, download) {
+function parseorigin(url) {
 
+	var origin = '';
+
+	if (url.charAt(0) !== '/') {
+		var index = url.indexOf('/', 9);
+		origin = index === -1 ? url : url.substring(0, index);
+	}
+
+	return origin;
+}
+
+async function getComponents(opt, used) {
+
+	var schema = opt.schema;
+	var download = opt.download;
 	var components = {};
 	var arr = [];
 
@@ -105,12 +133,16 @@ async function getComponents(schema, used, download) {
 
 	for (let com of arr) {
 
-		if (com.value.indexOf('.json') === -1 & !used[com.id])
+		if (com.value.indexOf('.json') === -1 && !used[com.id])
 			continue;
 
 		let url = com.value;
-		if (url[0] === '/')
-			url = schema.origin + url;
+		let origin = opt.origin || schema.origin;
+
+		if (url[0] === '/') {
+			url = origin + url;
+		} else
+			origin = parseorigin(url);
 
 		let body = await Download(url.format(com.id));
 
@@ -132,12 +164,13 @@ async function getComponents(schema, used, download) {
 
 			let render = body.substring(body.indexOf('=', index) + 1, index + end.index).trim().replace(REG_STRING, '').format(com.id);
 
+			if (render[0] === '/')
+				render = (origin || schema.origin || '') + render;
+
 			if (download) {
 				if (render.substring(0, 7) === 'base64 ') {
 					components[com.id] = render;
 				} else {
-					if (render[0] === '/')
-						render = schema.origin + render;
 					let html = await Download(render);
 					if (html)
 						components[com.id] = 'base64 ' + Buffer.from(encodeURIComponent(html), 'utf8').toString('base64');
@@ -153,8 +186,10 @@ async function getComponents(schema, used, download) {
 	return components;
 }
 
-async function getComponents2(list, origin) {
+async function getComponents2(opt) {
 
+	var list = opt.components;
+	var origin = opt.origin;
 	var components = {};
 	var arr = [];