total5 0.0.16-1 → 0.0.16-2

package/changelog.txt

@@ -6,6 +6,11 @@
 - framework reads a `/config` file in `plugins`
 - added `RESTBuilder.?.logerror()` method for printing errors into the console
 - added `API.?.logerror()` method for printing errors into the console
+- fixed handling of unexpected problems in the Flow with the main process becoming disconnected
+- fixed `uptime` value in the framework stats
+- improved auditlogs by adding `files`
+- fixed unexpected errors when compressing/decompressing data via WebSocket
+- fixed processing TMS data in the FlowStream
 
 ========================
 0.0.15

package/flow-flowstream.js

@@ -97,7 +97,12 @@ Instance.prototype = {
 };
 
 Instance.prototype.postMessage = function(msg) {
-	this.flow.postMessage && this.flow.postMessage(msg);
+	if (this.flow.postMessage) {
+		// Try & Catch handles unexpected problems with the main process becoming disconnected.
+		try {
+			this.flow.postMessage(msg);
+		} catch {}
+	}
 };
 
 Instance.prototype.httprequest = function(opt, callback) {
@@ -2877,19 +2882,19 @@ TMS.connect = function(fs, sourceid, callback) {
 		if (!client.tmsready)
 			return;
 
-		var publishers = {};
+		let publishers = {};
 
-		for (var key in fs.meta.flow) {
-			var instance = fs.meta.flow[key];
-			var com = fs.meta.components[instance.component];
+		for (let key in fs.meta.flow) {
+			let instance = fs.meta.flow[key];
+			let com = fs.meta.components[instance.component];
 			if (com && com.itemid === item.id && com.outputs && com.outputs.length) {
 				if (Object.keys(instance.connections).length)
 					publishers[com.schema.id] = 1;
 			}
 		}
 
-		var keys = Object.keys(publishers);
-		var cache = keys.join(',');
+		let keys = Object.keys(publishers);
+		let cache = keys.join(',');
 
 		if (!prev || prev !== cache) {
 			prev = cache;
@@ -2915,8 +2920,8 @@ TMS.connect = function(fs, sourceid, callback) {
 
 	client.on('message', function(msg) {
 
-		var type = msg.type || msg.TYPE;
-		var tmp;
+		let type = msg.type || msg.TYPE;
+		let tmp;
 
 		switch (type) {
 			case 'meta':
@@ -2969,18 +2974,18 @@ TMS.connect = function(fs, sourceid, callback) {
 
 			case 'publish':
 
-				if (fs.paused)
+				if (fs.paused || !fs.meta || !fs.meta.flow)
 					return;
 
 				tmp = client.publishers[msg.id];
 				if (tmp) {
 					// HACK: very fast validation
-					var err = new F.TBuilders.ErrorBuilder();
-					var data = F.TJSONSchema.transform(tmp, err, msg.data, true);
+					let err = new F.TBuilders.ErrorBuilder();
+					let data = F.TJSONSchema.transform(tmp, err, msg.data, true);
 					if (data) {
-						var id = 'pub' + item.id + 'X' + msg.id;
+						let id = 'pub' + item.id + 'X' + msg.id;
 						for (let key in fs.meta.flow) {
-							var flow = fs.meta.flow[key];
+							let flow = fs.meta.flow[key];
 							if (flow.component === id)
 								flow.process(data, client);
 						}

package/index.js

@@ -2099,8 +2099,14 @@ F.audit = function(name, $, message, type) {
 	if ($.id)
 		data.action = $.id;
 
-	if ($.model)
-		data.data = JSON.stringify({ params: $.params, query: $.query, model: $.model }, auditjsonserialization);
+	let files = [];
+
+	if ($.files && $.files.length) {
+		for (let file of $.files)
+			files.push({ name: file.name, filename: file.filename, size: file.size, width: file.width, height: file.height });
+	}
+
+	data.data = JSON.stringify({ params: $.params, query: $.query, model: $.model, files: files }, auditjsonserialization);
 
 	if (F.clusterid)
 		data.instance = F.clusterid;
@@ -2800,7 +2806,7 @@ F.loadstats = function() {
 
 	F.usage = function() {
 
-		var memory = process.memoryUsage();
+		let memory = process.memoryUsage();
 		stats.date = NOW;
 
 		if (stats.id != F.clusterid)
@@ -2827,12 +2833,12 @@ F.loadstats = function() {
 		stats.errors = F.stats.error;
 		stats.timeouts = F.stats.response.timeout;
 		stats.online = F.stats.performance.online;
-		stats.uptime = F.cache.count;
+		stats.uptime = F.internal.counter;
 		stats.download = F.stats.request.size.floor(3);
 		stats.upload = F.stats.response.size.floor(3);
 
-		var err = F.errors[F.errors.length - 1];
-		var timeout = F.timeouts[F.timeouts.length - 1];
+		let err = F.errors[F.errors.length - 1];
+		let timeout = F.timeouts[F.timeouts.length - 1];
 
 		stats.lasterror = err ? (err.date.toJSON() + ' '  + (err.name ? (err.name + ' - ') : '') + err.error) : undefined;
 		stats.lasttimeout = timeout;
@@ -2881,7 +2887,7 @@ process.on('unhandledRejection', function(e) {
 });
 
 process.on('uncaughtException', function(e) {
-	var err = e + '';
+	let err = e + '';
 	if (err.indexOf('listen EADDRINUSE') !== -1) {
 		console.log('\nThe IP address and the PORT is already in use.\nYou must change the PORT\'s number or IP address.\n');
 		process.send && process.send('total:eaddrinuse');

package/package.json

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

package/websocket.js

@@ -488,7 +488,14 @@ Controller.prototype.parseinflate = function() {
 		ctrl.inflatechunks = [];
 		ctrl.inflatechunkslength = 0;
 		ctrl.inflatelock = true;
-		ctrl.inflate.write(buf);
+
+		try {
+			ctrl.inflate.write(buf);
+		} catch (e) {
+			// invalid block
+			self.onerror(e);
+			return;
+		}
 
 		if (!buf.$continue)
 			ctrl.inflate.write(Buffer.from(SOCKET_COMPRESS));
@@ -575,7 +582,15 @@ Controller.prototype.senddeflate = function() {
 		ctrl.deflatechunks = [];
 		ctrl.deflatechunkslength = 0;
 		ctrl.deflatelock = true;
-		ctrl.deflate.write(buf);
+
+		try {
+			ctrl.deflate.write(buf);
+		} catch (e) {
+			// invalid block
+			self.onerror(e);
+			return;
+		}
+
 		ctrl.deflate.flush(function() {
 			if (ctrl.deflatechunks) {
 				var data = concat(ctrl.deflatechunks, ctrl.deflatechunkslength);