Improve performance + new behaviour disable-middleware

petersirka · petersirka · commit 160743b20ec0 · 2015-07-27T09:11:54.000+02:00
diff --git a/changes.txt b/changes.txt
@@ -59,6 +59,7 @@ BETA ======= 1.9.0
 - added: configs directory
 - added: F.behaviour(url, flags);
 - added: behaviour: disable-upload-dimension (default: false)
+- added: behaviour: disable-middleware (default: false)
 
 - updated: (IMPORTANT) routing: `json` flag is not required for receiving incomming data as JSON
 - updated: `F.mail(address, subject, view, [model], [callback], [language])` added language
diff --git a/index.js b/index.js
@@ -228,7 +228,7 @@ function Framework() {
 
 	this.id = null;
 	this.version = 1900;
-	this.version_header = '1.9.0-18';
+	this.version_header = '1.9.0-19';
 
 	var version = process.version.toString().replace('v', '').replace(/\./g, '');
 	if (version[1] === '0')
@@ -5239,7 +5239,7 @@ Framework.prototype.listener = function(req, res) {
 		}
 	}
 
-	req.uri = parser.parse(protocol + '://' + req.host + req.url);
+	req.uri = framework_internal.parseURI(protocol, req.host, req.url);
 	req.path = framework_internal.routeSplit(req.uri.pathname);
 	req.body = {};
 	req.files = new Array(0);
@@ -5251,16 +5251,12 @@ Framework.prototype.listener = function(req, res) {
 	res.success = false;
 	res.setHeader('X-Powered-By', 'total.js v' + self.version_header);
 
-	if (framework._request_check_mobile)
-		req.mobile = REG_MOBILE.test(req.headers['user-agent']);
-
 	if (self.isDebug)
 		res.setHeader('Mode', 'debug');
 
-	req.isStaticFile = framework.config['allow-handle-static-files'] ? utils.isStaticFile(req.uri.pathname) : false;
+	req.isStaticFile = framework.config['allow-handle-static-files'] ? framework_utils.isStaticFile(req.uri.pathname) : false;
 
 	var can = true;
-
 	if (req.isStaticFile) {
 		req.extension = path.extname(req.uri.pathname).substring(1);
 		switch (req.extension) {
@@ -5284,6 +5280,9 @@ Framework.prototype.listener = function(req, res) {
 	if (self._length_request_middleware === 0)
 		return self._request_continue(req, res, headers, protocol);
 
+	if (!req.can('disable-middleware'))
+		return self._request_continue(req, res, headers, protocol);
+
 	var func = new Array(self._length_request_middleware);
 	var indexer = 0;
 
@@ -5523,7 +5522,7 @@ Framework.prototype._upgrade = function(req, socket, head) {
 		}
 	}
 
-	req.uri = parser.parse((req.connection.encrypted || headers['x-forwarded-protocol'] === 'https' || headers['x-forwarded-protocol'] === 'wss' ? 'wss' : 'ws') + '://' + req.headers.host + req.url);
+	req.uri = framework_internal.parseURI((req.connection.encrypted || headers['x-forwarded-protocol'] === 'https' || headers['x-forwarded-protocol'] === 'wss' ? 'wss' : 'ws'), req.headers.host, req.url);
 	req.session = null;
 	req.user = null;
 	req.flags = [req.isSecure ? 'https' : 'http', 'get'];
@@ -5540,6 +5539,9 @@ Framework.prototype._upgrade = function(req, socket, head) {
 	if (self._length_request_middleware === 0)
 		return self._upgrade_prepare(req, path, headers);
 
+	if (!req.can('disable-middleware'))
+		return self._request_continue(req, res, headers, protocol);
+
 	var func = new Array(self._length_request_middleware);
 	var indexer = 0;
 
@@ -6068,7 +6070,6 @@ Framework.prototype.testing = function(stop, callback) {
 	};
 
 	var options = parser.parse((test.url.indexOf('http://') > 0 || test.url.indexOf('https://') > 0 ? '' : 'http://' + self.ip + ':' + self.port) + test.url);
-
 	if (typeof(test.data) === TYPE_FUNCTION)
 		test.data = test.data();
 
@@ -8656,6 +8657,11 @@ Subscribe.prototype.doEndfile = function() {
 	var req = self.req;
 	var res = self.res;
 
+	if (!framework._length_files) {
+		framework.responseStatic(self.req, self.res);
+		return;
+	}
+
 	for (var i = 0; i < framework._length_files; i++) {
 		var file = framework.routes.files[i];
 		try {
@@ -13477,6 +13483,12 @@ http.IncomingMessage.prototype = {
 		return this.$language;
 	},
 
+	get mobile() {
+		if (this.$mobile === undefined)
+			this.$mobile = REG_MOBILE.test(this.headers['user-agent']);
+		return this.$mobile;
+	},
+
 	set language(value) {
 		this.$language = value;
 	}
diff --git a/internal.js b/internal.js
@@ -174,7 +174,7 @@ exports.parseMULTIPART = function(req, contentType, route, tmpDirectory, subscri
 
 		var wh = null;
 
-		if (req.can('disable-upload-dimension')) {
+		if (req.can('disable-measuring')) {
 			switch (tmp.type) {
 				case 'image/jpeg':
 					wh = framework_image.measureJPG(buffer.slice(start));
@@ -2899,6 +2899,47 @@ exports.appendModel = function(str) {
 	return str.substring(0, index) + '(model' + (end[0] === ')' ? end : ',' + end);
 };
 
+exports.parseURI = function(protocol, host, url) {
+
+	var port = host.lastIndexOf(':');
+	var hostname;
+	var search = url.indexOf('?');
+	var pathname;
+	var query = null;
+
+	if (port === -1) {
+		port = null;
+		hostname = host;
+	} else {
+		hostname = host.substring(0, port);
+		port = host.substring(port + 1);
+	}
+
+	if (search === -1) {
+		search = null;
+		pathname = url;
+	} else {
+		pathname = url.substring(0, search);
+		search = url.substring(search);
+		query = search.substring(1);
+	}
+
+	return {
+		auth: null,
+		hash: null,
+		host: host,
+		hostname: hostname,
+		href: protocol + '://' + host + url,
+		path: url,
+		pathname: pathname,
+		port: host.substring(host.lastIndexOf(':') + 1),
+		protocol: protocol + ':',
+		query: query,
+		search: search,
+		slashes: true
+	};
+};
+
 /**
  * Destroy the stream
  * @param {Stream} stream
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1"
     },
-    "version": "1.9.0-18",
+    "version": "1.9.0-19",
     "homepage": "http://www.totaljs.com",
     "bugs": {
         "url": "https://github.com/totaljs/framework/issues",
diff --git a/test/controllers/default.js b/test/controllers/default.js
@@ -271,7 +271,7 @@ function view_homepage() {
     console.log(this.hash('sha1', '123456', false));
 
     //this.view('homepage');
-    this.plain(this.framework.usage(true));
+    this.plain(framework.usage(true));
 }
 
 function view_layout() {
@@ -566,6 +566,7 @@ function viewViews() {
     assert.ok(output.contains('<link rel="dns-prefetch" href="//fonts.googleapis.com" />'), name + 'dns');
     assert.ok(output.contains('<link rel="prefetch" href="http://daker.me/2013/05/hello-world.html" />'), name + 'prefetch');
     assert.ok(output.contains('<link rel="prerender" href="http://daker.me/2013/05/hello-world.html" />'), name + 'prerender');
+
     assert.ok(output.contains('<link rel="canonical" href="http://127.0.0.1:8001/a/a-b-c/" />'), name + 'canonical');
     assert.ok(output.contains('<link rel="next" href="http://127.0.0.1:8001/a/3/" />'), name + 'next');
     assert.ok(output.contains('<link rel="prev" href="http://127.0.0.1:8001/a/1/" />'), name + 'prev');
