total5 0.0.15 → 0.0.16-10

package/aimodel.js

@@ -0,0 +1,143 @@
+// AI
+// The MIT License
+// Copyright 2026 (c) Peter Širka <petersirka@gmail.com>
+
+function AI(model) {
+    const t = this;
+
+	t.options = {};
+	t.options.callback = NOOP;
+	t.config = {};
+
+	t.payload = {};
+	t.payload.model = model;
+	t.payload.messages = [];
+}
+
+// Enables think mode
+AI.prototype.think = function () {
+	const t = this;
+	t.payload.think = true;
+	return t;
+};
+
+// Internal function
+// Appends content message
+AI.prototype.message = function(role, content, merge) {
+
+	const t = this;
+
+	if (merge) {
+		for (let m of t.payload.messages) {
+			if (m.role === role) {
+
+				if (typeof(content) === 'object') {
+					for (let key in content)
+						m[key] = content[key];
+				} else
+					m.content += merge + content;
+
+				return this;
+			}
+		}
+	}
+
+	const msg = { role: role };
+
+	if (typeof(content) === 'object') {
+		for (let key in content)
+			msg[key] = content[key];
+	} else
+		msg.content = content;
+
+	t.payload.messages.push(msg);
+	return t;
+};
+
+AI.prototype.configure = function(opt) {
+	const t = this;
+	for (let key in opt)
+		t.config[key] = opt[key];
+	return t;
+};
+
+AI.prototype.system = function(content, merge) {
+	return this.message('system', content, merge);
+};
+
+AI.prototype.user = function(content, merge) {
+	return this.message('user', content, merge);
+};
+
+AI.prototype.prompt = function(content) {
+	this.payload.prompt = content;
+	return this;
+};
+
+AI.prototype.assistant = function(content, merge) {
+	return this.message('assistant', content, merge);
+};
+
+AI.prototype.promise = function($) {
+	const t = this;
+	return new Promise(function(resolve, reject) {
+		t.callback(function(err, response) {
+			if (err) {
+				if ($ && $.invalid)
+					$.invalid(err);
+				else
+					reject(F.TUtils.toError(err));
+			} else
+				resolve(response);
+		});
+	});
+};
+
+AI.prototype.stream = function(fn) {
+	const t = this;
+	t.options.stream = fn;
+	t.options.$running && clearImmediate(t.options.$running);
+	t.options.$running = setImmediate(() => t.run());
+	return t;
+};
+
+AI.prototype.callback = function(fn) {
+	const t = this;
+	t.options.callback = fn;
+	t.options.$running && clearImmediate(t.options.$running);
+	t.options.$running = setImmediate(() => t.run());
+	return t;
+};
+
+// Internal function
+AI.prototype.run = function() {
+	const t = this;
+	let ai = F.aimodels[t.payload.model];
+	if (ai) {
+		if (ai.config) {
+			for (let key in ai.config) {
+				if (t.config[key] === undefined)
+					t.config[key] = ai.config[key];
+			}
+		}
+		ai.callback(t, t.options.callback);
+	} else
+		t.options.callback('AI model not found.');
+	return t;
+};
+
+exports.exec = function(model) {
+	return new AI(model);
+};
+
+exports.newai = function(model, config, callback) {
+
+	if (typeof(config) === 'function') {
+		callback = config;
+		config = null;
+	}
+
+	const models = model.split(/,/).trim();
+	for (const m of models)
+		F.aimodels[m] = { config, callback };
+};

package/api.js

@@ -10,17 +10,29 @@ const REG_TEXT = /^text\/(html|plain|xml)/;
 var cache = {};
 
 // Registers a new API type
-exports.newapi = function(type, callback) {
+exports.newapi = function(type, config, callback) {
 
-	if (typeof(type) === 'function') {
+	let t = typeof(type);
+
+	if (t === 'function') {
 		callback = type;
 		type = 'default';
+		config = null;
+	} else if (t === 'object') {
+		callback = config;
+		config = type;
+		type = 'default';
+	}
+
+	if (typeof(config) === 'function') {
+		callback = config;
+		config = null;
 	}
 
 	if (type.indexOf(',') !== -1) {
 		var arr = type.split(',').trim();
 		for (var m of arr)
-			exports.newapi(m, callback);
+			exports.newapi(m, config, callback);
 		return;
 	}
 
@@ -30,15 +42,17 @@ exports.newapi = function(type, callback) {
 	cache[lower] = lower;
 
 	if (callback)
-		F.apiservices[lower] = callback;
+		F.apiservices[lower] = { config, callback };
 	else
 		delete F.apiservices[lower];
 
 };
 
 function APIOptions(api) {
-	this.api = api;
-	this.retries = 0;
+	const t = this;
+	t.api = api;
+	t.retries = 0;
+	t.config = {};
 }
 
 APIOptions.prototype.retry = function() {
@@ -58,8 +72,8 @@ APICallProto.output = function(type) {
 };
 
 APICallProto.promise = function($) {
-	var t = this;
-	var promise = new Promise(function(resolve, reject) {
+	const t = this;
+	const promise = new Promise(function(resolve, reject) {
 		t.$callback = function(err, response) {
 			if (err) {
 				if ($ && $.invalid) {
@@ -75,7 +89,7 @@ APICallProto.promise = function($) {
 };
 
 APICallProto.audit = function($, message, type) {
-	var t = this;
+	const t = this;
 	t.$audit = function() {
 		// Dynamic arguments
 		if (message)
@@ -85,8 +99,15 @@ APICallProto.audit = function($, message, type) {
 	return t;
 };
 
+APICallProto.configure = function(opt) {
+	const t = this;
+	for (let key in opt)
+		t.options.config[key] = opt[key];
+	return t;
+};
+
 APICallProto.done = function($, callback) {
-	var t = this;
+	const t = this;
 	t.$callback = function(err, response) {
 		if (err)
 			$.invalid(err);
@@ -119,12 +140,12 @@ APICallProto.controller = function($) {
 
 APICallProto.file = function(filename, path, name) {
 
-	var t = this;
+	const t = this;
 
 	if (!t.options.files)
 		t.options.files = [];
 
-	var obj = { name: name || ('file' + t.options.files.length), filename: filename, path: path };
+	const obj = { name: name || ('file' + t.options.files.length), filename: filename, path: path };
 
 	if (t.options.files)
 		t.options.files.push(obj);
@@ -140,15 +161,20 @@ APICallProto.error = APICallProto.err = function(err, reverse) {
 	return this;
 };
 
+APICallProto.logerror = function() {
+	this.$loggerror = true;
+	return this;
+};
+
 APICallProto.callback = APICallProto.pipe = function($) {
-	var t = this;
+	const t = this;
 	t.$callback = typeof($) === 'function' ? $ : $.callback();
 	return t;
 };
 
 APICallProto.evaluate = function(err, response) {
 
-	var t = this;
+	const t = this;
 	if (!err && t.$error) {
 		if (t.$error_reverse) {
 			if (response)
@@ -161,6 +187,9 @@ APICallProto.evaluate = function(err, response) {
 			err = t.$error;
 	}
 
+	if (t.$logerror)
+		F.error(err, 'API: ' + t.options.name + ' --> ' + t.options.schema);
+
 	if (err) {
 		t.$callback_fail && t.$callback_fail(err);
 	} else {
@@ -176,16 +205,24 @@ APICallProto.evaluate = function(err, response) {
 };
 
 function execapi(api) {
-	var conn = F.apiservices[cache[api.options.name]] || F.apiservices['*'];
-	if (conn)
-		conn.call(api, api.options, (err, response) => api.evaluate(err, response));
-	else
+	const conn = F.apiservices[cache[api.options.name]] || F.apiservices['*'];
+	if (conn) {
+
+		if (conn.config) {
+			for (let key in conn.config) {
+				if (api.options.config[key] === undefined)
+					api.options.config[key] = conn.config[key];
+			}
+		}
+
+		conn.callback.call(api, api.options, (err, response) => api.evaluate(err, response));
+	} else
 		api.evaluate('API is not initialized');
 }
 
 // Executes API
 exports.exec = function(name, schema, data, $) {
-	var api = new APICall();
+	const api = new APICall();
 	api.options.name = cache[name] || name;
 	api.options.schema = schema;
 	api.options.data = data;
@@ -204,7 +241,7 @@ exports.newapi('TotalAPI,TAPI', function(opt, next) {
 	if (opt.data && typeof(opt.data) !== 'object')
 		opt.data = { value: opt.data };
 
-	var req = {};
+	const req = {};
 
 	req.method = 'POST';
 	req.url = 'https://' + F.config.$tapiurl + '.api.totaljs.com/' + opt.schema + '/';
@@ -218,7 +255,7 @@ exports.newapi('TotalAPI,TAPI', function(opt, next) {
 	req.type = 'json';
 	req.timeout = 60000;
 	req.keepalive = true;
-	req.headers = { 'x-token': opt.token || F.config.totalapi || F.config.secret_totalapi || F.config.$tapisecret || '-', 'x-app': encodeURIComponent(F.config.name) };
+	req.headers = { 'x-token': opt.token || opt.config.token || F.config.totalapi || F.config.secret_totalapi || F.config.$tapisecret || '-', 'x-app': encodeURIComponent(F.config.name) };
 	req.custom = true;
 
 	req.callback = function(err, response) {
@@ -228,7 +265,7 @@ exports.newapi('TotalAPI,TAPI', function(opt, next) {
 			return;
 		}
 
-		var buffer = [];
+		const buffer = [];
 
 		// Error
 		if (response.status > 200) {
@@ -248,7 +285,8 @@ exports.newapi('TotalAPI,TAPI', function(opt, next) {
 				if (opt.output === 'base64') {
 					output = output.toString('base64');
 				} else if (opt.output !== 'binary' && opt.output !== 'buffer') {
-					var type = response.headers['content-type'];
+
+					const type = response.headers['content-type'];
 
 					if (REG_BINARY.test(type)) {
 						next(null, output);
@@ -284,20 +322,20 @@ exports.newapi('TotalAPI,TAPI', function(opt, next) {
 			}
 
 			var type = (response.headers['content-type'] || '').toLowerCase();
-			var index = type.lastIndexOf(';');
+			const index = type.lastIndexOf(';');
 			if (index !== -1)
 				type = type.substring(0, index);
 
-			var ext = type ? F.TUtils.getExtensionFromContentType(type) : 'bin';
-			var id = fsdata[1] || UID();
-			var filename = fsdata[2] || id + '.' + ext;
+			const ext = type ? F.TUtils.getExtensionFromContentType(type) : 'bin';
+			const id = fsdata[1] || UID();
+			const filename = fsdata[2] || id + '.' + ext;
 
 			response.stream.pause();
 			fs.save(id, filename, response.stream, next);
 			return;
 		}
 
-		var writer = F.Fs.createWriteStream(opt.output);
+		const writer = F.Fs.createWriteStream(opt.output);
 		response.stream.pipe(writer);
 		F.cleanup(writer, () => opt.next(null, opt.output));
 	};

package/builders.js

@@ -1,6 +1,6 @@
 // Total.js Builders
 // The MIT License
-// Copyright 2023 (c) Peter Širka <petersirka@gmail.com>
+// Copyright 2023-2026 (c) Peter Širka <petersirka@gmail.com>
 
 'use strict';
 
@@ -153,7 +153,13 @@ Options.prototype.promisify = function(fn, a, b, c) {
 	});
 };
 
-Options.prototype.status = function() {};
+Options.prototype.status = function(a, b, c, d) {
+	this.status2?.call(this, a, b, c, d);
+};
+
+Options.prototype.progress = function(a, b, c, d) {
+	this.progress2?.call(this, a, b, c, d);
+};
 
 Options.prototype.publish = function(value) {
 	var self = this;
@@ -241,7 +247,7 @@ Options.prototype.successful = function(callback) {
 	};
 };
 
-Options.prototype.callback = Options.prototype.pipe = function(value) {
+Options.prototype.callback = Options.prototype.output = Options.prototype.pipe = function(value) {
 
 	var self = this;
 
@@ -252,7 +258,7 @@ Options.prototype.callback = Options.prototype.pipe = function(value) {
 		};
 	}
 
-	self.$callback(self.error.items.length ? self.error : null, value);
+	self.$callback.call(self, self.error.items.length ? self.error : null, value);
 };
 
 Options.prototype.done = function(arg) {
@@ -382,9 +388,10 @@ ErrorBuilder.prototype.push = function(err, path, index) {
 	return self;
 };
 
-ErrorBuilder.prototype.push2 = function(name, path, index) {
+ErrorBuilder.prototype.push2 = function(name, path, index, error) {
 	let self = this;
-	self.items.push({ name: self.prefix + name, error: '@', path: path, index: index });
+
+	self.items.push({ name: self.prefix + name, error: error || '@', path: path, index: index });
 
 	if (self.$throw) {
 		let errors = self.output();
@@ -563,7 +570,12 @@ RESTP.insecure = function() {
 };
 
 RESTP.error = function(err) {
-	this.$errorhandler = err;
+	this.$errormessage = err;
+	return this;
+};
+
+RESTP.logerror = function() {
+	this.$loggerror = true;
 	return this;
 };
 
@@ -904,7 +916,7 @@ RESTP.exec = function(callback) {
 	if (!callback)
 		callback = NOOP;
 
-	var self = this;
+	let self = this;
 
 	if (self.operation) {
 
@@ -939,15 +951,15 @@ RESTP.exec = function(callback) {
 	self.$callback = callback;
 
 	if (restbuilderupgrades.length) {
-		for (var i = 0; i < restbuilderupgrades.length; i++)
+		for (let i = 0; i < restbuilderupgrades.length; i++)
 			restbuilderupgrades[i](self);
 	}
 
-	var key;
+	let key;
 
 	if (self.$expire && !self.$nocache) {
 		key = 'restbuilder' + ((self.options.url || '') + (self.options.socketpath || '') + (self.options.path || '') + (self.options.body || '')).hash(true);
-		var data = F.cache.read(key);
+		let data = F.cache.read(key);
 		if (data) {
 			data = data.value;
 			if (self.$resolve) {
@@ -1053,7 +1065,7 @@ function restbuilder_callback(err, response) {
 		if (val instanceof Array && val.length && val[0] && val[0].error)
 			err = ErrorBuilder.assign(val);
 		else
-			err = null;
+			err = (new ErrorBuilder()).push2(output.status, undefined, undefined, response.body);
 	}
 
 	if (!err && key)
@@ -1079,6 +1091,12 @@ function restbuilder_callback(err, response) {
 			val = jsresponse.response;
 	}
 
+	if (err && self.$loggerror)
+		F.error(new Error(response.body || err.toString()), 'RESTBuilder', self.options.method + ' ' + (self.options.url || self.options.path));
+
+	if (self.$errormessage && err)
+		err = self.$errormessage;
+
 	if (self.$resolve) {
 
 		if (err) {
@@ -1336,6 +1354,11 @@ ActionCaller.prototype.status = function(fn) {
 	return this;
 };
 
+ActionCaller.prototype.progress = function(fn) {
+	this.options.progress = fn;
+	return this;
+};
+
 ActionCaller.prototype.exec = function() {
 
 	let self = this;
@@ -1382,6 +1405,8 @@ ActionCaller.prototype.exec = function() {
 	let type = meta.payload || (action.input ? '+' : '-');
 	let $ = self.$;
 
+	$.$end = false;
+	$.name = action.name;
 	$.id = action.id;
 	$.error = self.error;
 	$.controller = self.controller;
@@ -1392,9 +1417,19 @@ ActionCaller.prototype.exec = function() {
 
 	$.$callback = function(err, response) {
 
+		if ($.$end)
+			return;
+
+		$.$end = true;
+
+		if ($.$timeout) {
+			clearTimeout($.$timeout);
+			$.$timeout = null;
+		}
+
 		if (!err) {
 			if (action.jsoutput)
-				response = action.jsoutput.transform(response).response;
+				response = action.jsoutput.transform(response).response || {};
 
 			if (action.extend) {
 				if (action.extend.includes('.'))
@@ -1458,7 +1493,7 @@ ActionCaller.prototype.exec = function() {
 			self.cancel();
 			return;
 		}
-		$.query = response.response;
+		$.query = response.response || {};
 	} else
 		$.query = query;
 
@@ -1470,7 +1505,7 @@ ActionCaller.prototype.exec = function() {
 			self.cancel();
 			return;
 		}
-		$.params = response.response;
+		$.params = response.response || {};
 	} else
 		$.params = params;
 
@@ -1480,12 +1515,21 @@ ActionCaller.prototype.exec = function() {
 			self.cancel();
 			return;
 		}
-		$.payload = response.response;
+		$.payload = response.response || {};
 	} else
 		$.payload = payload;
 
 	if (self.options.status)
-		$.status = self.options.status;
+		$.status2 = self.options.status;
+
+	if (self.options.progress)
+		$.progress2 = self.options.progress;
+
+	if (action.timeout) {
+		$.$timeout = setTimeout(function() {
+			$.invalid('Timeout.');
+		}, action.timeout);
+	}
 
 	if (action.middleware) {
 		action.middleware.wait(function(name, next) {
@@ -1511,9 +1555,9 @@ ActionCaller.prototype.finish = function(value) {
 			if (self.error.length)
 				$.invalid(self.error);
 			else
-				$.callback(value === undefined ? self.$.response : value);
+				$.callback.call($, value === undefined ? self.$.response : value);
 		} else
-			self.options.callback(self.error.length ? self.error : null, value === undefined ? self.$.response : value);
+			self.options.callback.call(self.$, self.error.length ? self.error : null, value === undefined ? self.$.response : value);
 
 		self.options.callback = null;
 	}

package/changelog.txt

@@ -1,3 +1,36 @@
+========================
+0.0.16
+========================
+
+- improved loading plugins
+- framework reads a `/config` file in `plugins`
+- added `RESTBuilder.?.logerror()` method for printing errors into the console
+- added `API.?.logerror()` method for printing errors into the console
+- fixed handling of unexpected problems in the Flow with the main process becoming disconnected
+- fixed `uptime` value in the framework stats
+- improved auditlogs by adding `files`
+- fixed unexpected errors when compressing/decompressing data via WebSocket
+- fixed processing TMS data in the FlowStream
+- added a new config key `CONF.$httpcacheoffset` for extending `last-modified` header
+- exended `Total.download()` by adding `size {Number}` property to the response
+- extended FlowStream by adding the ability to execute Total.js actions
+- added a new global event `ON('flowstream', function(instance) {`
+- added new action methods `$.progress(percentage)` and `ACTION().progress(console.log)` to measure percentage
+- fixed Total error handling
+- improved compiling navigation in the CMS compiler
+- fixed filling of the `template` property in the CMS compiler
+- added a new method `U.aistreamer(on_line, on_message)`
+- added `Flow.edit(proxy_socket_url)` method for the remote editing of the FlowStream
+- added a new global methods `AIMODEL()` and `NEWAIMODEL()`
+- added `exec` command to the remote editing functionality
+- always set `cwd` directory for the current executed script
+- added `timeout {Number}` property into the `NEWACTION` method
+- extended `NEWAPI(type, [config], config)` by adding the `config` argument
+- replaced `Url.parse()` with `new URL()`
+- fixed `NEWFORK()` method
+- fixed callback with `$` in the `ACTION().callback($)`
+- fixed returing a default JSON schema object in actions
+
 ========================
 0.0.15
 ========================

package/cms.js

@@ -548,6 +548,7 @@ exports.compile = function(html, widgets, used) {
 		opt.html = body.substring(body.lastIndexOf('~BEG~') + 5, body.lastIndexOf('~END~'));
 		opt.config = config || EMPTYOBJECT;
 		opt.render = widget.render;
+		opt.template = widget.ui ? widget.ui.template : '';
 		opt.beg = opt.body.substring(0, opt.body.indexOf('>') + 1);
 		opt.end = opt.body.substring(opt.body.lastIndexOf('<'));
 
@@ -575,14 +576,30 @@ exports.compile = function(html, widgets, used) {
 		let endindex = html.indexOf('</script>', index);
 		let endhead = html.indexOf('>', index);
 		let head = html.substring(begindex, endhead);
-		let name = head.match(/name=".*?"/i)[0];
+		let uid = head.match(/id=".*?"/i);
 		let template = html.substring(html.indexOf('>', endhead) + 1, endindex);
+		let name = '';
 
-		name = name.substring(6, name.length - 1);
-		html = html.replace(html.substring(begindex, endindex + 9), '~WIDGET#' + response.tangular.length + '~');
-		response.tangular.push({ id: HASH(name).toString(36), name: name, type: 'nav', template: Tangular.compile(template) });
-		index = begindex;
+		if (uid && uid[0]) {
+			uid = uid[0];
+			uid = uid.substring(4, uid.length - 1);
+			name = uid.capitalize();
+		} else {
+			uid = head.match(/name=".*?"/i);
+			if (uid && uid[0]) {
+				uid = uid[0];
+				uid = uid.substring(6, uid.length - 1);
+				name = uid.capitalize();
+				uid = HASH(uid).toString(36); // Backward compatibility with old CMS
+			}
+		}
+
+		if (name) {
+			html = html.replace(html.substring(begindex, endindex + 9), '~WIDGET#' + response.tangular.length + '~');
+			response.tangular.push({ id: uid, name: name, type: 'nav', template: Tangular.compile(template) });
+		}
 
+		index = begindex;
 	}
 
 	index = 0;

package/controller.js

@@ -115,7 +115,7 @@ function Controller(req, res) {
 Controller.prototype = {
 
 	get query() {
-		return this.$query || (this.$query = ctrl.uri.search.parseEncoded());
+		return this.$query || (this.$query = this.uri.search.parseEncoded());
 	},
 
 	set query(val) {
@@ -1617,7 +1617,7 @@ function send_file(ctrl, path, ext) {
 			ctrl.response.headers['cache-control'] = NOCACHE;
 
 		if (!cache)
-			cache = { date: stats.mtime.toUTCString(), size: stats.size };
+			cache = { date: (CONF.$httpcacheoffset ? stats.mtime.add(CONF.$httpcacheoffset) : stats.mtime).toUTCString(), size: stats.size };
 
 		ctrl.response.headers['last-modified'] = cache.date;
 		ctrl.response.headers.etag = '858' + F.config.$httpetag;

package/debug.js

@@ -75,6 +75,7 @@ function runwatching() {
 	const REG_PUBLIC = /\/public\//i;
 	const REG_INDEX = new RegExp(FILENAME.replace(/\.js$/, '') + '_.*?\\.js$');
 	const REG_EXTENSION = /\.(js|ts|py|resource|package|bundle|build|flow|url|html)$/i;
+	const REG_CONFIG = /\/config$/
 	const REG_RELOAD = /\.(js|ts|py|css|html|htm|jpg|png|gif|ico|svg|webp|resource)$/i;
 	const isRELOAD = !!options.livereload;
 	const SPEED = isRELOAD ? 1000 : 1500;
@@ -105,7 +106,6 @@ function runwatching() {
 				skipbundle = true;
 				F.directory = directory = F.path.join(directory, '.src');
 			}
-
 		} catch(e) {}
 
 		const fork = F.Child.fork;
@@ -210,7 +210,7 @@ function runwatching() {
 			if (isdir)
 				return true;
 
-			if (!REG_PUBLIC.test(path) && REG_EXTENSION.test(path))
+			if (!REG_PUBLIC.test(path) && (REG_CONFIG.test(path) || REG_EXTENSION.test(path)))
 				return true;
 
 			return false;