total5 0.0.16-7 → 0.0.16-9

package/aimodel.js

@@ -7,11 +7,11 @@ function AI(model) {
 
 	t.options = {};
 	t.options.callback = NOOP;
+	t.config = {};
 
 	t.payload = {};
 	t.payload.model = model;
 	t.payload.messages = [];
-	t.response = [];
 }
 
 // Enables think mode
@@ -30,13 +30,34 @@ AI.prototype.message = function(role, content, merge) {
 	if (merge) {
 		for (let m of t.payload.messages) {
 			if (m.role === role) {
-				m.content += merge + content;
+
+				if (typeof(content) === 'object') {
+					for (let key in content)
+						m[key] = content[key];
+				} else
+					m.content += merge + content;
+
 				return this;
 			}
 		}
 	}
 
-	t.payload.messages.push({ role: role, content: content });
+	const msg = { role: role };
+
+	if (typeof(content) === 'object') {
+		for (let key in content)
+			msg[key] = content[key];
+	} else
+		msg.content = content;
+
+	t.payload.messages.push(msg);
+	return t;
+};
+
+AI.prototype.configure = function(opt) {
+	const t = this;
+	for (let key in opt)
+		t.config[key] = opt[key];
 	return t;
 };
 
@@ -48,6 +69,11 @@ AI.prototype.user = function(content, merge) {
 	return this.message('user', content, merge);
 };
 
+AI.prototype.prompt = function(content) {
+	this.payload.prompt = content;
+	return this;
+};
+
 AI.prototype.assistant = function(content, merge) {
 	return this.message('assistant', content, merge);
 };
@@ -86,10 +112,16 @@ AI.prototype.callback = function(fn) {
 // Internal function
 AI.prototype.run = function() {
 	const t = this;
-	let fn = F.aimodels[t.payload.model];
-	if (fn)
-		fn(t);
-	else
+	let ai = F.aimodels[t.payload.model];
+	if (ai) {
+		if (ai.config) {
+			for (let key in ai.config) {
+				if (t.config[key] === undefined)
+					t.config[key] = ai.config[key];
+			}
+		}
+		ai.callback(t, t.options.callback);
+	} else
 		t.options.callback('AI model not found.');
 	return t;
 };
@@ -98,8 +130,14 @@ exports.exec = function(model) {
 	return new AI(model);
 };
 
-exports.newai = function (model, callback) {
+exports.newai = function(model, config, callback) {
+
+	if (typeof(config) === 'function') {
+		callback = config;
+		config = null;
+	}
+
 	const models = model.split(/,/).trim();
 	for (const m of models)
-		F.aimodels[m] = callback;
+		F.aimodels[m] = { config, callback };
 };

package/api.js

@@ -10,17 +10,29 @@ const REG_TEXT = /^text\/(html|plain|xml)/;
 var cache = {};
 
 // Registers a new API type
-exports.newapi = function(type, callback) {
+exports.newapi = function(type, config, callback) {
 
-	if (typeof(type) === 'function') {
+	let t = typeof(type);
+
+	if (t === 'function') {
 		callback = type;
 		type = 'default';
+		config = null;
+	} else if (t === 'object') {
+		callback = config;
+		config = type;
+		type = 'default';
+	}
+
+	if (typeof(config) === 'function') {
+		callback = config;
+		config = null;
 	}
 
 	if (type.indexOf(',') !== -1) {
 		var arr = type.split(',').trim();
 		for (var m of arr)
-			exports.newapi(m, callback);
+			exports.newapi(m, config, callback);
 		return;
 	}
 
@@ -30,15 +42,17 @@ exports.newapi = function(type, callback) {
 	cache[lower] = lower;
 
 	if (callback)
-		F.apiservices[lower] = callback;
+		F.apiservices[lower] = { config, callback };
 	else
 		delete F.apiservices[lower];
 
 };
 
 function APIOptions(api) {
-	this.api = api;
-	this.retries = 0;
+	const t = this;
+	t.api = api;
+	t.retries = 0;
+	t.config = {};
 }
 
 APIOptions.prototype.retry = function() {
@@ -58,8 +72,8 @@ APICallProto.output = function(type) {
 };
 
 APICallProto.promise = function($) {
-	var t = this;
-	var promise = new Promise(function(resolve, reject) {
+	const t = this;
+	const promise = new Promise(function(resolve, reject) {
 		t.$callback = function(err, response) {
 			if (err) {
 				if ($ && $.invalid) {
@@ -75,7 +89,7 @@ APICallProto.promise = function($) {
 };
 
 APICallProto.audit = function($, message, type) {
-	var t = this;
+	const t = this;
 	t.$audit = function() {
 		// Dynamic arguments
 		if (message)
@@ -85,8 +99,15 @@ APICallProto.audit = function($, message, type) {
 	return t;
 };
 
+APICallProto.configure = function(opt) {
+	const t = this;
+	for (let key in opt)
+		t.options.config[key] = opt[key];
+	return t;
+};
+
 APICallProto.done = function($, callback) {
-	var t = this;
+	const t = this;
 	t.$callback = function(err, response) {
 		if (err)
 			$.invalid(err);
@@ -119,12 +140,12 @@ APICallProto.controller = function($) {
 
 APICallProto.file = function(filename, path, name) {
 
-	var t = this;
+	const t = this;
 
 	if (!t.options.files)
 		t.options.files = [];
 
-	var obj = { name: name || ('file' + t.options.files.length), filename: filename, path: path };
+	const obj = { name: name || ('file' + t.options.files.length), filename: filename, path: path };
 
 	if (t.options.files)
 		t.options.files.push(obj);
@@ -146,14 +167,14 @@ APICallProto.logerror = function() {
 };
 
 APICallProto.callback = APICallProto.pipe = function($) {
-	var t = this;
+	const t = this;
 	t.$callback = typeof($) === 'function' ? $ : $.callback();
 	return t;
 };
 
 APICallProto.evaluate = function(err, response) {
 
-	var t = this;
+	const t = this;
 	if (!err && t.$error) {
 		if (t.$error_reverse) {
 			if (response)
@@ -184,16 +205,24 @@ APICallProto.evaluate = function(err, response) {
 };
 
 function execapi(api) {
-	var conn = F.apiservices[cache[api.options.name]] || F.apiservices['*'];
-	if (conn)
-		conn.call(api, api.options, (err, response) => api.evaluate(err, response));
-	else
+	const conn = F.apiservices[cache[api.options.name]] || F.apiservices['*'];
+	if (conn) {
+
+		if (conn.config) {
+			for (let key in conn.config) {
+				if (api.options.config[key] === undefined)
+					api.options.config[key] = conn.config[key];
+			}
+		}
+
+		conn.callback.call(api, api.options, (err, response) => api.evaluate(err, response));
+	} else
 		api.evaluate('API is not initialized');
 }
 
 // Executes API
 exports.exec = function(name, schema, data, $) {
-	var api = new APICall();
+	const api = new APICall();
 	api.options.name = cache[name] || name;
 	api.options.schema = schema;
 	api.options.data = data;
@@ -212,7 +241,7 @@ exports.newapi('TotalAPI,TAPI', function(opt, next) {
 	if (opt.data && typeof(opt.data) !== 'object')
 		opt.data = { value: opt.data };
 
-	var req = {};
+	const req = {};
 
 	req.method = 'POST';
 	req.url = 'https://' + F.config.$tapiurl + '.api.totaljs.com/' + opt.schema + '/';
@@ -226,7 +255,7 @@ exports.newapi('TotalAPI,TAPI', function(opt, next) {
 	req.type = 'json';
 	req.timeout = 60000;
 	req.keepalive = true;
-	req.headers = { 'x-token': opt.token || F.config.totalapi || F.config.secret_totalapi || F.config.$tapisecret || '-', 'x-app': encodeURIComponent(F.config.name) };
+	req.headers = { 'x-token': opt.token || opt.config.token || F.config.totalapi || F.config.secret_totalapi || F.config.$tapisecret || '-', 'x-app': encodeURIComponent(F.config.name) };
 	req.custom = true;
 
 	req.callback = function(err, response) {
@@ -236,7 +265,7 @@ exports.newapi('TotalAPI,TAPI', function(opt, next) {
 			return;
 		}
 
-		var buffer = [];
+		const buffer = [];
 
 		// Error
 		if (response.status > 200) {
@@ -256,7 +285,8 @@ exports.newapi('TotalAPI,TAPI', function(opt, next) {
 				if (opt.output === 'base64') {
 					output = output.toString('base64');
 				} else if (opt.output !== 'binary' && opt.output !== 'buffer') {
-					var type = response.headers['content-type'];
+
+					const type = response.headers['content-type'];
 
 					if (REG_BINARY.test(type)) {
 						next(null, output);
@@ -292,20 +322,20 @@ exports.newapi('TotalAPI,TAPI', function(opt, next) {
 			}
 
 			var type = (response.headers['content-type'] || '').toLowerCase();
-			var index = type.lastIndexOf(';');
+			const index = type.lastIndexOf(';');
 			if (index !== -1)
 				type = type.substring(0, index);
 
-			var ext = type ? F.TUtils.getExtensionFromContentType(type) : 'bin';
-			var id = fsdata[1] || UID();
-			var filename = fsdata[2] || id + '.' + ext;
+			const ext = type ? F.TUtils.getExtensionFromContentType(type) : 'bin';
+			const id = fsdata[1] || UID();
+			const filename = fsdata[2] || id + '.' + ext;
 
 			response.stream.pause();
 			fs.save(id, filename, response.stream, next);
 			return;
 		}
 
-		var writer = F.Fs.createWriteStream(opt.output);
+		const writer = F.Fs.createWriteStream(opt.output);
 		response.stream.pipe(writer);
 		F.cleanup(writer, () => opt.next(null, opt.output));
 	};

package/builders.js

@@ -1,6 +1,6 @@
 // Total.js Builders
 // The MIT License
-// Copyright 2023 (c) Peter Širka <petersirka@gmail.com>
+// Copyright 2023-2026 (c) Peter Širka <petersirka@gmail.com>
 
 'use strict';
 
@@ -247,7 +247,7 @@ Options.prototype.successful = function(callback) {
 	};
 };
 
-Options.prototype.callback = Options.prototype.pipe = function(value) {
+Options.prototype.callback = Options.prototype.output = Options.prototype.pipe = function(value) {
 
 	var self = this;
 
@@ -1405,6 +1405,7 @@ ActionCaller.prototype.exec = function() {
 	let type = meta.payload || (action.input ? '+' : '-');
 	let $ = self.$;
 
+	$.$end = false;
 	$.name = action.name;
 	$.id = action.id;
 	$.error = self.error;
@@ -1416,6 +1417,16 @@ ActionCaller.prototype.exec = function() {
 
 	$.$callback = function(err, response) {
 
+		if ($.$end)
+			return;
+
+		$.$end = true;
+
+		if ($.$timeout) {
+			clearTimeout($.$timeout);
+			$.$timeout = null;
+		}
+
 		if (!err) {
 			if (action.jsoutput)
 				response = action.jsoutput.transform(response).response;
@@ -1514,6 +1525,12 @@ ActionCaller.prototype.exec = function() {
 	if (self.options.progress)
 		$.progress2 = self.options.progress;
 
+	if (action.timeout) {
+		$.$timeout = setTimeout(function() {
+			$.invalid('Timeout.');
+		}, action.timeout);
+	}
+
 	if (action.middleware) {
 		action.middleware.wait(function(name, next) {
 			let fn = F.routes.middleware[name];
@@ -1538,7 +1555,7 @@ ActionCaller.prototype.finish = function(value) {
 			if (self.error.length)
 				$.invalid(self.error);
 			else
-				$.callback.call(self.$, value === undefined ? self.$.response : value);
+				$.callback.call($, value === undefined ? self.$.response : value);
 		} else
 			self.options.callback.call(self.$, self.error.length ? self.error : null, value === undefined ? self.$.response : value);
 

package/changelog.txt

@@ -24,6 +24,11 @@
 - added a new global methods `AIMODEL()` and `NEWAIMODEL()`
 - added `exec` command to the remote editing functionality
 - always set `cwd` directory for the current executed script
+- added `timeout {Number}` property into the `NEWACTION` method
+- extended `NEWAPI(type, [config], config)` by adding the `config` argument
+- replaced `Url.parse()` with `new URL()`
+- fixed `NEWFORK()` method
+- fixed callback with `$` in the `ACTION().callback($)`
 
 ========================
 0.0.15

package/global.js

@@ -250,11 +250,11 @@ global.TMSCLIENT = F.TTMS.client;
 
 // API
 global.API = (name, schema, data, $) => F.TApi.exec(name, schema, data, $);
-global.NEWAPI = (name, callback) => F.TApi.newapi(name, callback);
+global.NEWAPI = (name, config, callback) => F.TApi.newapi(name, config, callback);
 
 // AI
 global.AIMODEL = (name, schema, data, $) => F.TAIModel.exec(name, schema, data, $);
-global.NEWAIMODEL = (name, callback) => F.TAIModel.newai(name, callback);
+global.NEWAIMODEL = (name, config, callback) => F.TAIModel.newai(name, config, callback);
 
 // NoSQL
 global.NOSQL = F.TNoSQL.nosql;

package/index.js

@@ -2942,6 +2942,7 @@ process.on('message', function(msg, h) {
 	F.Tls = F.require('node:tls');
 	F.Stream = F.require('node:stream');
 	F.Cluster = require('node:cluster');
+	F.Util = F.require('node:util');
 
 	// Total.js modules
 	F.TUtils = require('./utils');

package/package.json

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

package/routing.js

@@ -804,7 +804,7 @@ function Proxy(url, target) {
 	if (typeof(target) === 'function')
 		t.stream = target;
 	else if ((/^(https|http):\/\//).test(target))
-		t.target = F.Url.parse(target);
+		t.target = F.TUtils.parseURI(target);
 	else
 		t.target = { socketPath: target };
 
@@ -887,20 +887,20 @@ exports.proxy = function(url, target) {
 	url = F.virtualpath(url);
 
 	if (!target) {
-		let index = F.routes.proxies.TfindIndex('url', url.toLowerCase());
+		const index = F.routes.proxies.TfindIndex('url', url.toLowerCase());
 		if (index !== -1)
 			F.routes.proxies.splice(index, 1);
 		return;
 	}
 
-	let proxy = new Proxy(url, target);
+	const proxy = new Proxy(url, target);
 	F.routes.proxies.push(proxy);
 	return proxy;
 };
 
 exports.lookupproxy = function(ctrl) {
-	for (var proxy of F.routes.proxies) {
-		var u = ctrl.uri.key.substring(0, proxy.url.length);
+	for (let proxy of F.routes.proxies) {
+		let u = ctrl.uri.key.substring(0, proxy.url.length);
 		if (u[u.length - 1] !== '/')
 			u += '/';
 		if (u === proxy.url && (!proxy.$check || proxy.$check(ctrl))) {
@@ -913,10 +913,10 @@ exports.lookupproxy = function(ctrl) {
 
 function proxyheadersws(header, headers) {
 
-	var output = [];
+	const output = [];
 
 	for (let key in headers) {
-		var value = headers[key];
+		const value = headers[key];
 		if (value instanceof Array) {
 			for (let item of value)
 				output.push(key + ': ' + item);

package/utils.js

@@ -491,16 +491,16 @@ exports.toURLEncode = function(value) {
 
 exports.resolve = function(url, callback, param) {
 
-	var uri;
+	let uri;
 
 	try {
-		uri = F.Url.parse(url);
+		uri = exports.parseURI(url);
 	} catch (e) {
 		callback(e);
 		return;
 	}
 
-	var cache = F.temporary.dnscache[uri.host];
+	const cache = F.temporary.dnscache[uri.host];
 
 	if (!callback)
 		return cache;
@@ -538,7 +538,7 @@ function keywordscleaner(c) {
 
 function parseProxy(p) {
 
-	var key = 'proxy_' + p;
+	const key = 'proxy_' + p;
 
 	if (F.temporary.utils[key])
 		return F.temporary.utils[key];
@@ -546,7 +546,7 @@ function parseProxy(p) {
 	if (p.indexOf('://') === -1)
 		p = 'http://' + p;
 
-	var obj = F.Url.parse(p);
+	const obj = exports.parseURI(p);
 
 	if (obj.auth)
 		obj._auth = 'Basic ' + Buffer.from(obj.auth).toString('base64');
@@ -563,7 +563,7 @@ function parseProxy(p) {
 
 function _request(opt, callback) {
 
-	var options = { length: 0, timeout: opt.timeout == false || opt.timeout == 0 ? 0 : (opt.timeout || 8000), encoding: opt.encoding || 'utf8', callback: callback || opt.callback || NOOP, post: true, redirect: 0 };
+	const options = { length: 0, timeout: opt.timeout == false || opt.timeout == 0 ? 0 : (opt.timeout || 8000), encoding: opt.encoding || 'utf8', callback: callback || opt.callback || NOOP, post: true, redirect: 0 };
 	var proxy;
 
 	F.stats.performance.external++;
@@ -691,7 +691,7 @@ function _request(opt, callback) {
 		}
 	}
 
-	var uri = opt.unixsocket ? { socketPath: opt.unixsocket.socket, path: opt.unixsocket.path } : F.Url.parse(opt.url);
+	const uri = opt.unixsocket ? { socketPath: opt.unixsocket.socket, path: opt.unixsocket.path } : exports.parseURI(opt.url);
 
 	if ((opt.unixsocket && !uri.socketPath) || (!opt.unixsocket && (!uri.hostname || !uri.host))) {
 		options.response.canceled = true;
@@ -794,9 +794,9 @@ PAP.createConnection = function(pending) {
 
 PAP.createSocket = function(options, callback) {
 
-	var self = this;
-	var proxy = self.options.proxy;
-	var uri = self.options.uri;
+	const self = this;
+	const proxy = self.options.proxy;
+	const uri = self.options.uri;
 
 	PROXYOPTIONS.host = proxy.hostname;
 	PROXYOPTIONS.port = proxy.port;
@@ -805,7 +805,7 @@ PAP.createSocket = function(options, callback) {
 	if (proxy._auth)
 		PROXYOPTIONS.headers['Proxy-Authorization'] = proxy._auth;
 
-	var req = self.request(PROXYOPTIONS);
+	const req = self.request(PROXYOPTIONS);
 	req.setTimeout(10000);
 	req.on('response', proxyagent_response);
 	req.on('connect', function(res, socket) {
@@ -825,7 +825,7 @@ PAP.createSocket = function(options, callback) {
 	});
 
 	req.on('error', function(err) {
-		var e = new Error('Request Proxy "proxy {0} --> target {1}": {2}'.format(PROXYOPTIONS.host + ':' + proxy.port, PROXYOPTIONS.path, err.toString()));
+		const e = new Error('Request Proxy "proxy {0} --> target {1}": {2}'.format(PROXYOPTIONS.host + ':' + proxy.port, PROXYOPTIONS.path, err.toString()));
 		e.code = err.code;
 		req.destroy && req.destroy();
 		req = null;
@@ -866,14 +866,17 @@ function request_call(uri, options) {
 		opt.path = uri.href;
 		opt.headers = uri.headers;
 		opt.method = uri.method;
-		opt.headers.host = uri.host;
+
+		if (uri.host)
+			opt.headers.host = uri.host;
+
 		if (options.proxy._auth)
 			opt.headers['Proxy-Authorization'] = options.proxy._auth;
 	} else
 		opt = uri;
 
-	var connection = uri.protocol === 'https:' ? F.Https : F.Http;
-	var req = opt.method === 'GET' ? connection.get(opt, request_response) : connection.request(opt, request_response);
+	const connection = uri.protocol === 'https:' ? F.Https : F.Http;
+	const req = opt.method === 'GET' ? connection.get(opt, request_response) : connection.request(opt, request_response);
 
 	req.$options = options;
 	req.$uri = uri;
@@ -986,11 +989,10 @@ function request_writefile(req, options, file, next) {
 		return;
 	}
 
-	var filedata = file.buffer || file.url;
-	var isbuffer = filedata instanceof Buffer;
-	var isurl = isbuffer ? false : typeof(filedata) === 'string' && filedata;
-
-	var filename = (isbuffer || isurl ? file.filename : exports.getName(file.filename));
+	const filedata = file.buffer || file.url;
+	const isbuffer = filedata instanceof Buffer;
+	const isurl = isbuffer ? false : typeof(filedata) === 'string' && filedata;
+	const filename = (isbuffer || isurl ? file.filename : exports.getName(file.filename));
 
 	req.write((options.first ? '' : NEWLINE) + '--' + options.boundary + NEWLINE + 'Content-Disposition: form-data; name="' + file.name + '"; filename="' + filename + '"' + NEWLINE + 'Content-Type: ' + exports.getContentType(exports.getExtension(filename)) + NEWLINE + NEWLINE);
 
@@ -1030,8 +1032,8 @@ function request_writefile(req, options, file, next) {
 
 function request_response(res) {
 
-	var options = this.$options;
-	var uri = this.$uri;
+	const options = this.$options;
+	const uri = this.$uri;
 
 	res._buffer = null;
 	res._bufferlength = 0;
@@ -1093,18 +1095,18 @@ function request_response(res) {
 
 		options.redirect++;
 
-		var loc = res.headers.location;
-		var proto = loc.substring(0, 6);
+		let loc = res.headers.location;
+		const proto = loc.substring(0, 6);
 
 		if (proto !== 'http:/' && proto !== 'https:')
 			loc = uri.protocol + '//' + uri.hostname + (uri.port && !SKI_PPORTS[uri.port] ? (':' + uri.port) : '') + loc;
 
-		var tmp = F.Url.parse(loc);
+		var tmp = exports.parseURI(loc);
 		tmp.headers = uri.headers;
 
 		// Transfers cookies
 		if (!options.nocookies) {
-			var cookies = res.headers['set-cookie'];
+			const cookies = res.headers['set-cookie'];
 			if (cookies) {
 
 				if (options.$totalinit.cook && !options.$totalinit.cookies)
@@ -1113,14 +1115,14 @@ function request_response(res) {
 				if (!options.cookies)
 					options.cookies = {};
 
-				for (var i = 0; i < cookies.length; i++) {
-					var cookie = cookies[i];
-					var index = cookie.indexOf(';');
+				for (let i = 0; i < cookies.length; i++) {
+					let cookie = cookies[i];
+					let index = cookie.indexOf(';');
 					if (index !== -1){
 						cookie = cookie.substring(0, index);
 						index = cookie.indexOf('=');
 						if (index !== -1) {
-							var key = decodeURIComponent(cookie.substring(0, index));
+							const key = decodeURIComponent(cookie.substring(0, index));
 							options.cookies[key] = decodeURIComponent(cookie.substring(index + 1));
 							if (options.$totalinit.cookies)
 								options.$totalinit.cookies[key] = options.cookies[key];
@@ -1128,7 +1130,7 @@ function request_response(res) {
 					}
 				}
 
-				var builder = '';
+				let builder = '';
 				for (var m in options.cookies)
 					builder += (builder ? '; ' : '') + encodeURIComponent(m) + '=' + encodeURIComponent(options.cookies[m]);
 
@@ -1162,12 +1164,13 @@ function request_response(res) {
 		if (!options.resolve) {
 			res.removeAllListeners();
 			res = null;
-			return request_call(tmp, options);
+			request_call(tmp, options);
+			return;
 		}
 
 		exports.resolve(tmp, function(err, u, param, origin) {
 			if (!err) {
-				tmp.host = u.host;
+				tmp.ip = u.host;
 				options.origin = origin;
 			}
 			res.removeAllListeners();
@@ -6459,6 +6462,22 @@ exports.uidr = function() {
 	return builder + RANDOM_STRING[sum] + 'r'; // "r" version
 };
 
+exports.parseURI = function(url) {
+	const uri = new URL(url);
+	return {
+		auth: (uri.username || uri.password) ? ((uri.username || '') + ':' + (user.password || '')) : '',
+		port: uri.port,
+		search: uri.search,
+		hash: uri.hash,
+		pathname: uri.pathname,
+		href: uri.href,
+		protocol: uri.protocol,
+		hostname: uri.hostname,
+		host: uri.host,
+		path: uri.pathname + uri.search
+	};
+};
+
 exports.paginate = function(page, pages, max) {
 
 	if (!page)

package/websocket.js

@@ -1225,7 +1225,7 @@ WebSocketClient.prototype.connect = function(url, protocol, origin) {
 
 WebSocketClient.prototype.connectforce = function(self, url, protocol, origin) {
 
-	var options = {};
+	const options = {};
 
 	self.url = url;
 	self.origin = origin;
@@ -1238,12 +1238,12 @@ WebSocketClient.prototype.connectforce = function(self, url, protocol, origin) {
 	var secured = false;
 
 	if (typeof(url) === 'string') {
-		url = F.Url.parse(url);
+		url = F.TUtils.parseURI(url);
 		options.host = url.hostname;
-		options.path = url.path;
 		options.query = url.query;
 		secured = url.protocol === 'wss:';
 		options.port = url.port || (secured ? 443 : 80);
+		options.path = url.path;
 	} else {
 		options.socketPath = url.socket;
 		options.path = url.path;
@@ -1284,7 +1284,8 @@ WebSocketClient.prototype.connectforce = function(self, url, protocol, origin) {
 	for (let key in self.headers)
 		options.headers[key] = self.headers[key];
 
-	var tmp = [];
+	const tmp = [];
+
 	for (let key in self.cookies)
 		tmp.push(key + '=' + self.cookies[key]);
 

package/workers.js

@@ -1,6 +1,6 @@
 // Total.js Workers
 // The MIT License
-// Copyright 2020-2023 (c) Peter Širka <petersirka@gmail.com>
+// Copyright 2023-2026 (c) Peter Širka <petersirka@gmail.com>
 
 const HEADER = { cwd: '' };
 
@@ -26,7 +26,7 @@ function process_thread() {
 	F.worker.postMessage = F.worker.send = function() {
 		if (Port)
 			Port.postMessage.apply(Port, arguments);
-		else
+		else if (process.send)
 			process.send.apply(process, arguments);
 	};
 
@@ -34,7 +34,7 @@ function process_thread() {
 		process.exit(code || 0);
 	};
 
-	var onmessage = function() {
+	const onmessage = function() {
 		F.worker.message && F.worker.message.apply(this, arguments);
 	};
 
@@ -49,8 +49,8 @@ function process_thread() {
 exports.createthread = function(name, data) {
 	if (!name)
 		return process_thread();
-	var filename = name[0] === '~' ? name.substring(1) : F.path.root('workers/' + name + '.js');
-	var worker = new F.Worker.Worker(filename, { workerData: data, cwd: HEADER, argv: ['--worker'] });
+	const filename = name[0] === '~' ? name.substring(1) : F.path.root('workers/' + name + '.js');
+	const worker = new F.Worker.Worker(filename, { workerData: data, cwd: HEADER, argv: ['--worker'] });
 	worker.kill = worker.exit = () => worker.terminate();
 	return worker;
 };
@@ -60,8 +60,8 @@ exports.createfork = function(name) {
 	if (!name)
 		return process_thread();
 
-	var filename = name[0] === '~' ? name.substring(1) : F.path.root('workers/' + name + '.js');
-	var fork = new F.Child.fork(filename, { cwd: HEADER, argv: ['--worker'] });
+	const filename = name[0] === '~' ? name.substring(1) : F.path.root('workers/' + name + '.js');
+	const fork = new F.Child.fork(filename, { cwd: HEADER.cwd, argv: ['--worker'] });
 	fork.postMessage = fork.send;
 	fork.terminate = () => fork.kill('SIGTERM');
 	return fork;
@@ -69,14 +69,14 @@ exports.createfork = function(name) {
 
 exports.createpool = function(name, count, isfork) {
 
-	var pool = {};
+	const pool = {};
 	pool.workers = [];
 	pool.pending = [];
 	pool.count = pool;
 	pool.next = function() {
 		for (let worker of pool.workers) {
 			if (worker.$released) {
-				let fn = pool.pending.shift();
+				const fn = pool.pending.shift();
 				if (fn) {
 					worker.removeAllListeners('message');
 					worker.$released = false;
@@ -91,9 +91,9 @@ exports.createpool = function(name, count, isfork) {
 
 	var release = function(worker) {
 		worker.on('exit', function() {
-			let index = pool.workers.indexOf(worker);
+			const index = pool.workers.indexOf(worker);
 			pool.workers.splice(index, 1);
-			let worker = isfork ? exports.createfork(name) : exports.createthread(name);
+			const worker = isfork ? exports.createfork(name) : exports.createthread(name);
 			worker.$pool = pool;
 			worker.release = release(worker);
 		});
@@ -105,8 +105,8 @@ exports.createpool = function(name, count, isfork) {
 
 	};
 
-	for (var i = 0; i < count; i++) {
-		var worker = isfork ? exports.createfork(name) : exports.createthread(name);
+	for (let i = 0; i < count; i++) {
+		const worker = isfork ? exports.createfork(name) : exports.createthread(name);
 		worker.$pool = pool;
 		worker.$released = true;
 		worker.release = release(worker);