total5 0.0.17-9 → 0.0.18-1

package/bin/total5

@@ -41,7 +41,7 @@ FUNC.help = function() {
 	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('proxy <server_endpoint> <local_port>  : It connects a local port with a remote totaljs proxy server');
+	console.log('proxy <server_endpoint> <local_port>  : It connects a local port with a remote Total.js proxy server');
 	console.log('8000                                  : it starts a web server on port "8000" for the current directory');
 	done();
 };
@@ -243,7 +243,7 @@ FUNC.server = function(port) {
 };
 
 FUNC.proxy = function(endpoint, port) {
-	require('../proxy').client(endpoint, port);
+	PROXYCLIENT(endpoint, port);
 };
 
 FUNC.edit = function(url) {

package/changelog.txt

@@ -1,3 +1,12 @@
+========================
+0.0.18
+========================
+
+- fixed handling static files
+- added `flow.proxytimeout {Number}` property
+- extended the `message.send(output, data, [clone_data], [check(from, to, output, input)])` method by adding `check` argument
+- extended `LDAP()` options by adding a new option `attributes = { thumbnailPhoto: 'buffer' }` for custom parsing data
+
 ========================
 0.0.17
 ========================
@@ -23,6 +32,7 @@
 - improved `Utils.filestreamer()` method by adding percentage
 - fixed sending data to all outputs `$.send(null, [data])` in the FlowStream
 - fixed sending data to all outputs `instance.send(null, [data])` in the FlowStream
+- fixed removing WebSocket route
 
 ========================
 0.0.16

package/controller.js

@@ -1595,7 +1595,7 @@ function send_file(ctrl, path, ext) {
 
 	var loadstats = function(err, stats, cache) {
 
-		if (err) {
+		if (err || (cache && cache.size === 0)) {
 
 			if (!DEBUG && ctrl.response.cache)
 				F.temporary.notfound[ctrl.uri.cache] = true;
@@ -1657,6 +1657,15 @@ function send_file(ctrl, path, ext) {
 			if (ctrl.method === 'HEAD') {
 				ctrl.res.end();
 			} else {
+
+				if (end > cache.size || beg > cache.size) {
+					// Unexpected file problem
+					delete F.temporary.tmp[ctrl.uri.cache];
+					ctrl.destroyed = true;
+					ctrl.req.destroy();
+					return;
+				}
+
 				reader = F.Fs.createReadStream(path, { start: beg, end: end });
 
 				// Unexpected error

package/flow-flowstream.js

@@ -1,6 +1,6 @@
 // Total.js FlowStream module
 // The MIT License
-// Copyright 2021-2025 (c) Peter Širka <petersirka@gmail.com>
+// Copyright 2021-2026 (c) Peter Širka <petersirka@gmail.com>
 
 'use strict';
 
@@ -9,7 +9,7 @@ if (!global.F)
 
 const W = F.Worker;
 const Fork = F.Child.fork;
-const VERSION = 34;
+const VERSION = 35;
 const NOTIFYPATH = '/notify/';
 
 var isFLOWSTREAMWORKER = false;
@@ -648,6 +648,8 @@ Instance.prototype.reload = function(data) {
 			}
 
 			PROXIES[data.id] = F.proxy(data.proxypath, data.unixsocket);
+			data.proxytimeout && PROXIES[data.id].timeout(data.proxytimeout);
+
 		}
 
 		for (let key in data)

package/flow.js

@@ -1,6 +1,6 @@
 // Total.js Flow module
 // The MIT License
-// Copyright 2023-2025 (c) Peter Širka <petersirka@gmail.com>
+// Copyright 2023-2026 (c) Peter Širka <petersirka@gmail.com>
 
 'use strict';
 
@@ -81,6 +81,7 @@ FS.reload = function(flow, restart = false) {
 	var instance = FS.instances[flow.id];
 	instance.workertype = flow.worker;
 	instance.proxypath = flow.proxypath;
+	instance.proxytimeout = flow.proxytimeout;
 
 	if (restart)
 		instance.restart();
@@ -141,6 +142,7 @@ FS.load = function(flow, callback) {
 	// flow.worker {String/Boolean}
 	// flow.memory {Number}
 	// flow.proxypath {String}
+	// flow.proxytimeout {Number}
 
 	if (FS.instances[flow.id]) {
 		FS.reload(flow);

package/flowstream.js

@@ -1,6 +1,6 @@
 // Total.js FlowStream
 // The MIT License
-// Copyright 2021-2025 (c) Peter Širka <petersirka@gmail.com>
+// Copyright 2021-2026 (c) Peter Širka <petersirka@gmail.com>
 
 'use strict';
 
@@ -350,9 +350,9 @@ function timeouthandler(msg) {
 	msg.end();
 }
 
-MP.send = function(outputindex, data, clonedata) {
+MP.send = function(outputindex, data, clonedata, check) {
 
-	let self = this;
+	const self = this;
 
 	if (clonedata == null)
 		clonedata = self.main.cloning;
@@ -363,7 +363,6 @@ MP.send = function(outputindex, data, clonedata) {
 		return 0;
 	}
 
-	let outputs;
 	let count = 0;
 
 	if (outputindex == null) {
@@ -379,11 +378,8 @@ MP.send = function(outputindex, data, clonedata) {
 		return count;
 	}
 
-
-	let meta = self.main.meta;
-	let now = Date.now();
-
-	outputs = self.instance.connections ? (self.instance.connections[outputindex] || F.EMPTYARRAY) : F.EMPTYARRAY;
+	const now = Date.now();
+	const meta = self.main.meta;
 
 	if (self.processed === 0) {
 		self.processed = 1;
@@ -406,6 +402,7 @@ MP.send = function(outputindex, data, clonedata) {
 		return count;
 	}
 
+	let outputs = self.instance.connections ? (self.instance.connections[outputindex] || F.EMPTYARRAY) : F.EMPTYARRAY;
 	let tid = self.toid + D + outputindex + (self.color || '');
 
 	if (self.main.stats.traffic[tid]) {
@@ -425,14 +422,20 @@ MP.send = function(outputindex, data, clonedata) {
 		if (output.disabled || output.paused)
 			continue;
 
-		let schema = meta.flow[output.id];
+		const schema = meta.flow[output.id];
 		if (schema && (schema.message || schema['message_' + output.index]) && schema.component && schema.ready && self.main.$can(true, output.id, output.index)) {
-			let next = meta.components[schema.component];
+			const next = meta.components[schema.component];
 			if (next && next.connected && !next.isdestroyed && !next.disabled) {
 
 				if (output.color && self.color && self.color !== output.color)
 					continue;
 
+				if (check) {
+					// from, to, output, input
+					if (!check(self.to, schema, outputindex, output.index))
+						continue;
+				}
+
 				let inputindex = output.index;
 				let message = self.clone();
 

package/index.js

@@ -38,7 +38,7 @@ global.DEF = {};
 
 	F.id = '';
 	F.clusterid = '';
-	F.is5 = F.version = 5017;
+	F.is5 = F.version = 5018;
 	F.isBundle = false;
 	F.isLoaded = false;
 	F.version_header = '5';

package/ldap.js

@@ -85,12 +85,13 @@ const TYPES = {
 	Context: 128
 };
 
-function Reader(buffer, callback) {
+function Reader(buffer, callback, opt) {
 
 	if (buffer instanceof Array)
 		buffer = Buffer.concat(buffer);
 
-	var t = this;
+	const t = this;
+	t.opt = opt;
 	t.buffer = buffer;
 	t.size = t.buffer.length;
 	t.length = 0;
@@ -99,8 +100,8 @@ function Reader(buffer, callback) {
 	t.callback = callback;
 }
 
-Reader.parse = function(buffer, callback) {
-	var reader = new Reader(buffer, callback);
+Reader.parse = function(buffer, callback, opt) {
+	const reader = new Reader(buffer, callback, opt);
 	reader.parse();
 };
 
@@ -112,11 +113,11 @@ Reader.prototype = {
 
 Reader.prototype.readbyte = function(peek) {
 
-	var self = this;
+	const self = this;
 	if (self.size - self.offset < 1)
 		return null;
 
-	var b = self.buffer[self.offset] & 0xff;
+	const b = self.buffer[self.offset] & 0xff;
 
 	if (!peek)
 		self.offset += 1;
@@ -133,15 +134,48 @@ Reader.prototype.readattribute = function(attr) {
 	if (self.peek() === PROTOCOL.LBER_SET) {
 
 		if (self.readsequence(PROTOCOL.LBER_SET)) {
-			var end = self.offset + self.length;
+			let end = self.offset + self.length;
 			while (self.offset < end) {
 
-				var val = self.readstring(TYPES.OctetString, true);
+				let val = self.readstring(TYPES.OctetString, true);
+				let is = false;
+
+				if (self.opt.attributes) {
+					switch (self.opt.attributes[id]) {
+						case 'string':
+							val = val.toString('utf8');
+							is = true;
+							break;
+						case 'number':
+							val = val.toString('utf8').parseFloat();
+							is = true;
+							break;
+						case 'date':
+							val = val.toString('utf8').parseDate();
+							is = true;
+							break;
+						case 'hex':
+						case 'ascii':
+						case 'base16':
+						case 'base32':
+						case 'base64':
+						case 'utf8':
+							val = val.toString(self.opt.attributes[id]);
+							is = true;
+							break;
+						case 'buffer':
+						case 'binary':
+							is = true;
+							break;
+					}
+				}
 
-				if (id === 'objectGUID' || id === 'objectSid')
-					val = val.toString('hex');
-				else
-					val = val.toString('utf8');
+				if (!is) {
+					if (id === 'objectGUID' || id === 'objectSid')
+						val = val.toString('hex');
+					else
+						val = val.toString('utf8');
+				}
 
 				if (attr[id]) {
 					if (!(attr[id] instanceof Array))
@@ -705,6 +739,7 @@ exports.load = function(opt, callback) {
 	// opt.login {String} required for the "profile" type
 	// opt.dn {String}
 	// opt.noauth {Boolean} true skips auth
+	// opt.attributes = { prop1: 'buffer', prop2: 'hex', prop3: 'base64' }; types must be in lower-case
 
 	if (opt.callback)
 		callback = opt.callback;
@@ -732,7 +767,7 @@ exports.load = function(opt, callback) {
 			Reader.parse(buffer, function(err, response) {
 				callback(err, profile ? (response ? response[0] : null) : response);
 				meta.close();
-			});
+			}, opt);
 		};
 
 		meta.ondata(function(chunk) {
@@ -753,7 +788,7 @@ exports.load = function(opt, callback) {
 					}
 
 					auth = false;
-				});
+				}, opt);
 			} else {
 				buffer.push(chunk);
 				timeout && clearTimeout(timeout);
@@ -769,7 +804,7 @@ exports.load = function(opt, callback) {
 			// No emitted any data in "ondata" handler
 			Reader.parse(buffer, function(err) {
 				callback(err, profile ? null : EMPTYARRAY);
-			});
+			}, opt);
 
 		});
 

package/package.json

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

package/routing.js

@@ -1,5 +1,5 @@
 // The MIT License
-// Copyright 2023 (c) Peter Širka <petersirka@gmail.com>
+// Copyright 2023-2026 (c) Peter Širka <petersirka@gmail.com>
 
 const NEWLINE = '\r\n';
 
@@ -322,8 +322,10 @@ Route.prototype.remove = function() {
 			index = F.routes.websockets.indexOf(self);
 			if (index !== -1)
 				F.routes.websockets.splice(index, 1);
-			for (let conn of self.connections)
-				conn.destroy();
+			if (self.connections instanceof Array) {
+				for (let conn of self.connections)
+					conn.destroy();
+			}
 			break;    
 		case 'file':
 			index = F.routes.files.indexOf(self);

package/websocket.js

@@ -694,9 +694,9 @@ WebSocket.prototype.encrypt = function(enable) {
 };
 
 WebSocket.prototype.find = function(fn) {
-	var self = this;
-	for (var key in self.connections) {
-		var ctrl = self.connections[key];
+	let self = this;
+	for (let key in self.connections) {
+		let ctrl = self.connections[key];
 		if (fn(ctrl))
 			return ctrl;
 	}
@@ -704,7 +704,7 @@ WebSocket.prototype.find = function(fn) {
 
 WebSocket.prototype.send = function(message, comparer, replacer, params) {
 
-	var self = this;
+	let self = this;
 
 	if (message === undefined)
 		return self;
@@ -714,11 +714,11 @@ WebSocket.prototype.send = function(message, comparer, replacer, params) {
 		replacer = null;
 	}
 
-	var raw = false;
-	var data = null;
+	let raw = false;
+	let data = null;
 
-	for (var key in self.connections) {
-		var ctrl = self.connections[key];
+	for (let key in self.connections) {
+		let ctrl = self.connections[key];
 		if (data == null) {
 			if (ctrl.datatype === 'json') {
 				raw = true;
@@ -740,20 +740,20 @@ WebSocket.prototype.send = function(message, comparer, replacer, params) {
 // Ping all connections
 WebSocket.prototype.ping = function() {
 
-	var self = this;
+	let self = this;
 
 	self.$ping = true;
 	F.stats.other.websocketping++;
 
-	var ts = Date.now();
-	for (var key in self.connections)
+	let ts = Date.now();
+	for (let key in self.connections)
 		self.connections[key].ping(ts);
 
 	return self;
 };
 
 WebSocket.prototype.api = function(api) {
-	var self = this;
+	let self = this;
 
 	if (!api.startsWith('/@')) {
 		if (api[0] !== '@')
@@ -771,9 +771,9 @@ WebSocket.prototype.api = function(api) {
 
 WebSocket.prototype.close = function(code, message) {
 
-	var self = this;
+	let self = this;
 
-	for (var key in self.connections) {
+	for (let key in self.connections) {
 		self.connections[key].close(code, message);
 		delete self.connections[key];
 	}
@@ -783,13 +783,13 @@ WebSocket.prototype.close = function(code, message) {
 };
 
 WebSocket.prototype.error = function(err) {
-	var self = this;
+	let self = this;
 	F.error(typeof(err) === 'string' ? new Error(err) : err, self.name, self.url);
 };
 
 WebSocket.prototype.destroy = function() {
 
-	var self = this;
+	let self = this;
 
 	if (!self.connections)
 		return self;
@@ -800,15 +800,15 @@ WebSocket.prototype.destroy = function() {
 
 	setTimeout(function(self) {
 
-		for (var key in self.connections) {
-			var conn = self.connections[key];
+		for (let key in self.connections) {
+			let conn = self.connections[key];
 			if (conn) {
 				conn.isclosed2 = true;
 				conn.socket.removeAllListeners();
 			}
 		}
 
-		var index = self.route.connections.indexOf(self);
+		let index = self.route.connections.indexOf(self);
 		if (index !== -1)
 			self.route.connections.splice(index, 1);