expressjs · phouri · Aug 9, 2017 · Sep 1, 2017 · Sep 1, 2017 · Sep 1, 2017
diff --git a/examples/http2/index.js b/examples/http2/index.js
@@ -0,0 +1,34 @@
+var http2 = require('http2');
+var fs = require('fs');
+var path = require('path');
+var express = require('../../');
+var keys = path.join(__dirname, 'keys');
+var app = express();
+var style = fs.readFileSync(path.resolve(__dirname, './static/style.css'), 'utf8');
+function pushStyle(res) {
+  res.createPushResponse({
+    ':path': '/style.css',
+    ':status': 200,
+    'content-type': 'text/css'
+  }, function(err, newResponse) {
+    newResponse.setHeader('content-type', 'text/css');
+    newResponse.end(style);
+  });
+}
+
+app.use(express.static('static', {setHeaders: function(res, file) {
+  if (file.indexOf('index.html') > -1) {
+    pushStyle(res);
+  }
+}}));
+
+var server = http2.createSecureServer({
+  key: fs.readFileSync(path.join(keys, 'test_key.pem')),
+  cert: fs.readFileSync(path.join(keys, 'test_cert.pem'))
+}, app);
+
+/* istanbul ignore next */
+if (!module.parent) {
+  server.listen(3000);
+  console.log('Express started on port 3000');
+}
diff --git a/examples/http2/keys/test_cert.pem b/examples/http2/keys/test_cert.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICjzCCAfgCCQCduAjYszOZ3DANBgkqhkiG9w0BAQUFADCBizELMAkGA1UEBhMC
+Q04xEzARBgNVBAgTCkd1YW5nIERvbmcxFDASBgNVBAcTC0d1YW5nIFpob3VlMQ4w
+DAYDVQQKEwVUQkVEUDENMAsGA1UECxMEVEVTVDEQMA4GA1UEAxMHZmVuZ21rMjEg
+MB4GCSqGSIb3DQEJARYRZmVuZ21rMkBnbWFpbC5jb20wHhcNMTIwOTIzMTQxMDI5
+WhcNMTIxMDIzMTQxMDI5WjCBizELMAkGA1UEBhMCQ04xEzARBgNVBAgTCkd1YW5n
+IERvbmcxFDASBgNVBAcTC0d1YW5nIFpob3VlMQ4wDAYDVQQKEwVUQkVEUDENMAsG
+A1UECxMEVEVTVDEQMA4GA1UEAxMHZmVuZ21rMjEgMB4GCSqGSIb3DQEJARYRZmVu
+Z21rMkBnbWFpbC5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALOEtchk
+KBK8WTqwXR2Aov2mc0+igyQTGbxBDSyyULHPiecMqOBHs5bV4DL1pc/01hLKIp4T
+2j2KNTTmeivrtKd3wMQL7A+IgyqdmeqRi98pYUylFZrHxb9Kiwm7mpHanodmgnTT
+zOluEpi/K9h9zM0DbIOynsOh9/w4E2Aq6JvrAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+gYEAnPd0JvCKQQBrm9jI6TkJKmfBa4NH0wUpMQv/bo2NWw1tA8fTQYb0S4aTep5Q
+JdYctLQeE7abY1fpXFIwFY/FC0rE3alkEK+4PlCXvHGTYMiq90oH0JtlEqYTdTWJ
+i99gtHarMEfzejyY3VDa2XFGmZrQCP6Co5NGDjAEr2A4ECg=
+-----END CERTIFICATE-----
diff --git a/examples/http2/keys/test_key.pem b/examples/http2/keys/test_key.pem
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQCzhLXIZCgSvFk6sF0dgKL9pnNPooMkExm8QQ0sslCxz4nnDKjg
+R7OW1eAy9aXP9NYSyiKeE9o9ijU05nor67Snd8DEC+wPiIMqnZnqkYvfKWFMpRWa
+x8W/SosJu5qR2p6HZoJ008zpbhKYvyvYfczNA2yDsp7Doff8OBNgKuib6wIDAQAB
+AoGAAp2tdHUZLGS4PCWzxalJNr8FMSTiGlV464hbI8qZaG3oyYgisdn5oPoO4U85
+ElW0BOQTKxCI/pqT+ehd4WP25u+RXBqOSfpIRQvY2RjXmeyrkDEZWATP/BUa/Oqa
+0YitEsAXvt3pQli+LVc9GZSFZQECgwDVdAs4n7DdQlkLwIECQQDmFL9rIE/6wF3h
+fJkvPFs67MJgMF/T4omLnv/FGSH7KBpjFHts9AbPIGjD1dadRpmHxk7ahbSTKMxu
+uoZ1R1irAkEAx73MW4fJDQZDdJHwskYyGXuL99Fcr8xz6YZv75tm5O3eF2a/UvoO
+UIgDGpTIWFrm+gli27p3J0rJhhOiI4JJwQJAYOjUR3bwuRlVcahdjTvK4WLf7Evz
+0PdWH+z0pjwTyAn4M0tpQVb3lz57YiErqEsYV8v7Yqd2i5VfpjQCdlt6yQJBAIpm
+7kph/SLEO0tzsGenEiHsJKFT9bhun8ape7h4YsSwOdrXPC0fzXlptVTe0S+/1Rpe
+FJ0SSGv2e0snIYsfRUECQQCP8VOp3IIE8beytDoqn3QbWvobx94NVhHKUX5UB6C+
+bhY0LpTTFb8VMfSkICZXhbpcKf5zIdRjOh0ZLDeZJl5v
+-----END RSA PRIVATE KEY-----
diff --git a/examples/http2/static/index.html b/examples/http2/static/index.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <script src="s1.js" type="text/javascript"></script>
+    <script src="s2.js" type="text/javascript"></script>
+    <script src="s3.js" type="text/javascript"></script>
+    <link rel="stylesheet" href="/style.css">
+  </head>
+  <body>
+    <div>
+        Express with Http2 Example
+        Check out the network tab, notice how all the connections use the same connection ID
+        and the style gets via push (most of the time :) )
+    </div>    
+  </body>
+</html>
diff --git a/examples/http2/static/s1.js b/examples/http2/static/s1.js
@@ -0,0 +1 @@
+console.log('Loaded');
diff --git a/examples/http2/static/s2.js b/examples/http2/static/s2.js
@@ -0,0 +1 @@
+console.log('Loaded');
diff --git a/examples/http2/static/s3.js b/examples/http2/static/s3.js
@@ -0,0 +1 @@
+console.log('Loaded');
diff --git a/examples/http2/static/style.css b/examples/http2/static/style.css
@@ -0,0 +1,8 @@
+body {
+  margin: 0;
+  padding: 0;
+  height: 100vh;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
diff --git a/lib/application.js b/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

diff --git a/lib/express.js b/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,7 +34,7 @@ exports = module.exports = createApplication;
  */
 
 function createApplication() {
-  var app = function(req, res, next) {
+  var app = function (req, res, next) {
     app.handle(req, res, next);
   };
 
@@ -51,6 +51,21 @@ function createApplication() {
     app: { configurable: true, enumerable: true, writable: true, value: app }
   })
 
+  if (isHttp2Supported) {
+    var http2Req = require('./http2Request');
+    var http2Res = require('./http2Response');
+    app.http2Request = Object.create(http2Req, {
+      app: { configurable: true, enumerable: true, writable: true, value: app }
+    });
+
+    app.http2Response = Object.create(http2Res, {
+      app: { configurable: true, enumerable: true, writable: true, value: app }
+    });
+  }
+
+
+
+
   app.init();
   return app;
 }

diff --git a/lib/http2Request.js b/lib/http2Request.js
@@ -0,0 +1,40 @@
+/*!
+ * express
+ * Copyright(c) 2009-2013 TJ Holowaychuk
+ * Copyright(c) 2013 Roman Shtylman
+ * Copyright(c) 2014-2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+'use strict';
+
+/**
+ * Module dependencies.
+ * @private
+ */
+var http2 = require('http2');
+var http2Constants = http2.constants;
+var decorator = require('./requestDecorator');
+var defineGetter = require('./utils').defineGetter;
+var http2Req = decorator(Object.create(http2.Http2ServerRequest.prototype));
+/**
+ * Override default http2 path to return only pathname
+ * as it returns full url
+ * Gets the full URL from the headers
+ * Creates a mock object for parse to cache on and read from
+ * as url in http2 refers to this.path which will results in an error
+ */
+defineGetter(http2Req, 'url', function path() {
+  var headers = this.headers;
+  if (headers === undefined) {
+    return '';
+  }
+  return headers[http2Constants.HTTP2_HEADER_PATH];
+});
+
+/**
+ * Module exports.
+ * @public
+ */
+
+module.exports = http2Req;
diff --git a/lib/http2Response.js b/lib/http2Response.js
@@ -0,0 +1,40 @@
+/*!
+ * express
+ * Copyright(c) 2009-2013 TJ Holowaychuk
+ * Copyright(c) 2014-2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+'use strict';
+
+/**
+ * Module dependencies.
+ * @private
+ */
+var Http2ServerResponse = require('http2').Http2ServerResponse;
+var decorator = require('./responseDecorator');
+/**
+ * Response prototype.
+ * @public
+ */
+
+var res = decorator(Object.create(Http2ServerResponse.prototype));
+
+/**
+ * Add setter for statusMessage as it's deprecated, node doesn't set setter only getter
+ * so without setting this setter it fails
+ * Remove if node adds deprecation setter as well
+ */
+Object.defineProperty(res, 'statusMessage', {
+  set: function (x) {
+    //Empty setter for statusMessage
+  }
+});
+
+/**
+ * Module exports.
+ * @public
+ */
+
+module.exports = res;
+
diff --git a/lib/middleware/init.js b/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);