total5 0.0.6-4 → 0.0.6-6

package/builders.js

@@ -134,6 +134,8 @@ Options.prototype.promisify = function(fn, a, b, c) {
 	});
 };
 
+Options.prototype.status = function() {};
+
 Options.prototype.publish = function(value) {
 	var self = this;
 	var name = self.id;
@@ -1254,6 +1256,11 @@ ActionCaller.prototype.params = function(value) {
 	return this;
 };
 
+ActionCaller.prototype.status = function(fn) {
+	this.options.status = fn;
+	return this;
+};
+
 ActionCaller.prototype.exec = function() {
 
 	var self = this;
@@ -1379,6 +1386,7 @@ ActionCaller.prototype.exec = function() {
 	} else
 		$.payload = payload;
 
+	$.status = self.options.status;
 	action.action($, $.payload);
 };
 

package/cache.js

@@ -12,7 +12,7 @@ exports.set = function(key, value, expire = '5 minutes') {
 exports.read = exports.get = function(key, def) {
 	var item = F.temporary.cache[key];
 	global.NOW = new Date();
-	if (item && item.expire < global.NOW)
+	if (item && item.expire > global.NOW)
 		return item.value;
 	else
 		return def;

package/changelog.txt

@@ -13,6 +13,21 @@
 - added `Image` global variable
 - added `Utils.filestreamer(filename, onbuffer(buffer, next), onend, [buffer_size])`
 - fix image bug in the `Image.measureWEBP()` method by [Marek Mraz](https://github.com/Mrazbb)
+- added `action.status(fn)` for handling and `$.status(value)` for calling in actions
+- added HTTP auto-redirect for `WebSocketClient`
+- added support for WebSocket redirections in the remote edit
+- fixed `CACHE.read()`
+- added a new argument `size {Number}` to the `WebSocket.on('message', function(client, msg, [size]))` event
+- fixed `@{href()}` command in the ViewEngine
+- improved config & resource parser by adding support for `=` between key and value and for `#` as a comment
+- removed `@{url()}` method and added `@{url}` property
+- added `@{hostname([url])}`
+- added `controller.href()` method
+- extended `HTMLParser` by adding selector for prefixes, example: `node.find('xsd:')`
+- fixed parsing attributes with the `_` character in the `HTMLParser`
+- fixed parsing unpair XML elements in the `HTMLParser`
+- improved Markdown parser
+- added a test functionality for testing Flow components
 
 ========================
 0.0.5

package/controller.js

@@ -39,7 +39,7 @@ function Controller(req, res) {
 	ctrl.ext = ctrl.uri.ext;
 	ctrl.split = ctrl.uri.split;
 	ctrl.split2 = [];
-	ctrl.url = ctrl.uri.key;
+	ctrl.url = ctrl.uri.pathname;
 	ctrl.released = false;
 	ctrl.downloaded = false;
 	ctrl.protocol = req.connection.encrypted || (req.headers['x-forwarded-protocol'] || req.headers['x-forwarded-proto']) === 'https' ? 'https' : 'http';
@@ -1034,6 +1034,10 @@ Controller.prototype.$route = function() {
 
 };
 
+Controller.prototype.href = function(key, value) {
+	return F.TViewEngine.prototype.href.call(this, key, value);
+};
+
 function readfile(filename, callback) {
 	F.stats.performance.open++;
 	F.Fs.lstat(filename, function(err, stats) {
@@ -1766,4 +1770,4 @@ HttpFile.prototype.fs = function(storage, fileid, callback, custom, expire) {
 	return F.filestorage(storage).save(fileid, this.filename, this.path, callback, custom, expire);
 };
 
-exports.Controller = Controller;
+exports.Controller = Controller;

package/edit.js

@@ -16,16 +16,30 @@ exports.init = function(url) {
 	client.options.reconnect = 10000;
 	client.options.reconnectserver = true;
 
+	var initilaized = false;
+
 	client.on('message', function(msg) {
 
+		if (msg.TYPE === 'redirect') {
+			if (msg.url) {
+				client.close(3001);
+				exports.init(msg.url);
+			}
+			return;
+		}
+
 		if (msg.TYPE === 'init') {
 			console.log(DIVIDER);
 			console.log(HEADER + ': Welcome to "' + msg.name + ' (' + msg.version + ')"');
 			console.log('> Project: "' + msg.project + '"');
 			console.log(DIVIDER);
+			initilaized = true;
 			return;
 		}
 
+		if (!initilaized)
+			return;
+
 		F.action('editor', msg).callback(function(err, response) {
 
 			if (err) {
@@ -45,6 +59,8 @@ exports.init = function(url) {
 
 	client.on('close', function(e) {
 
+		initilaized = false;
+
 		if (e === 4004) {
 			console.log(HEADER + ': 404 project not found');
 			// Tries again in 10 second interval

package/flow-flowstream.js

@@ -2648,8 +2648,10 @@ function MAKEFLOWSTREAM(meta) {
 
 	var sendstatusforce = function(instance) {
 		instance.$statusdelay = null;
-		if (instance.$status != null && flow.proxy.online)
+		if (instance.$status != null) {
 			flow.proxy.online && flow.proxy.send({ TYPE: 'flow/status', id: instance.id, data: instance.$status });
+			flow.$events.status && flow.emit('status', instance, instance.$status);
+		}
 	};
 
 	// component.status() will execute this method
@@ -2663,22 +2665,24 @@ function MAKEFLOWSTREAM(meta) {
 		if (delay) {
 			if (!instance.$statusdelay)
 				instance.$statusdelay = setTimeout(sendstatusforce, delay || 1000, instance);
-		} else if (instance.$status != null && flow.proxy.online)
-			flow.proxy.online && flow.proxy.send({ TYPE: 'flow/status', id: instance.id, data: instance.$status });
+		} else
+			sendstatusforce(instance);
 	};
 
 	// component.dashboard() will execute this method
-	flow.ondashboard = function(status) {
+	flow.ondashboard = function(data) {
 
 		var instance = this;
 
-		if (status == null)
-			status = instance.$dashboard;
+		if (data == null)
+			data = instance.$dashboard;
 		else
-			instance.$dashboard = status;
+			instance.$dashboard = data;
 
-		if (status != null && flow.proxy.online)
-			flow.proxy.online && flow.proxy.send({ TYPE: 'flow/dashboard', id: instance.id, data: status });
+		if (data != null) {
+			flow.proxy.online && flow.proxy.send({ TYPE: 'flow/dashboard', id: instance.id, data: data });
+			flow.$events.dashboard && flow.emit('dashboard', instance, instance.data);
+		}
 
 	};
 

package/flow-test.js

@@ -0,0 +1,141 @@
+exports.load = function(name, source, config, init) {
+
+	if (typeof(config) === 'function') {
+		init = config;
+		config = {};
+	}
+
+	let schema = {};
+
+	schema.id = 'test';
+	schema.name = 'Test';
+	schema.paused = false;
+	schema.cloning = true;
+	schema.design = {};
+	schema.components = {};
+	schema.components.dummy = `<script total>
+	exports.id = 'dummy';
+	exports.name = 'Dummy';
+	exports.inputs = [{ id: 'input', name: 'Input' }];
+	exports.make = function(instance) {
+
+		instance.refresh = function() {
+			// somethings happens e.g. reconfiguration
+			instance.main.refresh2 && instance.main.refresh2();
+		};
+
+		instance.message = function($) {
+			instance.main.test.message && instance.main.test.message($, $.data);
+			instance.main.test.output && instance.main.test.output($, $.data);
+		};
+	};
+</script>`;
+
+	schema.components[name] = source;
+	schema.variables = {};
+
+	schema.design.dummy = {
+		id: 'dummy',
+		component: 'dummy',
+		connections: {}
+	};
+
+	schema.design.component = {
+		id: 'component',
+		component: name,
+		config: config || {},
+		connections: {}
+	};
+
+	var Test = {};
+
+	Test.variables = function(variables) {
+		Test.flow.variables(variables);
+	};
+
+	Test.input = Test.send = function(name, data) {
+		let msg = Test.dummy.newmessage(data);
+		setImmediate(() => msg.send(name));
+		return msg;
+	};
+
+	Test.assert = function(ok, message) {
+		if (ok)
+			Test.ok(message);
+		else
+			Test.fail(message);
+	};
+
+	Test.ok = function(message = name) {
+		console.log(new Date().format('yyyy-MM-dd HH:mm:ss:ms') + ' [OK]: ' + message);
+	};
+
+	Test.fail = function(message = 'Unexpected problem') {
+		console.warn(new Date().format('yyyy-MM-dd HH:mm:ss:ms') + ' [NO]: ' + message);
+		throw new Error(message);
+	};
+
+	Test.trigger = function(data) {
+		Flow.test.component.trigger(data);
+	};
+
+	Test.reconfigure = function(value) {
+		Test.flow.reconfigure('component', value);
+	};
+
+	Flow.load(schema, function(err, instance) {
+
+		var skip = false;
+
+		instance.flow.refresh2 = function() {
+
+			if (skip)
+				return;
+
+			let component = instance.flow.meta.flow.component;
+			let outputs = component.outputs || instance.flow.meta.components[name].outputs || [];
+			let inputs = component.inputs || instance.flow.meta.components[name].inputs || [];
+
+			instance.flow.meta.flow.component.connections = {};
+			instance.flow.meta.flow.dummy.connections = {};
+
+			for (let m of outputs)
+				instance.flow.meta.flow.component.connections[m.id] = [{ id: 'dummy', index: 'input' }];
+
+			for (let m of inputs)
+				instance.flow.meta.flow.dummy.connections[m.id] = [{ id: 'component', index: m.id }];
+		};
+
+		Test.flow = instance;
+		Test.component = instance.flow.meta.flow.component;
+		Test.dummy = instance.flow.meta.flow.dummy;
+
+		instance.flow.onreconfigure = function(component) {
+			Test.configure && setImmediate(() => Test.configure(component.config));
+		};
+
+		instance.flow.test = Test;
+		instance.flow.refresh2();
+
+		instance.flow.on('debug', function(a, b, c, d) {
+			Test.debug && Test.debug(a, b, c, d);
+		});
+
+		instance.flow.on('status', function(instance, status) {
+			Test.status && Test.status(status);
+		});
+
+		instance.flow.on('error', function(a, b, c, d) {
+			Test.error && Test.error(a, b, c, d);
+		});
+
+		instance.flow.on('dashboard', function(instance, data) {
+			Test.dashboard && Test.dashboard(data);
+		});
+
+		instance.onerror = () => process.exit(1);
+		init && init(Test);
+
+	});
+
+};

package/flow.js

@@ -16,6 +16,7 @@ FS.worker = false;
 FS.instances = {};
 FS.onerror = function(err, source, id, componentid, stack) {
 
+throw new Error('FET');
 	var flow = FS.db[this.id];
 	var empty = '---';
 	var output = '';
@@ -168,6 +169,7 @@ FS.load = function(flow, callback) {
 			FS.$events.load && FS.emit('load', instance, flow);
 			callback && callback(err, err ? null : instance);
 		};
+
 	});
 
 };
@@ -229,6 +231,10 @@ FS.ping = function() {
 	}
 };
 
+FS.test = function(name, source, config, init) {
+	require('./flow-test.js').load(name, source, config, init);
+};
+
 global.Flow = FS;
 global.FlowStream = exports;
 

package/flowstream.js

@@ -380,6 +380,7 @@ MP.send = function(outputindex, data, clonedata) {
 		return count;
 	}
 
+
 	var meta = self.main.meta;
 	var now = Date.now();
 
@@ -930,11 +931,13 @@ FP.onreconfigure = function(instance, init) {
 */
 
 FP.ondashboard = function(a, b, c, d) {
+	// Flow uses only the "a {Object}" argument
 	// this == instance
 	this.main.$events.dashboard && this.main.emit('dashboard', this, a, b, c, d);
 };
 
 FP.onstatus = function(a, b, c, d) {
+	// Flow uses only the "a {Object}" argument
 	// this == instance
 	this.main.$events.status && this.main.emit('status', this, a, b, c, d);
 };

package/htmlparser.js

@@ -67,7 +67,12 @@ function parseRule(selector, output) {
 	}
 
 	selector = selector.trim();
-	rule.tagName = selector[0] === '*' ? '' : selector.toUpperCase();
+
+	if (selector[selector.length - 1] === ':') {
+		rule.prefix = selector.toUpperCase();
+		rule.tagName = '';
+	} else
+		rule.tagName = selector[0] === '*' ? '' : selector.toUpperCase();
 
 	return rule;
 }
@@ -168,6 +173,9 @@ HTMLElement.prototype.find = function(selector, reverse) {
 			if (rule.tagName && rule.tagName !== node.tagName)
 				skip = true;
 
+			if (rule.prefix && rule.prefix !== node.prefix)
+				skip = true;
+
 			if (rule.attrs.length && !skip) {
 				for (var attr of rule.attrs) {
 					switch (attr.id) {
@@ -439,6 +447,7 @@ HTMLElement.prototype.toString = HTMLElement.prototype.html = function(formatted
 						builder.push(indent + item.textContent);
 					break;
 				default:
+					tag = item.raw;
 					if (item.unpair) {
 						builder.push(indent + '<' + tag + (attrs.length ? (' ' + attrs.join(' ')) : '') + ' />');
 					} else {
@@ -490,7 +499,7 @@ function parseHTML(html, trim, onerror, isxml) {
 	};
 
 	var parseAttrs = function(str) {
-		var attrs = str.match(/[a-z-0-9A-Z\:]+(=("|').*?("|'))?/g);
+		var attrs = str.match(/[a-z-0-9A-Z\:_-]+(=("|').*?("|'))?/g);
 		var obj = {};
 		if (attrs) {
 			for (var m of attrs) {
@@ -566,6 +575,11 @@ function parseHTML(html, trim, onerror, isxml) {
 		}
 
 		dom.tagName = tag.toUpperCase();
+		index = dom.tagName.indexOf(':');
+
+		if (index !== -1)
+			dom.prefix = dom.tagName.substring(0, index + 1);
+
 		dom.children = [];
 		dom.attrs = node ? parseAttrs(node) : {};
 		dom.raw = tag;
@@ -575,7 +589,10 @@ function parseHTML(html, trim, onerror, isxml) {
 		str = str.substring(end + 1);
 
 		// Unpair tags
-		if (!isxml) {
+		if (isxml) {
+			if (dom.unpair)
+				return str;
+		} else {
 			switch (dom.tagName) {
 				case 'BR':
 				case 'HR':

package/index.js

@@ -650,7 +650,7 @@ F.loadresource = function(name, value) {
 
 		let index = line.indexOf(':');
 		if (index === -1) {
-			index = line.indexOf('\t:');
+			index = line.indexOf('=');
 			if (index === -1)
 				continue;
 		}

package/markdown.js

@@ -9,7 +9,7 @@ const REG_ICONS = /(^|[^\w]):((fab|far|fas|fal|fad|fa|ti)\s(fa|ti)-)?[a-z-]+:([^
 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_ORDERED = /^[a-z|0-9]{1,3}\.\s|^(-|\*|\+)\s/i;
 const REG_ORDEREDSIZE = /^(\s|\t)+/;
 const REG_CODE = /`.*?`/g;
 const REG_ENCODETAGS = /<|>/g;
@@ -732,7 +732,8 @@ String.prototype.markdown = function(opt, nested) {
 			else
 				size = 0;
 
-			var ultype = tmpline.charAt(0) === '-' ? 'ul' : 'ol';
+			var c = tmpline.charAt(0);
+			var ultype = c === '-' || c === '*' || c === '+' ? 'ul' : 'ol';
 			var tmpstr = (ultype === 'ol' ? tmpline.substring(tmpline.indexOf('.') + 1) : tmpline.substring(2));
 			var istask = false;
 

package/package.json

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

package/utils.js

@@ -3218,7 +3218,7 @@ SP.parseConfig = function(def, onerr) {
 
 		index = str.indexOf(':');
 		if (index === -1) {
-			index = str.indexOf('\t:');
+			index = str.indexOf('=');
 			if (index === -1)
 				continue;
 		}

package/viewengine.js

@@ -591,6 +591,8 @@ function View(controller) {
 	self.language = controller?.language || '';
 	self.repository = { layout: 'layout' };
 	self.islayout = false;
+	self.url = controller?.url || '';
+	self.query = controller?.query || {};
 }
 
 View.prototype.ota = function(obj) {
@@ -655,29 +657,23 @@ View.prototype.keywords = function(value) {
 	return '';
 };
 
-function querystring_encode(value, def, key) {
-
-	if (value instanceof Array) {
-		var tmp = '';
-		for (var i = 1; i < value.length; i++)
-			tmp += (tmp ? '&' : '') + key + '=' + querystring_encode(value[i], def);
-		return querystring_encode(value[0], def) + (tmp ? tmp : '');
-	}
-
-	return value != null ? value instanceof Date ? encodeURIComponent(value.format()) : typeof(value) === 'string' ? encodeURIComponent(value) : (value + '') : def || '';
-}
-
+// @{href({ key1: 1, key2: 2 })}
+// @{href('key', 'value')}
 // @{href({ key1: 1, key2: 2 })}
 // @{href('key', 'value')}
 View.prototype.href = function(key, value) {
 
 	var self = this;
+	var query = self.query;
 
 	if (!arguments.length) {
-		let val = F.TUtils.toURLEncode(self.query);
+		let val = F.TUtils.toURLEncode(query);
 		return val ? '?' + val : '';
 	}
 
+	if (!self.repository)
+		self.repository = {};
+
 	var type = typeof(key);
 	var obj;
 
@@ -688,18 +684,21 @@ View.prototype.href = function(key, value) {
 
 		if (!str) {
 
-			obj = F.TUtils.copy(self.query);
+			obj = {};
+
+			for (let key in query)
+				obj[key] = query[key];
 
-			for (var i = 2; i < arguments.length; i++)
+			for (let i = 2; i < arguments.length; i++)
 				obj[arguments[i]] = undefined;
 
 			obj[key] = '\0';
 
-			for (var m in obj) {
+			for (let m in obj) {
 				var val = obj[m];
 				if (val !== undefined) {
 					if (val instanceof Array) {
-						for (var j = 0; j < val.length; j++)
+						for (let j = 0; j < val.length; j++)
 							str += (str ? '&' : '') + m + '=' + (key === m ? '\0' : querystring_encode(val[j]));
 					} else
 						str += (str ? '&' : '') + m + '=' + (key === m ? '\0' : querystring_encode(val));
@@ -708,22 +707,25 @@ View.prototype.href = function(key, value) {
 			self.repository[cachekey] = str;
 		}
 
-		str = str.replace('\0', querystring_encode(value, self.query[key], key));
+		str = str.replace('\0', querystring_encode(value, query[key], key));
 
-		for (var i = 2; i < arguments.length; i++) {
-			var beg = str.indexOf(arguments[i] + '=');
+		for (let i = 2; i < arguments.length; i++) {
+			let beg = str.indexOf(arguments[i] + '=');
 			if (beg === -1)
 				continue;
-			var end = str.indexOf('&', beg);
+			let end = str.indexOf('&', beg);
 			str = str.substring(0, beg) + str.substring(end === -1 ? str.length : end + 1);
 		}
 
-		return str ? '?' + str : '';
+		return str ? ('?' + str) : '';
 	}
 
 	if (value) {
-		obj = F.TUtils.copy(self.query);
-		F.TUtils.extend(obj, value);
+		obj = {};
+		for (let key in query)
+			obj[key] = query[key];
+		for (let key in value)
+			obj[key] = value[key];
 	}
 
 	if (value != null)
@@ -737,6 +739,18 @@ View.prototype.href = function(key, value) {
 	return self.url + (obj ? '?' + obj : '');
 };
 
+function querystring_encode(value, def, key) {
+
+	if (value instanceof Array) {
+		var tmp = '';
+		for (var i = 1; i < value.length; i++)
+			tmp += (tmp ? '&' : '') + key + '=' + querystring_encode(value[i], def);
+		return querystring_encode(value[0], def) + (tmp ? tmp : '');
+	}
+
+	return value != null ? value instanceof Date ? encodeURIComponent(value.format()) : typeof(value) === 'string' ? encodeURIComponent(value) : (value + '') : def || '';
+}
+
 function makehtmlmeta(self) {
 
 	var builder = '';
@@ -850,9 +864,9 @@ View.prototype.section = function(name, value, replace) {
 	return self;
 };
 
-View.prototype.url = function(hostname = false) {
+View.prototype.hostname = function(url) {
 	var self = this;
-	return hostname ? (self.controller ? self.controller.hostname(self.controller.url) : '') : (self.controller ? self.controller.url : '');
+	return self.controller ? self.controller.hostname(url == null ? self.controller.url : url) : (url || '');
 };
 
 View.prototype.set = function() {

package/websocket.js

@@ -411,14 +411,15 @@ Controller.prototype.decode = function() {
 
 	var ctrl = this;
 	var data = ctrl.current.body;
+	var size = data.length;
 
 	F.stats.performance.message++;
-	F.stats.performance.download += data.length / 1024 / 1024;
+	F.stats.performance.download += size / 1024 / 1024;
 
 	switch (ctrl.datatype) {
 
 		case 'binary':
-			ctrl.parent.$events.message && ctrl.parent.emit('message', ctrl, data);
+			ctrl.parent.$events.message && ctrl.parent.emit('message', ctrl, data, size);
 			break;
 
 		case 'json':
@@ -440,7 +441,7 @@ Controller.prototype.decode = function() {
 					tmp = tmp.replace(REG_EMPTYBUFFER, '');
 
 				if (tmp !== undefined && ctrl.parent.$events.message)
-					ctrl.parent.emit('message', this, tmp);
+					ctrl.parent.emit('message', this, tmp, size);
 			}
 			break;
 
@@ -458,7 +459,7 @@ Controller.prototype.decode = function() {
 			if (REG_EMPTYBUFFER_TEST.test(data))
 				data = data.replace(REG_EMPTYBUFFER, '');
 
-			ctrl.parent.$events.message && ctrl.parent.emit('message', ctrl, data);
+			ctrl.parent.$events.message && ctrl.parent.emit('message', ctrl, data, size);
 			break;
 	}
 
@@ -1272,6 +1273,11 @@ WebSocketClient.prototype.connectforce = function(self, url, protocol, origin) {
 
 	self.req.on('response', function(res) {
 
+		if (res.statusCode === 301 || res.statusCode === 302) {
+			self.connect(res.headers.location, self.protocol, self.origin);
+			return;
+		}
+
 		self.$events.error && self.emit('error', new Error('Unexpected server response (' + res.statusCode + ')'));
 
 		if (self.options.reconnectserver) {
@@ -1529,13 +1535,14 @@ WebSocketClient.prototype.decode = function() {
 
 	var self = this;
 	var data = self.current.body;
+	var size = data.length;
 
 	F.stats.performance.message++;
 
 	switch (self.options.type) {
 
 		case 'binary':
-			self.emit('message', data);
+			self.emit('message', data, size);
 			break;
 
 		case 'json':
@@ -1552,7 +1559,7 @@ WebSocketClient.prototype.decode = function() {
 			if (data.isJSON()) {
 				var tmp = data.parseJSON(true);
 				if (tmp !== undefined)
-					self.emit('message', tmp);
+					self.emit('message', tmp, size);
 			}
 			break;
 
@@ -1567,7 +1574,7 @@ WebSocketClient.prototype.decode = function() {
 			if (self.options.encrypt)
 				data = F.TUtils.decrypt_data(data, self.options.encrypt);
 
-			self.emit('message', data);
+			self.emit('message', data, size);
 			break;
 	}