total5 0.0.16-10 → 0.0.16-11

package/changelog.txt

@@ -30,6 +30,12 @@
 - fixed `NEWFORK()` method
 - fixed callback with `$` in the `ACTION().callback($)`
 - fixed returing a default JSON schema object in actions
+- added support for nested inline action schemas in action schemas
+- fixed loading of `totalapi` key via `LOADCONFIG()`
+- changed `SIGTERM` for `SIGKILL` in the `NEWFORK()` method
+- extended `data` object in the `DEF.onAudit` delegate by adding `sessionid {String}` property
+- fixed promise in the `AJAX()` method
+- added `options.timeout {Number}` to the `WebSocketClient`
 
 ========================
 0.0.15

package/global.js

@@ -147,11 +147,21 @@ global.AJAX = function(url, data, callback) {
 		data = null;
 	}
 
-	if (!callback)
-		return new Promise((resolve, reject) => global.AJAX(url, data, (err, response) => err ? reject(err) : resolve(response)));
+	if (!callback) {
+		return new Promise(function(resolve, reject) {
+			global.AJAX(url, data, function(err, response) {
+				if (err) {
+					if (err instanceof Array)
+						err = ErrorBuilder.assign(err).reject();
+					reject(err);
+				} else
+					resolve(response);
+			});
+		});
+	}
 
-	var index = url.indexOf(' ');
-	var opt = {};
+	const index = url.indexOf(' ');
+	const opt = {};
 
 	if (index !== -1) {
 		opt.method = url.substring(0, index);
@@ -175,14 +185,14 @@ global.AJAX = function(url, data, callback) {
 			return;
 		}
 
-		var type = err ? '' : response.headers['content-type'] || '';
+		let type = err ? '' : response.headers['content-type'] || '';
 		if (type) {
-			var index = type.lastIndexOf(';');
+			const index = type.lastIndexOf(';');
 			if (index !== -1)
 				type = type.substring(0, index).trim();
 		}
 
-		var value = null;
+		let value = null;
 
 		switch (type.toLowerCase()) {
 			case 'text/xml':

package/index.js

@@ -559,6 +559,7 @@ F.loadconfig = function(value) {
 					key = 'secret_totalapi';
 				else
 					key = '$tapi';
+				cfg[key] = val;
 				break;
 			case '$tms':
 				break;
@@ -2085,6 +2086,7 @@ F.audit = function(name, $, message, type) {
 	var data = {};
 
 	if ($.user) {
+		data.sessionid = $.user.sessionid || $.sessionid || $.controller?.sessionid;
 		data.userid = $.user.id;
 		data.createdby = $.user.name || $.user.nick || $.user.alias;
 	}

package/package.json

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

package/utils.js

@@ -5949,6 +5949,84 @@ exports.connect = function(opt, callback) {
 	meta.socket1.on('clientError', error);
 };
 
+function extractnested(str, minDepth = 0) {
+
+	const parts = [];
+
+	let out = '';
+	let depth = 0;
+	let capturing = false;
+	let capDepth = 0;
+	let buf = '';
+
+	const isOpen = (c) => c === '[' || c === '{';
+	const isClose = (c) => c === ']' || c === '}';
+	const matches = (o, c) => (o === '[' && c === ']') || (o === '{' && c === '}');
+	const stack = [];
+
+	for (let i = 0; i < str.length; i++) {
+		const ch = str[i];
+
+		if (isOpen(ch)) {
+
+			if (!capturing && depth >= minDepth) {
+				capturing = true;
+				capDepth = depth + 1;
+				buf = '';
+			}
+
+			stack.push(ch);
+			depth++;
+
+			if (capturing) buf += ch;
+			else out += ch;
+
+			continue;
+		}
+
+		if (isClose(ch)) {
+
+			const open = stack[stack.length - 1];
+			if (!open || !matches(open, ch))
+				throw new Error(`Mismatched/unbalanced brackets at index ${i}`);
+
+			if (capturing) buf += ch;
+			else out += ch;
+
+			stack.pop();
+			depth--;
+
+			if (capturing && depth < capDepth) {
+
+				const inner = buf.slice(1, -1);
+				const type = buf[0];
+				const startsWithRef = inner.trimStart().startsWith('@');
+				const hasEnumPipe = type === '{' && inner.includes('|');
+
+				if (!startsWithRef && !hasEnumPipe) {
+					const idx = parts.length;
+					out += type + `#${idx}` + (type === '{' ? '}' : ']');
+					parts.push(inner);
+				} else
+					out += buf;
+
+				capturing = false;
+				buf = '';
+			}
+
+			continue;
+		}
+
+		if (capturing) buf += ch;
+		else out += ch;
+	}
+
+	if (stack.length)
+		throw new Error('Unbalanced opening bracket(s)');
+
+	return { text: out, parts };
+}
+
 SP.toJSONSchema = SP.parseSchema = function(name, url) {
 
 	let obj = {};
@@ -5963,19 +6041,11 @@ SP.toJSONSchema = SP.parseSchema = function(name, url) {
 	obj.properties = {};
 
 	let str = this;
-	let nestedtypes = [];
+	let nestedtypes;
 
-	str = str.replace(/\[.*?\]/g, function(text) {
-		if (text.substring(1, 2) === '@')
-			return text;
-		return '[#' + (nestedtypes.push(text.substring(1, text.length - 1)) - 1) + ']';
-	});
-
-	str = str.replace(/\{.*?\}/g, function(text) {
-		if (text.substring(1, 2) === '@')
-			return text;
-		return '{#' + (nestedtypes.push(text.substring(1, text.length - 1)) - 1) + '}';
-	});
+	let extracted = extractnested(str);
+	nestedtypes = extracted.parts;
+	str = extracted.text;
 
 	let prop = str.split(/,|\n/);
 	let required = [];
@@ -6034,8 +6104,12 @@ SP.toJSONSchema = SP.parseSchema = function(name, url) {
 		let isenum = type[0] === '{';
 
 		if (isenum) {
-			tmp = type.substring(2, type.length - 1);
-			tmp = nestedtypes[+tmp];
+
+			if (type[1] === '@' || type[1] === '#') {
+				tmp = type.substring(2, type.indexOf('}'));
+				tmp = nestedtypes[+tmp];
+			} else
+				tmp = type.substring(1, type.indexOf('}'));
 
 			// Nested schema
 			if ((/[:,\s]/).test(tmp)) {

package/websocket.js

@@ -169,7 +169,7 @@ function websocket_ondata(chunk) {
 }
 
 function websocket_onerror(e) {
-	this.destroy &&  this.destroy();
+	this.destroy && this.destroy();
 	this.$controller && this.$controller.onerror(e);
 }
 
@@ -1212,7 +1212,7 @@ function WebSocketClient() {
 
 	// type: json, text, binary
 	t.headers = {};
-	t.options = { type: 'json', size: 0, masking: false, compress: true, reconnect: 3000, encodedecode: false, encryptdecrypt: false, rejectunauthorized: false }; // key: Buffer, cert: Buffer, dhparam: Buffer
+	t.options = { type: 'json', size: 0, masking: false, compress: true, reconnect: 3000, encodedecode: false, encryptdecrypt: false, rejectunauthorized: false, timeout: 30000 }; // key: Buffer, cert: Buffer, dhparam: Buffer
 	t.cookies = {};
 
 	t.ondata2 = () => t.ondata();
@@ -1294,7 +1294,6 @@ WebSocketClient.prototype.connectforce = function(self, url, protocol, origin) {
 	F.stats.performance.online++;
 	self.req = (secured ? F.Https : F.Http).get(options);
 	self.req.$main = self;
-
 	self.req.on('error', function(e) {
 		self.$events.error && self.emit('error', e);
 		self.onclose();
@@ -1337,6 +1336,10 @@ WebSocketClient.prototype.connectforce = function(self, url, protocol, origin) {
 		}
 
 		self.closed = false;
+
+		if (self.options.timeout > 0)
+			self.socket.setKeepAlive(true, self.options.timeout);
+
 		self.socket.on('data', websocket_ondata);
 		self.socket.on('error', websocket_onerror);
 		self.socket.on('close', wsclient_close);

package/workers.js

@@ -63,7 +63,7 @@ exports.createfork = function(name) {
 	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');
+	fork.terminate = () => fork.kill('SIGKILL');
 	return fork;
 };