total5 0.0.1-9 → 0.0.2

package/routing.js

@@ -19,26 +19,38 @@ function parseSizeTimeout(route, value) {
 
 	switch (type) {
 		case 's':
-			route.timeout = number;
+			if (route.timeout < number)
+				route.timeout = number;
 			break;
 		case 'm':
-			route.timeout = number * 60;
+			number = number * 60;
+			if (route.timeout < number)
+				route.timeout = number;
 			break;
 		case 'h':
-			route.timeout = number * 60 * 60;
+			number = number * 60 * 60;
+			if (route.timeout < number)
+				route.timeout = number;
 			break;
 		case 'b':
-			route.size = number / 1024;
+			if (route.size < number)
+				route.size = number;
 			break;
 		case 'kb':
-			route.size = number;
+			number = number / 1024;
+			if (route.size < number)
+				route.size = number;
 			break;
 		case 'gb':
-			route.size = (number * 1024) * 1000;
+			number = (number * 1024 * 1024) * 1000;
+			if (route.size < number)
+				route.size = number;
 			break;
 		case 'mb':
 		default:
-			route.size = number * 1024;
+			number = number * 1024 * 1024;
+			if (route.size < number)
+				route.size = number;
 			break;
 	}
 }
@@ -51,17 +63,24 @@ function Route(url, action, size) {
 		action = null;
 	}
 
+	// Apply a default API endpoint
+	url = url.replace(/\?/g, F.config.$api).replace(/\/{2,}/g, '/');
+
 	var t = this;
 
 	if (url[0] === '#') {
 		// internal routing
-		t.url = [url[0].substring(1)];
+		t.url = [url.substring(1)];
 		t.action = action;
 		t.fallback = true;
-		F.routes.fallback[t.url[0]] = t;
+		F.routes.fallback[t.url] = t;
 		return;
 	}
 
+	t.timeout = 0;
+	t.size = 0;
+	t.flags = {};
+
 	var index = url.indexOf(' ');
 
 	t.method = url.substring(0, index).toUpperCase();
@@ -77,7 +96,7 @@ function Route(url, action, size) {
 	if (t.url2[0] === '@') {
 		// @TODO: missing WAPI implementation
 		t.skip = true;
-		console.log('This "{0}" kind of routes are not supported yet'.formaT(t.url2));
+		console.log('This "{0}" kind of routes are not supported yet'.format(t.url2));
 		return;
 	}
 
@@ -100,6 +119,7 @@ function Route(url, action, size) {
 	}
 
 	if (t.method === 'FILE') {
+
 		let types = t.url[t.url.length - 1];
 
 		// fixed filename
@@ -117,6 +137,7 @@ function Route(url, action, size) {
 			for (let type of types)
 				t.ext[type] = 1;
 		}
+
 	} else {
 		t.params = [];
 		index = 0;
@@ -130,7 +151,6 @@ function Route(url, action, size) {
 		t.size = size || 0;
 	}
 
-	t.flags = {};
 	t.middleware = [];
 
 	index = t.url.indexOf('*');
@@ -152,13 +172,16 @@ function Route(url, action, size) {
 	t.partial = t.method === 'PATCH';
 
 	var endpoint = '';
+	var isapi = false;
 
 	if (t.method === 'API') {
 		t.method = 'POST';
+		isapi = true;
 		t.id = t.id.replace(/^(\+|-)/, '');
 		url = url.replace(/(\*|\+|-|%)?[a-z0-9-_/{}]+/i, function(text) {
 			let tmp = text.trim();
-			endpoint = tmp.substring(1);
+			let c = tmp[0];
+			endpoint = c === '%' || c === '+' || c === '*' || c === '-' ? tmp.substring(1) : tmp;
 			t.partial = tmp[0] === '%';
 			return text;
 		});
@@ -185,8 +208,12 @@ 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;
 
@@ -202,9 +229,10 @@ function Route(url, action, size) {
 
 		parent = F.routes.routes.findItem('id', t.id);
 
-		var apiroute = { auth: t.auth, params: params, actions: t.actions.join(',') };
+		var apiroute = { auth: t.auth, params: params, actions: t.actions.join(','), action: action, timeout: t.timeout };
 
 		t.apiendpoint = arr[0];
+
 		if (parent) {
 			parent.api[arr[0]] = apiroute;
 			t.skip = true;
@@ -227,11 +255,11 @@ 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;
 		}
 	}
@@ -244,8 +272,12 @@ function Route(url, action, size) {
 		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) {
@@ -270,7 +302,7 @@ Route.prototype.remove = function() {
 				F.routes.websockets.splice(index);
 			for (let conn of self.connections)
 				conn.destroy();
-			break;
+			break;    
 		case 'file':
 			index = F.routes.files.indexOf(self);
 			if (index !== -1)
@@ -401,6 +433,10 @@ exports.sort = function() {
 
 		tmp = cache;
 		let key = route.url.join('/');
+
+		if (route.wildcard)
+			key += '/*';
+
 		if (cache[key])
 			cache[key].push(route);
 		else
@@ -482,8 +518,7 @@ exports.lookup = function(ctrl, auth = 0, skip = false) {
 
 	// 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)
@@ -575,11 +610,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;
@@ -609,10 +663,20 @@ exports.lookupfile = function(ctrl, auth = 0) {
 		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('/') + '/*';
+			let item = F.routes.filescache[url];
+			if (item)
+				return item[0];
+		}
 	}
 };
 
@@ -712,14 +776,31 @@ Proxy.prototype.copy = function(type) {
 
 	// @type {String} none|replace|extend
 
+	// "none":
+	// PROXY('/cl/', 'https://yourdomain.com');
+	// GET /cl/?q=search             --> https://yourdomain.com/?q=search');
+	// GET /cl/something/?q=search   --> https://yourdomain.com/?q=search');
+
+	// "replace":
+	// PROXY('/cl/', 'https://yourdomain.com');
+	// GET /cl/?q=search             --> https://yourdomain.com/');
+	// GET /cl/something/?q=search   --> https://yourdomain.com/something/');
+
+	// "extend":
+	// PROXY('/cl/', 'https://yourdomain.com');
+	// GET /cl/?q=search             --> https://yourdomain.com/?q=search');
+	// GET /cl/something/?q=search   --> https://yourdomain.com/something/?q=search');
+
 	var t = this;
 	if (type === 'replace' && t.target.pathname.length > 1)
 		type = 'extend';
+
 	t.copypath = type;
 	return t;
 };
 
 Proxy.prototype.after = function(callback) {
+	// callback(response)
 	var t = this;
 	t.$after = callback;
 	return t;
@@ -733,11 +814,13 @@ Proxy.prototype.timeout = function(timeout) {
 
 Proxy.prototype.check = function(callback) {
 	var t = this;
+	// callback(ctrl)
 	t.$check = callback;
 	return t;
 };
 
 Proxy.prototype.before = function(callback) {
+	// callback(uri, ctrl)
 	var t = this;
 	t.$before = callback;
 	return t;
@@ -753,7 +836,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;
@@ -769,7 +852,7 @@ exports.lookupproxy = function(ctrl) {
 		var u = ctrl.uri.key.substring(0, proxy.url.length);
 		if (u[u.length - 1] !== '/')
 			u += '/';
-		if (u === proxy.url && (!proxy.check || proxy.check(ctrl))) {
+		if (u === proxy.url && (!proxy.$check || proxy.$check(ctrl))) {
 			F.stats.response.proxy++;
 			proxycreate(proxy, ctrl);
 			return true;
@@ -807,19 +890,19 @@ function proxycreate(proxy, ctrl) {
 
 	var tmp;
 
-	uri.method = ctrl.method;
+	uri.method = ctrl.method === 'SOCKET' ? 'GET' : ctrl.method;
 	uri.headers = ctrl.headers;
 	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;
-		} else if (proxy.copypath === 'replace')
+			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') {
+		} else if (proxy.copypath === 'extend') {
 			tmp = ctrl.uri.pathname.substring(proxy.url.length) + (ctrl.uri.search ? ('?' + ctrl.uri.search) : '');
 			uri.path = proxy.path + (tmp ? ((tmp[0] === '/' ? '' : '/') + tmp) : '') + (proxy.query ? (ctrl.uri.search ? ('&' + proxy.query) : ('?' + proxy.query)) : '');
 		} else {
@@ -841,7 +924,7 @@ function proxycreate(proxy, ctrl) {
 
 	delete uri.headers.host;
 
-	proxy.before && proxy.before(uri, ctrl);
+	proxy.$before && proxy.$before(uri, ctrl);
 	F.stats.performance.external++;
 	F.stats.request.external++;
 
@@ -849,7 +932,7 @@ function proxycreate(proxy, ctrl) {
 	if (ctrl.res.headersSent || ctrl.destroyed)
 		return;
 
-	var get = uri.method === 'GET' || uri.method === 'HEAD' || uri.method === 'OPTIONS';
+	var get = (ctrl.method === 'GET' || ctrl.method === 'HEAD' || ctrl.method === 'OPTIONS');
 	var kind = secured ? F.Https : F.Http;
 	var request = get && !ctrl.iswebsocket ? kind.get(uri, proxycreatecallback) : kind.request(uri, proxycreatecallback);
 
@@ -938,7 +1021,7 @@ function proxycreatecallback(response) {
 		let ctrl = self.$controller;
 		ctrl.released = true;
 		ctrl.destroyed = true;
-		ctrl.$proxy.after && self.$proxy.after(response);
+		ctrl.$proxy.$after && self.$proxy.$after(response);
 		ctrl.res.writeHead && ctrl.res.writeHead(response.statusCode, response.headers);
 		response.pipe(ctrl.res, PROXY_OPTIONS);
 	}

package/sourcemap.js

@@ -64,9 +64,9 @@ exports.create = function() {
 		if (route.timeout)
 			m.timeout = route.timeout;
 
-		if (route.flags.upload) {
+		if (route.flags && route.flags.upload) {
 			m.upload = true;
-			m.limit = route.size / 1024;
+			m.limit = route.size;
 		}
 
 		if (route.api) {
@@ -86,6 +86,9 @@ exports.create = function() {
 					let action = F.actions[name];
 					if (action) {
 						tmp.input = action.input;
+						tmp.name = action.name;
+						tmp.summary = action.summary;
+						tmp.public = action.public;
 
 						if (tmp.input && tmp.input[0] === '@')
 							tmp.input = stringify(F.jsonschemas[tmp.input.substring(1)]);
@@ -152,7 +155,7 @@ exports.create = function() {
 
 exports.refresh = function() {
 
-	if (!F.isloaded || !F.config.$sourcemap || F.id)
+	if (!F.isLoaded || !F.config.$sourcemap || F.id)
 		return;
 
 	timeout && clearTimeout(timeout);

package/test.js

@@ -1,3 +1,7 @@
+// Total.js Tests
+// The MIT License
+// Copyright 2023 (c) Peter Širka <petersirka@gmail.com>
+
 var Test = { items: [], count: 0 };
 
 Test.start = function(message) {
@@ -7,7 +11,7 @@ Test.start = function(message) {
 		console.log('');
 
 	console.log(divider);
-	console.log('| ' + message.padRight(divider.length - 4) + ' |');
+	console.log('> ' + message.padRight(divider.length - 4) + ' <');
 	console.log(divider);
 };
 
@@ -37,7 +41,10 @@ Test.run = function(callback) {
 		console.log('Tests:', Test.count);
 		console.timeEnd('Time');
 		console.log('');
-		callback && callback();
+		if (callback)
+			callback();
+		else
+			process.exit(0);
 	});
 };
 

package/tms.js

@@ -115,7 +115,7 @@ exports.client = function(url, token, callback) {
 		token = undefined;
 	}
 
-	var client = new F.TWebSocket.WebSocketClient();
+	var client = F.TWebSocket.createclient();
 	var publishers = {};
 	var subscribers = {};
 	var callbacks = {};
@@ -211,7 +211,7 @@ exports.client = function(url, token, callback) {
 
 	client.subscribe = function(name, callback) {
 		timeout && clearTimeout(timeout);
-		timeout = setTimeout(sync_subscribers, 50, true);
+		timeout = setTimeout(sync_subscribers, 30, true);
 		if (subscribers[name])
 			subscribers[name].push(callback);
 		else
@@ -230,6 +230,7 @@ exports.client = function(url, token, callback) {
 			client.send({ type: 'subscribers', subscribers: keys });
 	};
 
+	return client;
 };
 
 function refresh(client) {
@@ -239,19 +240,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)
@@ -308,7 +305,7 @@ exports.newsubscribe = function(name, schema, callback) {
 	else
 		delete Cache.scache[name];
 
-	exports.subscribe(name, callback);
+	callback && exports.subscribe(name, callback);
 	exports.refresh();
 
 };
@@ -324,7 +321,7 @@ exports.subscribe = function(name, callback, client) {
 	if (client) {
 		var arr = Cache.swatchers[name];
 		if (arr) {
-			for (let fn of Cache.arr)
+			for (let fn of arr)
 				fn(callback, client);
 		}
 	} else {
@@ -371,7 +368,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/uibuilder.js

@@ -7,6 +7,13 @@ 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}
+	// opt.filesystem {Boolean} enables loading components from HDD (default: false)
+
 	if (!callback)
 		return new Promise((resolve, reject) => exports.compile(opt, (err, response) => err ? reject(err) : resolve(response)));
 
@@ -24,7 +31,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 +62,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 +88,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,14 +134,18 @@ 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;
 
-		let body = await Download(url.format(com.id));
+		if (url[0] === '/') {
+			url = origin + url;
+		} else
+			origin = parseorigin(url);
+
+		let body = await Download(url.format(com.id), opt.filesystem);
 
 		if (typeof(body) === 'string') {
 
@@ -132,13 +165,14 @@ 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);
+					let html = await Download(render, opt.filesystem);
 					if (html)
 						components[com.id] = 'base64 ' + Buffer.from(encodeURIComponent(html), 'utf8').toString('base64');
 				}
@@ -153,8 +187,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 = [];
 
@@ -167,7 +203,7 @@ async function getComponents2(list, origin) {
 		if (url[0] === '/')
 			url = origin + url;
 
-		let body = await Download(url.format(com.id));
+		let body = await Download(url.format(com.id), opt.filesystem);
 
 		if (typeof(body) === 'string') {
 
@@ -192,7 +228,7 @@ async function getComponents2(list, origin) {
 			} else {
 				if (render[0] === '/')
 					render = origin + render;
-				let html = await Download(render);
+				let html = await Download(render, opt.filesystem);
 				if (html)
 					components[com.id] = 'base64 ' + Buffer.from(encodeURIComponent(html), 'utf8').toString('base64');
 			}