total5 0.0.17-1 → 0.0.17-3

package/aimodel.js

@@ -78,6 +78,10 @@ AI.prototype.assistant = function(content, merge) {
 	return this.message('assistant', content, merge);
 };
 
+AI.prototype.tool = function(content, merge) {
+	return this.message('tool', content, merge);
+};
+
 AI.prototype.promise = function($) {
 	const t = this;
 	return new Promise(function(resolve, reject) {

package/bin/total5

@@ -243,7 +243,7 @@ FUNC.server = function(port) {
 };
 
 FUNC.proxyclient = function(endpoint, port) {
-	require('../proxyclient').init(endpoint, port);
+	require('../proxy').client(endpoint, port);
 };
 
 FUNC.edit = function(url) {

package/changelog.txt

@@ -9,6 +9,12 @@
 - fixed `mail` priority
 - fixed `kB` and `GB` units in the routing as upload limits
 - `DEBUG` is set according to the `process.env.NODE_ENV` variable
+- fixed server pinging of all WebSocket connections
+- improved code
+- fixed typo in send method data assignment
+- added `PROXYCLIENT(proxyserver, ip:port, [logger])` method
+- added `PROXYSERVER(endpoint, socketendpoint, [logger])` method
+- added `AIMODEL.tool(content, [merge])` method.
 
 ========================
 0.0.16

package/components.js

@@ -233,7 +233,7 @@ Instance.prototype.input = function(input, data, callback) {
 Instance.prototype.send = function(output, data) {
 	let msg = data instanceof Message ? data : this.newmessage();
 	msg.output = output;
-	msg.data = data;x
+	msg.data = data;
 	msg.send(output);
 };
 

package/global.js

@@ -12,6 +12,8 @@ global.EMIT = (name, a, b, c, d, e, f, g) => F.emit(name, a, b, c, d, e, f, g);
 global.OFF = (name, fn) => F.off(name, fn);
 global.ROUTE = F.TRouting.route;
 global.PROXY = F.TRouting.proxy;
+global.PROXYCLIENT = F.TProxy.client;
+global.PROXYSERVER = F.TProxy.server;
 global.print = console.log;
 global.Utils = F.TUtils;
 global.LOAD = F.load;

package/index.js

@@ -1148,10 +1148,10 @@ F.console = function() {
 	if (!F.config.$imprint)
 		return;
 
-	var memory = process.memoryUsage();
-	var nodemodules = require.resolve('./index');
+	let memory = process.memoryUsage();
+	let nodemodules = require.resolve('./index');
 
-	nodemodules = nodemodules.substring(0, nodemodules.length - (8 + 7));
+	nodemodules = F.Path.dirname(nodemodules);
 
 	print('====================================================');
 	print('PID           : ' + process.pid);
@@ -1171,19 +1171,19 @@ F.console = function() {
 	// global.THREAD && print('Thread        : ' + global.THREAD);
 	print('====================================================');
 	F.config.$root && print('Root          : ' + F.config.$root);
-	print('Directory     : ' + process.cwd());
-	print('node_modules  : ' + nodemodules);
+	print('Directory     : ' + F.Path.join(process.cwd(), F.Path.sep));
+	print('node_modules  : ' + F.Path.join(nodemodules, F.Path.sep));
 	print('====================================================\n');
 
 	if (!F.isWorker && F.server) {
 
-		var hostname = F.unixsocket ? ('Socket: ' + F.unixsocket) : '{2}://{0}:{1}/'.format(F.config.$ip, F.config.$port, F.isHTTPS ? 'https' : 'http');
+		let hostname = F.unixsocket ? ('Socket: ' + F.unixsocket) : '{2}://{0}:{1}/'.format(F.config.$ip, F.config.$port, F.isHTTPS ? 'https' : 'http');
 
 		if (!F.unixsocket && F.ip === '0.0.0.0') {
-			var ni = F.Os.networkInterfaces();
+			let ni = F.Os.networkInterfaces();
 			if (ni.en0) {
-				for (var i = 0; i < ni.en0.length; i++) {
-					var nii = ni.en0[i];
+				for (let i = 0; i < ni.en0.length; i++) {
+					let nii = ni.en0[i];
 					// nii.family === 'IPv6' ||
 					if (nii.family === 'IPv4') {
 						hostname += '\n{2}://{0}:{1}/'.format(nii.address, F.port, F.isHTTPS ? 'https' : 'http');
@@ -1215,7 +1215,7 @@ F.loadservices = function() {
 				flow.service(F.internal.ticks);
 		}
 
-		if (F.internal.ticks == 6 || F.internal.ticks == 12)
+		if (F.internal.ticks == 3 || F.internal.ticks == 6 || F.internal.ticks == 12)
 			F.TWebSocket.ping();
 
 		// 1 minute
@@ -3025,6 +3025,7 @@ process.on('message', function(msg, h) {
 	F.proxy = F.TRouting.proxy;
 
 	// Needed "F"
+	F.TProxy = require('./proxy');
 	F.TFlow = require('./flow');
 	F.TTMS = require('./tms');
 	F.TCMS = require('./cms');

package/package.json

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

package/proxy.js

@@ -0,0 +1,277 @@
+// Total.js client for Proxy
+// The MIT License
+// Copyright 2017-2026 (c) Peter Širka <petersirka@gmail.com>
+
+// Client implementation
+(function() {
+
+	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 REG_ANSI = /\x1B\[[0-?]*[ -/]*[@-~]/g;
+	const Pending = {};
+	const EnabledColors = process.stdout.isTTY && process.stdout.hasColors();
+
+	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, logger) {
+
+		let client = F.websocketclient();
+
+		client.options.type = 'binary';
+		client.connect(Target.replace(/^http/i, 'ws'));
+
+		client.on('open', function() {
+			logger && logger('[OK]', 'Proxy client successfully connected to ' + Target);
+		});
+
+		client.on('close', function() {
+			logger && logger('[NO]', '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;
+
+					logger && logger('[' + opt.method + ']',tmp.ip, 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;
+			}
+
+		});
+
+		return client;
+	}
+
+	exports.client = function (proxyserver, port, logger = log) {
+
+		let Target = proxyserver;
+		let Source = port;
+
+		if (!Target || !Source) {
+			help();
+			return;
+		}
+
+		Source = Source.split(':');
+
+		if (!Source[1]) {
+			Source[1] = +Source[0];
+			Source[0] = '127.0.0.1';
+		}
+
+		return connect(Source, Target, logger);
+	};
+
+})();
+
+// Server implementation
+(function() {
+
+	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);
+
+	var Messages = 0;
+	var Client = null;
+	var Pending = {};
+	var Logger = null;
+
+	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);
+	}
+
+	// Handles communication between the server and proxy client
+	function socket($) {
+
+		$.autodestroy();
+
+		$.on('open', function(client) {
+			if (Client) {
+				let err = 'Proxy client is already in use';
+				Logger && Logger('[OK]', err);
+				Client.close(4001, err);
+			} else {
+				Logger && Logger('[OK]', 'Proxy client is connected');
+				Client = client;
+			}
+		});
+
+		$.on('close', function(client) {
+			if (Client == client) {
+				Client = null;
+				Logger && Logger('[NO]', 'Proxy client is disconnected.');
+			}
+		});
+
+		$.on('message', function(client, msg) {
+
+			let id = msg.readInt32BE(1);
+			let type = msg.readInt8(0);
+			let data = msg.slice(5);
+			let ctrl = Pending[id];
+
+			switch (type) {
+				case 0: // init
+					let tmp = JSON.parse(data.toString('utf8'));
+					delete tmp.headers.connection;
+					delete tmp.headers['content-length'];
+					ctrl.res.writeHead(tmp.status, tmp.headers);
+					break;
+				case 1: // data
+					ctrl.res.write(data);
+					break;
+				case 2: // end
+					delete Pending[id];
+					ctrl.res.end();
+					break;
+				case 3: // error
+					delete Pending[id];
+					ctrl.res.end();
+					break;
+				case 4: // abort
+					delete Pending[id];
+					ctrl.res.end();
+					break;
+			}
+
+		});
+	}
+
+	// Handles communication between the client and server
+	function proxy(ctrl) {
+
+		if (!Client) {
+			ctrl.invalid('Not yet available.');
+			return;
+		}
+
+		var obj = {};
+		obj.headers = ctrl.req.headers;
+		obj.url = ctrl.req.url;
+		obj.method = ctrl.req.method;
+		obj.ip = ctrl.ip;
+
+		let buffer = Buffer.from(JSON.stringify(obj), 'utf8');
+		let id = Buffer.alloc(4);
+		let index = Messages++;
+
+		// For answer
+		Pending[index] = ctrl;
+
+		// Write request id
+		id.writeUInt32BE(index);
+
+		// Sent initial data
+		Client.send(Buffer.concat([BUFFER_INIT, id, buffer]));
+
+		// Send data
+		ctrl.req.on('data', chunk => Client.send(Buffer.concat([BUFFER_DATA, id, chunk])));
+
+		// Send empty buffer
+		ctrl.req.on('end', () => Client.send(Buffer.concat([BUFFER_END, id])));
+	}
+
+	exports.server = function(endpoint = '/', socketendpoint = '/', logger = log) {
+		PROXY(endpoint, proxy).check(ctrl => ctrl.method !== 'SOCKET');
+		ROUTE('SOCKET {0} @binary <100MB'.format(socketendpoint), socket);
+		Logger = logger;
+	};
+
+})();

package/websocket.js

@@ -605,10 +605,11 @@ Controller.prototype.senddeflate = function() {
 };
 
 Controller.prototype.ping = function(ts) {
-	var ctrl = this;
+	let ctrl = this;
+	ctrl.$ping = ts || Date.now();
+	ctrl.latency = null;
 	if (!ctrl.isclosed) {
 		try {
-			ctrl.$ping = ts || Date.now();
 			ctrl.socket.write(getWebSocketFrame(0, 'PING', 0x09, false, ctrl.masking));
 		} catch (e) {
 			// Socket error
@@ -1366,10 +1367,10 @@ WebSocketClient.prototype.connectforce = function(self, url, protocol, origin) {
 
 WebSocketClient.prototype.ping = function(timeout) {
 	var self = this;
+	self.$ping = Date.now();
 	if (!self.isclosed && !self.timeout) {
 		self.timeout = setTimeout(wsclient_timeout, timeout || 3000, self);
 		self.socket.write(getWebSocketFrame(0, 'PING', 0x09, false, self.options.masking));
-		self.$ping = Date.now();
 	}
 	return self;
 };

package/proxyclient.js

@@ -1,145 +0,0 @@
-// 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);
-};