total5 0.0.1-2 → 0.0.1-21

package/flow.js

@@ -1,4 +1,6 @@
-// Internal module
+// Total.js Flow module
+// The MIT License
+// Copyright 2023 (c) Peter Širka <petersirka@gmail.com>
 
 'use strict';
 
@@ -8,8 +10,7 @@ const REG_BK = /-bk|_bk/i;
 var FS = exports;
 
 FS.module = require('./flow-flowstream');
-FS.version = 1;
-FS.proxies = {};
+FS.version = 40;
 FS.db = {};
 FS.worker = false;
 FS.instances = {};
@@ -53,26 +54,39 @@ FS.onsave = function(data) {
 	FS.$events.save && FS.emit('save', data);
 };
 
-FS.reload = function(flow, restart) {
+FS.remove = function(id) {
 
-	var prev = FS.db[flow.id];
-	if (!prev)
-		return;
+	var tmp = FS.db[id];
 
-	if (prev.worker) {
-		if (prev.proxypath !== flow.proxypath) {
-			if (FS.proxies[prev.proxypath]) {
-				FS.proxies[prev.proxypath].remove();
-				delete FS.proxies[prev.proxypath];
-			}
-		}
+	if (FS.instances[id]) {
+		FS.instances[id].destroy();
+		delete FS.instances[id];
 	}
 
-	if (flow.worker && prev.proxypath !== flow.proxypath)
-		FS.proxies[flow.proxypath] = F.proxy(flow.proxypath, flow.unixsocket);
+	if (tmp)
+		delete FS.db[id];
+
+	FS.$events.remove && FS.emit('remove', tmp);
+};
+
+FS.reload = function(flow, restart = false) {
+
+	var prev = FS.instances[flow.id];
+	if (!prev)
+		return false;
 
 	FS.db[flow.id] = flow;
-	FS.instance[flow.id].restart(flow, restart);
+
+	var instance = FS.instances[flow.id];
+	instance.workertype = flow.worker;
+	instance.proxypath = flow.proxypath;
+
+	if (restart)
+		instance.restart();
+	else
+		instance.reload(flow);
+
+	return true;
 };
 
 FS.init = function(directory, callback) {
@@ -105,9 +119,7 @@ FS.init = function(directory, callback) {
 				if (response) {
 					response = response.parseJSON();
 					response.directory = directory;
-					FS.load(response, function() {
-						next();
-					});
+					FS.load(response, () => next());
 				} else
 					next();
 			});
@@ -126,27 +138,18 @@ FS.load = function(flow, callback) {
 	// flow.memory {Number}
 	// flow.proxypath {String}
 
+	if (FS.instances[flow.id]) {
+		FS.reload(flow);
+		callback && setImmediate(callback, null, FS.instances[flow.id]);
+		return;
+	}
+
 	var id = flow.id;
 	flow.directory = flow.directory || F.path.root('/flowstream/');
 	FS.db[id] = flow;
 
 	FS.module.init(flow, flow.worker, function(err, instance) {
 
-		FS.$events.load && FS.emit('load', instance, flow);
-
-		if (flow.worker && flow.proxypath) {
-
-			// Removes old
-			if (FS.proxies[flow.proxypath])
-				FS.proxies[flow.proxypath].remove();
-
-			// Registers new
-			FS.proxies[flow.proxypath] = F.proxy(flow.proxypath, flow.unixsocket);
-
-		}
-
-		// instance.httprouting();
-		instance.ondone = callback;
 		instance.onerror = FS.onerror;
 
 		instance.onsave = function(data) {
@@ -156,6 +159,12 @@ FS.load = function(flow, callback) {
 		};
 
 		FS.instances[id] = instance;
+
+		// instance.httprouting();
+		instance.ondone = function(err) {
+			FS.$events.load && FS.emit('load', instance, flow);
+			callback && callback(err, err ? null : instance);
+		};
 	});
 
 };
@@ -168,7 +177,7 @@ FS.notify = function(controller, id) {
 	if (instance) {
 		var obj = {};
 		obj.id = arr[1];
-		obj.method = $.req.method;
+		obj.method = $.method;
 		obj.headers = $.headers;
 		obj.query = $.query;
 		obj.body = $.body;
@@ -191,6 +200,23 @@ FS.notify = function(controller, id) {
 		$.success();
 };
 
+FS.restart = function(id) {
+	let item = FS.instances[id];
+	if (item) {
+		if (item.flow) {
+			if (item.flow.terminate)
+				item.flow.terminate();
+			else
+				item.flow.kill(9);
+			return true;
+		}
+	}
+};
+
+FS.save = function(data) {
+	FS.onsave(data);
+};
+
 FS.ping = function() {
 	// ping all services
 	for (let key in FS.instances) {

package/flowstream.js

@@ -277,7 +277,7 @@ function variables(str, data, encoding) {
 	if (typeof(str) !== 'string' || str.indexOf('{') === -1)
 		return str;
 
-	var main = this.main;
+	var main = this.main ? this.main : this;
 
 	if (data == null || data == true)
 		data = this;
@@ -754,7 +754,7 @@ FP.destroy = function() {
 		self.emit('destroy');
 		self.meta = null;
 		self.$events = null;
-		delete F.flows[self.name];
+		delete F.flowstreams[self.name];
 	});
 
 };
@@ -896,8 +896,8 @@ FP.unregister = function(name, callback) {
 			callback && callback();
 			self.clean();
 		});
-	} else
-		callback && callback();
+	} else if (callback)
+		callback();
 
 	return self;
 };
@@ -1218,27 +1218,43 @@ FP.unload = function(callback) {
 	return self;
 };
 
-FP.load = function(components, design, callback, asfile) {
+FP.loadvariables = function(variables, type = 'variables') {
+
+	// @type {String} variables (default), variables2, secrets
+
+	var self = this;
+	if (JSON.stringify(self[type]) !== JSON.stringify(variables)) {
+		self[type] = variables;
+		for (let key in self.meta.flow) {
+			let instance = self.meta.flow[key];
+			instance[type] && instance[type](self[type]);
+			instance.vary && instance.vary(type);
+		}
+	}
+	return self;
+};
+
+FP.load = function(data, callback) {
 
 	var self = this;
 	if (self.loading) {
-		setTimeout(() => self.load(components, design, callback), 200);
+		setTimeout(() => self.load(data, callback), 200);
 		return self;
 	}
 
-	self.loading = 10000;
+	self.loading = 100000;
 	self.unload(function() {
 
-		var keys = Object.keys(components);
+		var keys = Object.keys(data.components);
 		var error = new F.ErrorBuilder();
 
 		keys.wait(function(key, next) {
-			var body = components[key];
+			var body = data.components[key];
 			if (typeof(body) === 'string' && body.indexOf('<script ') !== -1) {
 				self.add(key, body, function(err) {
 					err && error.push(err);
 					next();
-				}, asfile);
+				}, data.asfiles);
 			} else {
 				error.push('Invalid component: ' + key);
 				next();
@@ -1247,11 +1263,11 @@ FP.load = function(components, design, callback, asfile) {
 
 			// Loads design
 			self.inc(0);
-			self.use(design, function(err) {
+			self.use(data.design, function(err) {
 				self.inc(0);
 				err && error.push(err);
-				callback && callback(err);
 				self.clean();
+				callback && callback(err);
 			});
 
 		});
@@ -1260,6 +1276,59 @@ FP.load = function(components, design, callback, asfile) {
 	return self;
 };
 
+FP.replace = variables;
+FP.rewrite = function(data, callback) {
+
+	var self = this;
+	if (self.loading) {
+		setTimeout(() => self.replace(data, callback), 200);
+		return self;
+	}
+
+	self.loading = 100000;
+
+	var keys = Object.keys(data.components);
+	var error = new F.ErrorBuilder();
+	var processed = {};
+
+	keys.wait(function(key, next) {
+		var body = data.components[key];
+		processed[key] = 1;
+		if (typeof(body) === 'string' && body.indexOf('<script ') !== -1) {
+			self.add(key, body, function(err) {
+				err && error.push(err);
+				next();
+			}, data.asfiles);
+		} else {
+			error.push('Invalid component: ' + key);
+			next();
+		}
+	}, function() {
+		// Removed non-exist components
+		Object.keys(self.meta.components).wait(function(key, next) {
+			if (processed[key])
+				next();
+			else
+				self.unregister(key, next);
+		}, function() {
+			// Loads design
+			self.inc(0);
+			self.use(data.design, function(err) {
+
+				if (data.variables)
+					self.loadvariables(F.TUtils.clone(data.variables));
+
+				self.inc(0);
+				err && error.push(err);
+				self.clean();
+				callback && callback(err);
+			});
+		});
+	});
+
+	return self;
+};
+
 FP.insert = function(schema, callback) {
 	var self = this;
 	if (callback)
@@ -1984,8 +2053,8 @@ FP.components = function(prepare_export) {
 	return arr;
 };
 
-exports.create = function(name, errorhandler) {
-	let flowstream = new FlowStream(name, errorhandler);
-	F.flowstreams[name] =flowstream;
+exports.create = function(id, errorhandler) {
+	let flowstream = new FlowStream(id, errorhandler);
+	F.flowstreams[id] = flowstream;
 	return flowstream;
 };

package/global.js

@@ -17,21 +17,26 @@ global.NPMINSTALL = F.npminstall;
 global.COMPONENTATOR = F.componentator;
 global.MERGE = F.merge;
 global.TOUCH = F.touch;
+global.LOCALIZE = F.localize;
 global.AUTH = F.auth;
 global.CLEANUP = F.cleanup;
 global.NEWDB = F.newdb;
 global.REQUIRE = F.require;
 global.CRON = F.cron;
 global.UID = F.uid;
+global.SUCCESS = value => DEF.onSuccess(value);
 global.MEMORIZE = F.memorize;
 global.AUDIT = F.audit;
 global.TRANSLATE = F.translate;
+global.TRANSFORM = F.transform;
+global.NEWTRANSFORM = F.newtransform;
+global.MIDDLEWARE = F.middleware;
 global.DATA = new F.TQueryBuilder.Controller(true);
 global.DB = () => new F.TQueryBuilder.Controller();
 global.CACHE = F.cache;
 global.NEWACTION = F.TBuilders.newaction;
 global.NEWSCHEMA = F.TBuilders.newschema;
-global.ACTION = F.TBuilders.action;
+global.ACTION = global.EXEC = F.TBuilders.action;
 global.TEMPLATE = F.template;
 global.FILESTORAGE = F.filestorage;
 global.WEBSOCKETCLIENT = F.websocketclient;
@@ -50,6 +55,7 @@ global.MAIL = F.mail;
 global.Mail = F.TMail.Mailer;
 global.RESTBuilder = F.TBuilders.RESTBuilder;
 global.ErrorBuilder = F.TBuilders.ErrorBuilder;
+global.DOWNLOAD = F.download;
 
 global.BLOCKED = function($, limit, expire) {
 
@@ -92,7 +98,82 @@ global.LDAP = function(opt, callback) {
 };
 
 global.CORS = function(origin) {
-	CONF.$cors = origin || '*';
+	if (origin && origin[0] === '+') {
+		if (CONF.$cors !== '*')
+			CONF.$cors = (CONF.$cors ? ',' : '') + origin.substring(1);
+	} else
+		CONF.$cors = origin || '*';
+	F.emit('$cors');
+};
+
+global.AJAX = function(url, data, callback) {
+
+	if (typeof(data) === 'function') {
+		callback = data;
+		data = null;
+	}
+
+	if (!callback)
+		return new Promise((resolve, reject) => global.AJAX(url, data, (err, response) => err ? reject(err) : resolve(response)));
+
+	var index = url.indexOf(' ');
+	var opt = {};
+
+	if (index !== -1) {
+		opt.method = url.substring(0, index);
+		opt.url = url.substring(index + 1);
+	} else {
+		opt.method = 'GET';
+		opt.url = url;
+	}
+
+	if (data) {
+		opt.type = 'json';
+		opt.body = JSON.stringify(data);
+	}
+
+	opt.callback = function(err, response) {
+
+		if (err) {
+			callback && callback(err, null, response);
+			return;
+		}
+
+		var type = err ? '' : response.headers['content-type'] || '';
+		if (type) {
+			var index = type.lastIndexOf(';');
+			if (index !== -1)
+				type = type.substring(0, index).trim();
+		}
+
+		var value = null;
+
+		switch (type.toLowerCase()) {
+			case 'text/xml':
+			case 'application/xml':
+				value = response.body ? response.body.parseXML(self.$replace ? true : false) : {};
+				break;
+			case 'application/x-www-form-urlencoded':
+				value = response.body ? DEF.parsers.urlencoded(response.body) : {};
+				break;
+			case 'application/json':
+			case 'text/json':
+				value = response.body ? response.body.parseJSON(true) : null;
+				break;
+			default:
+				value = response.body;
+				break;
+		}
+
+		if (response.status >= 400) {
+			err = value;
+			value = null;
+		}
+
+		delete response.body;
+		callback && callback(err, value, response);
+	};
+	F.TUtils.request(opt);
 };
 
 // Utils
@@ -103,6 +184,8 @@ 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;
+global.QUERIFY = F.TUtils.querify;
 
 // TMS
 global.SUBSCRIBE = F.TTMS.subscribe;
@@ -123,4 +206,62 @@ global.NOSQL = F.TNoSQL.nosql;
 // Workers
 global.NEWFORK = F.TWorkers.createfork;
 global.NEWTHREAD = F.TWorkers.createthread;
-global.NEWTHREADPOOL = F.TWorkers.createpool;
+global.NEWTHREADPOOL = F.TWorkers.createpool;
+
+// Custom global functionality
+function timeout2(key, a, b, c, d, e) {
+	let tmp = F.temporary.internal[key];
+	if (tmp) {
+		tmp.callback(a, b, c, d, e);
+		delete F.temporary.internal[key];
+	}
+}
+
+global.setTimeout2 = function(id, callback, timeout, limit, a, b, c, d, e) {
+
+	let key = 'timeout2' + id;
+	let internal = F.temporary.internal;
+	let cache = internal[key];
+
+	if (limit > 0) {
+
+		if (cache && cache.count >= limit) {
+			clearTimeout(cache.timer);
+			delete internal[key];
+			callback();
+			return;
+		}
+
+		if (cache) {
+			clearTimeout(cache.timer);
+			cache.count++;
+		} else
+			cache = internal[key] = {};
+
+		cache.callback = callback;
+		cache.timer = setTimeout(timeout2, timeout, key, a, b, c, d, e);
+
+	} else {
+
+		if (cache)
+			clearTimeout(cache.timer);
+		else
+			cache = internal[key] = {};
+
+		cache.callback = callback;
+		cache.timer = setTimeout(timeout2, timeout, key, a, b, c, d, e);
+	}
+};
+
+global.clearTimeout2 = function(id) {
+
+	let key = 'timeout2' + id;
+	let tmp = F.temporary.internal[key];
+
+	if (tmp) {
+		clearTimeout(tmp.timer);
+		delete F.temporary.internal[key];
+	}
+
+	return !!tmp;
+};

package/http.js

@@ -63,7 +63,7 @@ exports.listen = function(req, res) {
 	// Pending requests
 	F.temporary.pending.push(ctrl);
 
-	if (!ctrl.uri.file && (F.def.onCORS || F.config.$cors)) {
+	if (ctrl.headers.origin && (F.def.onCORS || F.config.$cors)) {
 		if (F.TRouting.lookupcors(ctrl))
 			ctrl.$route();
 	} else

package/image.js

@@ -1,3 +1,7 @@
+// Total.js Images
+// The MIT License
+// Copyright 2016-2023 (c) Peter Širka <petersirka@gmail.com>
+
 'use strict';
 
 const D = F.iswindows ? '"' : '\'';

package/images.js

@@ -196,7 +196,7 @@ ImageProto.measure = function(callback) {
 
 	F.stats.performance.open++;
 	var extension = self.filename.substring(index).toLowerCase();
-	var stream = require('fs').createReadStream(self.filename, { start: 0, end: (extension === '.jpg' || extension === '.webp') ? 40000 : 24 });
+	var stream = F.Fs.createReadStream(self.filename, { start: 0, end: (extension === '.jpg' || extension === '.webp') ? 40000 : 24 });
 
 	stream.on('data', function(buffer) {