raw http support

Author: goenning

README.md

@@ -65,6 +65,7 @@ See [examples/express.js](/examples/express.js) for more examples.
 
 Things to do:
 
+- Refactor/Remove TODO comments 
 - transform testcases into runnable examples (npm run example)
 - storing of client timings on first result postback (there's a todo in the `results` function about where to do this)
 - document more things

examples/http.js

@@ -1,10 +1,10 @@
 var http = require('http');
 var miniprofiler = require('../lib/miniprofiler.js');
 
-var profile = miniprofiler.profile();
+var profiler = miniprofiler.http();
 
 http.createServer(function(req, res) {
-  profile(req, res, function() {
+  profiler(req, res, () => {
     req.miniprofiler.step('Step 1', function(){
       res.end('home');
     });

lib/middlewares/express.js

@@ -14,6 +14,7 @@ module.exports = function(f, profiler) {
 
 			var sp = req.path.split('/');
 			var reqPath = sp[sp.length - 1];
+		
 			if(reqPath == 'results')
 				profiler.results(req, res, (result) => {
           res.setHeader('Content-Type', result.type);
@@ -30,9 +31,9 @@ module.exports = function(f, profiler) {
 		}
 		var id = profiler.startProfiling(req, enabled);
 
-		res.locals.miniprofiler = enabled ? req.miniprofiler : {
-			include: function() { return ''; }
-		};
+		//res.locals.miniprofiler = enabled ? req.miniprofiler : {
+		//	include: function() { return ''; }
+		//};
 
 		if (enabled) {
 			res.on('finish', function() {

lib/middlewares/http.js

@@ -0,0 +1,47 @@
+module.exports = function(f, profiler) {
+	if(!f) f = function() { return true; };
+	return function(req, res, next) {
+		profiler.configure();
+		var enabled = f(req, res);
+
+    req.path = require('url').parse(req.url).pathname; //TODO remove this
+		if(req.path.startsWith(profiler.resourcePath)) {
+			if (!enabled) {
+        res.setHeader('Content-Type', 'text/plain; charset=utf-8');
+        res.writeHead(404);
+        res.end('MiniProfiler is disabled');
+        return;
+			}
+
+			var sp = req.path.split('/');
+			var reqPath = sp[sp.length - 1];
+
+			if(reqPath == 'results')
+				profiler.results(req, res, (result) => {
+          res.setHeader('Content-Type', result.type);
+          res.writeHead(result.status);
+          res.end(result.body);
+        });
+			else
+				profiler.static(reqPath, res, (result) => {
+          res.setHeader('Content-Type', result.type);
+          res.writeHead(result.status);
+          res.end(result.body);
+        });
+			return;
+		}
+		var id = profiler.startProfiling(req, enabled);
+
+		//res.locals.miniprofiler = enabled ? req.miniprofiler : {
+		//	include: function() { return ''; }
+		//};
+
+		if (enabled) {
+			res.on('finish', function() {
+				profiler.stopProfiling(req);
+			});
+			res.setHeader('X-MiniProfiler-Ids', `["${id}"]`);
+		}
+		next();
+	};
+};

lib/miniprofiler.js

@@ -46,6 +46,10 @@ exports.hapi = function(f) {
 	return require('./middlewares/hapi.js')(f, shared());
 };
 
+exports.http = function(f) {
+	return require('./middlewares/http.js')(f, shared());
+};
+
 exports.for = {
 	pg: require('./providers/miniprofiler.pg.js'),
 	redis: require('./providers/miniprofiler.redis.js')

tests/servers/http/default.js

@@ -0,0 +1,32 @@
+var miniprofiler = require('../../../lib/miniprofiler.js');
+const http = require('http');
+
+var profiler = miniprofiler.http();
+
+var server = http.createServer((req, res) => {
+
+	profiler(req, res, () => {
+		res.writeHead(200, {'Content-Type': 'text/plain'});
+
+		if (req.path == '/') {
+			res.end('');
+		} else if (req.path == '/step') {
+			req.miniprofiler.step('Step 1', () => {
+				res.end('');
+			});
+		} else if (req.path == '/step-two') {
+			req.miniprofiler.step('Step 1', () => {
+				req.miniprofiler.step('Step 2', () => {
+					res.end('');
+				});
+			});
+		} else if (req.path == '/js-sleep') {
+			req.miniprofiler.timeQuery('custom', 'Sleeping...', setTimeout, function() {
+				res.end('');
+			}, 50);
+		}
+	});
+
+});
+
+module.exports = server;

tests/servers/http/index.js

@@ -0,0 +1,10 @@
+var server;
+module.exports = {
+  start: function(name) {
+    server = require(`./${name}.js`);
+    server.listen(8080);
+  },
+  stop: function() {
+    server.close();
+  }
+};

tests/servers/http/unprofiled.js

@@ -0,0 +1,21 @@
+var miniprofiler = require('../../../lib/miniprofiler.js');
+const http = require('http');
+
+var disableMiniProfiler = (req) => {
+  return false;
+};
+
+var profiler = miniprofiler.http(disableMiniProfiler);
+
+var server = http.createServer((req, res) => {
+
+	profiler(req, res, () => {
+		if (req.path == '/') {
+			res.writeHead(200, {'Content-Type': 'text/plain'});
+			res.end('');
+		}
+	});
+
+});
+
+module.exports = server;

tests/servers/index.js

@@ -1,5 +1,5 @@
 var request = require('request');
-var frameworks = [ 'koa', 'express', 'hapi' ];
+var frameworks = [ 'koa', 'express', 'hapi', 'http' ];
 var all = [ ];
 
 for (var fw of frameworks) {