total5 0.0.1-9 → 0.0.2

package/controller.js

@@ -11,17 +11,23 @@ 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, '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_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, 'application/x-ipynb+json': true, 'application/x-ijsnb+json': 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, 'application/x-ijsnb+json': true, 'application/x-ipynb+json': true };
 const CHECK_NOCACHE = { zip: 1, rar: 1 };
+const CHECK_MIN = /(\.|-|@)min/i;
 
 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.timeout = F.config.$httptimeout;
 	ctrl.req = req;
 	ctrl.res = res;
 	ctrl.method = ctrl.req.method;
@@ -58,7 +64,7 @@ function Controller(req, res) {
 
 	ctrl.response = {
 		status: 200,
-		cache: DEBUG,
+		cache: global.DEBUG != true,
 		minify: true,
 		// minifyjson: false
 		// encrypt: false
@@ -206,14 +212,28 @@ 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++;
 };
 
+Controller.prototype.xml = function(value) {
+	var ctrl = this;
+
+	if (ctrl.destroyed)
+		return;
+
+	if (value != null)
+		ctrl.response.value = value;
+
+	ctrl.response.headers['content-type'] = 'text/xml';
+	ctrl.flush();
+
+	F.stats.response.xml++;
+};
+
 Controller.prototype.text = Controller.prototype.plain = function(value) {
 	var ctrl = this;
 
@@ -229,6 +249,28 @@ Controller.prototype.text = Controller.prototype.plain = function(value) {
 	F.stats.response.text++;
 };
 
+Controller.prototype.respond = function(value, a, b) {
+	var ctrl = this;
+	var output = ctrl.response.output;
+	switch (output) {
+		case 'html':
+		case 'plain':
+		case 'text':
+		case 'xml':
+		case 'json':
+		case 'redirect':
+		case 'jsonstring':
+		case 'empty':
+		case 'file':
+			ctrl[output](value, a, b);
+			break;
+		default:
+			ctrl.json(value, a, b);
+			break;
+	}
+	return ctrl;
+};
+
 Controller.prototype.json = function(value, beautify, replacer) {
 	var ctrl = this;
 
@@ -237,7 +279,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);
@@ -253,7 +295,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;
@@ -291,7 +333,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;
@@ -332,8 +374,8 @@ Controller.prototype.flush = function() {
 					response.headers['content-encoding'] = 'gzip';
 					ctrl.res.writeHead(response.status, response.headers);
 					ctrl.res.end(buffer, 'utf8');
-					ctrl.free();
 					F.stats.performance.upload += buffer.length / 1024 / 1024;
+					ctrl.free();
 				}
 			});
 			return;
@@ -343,9 +385,12 @@ Controller.prototype.flush = function() {
 	if (CHECK_CHARSET[type])
 		response.headers['content-type'] += '; charset=utf-8';
 
-	ctrl.res.writeHead(response.status, response.headers);
-	ctrl.res.end(buffer);
-	ctrl.free();
+	try {
+		ctrl.res.writeHead(response.status, response.headers);
+		ctrl.res.end(buffer);
+	} finally {
+		ctrl.free();
+	}
 };
 
 Controller.prototype.fallback = function(code, err) {
@@ -376,7 +421,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 {
@@ -384,7 +429,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() : '') : '' };
 		}
@@ -393,6 +438,11 @@ Controller.prototype.fallback = function(code, err) {
 	}
 };
 
+Controller.prototype.layout = function(name) {
+	var ctrl = this;
+	ctrl.response.layout = name;
+};
+
 Controller.prototype.view = function(name, model) {
 
 	var ctrl = this;
@@ -401,10 +451,15 @@ Controller.prototype.view = function(name, model) {
 		return;
 
 	var view = new F.TViewEngine.View(ctrl);
-	var output = view.render(name, model);
-	ctrl.html(output);
+	ctrl.response.layout && view.layout(ctrl.response.layout);
+	setImmediate(renderview, view, name, model);
+	return view;
 };
 
+function renderview(view, name, model) {
+	view.controller.html(view.render(name, model));
+}
+
 Controller.prototype.file = function(path, download) {
 
 	var ctrl = this;
@@ -423,14 +478,23 @@ Controller.prototype.file = function(path, download) {
 	var ext = F.TUtils.getExtension(path);
 
 	if (ext === 'js') {
-		if (response.minify)
+		if (response.minify) {
 			response.minify = F.config.$minifyjs;
+			if (response.minify)
+				response.minify = !CHECK_MIN.test(path);
+		}
 	} else if (ext === 'css') {
-		if (response.minify)
+		if (response.minify) {
 			response.minify = F.config.$minifycss;
+			if (response.minify)
+				response.minify = !CHECK_MIN.test(path);
+		}
 	} else if (ext === 'html') {
-		if (response.minify)
+		if (response.minify) {
 			response.minify = F.config.$minifyhtml;
+			if (response.minify)
+				response.minify = !CHECK_MIN.test(path);
+		}
 	}
 
 	if (response.minify) {
@@ -477,7 +541,7 @@ Controller.prototype.stream = function(type, stream, download) {
 	if (CHECK_CHARSET[type])
 		type += '; charset=utf-8';
 
-	response.headers['content-type'] = type;
+	response.headers['content-type'] = type || 'application/octet-stream';
 
 	if (compress)
 		response.headers['content-encoding'] = 'gzip';
@@ -595,6 +659,30 @@ Controller.prototype.proxy = function(opt) {
 
 };
 
+Controller.prototype.successful = function(callback) {
+	var ctrl = this;
+	return function(err, a, b, c) {
+		if (err)
+			ctrl.invalid(err);
+		else
+			callback.call(ctrl, a, b, c);
+	};
+};
+
+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.transform = function(name, value, callback) {
+	return F.transform(name, value, callback, this);
+};
+
 Controller.prototype.success = function(value) {
 	F.TUtils.success.value = value;
 	this.json(F.TUtils.success);
@@ -735,13 +823,22 @@ Controller.prototype.resume = function() {
 
 		switch (ctrl.ext) {
 			case 'js':
-				send_js(ctrl, path);
+				if (CHECK_MIN.test(path))
+					send_file(ctrl, path, ctrl.ext);
+				else
+					send_js(ctrl, path);
 				break;
 			case 'css':
-				send_css(ctrl, path);
+				if (CHECK_MIN.test(path))
+					send_file(ctrl, path, ctrl.ext);
+				else
+					send_css(ctrl, path);
 				break;
 			case 'html':
-				send_html(ctrl, path);
+				if (CHECK_MIN.test(path))
+					send_file(ctrl, path, ctrl.ext);
+				else
+					send_html(ctrl, path);
 				break;
 			default:
 				send_file(ctrl, path, ctrl.ext);
@@ -764,14 +861,15 @@ 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;
 
 };
 
@@ -824,7 +922,7 @@ Controller.prototype.$route = function() {
 
 			ctrl.req.on('data', function(chunk) {
 				ctrl.payloadsize += chunk.length;
-				if ((ctrl.payloadsize / 1024) > ctrl.route.size) {
+				if (ctrl.payloadsize > ctrl.route.size) {
 					if (!ctrl.toolarge) {
 						ctrl.toolarge = true;
 						delete ctrl.payload;
@@ -889,16 +987,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) {
 
@@ -938,6 +1053,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);
 		}
 
@@ -961,7 +1077,7 @@ function multipart(ctrl) {
 	});
 
 	parser.skipcheck = !F.config.$httpchecktypes;
-	parser.limits.total = ctrl.route.size * 1024; // to bytes
+	parser.limits.total = ctrl.route.size;
 }
 
 function authorize(ctrl) {
@@ -988,21 +1104,25 @@ function authorize(ctrl) {
 		execute(ctrl);
 }
 
-function execute(ctrl) {
+function execute(ctrl, skipmiddleware) {
 
-	ctrl.timeout = ctrl.route.timeout || F.config.$httptimeout;
+	if (ctrl.route.timeout)
+		ctrl.timeout = ctrl.route.timeout;
 
 	for (let param of ctrl.route.params) {
 		let value = ctrl.split[param.index];
 		ctrl.params[param.name] = value;
 	}
 
-	if (!ctrl.language && F.def.onLocalize)
+	if (!ctrl.language && F.def.onLocalize) {
 		ctrl.language = F.def.onLocalize(ctrl);
+		ctrl.uri.cache += ctrl.language;
+	}
 
-	if (ctrl.route.middleware.length) {
+	if (!skipmiddleware && 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') {
@@ -1026,17 +1146,40 @@ function execute(ctrl) {
 
 					let params = {};
 					if (endpoint.params) {
-						for (let m of endpoint.params)
+						let err = null;
+						for (let m of endpoint.params) {
 							params[m.name] = schema[m.index] || '';
+							if (!params[m.name]) {
+								if (!err)
+									err = new F.TBuilders.ErrorBuilder();
+								err.push2('params.' + m.name);
+							}
+						}
+						if (err) {
+							ctrl.invalid(err);
+							return;
+						}
 					}
+
 					body = body.data;
+
 					if (!body || typeof(body) === 'object') {
+
+						if (endpoint.timeout)
+							ctrl.timeout = endpoint.timeout;
+
 						ctrl.params = params;
 						ctrl.query = query ? query.parseEncoded() : {};
-						F.action(endpoint.actions, body || {}, ctrl).autorespond();
+						let action = endpoint.action;
+						if (action) {
+							ctrl.body = body || {};
+							action(ctrl);
+						} else
+							F.action(endpoint.actions, body || {}, ctrl).autorespond();
 						return;
 					}
 				}
+
 				ctrl.fallback(400, 'Invalid data');
 			}
 		} else {
@@ -1062,12 +1205,17 @@ function auto_view(ctrl) {
 
 function send_html(ctrl, path) {
 
-	if (F.temporary.notfound[ctrl.uri.key]) {
+	if (!ctrl.language && F.def.onLocalize) {
+		ctrl.language = F.def.onLocalize(ctrl);
+		ctrl.uri.cache += ctrl.language;
+	}
+
+	if (F.temporary.notfound[ctrl.uri.cache]) {
 		ctrl.fallback(404);
 		return;
 	}
 
-	let filename = F.temporary.minified[ctrl.uri.key];
+	let filename = F.temporary.minified[ctrl.uri.cache];
 	if (filename) {
 		send_file(ctrl, filename, 'html');
 		return;
@@ -1076,32 +1224,33 @@ 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.cache] = 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;
 			ctrl.flush();
 		} else {
-			let filename = F.path.tmp(F.clusterid + (ctrl.language ? (ctrl.language + '-') : '') + ctrl.uri.key.substring(1).replace(REG_FILETMP, '-') + '-min.html');
+			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) {
-					F.temporary.notfound[ctrl.uri.key] = 1;
+					F.temporary.notfound[ctrl.uri.cache] = 1;
 					ctrl.fallback(404, err.toString());
 				} else {
-					F.temporary.minified[ctrl.uri.key] = filename;
+					F.temporary.minified[ctrl.uri.cache] = filename;
 					send_file(ctrl, filename, 'html');
 				}
 			});
@@ -1111,12 +1260,12 @@ function send_html(ctrl, path) {
 
 function send_css(ctrl, path) {
 
-	if (F.temporary.notfound[ctrl.uri.key]) {
+	if (F.temporary.notfound[ctrl.uri.cache]) {
 		ctrl.fallback(404);
 		return;
 	}
 
-	let filename = F.temporary.minified[ctrl.uri.key];
+	let filename = F.temporary.minified[ctrl.uri.cache];
 	if (filename) {
 		send_file(ctrl, filename, 'css');
 		return;
@@ -1125,7 +1274,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.cache] = 1;
+
 			ctrl.fallback(404);
 			return;
 		}
@@ -1134,18 +1286,19 @@ 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;
 			ctrl.flush();
 		} else {
-			let filename = F.path.tmp(F.clusterid + ctrl.uri.key.substring(1).replace(REG_FILETMP, '-') + '-min.css');
+			let filename = F.path.tmp(F.clusterid + ctrl.uri.cache.substring(1).replace(REG_FILETMP, '-') + '-min.css');
 			F.Fs.writeFile(filename, output.body, function(err) {
 				if (err) {
-					F.temporary.notfound[ctrl.uri.key] = 1;
+					F.temporary.notfound[ctrl.uri.cache] = 1;
 					ctrl.fallback(404, err.toString());
 				} else {
-					F.temporary.minified[ctrl.uri.key] = filename;
+					F.temporary.minified[ctrl.uri.cache] = filename;
 					send_file(ctrl, filename, 'css');
 				}
 			});
@@ -1155,12 +1308,12 @@ function send_css(ctrl, path) {
 
 function send_js(ctrl, path) {
 
-	if (F.temporary.notfound[ctrl.uri.key]) {
+	if (F.temporary.notfound[ctrl.uri.cache]) {
 		ctrl.fallback(404);
 		return;
 	}
 
-	let filename = F.temporary.minified[ctrl.uri.key];
+	let filename = F.temporary.minified[ctrl.uri.cache];
 	if (filename) {
 		send_file(ctrl, filename, 'js');
 		return;
@@ -1169,7 +1322,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.cache] = 1;
+
 			ctrl.fallback(404);
 			return;
 		}
@@ -1178,18 +1334,19 @@ 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;
 			ctrl.flush();
 		} else {
-			let filename = F.path.tmp(F.clusterid + ctrl.uri.key.substring(1).replace(REG_FILETMP, '-') + '-min.js');
+			let filename = F.path.tmp(F.clusterid + ctrl.uri.cache.substring(1).replace(REG_FILETMP, '-') + '-min.js');
 			F.Fs.writeFile(filename, output.body, function(err) {
 				if (err) {
-					F.temporary.notfound[ctrl.uri.key] = 1;
+					F.temporary.notfound[ctrl.uri.cache] = 1;
 					ctrl.fallback(404, err.toString());
 				} else {
-					F.temporary.minified[ctrl.uri.key] = filename;
+					F.temporary.minified[ctrl.uri.cache] = filename;
 					send_file(ctrl, filename, 'js');
 				}
 			});
@@ -1200,15 +1357,15 @@ function send_js(ctrl, path) {
 function send_file(ctrl, path, ext) {
 
 	// Check the file existence
-	if (F.temporary.notfound[ctrl.uri.key]) {
+	if (F.temporary.notfound[ctrl.uri.cache]) {
 		ctrl.fallback(404);
 		return;
 	}
 
-	var cache = F.temporary.tmp[ctrl.uri.key];
+	var cache = F.temporary.tmp[ctrl.uri.cache];
 
 	// 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'];
@@ -1221,18 +1378,24 @@ function send_file(ctrl, path, ext) {
 
 		if (err) {
 
-			if (ctrl.response.cache)
-				F.temporary.notfound[ctrl.uri.key] = true;
+			if (!DEBUG && ctrl.response.cache)
+				F.temporary.notfound[ctrl.uri.cache] = 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 };
 
@@ -1245,7 +1408,7 @@ function send_file(ctrl, path, ext) {
 			type += '; charset=utf-8';
 
 		ctrl.response.headers['content-type'] = type;
-		F.temporary.tmp[ctrl.uri.key] = cache;
+		F.temporary.tmp[ctrl.uri.cache] = cache;
 
 		F.stats.performance.open++;
 
@@ -1303,7 +1466,7 @@ function send_file(ctrl, path, ext) {
 
 function middleware(ctrl) {
 	var run = function(index) {
-		var name = ctrl.route.middleware[index];
+		let name = ctrl.route.middleware[index];
 		if (name) {
 			let fn = F.routes.middleware[name];
 			if (fn)
@@ -1311,7 +1474,7 @@ function middleware(ctrl) {
 			else
 				run(index + 1);
 		} else
-			ctrl.route.action(ctrl);
+			execute(ctrl, true);
 	};
 	run(0);
 }
@@ -1372,7 +1535,7 @@ HttpFile.prototype.$move = function(filename, callback) {
 		} else {
 			if (!err) {
 				self.path = filename;
-				self.rem = false;
+				self.removable = false;
 			}
 			callback && callback(err);
 		}

package/cron.js

@@ -28,7 +28,7 @@ function cronexec(output, date) {
 				break;
 			}
 		} else if (m.type === 'every') {
-			if (m.value % val !== 0) {
+			if (m.value[i] !== '*' && m.value[i] % val !== 0) {
 				is = false;
 				break;
 			}