total5 0.0.1-1 → 0.0.1-3

package/builders.js

@@ -1121,7 +1121,7 @@ exports.newaction = function(name, obj) {
 
 	if (obj.route) {
 		if (obj.route.indexOf('-->') === -1)
-			obj.route = obj.route + '  ' + (obj.input ? '+' : '-') + obj.$url + '  *  -->  ' + name;
+			obj.route = obj.route + '  ' + (obj.input ? '+' : '-') + obj.$url + ' --> ' + name;
 		var flags = null;
 		if (obj.encrypt)
 			flags = '@encrypt';

package/controller.js

@@ -691,8 +691,7 @@ Controller.prototype.resume = function() {
 	if (ctrl.isfile) {
 
 		var path = ctrl.uri.key;
-
-		if (path[0] === '_') {
+		if (path[1] === '_') {
 
 			let tmp = path.substring(1);
 			let index = tmp.indexOf('/', 1);
@@ -701,7 +700,7 @@ Controller.prototype.resume = function() {
 				return;
 			}
 
-			path = F.path.plugins(tmp.substring(0, index) + '/public/' + tmp.substring(index + 2));
+			path = F.path.root('plugins/' + tmp.substring(1, index) + '/public/' + tmp.substring(index + 1));
 		} else
 			path = F.path.public(path.substring(1));
 

package/global.js

@@ -25,6 +25,7 @@ global.CRON = F.cron;
 global.UID = F.uid;
 global.MEMORIZE = F.memorize;
 global.AUDIT = F.audit;
+global.TRANSLATE = F.translate;
 global.DATA = new F.TQueryBuilder.Controller(true);
 global.DB = () => new F.TQueryBuilder.Controller();
 global.CACHE = F.cache;
@@ -102,6 +103,7 @@ global.REQUEST = F.TUtils.request;
 global.HASH = (val, type) => val.hash(type ? type : true);
 global.DIFFARR = F.TUtils.diffarr;
 global.CLONE = F.TUtils.clone;
+global.COPY = F.TUtils.copy;
 
 // TMS
 global.SUBSCRIBE = F.TTMS.subscribe;

package/index.js

@@ -808,6 +808,8 @@ F.load = async function(types, callback) {
 			case 'plugins':
 				tmp = require(file.filename);
 				F.plugins[file.id] = tmp;
+				if (!tmp.id)
+					tmp.id = file.id;
 				tmp.install && tmp.install();
 				break;
 
@@ -1259,7 +1261,7 @@ F.logger = function(enable) {
 };
 
 
-F.componentator = function(name, components, removeprev) {
+F.componentator = function(name, components, removeprev = true) {
 
 	var meta = {};
 
@@ -1584,10 +1586,8 @@ F.service = function(count) {
 	}
 
 	// Update expires date
-	if (count % 60 === 0) {
+	if (count % 60 === 0)
 		F.config.$httpexpire = NOW.add('y', 1).toUTCString();
-		F.TImages.clear();
-	}
 
 	if (count % F.config.$tmsclearblocked === 0)
 		F.temporary.tmsblocked = {};
@@ -2521,10 +2521,12 @@ function httptuningperformance(socket) {
 }
 
 process.on('unhandledRejection', function(e) {
-	F.error(e, '');
+	F.error(e.stack, '');
 });
 
+// process.on('uncaughtException', function(e) {
 process.on('uncaughtException', function(e) {
+
 	var err = e + '';
 	if (err.indexOf('listen EADDRINUSE') !== -1) {
 		process.send && process.send('total:eaddrinuse');
@@ -2533,7 +2535,7 @@ process.on('uncaughtException', function(e) {
 		return;
 	} else if (F.config.$filtererrors && REG_SKIPERRORS.test(err))
 		return;
-	F.error(e, '');
+	F.error(e.stack, '');
 });
 
 function ping() {
@@ -2653,6 +2655,9 @@ process.on('message', function(msg, h) {
 process.connected && setTimeout(() => process.send('total:init'), 100);
 
 require('./global');
-require('./Tangular');
+require('./tangular');
+
+// Init directories
+F.dir();
 
 module.exports = F;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "total5",
-  "version": "0.0.1-1",
+  "version": "0.0.1-3",
   "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;
 };
 
@@ -1093,146 +1092,6 @@ QBP.schema = function(value) {
 	return this;
 };
 
-QBP.autofill = function($, allowedfields, skipfilter, defsort, maxlimit) {
-
-	if (typeof(defsort) === 'number') {
-		maxlimit = defsort;
-		defsort = null;
-	}
-
-	var t = this;
-	var query = $.query || $.options;
-	var schema = $.schema;
-	var skipped;
-	var allowed;
-	var key;
-	var tmp;
-
-	if (skipfilter) {
-		key = 'NDB_' + skipfilter;
-		skipped = F.temporary.querybuilders[key];
-		if (!skipped) {
-			tmp = skipfilter.split(',').trim();
-			var obj = {};
-			for (var i = 0; i < tmp.length; i++)
-				obj[tmp[i]] = 1;
-			skipped = F.temporary.querybuilders[key] = obj;
-		}
-	}
-
-	if (allowedfields) {
-		key = 'NDB_' + allowedfields;
-		allowed = F.temporary.querybuilders[key];
-		if (!allowed) {
-			var obj = {};
-			var arr = [];
-			var filter = [];
-			tmp = allowedfields.split(',').trim();
-			for (var i = 0; i < tmp.length; i++) {
-				var k = tmp[i].split(':').trim();
-				obj[k[0]] = 1;
-				arr.push(k[0]);
-				k[1] && filter.push({ name: k[0], type: (k[1] || '').toLowerCase() });
-			}
-			allowed = F.temporary.querybuilders[key] = { keys: arr, meta: obj, filter: filter };
-		}
-	}
-
-	var fields = query.fields;
-	var fieldscount = 0;
-	var newfields = [];
-
-	if (fields) {
-		fields = fields.replace(REG_FIELDS_CLEANER, '').split(',');
-		for (var i = 0; i < fields.length; i++) {
-			var field = fields[i];
-			if (allowed && allowed.meta[field]) {
-				newfields.push(field);
-				fieldscount++;
-			} else if (schema.schema[field]) {
-				if (skipped && skipped[field])
-					continue;
-				newfields.push(field);
-				fieldscount++;
-			}
-		}
-	}
-
-	if (!fieldscount) {
-		if (allowed) {
-			for (var item of allowed.keys)
-				newfields.push(item);
-		}
-		if (schema.fields) {
-			for (var item of schema.fields) {
-				if (skipped && skipped[item])
-					continue;
-				newfields.push(item);
-			}
-		}
-	}
-
-	if (allowed && allowed.filter) {
-		for (var item of allowed.filter)
-			t.gridfilter(item.name, query, item.type);
-	}
-
-	if (schema.fields) {
-		for (var name of schema.fields) {
-			if ((!skipped || !skipped[name]) && query[name]) {
-				var field = schema.schema[name];
-				var type = String;
-				switch (field.type) {
-					case 2:
-						type = Number;
-						break;
-					case 4:
-						type = Boolean;
-						break;
-					case 5:
-						type = Date;
-						break;
-				}
-				t.gridfilter(name, query, type);
-			}
-		}
-	}
-
-	if (query.sort) {
-
-		var sort = query.sort.split(',');
-		var sortvalue = '';
-
-		for (var item of sort) {
-
-			var index = item.lastIndexOf('_');
-			var name = index > 1 ? item.substring(0, index) : item;
-
-			if (skipped && skipped[name])
-				continue;
-
-			if (allowed) {
-				if (!allowed.meta[name] && !schema.schema[name])
-					continue;
-			} else if (!schema.schema[name])
-				continue;
-
-			sortvalue += (sortvalue ? ',' : '') + item;
-		}
-
-		if (!sortvalue && defsort)
-			sortvalue = defsort;
-
-		if (sortvalue)
-			t.gridsort(sortvalue);
-
-	} else if (defsort)
-		t.gridsort(defsort);
-
-	t.paginate(query.page, query.limit, maxlimit || 50);
-	return t;
-};
-
 QBP.autoquery = function(query, schema, defsort, maxlimit) {
 
 	var t = this;

package/routing.js

@@ -1,4 +1,3 @@
-// Total.js Routing
 // The MIT License
 // Copyright 2023 (c) Peter Širka <petersirka@gmail.com>
 
@@ -140,6 +139,9 @@ function Route(url, action, size) {
 	if (index != -1)
 		t.url.splice(index, 1);
 
+	if (!t.url.length)
+		t.url[0] = '/';
+
 	url = url.replace(/<\d+[mb|gb|kb|b|m|s|h]+/gi, function(text) {
 		parseSizeTimeout(t, text.substring(1));
 		return '';

package/todo.txt

@@ -4,4 +4,8 @@
 - autoquery
 
 - CSRF tokeny
-- encryption/decryption
+- encryption/decryption
+
+---
+
+CHECK WINDOWS PLUGINS STATIC FILES

package/utils.js

@@ -88,6 +88,9 @@ exports.noop = function() {};
 
 exports.parseConfig = function(value) {
 
+	if (!value)
+		return {};
+
 	if (typeof(value) === 'string') {
 
 		var lines = value.split('\n');
@@ -126,6 +129,13 @@ exports.parseConfig = function(value) {
 		return exports.parseConfig(response);
 	}
 
+	if (!(value instanceof Array)) {
+		let tmp = [];
+		for (let key in value)
+			tmp.push({ id: key, value: value[key] });
+		value = tmp;
+	}
+
 	var cfg = {};
 	var generated = [];
 

package/viewengine.js

@@ -258,7 +258,7 @@ exports.compile = function(name, content, debug = true) {
 	if (!debug)
 		builder = builder.replace(/(\+\$EMPTY\+)/g, '+').replace(/(\$output=\$EMPTY\+)/g, '$output=').replace(/(\$output\+=\$EMPTY\+)/g, '$output+=').replace(/(\}\$output\+=\$EMPTY)/g, '}').replace(/(\{\$output\+=\$EMPTY;)/g, '{').replace(/(\+\$EMPTY\+)/g, '+').replace(/(>'\+'<)/g, '><').replace(/'\+'/g, '');
 
-	var fn = ('(function(self){var model=self.model;var ctrl=self.controller;var query=ctrl?.query || EMPTYOBJECT,repository=self.repository,controller=self.controller,files=ctrl?.files || EMPTYARRAY,user=ctrl?.user,session=ctrl?.session,body=ctrl?.body,language=ctrl?.language || \'\'' + (isCookie ? ',cookie=name=>ctrl?ctrl.cookie(name):\'\'' : '') + ';' + (nocompressHTML ? 'if(ctrl)ctrl.response.minify=false;' : '') + builder + ';return $output;})');
+	var fn = ('(function(self){var model=self.model;var config=F.config;var ctrl=self.controller;var query=ctrl?.query || EMPTYOBJECT,repository=self.repository,controller=self.controller,files=ctrl?.files || EMPTYARRAY,user=ctrl?.user,session=ctrl?.session,body=ctrl?.body,language=ctrl?.language || \'\'' + (isCookie ? ',cookie=name=>ctrl?ctrl.cookie(name):\'\'' : '') + ';' + (nocompressHTML ? 'if(ctrl)ctrl.response.minify=false;' : '') + builder + ';return $output;})');
 	try {
 		fn = eval(fn);
 	} catch (e) {
@@ -332,6 +332,7 @@ function prepare(command, dynamicCommand, functions) {
 			return '\'' + (r ? r.substring(0, r.length - 1) : r) + '\'';
 
 		case 'CONF':
+		case 'config':
 		case 'controller':
 		case 'FUNC':
 		case 'MAIN':