total5 0.0.10-2 → 0.0.11

package/api.js

@@ -140,7 +140,7 @@ APICallProto.error = APICallProto.err = function(err, reverse) {
 	return this;
 };
 
-APICallProto.callback = function($) {
+APICallProto.callback = APICallProto.pipe = function($) {
 	var t = this;
 	t.$callback = typeof($) === 'function' ? $ : $.callback();
 	return t;

package/bin/total5

@@ -36,12 +36,13 @@ function load(args) {
 setTimeout(load, 10, ARGS);
 
 FUNC.help = function() {
-	console.log('translate                : it makes a resource file with a localized dictionary from the current directory');
-	console.log('minify <filename>        : it minifies .js, .css and .html files');
-	console.log('bundle <filename>        : it makes a bundle from the current directory');
-	console.log('extract <filename>       : it extracts a bundle into the current directory');
-	console.log('edit <url?id=project>    : it opens remote editing of the current directory with the Total.js Code Editor');
-	console.log('8000                     : it starts a web server on port "8000" for the current directory');
+	console.log('translate                                   : it makes a resource file with a localized dictionary from the current directory');
+	console.log('minify <filename>                           : it minifies .js, .css and .html files');
+	console.log('bundle <filename>                           : it makes a bundle from the current directory');
+	console.log('extract <filename>                          : it extracts a bundle into the current directory');
+	console.log('edit <url?id=project>                       : it opens remote editing of the current directory with the Total.js Code Editor');
+	console.log('proxyclient <server_endpoint> <local_port>  : It connects a local port with a remote totaljs proxy server');
+	console.log('8000                                        : it starts a web server on port "8000" for the current directory');
 	done();
 };
 
@@ -241,6 +242,10 @@ FUNC.server = function(port) {
 	F.http({ load: 'none', port: port || 8000 });
 };
 
+FUNC.proxyclient = function(endpoint, port) {
+	require('../proxyclient').init(endpoint, port);
+};
+
 FUNC.edit = function(url) {
 	if (!url)
 		throw new Error('Invalid URL address');

package/builders.js

@@ -117,7 +117,17 @@ Options.prototype.transform = function(name, value, callback) {
 };
 
 Options.prototype.action = function(schema, payload) {
-	return F.action(schema, payload, this.controller);
+	let t = this;
+	let action = F.action(schema, payload, this.controller);
+	if (!t.controller) {
+		if (t.user)
+			action.options.user = t.user;
+		if (t.query)
+			action.options.query = t.query;
+		if (t.params)
+			action.options.params = t.params;
+	}
+	return action;
 };
 
 Options.prototype.promisify = function(fn, a, b, c) {
@@ -231,7 +241,7 @@ Options.prototype.successful = function(callback) {
 	};
 };
 
-Options.prototype.callback = function(value) {
+Options.prototype.callback = Options.prototype.pipe = function(value) {
 
 	var self = this;
 
@@ -1489,7 +1499,7 @@ ActionCaller.prototype.done = function($, fn) {
 	return this;
 };
 
-ActionCaller.prototype.callback = function(value) {
+ActionCaller.prototype.callback = ActionCaller.prototype.pipe = function(value) {
 	this.options.callback = value;
 	return this;
 };

package/changelog.txt

@@ -1,9 +1,24 @@
+========================
+0.0.11
+========================
+
+- fixed `controller` and `user` argument in the `TRANSFORM()` method
+- fixed assigning `user`, `query` and `params` properties in the `$.action()` method
+- fixed nullable `value` argument in the `querybuilder.permit()`
+- fixed parsing `CONF.version`
+- added `QueryBuilder.pipe()` method as alias to `QueryBuilder.callback()`
+- added `API.pipe()` method as alias to `API.callback()`
+- added `Action.pipe()` method as alias to `Action.callback()`
+- added `RESTBuilder.pipe()` method as alias to `RESTBuilder.callback()`
+- added support for localization in the `TEMPLATE()` method
+
 ========================
 0.0.10
 ========================
 
 - improved HTMLParser parser
 - extended `Flow.socket(flow, socket, [verify(client)], [check(client, msg)])` by adding `check` argument for verifying permissions
+- fixed icons in FlowStream core for TMS
 
 ========================
 0.0.9

package/flow-flowstream.js

@@ -3182,7 +3182,7 @@ TMS.refresh = function(fs, callback) {
 					readme.push(beautifyjsonschema(m.schema));
 
 					var id = 'pub' + item.id + 'X' + m.id;
-					var template = TEMPLATE_PUBLISH.format(item.meta.name, m.id, readme.join('\n'), m.icon || 'fas fa-broadcast-tower', m.url, id, item.meta.name.max(15), item.id);
+					var template = TEMPLATE_PUBLISH.format(item.meta.name, m.id, readme.join('\n'), m.icon || 'ti ti-antenna', m.url, id, item.meta.name.max(15), item.id);
 					var com = fs.add(id, template);
 					m.url = url;
 					com.type = 'pub';
@@ -3204,7 +3204,7 @@ TMS.refresh = function(fs, callback) {
 					readme.push(beautifyjsonschema(m));
 
 					var id = 'sub' + item.id + 'X' + m.id;
-					var template = TEMPLATE_SUBSCRIBE.format(item.meta.name, m.id, readme.join('\n'), m.icon || 'fas fa-satellite-dish', m.url, id, item.meta.name.max(15), item.id);
+					var template = TEMPLATE_SUBSCRIBE.format(item.meta.name, m.id, readme.join('\n'), m.icon || 'ti ti-satellite', m.url, id, item.meta.name.max(15), item.id);
 					var com = fs.add(id, template);
 					m.url = url;
 					com.type = 'sub';
@@ -3226,7 +3226,7 @@ TMS.refresh = function(fs, callback) {
 					readme.push(beautifyjsonschema(m.schema));
 
 					var id = 'cal' + item.id + 'X' + m.id;
-					var template = TEMPLATE_CALL.format(item.meta.name, m.id, readme.join('\n'), m.icon || 'fa fa-plug', m.url, id, item.meta.name.max(15), item.id);
+					var template = TEMPLATE_CALL.format(item.meta.name, m.id, readme.join('\n'), m.icon || 'ti ti-plug', m.url, id, item.meta.name.max(15), item.id);
 					var com = fs.add(id, template);
 					m.url = url;
 					com.type = 'call';

package/index.js

@@ -36,7 +36,7 @@ global.DEF = {};
 
 	F.id = '';
 	F.clusterid = '';
-	F.is5 = F.version = 5010;
+	F.is5 = F.version = 5011;
 	F.isBundle = false;
 	F.isLoaded = false;
 	F.version_header = '5';
@@ -608,7 +608,7 @@ F.loadconfig = function(value) {
 		F.Http.globalAgent.maxSockets = 9999;
 
 	if (!F.config.$httpetag)
-		F.config.$httpetag = F.config.version.replace(/\.|\s/g, '');
+		F.config.$httpetag = (F.config.version || '').toString().replace(/\.|\s/g, '');
 
 	if (smtp)
 		F.config.smtp = smtp;
@@ -1976,11 +1976,15 @@ function transform(items, opt, index) {
 F.transform = function(name, value, callback, controller) {
 
 	if (typeof(callback) !== 'function')
-		return new Promise((resolve, reject) => F.transform(name, value, (err, response) => err ? reject(err) : resolve(response), controller));
+		return new Promise((resolve, reject) => F.transform(name, value, (err, response) => err ? reject(err) : resolve(response), callback || controller));
 
 	var items = F.transformations[name];
 	if (items) {
 		let opt = new F.TBuilders.Options(controller, new F.TBuilders.ErrorBuilder());
+
+		if (controller)
+			opt.user = controller.user;
+
 		opt.value = value;
 		opt.$callback = callback;
 		transform(items, opt, 0);

package/package.json

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

package/proxyclient.js

@@ -0,0 +1,145 @@
+// Total.js client for Proxy
+// The MIT License
+// Copyright 2017-2023 (c) Peter Širka <petersirka@gmail.com>
+
+const BUFFER_INIT = Buffer.alloc(1);
+BUFFER_INIT.writeUInt8(0);
+
+const BUFFER_DATA = Buffer.alloc(1);
+BUFFER_DATA.writeUInt8(1);
+
+const BUFFER_END = Buffer.alloc(1);
+BUFFER_END.writeUInt8(2);
+
+const BUFFER_ERROR = Buffer.alloc(1);
+BUFFER_END.writeUInt8(3);
+
+const BUFFER_ABORT = Buffer.alloc(1);
+BUFFER_END.writeUInt8(4);
+
+const Pending = {};
+
+function help() {
+	console.log('Proxy client arguments:');
+	console.log('client [WSS proxy server] [port or ip:port]');
+}
+
+function log() {
+
+	let arr = [new Date().format('yyyy-MM-dd HH:mm:ss')];
+
+	for (let index in arguments)
+		arr.push(arguments[index]);
+
+	console.log.apply(console, arr);
+}
+
+function connect(Source, Target) {
+
+	F.websocketclient(function(client) {
+
+		client.options.type = 'binary';
+		client.connect(Target.replace(/^http/i, 'ws'));
+
+		client.on('open', function() {
+			log('\x1b[42m[OK]\x1b[0m', 'Proxy client successfully connected to \x1b[41m{0}\x1b[0m'.format(Target));
+		});
+
+		client.on('close', function() {
+			log('\x1b[41m[NO]\x1b[0m', 'Proxy client is disconnected.');
+		});
+
+		client.on('message', function(msg) {
+
+			let type = msg.readInt8(0);
+			let id = msg.readInt32BE(1);
+			let data = msg.slice(5);
+			let req = Pending[id];
+
+			switch (type) {
+				case 0: // init
+
+					let tmp = JSON.parse(data.toString('utf8'));
+					let opt = {};
+					opt.hostname = Source[0];
+					opt.port = Source[1];
+					opt.headers = tmp.headers;
+					opt.headers['x-proxy'] = 'Total.js';
+					opt.headers.host = Source[0] + ':' + Source[1];
+					opt.method = tmp.method;
+					opt.path = tmp.url;
+
+					log('\x1b[43m[' + opt.method + ']\x1b[0m', '\x1b[34m' + tmp.ip + '\x1b[0m', opt.path);
+
+					req = Total.Http.request(opt);
+					req.ID = Buffer.alloc(4);
+					req.ID.writeUInt32BE(id);
+
+					Pending[id] = req;
+
+					req.on('error', function(err) {
+						delete Pending[id];
+						client.send(Buffer.concat([BUFFER_ERROR, req.ID, Buffer.from(err.toString(), 'utf8')]));
+					});
+
+					req.on('abort', function() {
+						delete Pending[id];
+						client.send(Buffer.concat([BUFFER_ABORT, req.ID]));
+					});
+
+					req.on('response', function(res) {
+
+						let obj = {};
+						obj.status = res.statusCode;
+						obj.headers = res.headers;
+
+						delete Pending[id];
+						res.req = req;
+						client.send(Buffer.concat([BUFFER_INIT, req.ID, Buffer.from(JSON.stringify(obj))]));
+						res.on('data', chunk => client.send(Buffer.concat([BUFFER_DATA, req.ID, chunk])));
+
+						res.on('error', function(err) {
+							delete Pending[id];
+							client.send(Buffer.concat([BUFFER_ERROR, req.ID, Buffer.from(err.toString(), 'utf8')]));
+						});
+
+						res.on('abort', function() {
+							delete Pending[id];
+							client.send(Buffer.concat([BUFFER_ABORT, req.ID]));
+						});
+
+						res.on('end', () => client.send(Buffer.concat([BUFFER_END, req.ID])));
+					});
+					break;
+
+				case 1: // data
+					req && req.write(data);
+					break;
+
+				case 2: // end
+					req && req.end();
+					break;
+			}
+
+		});
+	});
+}
+
+exports.init = function (endpoint, port) { 
+    let Target = endpoint;
+    let Source = port;
+    
+    if (!Target || !Source) {
+        help();
+        return;
+    }
+    
+    Source = Source.split(':');
+    
+    if (!Source[1]) {
+        Source[1] = +Source[0];
+        Source[0] = '127.0.0.1';
+    }
+
+    connect(Source, Target);
+};

package/querybuilder.js

@@ -153,7 +153,7 @@ CTP.next = function(t) {
 
 };
 
-CTP.callback = function($) {
+CTP.callback = CTP.pipe = function($) {
 	var t = this;
 	t.$callback = typeof($) === 'function' ? $ : $.callback();
 	return t;
@@ -499,7 +499,7 @@ QBP.set = function(name) {
 	return this;
 };
 
-QBP.callback = function($) {
+QBP.callback = QBP.pipe = function($) {
 	var t = this;
 	t.main.callback = typeof($) === 'function' ? $ : $.callback();
 	return t;
@@ -1192,9 +1192,11 @@ QBP.permit = function(name, type, value, userid, required) {
 	var types = type.split('');
 	var arr = [];
 
-	for (let m of value) {
-		for (let n of types)
-			arr.push(n + m);
+	if (value && value.length) {
+		for (let m of value) {
+			for (let n of types)
+				arr.push(n + m);
+		}
 	}
 
 	t.options.checksum += (t.options.checksum ? ' ' : '') + 'permit' + type + arr.join('');

package/templates.js

@@ -6,7 +6,7 @@ exports.render = function(body, model, $) {
 	return new Promise(function(resolve, reject) {
 
 		var cache = F.temporary.templates;
-		var id = 'Ttemplate' + HASH(body);
+		var id = 'Ttemplate' + HASH(body) + ($ ? $.language : '');
 		var data = cache[id];
 
 		if (data) {
@@ -45,7 +45,7 @@ exports.render = function(body, model, $) {
 						return;
 					}
 
-					data = parse(response.body);
+					data = parse(response.body, $);
 					cache[id] = data;
 
 					try {
@@ -83,7 +83,7 @@ exports.render = function(body, model, $) {
 						return;
 					}
 
-					data = parse(response.toString('utf8'));
+					data = parse(response.toString('utf8'), $);
 
 					if (!DEBUG)
 						cache[id] = data;
@@ -102,7 +102,7 @@ exports.render = function(body, model, $) {
 			}
 		}
 
-		data = cache[id] = parse(body);
+		data = cache[id] = parse(body, $);
 
 		try {
 			resolve(data.template({ value: model || data.model }, null, data.helpers));
@@ -115,7 +115,10 @@ exports.render = function(body, model, $) {
 	});
 };
 
-function parse(body) {
+function parse(body, $) {
+
+	if ($ && $.language)
+		body = F.translate($.language, body);
 
 	var helpers = {};
 	var model = EMPTYOBJECT;