total5 0.0.18-4 → 0.0.18

package/changelog.txt

@@ -7,6 +7,7 @@
 - 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
 - fixed Flow error handling
+- updated Total.js debug watcher to detect incomplete file writes
 
 ========================
 0.0.17

package/debug.js

@@ -1,6 +1,6 @@
 // Debug module (Watcher)
 // The MIT License
-// Copyright 2012-2024 (c) Peter Širka <petersirka@gmail.com>
+// Copyright 2012-2026 (c) Peter Širka <petersirka@gmail.com>
 
 'use strict';
 
@@ -143,6 +143,7 @@ function runwatching() {
 
 		var WS = null;
 		var files = {};
+		var sizes = {};
 		var force = false;
 		var changes = [];
 		var app = null;
@@ -303,6 +304,19 @@ function runwatching() {
 						var ticks = stat.mtime.getTime();
 						if (files[filename] != null && files[filename] !== ticks) {
 
+							// Check filesize
+							let size = sizes[filename] || 0;
+							if (!size || size != stat.size) {
+
+								// This is because the file can only be copied slowly via the network.
+								if (size < stat.size) {
+									// Reload round for this file
+									sizes[filename] = stat.size;
+									next();
+									return;
+								}
+							}
+
 							if (filename.endsWith('.bundle') && files[filename.replace(/\.bundle$/, '.url')]) {
 								// Bundle from URL address
 								files[filename] = ticks;
@@ -321,6 +335,7 @@ function runwatching() {
 
 							var log = stamp.replace('#', files[filename] === 0 ? 'ADD' : 'UPD') + prefix + LIVERELOADCHANGE;
 							if (files[filename]) {
+								delete sizes[filename];
 								var tmp = isViewPublic(filename);
 								if (tmp) {
 									var skip = true;
@@ -550,4 +565,4 @@ function init() {
 		setImmediate(runapp);
 }
 
-Meta.delay = setTimeout(init, 100);
+Meta.delay = setTimeout(init, 100);

package/flow-flowstream.js

@@ -1914,9 +1914,9 @@ exports.client = function(flow, socket) {
 
 function MAKEFLOWSTREAM(meta) {
 
-	var flow = F.TFlowStream.create(meta.id, function(err, type, componentid) {
+	var flow = F.TFlowStream.create(meta.id, function(err, type, componentid, instanceid) {
 		if (isFLOWSTREAMWORKER) {
-			Parent.postMessage({ TYPE: 'stream/error', error: err.toString(), stack: err.stack, source: type, component: componentid });
+			Parent.postMessage({ TYPE: 'stream/error', error: err.toString(), stack: err.stack, source: type, id: instanceid, component: componentid });
 		} else {
 			this.$instance.onerror(err, type, null, componentid, err.stack);
 		}

package/flowstream.js

@@ -1730,7 +1730,6 @@ function sendmessage(instance, message, event) {
 	try {
 
 		var is = false;
-
 		var key = 'message_' + message.input;
 
 		if (instance[key]) {
@@ -1747,7 +1746,7 @@ function sendmessage(instance, message, event) {
 			message.destroy();
 
 	} catch (e) {
-		instance.main.error(e, 'instance_message', message.tocomponent);
+		instance.main.error(e, 'instance_message', message.tocomponent, message.toid);
 		message.destroy();
 	}
 }

package/mail.js

@@ -489,7 +489,6 @@ Mailer.send = function(opt, messages, callback) {
 		const err = new Error('No SMTP server configuration.');
 		let iscallback = false;
 
-
 		if (callback) {
 			iscallback = true;
 			callback(err);

package/package.json

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

package/templates.js

@@ -5,9 +5,9 @@
 exports.render = function(body, model, $) {
 	return new Promise(function(resolve, reject) {
 
-		var cache = F.temporary.templates;
-		var id = 'Ttemplate' + HASH(body) + ($ ? $.language : '');
-		var data = cache[id];
+		let cache = F.temporary.templates;
+		let id = 'Ttemplate' + HASH(body) + ($ ? $.language : '');
+		let data = cache[id];
 
 		if (data) {
 			try {
@@ -26,13 +26,13 @@ exports.render = function(body, model, $) {
 			// URL address or filename
 			data = cache[id];
 
-			var start = body.substring(0, 7);
+			let start = body.substring(0, 7);
 			// http://
 			// https:/
 
 			if (start === 'http://' || start === 'https:/') {
 				// download template
-				var opt = {};
+				let opt = {};
 				opt.url = body;
 				opt.method = 'GET';
 				opt.callback = function(err, response) {
@@ -67,9 +67,11 @@ exports.render = function(body, model, $) {
 				} else if (body[0] === '#') {
 					// plugins
 					body = PATH.plugins(body.substring(1));
+					if (!body.includes('.html'))
+						body += '.html';
 				} else {
 					body = F.path.templates(body);
-					if (body.indexOf('.html') === -1)
+					if (!body.includes('.html'))
 						body += '.html';
 				}
 
@@ -120,11 +122,11 @@ function parse(body, $) {
 	if ($ && $.language != null)
 		body = F.translate($.language, body);
 
-	var helpers = {};
-	var model = EMPTYOBJECT;
-	var strhelpers = '';
-	var beg = body.indexOf('<scr' + 'ipt>');
-	var end;
+	let helpers = {};
+	let model = EMPTYOBJECT;
+	let strhelpers = '';
+	let beg = body.indexOf('<scr' + 'ipt>');
+	let end;
 
 	// helpers
 	if (beg !== -1) {
@@ -144,7 +146,7 @@ function parse(body, $) {
 	if (strhelpers)
 		new Function('Thelpers', strhelpers)(helpers);
 
-	var output = {};
+	let output = {};
 	output.helpers = helpers;
 	output.template = Tangular.compile(body);
 	output.model = model;