Initial support proposal for http2

lib/application.js

@@ -22,6 +22,7 @@ var debug = require('debug')('express:application');
 var View = require('./view');
 var http = require('http');
 var compileETag = require('./utils').compileETag;
+var isHttp2Suported = require('./utils').isHttp2Supported;
 var compileQueryParser = require('./utils').compileQueryParser;
 var compileTrust = require('./utils').compileTrust;
 var deprecate = require('depd')('express');
@@ -99,6 +100,13 @@ app.defaultConfiguration = function defaultConfiguration() {
     setPrototypeOf(this.response, parent.response)
     setPrototypeOf(this.engines, parent.engines)
     setPrototypeOf(this.settings, parent.settings)
+
+    //set prototype for http2 requests/response
+    if (isHttp2Suported) {
+      setPrototypeOf(this.http2Request, parent.http2Request)
+      setPrototypeOf(this.http2Response, parent.http2Response)
+    }
+
   });
 
   // setup locals

lib/express.js

@@ -19,7 +19,7 @@ var Route = require('./router/route');
 var Router = require('./router');
 var req = require('./request');
 var res = require('./response');
-
+var isHttp2Supported = require('./utils').isHttp2Supported;
 /**
  * Expose `createApplication()`.
  */
@@ -34,23 +34,36 @@ exports = module.exports = createApplication;
  */
 
 function createApplication() {
-  var app = function(req, res, next) {
+  var app = function (req, res, next) {
     app.handle(req, res, next);
   };
 
   mixin(app, EventEmitter.prototype, false);
   mixin(app, proto, false);
 
   // expose the prototype that will get set on requests
-  app.request = Object.create(req, {
+  app.request = Object.create(req.req, {
     app: { configurable: true, enumerable: true, writable: true, value: app }
   })
 
   // expose the prototype that will get set on responses
-  app.response = Object.create(res, {
+  app.response = Object.create(res.res, {
     app: { configurable: true, enumerable: true, writable: true, value: app }
   })
 
+  if (isHttp2Supported) {
+    app.http2Request = Object.create(req.http2Req, {
+      app: { configurable: true, enumerable: true, writable: true, value: app }
+    });
+
+    app.http2Response = Object.create(res.http2Res, {
+      app: { configurable: true, enumerable: true, writable: true, value: app }
+    });
+  }
+
+
+
+
   app.init();
   return app;
 }

lib/middleware/init.js

@@ -7,14 +7,18 @@
  */
 
 'use strict';
-
 /**
  * Module dependencies.
  * @private
  */
 
-var setPrototypeOf = require('setprototypeof')
+var setPrototypeOf = require('setprototypeof');
+var isHttp2Supported = require('../utils').isHttp2Supported;
+var http2Request = null;
 
+if (isHttp2Supported) {
+  http2Request = require('http2').Http2ServerRequest;
+}
 /**
  * Initialization middleware, exposing the
  * request and response to each other, as well
@@ -31,9 +35,14 @@ exports.init = function(app){
     req.res = res;
     res.req = req;
     req.next = next;
+    if (isHttp2Supported && req instanceof http2Request) {
+      setPrototypeOf(req, app.http2Request)
+      setPrototypeOf(res, app.http2Response)
+    } else {
+      setPrototypeOf(req, app.request)
+      setPrototypeOf(res, app.response)
+    }
 
-    setPrototypeOf(req, app.request)
-    setPrototypeOf(res, app.response)
 
     res.locals = res.locals || Object.create(null);