total5 0.0.2 → 0.0.3-2

package/bin/total5

@@ -93,10 +93,13 @@ FUNC.translate = function(filename) {
 		var dictionary = {};
 
 		for (let filename of files) {
-			let body = F.Fs.readFileSync(filename, 'utf8');
-			let dict = translate(body);
-			for (let key in dict)
-				dictionary[key] = dict[key];
+			let ext = U.getExtension(filename);
+			if (ext === 'js' || ext === 'html') {
+				let body = F.Fs.readFileSync(filename, 'utf8');
+				let dict = translate(body);
+				for (let key in dict)
+					dictionary[key] = dict[key];
+			}
 		}
 
 		let builder = [];

package/changelog.txt

@@ -1,3 +1,24 @@
+========================
+0.0.3
+========================
+
+- extended icon validator by adding support for `tic` keyword
+- added new events `ON('request')`, `ON('controller')` and `ON('websocket')`
+- fixed applying the `$insecure` option in the FlowStream
+- fixed routing for unexpected content-type
+- added `controller.authorize([callback])` method
+- improved `translate` command in `total5` command-line tool
+- fixed link generator for email and phone numbers in `Markdown`
+- fixed auto-restarting app in the `debug` mode with bundles
+- fixed global settings for JS/CSS/HTML minificator
+- improved merging files
+- fixed middleware with `_` underscore character in routes
+- fixed `CORS()` method
+- improved `CORS` checker
+- added support for inheriting inline schemas in the form e.g. `id:String,@address,@products`
+- added `ctrl.image(opt)` method
+- extended `ctrl.filefs()` method by returing `opt` object
+
 ========================
 0.0.2
 ========================

package/controller.js

@@ -188,6 +188,10 @@ Controller.prototype.callback = function(err, value) {
 
 };
 
+Controller.prototype.cancel = function() {
+	this.iscanceled = true;
+};
+
 Controller.prototype.csrf = function() {
 	return F.def.onCSRFcreate(this);
 };
@@ -570,6 +574,67 @@ Controller.prototype.filefs = function(name, id, download, checkmeta) {
 	opt.check = checkmeta;
 
 	F.filestorage(name).http(ctrl, opt);
+	return opt;
+};
+
+Controller.prototype.image = function(opt) {
+
+	// opt.ext {String} required, image extension
+	// opt.date {Date} optional, for HTTP cache
+	// opt.cache {String} optional, a cache key
+	// opt.load {Function(next(stream), opt)};
+	// opt.image {Function(img, opt)}
+
+	var ctrl = this;
+	var date = opt.date ? opt.date instanceof Date ? opt.date.toUTCString() : opt.date : null;
+
+	// HTTP Cache
+	if (ctrl.response.cache && date && ctrl.notmodified(date))
+		return;
+
+	if (opt.cache) {
+		var tmp = F.path.tmp('img_' + opt.cache + '.' + opt.ext);
+
+		if (!DEBUG && date)
+			ctrl.httpcache(date);
+
+		F.Fs.lstat(tmp, function(err) {
+			if (err) {
+				opt.load.call(ctrl, function(stream) {
+					var img = F.TImages.load(stream);
+					opt.image.call(ctrl, img, opt);
+					img.save(tmp, function(err) {
+						if (err)
+							ctrl.fallback(404, err);
+						else
+							ctrl.file(tmp);
+					});
+				}, opt);
+			} else
+				ctrl.file(tmp);
+		});
+	} else {
+
+		opt.load.call(ctrl, function(stream) {
+
+			var img = F.TImages.load(stream);
+			var response = ctrl.response;
+
+			opt.image.call(ctrl, img, opt);
+
+			if (ctrl.response.headers.expires)
+				delete response.headers.expires;
+
+			if (!DEBUG && date)
+				ctrl.httpcache(date);
+
+			response.headers.etag = '858' + F.config.$httpetag;
+			response.headers['content-type'] = F.TUtils.getContentType(opt.ext);
+			ctrl.res.writeHead(response.status, response.headers);
+			F.stats.response.stream++;
+			img.pipe(ctrl.res);
+		}, opt);
+	}
 };
 
 Controller.prototype.binary = function(buffer, type, download) {
@@ -881,6 +946,7 @@ Controller.prototype.hostname = function(path) {
 Controller.prototype.$route = function() {
 
 	var ctrl = this;
+
 	if (ctrl.isfile) {
 
 		if (F.routes.files.length) {
@@ -943,7 +1009,6 @@ Controller.prototype.$route = function() {
 
 				ctrl.payload = Buffer.concat(ctrl.payload);
 				F.stats.performance.download += ctrl.payload.length / 1024 / 1024;
-
 				switch (ctrl.datatype) {
 					case 'json':
 						ctrl.body = F.def.parsers.json(ctrl.payload.toString('utf8'));
@@ -987,6 +1052,29 @@ function readfile(filename, callback) {
 	});
 }
 
+/*
+	@Path: Controller
+	@Method: instance.authorize([callback]); #callback {Function(err, session)} optional;
+	The method performs "manual" authorization. If the user is logged in, then `session {Object}` is not null, otherwise `null`. If you don't use the `callback` argument, then the method returns `Promise`.
+*/
+Controller.prototype.authorize = function(callback) {
+
+	var ctrl = this;
+
+	if (!callback)
+		return new Promise((resolve, reject) => ctrl.authorize((err, response) => resolve(response)));
+
+	if (F.def.onAuthorize) {
+		var opt = new F.TBuilders.Options(ctrl);
+		opt.TYPE = 'auth';
+		opt.query = ctrl.query;
+		opt.next = opt.callback;
+		opt.$callback = (err, response) => callback(null, response);
+		F.def.onAuthorize(opt);
+	} else
+		callback();
+}
+
 Controller.prototype.notmodified = function(date) {
 	var ctrl = this;
 	if (ctrl.headers['if-modified-since'] === date) {
@@ -1137,6 +1225,7 @@ function execute(ctrl, skipmiddleware) {
 
 				let schema = body.schema.split('/');
 				let endpoint = ctrl.route.api[schema[0]];
+
 				if (endpoint) {
 
 					if ((endpoint.auth === 1 && ctrl.user == null) || (endpoint.auth === 2 && ctrl.user)) {
@@ -1170,29 +1259,56 @@ function execute(ctrl, skipmiddleware) {
 
 						ctrl.params = params;
 						ctrl.query = query ? query.parseEncoded() : {};
+
+						if (body)
+							ctrl.body = body;
+
+						if (F.$events.controller) {
+							F.emit('controller', ctrl);
+							if (ctrl.iscanceled)
+								return;
+						}
+
 						let action = endpoint.action;
-						if (action) {
-							ctrl.body = body || {};
+						if (action)
 							action(ctrl);
-						} else
-							F.action(endpoint.actions, body || {}, ctrl).autorespond();
+						else
+							F.action(endpoint.actions, ctrl.body, ctrl).autorespond();
+
 						return;
 					}
 				}
 
-				ctrl.fallback(400, 'Invalid data');
 			}
+
+			ctrl.fallback(400, 'Invalid data');
+
 		} else {
+
+			if (F.$events.controller) {
+				/*
+					@Path: Framework
+					@Event: ON('controller', function(ctrl) { ... }); #ctrl {Controller};
+					The event captures all processed controllers on HTTP requests. The next processing can be canceled via the `ctrl.cancel()` method.
+				*/
+				F.emit('controller', ctrl);
+				if (ctrl.iscanceled)
+					return;
+			}
+
 			if (ctrl.route.actions) {
 				F.action(ctrl.route.actions, ctrl.body, ctrl).autorespond();
 			} else {
+
 				if (ctrl.route.view) {
 					ctrl.view(ctrl.route.view);
 					return;
 				}
+
 				let action = ctrl.route.action;
 				if (!action)
 					action = auto_view;
+
 				action(ctrl);
 			}
 		}

package/debug.js

@@ -1,6 +1,6 @@
 // Debug module (Watcher)
 // The MIT License
-// Copyright 2012-2023 (c) Peter Širka <petersirka@gmail.com>
+// Copyright 2012-2024 (c) Peter Širka <petersirka@gmail.com>
 
 'use strict';
 
@@ -76,7 +76,7 @@ function runwatching() {
 	const REG_PUBLIC = /\/public\//i;
 	const REG_INDEX = new RegExp(FILENAME.replace(/\.js$/, '') + '_.*?\\.js$');
 	const REG_EXTENSION = /\.(js|ts|resource|package|bundle|build|flow|url)$/i;
-	const REG_RELOAD = /\.(js|ts|css|html|htm|jpg|png|gif|ico|svg|resource)$/i;
+	const REG_RELOAD = /\.(js|ts|css|html|htm|jpg|png|gif|ico|svg|webp|resource)$/i;
 	const isRELOAD = !!options.livereload;
 	const SPEED = isRELOAD ? 1000 : 1500;
 	const ARGV = F.TUtils.clone(process.argv);
@@ -124,8 +124,8 @@ function runwatching() {
 			F.Path.join(directory, 'middleware'),
 			F.Path.join(directory, 'bundles'),
 			F.Path.join(directory, 'flowstreams'),
-			F.Path.join(directory, '/startup/'),
-			F.Path.join(directory, '/plugins/')
+			F.Path.join(directory, 'startup'),
+			F.Path.join(directory, 'plugins')
 		];
 
 		const SRC = F.Path.join(directory, '.src');
@@ -186,7 +186,7 @@ function runwatching() {
 			}
 		}
 
-		if (skipbundle) {
+		if (!skipbundle) {
 			try {
 				F.Fs.statSync(F.path.root('bundles'));
 				isbundle = true;
@@ -200,14 +200,19 @@ function runwatching() {
 
 		function onFilter(path, isdir) {
 			var p = path.substring(directory.length);
+
 			if (isbundle)
 				return isdir ? SRC !== path : !ignore[p];
+
 			if (isRELOAD)
 				return isdir ? true : REG_RELOAD.test(path);
+
 			if (isdir)
 				return true;
+
 			if (!REG_PUBLIC.test(path) && REG_EXTENSION.test(path))
 				return true;
+
 			return false;
 		}
 

package/filestorage.js

@@ -1018,14 +1018,13 @@ FP.http = function(ctrl, opt) {
 
 		response.headers['x-size'] = obj.size;
 
-		if (opt.image) {
-			/*
-			res.opt.stream = { filename: filename, start: HEADERSIZE, custom: true };
-			res.opt.make = opt.make;
-			res.opt.cache = opt.cache !== false;
-			res.opt.persistent = false;
-			res.$image();
-			*/
+		if (opt.image && IMAGES[obj.ext]) {
+			var img = {};
+			img.ext = obj.ext;
+			img.cache = opt.cache;
+			img.load = next => next(F.Fs.createReadStream(filename, { start: HEADERSIZE }));
+			img.image = opt.image;
+			ctrl.image(img);
 		} else {
 
 			var range = ctrl.headers.range;
@@ -1077,10 +1076,8 @@ FP.http = function(ctrl, opt) {
 
 			} else {
 				var stream = F.Fs.createReadStream(filename, { start: HEADERSIZE });
-
 				if (!opt.download && !DEBUG && date)
 					ctrl.httpcache(date);
-
 				ctrl.stream(obj.type, stream);
 			}
 		}

package/flow-flowstream.js

@@ -1467,6 +1467,9 @@ function init_worker(meta, type, callback) {
 
 	var forkargs = [F.directory, '--fork'];
 
+	if (F.config.$insecure)
+		forkargs.push('--insecure');
+
 	if (meta.memory)
 		forkargs.push('--max-old-space-size=' + meta.memory);
 
@@ -3323,7 +3326,12 @@ function makeunixsocket(id) {
 
 if (process.argv[1].endsWith('flow-flowstream.js')) {
 
-	isFLOWSTREAMWORKER = W.workerData || process.argv.indexOf('--fork') !== -1;
+	isFLOWSTREAMWORKER = W.workerData || process.argv.includes('--fork');
+
+	if (process.argv.includes('--insecure')) {
+		process.env.NODE_TLS_REJECT_UNAUTHORIZED = '1';
+		F.config.$insecure = true;
+	}
 
 	// Runs the worker
 	if (W.workerData) {

package/global.js

@@ -11,6 +11,7 @@ global.OFF = (name, fn) => F.off(name, fn);
 global.ROUTE = F.TRouting.route;
 global.PROXY = F.TRouting.proxy;
 global.print = console.log;
+global.Utils = F.TUtils;
 global.LOAD = F.load;
 global.LOADCONFIG = F.loadconfig;
 global.LOADRESOURCE = F.loadresource;
@@ -25,6 +26,7 @@ global.CLEANUP = F.cleanup;
 global.NEWDB = F.newdb;
 global.IMPORT = F.import;
 global.REQUIRE = F.require;
+global.RESTORE = F.restore;
 global.CRON = F.cron;
 global.UID = F.uid;
 global.SUCCESS = value => DEF.onSuccess(value);
@@ -48,6 +50,7 @@ global.MODS = F.modules;
 global.PLUGINS = F.plugins;
 global.DECRYPT = F.decrypt;
 global.ENCRYPT = F.encrypt;
+global.BACKUP = F.backup;
 global.DECRYPTREQ = F.decryptreq;
 global.ENCRYPTREQ = F.encryptreq;
 global.PATH = F.path;
@@ -105,7 +108,7 @@ global.LDAP = function(opt, callback) {
 global.CORS = function(origin) {
 	if (origin && origin[0] === '+') {
 		if (F.config.$cors !== '*')
-			F.config.$cors = (F.config.$cors ? ',' : '') + origin.substring(1);
+			F.config.$cors += (F.config.$cors ? ',' : '') + origin.substring(1);
 	} else
 		F.config.$cors = origin || '*';
 	F.emit('$cors');

package/http.js

@@ -65,6 +65,19 @@ exports.listen = function(req, res) {
 	// Pending requests
 	F.temporary.pending.push(ctrl);
 
+	if (F.$events.request) {
+
+		/*
+			@Path: Framework
+			@Event: ON('request', function(ctrl) { ... }); #ctrl {Controller};
+			The event captures all incoming requests. The next processing can be canceled via the `ctrl.cancel()` method.
+		*/
+		F.emit('request', ctrl);
+
+		if (ctrl.iscanceled)
+			return;
+	}
+
 	if (ctrl.headers.origin && (F.def.onCORS || F.config.$cors)) {
 		if (F.TRouting.lookupcors(ctrl))
 			ctrl.$route();

package/images.js

@@ -222,11 +222,6 @@ ImageProto.measure = function(callback) {
 	return self;
 };
 
-ImageProto.$$measure = function() {
-	var self = this;
-	return callback => self.measure(callback);
-};
-
 ImageProto.save = function(filename, callback, writer) {
 
 	var self = this;
@@ -284,13 +279,6 @@ ImageProto.save = function(filename, callback, writer) {
 	return self;
 };
 
-ImageProto.$$save = function(filename, writer) {
-	var self = this;
-	return function(callback) {
-		self.save(filename, callback, writer);
-	};
-};
-
 ImageProto.pipe = function(stream, type, options) {
 
 	var self = this;
@@ -327,7 +315,7 @@ ImageProto.pipe = function(stream, type, options) {
 	return self;
 };
 
-ImageProto.stream = function(type, writer) {
+ImageProto.writer = function(type, writer) {
 
 	var self = this;
 
@@ -428,13 +416,6 @@ ImageProto.identify = function(callback) {
 	return self;
 };
 
-ImageProto.$$identify = function() {
-	var self = this;
-	return function(callback) {
-		self.identify(callback);
-	};
-};
-
 ImageProto.push = function(key, value, priority, encode) {
 	var self = this;
 	var cmd = key;

package/index.js

@@ -36,7 +36,7 @@ global.DEF = {};
 
 	F.id = '';
 	F.clusterid = '';
-	F.is5 = F.version = 5000;
+	F.is5 = F.version = 5003;
 	F.isBundle = false;
 	F.isLoaded = false;
 	F.version_header = '5';
@@ -1452,11 +1452,15 @@ F.merge = function(url) {
 				}
 
 				if (link[0] !== '~' && link[0] !== '_') {
-					let ext = F.TUtils.getExtension(link);
-					if (ext === 'js')
-						link = F.path.public('/js/' + link);
-					else
-						link = F.path.public('/css/' + link);
+					if (link[0] === '/') {
+						link = F.path.public(link);
+					} else {
+						let ext = F.TUtils.getExtension(link);
+						if (ext === 'js')
+							link = F.path.public('/js/' + link);
+						else
+							link = F.path.public('/css/' + link);
+					}
 					arr.push(link);
 				} else
 					arr.push(F.path.route(link, 'public'));
@@ -2831,9 +2835,9 @@ F.dir();
 // Init CORS
 F.on('$cors', function() {
 
-	var arr = (F.config.$cors || '').toLowerCase().split(',').trim();
+	var arr = (F.config.$cors || '').toLowerCase().split(/,|;|\|/).trim();
 	var wildcard = [];
-	var strict = [];
+	var strict = {};
 
 	for (let i = 0; i < arr.length; i++) {
 		let val = arr[i];
@@ -2841,7 +2845,7 @@ F.on('$cors', function() {
 			if (val[0] === '*' && val.length > 1)
 				wildcard.push(val.substring(1));
 			else
-				strict.push(val);
+				strict[val] = 1;
 		}
 	}
 

package/jsonschema.js

@@ -8,7 +8,7 @@ require('./index');
 
 const REG_NUMBER = /[\d,.]+/;
 const REG_COLOR = /^#([A-F0-9]{3}|[A-F0-9]{6}|[A-F0-9]{8})$/i;
-const REG_ICON = /^(ti|far|fab|fad|fal|fas|fa)?\s(fa|ti)-[a-z0-9-]+$/;
+const REG_ICON = /^(ti|tic|far|fab|fad|fal|fas|fa)?\s(fa|ti|tic)-[a-z0-9-]+$/;
 const REG_WSPACE = /\u00A0/g;
 
 function Value() {}

package/markdown.js

@@ -1,6 +1,6 @@
 // Total.js Markdown
 // The MIT License
-// Copyright 2018-2023 (c) Peter Širka <petersirka@gmail.com>
+// Copyright 2018-2024 (c) Peter Širka <petersirka@gmail.com>
 
 const REG_DASH = /-{2,}/g;
 const REG_TAGS = /<[^>]*>/g;
@@ -64,9 +64,14 @@ function markdown_links(value) {
 	var link = value.substring(end + 2, value.length - 1);
 
 	// footnotes
-	if ((/^#\d+$/).test(link)) {
+	if ((/^#\d+$/).test(link))
 		return (/^\d+$/).test(text) ? '<sup data-id="{0}" class="markdown-footnote">{1}</sup>'.format(link.substring(1), text) : '<span data-id="{0}" class="markdown-footnote">{1}</span>'.format(link.substring(1), text);
-	}
+
+	if (link.isEmail())
+		return '<a href="mailto:' + link + '" rel="nofollow">' + text + '</a>';
+
+	if (link.isPhone())
+		return '<a href="tel:' + link + '" rel="nofollow">' + text + '</a>';
 
 	if (link.substring(0, 4) === 'www.')
 		link = 'https://' + link;

package/minificators.js

@@ -301,7 +301,7 @@ exports.htmlremovecomments = function(value) {
 	return value;
 };
 
-exports.merge = async function(filename, filenames, minify = true) {
+exports.merge = async function(filename, filenames, minify) {
 
 	// @filename {String/Boolean}
 
@@ -423,6 +423,7 @@ async function mergedownload(url, minify = true) {
 }
 
 async function mergefile(filename, minify) {
+
 	return new Promise(function(resolve) {
 
 		F.Fs.readFile(filename, 'utf8', function(err, response) {
@@ -445,6 +446,9 @@ async function mergefile(filename, minify) {
 				ext = ext.toLowerCase();
 			}
 
+			if (minify === undefined)
+				minify = !!F.config['$minify' + ext];
+
 			var output = { ext: ext };
 
 			response = response.ROOT();

package/package.json

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

package/routing.js

@@ -188,7 +188,7 @@ function Route(url, action, size) {
 	}
 
 	// Parse flags
-	url = url.replace(/(@|#)+[a-z0-9]+/gi, function(text) {
+	url = url.replace(/(@|#)+[a-z0-9_]+/gi, function(text) {
 		let tmp = text.trim();
 		if (tmp[0] === '#') {
 			t.middleware.push(tmp.substring(1));
@@ -618,7 +618,7 @@ exports.lookupcors = function(ctrl) {
 		let cors = F.temporary.cors;
 
 		if (cors) {
-			if (cors.strict.length && cors.strict.includes(origin)) {
+			if (cors.strict[origin]) {
 				resume = true;
 			} else if (cors.wildcard.length) {
 				for (let m of cors.wildcard) {

package/tms.js

@@ -101,7 +101,7 @@ function tmscontroller($) {
 				}
 			} else {
 				msg.error = true;
-				msg.data = new ErrorBuilder.push(404).output();
+				msg.data = new ErrorBuilder().push(404).output();
 				client.send(msg);
 			}
 		}
@@ -377,4 +377,4 @@ F.on('$tms', function() {
 		Cache.socket && Cache.socket.close(1000, 'Changed TMS secret');
 	}
 
-});
+});

package/utils.js

@@ -5968,6 +5968,17 @@ SP.toJSONSchema = SP.parseSchema = function(name, url) {
 		var arr = prop[i].split(':').trim();
 		var tmp = null;
 
+		if (arr[0][0] === '@') {
+			let ext = F.jsonschemas[arr[0].substring(1)];
+			if (ext) {
+				for (let m of ext.required)
+					required.push(m);
+				for (let m in ext.properties)
+					obj.properties[m] = ext.properties[m];
+			}
+			continue;
+		}
+
 		if (arr[0][0] === '!' || arr[0][0] === '*') {
 			// required
 			arr[0] = arr[0].substring(1);

package/websocket.js

@@ -110,7 +110,19 @@ Controller.prototype.upgrade = function(websocket) {
 	ctrl.socket.on('end', websocket_close);
 	ctrl.parent.add(ctrl);
 	websocket.online++;
-	F.$events.websocket_begin && F.emit('websocket_begin', ctrl.parent, ctrl);
+
+	// Deprecated:
+	// F.$events.websocket_begin && F.emit('websocket_begin', ctrl.parent, ctrl);
+
+	if (F.$events.websocket) {
+		/*
+			@Path: Framework
+			@Event: ON('websocket', function(ctrl) { ... }); #ctrl {Controller};
+			The event captures all incoming WebSocket connections. The next processing __can't be__ canceled via the `ctrl.cancel()` method.
+		*/
+		F.emit('websocket', ctrl);
+	}
+
 	ctrl.parent.$events.open && ctrl.parent.emit('open', ctrl);
 };