total5 0.0.1-5 → 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)
@@ -1159,13 +1161,17 @@ exports.newaction = function(name, obj) {
 	return obj;
 };
 
+function ActionCallerExec(self) {
+	self.exec();
+}
+
 function ActionCaller() {
 	var self = this;
 	self.$ = new Options();
 	self.error = new ErrorBuilder();
 	self.options = {};
 	self.actions = [];
-	setImmediate(self => self.exec(), self);
+	setImmediate(ActionCallerExec, self);
 }
 
 ActionCaller.prototype.debug = function() {
@@ -1271,13 +1277,15 @@ ActionCaller.prototype.exec = function() {
 	if (action.jsquery) {
 		self.error.prefix = 'query.';
 		response = action.jsquery.transform(query, false, self.error);
+		console.log(query, response, action);
 		self.error.prefix = '';
 		if (response.error) {
 			self.cancel();
 			return;
 		}
 		$.query = response.response;
-	}
+	} else
+		$.query = query;
 
 	if (action.jsparams) {
 		self.error.prefix = 'params.';
@@ -1288,7 +1296,8 @@ ActionCaller.prototype.exec = function() {
 			return;
 		}
 		$.params = response.response;
-	}
+	} else
+		$.params = params;
 
 	if (action.jsinput && type !== '-') {
 		response = action.jsinput.transform(payload, type === '%', self.error);
@@ -1297,7 +1306,8 @@ ActionCaller.prototype.exec = function() {
 			return;
 		}
 		$.payload = response.response;
-	}
+	} else
+		$.payload = payload;
 
 	action.action($, $.payload);
 };

package/controller.js

@@ -11,7 +11,7 @@ const REG_MOBILE = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Min
 const REG_ENCODINGCLEANER = /[;\s]charset=utf-8/g;
 
 const CHECK_DATA = { POST: 1, PUT: 1, PATCH: 1, DELETE: 1 };
-const CHECK_COMPRESSION = { 'text/plain': true, 'text/javascript': true, 'text/css': true, 'text/jsx': true, 'application/javascript': true, 'application/x-javascript': true, 'application/json': true, 'text/xml': true, 'image/svg+xml': true, 'text/x-markdown': true, 'text/html': true };
+const CHECK_COMPRESSION = { 'text/plain': true, 'text/javascript': true, 'text/css': true, 'text/jsx': true, 'application/javascript': true, 'application/x-javascript': true, 'application/json': true, 'application/xml': true, 'text/xml': true, 'image/svg+xml': true, 'text/x-markdown': true, 'text/html': true };
 const CHECK_CHARSET =  { 'text/plain': true, 'text/javascript': true, 'text/css': true, 'text/jsx': true, 'application/javascript': true, 'application/x-javascript': true, 'application/json': true, 'text/xml': true, 'text/x-markdown': true, 'text/html': true };
 const CHECK_NOCACHE = { zip: 1, rar: 1 };
 
@@ -998,6 +998,15 @@ function execute(ctrl) {
 		if (ctrl.route.api) {
 			let body = ctrl.body;
 			if (body && typeof(body) === 'object' && body.schema && typeof(body.schema) === 'string') {
+
+				let index = body.schema.indexOf('?');
+				let query = null;
+
+				if (index !== -1) {
+					query = body.schema.substring(index + 1);
+					body.schema = body.schema.substring(0, index);
+				}
+
 				let schema = body.schema.split('/');
 				let endpoint = ctrl.route.api[schema[0]];
 				let params = {};
@@ -1009,6 +1018,7 @@ function execute(ctrl) {
 					body = body.data;
 					if (!body || typeof(body) === 'object') {
 						ctrl.params = params;
+						ctrl.query = query ? query.parseEncoded() : {};
 						F.action(endpoint.actions, body || {}, ctrl).autorespond();
 						return;
 					}

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,27 +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;
 };
 
@@ -1401,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;
@@ -1506,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);
@@ -214,6 +197,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/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/index.js

@@ -344,7 +344,7 @@ function unlink(arr, callback) {
 	CONF.$httpmaxsize = 256; // 256 kB
 	CONF.$httprangebuffer = 5120; // 5 MB
 	CONF.$httptimeout = 5; // 5 seconds
-	CONF.$httpfiles = { flac: true, jpg: true, jpeg: true, png: true, gif: true, ico: true, wasm: true, js: true, mjs: true, css: true, txt: true, xml: true, woff: true, woff2: true, otf: true, ttf: true, eot: true, svg: true, zip: true, rar: true, pdf: true, docx: true, xlsx: true, doc: true, xls: true, html: true, htm: true, appcache: true, manifest: true, map: true, ogv: true, ogg: true, mp4: true, mp3: true, webp: true, webm: true, swf: true, package: true, json: true, ui: true, md: true, m4v: true, jsx: true, heif: true, heic: true, ics: true, ts: true, m3u8: true, wav: true };
+	CONF.$httpfiles = { flac: true, jpg: true, jpeg: true, png: true, gif: true, ico: true, wasm: true, js: true, mjs: true, css: true, txt: true, xml: true, woff: true, woff2: true, otf: true, ttf: true, eot: true, svg: true, zip: true, rar: true, pdf: true, docx: true, xlsx: true, doc: true, xls: true, html: true, htm: true, appcache: true, manifest: true, map: true, ogv: true, ogg: true, mp4: true, mp3: true, webp: true, webm: true, swf: true, package: true, json: true, ui: true, md: true, m4v: true, jsx: true, heif: true, heic: true, ics: true, ts: true, m3u8: true, wav: true, xsd: true, xsl: true, xslt: true };
 	CONF.$httpchecktypes = true; // for multipart data only
 	CONF.$blacklist = '';
 	CONF.$xpoweredby = 'Total.js';
@@ -2705,6 +2705,7 @@ process.connected && setTimeout(() => process.send('total:init'), 100);
 
 require('./global');
 require('./tangular');
+require('./markdown');
 
 // Init directories
 F.dir();

package/markdown.js

@@ -0,0 +1,752 @@
+const REG_DASH = /-{2,}/g;
+const REG_TAGS = /<[^>]*>/g;
+const REG_EMPTYCHAR = /\s|\W/;
+const REG_ICONS = /(^|[^\w]):((fab|far|fas|fal|fad|fa|ti)\s(fa|ti)-)?[a-z-]+:([^\w]|$)/g;
+const REG_KEYWORDS = /\{.*?\}\(.*?\)/g;
+const REG_LINKEXTERNAL = /(https|http):\/\//;
+const REG_FORMAT = /__.*?__|_.*?_|\*\*.*?\*\*|\*.*?\*|~~.*?~~|~.*?~/g;
+const REG_ORDERED = /^[a-z|0-9]{1,3}\.\s|^-\s/i;
+const REG_ORDEREDSIZE = /^(\s|\t)+/;
+const REG_CODE = /`.*?`/g;
+const REG_ENCODETAGS = /<|>/g;
+const ENCODE = val => '&' + (val === '<' ? 'lt' : 'gt') + ';';
+const REG_NIL = /\0/g;
+
+function markdown_code(value) {
+	return value ? ('<code>' + value.substring(1, value.length - 1) + '</code>') : '';
+}
+
+function markdown_imagelinks(value) {
+
+	if (!value)
+		return '';
+
+	var end = value.lastIndexOf(')') + 1;
+	var img = value.substring(0, end);
+	var url = value.substring(end + 2, value.length - 1);
+	var label = markdown_links(img);
+	var footnote = label.substring(0, 13);
+
+	if (footnote === '<sup data-id=' || footnote === '<span data-id' || label.substring(0, 9) === '<a href="')
+		return label;
+
+	return '<a href="' + url + '"' + (REG_LINKEXTERNAL.test(url) ? ' target="_blank"' : '') + '>' + label + '</a>';
+}
+
+function markdown_table(value, align, ishead) {
+
+	var columns = value.substring(1, value.length - 1).split('|');
+	var builder = '';
+
+	for (var i = 0; i < columns.length; i++) {
+		var column = columns[i].trim();
+		if (column.charAt(0) != '-') {
+			var a = align[i];
+			builder += '<' + (ishead ? 'th' : 'td') + (a && a !== 'left' ? (' class="' + a + '"') : '') + '>' + column + '</' + (ishead ? 'th' : 'td') + '>';
+		}
+	}
+
+	return '<tr>' + builder + '</tr>';
+}
+
+function markdown_links(value) {
+
+	if (!value)
+		return '';
+
+	var end = value.lastIndexOf(']');
+	var img = value.charAt(0) === '!';
+	var text = value.substring(img ? 2 : 1, end);
+	var link = value.substring(end + 2, value.length - 1);
+
+	// footnotes
+	if ((/^#\d+$/).test(link)) {
+		return (/^\d+$/).test(text) ? '<sup data-id="{0}" class="markdown-footnote">{1}</sup>'.format(link.substring(1), text) : '<span data-id="{0}" class="markdown-footnote">{1}</span>'.format(link.substring(1), text);
+	}
+
+	if (link.substring(0, 4) === 'www.')
+		link = 'https://' + link;
+
+	var nofollow = link.charAt(0) === '@' ? ' rel="nofollow"' : REG_LINKEXTERNAL.test(link) ? ' target="_blank"' : '';
+	return '<a href="' + link + '"' + nofollow + '>' + text + '</a>';
+}
+
+function markdown_image(value) {
+
+	var end = value.lastIndexOf(']');
+	var text = value.substring(2, end);
+	var link = value.substring(end + 2, value.length - 1);
+	var responsive = 1;
+	var f = text.charAt(0);
+
+	if (f === '+') {
+		responsive = 2;
+		text = text.substring(1);
+	} else if (f === '-') {
+		// gallery
+		responsive = 3;
+		text = text.substring(1);
+	}
+
+	return '<img src="' + link + '" alt="' + text + '"' + (responsive === 1 ? ' class="img-responsive"' : responsive === 3 ? ' class="markdown-gallery"' : '') + ' border="0" loading="lazy" />';
+}
+
+function markdown_keywords(value) {
+	var keyword = value.substring(1, value.indexOf('}'));
+	var type = value.substring(value.lastIndexOf('(') + 1, value.lastIndexOf(')'));
+	return '<span class="markdown-keyword" data-type="{0}">{1}</span>'.format(type, keyword);
+}
+
+function markdown_links2(value) {
+	value = value.substring(4, value.length - 4);
+	return '<a href="' + (value.isEmail() ? 'mailto:' : REG_LINKEXTERNAL.test(value) ? '' : 'http://') + value + '" target="_blank">' + value + '</a>';
+}
+
+function markdown_format(value, index, text) {
+
+	var p = text.charAt(index - 1);
+	var n = text.charAt(index + value.length);
+
+	if ((!p || REG_EMPTYCHAR.test(p)) && (!n || REG_EMPTYCHAR.test(n))) {
+
+		var beg = '';
+		var end = '';
+		var tag;
+
+		if (value.indexOf('*') !== -1) {
+			tag = value.indexOf('**') === -1 ? 'em' : 'strong';
+			beg += '<' + tag + '>';
+			end = '</' + tag + '>' + end;
+		}
+
+		if (value.indexOf('_') !== -1) {
+			tag = value.indexOf('__') === -1 ? 'u' : 'b';
+			beg += '<' + tag + '>';
+			end = '</' + tag + '>' + end;
+		}
+
+		if (value.indexOf('~') !== -1) {
+			beg += '<strike>';
+			end = '</strike>' + end;
+		}
+
+		var count = value.charAt(1) === value.charAt(0) ? 2 : 1;
+		return beg + value.substring(count, value.length - count) + end;
+	}
+
+	return value;
+}
+
+function markdown_id(value) {
+	value = value.replace(REG_TAGS, '');
+	return value.slug().replace(REG_DASH, '-');
+}
+
+function markdown_icon(value) {
+
+	var beg = -1;
+	var end = -1;
+
+	for (var i = 0; i < value.length; i++) {
+		var code = value.charCodeAt(i);
+		if (code === 58) {
+			if (beg === -1)
+				beg = i + 1;
+			else
+				end = i;
+		}
+	}
+
+	var icon = value.substring(beg, end);
+	if (icon.indexOf(' ') === -1)
+		icon = 'ti ti-' + icon;
+	return value.substring(0, beg - 1) + '<i class="' + icon + '"></i>' + value.substring(end + 1);
+}
+
+function markdown_urlify(str) {
+	return str.replace(/(^|\s)+(((https?:\/\/)|(www\.))[^\s]+)/g, function(url, b, c) {
+		var len = url.length;
+		var l = url.charAt(len - 1);
+		var f = url.charAt(0);
+		if (l === '.' || l === ',')
+			url = url.substring(0, len - 1);
+		else
+			l = '';
+		url = (c === 'www.' ? 'http://' + url : url).trim();
+		return (f.charCodeAt(0) < 40 ? f : '') + '[' + url + '](' + url + ')' + l;
+	});
+}
+
+function parseul(builder) {
+
+	var ul = {};
+	var is = false;
+	var currentindex = -1;
+	var output = [];
+
+	for (var i = 0; i < builder.length; i++) {
+
+		var line = builder[i];
+
+		if (line.charAt(0) === '\0') {
+
+			if (!is)
+				currentindex = output.push('<ul />') - 1;
+
+			var key = currentindex + '';
+			is = true;
+
+			var tmp = line.substring(1);
+			var index = tmp.indexOf('<');
+			var obj = {};
+			obj.index = i;
+			obj.type = tmp.substring(0, 2);
+			obj.offset = +tmp.substring(2, index).trim();
+			obj.line = line.substring(index + 1);
+
+			if (ul[key])
+				ul[key].push(obj);
+			else
+				ul[key] = [obj];
+
+		} else {
+			output.push(line);
+			is = false;
+		}
+	}
+
+	for (var key in ul) {
+
+		var line = +key;
+		var arr = ul[key];
+		var lines = [];
+		var tags = [];
+		var prev;
+		var diff;
+		var init = false;
+		var tmp;
+
+		for (var i = 0; i < arr.length; i++) {
+
+			var li = arr[i];
+			var beg = li.type === 'ul' ? '<ul>' : li.type === 'o1' ? '<ol type="1">' : '<ol type="a">';
+			var end = li.type === 'ul' ? '</ul>' : '</ol>';
+
+			var diff = li.offset - (prev ? prev.offset : 0);
+
+			// Init
+			if (!init) {
+				init = true;
+				lines.push(beg);
+				tags.push(end);
+			}
+
+			if (diff > 0) {
+				var last = lines[lines.length - 1];
+				last = last.replace(/<\/li>$/, '');
+				lines[lines.length - 1] = last;
+				tags.push(end + '</li>');
+				lines.push(beg);
+				lines.push(li.line);
+			} else if (diff < 0) {
+				while (diff < 0) {
+					tmp = tags.pop();
+					lines.push(tmp);
+					diff++;
+				}
+				lines.push(li.line);
+			} else {
+				lines.push(li.line);
+			}
+
+			prev = li;
+
+		}
+
+		while (tags.length)
+			lines.push(tags.pop());
+
+		output[line] = lines.join('\n');
+	}
+
+	return output;
+}
+
+function formatline(line) {
+	var tmp = [];
+	return line.replace(REG_CODE, function(text) {
+		tmp.push(text);
+		return '\0';
+	}).replace(REG_FORMAT, markdown_format).replace(REG_NIL, () => markdown_code(tmp.shift()));
+}
+
+function imagescope(val) {
+
+	var beg = -1;
+	var can = false;
+	var n;
+
+	for (var i = 0; i < val.length; i++) {
+		var c = val.charAt(i);
+
+		if (c === '[') {
+			beg = i;
+			can = false;
+			continue;
+		}
+
+		if (c === ']') {
+
+			can = false;
+
+			if (beg === -1)
+				continue;
+
+			n = val.charAt(i + 1);
+
+			// maybe a link mistake
+			if (n === ' ')
+				n = val.charAt(i + 2);
+
+			// maybe a link
+			can = n === '(';
+		}
+
+		if (beg > -1 && can && c === ')') {
+			n = val.charAt(beg - 1);
+			var tmp = val.substring(beg - (n === '!' ? 1 : 0), i + 1);
+			if (tmp.charAt(0) === '!')
+				val = val.replace(tmp, markdown_image(tmp));
+			can = false;
+			beg = -1;
+		}
+	}
+
+	return val;
+}
+
+function linkscope(val, index, callback) {
+
+	var beg = -1;
+	var beg2 = -1;
+	var can = false;
+	var skip = false;
+	var find = false;
+	var n;
+
+	for (var i = index; i < val.length; i++) {
+		var c = val.charAt(i);
+
+		if (c === '[') {
+			beg = i;
+			can = false;
+			find = true;
+			continue;
+		}
+
+		var codescope = val.substring(i, i + 6);
+
+		if (skip && codescope === '</code') {
+			skip = false;
+			i += 7;
+			continue;
+		}
+
+		if (skip)
+			continue;
+
+		if (!find && codescope === '<code>') {
+			skip = true;
+			continue;
+		}
+
+		var il = val.substring(i, i + 4);
+
+		if (il === '&lt;') {
+			beg2 = i;
+			continue;
+		} else if (beg2 > -1 && il === '&gt;') {
+			callback(val.substring(beg2, i + 4), true);
+			beg2 = -1;
+			continue;
+		}
+
+		if (c === ']') {
+
+			can = false;
+			find = false;
+
+			if (beg === -1)
+				continue;
+
+			n = val.charAt(i + 1);
+
+			// maybe a link mistake
+			if (n === ' ')
+				n = val.charAt(i + 2);
+
+			// maybe a link
+			can = n === '(';
+		}
+
+		if (beg > -1 && can && c === ')') {
+			n = val.charAt(beg - 1);
+			callback(val.substring(beg - (n === '!' ? 1 : 0), i + 1));
+			can = false;
+			find = false;
+			beg = -1;
+		}
+	}
+}
+
+String.prototype.markdown = function(opt, nested) {
+
+	// opt.wrap = true;
+	// opt.linetag = 'p';
+	// opt.ul = true;
+	// opt.code = true;
+	// opt.images = true;
+	// opt.links = true;
+	// opt.formatting = true;
+	// opt.icons = true;
+	// opt.tables = true;
+	// opt.br = true;
+	// opt.headlines = true;
+	// opt.hr = true;
+	// opt.blockquotes = true;
+	// opt.sections = true;
+	// opt.custom
+	// opt.footnotes = true;
+	// opt.urlify = true;
+	// opt.keywords = true;
+	// opt.emptynewline = true;
+
+	var str = this;
+
+	if (!opt)
+		opt = {};
+
+	var lines = str.split('\n');
+	var builder = [];
+	var ul = [];
+	var table = false;
+	var iscode = false;
+	var isblock = false;
+	var ishead = 0;
+	var isprevblock = false;
+	var headline = '<{0} id="{3}" class="markdown-line" data-index="{1}">{2}</{0}>';
+	var line;
+	var tmp;
+
+	if (opt.wrap == null)
+		opt.wrap = true;
+
+	if (opt.linetag == null)
+		opt.linetag = 'p';
+
+	var closeul = function() {
+		while (ul.length) {
+			var text = ul.pop();
+			builder.push('</' + text + '>');
+		}
+	};
+
+	var linkreplace = function(text, inline) {
+		if (inline)
+			opt.$line = opt.$line.replace(text, markdown_links2);
+		else if (opt.images !== false)
+			opt.$line = opt.$line.replace(text, markdown_imagelinks);
+		else
+			opt.$line = opt.$line.replace(text, text => markdown_links(text, opt.images));
+	};
+
+	for (var i = 0; i < lines.length; i++) {
+
+		lines[i] = lines[i].replace(REG_ENCODETAGS, ENCODE);
+
+		if (!lines[i]) {
+			builder.push('');
+			continue;
+		}
+
+		var three = lines[i].substring(0, 3);
+
+		if (!iscode && (three === ':::' || (three === '==='))) {
+
+			if (isblock) {
+				if (opt.blocks !== false)
+					builder[builder.length - 1] += '</div></div>';
+				isblock = false;
+				isprevblock = true;
+				continue;
+			}
+
+			closeul();
+			isblock = true;
+			if (opt.blocks !== false) {
+				line = lines[i].substring(3).trim();
+				if (opt.formatting !== false)
+					line = formatline(line);
+				if (opt.custom)
+					line = opt.custom(line);
+				if (opt.html)
+					line = opt.html(line, 'block');
+				builder.push('<div class="markdown-block markdown-line" data-line="{0}"><span class="markdown-showblock"><i class="ti ti-plus"></i>{1}</span><div class="hidden">'.format(i, line));
+			}
+			continue;
+		}
+
+		if (!isblock && lines[i] && isprevblock) {
+			builder.push('<br />');
+			isprevblock = false;
+		}
+
+		if (three === '```') {
+
+			if (iscode) {
+				if (opt.code !== false)
+					builder[builder.length - 1] += '</code></pre></div>';
+				iscode = false;
+				continue;
+			}
+
+			closeul();
+			iscode = true;
+			if (opt.code !== false)
+				tmp = '<div class="markdown-code markdown-line hidden"><pre class="noscrollbar"><code class="lang-{0}">'.format(lines[i].substring(3));
+			continue;
+		}
+
+		if (iscode) {
+			if (opt.code !== false)
+				builder.push(tmp + lines[i]);
+			if (tmp)
+				tmp = '';
+			continue;
+		}
+
+		line = lines[i];
+
+		if (opt.br !== false)
+			line = line.replace(/&lt;br(\s\/)?&gt;/g, '<br />');
+
+		if (line.length > 10 && opt.urlify !== false && opt.links !== false)
+			line = markdown_urlify(line);
+
+		if (opt.custom)
+			line = opt.custom(line);
+
+		if (line.length > 2 && line !== '***' && line !== '---') {
+
+			if (opt.formatting !== false)
+				line = formatline(line);
+
+			if (opt.images !== false)
+				line = imagescope(line);
+
+			if (opt.links !== false) {
+				opt.$line = line;
+				linkscope(line, 0, linkreplace);
+				line = opt.$line;
+			}
+
+			if (opt.keywords !== false)
+				line = line.replace(REG_KEYWORDS, markdown_keywords);
+
+			if (opt.icons !== false)
+				line = line.replace(REG_ICONS, markdown_icon);
+		}
+
+		if (!line) {
+			if (table) {
+				table = null;
+				if (opt.tables !== false)
+					builder.push('</tbody></table>');
+			}
+		}
+
+		if (line === '' && lines[i - 1] === '') {
+			closeul();
+			if (opt.emptynewline !== false)
+				builder.push('<br />');
+			continue;
+		}
+
+		if (line[0] === '|') {
+			closeul();
+
+			if (!table) {
+				var next = lines[i + 1];
+				if (next[0] === '|') {
+					if (next.indexOf('--') === -1) {
+						if (opt.tables !== false)
+							builder.push('<table class="table table-bordered"><thead>');
+						table = [];
+						ishead = 2;
+					} else {
+						table = [];
+						var columns = next.substring(1, next.length - 1).split('|');
+						for (var j = 0; j < columns.length; j++) {
+							var column = columns[j].trim();
+							var align = 'left';
+							if (column.charAt(column.length - 1) === ':')
+								align = column[0] === ':' ? 'center' : 'right';
+							table.push(align);
+						}
+						if (opt.tables !== false)
+							builder.push('<table class="table table-bordered"><thead>');
+						ishead = 1;
+						i++;
+					}
+				} else
+					continue;
+			}
+
+			if (opt.tables !== false) {
+				if (ishead === 1)
+					builder.push(markdown_table(line, table, true) + '</thead><tbody>');
+				else if (ishead === 2)
+					builder.push('<tbody>' + markdown_table(line, table));
+				else
+					builder.push(markdown_table(line, table));
+			}
+
+			ishead = 0;
+			continue;
+		}
+
+		if (line.charAt(0) === '#') {
+
+			closeul();
+
+			if (line.substring(0, 2) === '# ') {
+				tmp = line.substring(2).trim();
+				if (opt.headlines !== false) {
+					if (opt.html)
+						tmp = opt.html(tmp, '#');
+					builder.push(headline.format('h1', i, tmp, markdown_id(tmp)));
+				}
+				continue;
+			}
+
+			if (line.substring(0, 3) === '## ') {
+				tmp = line.substring(3).trim();
+				if (opt.headlines !== false) {
+					if (opt.html)
+						tmp = opt.html(tmp, '##');
+					builder.push(headline.format('h2', i, tmp, markdown_id(tmp)));
+				}
+				continue;
+			}
+
+			if (line.substring(0, 4) === '### ') {
+				tmp = line.substring(4).trim();
+				if (opt.headlines !== false) {
+					if (opt.html)
+						tmp = opt.html(tmp, '###');
+					builder.push(headline.format('h3', i, tmp, markdown_id(tmp)));
+				}
+				continue;
+			}
+
+			if (line.substring(0, 5) === '#### ') {
+				tmp = line.substring(5).trim();
+				if (opt.headlines !== false) {
+					if (opt.html)
+						tmp = opt.html(tmp, '####');
+					builder.push(headline.format('h4', i, tmp, markdown_id(tmp)));
+				}
+				continue;
+			}
+
+			if (line.substring(0, 6) === '##### ') {
+				tmp = line.substring(6).trim();
+				if (opt.headlines !== false) {
+					if (opt.html)
+						tmp = opt.html(tmp, '#####');
+					builder.push(headline.format('h5', i, tmp, markdown_id(tmp)));
+				}
+				continue;
+			}
+		}
+
+		tmp = line.substring(0, 3);
+
+		if (tmp === '---' || tmp === '***') {
+			if (opt.hr !== false)
+				builder.push('<hr class="markdown-line' + (tmp.charAt(0) === '-' ? '1' : '2') + ' markdown-line" data-line="' + i + '" />');
+			continue;
+		}
+
+		// footnotes
+		if ((/^#\d+:(\s)+/).test(line)) {
+			if (opt.footnotes !== false) {
+				tmp = line.indexOf(':');
+				builder.push('<div class="markdown-footnotebody" data-id="{0}"><span>{0}:</span> {1}</div>'.format(line.substring(1, tmp).trim(), line.substring(tmp + 1).trim()));
+			}
+			continue;
+		}
+
+		if (line.substring(0, 5) === '&gt; ') {
+			if (opt.blockquotes !== false) {
+				line = line.substring(5).trim();
+				if (opt.html)
+					line = opt.html(line, 'blockquote');
+				builder.push('<blockquote class="markdown-line" data-line="' + i + '">' + line + '</blockquote>');
+			}
+			continue;
+		}
+
+		if (line.substring(0, 5) === '&lt; ') {
+			if (opt.sections !== false) {
+				line = line.substring(5).trim();
+				if (opt.html)
+					line = opt.html(line, 'section');
+				builder.push('<section class="markdown-line" data-line="' + i + '">' + line + '</section>');
+			}
+			continue;
+		}
+
+		var tmpline = line.trim();
+
+		if (opt.ul !== false && REG_ORDERED.test(tmpline)) {
+
+			var size = line.match(REG_ORDEREDSIZE);
+			if (size)
+				size = size[0].length;
+			else
+				size = 0;
+
+			var ultype = tmpline.charAt(0) === '-' ? 'ul' : 'ol';
+			var tmpstr = (ultype === 'ol' ? tmpline.substring(tmpline.indexOf('.') + 1) : tmpline.substring(2));
+			var istask = false;
+
+			var tt = tmpstr.trim().substring(0, 3);
+			istask = tt === '[ ]' || tt === '[x]';
+
+			var tmpval = tmpstr.trim();
+
+			if (opt.html)
+				tmpval = opt.html(tmpval, 'li');
+
+			builder.push('\0' + (ultype === 'ol' ? ('o' + ((/\d+\./).test(tmpline) ? '1' : 'a')) : 'ul') + size + '<li data-line="{0}" class="markdown-line{1}">'.format(i, istask ? ' markdown-task' : '') + tmpval.replace(/\[x\]/g, '<i class="ti ti-check-square green"></i>').replace(/\[\s\]/g, '<i class="ti ti-square"></i>') + '</li>');
+
+		} else {
+			closeul();
+			if (line) {
+				line = line.trim();
+				if (opt.html)
+					line = opt.html(line, opt.linetag);
+			}
+			line && builder.push((opt.linetag ? ('<' + opt.linetag + ' class="markdown-line" data-line="' + i +  '">') : '') + line.trim() + (opt.linetag ? ('</' + opt.linetag + '>') : ''));
+		}
+	}
+
+	closeul();
+
+	table && opt.tables !== false && builder.push('</tbody></table>');
+	iscode && opt.code !== false && builder.push('</code></pre>');
+
+	builder = parseul(builder);
+	return (opt.wrap ? ('<div class="markdown' + (nested ? '' : ' markdown-container') + '">') : '') + builder.join('\n').replace(/\t/g, '    ') + (opt.wrap ? '</div>' : '');
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "total5",
-  "version": "0.0.1-5",
+  "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]);
 	}
 };
 

package/utils.js

@@ -349,6 +349,7 @@ var CONTENTTYPES = {
 	xml: 'application/xml',
 	xpm: 'image/x-xpixmap',
 	xsl: 'application/xml',
+	xsd: 'application/xml',
 	xslt: 'application/xslt+xml',
 	zip: 'application/zip',
 	'7zip': 'application/x-7z-compressed'
@@ -3163,6 +3164,11 @@ SP.parseConfig = function(def, onerr) {
 		} else
 			subtype = '';
 
+		if (value.substring(0, 7) === 'base64 ' && value.length > 8)
+			value = Buffer.from(value.substring(7).trim(), 'base64').toString('utf8');
+		else if (value.substring(0, 4) === 'hex ' && value.length > 6)
+			value = Buffer.from(value.substring(4).trim(), 'hex').toString('utf8');
+
 		switch (subtype) {
 			case 'string':
 				obj[name] = value;