Moves req/res out of the repo

lib/application.js

@@ -17,7 +17,6 @@ var finalhandler = require('finalhandler');
 var methods = require('methods');
 var debug = require('debug')('express:application');
 var View = require('./view');
-var http = require('http');
 var compileETag = require('./utils').compileETag;
 var compileQueryParser = require('./utils').compileQueryParser;
 var compileTrust = require('./utils').compileTrust;
@@ -599,8 +598,8 @@ app.render = function render(name, options, callback) {
  */
 
 app.listen = function listen() {
-  var server = http.createServer(this);
-  return server.listen.apply(server, arguments);
+  var server = this.createServer(this)
+  return server.listen.apply(server, arguments)
 };
 
 /**

lib/express.js

@@ -14,10 +14,35 @@
 
 var EventEmitter = require('events').EventEmitter;
 var mixin = require('merge-descriptors');
+var setPrototypeOf = require('setprototypeof')
 var proto = require('./application');
 var Router = require('router');
-var req = require('./request');
-var res = require('./response');
+var req = require('@wesleytodd/express-request');
+var res = require('@wesleytodd/express-response');
+
+/**
+ * Only reqire http when requested
+ */
+var http = {};
+var _http;
+Object.defineProperty(http, 'IncomingMessage', {
+  get: function () {
+    _http = _http || require('http')
+    return _http.IncomingMessage
+  }
+});
+Object.defineProperty(http, 'ServerResponse', {
+  get: function () {
+    _http = _http || require('http')
+    return _http.ServerResponse
+  }
+});
+Object.defineProperty(http, 'createServer', {
+  get: function () {
+    _http = _http || require('http')
+    return _http.createServer
+  }
+});
 
 /**
  * Expose `createApplication()`.
@@ -32,16 +57,22 @@ exports = module.exports = createApplication;
  * @api public
  */
 
-function createApplication() {
+function createApplication(opts) {
+  opts = opts || {}
+  opts.reqProto = opts.reqProto || http.IncomingMessage.prototype
+  opts.resProto = opts.resProto || http.ServerResponse.prototype
+  opts.createServer = opts.createServer || http.createServer
+
   var app = function(req, res, next) {
     app.handle(req, res, next);
   };
 
   mixin(app, EventEmitter.prototype, false);
   mixin(app, proto, false);
 
-  app.request = { __proto__: req, app: app };
-  app.response = { __proto__: res, app: app };
+  app.createServer = opts.createServer
+  app.request = setPrototypeOf({ app: app }, req(opts.reqProto))
+  app.response = setPrototypeOf({ app: app }, res(opts.resProto))
   app.init();
   return app;
 }
@@ -51,8 +82,8 @@ function createApplication() {
  */
 
 exports.application = proto;
-exports.request = req;
-exports.response = res;
+exports.request = req.proto
+exports.response = res.proto
 
 /**
  * Expose constructors.