total5 0.0.1-9 → 0.0.2

package/index.js

@@ -1,4 +1,4 @@
-// Total.js core
+// Total.js framework
 // The MIT License
 // Copyright 2012-2023 (c) Peter Širka <petersirka@gmail.com>
 
@@ -20,7 +20,7 @@ Object.freeze(EMPTYOBJECT);
 Object.freeze(EMPTYARRAY);
 
 // Globals
-global.F = {};
+global.F = global.Total = {};
 global.DEBUG = true;
 global.CONF = {};
 global.REPO = {};
@@ -38,6 +38,7 @@ global.DEF = {};
 	F.clusterid = '';
 	F.is5 = F.version = 5000;
 	F.isBundle = false;
+	F.isLoaded = false;
 	F.version_header = '5';
 	F.version_node = process.version + '';
 	F.EMPTYOBJECT = EMPTYOBJECT;
@@ -57,6 +58,8 @@ global.DEF = {};
 	F.filestorages = {};
 	F.jsonschemas = {};
 	F.querybuilders = {};
+	F.openclients = {};
+	F.nodemodules = {};
 	F.workers = {};
 	F.config = CONF;
 	F.def = DEF;
@@ -182,6 +185,7 @@ global.DEF = {};
 		response: {
 			ddos: 0,
 			html: 0,
+			xml: 0,
 			json: 0,
 			websocket: 0,
 			timeout: 0,
@@ -221,6 +225,9 @@ global.DEF = {};
 	F.path.private = path => path ? F.path.$join(F.temporary.directories.private, path) : F.temporary.directories.private;
 	F.path.databases = path => path ? F.path.$join(F.temporary.directories.databases, path) : F.temporary.directories.databases;
 	F.path.plugins = path => path ? F.path.$join(F.temporary.directories.plugins, path) : F.temporary.directories.plugins;
+	F.path.templates = path => path ? F.path.$join(F.temporary.directories.templates, path) : F.temporary.directories.templates;
+	F.path.flowstreams = path => path ? F.path.$join(F.temporary.directories.flowstreams, path) : F.temporary.directories.flowstreams;
+	F.path.modules = path => path ? F.path.$join(F.temporary.directories.modules, path) : F.temporary.directories.modules;
 	F.path.directory = (type, path) => path ? F.path.$join(F.temporary.directories[type], path) : F.temporary.directories[type];
 	F.path.tmp = F.path.temp = path => path ? F.path.$join(F.temporary.directories.tmp, path) : F.temporary.directories.tmp;
 	F.path.exists = (path, callback) => callback ? (F.Fs.lstat(path, (err, stats) => callback(err ? false : true, stats ? stats.size : 0, stats ? stats.isFile() : false))) : new Promise(resolve => F.path.exists(path, resolve));
@@ -338,15 +345,19 @@ function unlink(arr, callback) {
 	// New internal configuration
 	CONF.$root = '';
 	CONF.$cors = ''; // hostnames separated by comma
+	CONF.$api = '/api/'; // a default API endpoint
 	CONF.$sourcemap = true;
 	CONF.$httpreqlimit = 0; // request limit per ip
 	CONF.$httpcompress = true;
 	CONF.$httpetag = '';
-	CONF.$httpmaxsize = 256; // 256 kB
+	CONF.$httpmaxsize = 256; // kB
 	CONF.$httprangebuffer = 5120; // 5 MB
 	CONF.$httptimeout = 5; // 5 seconds
-	CONF.$httpfiles = { flac: true, jpg: true, jpeg: true, png: true, gif: true, ico: true, wasm: true, js: true, mjs: true, css: true, txt: true, xml: true, woff: true, woff2: true, otf: true, ttf: true, eot: true, svg: true, zip: true, rar: true, pdf: true, docx: true, xlsx: true, doc: true, xls: true, html: true, htm: true, appcache: true, manifest: true, map: true, ogv: true, ogg: true, mp4: true, mp3: true, webp: true, webm: true, swf: true, package: true, json: true, ui: true, md: true, m4v: true, jsx: true, heif: true, heic: true, ics: true, ts: true, m3u8: true, wav: true, xsd: true, xsl: true, xslt: true };
+	CONF.$httpfiles = { flac: true, jpg: true, jpeg: true, png: true, gif: true, ico: true, wasm: true, js: true, mjs: true, css: true, txt: true, xml: true, woff: true, woff2: true, otf: true, ttf: true, eot: true, svg: true, zip: true, rar: true, pdf: true, docx: true, xlsx: true, doc: true, xls: true, html: true, htm: true, appcache: true, manifest: true, map: true, ogv: true, ogg: true, mp4: true, mp3: true, webp: true, webm: true, swf: true, package: true, json: true, ui: true, md: true, m4v: true, jsx: true, heif: true, heic: true, ics: true, ts: true, m3u8: true, wav: true, xsd: true, xsl: true, xslt: true, ipynb: true, ijsnb: true };
 	CONF.$httpchecktypes = true; // for multipart data only
+	CONF.$httpmaxage = 60; // in seconds
+	CONF.$httpmaxkeys = 33;
+	CONF.$httpmaxkey = 25;
 	CONF.$blacklist = '';
 	CONF.$xpoweredby = 'Total.js';
 	CONF.$maxopenfiles = 100;
@@ -369,15 +380,14 @@ function unlink(arr, callback) {
 	CONF.$imagememory = 0; // disabled because e.g. GM v1.3.32 throws some error about the memory
 	CONF.$stats = true;
 
-	CONF.$nodemodules = require.resolve('./index');
-	CONF.$nodemodules = CONF.$nodemodules.substring(0, CONF.$nodemodules.length - (8 + 7));
 	CONF.$npmcache = '/var/www/.npm';
 	CONF.$python = 'python3';
-	CONF.$wsmaxsize = 256; // 256 kB
+	CONF.$wsmaxsize = 256; // kB
 	CONF.$wscompress = true;
 	CONF.$wsencodedecode = false;
 	CONF.$wsmaxlatency = 2000;
 	CONF.$proxytimeout = 5; // 5 seconds
+	// CONF.$proxyrequest = '';
 	CONF.$cookiesamesite = 'Lax';
 	CONF.$cookiesecure = false;
 	CONF.$csrfexpiration = '30 minutes';
@@ -386,9 +396,10 @@ function unlink(arr, callback) {
 	CONF.$tapiurl = 'eu';
 	CONF.$tapimail = false;
 	CONF.$tapilogger = false;
+	CONF.$imprint = true;
 
 	CONF.$tms = false;
-	CONF.$tmsmaxsize = 256;
+	CONF.$tmsmaxsize = 256; // kB
 	CONF.$tmsurl = '/$tms/';
 	CONF.$tmsclearblocked = 60; // in minutes
 
@@ -449,7 +460,7 @@ function unlink(arr, callback) {
 		} else
 			msg.to(email);
 
-		msg.from(F.config.mail_from);
+		msg.from(F.config.mail_from || F.config.smtp.from || F.config.smtp.user);
 		callback && msg.callback(callback);
 
 		if (reply)
@@ -480,7 +491,10 @@ function unlink(arr, callback) {
 
 		NOW = new Date();
 
-		if (!name && err.name)
+		if (err instanceof F.TBuilders.ErrorBuilder) {
+			if (!name)
+				name = err[0].name;
+		} else if (!name && err.name)
 			name = err.name;
 
 		err = err.toString();
@@ -560,10 +574,12 @@ F.loadconfig = function(value) {
 
 				break;
 			case '$cryptoiv':
-				cfg[key] = val ? Buffer.from(val, 'hex') : null;
+				cfg[key] = val ? Buffer.from(val, (/[A-Z=\/+]/).test(val) ? 'base64' : 'hex') : null;
 				break;
-			case 'mail_from':
 			case '$root':
+				cfg[key] = val ? F.TUtils.normalize(val) : '';
+				break;
+			case 'mail_from':
 				break;
 			case '$port':
 				cfg[key] = +val;
@@ -596,6 +612,7 @@ F.loadconfig = function(value) {
 	process.env.NODE_TLS_REJECT_UNAUTHORIZED = F.config.$insecure ? '0' : '1';
 	F.logger(F.config.$logger == true);
 	F.dir();
+	F.emit('$cors');
 	F.emit('$tms');
 	F.emit('$reconfigure');
 };
@@ -710,6 +727,9 @@ F.auth = function(fn) {
 
 F.load = async function(types, callback) {
 
+	if (!types)
+		types = '';
+
 	var beg = Date.now();
 
 	F.dir();
@@ -735,10 +755,11 @@ F.load = async function(types, callback) {
 		return arr;
 	};
 
-	if (!types.length || types.includes('stats')) {
+	if (types.length && !types.includes('stats')) {
 		F.config.$stats = false;
 		F.config.$sourcemap = false;
-	}
+	} else
+		F.config.$sourcemap = DEBUG;
 
 	if (!types.length || types.includes('env')) {
 		let env = await read(F.path.root('.env'));
@@ -770,7 +791,7 @@ F.load = async function(types, callback) {
 		}
 	}
 
-	let loader = ['modules', 'controllers', 'actions', 'schemas', 'models', 'definitions', 'sources', 'middleware'];
+	let loader = ['modules', 'actions', 'schemas', 'models', 'definitions', 'controllers', 'middleware', 'sources'];
 	var files = [];
 	var tmp;
 
@@ -859,7 +880,7 @@ F.load = async function(types, callback) {
 	F.loadservices();
 	F.stats.compilation = Date.now() - beg;
 	F.stats.compiled = files.length;
-	F.isloaded = true;
+	F.isLoaded = true;
 	DEBUG && F.TSourceMap.refresh();
 	callback && callback();
 
@@ -868,9 +889,42 @@ F.load = async function(types, callback) {
 };
 
 F.require = function(name) {
+
 	if (name.startsWith('node:'))
 		return require(name);
-	return NODE_MODULES[name] ? require('node:' + name) : require(F.Path.join(F.directory, name));
+
+	if (NODE_MODULES[name])
+		return require('node:' + name);
+
+	let mod = null;
+
+	try {
+		mod = require(name);
+	} catch (e) {
+		mod = require(F.Path.join(F.config.$nodemodules, name));
+	}
+
+	if (!mod)
+		throw new Error('NPM module "' + name + '" not found');
+
+	return mod;
+};
+
+F.runscript = function(filename) {
+	F.Fs.readFile(filename || PATH.root('debug.js'), function(err, data) {
+		if (data) {
+			var scr = data.toString('utf8').trim();
+			var fn;
+			if (data) {
+				try {
+					fn = new Function('require', scr);
+				} catch (e) {
+					console.error(e);
+				}
+				fn && fn(require);
+			}
+		}
+	});
 };
 
 F.import = function(url, callback) {
@@ -977,7 +1031,7 @@ F.npminstall = function(name, callback) {
 	if (!callback)
 		return new Promise((resolve, reject) => F.npminstall(name, err => err ? reject(err) : resolve()));
 
-	var path = F.config.$node_modules;
+	var path = F.config.$nodemodules;
 	F.path.mkdir(path, true);
 
 	var index = name.lastIndexOf('@');
@@ -1033,7 +1087,13 @@ F.shell = function(cmd, callback, cwd) {
 
 F.console = function() {
 
+	if (!F.config.$imprint)
+		return;
+
 	var memory = process.memoryUsage();
+	var nodemodules = require.resolve('./index');
+
+	nodemodules = nodemodules.substring(0, nodemodules.length - (8 + 7));
 
 	print('====================================================');
 	print('PID           : ' + process.pid);
@@ -1054,10 +1114,10 @@ F.console = function() {
 	print('====================================================');
 	F.config.$root && print('Root          : ' + F.config.$root);
 	print('Directory     : ' + process.cwd());
-	print('node_modules  : ' + F.config.$nodemodules);
+	print('node_modules  : ' + nodemodules);
 	print('====================================================\n');
 
-	if (!F.isWorker) {
+	if (!F.isWorker && F.server) {
 
 		var hostname = F.unixsocket ? ('Socket: ' + F.unixsocket) : '{2}://{0}:{1}/'.format(F.config.$ip, F.config.$port, F.isHTTPS ? 'https' : 'http');
 
@@ -1082,7 +1142,7 @@ F.console = function() {
 
 F.loadservices = function() {
 
-	F.internal.interval && clearInterval(F.internal.timeouts);
+	F.internal.interval && clearInterval(F.internal.interval);
 
 	// This timer solving timeouts
 	F.internal.interval = setInterval(function() {
@@ -1093,6 +1153,9 @@ F.loadservices = function() {
 		for (let key in F.flowstreams)
 			F.flowstreams[key].service(F.internal.ticks);
 
+		if (F.internal.ticks == 6 || F.internal.ticks == 12)
+			F.TWebSocket.ping();
+
 		// 1 minute
 		if (F.internal.ticks == 12) {
 			F.internal.ticks = 0;
@@ -1101,9 +1164,6 @@ F.loadservices = function() {
 			F.$events.service && F.emit('service', F.internal.counter);
 		}
 
-		if (F.internal.ticks == 6 || F.internal.ticks == 12)
-			F.TWebSocket.ping();
-
 		F.TFlow.ping();
 
 		if (!F.temporary.pending.length) {
@@ -1116,7 +1176,7 @@ F.loadservices = function() {
 		while (true) {
 			let ctrl = F.temporary.pending[index];
 			if (ctrl) {
-				if (ctrl.destroyed) {
+				if (ctrl.destroyed || ctrl.res.headersSent || ctrl.res.writableEnded) {
 					F.temporary.pending.splice(index, 1);
 				} else if (ctrl.timeout <= 0) {
 
@@ -1155,6 +1215,11 @@ F.http = function(opt) {
 	// config, env, modules, controllers, actions, schemas, models, definitions, sources, middleware, resources, plugins, stats
 	// none - loads only web server
 
+	if (F.isLoaded) {
+		F.httpload(opt);
+		return;
+	}
+
 	if (opt.config) {
 		let cfg = [];
 		for (let key in opt.config)
@@ -1162,81 +1227,90 @@ F.http = function(opt) {
 		F.loadconfig(cfg);
 	}
 
-	F.load(opt.load || opt.type || '', function() {
+	F.load(opt.load || opt.type || '', () => F.httpload(opt));
+};
 
-		F.server = F.Http.createServer(F.THttp.listen);
-		F.server.on('upgrade', F.TWebSocket.listen);
+F.httpload = function(opt) {
 
-		var unixsocket = opt.unixsocket || F.config.$unixsocket;
+	if (F.server) {
+		F.server.close(function() {
+			F.server = null;
+			F.httpload(opt);
+		});
+		return;
+	}
 
-		if (unixsocket) {
+	F.server = F.Http.createServer(F.THttp.listen);
+	F.server.on('upgrade', F.TWebSocket.listen);
 
-			try {
-				F.Fs.unlinkSync(unixsocket);
-			} catch (e) {}
+	var unixsocket = opt.unixsocket || F.config.$unixsocket;
+	if (unixsocket) {
 
-			if (F.isWindows && unixsocket.indexOf(SOCKETWINDOWS) === -1)
-				unixsocket = F.Path.join(SOCKETWINDOWS, unixsocket);
+		try {
+			F.Fs.unlinkSync(unixsocket);
+		} catch (e) {}
 
-			F.unixsocket = unixsocket;
+		if (F.isWindows && unixsocket.indexOf(SOCKETWINDOWS) === -1)
+			unixsocket = F.Path.join(SOCKETWINDOWS, unixsocket);
 
-			var listen = function(count) {
-				F.server.listen(unixsocket, function() {
+		F.config.$unixsocket = F.unixsocket = unixsocket;
 
-					// Check if the socket exists
-					if (F.isWindows)
-						return;
+		var listen = function(count) {
+			F.server.listen(unixsocket, function() {
 
-					F.Fs.lstat(unixsocket, function(err) {
+				// Check if the socket exists
+				if (F.isWindows)
+					return;
 
-						if (count > 9)
-							throw new Error('HTTP server can not listen the path "{0}"'.format(unixsocket));
+				F.Fs.lstat(unixsocket, function(err) {
 
-						if (err)
-							setTimeout(listen, 500, count + 1);
-						else if (opt.unixsocket777)
-							F.Fs.chmodSync(unixsocket, 0o777);
-					});
+					if (count > 9)
+						throw new Error('HTTP server can not listen the path "{0}"'.format(unixsocket));
 
+					if (err)
+						setTimeout(listen, 500, count + 1);
+					else if (opt.unixsocket777)
+						F.Fs.chmodSync(unixsocket, 0o777);
 				});
-			};
 
-			listen(1);
+			});
+		};
+
+		listen(1);
 
-		} else {
+	} else {
 
-			if (opt.port)
-				F.config.$port = opt.port;
-
-			if (F.config.$port === 'auto') {
-				let port = process.env.PORT;
-				if (!port) {
-					for (let arg of process.argv) {
-						if ((/^\d{3,5}$/).test(arg)) {
-							port = arg;
-							break;
-						}
+		if (opt.port)
+			F.config.$port = opt.port;
+
+		if (F.config.$port === 'auto') {
+			let port = process.env.PORT;
+			if (!port) {
+				for (let arg of process.argv) {
+					if ((/^\d{3,5}$/).test(arg)) {
+						port = arg;
+						break;
 					}
 				}
-				if (port)
-					port = +port;
-				if (isNaN(port))
-					port = 8000;
-				F.config.$port = port;
 			}
+			if (port)
+				port = +port;
+			if (isNaN(port))
+				port = 8000;
+			F.config.$port = port;
+		}
 
-			if (opt.ip)
-				F.config.$ip = opt.ip;
+		if (opt.ip)
+			F.config.$ip = opt.ip;
 
-			F.server.listen(F.config.$port, F.config.$ip);
-		}
+		F.server.listen(F.config.$port, F.config.$ip);
+	}
 
-		F.config.$performance && F.server.on('connection', httptuningperformance);
+	F.config.$performance && F.server.on('connection', httptuningperformance);
 
-		if (!process.connected && F.console)
-			F.console();
+	if (!process.connected && F.console)
+		F.console();
 
-	});
 };
 
 F.logger = function(enable) {
@@ -1305,8 +1379,12 @@ F.logger = function(enable) {
 	};
 };
 
+F.componentator = function(name, components, removeprev = true, attrs = '') {
 
-F.componentator = function(name, components, removeprev = true) {
+	if (typeof(removeprev) === 'string') {
+		attrs = removeprev;
+		removeprev = true;
+	}
 
 	var meta = {};
 
@@ -1315,7 +1393,7 @@ F.componentator = function(name, components, removeprev = true) {
 
 	F.$events.componentator && F.emit('componentator', meta);
 
-	var url = 'https://componentator.com/download.js?id=' + meta.components;
+	var url = 'https://componentator.com/download.js?id=' + meta.components + (attrs ? ('&' + attrs) : '');
 	var nameid = meta.name.slug();
 	var relative = 'ui-' + (removeprev ? (nameid + '-') : '') + url.makeid() + '.min.js';
 	var filename = F.path.public(relative);
@@ -1344,13 +1422,13 @@ F.componentator = function(name, components, removeprev = true) {
 
 };
 
-F.error = function(err, name, uri) {
+F.error = function(err, name, url) {
 
 	if (!arguments.length)
 		return F.errorcallback;
 
 	if (err)
-		F.def.onError(err, name, uri);
+		F.def.onError(err, name, url);
 };
 
 F.errorcallback = function(err) {
@@ -1410,6 +1488,7 @@ F.merge = function(url) {
 				if (F.temporary.merged[key]) {
 					if (F.temporary.notfound[url]) {
 						ctrl.fallback(404);
+						next();
 						return;
 					}
 				} else {
@@ -1520,8 +1599,12 @@ F.middleware = function(name, fn, assign) {
 					}
 				}
 			} else {
+
 				if (a === 'websocket' || a === 'file' || a === 'route')
 					a += 's';
+				else if (a === 'dynamic')
+					a = 'routes';
+
 				let routes = F.routes[a];
 				if (routes) {
 					for (let route of routes) {
@@ -1654,15 +1737,6 @@ F.service = function(count) {
 		}
 	}
 
-	// Exec crons
-	for (let cron of F.crons) {
-		if (cron.check(NOW))
-			cron.exec(NOW);
-	}
-
-	if (count % 10 === 0 && global.gc)
-		setTimeout(cleargc, 1000);
-
 	F.temporary.service.publish = F.stats.performance.publish;
 	F.temporary.service.subscribe = F.stats.performance.subscribe;
 	F.temporary.service.call = F.stats.performance.call;
@@ -1695,6 +1769,16 @@ F.service = function(count) {
 
 	F.usage && F.usage();
 	F.temporary.service.usage = 0;
+
+	if (count % 10 === 0 && global.gc)
+		setTimeout(cleargc, 1000);
+
+	// Exec crons
+	for (let cron of F.crons) {
+		if (cron.check(NOW))
+			cron.exec(NOW);
+	}
+
 };
 
 function cleargc() {
@@ -1716,8 +1800,7 @@ F.clear = function(init = true, callback) {
 		dir = dir.replaceAll('/', '\\');
 
 	if (init) {
-
-		if (!F.config.$cleartemp) {
+		if (F.config.$cleartemp) {
 			// clears only JS and CSS files
 			F.TUtils.ls(dir, function(files) {
 				F.path.unlink(files, callback);
@@ -1839,7 +1922,7 @@ F.newjsonschema = function(name, obj) {
 F.newtransform = function(name, action, id) {
 	if (action == null) {
 		let items = F.transformations[name];
-		let index = items.findIndex('id', id);
+		let index = items.TfindIndex('id', id);
 		if (index !== -1) {
 			items.splice(index, 1);
 			if (!items.length)
@@ -1849,19 +1932,30 @@ F.newtransform = function(name, action, id) {
 		let obj = {};
 		obj.id = id;
 		obj.action = action;
-
+		obj.remove = function() {
+			let arr = F.transformations[name];
+			if (arr) {
+				let index = arr.indexOf(obj);
+				if (index !== -1) {
+					arr.splice(index, 1);
+					if (!arr.length)
+						delete F.transformations[name];
+				}
+			}
+		};
 		if (F.transformations[name])
 			F.transformations[name].push(obj);
 		else
 			F.transformations[name] = [obj];
+		return obj;
 	}
 };
 
 function transform(items, opt, index) {
 	var t = items[index];
 	if (t) {
+		opt.next = () => transform(items, opt, index + 1);
 		t.action(opt, opt.value);
-		t.next = () => transform(items, opt, index + 1);
 	} else
 		opt.$callback(opt.error.items.length ? opt.error : null, opt.value);
 }
@@ -1905,11 +1999,12 @@ F.audit = function(name, $, message, type) {
 	if ($.controller) {
 		if ($.controller.sessionid)
 			data.sessionid = $.controller.sessionid;
-		data.ua = $.ua;
-		data.ip = $.ip;
-		data.url = $.url;
 	}
 
+	data.ua = $.ua;
+	data.ip = $.ip;
+	data.url = $.url;
+
 	if (type)
 		data.type = type || 'info';
 
@@ -2130,7 +2225,7 @@ F.restore = function(filename, target, callback, filter) {
 		parser.next();
 	});
 
-	CLEANUP(stream, function() {
+	F.cleanup(stream, function() {
 		end = true;
 		parser.end();
 	});
@@ -2302,16 +2397,13 @@ F.restart = function() {
 	process.send && process.send('total:restart');
 };
 
-F.exit = function(signal) {
+F.exit = function(signal = 15) {
 
 	if (F.isexited)
 		return;
 
 	F.isexited = true;
 
-	if (!signal)
-		signal = 'SIGTERM';
-
 	for (let m in F.workers) {
 		let worker = F.workers[m];
 		try {
@@ -2329,8 +2421,8 @@ F.exit = function(signal) {
 		} catch (e) {}
 	}
 
-	F.internal.timeouts && clearInterval(F.internal.timeouts);
-	F.internal.timeouts = null;
+	F.internal.interval && clearInterval(F.internal.interval);
+	F.internal.interval = null;
 
 	if (F.server) {
 		F.server.setTimeout(1);
@@ -2413,10 +2505,10 @@ F.dir = function(val) {
 	if (val)
 		F.directory = val;
 
-	var dirs = ['public', 'tmp', 'logs', 'databases', 'controllers', 'resources', 'plugins', 'views', 'definitions', 'schemas', 'models', 'flowstreams', 'bundles', 'actions', 'extensions', 'source', 'services', 'updates', 'templates'];
+	var dirs = ['public', 'tmp', 'logs', 'databases', 'controllers', 'resources', 'plugins', 'modules', 'views', 'definitions', 'schemas', 'models', 'flowstreams', 'bundles', 'actions', 'extensions', 'source', 'services', 'updates', 'templates', 'private'];
 
 	for (let dir of dirs) {
-		var cfg = F.config['$dir' + dir];
+		let cfg = F.config['$dir' + dir];
 		F.temporary.directories[dir] = cfg || F.Path.join(F.directory, dir);
 	}
 
@@ -2456,7 +2548,7 @@ F.mail = function(email, subject, name, model, language, callback) {
 	// Localization
 	if (typeof(language) === 'string') {
 		if (subject.includes('@('))
-			subject = TRANSLATE(language, subject);
+			subject = F.translate(language, subject);
 	}
 
 	let body = F.view(name, model, view => view.language = language || '');
@@ -2474,9 +2566,9 @@ F.htmlmail = function(email, subject, body, language, callback) {
 	// Localization
 	if (typeof(language) === 'string') {
 		if (subject.includes('@('))
-			subject = TRANSLATE(language, subject);
+			subject = F.translate(language, subject);
 		if (body.includes('@('))
-			body = TRANSLATE(language, body);
+			body = F.translate(language, body);
 	}
 
 	body = body.indexOf('<body>') === -1 ? ('<!DOCTYPE html><html><head><title>' + subject + '</title><meta charset="utf-8" /></head><body style="padding:0;margin:0;font-family:Arial;font-size:14px;font-weight:normal">' + body + '</body></html>') : body;
@@ -2487,6 +2579,17 @@ F.readfile = function(path, type = null) {
 	return new Promise(resolve => F.Fs.readFile(path, type, (err, response) => err ? resolve(null) : resolve(response)));
 };
 
+F.datauri = function(path) {
+	return new Promise(resolve => F.Fs.readFile(path, 'base64', function(err, response) {
+		if (err) {
+			resolve(null);
+		} else {
+			var ext = F.TUtils.getExtension(path);
+			resolve('data:' + F.TUtils.getContentType(ext) + ';base64,' + response);
+		}
+	}));
+};
+
 F.loadstats = function() {
 
 	var main = {};
@@ -2604,9 +2707,9 @@ process.on('message', function(msg, h) {
 
 	let key;
 
-	if (msg === 'total:debug')
-		F.TUtils.wait(() => F.isloaded, F.console, 10000, 500);
-	else if (msg === 'total:ping')
+	if (msg === 'total:debug') {
+		F.TUtils.wait(() => F.isLoaded, F.console, 10000, 500);
+	} else if (msg === 'total:ping')
 		setImmediate(ping);
 	else if (msg === 'total:update') {
 		key = '$update';
@@ -2658,11 +2761,16 @@ process.on('message', function(msg, h) {
 	F.TCluster = require('./cluster');
 
 	// Settings
-	F.directory = F.TUtils.$normalize(require.main ? F.Path.dirname(require.main.filename) : process.cwd());
+	// F.directory = F.TUtils.$normalize(require.main ? F.Path.dirname(require.main.filename) : process.cwd());
+	F.directory = F.TUtils.$normalize(process.cwd());
+
 	F.is = F.Os.platform().substring(0, 3).toLowerCase() === 'win';
 	F.isWorker = process.env.PASSENGER_APP_ENV ? false : F.Cluster.isWorker;
 	F.syshash = (__dirname + '-' + F.Os.hostname() + '-' + F.Os.platform() + '-' + F.Os.arch() + '-' + F.Os.release() + '-' + F.Os.tmpdir() + JSON.stringify(process.versions)).md5();
 	F.isLE = F.Os.endianness ? F.Os.endianness() === 'LE' : true;
+	F.isWindows = F.Os.platform().substring(0, 3).toLowerCase() === 'win';
+
+	F.config.$total5 = F.Path.dirname(require.resolve('./index'));
 
 	F.cache = require('./cache');
 	F.TImages = require('./images');
@@ -2673,16 +2781,17 @@ process.on('message', function(msg, h) {
 
 	F.on2 = F.on;
 	F.on = function(name, fn) {
-		if (name === 'ready' && F.isloaded)
+		if (name === 'ready' && F.isLoaded)
 			fn();
 		else
 			F.on2(name, fn);
 	};
 
 	// Configuration
-	CONF.secret_uid = F.syshash.substring(10);
-	CONF.$httpexpire = NOW.add('y', 1).toUTCString(); // must be refreshed every hour
-	CONF.$cryptoiv = Buffer.from(F.syshash).slice(0, 16);
+	F.config.secret_uid = F.syshash.substring(10);
+	F.config.$httpexpire = NOW.add('y', 1).toUTCString(); // must be refreshed every hour
+	F.config.$cryptoiv = Buffer.from(F.syshash).slice(0, 16);
+	F.config.$nodemodules = F.Path.join(F.directory, 'node_modules');
 
 	// Methods
 	F.route = F.TRouting.route;
@@ -2719,4 +2828,24 @@ require('./markdown');
 // Init directories
 F.dir();
 
+// Init CORS
+F.on('$cors', function() {
+
+	var arr = (F.config.$cors || '').toLowerCase().split(',').trim();
+	var wildcard = [];
+	var strict = [];
+
+	for (let i = 0; i < arr.length; i++) {
+		let val = arr[i];
+		if (val !== '*') {
+			if (val[0] === '*' && val.length > 1)
+				wildcard.push(val.substring(1));
+			else
+				strict.push(val);
+		}
+	}
+
+	F.temporary.cors = F.config.$cors === '*' ? null : { wildcard: wildcard, strict: strict };
+});
+
 module.exports = F;