total5 0.0.15-2 → 0.0.15-4

package/changelog.txt

@@ -6,6 +6,11 @@
 - improved `keepalive` option in the `REQUEST()` method (it can contain HttpAgent or options for it)
 - updated `RESTBuilder.keepalive()` method by adding `val` argument
 - fixed column indexer in the CSV parser
+- fixed proxy timeout
+- fixed string slug method
+- fixed an issue with generating file names when merging files directly in the view engine
+- fixed handling of case-sensitive file names
+- fixed unexpected errors with the stream when handling static files
 
 ========================
 0.0.14

package/controller.js

@@ -1659,6 +1659,14 @@ function send_file(ctrl, path, ext) {
 				ctrl.res.end();
 			} else {
 				reader = F.Fs.createReadStream(path, { start: beg, end: end });
+
+				// Unexpected error
+				reader.on('error', function(err) {
+					delete F.temporary.tmp[ctrl.uri.cache];
+					ctrl.destroyed = true;
+					ctrl.req.destroy();
+				});
+
 				reader.pipe(ctrl.res);
 				F.stats.response.streaming++;
 			}
@@ -1675,10 +1683,19 @@ function send_file(ctrl, path, ext) {
 			if (ctrl.method === 'HEAD') {
 				ctrl.res.end();
 			} else {
+
+				// Unexpected error
+				reader.on('error', function(err) {
+					delete F.temporary.tmp[ctrl.uri.cache];
+					ctrl.destroyed = true;
+					ctrl.req.destroy();
+				});
+
 				if (compress)
 					reader.pipe(F.Zlib.createGzip(GZIP_FILE)).pipe(ctrl.res);
 				else
 					reader.pipe(ctrl.res);
+
 				F.stats.response.file++;
 			}
 		}

package/index.js

@@ -1538,7 +1538,8 @@ F.merge = function(url) {
 	if (url[0] !== '/')
 		url = '/' + url;
 
-	url = F.virtualpath(url.toLowerCase());
+	// url = F.virtualpath(url.toLowerCase());
+	url = F.virtualpath(url);
 
 	var ext = F.TUtils.getExtension(url);
 	var key = url.substring(1).replace(/\//g, '-').replace(/\.(js|html|css)$/, '') + '-min.' + ext;

package/package.json

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

package/routing.js

@@ -1000,11 +1000,11 @@ function proxycreate(proxy, ctrl) {
 
 	request.$controller = ctrl;
 	request.$proxy = proxy;
-	request.$timeout = proxy.timeout || F.config.$proxytimeout;
+	request.$timeout = ctrl.timeout = proxy.$timeout || F.config.$proxytimeout;
 	request.iswebsocket = !!ctrl.iswebsocket;
 	request.$destroy = proxyerror;
 
-	if (!ctrl.iswebsocket && proxy.timeout) {
+	if (!ctrl.iswebsocket && request.$timeout) {
 		F.temporary.pending.push(ctrl);
 		F.TUtils.onfinished(ctrl.res, function() {
 			request.$destroyed = true;

package/utils.js

@@ -4040,7 +4040,7 @@ SP.slug = function(max) {
 			builder += c;
 	}
 
-	if (builder.length > 1) {
+	if (builder.length > 0) {
 		length = builder.length - 1;
 		return builder[length] === '-' ? builder.substring(0, length) : builder;
 	} else if (!length)
@@ -6283,7 +6283,7 @@ exports.parseURI2 = function(url) {
 	if (index != -1)
 		url = url.replace(REG_TRAVELSE, '');
 
-	let key = url.toLowerCase();
+	let key = index === -1 ? url.toLowerCase() : url;
 	return { key: key, cache: key, pathname: url, search: search, file: index != -1, ext: index == -1 ? '' : url.substring(index + 1), split: split };
 };
 
@@ -6444,4 +6444,4 @@ exports.paginate = function(page, pages, max) {
 		response.pages.push(i);
 
 	return response;
-};
+};

package/viewengine.js

@@ -857,7 +857,13 @@ View.prototype.import = function() {
 
 				if (m.includes('+')) {
 					let iscss = REG_CHECKCSS.test(m);
-					let path = '/' + F.TUtils.random_string(10).toLowerCase() + '-min.' + (iscss ? 'css' : 'js');
+					let key2 = 'file_' + HASH(m instanceof Array ? m.join('+') : m).toString(36);
+					let filename = F.temporary.merged[key2];
+					if (!filename) {
+						filename = F.TUtils.random_string(10).toLowerCase();
+						F.temporary.merged[key2] = filename;
+					}
+					let path = '/' + filename + '-min.' + (iscss ? 'css' : 'js');
 					F.merge(path, m);
 					if (iscss)
 						tmp = '<link rel="stylesheet" href="' + F.virtualpath(path) + version + '" />';