total5 0.0.1-2 → 0.0.1-21

package/controller.js

@@ -11,17 +11,21 @@ const REG_MOBILE = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Min
 const REG_ENCODINGCLEANER = /[;\s]charset=utf-8/g;
 
 const CHECK_DATA = { POST: 1, PUT: 1, PATCH: 1, DELETE: 1 };
-const CHECK_COMPRESSION = { 'text/plain': true, 'text/javascript': true, 'text/css': true, 'text/jsx': true, 'application/javascript': true, 'application/x-javascript': true, 'application/json': true, 'text/xml': true, 'image/svg+xml': true, 'text/x-markdown': true, 'text/html': true };
+const CHECK_COMPRESSION = { 'text/plain': true, 'text/javascript': true, 'text/css': true, 'text/jsx': true, 'application/javascript': true, 'application/x-javascript': true, 'application/json': true, 'application/xml': true, 'text/xml': true, 'image/svg+xml': true, 'text/x-markdown': true, 'text/html': true };
 const CHECK_CHARSET =  { 'text/plain': true, 'text/javascript': true, 'text/css': true, 'text/jsx': true, 'application/javascript': true, 'application/x-javascript': true, 'application/json': true, 'text/xml': true, 'text/x-markdown': true, 'text/html': true };
 const CHECK_NOCACHE = { zip: 1, rar: 1 };
 
 const GZIP_FILE = { memLevel: 9 };
 const GZIP_STREAM = { memLevel: 1 };
 
+const NOCACHE = 'private, no-cache, no-store, max-age=0';
+
 function Controller(req, res) {
 
 	var ctrl = this;
 
+	req.controller = ctrl;
+
 	ctrl.req = req;
 	ctrl.res = res;
 	ctrl.method = ctrl.req.method;
@@ -36,6 +40,7 @@ function Controller(req, res) {
 	ctrl.url = ctrl.uri.key;
 	ctrl.released = false;
 	ctrl.downloaded = false;
+	ctrl.protocol = req.connection.encrypted || (req.headers['x-forwarded-protocol'] || req.headers['x-forwarded-proto']) === 'https' ? 'https' : 'http';
 
 	for (let path of ctrl.split)
 		ctrl.split2.push(path.toLowerCase());
@@ -57,7 +62,7 @@ function Controller(req, res) {
 
 	ctrl.response = {
 		status: 200,
-		cache: DEBUG,
+		cache: global.DEBUG != true,
 		minify: true,
 		// minifyjson: false
 		// encrypt: false
@@ -120,6 +125,10 @@ Controller.prototype = {
 		return this.headers['x-requested-with'] === 'XMLHttpRequest';
 	},
 
+	get extension() {
+		return this.ext;
+	},
+
 	get ua() {
 		if (this.$ua != null)
 			return this.$ua;
@@ -153,8 +162,32 @@ Controller.prototype = {
 
 };
 
+Controller.prototype.callback = function(err, value) {
+
+	var ctrl = this;
+
+	if (arguments.length == 0) {
+		return function(err, response) {
+			if (err)
+				ctrl.invalid(err);
+			else
+				ctrl.json(response);
+		};
+	}
+
+	if (err)
+		ctrl.invalid(err);
+	else {
+		if (value === undefined)
+			ctrl.success();
+		else
+			ctrl.json(value);
+	}
+
+};
+
 Controller.prototype.csrf = function() {
-	return DEF.onCSRFcreate(this);
+	return F.def.onCSRFcreate(this);
 };
 
 Controller.prototype.redirect = function(value, permanent) {
@@ -177,9 +210,8 @@ Controller.prototype.html = function(value) {
 
 	ctrl.response.headers['content-type'] = 'text/html';
 
-	if (value != null) {
+	if (value != null)
 		ctrl.response.value = ctrl.response.minify && F.config.$minifyhtml ? F.TMinificators.html(value) : value;
-	}
 
 	ctrl.flush();
 	F.stats.response.html++;
@@ -208,7 +240,7 @@ Controller.prototype.json = function(value, beautify, replacer) {
 
 	var response = ctrl.response;
 	response.headers['content-type'] = 'application/json';
-	response.headers['cache-control'] = 'private, no-cache, no-store, max-age=0';
+	response.headers['cache-control'] = NOCACHE;
 	response.headers.vary = 'Accept-Encoding, Last-Modified, User-Agent';
 	response.headers.expires = '-1';
 	response.value = JSON.stringify(value, beautify ? '\t' : null, replacer);
@@ -224,7 +256,7 @@ Controller.prototype.jsonstring = function(value) {
 
 	var response = ctrl.response;
 	response.headers['content-type'] = 'application/json';
-	response.headers['cache-control'] = 'private, no-cache, no-store, max-age=0';
+	response.headers['cache-control'] = NOCACHE;
 	response.headers.vary = 'Accept-Encoding, Last-Modified, User-Agent';
 	response.headers.expires = '-1';
 	response.value = value;
@@ -262,7 +294,7 @@ Controller.prototype.invalid = function(value) {
 	}
 
 	response.headers['content-type'] = 'application/json';
-	response.headers['cache-control'] = 'private, no-cache, no-store, max-age=0';
+	response.headers['cache-control'] = NOCACHE;
 	response.headers.vary = 'Accept-Encoding, Last-Modified, User-Agent';
 	response.value = JSON.stringify(err.output(ctrl.language));
 	response.status = err.status === 408 ? 503 : err.status;
@@ -347,7 +379,7 @@ Controller.prototype.fallback = function(code, err) {
 			ctrl.response.status = 503;
 			if (!view) {
 				F.temporary.views.$pause = view = new F.TViewEngine.View();
-				view.compiled = F.TViewEngine.compile('$pause', F.Fs.readFileSync(F.Path.join(F.config.$nodemodules, 'total5/pause.html'), 'utf8'), false);
+				view.compiled = F.TViewEngine.compile('$pause', F.Fs.readFileSync(F.Path.join(F.config.$total5, 'pause.html'), 'utf8'), false);
 			}
 			view.model = F.paused;
 		} else {
@@ -355,7 +387,7 @@ Controller.prototype.fallback = function(code, err) {
 			view = F.temporary.views.$error;
 			if (!view) {
 				F.temporary.views.$error = view = new F.TViewEngine.View();
-				view.compiled = F.TViewEngine.compile('$error', F.Fs.readFileSync(F.Path.join(F.config.$nodemodules, 'total5/error.html'), 'utf8'), false);
+				view.compiled = F.TViewEngine.compile('$error', F.Fs.readFileSync(F.Path.join(F.config.$total5, 'error.html'), 'utf8'), false);
 			}
 			view.model = { code: code, status: F.TUtils.httpstatus(code), error: err ? (DEBUG ? err.toString() : '') : '' };
 		}
@@ -566,6 +598,16 @@ Controller.prototype.proxy = function(opt) {
 
 };
 
+Controller.prototype.done = function(arg) {
+	var ctrl = this;
+	return function(err, response) {
+		if (err)
+			ctrl.invalid(err);
+		else
+			ctrl.json(DEF.onSuccess(arg === true ? response : arg));
+	};
+};
+
 Controller.prototype.success = function(value) {
 	F.TUtils.success.value = value;
 	this.json(F.TUtils.success);
@@ -735,20 +777,21 @@ Controller.prototype.free = function() {
 	ctrl.payload = null;
 
 	// Potential problem
-	ctrl.body = null;
-	ctrl.params = null;
-	ctrl.query = null;
+	// ctrl.body = null;
+	// ctrl.params = null;
+	// ctrl.query = null;
 
 	if (ctrl.preventclearfiles != true)
 		ctrl.clear();
 
 	// Clear resources
+	ctrl.req.controller = null;
 
 };
 
 Controller.prototype.hostname = function(path) {
 	var ctrl = this;
-	return ctrl.headers.host + ctrl.uri.pathname + (path ? path : '');
+	return ctrl.protocol + '://' + ctrl.headers.host + (path ? path : '');
 };
 
 Controller.prototype.$route = function() {
@@ -860,16 +903,33 @@ function readfile(filename, callback) {
 	});
 }
 
-function notmodified(ctrl, date) {
+Controller.prototype.notmodified = function(date) {
+	var ctrl = this;
 	if (ctrl.headers['if-modified-since'] === date) {
 		ctrl.response.status = 304;
-		ctrl.response.headers['cache-control'] = 'public, max-age=11111111';
+		ctrl.response.headers['cache-control'] = 'public, must-revalidate, max-age=' + F.config.$httpmaxage; // 5 min.
 		ctrl.response.headers['last-modified'] = date;
 		ctrl.flush();
 		F.stats.response.notmodified++;
 		return true;
 	}
-}
+};
+
+Controller.prototype.httpcache = function(date) {
+	var ctrl = this;
+
+	if (date instanceof Date)
+		date = date.toUTCString();
+
+	if (!ctrl.response.headers.expires)
+		ctrl.response.headers.expires = F.config.$httpexpire;
+
+	if (!ctrl.response.headers['cache-control'])
+		ctrl.response.headers['cache-control'] = 'public, must-revalidate, max-age=' + F.config.$httpmaxage; // 5 minute cache for revalidate (304)
+
+	ctrl.response.headers['last-modified'] = date;
+	ctrl.response.headers.etag = '858' + F.config.$httpetag;
+};
 
 function multipart(ctrl) {
 
@@ -890,7 +950,7 @@ function multipart(ctrl) {
 	}
 
 	var boundary = type.substring(index + 9, end);
-	var parser = F.TUtils.multipartparser(boundary, ctrl, function(err, meta) {
+	var parser = F.TUtils.multipartparser(boundary, ctrl.req, function(err, meta) {
 
 		F.stats.performance.download += meta.size / 1024 / 1024;
 
@@ -909,6 +969,7 @@ function multipart(ctrl) {
 			if (index !== -1)
 				file.filename = file.filename.substring(index + 1);
 
+			file.ext = F.TUtils.getExtension(file.filename);
 			ctrl.files.push(file);
 		}
 
@@ -936,9 +997,10 @@ function multipart(ctrl) {
 }
 
 function authorize(ctrl) {
-	if (DEF.onAuthorize) {
+	if (F.def.onAuthorize) {
 		var opt = new F.TBuilders.Options(ctrl);
 		opt.TYPE = 'auth'; // important
+		opt.query = ctrl.query;
 		opt.next = opt.callback;
 		opt.$callback = function(err, user) {
 			let auth = user ? 1 : 2;
@@ -953,7 +1015,7 @@ function authorize(ctrl) {
 					ctrl.fallback(401);
 			}
 		};
-		DEF.onAuthorize(opt);
+		F.def.onAuthorize(opt);
 	} else
 		execute(ctrl);
 }
@@ -967,16 +1029,34 @@ function execute(ctrl) {
 		ctrl.params[param.name] = value;
 	}
 
+	if (!ctrl.language && F.def.onLocalize)
+		ctrl.language = F.def.onLocalize(ctrl);
+
 	if (ctrl.route.middleware.length) {
 		middleware(ctrl);
 	} else {
 		if (ctrl.route.api) {
 			let body = ctrl.body;
 			if (body && typeof(body) === 'object' && body.schema && typeof(body.schema) === 'string') {
+
+				let index = body.schema.indexOf('?');
+				let query = null;
+
+				if (index !== -1) {
+					query = body.schema.substring(index + 1);
+					body.schema = body.schema.substring(0, index);
+				}
+
 				let schema = body.schema.split('/');
 				let endpoint = ctrl.route.api[schema[0]];
-				let params = {};
 				if (endpoint) {
+
+					if ((endpoint.auth === 1 && ctrl.user == null) || (endpoint.auth === 2 && ctrl.user)) {
+						ctrl.fallback(401);
+						return;
+					}
+
+					let params = {};
 					if (endpoint.params) {
 						for (let m of endpoint.params)
 							params[m.name] = schema[m.index] || '';
@@ -984,7 +1064,8 @@ function execute(ctrl) {
 					body = body.data;
 					if (!body || typeof(body) === 'object') {
 						ctrl.params = params;
-						F.action(endpoint.actions, body || EMPTYOBJECT, ctrl).autorespond();
+						ctrl.query = query ? query.parseEncoded() : {};
+						F.action(endpoint.actions, body || {}, ctrl).autorespond();
 						return;
 					}
 				}
@@ -994,6 +1075,10 @@ function execute(ctrl) {
 			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;
@@ -1004,7 +1089,7 @@ function execute(ctrl) {
 }
 
 function auto_view(ctrl) {
-	ctrl.view(ctrl.split[0] || 'index', ctrl.body);
+	ctrl.view(ctrl.split[0] || 'index');
 }
 
 function send_html(ctrl, path) {
@@ -1023,17 +1108,24 @@ function send_html(ctrl, path) {
 	readfile(path, function(err, output) {
 
 		if (err) {
-			F.temporary.notfound[ctrl.uri.key] = 1;
+
+			if (!DEBUG)
+				F.temporary.notfound[ctrl.uri.key] = 1;
+
 			ctrl.fallback(404);
 			return;
 		}
 
+		if (!ctrl.language && F.def.onLocalize)
+			ctrl.language = F.def.onLocalize(ctrl);
+
 		output.body = F.translate(ctrl.language, output.body);
 
 		if (ctrl.response.minify && F.config.$minifyhtml)
 			output.body = F.TMinificators.html(output.body);
 
 		if (DEBUG) {
+			ctrl.response.headers['cache-control'] = NOCACHE;
 			ctrl.response.headers['last-modified'] = output.date;
 			ctrl.response.headers['content-type'] = 'text/html';
 			ctrl.response.value = output.body;
@@ -1069,7 +1161,10 @@ function send_css(ctrl, path) {
 	readfile(path, function(err, output) {
 
 		if (err) {
-			F.temporary.notfound[ctrl.uri.key] = 1;
+
+			if (!DEBUG)
+				F.temporary.notfound[ctrl.uri.key] = 1;
+
 			ctrl.fallback(404);
 			return;
 		}
@@ -1078,6 +1173,7 @@ function send_css(ctrl, path) {
 			output.body = F.TMinificators.css(output.body);
 
 		if (DEBUG) {
+			ctrl.response.headers['cache-control'] = NOCACHE;
 			ctrl.response.headers['last-modified'] = output.date;
 			ctrl.response.headers['content-type'] = 'text/css';
 			ctrl.response.value = output.body;
@@ -1113,7 +1209,10 @@ function send_js(ctrl, path) {
 	readfile(path, function(err, output) {
 
 		if (err) {
-			F.temporary.notfound[ctrl.uri.key] = 1;
+
+			if (!DEBUG)
+				F.temporary.notfound[ctrl.uri.key] = 1;
+
 			ctrl.fallback(404);
 			return;
 		}
@@ -1122,6 +1221,7 @@ function send_js(ctrl, path) {
 			output.body = F.TMinificators.js(output.body);
 
 		if (DEBUG) {
+			ctrl.response.headers['cache-control'] = NOCACHE;
 			ctrl.response.headers['last-modified'] = output.date;
 			ctrl.response.headers['content-type'] = 'text/javascript';
 			ctrl.response.value = output.body;
@@ -1152,7 +1252,7 @@ function send_file(ctrl, path, ext) {
 	var cache = F.temporary.tmp[ctrl.uri.key];
 
 	// HTTP Cache
-	if (ctrl.response.cache && cache && notmodified(ctrl, cache.date))
+	if (ctrl.response.cache && cache && ctrl.notmodified(cache.date))
 		return;
 
 	var accept = ctrl.headers['accept-encoding'];
@@ -1165,18 +1265,24 @@ function send_file(ctrl, path, ext) {
 
 		if (err) {
 
-			if (ctrl.response.cache)
+			if (!DEBUG && ctrl.response.cache)
 				F.temporary.notfound[ctrl.uri.key] = true;
 
 			ctrl.fallback(404);
 			return;
 		}
 
-		if (httpcache)
-			ctrl.response.headers.expires = F.config.$httpexpire;
-		else if (ctrl.response.headers.expires)
+		if (httpcache) {
+			if (!ctrl.response.headers.expires)
+				ctrl.response.headers.expires = F.config.$httpexpire;
+			if (!ctrl.response.headers['cache-control'])
+				ctrl.response.headers['cache-control'] = 'public, must-revalidate, max-age=' + F.config.$httpmaxage; // 5 minute cache for revalidate (304)
+		} else if (ctrl.response.headers.expires)
 			delete ctrl.response.headers.expires;
 
+		if (!httpcache)
+			ctrl.response.headers['cache-control'] = NOCACHE;
+
 		if (!cache)
 			cache = { date: stats.mtime.toUTCString(), size: stats.size };
 
@@ -1273,6 +1379,9 @@ function HttpFile(meta) {
 }
 
 HttpFile.prototype = {
+	get extension() {
+		return this.ext;
+	},
 	get isImage() {
 		return this.type.indexOf('image/') !== -1;
 	},
@@ -1313,7 +1422,7 @@ HttpFile.prototype.$move = function(filename, callback) {
 		} else {
 			if (!err) {
 				self.path = filename;
-				self.rem = false;
+				self.removable = false;
 			}
 			callback && callback(err);
 		}

package/filestorage.js

@@ -7,6 +7,7 @@
 const IMAGES = { jpg: 1, png: 1, gif: 1, svg: 1, jpeg: 1, heic: 1, heif: 1, webp: 1, tiff: 1, bmp: 1 };
 const HEADERSIZE = 2000;
 const MKDIR = { recursive: true };
+const READDIR = { withFileTypes: true };
 const GZIP_FILE = { memLevel: 9 };
 
 const REG_RANGE = /bytes=/;
@@ -94,14 +95,14 @@ FP.readjson = function(id, callback) {
 	});
 };
 
-FP.save = FP.insert = function(id, name, filename, callback, custom, expire, headers) {
+FP.save = FP.insert = function(id, name, filename, custom, callback, expire, headers) {
 	var self = this;
 
-	if (callback && typeof(callback) !== 'function') {
+	if (typeof(custom) === 'function') {
 		headers = expire;
-		expire = custom;
-		custom = callback;
-		callback = null;
+		expire = callback;
+		callback = custom;
+		custom = null;
 	}
 
 	if (callback)
@@ -435,7 +436,7 @@ FP._readbuffer = function(id, callback) {
 FP.browse = function(callback) {
 	var db = NOSQL(this.logger).find();
 	if (callback)
-		db.$callback = callback;
+		db.main.callback = callback;
 	return db;
 };
 
@@ -743,11 +744,11 @@ FP._clear = function(callback) {
 	return self;
 };
 
-FP.stream = function(onfile, callback, workers) {
+FP.stream = function(onfile, callback, workers = 2) {
 
 	var self = this;
 
-	F.Fs.readdir(self.directory, function(err, response) {
+	F.Fs.readdir(self.directory, READDIR, function(err, response) {
 
 		if (err) {
 			callback();
@@ -758,15 +759,33 @@ FP.stream = function(onfile, callback, workers) {
 
 		response.wait(function(item, next) {
 
-			if (item.length !== 4) {
+			if (!item.isDirectory()) {
+				next();
+				return;
+			}
+
+			if (item.name.length !== 4) {
 				next();
 				return;
 			}
 
-			F.Fs.readdir(F.Path.join(self.directory, item), function(err, files) {
+			F.Fs.readdir(F.Path.join(self.directory, item.name), READDIR, function(err, files) {
 				if (files instanceof Array) {
 					files.wait(function(item, next) {
-						var id = item.substring(0, item.lastIndexOf('.'));
+
+						if (!item.isFile()) {
+							next();
+							return;
+						}
+
+						let index = item.name.lastIndexOf('.');
+
+						if (item.name.substring(index) !== '.file') {
+							next();
+							return;
+						}
+
+						let id = item.name.substring(0, index);
 						self.read(id, function(err, meta) {
 							if (meta) {
 								meta.id = id;
@@ -976,14 +995,8 @@ FP.http = function(ctrl, opt) {
 		var date = obj.date ? obj.date.toUTCString() : '';
 		var response = ctrl.response;
 
-		if (!opt.download && ctrl.headers['if-modified-since'] === date) {
-			response.status = 304;
-			response.headers['cache-control'] = 'public, max-age=11111111';
-			response.headers['last-modified'] = date;
-			ctrl.flush();
-			F.stats.response.notmodified++;
+		if (!opt.download && date && ctrl.notmodified(date))
 			return;
-		}
 
 		// Resized image?
 		if (!DEBUG && F.temporary.path[ctrl.uri.key]) {
@@ -1047,7 +1060,10 @@ FP.http = function(ctrl, opt) {
 
 				response.status = 206;
 				response.headers['accept-ranges'] = 'bytes';
-				response.headers['cache-control'] = DEBUG ? 'private, no-cache, no-store, max-age=0' : 'public, max-age=11111111';
+
+				if (!opt.download && !DEBUG && date)
+					ctrl.httpcache(date);
+
 				response.headers['content-length'] = length;
 				response.headers['content-range'] = 'bytes ' + beg + '-' + end + '/' + obj.size;
 				response.headers['content-type'] = obj.type;
@@ -1060,6 +1076,10 @@ 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);
 			}
 		}