total5 0.0.1-6 → 0.0.1-7

package/builders.js

@@ -196,7 +196,7 @@ Options.prototype.done = function(arg) {
 Options.prototype.invalid = function(error, path, index) {
 	var self = this;
 	self.error.push(error, path, index);
-	self.$callback(error);
+	self.$callback(true);
 };
 
 Options.prototype.cookie = function(name, value, expire, options) {
@@ -321,8 +321,10 @@ ErrorBuilder.prototype.output = function(language = 'default') {
 
 		let err = m.error;
 
-		if (err[0] == '@')
+		if (err == '@')
 			err = F.resource(language, 'T' + (err === '@' ? m.name : err.substring(1)).hash(true).toString(36)) || 'The field "' + m.name + '" is invalid';
+		else if (err[0] === '@')
+			err = F.translate(language, err);
 
 		if (self.replacer) {
 			for (let key in self.replacer)

package/flow-flowstream.js

@@ -16,6 +16,7 @@ var isFLOWSTREAMWORKER = false;
 var Parent = W.parentPort;
 var CALLBACKS = {};
 var FLOWS = {};
+var PROXIES = {};
 var TMS = {};
 var RPC = {};
 var CALLBACKID = 1;
@@ -72,10 +73,11 @@ var isrunning = false;
 */
 
 function Instance(instance, id) {
-	this.httproutes = {};
-	this.version = VERSION;
-	this.id = id;
-	this.flow = instance;
+	var self = this;
+	self.httproutes = {};
+	self.version = VERSION;
+	self.id = id;
+	self.flow = instance;
 	// this.onoutput = null;
 }
 
@@ -369,6 +371,16 @@ Instance.prototype.eval = function(msg, callback) {
 	return self;
 };
 
+Instance.prototype.restart = function() {
+	var self = this;
+	self.flow.$socket && self.flow.$socket.destroy();
+	self.flow.$client && self.flow.$client.destroy();
+	if (self.flow.terminate)
+		self.flow.terminate();
+	else
+		self.flow.kill(9);
+};
+
 // Destroys the Flow
 Instance.prototype.kill = Instance.prototype.destroy = function() {
 
@@ -387,13 +399,11 @@ Instance.prototype.kill = Instance.prototype.destroy = function() {
 		else
 			self.flow.kill(9);
 
-		var schema = self.flow.$schema;
-
-		var tmp = F.TFlow;
-		if (tmp.proxies[schema.proxypath]) {
-			tmp.proxies[schema.proxypath].remove();
-			delete tmp.proxies[schema.proxypath];
+		if (PROXIES[self.id]) {
+			PROXIES[self.id].remove();
+			delete PROXIES[self.id];
 		}
+
 	} else {
 		if (self.flow.sockets) {
 			for (var key in self.flow.sockets)
@@ -573,31 +583,32 @@ Instance.prototype.reconfigure = function(id, config) {
 	return self;
 };
 
-Instance.prototype.reload = function(data, restart = false) {
+Instance.prototype.reload = function(data) {
 	var self = this;
 	var flow = self.flow;
 
+	if (PROXIES[data.id]) {
+		PROXIES[data.id].remove();
+		delete PROXIES[data.id];
+	}
+
 	if (flow.isworkerthread) {
+
+		if (data.proxypath)
+			PROXIES[data.id] = F.proxy(data.proxypath, data.unixsocket);
+
 		for (let key in data)
 			flow.$schema[key] = data[key];
-		if (restart) {
-			if (flow.terminate)
-				flow.terminate();
-			else
-				flow.kill(9);
-		} else
-			flow.postMessage2({ TYPE: 'stream/rewrite', data: data });
+		self.proxypath = data.proxypath;
+		flow.postMessage2({ TYPE: 'stream/rewrite', data: data });
 	} else {
 		for (let key in data)
 			flow.$schema[key] = data[key];
 		flow.variables = data.variables;
-
 		if (data.variables2)
 			flow.variables2 = data.variables2;
-
 		flow.rewrite(data, () => flow.proxy.refreshmeta());
 	}
-
 	return self;
 };
 
@@ -1405,6 +1416,14 @@ function init_worker(meta, type, callback) {
 
 	meta.unixsocket = F.isWindows ? ('\\\\?\\pipe\\flowstream' + F.directory.makeid() + meta.id + Date.now().toString(36)) : (F.Path.join(F.Os.tmpdir(), 'flowstream_' + F.directory.makeid() + '_' + meta.id + '_' + Date.now().toString(36) + '.socket'));
 
+	if (PROXIES[meta.id]) {
+		PROXIES[meta.id].remove();
+		delete PROXIES[meta.id];
+	}
+
+	if (meta.proxypath)
+		PROXIES[meta.id] = F.proxy(meta.proxypath, meta.unixsocket);
+
 	if (!worker.postMessage) {
 		worker.postMessage = worker.send;
 		ischild = true;
@@ -1510,7 +1529,7 @@ function init_worker(meta, type, callback) {
 				break;
 
 			case 'stream/error':
-				tmp = { TYPE: 'flow/error', error: msg.error, stack: msg.stack, source: msg.source, id: msg.id, component: msg.component };
+				tmp = { TYPE: 'flow/error', error: msg.error, stack: msg.stack, source: msg.source, id: msg.id, component: msg.component, ts: new Date() };
 				worker.$socket && worker.$socket.send(tmp);
 				worker.$client && worker.$client.send(tmp);
 				worker.$instance.onerror && worker.$instance.onerror(msg.error, msg.source, msg.id, msg.component, msg.stack);

package/flow.js

@@ -9,7 +9,6 @@ var FS = exports;
 
 FS.module = require('./flow-flowstream');
 FS.version = 1;
-FS.proxies = {};
 FS.db = {};
 FS.worker = false;
 FS.instances = {};
@@ -69,25 +68,22 @@ FS.remove = function(id) {
 };
 
 FS.reload = function(flow, restart = false) {
-
 	var prev = FS.instances[flow.id];
 	if (!prev)
-		return;
+		return false;
 
-	if (prev.worker) {
-		if (prev.proxypath !== flow.proxypath) {
-			if (FS.proxies[prev.proxypath]) {
-				FS.proxies[prev.proxypath].remove();
-				delete FS.proxies[prev.proxypath];
-			}
-		}
-	}
+	FS.db[flow.id] = flow;
 
-	if (flow.worker && prev.proxypath !== flow.proxypath)
-		FS.proxies[flow.proxypath] = F.proxy(flow.proxypath, flow.unixsocket);
+	var instance = FS.instances[flow.id];
+	instance.worker = flow.worker;
+	instance.proxypath = flow.proxypath;
 
-	FS.db[flow.id] = flow;
-	FS.instances[flow.id].reload(flow, restart);
+	if (restart)
+		instance.restart();
+	else
+		instance.reload(flow);
+
+	return true;
 };
 
 FS.init = function(directory, callback) {
@@ -120,9 +116,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();
 			});
@@ -133,7 +127,7 @@ FS.init = function(directory, callback) {
 
 };
 
-FS.load = function(flow, callback, restart = false) {
+FS.load = function(flow, callback) {
 
 	// flow.directory {String}
 	// flow.asfiles {Boolean}
@@ -142,7 +136,7 @@ FS.load = function(flow, callback, restart = false) {
 	// flow.proxypath {String}
 
 	if (FS.instances[flow.id]) {
-		FS.reload(flow, restart);
+		FS.reload(flow);
 		callback && setImmediate(callback, null, FS.instances[flow.id]);
 		return;
 	}
@@ -155,17 +149,6 @@ FS.load = function(flow, callback, restart = false) {
 
 		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();
 		if (callback)
 			instance.ondone = err => callback(err,  err ? null : instance);

package/global.js

@@ -126,4 +126,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/package.json

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

package/tms.js

@@ -8,7 +8,6 @@ var Cache = {
 	subscribers: {},
 	swatchers: {},    // watchers for subscribers
 	scache: {},       // cache for subscribers
-	publishers: {},
 	pcache: {},       // cache for publishers
 	calls: {},
 	socket: null,
@@ -46,7 +45,7 @@ function tmscontroller($) {
 		}
 
 		delete temporary.tmsblocked[client.ip];
-		Cache.publishers = {};
+		client.$subscribers = {};
 		client.tmsready = true;
 		refresh(client);
 	});
@@ -71,9 +70,9 @@ function tmscontroller($) {
 						F.TTMS.subscribe(msg.id, response, client);
 				}
 			} else if (msg.type === 'subscribers' && msg.subscribers instanceof Array) {
-				Cache.publishers = {};
-				for (var i = 0; i < msg.subscribers.length; i++)
-					Cache.publishers[msg.subscribers[i]] = 1;
+				client.$subscribers = {};
+				for (let sub of msg.subscribers)
+					client.$subscribers[sub] = true;
 			} else if (msg.type === 'call' && msg.id) {
 				var tmp = Cache.calls[msg.id];
 				if (tmp) {
@@ -315,9 +314,9 @@ exports.newsubscribe = function(name, schema, callback) {
 };
 
 exports.publish = function(name, value) {
-	if (Cache.socket && Cache.pcache[name] && Cache.publishers[name]) {
+	if (Cache.socket && Cache.pcache[name]) {
 		F.stats.performance.publish++;
-		Cache.socket.send({ type: 'publish', id: name, data: value }, client => client.tmsready);
+		Cache.socket.send({ type: 'publish', id: name, data: value }, client => client.tmsready && client.$subscribers[name]);
 	}
 };