total5 0.0.13-9 → 0.0.13

package/builders.js

@@ -171,6 +171,7 @@ Options.prototype.publish = function(value) {
 		F.stats.performance.publish++;
 		F.TTMS.cache.socket.send({ type: 'publish', id: name, data: tmp }, client => client.tmsready && client.$subscribers[name]);
 	}
+
 	return self;
 };
 
@@ -1237,7 +1238,7 @@ exports.newaction = function(name, obj) {
 		name = obj.id || obj.name;
 	}
 
-	var url = name;
+	let url = name;
 
 	if (F.actions[name])
 		F.actions[name].remove();
@@ -1254,6 +1255,8 @@ exports.newaction = function(name, obj) {
 	obj.options.csrf = obj.csrf;
 	obj.options.encrypt = obj.encrypt;
 	obj.options.compress = obj.compress;
+	obj.audit = obj.audit === true ? NOOP : (obj.audit ? Tangular.compile(obj.audit) : null);
+	obj.called = 0;
 
 	if (obj.cache)
 		obj.cache = parseactioncache(obj, obj.cache);
@@ -1284,16 +1287,16 @@ exports.newaction = function(name, obj) {
 
 	if (obj.publish) {
 
-		var tmsschema = obj.publish == true ? (obj.input || obj.output) : obj.publish;
+		let tmsschema = obj.publish == true ? (obj.input || obj.output) : obj.publish;
 
 		if (typeof(tmsschema) === 'string') {
 			if (tmsschema[0] === '+')
 				tmsschema = (obj.input || obj.output) + ',' + tmsschema.substring(1);
 
-			var keys = tmsschema.split(',');
+			let keys = tmsschema.split(',');
 			obj.$publish = [];
-			for (var key of keys) {
-				var index = key.indexOf(':');
+			for (let key of keys) {
+				let index = key.indexOf(':');
 				obj.$publish.push(index === -1 ? key : key.substring(0, index));
 			}
 		}
@@ -1382,14 +1385,14 @@ ActionCaller.prototype.exec = function() {
 	$.id = action.id;
 	$.error = self.error;
 	$.controller = self.controller;
-	$.fields = action.fields;
 	$.user = self.options.user;
 	$.config = action.config || EMPTYOBJECT;
 
+	action.called++;
+
 	$.$callback = function(err, response) {
 
 		if (!err) {
-
 			if (action.jsoutput)
 				response = action.jsoutput.transform(response).response;
 
@@ -1406,11 +1409,17 @@ ActionCaller.prototype.exec = function() {
 			// close
 			self.cancel();
 		} else {
+
 			$.response[$.id] = response;
 			meta.response && self.finish && self.finish(response);
-			var key = '@' + $.id;
+
+			if (action.audit)
+				F.audit('actions', $, action.audit(null, $) || '');
+
+			let key = '@' + $.id;
 			if (F.$events[key])
 				F.emit(key, $, response);
+
 			self.exec();
 		}
 	};

package/changelog.txt

@@ -24,6 +24,20 @@
 - fixed a problem with case-sensitive characters in the route parameters
 - fixed markdown parser
 - added missing ViewEngine `@{meta(...)}` method
+- fixed `expires` argument in the `$.cookie(key, value, expires|options)` method
+- fixed HTMLParser for XML, added support for `<!CDATA[[`
+- added `outerHTML` property for the HTMLParser element
+- improved `HTMLParser.text()` method
+- added a new view engine property `@{version}` that appends `?ts=start_app_timestamp`
+- extended `@{import()}` method now supports `@style_name.css` and `@script_name.js` (due to HTTP cache reasons, it automatically appends the argument `?ts=start_app_timestamp` to the URL)
+- fixed loading extensions
+- fixed unit-tests for HTMLParser
+- added `Total.syslog(msg)` method for internal app logging
+- added auto audit logs to Actions in the form: `NEWACTION({ ... audit: 'Executed by {{ $.user.name }}' })`
+- added `called {Number}` property per action in the `F.actions` collection
+- fixed `CONF.$root` functionality
+- improved `F.backup()` by adding internal ignore list for `.DS_Store` and `.gitignore` files
+- fixed `CONF.$root` in proxies
 
 ========================
 0.0.12

package/controller.js

@@ -794,15 +794,15 @@ Controller.prototype.clear = function() {
 
 Controller.prototype.cookie = function(name, value, expires, options) {
 
-	var ctrl = this;
-	var arr;
+	let ctrl = this;
+	let arr;
 
 	if (value === undefined) {
 
 		if (ctrl.cookies)
 			return F.TUtils.decodeURIComponent(ctrl.cookies[name] || '');
 
-		var cookie = ctrl.headers.cookie;
+		let cookie = ctrl.headers.cookie;
 		if (!cookie) {
 			ctrl.cookies = F.EMPTYOBJECT;
 			return '';
@@ -821,11 +821,11 @@ Controller.prototype.cookie = function(name, value, expires, options) {
 		return name ? F.TUtils.decodeURIComponent(ctrl.cookies[name] || '') : '';
 	}
 
-	var cookiename = name + '=';
-	var builder = [cookiename + value];
-	var type = typeof(expires);
+	let cookiename = name + '=';
+	let builder = [cookiename + value];
+	let type = typeof(expires);
 
-	if (expires && type === 'object') {
+	if (expires && !(expires instanceof Date) && type === 'object') {
 		options = expires;
 		expires = options.expires || options.expire || null;
 	}
@@ -849,7 +849,7 @@ Controller.prototype.cookie = function(name, value, expires, options) {
 	if (options.httpOnly || options.httponly || options.HttpOnly)
 		builder.push('HttpOnly');
 
-	var same = options.security || options.samesite || F.config.$cookiesamesite;
+	let same = options.security || options.samesite || F.config.$cookiesamesite;
 
 	switch (same) {
 		case 1:
@@ -866,7 +866,7 @@ Controller.prototype.cookie = function(name, value, expires, options) {
 
 	// Cookie, already, can be in array, resulting in duplicate 'set-cookie' header
 	if (arr.length) {
-		var l = cookiename.length;
+		let l = cookiename.length;
 		for (let i = 0; i < arr.length; i++) {
 			if (arr[i].substring(0, l) === cookiename) {
 				arr.splice(i, 1);
@@ -896,6 +896,9 @@ Controller.prototype.resume = function() {
 	if (ctrl.isfile) {
 
 		var path = ctrl.uri.key;
+		if (CONF.$root)
+			path = path.substring(CONF.$root.length - 1);
+
 		if (path[1] === '_') {
 
 			let tmp = path.substring(1);

package/htmlparser.js

@@ -4,6 +4,8 @@
 
 'use strict';
 
+const BLOCK = { DIV: 1, P: 1, H1: 1, H2: 1, H3: 1, H4: 1, H5: 1, H6: 1, UL: 1, OL: 1, TABLE: 1, SECTION: 1, HEADER: 1, FOOTER: 1 };
+
 function HTMLElement() {
 	this.children = [];
 }
@@ -12,8 +14,11 @@ HTMLElement.prototype = {
 	get innerHTML() {
 		return this.toString();
 	},
+	get outerHTML() {
+		return this.toString(false, true);
+	},
 	get innerText() {
-		return this.toString().removeTags();
+		return this.text();
 	}
 };
 
@@ -154,7 +159,10 @@ function extendarr(output) {
 	};
 
 	output.text = function() {
-		return output.html().removeTags();
+		let builder = [];
+		for (let item of this)
+			builder.push(item.text());
+		return builder.join('\n');
 	};
 
 	return output;
@@ -430,11 +438,29 @@ HTMLElement.prototype.prepend = function(str) {
 	return dom;
 };
 
-HTMLElement.prototype.text = function() {
-	return this.html().removeTags().decode();
+HTMLElement.prototype.text = function(formatted) {
+	let self = this;
+	let builder = [];
+	let browse = function(children, newline) {
+		for (let item of children) {
+			switch (item.tagName) {
+				case 'TEXT':
+					if (builder.length)
+						builder.push(newline ? '\n' : '');
+					if (item.textContent)
+						builder.push(item.textContent.decode());
+					break;
+				default:
+					browse(item.children, self.xml ? true : BLOCK[item.tagName]);
+					break;
+			}
+		}
+	};
+	browse(self.children, 0);
+	return builder.join('');
 };
 
-HTMLElement.prototype.toString = HTMLElement.prototype.html = function(formatted) {
+HTMLElement.prototype.toString = function(formatted, outer) {
 
 	let self = this;
 	let builder = [];
@@ -457,7 +483,7 @@ HTMLElement.prototype.toString = HTMLElement.prototype.html = function(formatted
 			switch (item.tagName) {
 				case 'TEXT':
 					if (item.textContent)
-						builder.push(indent + item.textContent);
+						builder.push((item.cdata ? '<![CDATA[' : '') + indent + item.textContent + (item.cdata ? ']]>' : ''));
 					break;
 				default:
 					tag = item.raw;
@@ -475,10 +501,15 @@ HTMLElement.prototype.toString = HTMLElement.prototype.html = function(formatted
 		}
 	};
 
-	browse(self.tagName ? [self] : self.children, 0);
+	// browse(self.tagName ? [self] : self.children, 0);
+	browse(outer && self.tagName ? [self] : self.children, 0);
 	return builder.join(formatted ? '\n' : '');
 };
 
+HTMLElement.prototype.html = function(formatted = false) {
+	return this.toString(formatted, false);
+};
+
 function removeComments(html) {
 	let tagBeg = '<!--';
 	let tagEnd = '-->';
@@ -534,9 +565,16 @@ function parseHTML(html, trim, onerror, isxml) {
 		let beg = str.indexOf('<');
 		let end = -1;
 		let tmp;
-
-		if (beg !== -1)
-			end = str.indexOf('>', beg + 1);
+		let cdata = false;
+
+		if (beg !== -1) {
+			if (str.substring(beg, beg + 5) === '<![CD') {
+				// CDATA
+				cdata = true;
+				end = str.indexOf(']]>', beg + 6)
+			} else
+				end = str.indexOf('>', beg + 1);
+		}
 
 		if (beg === -1 || end === -1) {
 			if (parent) {
@@ -550,7 +588,6 @@ function parseHTML(html, trim, onerror, isxml) {
 
 		if (beg > 0) {
 			tmp = str.substring(0, beg);
-
 			if (trim)
 				tmp = tmp.trim();
 
@@ -558,20 +595,27 @@ function parseHTML(html, trim, onerror, isxml) {
 				parent.children.push(makeText(parent, tmp));
 		}
 
-		let node = str.substring(beg + 1, end);
+		let node = str.substring(beg + (cdata ? 9 : 1), end);
 		let dom = new HTMLElement();
 
 		dom.xml = isxml;
 
 		// Doctype or xml?
-		if (node[0] === '!' || node[0] === '?')
+		if (!cdata && (node[0] === '!' || node[0] === '?'))
 			return str.substring(end + 1);
 
-		if (node[node.length - 1] === '/') {
+		if (!cdata && node[node.length - 1] === '/') {
 			node = node.substring(0, node.length - 1);
 			dom.unpair = true;
 		}
 
+		if (cdata) {
+			let txt = makeText(dom, node);
+			txt.cdata = true;
+			parent.children.push(txt);
+			return str.substring(end + 3);
+		}
+
 		let tag = node;
 		let index = -1;
 

package/index.js

@@ -233,7 +233,6 @@ global.DEF = {};
 	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;
 		if (!F.temporary.path[key])
@@ -277,6 +276,10 @@ global.DEF = {};
 		} catch {}
 	};
 
+	F.virtualpath = function(path) {
+		return F.config.$root ? (F.config.$root + (path[0] === '/' ? path.substring(1) : path)) : path;
+	};
+
 })(global.F);
 
 function mailsendforce(message) {
@@ -536,8 +539,9 @@ function unlink(arr, callback) {
 
 F.loadconfig = function(value) {
 
-	var cfg = F.TUtils.parseConfig(value);
-	var smtp = null;
+	let cfg = F.TUtils.parseConfig(value);
+	let smtp = null;
+	let isapi = false;
 
 	for (let key in cfg) {
 
@@ -597,11 +601,20 @@ F.loadconfig = function(value) {
 				for (var m of tmp)
 					F.config.$httpfiles[m] = true;
 				continue;
+			case '$api':
+				F.config.$apibk = val || '';
+				break;
 		}
 
 		F.config[key] = cfg[key];
 	}
 
+	if (cfg.$root) {
+		if (!F.config.$apibk)
+			F.config.$apibk = F.config.$api;
+		F.config.$api = cfg.$root + F.config.$apibk.substring(1);
+	}
+
 	if (!F.config.secret_uid)
 		F.config.secret_uid = (F.config.name).crc32(true) + '';
 
@@ -830,11 +843,11 @@ F.load = async function(types, callback) {
 
 	files.sort(function(a) {
 
-		if (a.type === 'middleware')
-			return 1;
+		if (a.type === 'module')
+			return -1;
 
 		if (a.type === 'middleware')
-			return -1;
+			return 1;
 
 		return 0;
 	});
@@ -867,6 +880,7 @@ F.load = async function(types, callback) {
 			case 'controllers':
 			case 'schemas':
 			case 'actions':
+			case 'extensions':
 			case 'models':
 			case 'definitions':
 			case 'middleware':
@@ -1411,7 +1425,7 @@ F.componentator = function(name, components, removeprev = true, attrs = '') {
 	let relative = 'ui-' + (removeprev ? (nameid + '-') : '') + meta.components.makeid() + '.min.js';
 	let filename = F.path.public(relative);
 
-	F.repo[meta.name] = '/' + relative;
+	F.repo[meta.name] = (F.config.$root || '/') + relative;
 
 	if (removeprev) {
 		F.Fs.readdir(F.path.public(), function(err, files) {
@@ -1449,6 +1463,11 @@ F.componentator = function(name, components, removeprev = true, attrs = '') {
 
 };
 
+F.syslog = function(msg) {
+	NOW = new Date();
+	console.log('INFO ======= ' + (NOW.format('yyyy-MM-dd HH:mm:ss')) + ': ' + msg);
+};
+
 F.error = function(err, name, url) {
 
 	if (!arguments.length)
@@ -1504,7 +1523,7 @@ F.merge = function(url) {
 	if (url[0] !== '/')
 		url = '/' + url;
 
-	url = url.toLowerCase();
+	url = F.virtualpath(url.toLowerCase());
 
 	var ext = F.TUtils.getExtension(url);
 	var key = url.substring(1).replace(/\//g, '-').replace(/\.(js|html|css)$/, '') + '-min.' + ext;
@@ -2285,6 +2304,7 @@ F.backup = function(filename, files, callback, filter) {
 	var unlink = typeof(filename) === 'string' ? F.Fs.unlink : (filename, callback) => callback();
 	var concat = [];
 	var gzipoptions = { memLevel: 9 };
+	var ignorelist = ['.ds_store', '.gitignore', '.npmignore', '.git'];
 
 	unlink(filename, function() {
 
@@ -2322,6 +2342,15 @@ F.backup = function(filename, files, callback, filter) {
 
 		files.wait(function(item, next) {
 
+			let lowerfilename = item.toLowerCase();
+
+			for (let ignore of ignorelist) {
+				if (lowerfilename.includes(ignore)) {
+					next();
+					return;
+				}
+			}
+
 			var file = F.Path.join(path, item);
 
 			if (F.is)
@@ -2900,6 +2929,7 @@ process.on('message', function(msg, h) {
 	F.syshash = (__dirname + '-' + F.Os.hostname() + '-' + F.Os.platform() + '-' + F.Os.arch() + '-' + F.Os.release() + '-' + F.Os.tmpdir() + JSON.stringify(process.versions)).md5();
 	F.isLE = F.Os.endianness ? F.Os.endianness() === 'LE' : true;
 	F.isWindows = F.Os.platform().substring(0, 3).toLowerCase() === 'win';
+	F.stamp = Date.now().toString(36);
 
 	F.config.$total5 = F.Path.dirname(require.resolve('./index'));
 

package/package.json

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

package/routing.js

@@ -63,8 +63,13 @@ function Route(url, action, size) {
 		action = null;
 	}
 
+	let skiproot = false;
+
 	// Apply a default API endpoint
-	url = url.replace(/\?/g, F.config.$api).replace(/\/{2,}/g, '/');
+	if (url.includes('?')) {
+		skiproot = true;
+		url = url.replace(/\?/g, F.config.$api).replace(/\/{2,}/g, '/');
+	}
 
 	var t = this;
 
@@ -100,6 +105,9 @@ function Route(url, action, size) {
 		return;
 	}
 
+	if (!skiproot && t.url2 && CONF.$root)
+		t.url2 = CONF.$root + t.url2.substring(1);
+
 	t.url = exports.split(t.url2, true);
 	url = url.substring(index + 1);
 	t.id = t.method + '/' + t.url.join('/');
@@ -271,8 +279,18 @@ 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.view && !t.action && t.method !== 'FILE' && t.method !== 'SOCKET') {
+
+		let arr = t.url;
+
+		if (F.config.$root) {
+			arr = t.url.join('~').substring(F.config.$root.length - 1).split('~');
+			if (arr[0] == '')
+				arr[0] = '/';
+		}
+
+		t.view = arr[0] && arr[0] !== '/' ? arr[0] : 'index';
+	}
 
 	if (t.wildcard)
 		t.priority -= 50;
@@ -847,6 +865,9 @@ Proxy.prototype.remove = function() {
 
 exports.proxy = function(url, target) {
 
+	// Apply proxy
+	url = F.virtualpath(url);
+
 	if (!target) {
 		let index = F.routes.proxies.TfindIndex('url', url.toLowerCase());
 		if (index !== -1)

package/test.js

@@ -2,6 +2,9 @@
 // The MIT License
 // Copyright 2023 (c) Peter Širka <petersirka@gmail.com>
 
+if (!global.Total)
+	require('total5');
+
 var Test = { items: [], count: 0 };
 
 Test.start = function(message) {
@@ -44,7 +47,7 @@ Test.run = function(callback) {
 		if (callback)
 			callback();
 		else
-			process.exit(0);
+			setTimeout(() => process.exit(0), 2);
 	});
 };
 

package/viewengine.js

@@ -372,29 +372,24 @@ function prepare(command, dcommand, functions) {
 		case '!session':
 		case '!user':
 			return 'self.safehtml(' + command.substring(1) + ')';
-
 		case 'host':
 		case 'hostname':
 			return 'self.hostname';
-
 		case 'href':
 			return command.includes('(') ? ('self.' + command) : 'self.href()';
-
 		case 'url':
 			return 'self.' + command;
-
 		case 'title':
 		case 'description':
 		case 'keywords':
 		case 'author':
 			return command.includes('(') ? ('self.' + command) : '((repository[\'' + command + '\'] || \'\') + \'\').safehtml()';
-
 		case 'meta':
 			return command.includes('(') ? ('self.' + command) : ('self.' + command + '()');
-
 		case 'title2':
 			return 'self.' + command;
-
+		case 'version':
+			return '\'?ts=\'+F.' + command;
 		case '!title':
 		case '!description':
 		case '!keywords':
@@ -823,10 +818,10 @@ function makehtmlmeta(self) {
 
 View.prototype.import = function() {
 
-	var builder = '';
-	var self = this;
+	let builder = '';
+	let self = this;
 
-	for (var m of arguments) {
+	for (let m of arguments) {
 
 		switch (m) {
 			case 'meta':
@@ -841,7 +836,7 @@ View.prototype.import = function() {
 				let ext = m.substring(m.length - 3);
 				if (ext === 'ico')
 					ext = 'x-icon';
-				builder += '<link rel="icon" href="/' + m + '" type="image/' + ext + '" />';
+				builder += '<link rel="icon" href="' + F.virtualpath('/' + m) + '" type="image/' + ext + '" />';
 				break;
 			default:
 
@@ -853,22 +848,29 @@ View.prototype.import = function() {
 					continue;
 				}
 
-				if (!m.includes('+')) {
-					let absolute = m[0] === '/';
-					let key = absolute ? m : ('/' + m);
-					if (REG_CHECKCSS.test(m)) {
-						tmp = '<link rel="stylesheet" href="' + (absolute ? m : ('/' + (F.routes.virtual[key] ? '' : 'css/') + m)) + '" />';
-					} else {
-						tmp = '<scri' + 'pt src="' + (absolute ? m : ('/' + (F.routes.virtual[key] ? '' : 'js/') + m)) + '"></scr' + 'ipt>';
-					}
-				} else {
+				let version = '';
+
+				if (m[0] === '@') {
+					m = m.substring(1);
+					version = '?ts=' + F.stamp;
+				}
+
+				if (m.includes('+')) {
 					let iscss = REG_CHECKCSS.test(m);
 					let path = '/' + F.TUtils.random_string(10).toLowerCase() + '-min.' + (iscss ? 'css' : 'js');
 					F.merge(path, m);
 					if (iscss)
-						tmp = '<link rel="stylesheet" href="' + path + '" />';
+						tmp = '<link rel="stylesheet" href="' + F.virtualpath(path) + version + '" />';
 					else
-						tmp = '<scri' + 'pt src="' + path + '"></scr' + 'ipt>';
+						tmp = '<scri' + 'pt src="' + F.virtualpath(path) + version + '"></scr' + 'ipt>';
+				} else {
+					let absolute = m[0] === '/';
+					let key = absolute ? m : ('/' + m);
+					if (REG_CHECKCSS.test(m)) {
+						tmp = '<link rel="stylesheet" href="' + F.virtualpath(absolute ? m : ('/' + (F.routes.virtual[key] ? '' : 'css/') + m)) + version + '" />';
+					} else {
+						tmp = '<scri' + 'pt src="' + F.virtualpath(absolute ? m : ('/' + (F.routes.virtual[key] ? '' : 'js/') + m)) + version + '"></scr' + 'ipt>';
+					}
 				}
 
 				F.temporary.views[key] = tmp;