total5 0.0.13 → 0.0.14-1

package/changelog.txt

@@ -1,3 +1,16 @@
+========================
+0.0.14
+========================
+
+- fixed loading plugin files (only `.js` files will load)
+- removed loading of `.DS_STORE` files in plugins
+- added watcher for `extensions/*.html` files
+- __breaking change__: the audit logs object has been changed:
+	- `username` renamed to `createdby`
+	- `schema` renamed to `action`
+- disabled auto-cleaning files in FlowStream workers
+- improved loading static files in release mode
+
 ========================
 0.0.13
 ========================

package/controller.js

@@ -1,6 +1,6 @@
 // Total.js Controller
 // The MIT License
-// Copyright 2023 (c) Peter Širka <petersirka@gmail.com>
+// Copyright 2023-2025 (c) Peter Širka <petersirka@gmail.com>
 
 'use strict';
 
@@ -891,11 +891,12 @@ Controller.prototype.autoclear = function(value) {
 
 Controller.prototype.resume = function() {
 
-	var ctrl = this;
+	let ctrl = this;
 
 	if (ctrl.isfile) {
 
-		var path = ctrl.uri.key;
+		let path = ctrl.uri.key;
+
 		if (CONF.$root)
 			path = path.substring(CONF.$root.length - 1);
 
@@ -1379,12 +1380,24 @@ function send_html(ctrl, path) {
 		return;
 	}
 
+	if (!DEBUG) {
+		if (F.temporary.files[ctrl.uri.cache]) {
+			F.temporary.files[ctrl.uri.cache].push(ctrl);
+			return;
+		}
+		F.temporary.files[ctrl.uri.cache] = [];
+	}
+
 	readfile(path, function(err, output) {
 
 		if (err) {
 
-			if (!DEBUG)
+			if (!DEBUG) {
 				F.temporary.notfound[ctrl.uri.cache] = 1;
+				for (let $ of F.temporary.files[ctrl.uri.cache])
+					$.fallback(404);
+				delete F.temporary.files[ctrl.uri.cache];
+			}
 
 			ctrl.fallback(404);
 			return;
@@ -1405,12 +1418,18 @@ function send_html(ctrl, path) {
 			let filename = F.path.tmp(F.clusterid + ctrl.uri.cache.substring(1).replace(REG_FILETMP, '-') + '-min.html');
 			F.Fs.writeFile(filename, output.body, function(err) {
 				if (err) {
+					err = err.toString();
 					F.temporary.notfound[ctrl.uri.cache] = 1;
-					ctrl.fallback(404, err.toString());
+					ctrl.fallback(404, err);
+					for (let $ of F.temporary.files[ctrl.uri.cache])
+						$.fallback(404, err);
 				} else {
 					F.temporary.minified[ctrl.uri.cache] = filename;
 					send_file(ctrl, filename, 'html');
+					for (let $ of F.temporary.files[ctrl.uri.cache])
+						send_file($, filename, 'html');
 				}
+				delete F.temporary.files[ctrl.uri.cache];
 			});
 		}
 	});
@@ -1429,12 +1448,24 @@ function send_css(ctrl, path) {
 		return;
 	}
 
+	if (!DEBUG) {
+		if (F.temporary.files[ctrl.uri.cache]) {
+			F.temporary.files[ctrl.uri.cache].push(ctrl);
+			return;
+		} else
+			F.temporary.files[ctrl.uri.cache] = [];
+	}
+
 	readfile(path, function(err, output) {
 
 		if (err) {
 
-			if (!DEBUG)
+			if (!DEBUG) {
+				for (let $ of F.temporary.files[ctrl.uri.cache])
+					$.fallback(404);
+				delete F.temporary.files[ctrl.uri.cache];
 				F.temporary.notfound[ctrl.uri.cache] = 1;
+			}
 
 			ctrl.fallback(404);
 			return;
@@ -1454,11 +1485,17 @@ function send_css(ctrl, path) {
 			F.Fs.writeFile(filename, output.body, function(err) {
 				if (err) {
 					F.temporary.notfound[ctrl.uri.cache] = 1;
-					ctrl.fallback(404, err.toString());
+					err = err.toString();
+					ctrl.fallback(404, err);
+					for (let $ of F.temporary.files[ctrl.uri.cache])
+						$.fallback(404, err);
 				} else {
 					F.temporary.minified[ctrl.uri.cache] = filename;
 					send_file(ctrl, filename, 'css');
+					for (let $ of F.temporary.files[ctrl.uri.cache])
+						send_file($, filename, 'css');
 				}
+				delete F.temporary.files[ctrl.uri.cache];
 			});
 		}
 	});
@@ -1477,12 +1514,24 @@ function send_js(ctrl, path) {
 		return;
 	}
 
+	if (!DEBUG) {
+		if (F.temporary.files[ctrl.uri.cache]) {
+			F.temporary.files[ctrl.uri.cache].push(ctrl);
+			return;
+		} else
+			F.temporary.files[ctrl.uri.cache] = [];
+	}
+
 	readfile(path, function(err, output) {
 
 		if (err) {
 
-			if (!DEBUG)
+			if (!DEBUG) {
+				for (let $ of F.temporary.files[ctrl.uri.cache])
+					$.fallback(404);
+				delete F.temporary.files[ctrl.uri.cache];
 				F.temporary.notfound[ctrl.uri.cache] = 1;
+			}
 
 			ctrl.fallback(404);
 			return;
@@ -1502,11 +1551,17 @@ function send_js(ctrl, path) {
 			F.Fs.writeFile(filename, output.body, function(err) {
 				if (err) {
 					F.temporary.notfound[ctrl.uri.cache] = 1;
-					ctrl.fallback(404, err.toString());
+					err = err.toString();
+					ctrl.fallback(404, err);
+					for (let $ of F.temporary.files[ctrl.uri.cache])
+						$.fallback(404, err);
 				} else {
 					F.temporary.minified[ctrl.uri.cache] = filename;
 					send_file(ctrl, filename, 'js');
+					for (let $ of F.temporary.files[ctrl.uri.cache])
+						send_file($, filename, 'js');
 				}
+				delete F.temporary.files[ctrl.uri.cache];
 			});
 		}
 	});
@@ -1520,7 +1575,7 @@ function send_file(ctrl, path, ext) {
 		return;
 	}
 
-	var cache = F.temporary.tmp[ctrl.uri.cache];
+	let cache = F.temporary.tmp[ctrl.uri.cache];
 
 	// HTTP Cache
 	if (ctrl.response.cache && cache && ctrl.notmodified(cache.date))

package/debug.js

@@ -74,7 +74,7 @@ function runwatching() {
 	const REG_FILES = /(config|bundles\.debug|\.js|\.ts|\.flow|\.py|\.resource)+$/i;
 	const REG_PUBLIC = /\/public\//i;
 	const REG_INDEX = new RegExp(FILENAME.replace(/\.js$/, '') + '_.*?\\.js$');
-	const REG_EXTENSION = /\.(js|ts|py|resource|package|bundle|build|flow|url)$/i;
+	const REG_EXTENSION = /\.(js|ts|py|resource|package|bundle|build|flow|url|html)$/i;
 	const REG_RELOAD = /\.(js|ts|py|css|html|htm|jpg|png|gif|ico|svg|webp|resource)$/i;
 	const isRELOAD = !!options.livereload;
 	const SPEED = isRELOAD ? 1000 : 1500;

package/flow-flowstream.js

@@ -1,6 +1,6 @@
 // Total.js FlowStream module
 // The MIT License
-// Copyright 2021-2023 (c) Peter Širka <petersirka@gmail.com>
+// Copyright 2021-2025 (c) Peter Širka <petersirka@gmail.com>
 
 'use strict';
 
@@ -1004,11 +1004,11 @@ function init_current(meta, callback, nested) {
 		if (meta.unixsocket && meta.proxypath) {
 			if (!F.isWindows)
 				F.Fs.unlink(meta.unixsocket, NOOP);
-			F.http({ load: 'none', unixsocket: meta.unixsocket, config: { $stats: false, $sourcemap: false }});
+			F.http({ load: 'none', unixsocket: meta.unixsocket, clear: false, config: { $stats: false, $sourcemap: false }});
 		} else {
 			F.config.$sourcemap = false;
 			F.config.$stats = false;
-			F.load('none');
+			F.load('none', null, false);
 		}
 	}
 

package/index.js

@@ -1,6 +1,6 @@
 // Total.js framework
 // The MIT License
-// Copyright 2012-2023 (c) Peter Širka <petersirka@gmail.com>
+// Copyright 2012-2025 (c) Peter Širka <petersirka@gmail.com>
 
 'use strict';
 
@@ -36,7 +36,7 @@ global.DEF = {};
 
 	F.id = '';
 	F.clusterid = '';
-	F.is5 = F.version = 5013;
+	F.is5 = F.version = 5014;
 	F.isBundle = false;
 	F.isLoaded = false;
 	F.version_header = '5';
@@ -106,6 +106,7 @@ global.DEF = {};
 		versions: {},
 		dependencies: {}, // temporary for module dependencies
 		other: {},
+		files: {},
 		cryptokeys: {}, // for crypto keys
 		internal: {}, // controllers/modules names for the routing
 		ready: {},
@@ -743,7 +744,7 @@ F.auth = function(fn) {
 		F.def.onAuthorize = fn;
 };
 
-F.load = async function(types, callback) {
+F.load = async function(types, callback, clear = true) {
 
 	if (!types)
 		types = '';
@@ -753,14 +754,16 @@ F.load = async function(types, callback) {
 	F.dir();
 
 	await F.TBundles.extract();
-	await F.clear(true);
+
+	if (clear)
+		await F.clear(true);
 
 	process.send && process.send('total:ready');
 
 	if (typeof(types) === 'string')
 		types = types.split(',').trim();
 
-	var list = async (path, extension = 'js') => new Promise(resolve => F.TUtils.ls(path, files => resolve(files), (path, isdir) => isdir ? true : (path.indexOf('-bk') === -1 && path.indexOf('_bk') === -1 && F.TUtils.getExtension(path) === extension)));
+	var list = async (path, extension = 'js') => new Promise(resolve => F.TUtils.ls(path, files => resolve(files), (path, isdir) => isdir ? true : (!path.includes('-bk') && !path.includes('_bk') && F.TUtils.getExtension(path) === extension)));
 	var read = async (path) => new Promise(resolve => F.Fs.readFile(path, 'utf8', (err, response) => resolve(response ? response : '')));
 
 	var update = function(type, arr) {
@@ -827,7 +830,7 @@ F.load = async function(types, callback) {
 
 		for (let plugin of tmp) {
 
-			if (plugin.indexOf('-bk') !== -1 || plugin.indexOf('_bk') !== -1)
+			if (plugin.includes('-bk') || plugin.includes('_bk') || plugin.toLowerCase().includes('ds_store'))
 				continue;
 
 			files.push({ id: F.TUtils.getName(plugin).replace(/\.js$/, ''), type: 'plugins', filename: F.path.directory('plugins', plugin + '/index.js') });
@@ -900,9 +903,10 @@ F.load = async function(types, callback) {
 	F.stats.compilation = Date.now() - beg;
 	F.stats.compiled = files.length;
 	F.isLoaded = true;
+
 	DEBUG && F.TSourceMap.refresh();
-	callback && callback();
 
+	callback && callback();
 	F.emit('ready');
 	F.emit('load');
 };
@@ -1167,6 +1171,7 @@ F.loadservices = function() {
 	F.internal.interval = setInterval(function() {
 
 		F.internal.ticks++;
+
 		global.NOW = new Date();
 
 		for (let key in F.flowstreams) {
@@ -1249,7 +1254,7 @@ F.http = function(opt) {
 		F.loadconfig(cfg);
 	}
 
-	F.load(opt.load || opt.type || '', () => F.httpload(opt));
+	F.load(opt.load || opt.type || '', () => F.httpload(opt), opt.clear);
 };
 
 F.httpload = function(opt) {
@@ -1872,12 +1877,11 @@ F.clear = function(init = true, callback) {
 	F.TUtils.ls(dir, function(files, directories) {
 
 		if (init) {
-			var arr = [];
+			let arr = [];
 			for (let file of files) {
-				var filename = file.substring(dir.length);
+				let filename = file.substring(dir.length);
 				if (plus && !filename.startsWith(plus))
 					continue;
-
 				if (filename.indexOf('/') === -1 && !filename.endsWith('.cache'))
 					arr.push(file);
 			}
@@ -2047,7 +2051,7 @@ F.audit = function(name, $, message, type) {
 
 	if ($.user) {
 		data.userid = $.user.id;
-		data.username = $.user.name || $.user.nick || $.user.alias;
+		data.createdby = $.user.name || $.user.nick || $.user.alias;
 	}
 
 	if ($.controller) {
@@ -2063,7 +2067,7 @@ F.audit = function(name, $, message, type) {
 		data.type = type || 'info';
 
 	if ($.id)
-		data.schema = $.id;
+		data.action = $.id;
 
 	if ($.model)
 		data.data = JSON.stringify({ params: $.params, query: $.query, model: $.model }, auditjsonserialization);

package/package.json

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