Support Http2

.eslintignore

@@ -1,2 +1,3 @@
 coverage
 node_modules
+/test/support/supertest/http2wrapper.js

.travis.yml

@@ -27,3 +27,7 @@ script:
   - "test   -z $(npm -ps ls eslint) || npm run-script lint"
 after_script:
   - "test -e ./coverage/lcov.info && npm install coveralls@2 && cat ./coverage/lcov.info | coveralls"
+matrix:
+  include:
+    - node_js: "10"
+      env: HTTP2_TEST=1

index.js

@@ -11,6 +11,11 @@ var deprecate = require('depd')('cookies')
 var Keygrip = require('keygrip')
 var http = require('http')
 var cache = {}
+var http2 = null;
+try{
+  http2 = require('http2');
+}catch(_){
+}
 
 /**
  * RegExp to match field-content in RFC 7230 sec 3.2
@@ -111,7 +116,9 @@ Cookies.prototype.set = function(name, value, opts) {
     pushCookie(headers, cookie)
   }
 
-  var setHeader = res.set ? http.OutgoingMessage.prototype.setHeader : res.setHeader
+  var protoSetHeader = http2 && res instanceof http2.Http2ServerResponse ?
+    http2.Http2ServerResponse.prototype.setHeader : http.OutgoingMessage.prototype.setHeader;
+  var setHeader = res.set ? protoSetHeader : res.setHeader
   setHeader.call(res, 'Set-Cookie', headers)
   return this
 };

package.json

@@ -14,11 +14,11 @@
   },
   "devDependencies": {
     "eslint": "3.19.0",
-    "express": "4.9.8",
+    "express": "4.16.3",
     "istanbul": "0.4.5",
     "mocha": "2.5.3",
     "restify": "2.8.1",
-    "supertest": "1.1.0"
+    "supertest": "2.0"
   },
   "files": [
     "HISTORY.md",
@@ -32,6 +32,7 @@
   "scripts": {
     "lint": "eslint .",
     "test": "mocha --require test/support/env --reporter spec --bail --check-leaks test/",
+    "test-http2": "HTTP2_TEST=1 mocha --require test/support/env --reporter spec --bail --check-leaks test/",
     "test-ci": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --require test/support/env --reporter spec --check-leaks test/",
     "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --require test/support/env --reporter dot --check-leaks test/"
   }

test/express.js

@@ -1,10 +1,14 @@
 
 var assert = require( "assert" )
-  , express = require( "express" )
+  , express = require( "./support/express" )
   , http = require( "http" )
   , keys = require( "keygrip" )(['a', 'b'])
   , cookies = require( "../" ).express
-  , request = require('supertest')
+  , request = require('./support/supertest')
+
+if(process.env.HTTP2_TEST){
+  http = require( "http2" )
+}
 
 describe('Express', function () {
   var server
@@ -65,7 +69,7 @@ describe('Express', function () {
       )
     })
 
-    server = require('http').createServer(app).listen()
+    server = http.createServer(app).listen()
   })
 
   it('should set cookies', function (done) {

test/http.js

@@ -3,7 +3,11 @@ var assert = require( "assert" )
   , http = require( "http" )
   , keys = require( "keygrip" )(['a', 'b'])
   , Cookies = require( "../" )
-  , request = require('supertest')
+  , request = require('./support/supertest')
+
+if(process.env.HTTP2_TEST){
+  http = require( "http2" )
+}
 
 describe('HTTP', function () {
   var server

test/restify.js

@@ -1,11 +1,14 @@
+if(Number(process.version.split('.')[0].slice(1)) >= 8){
+  process.EventEmitter = require('events')
+}
 var assert = require('assert')
   , restify = require('restify')
   , keys = require('keygrip')(['a', 'b'])
   , http = require('http')
   , Cookies = require('../')
-  , request = require('supertest')
+  , request = require('./support/supertest')
 
-describe('Restify', function () {
+if(!process.env.HTTP2_TEST) describe('Restify', function () {
   var header
   var server
 

test/support/express/index.js

@@ -0,0 +1,25 @@
+var express = require('express');
+var http2Req;
+var http2Res;
+if(process.env.HTTP2_TEST){
+  var http2 = require('http2');
+  var reqDecorator = require('./requestDecorator');
+  var resDecorator = require('./responseDecorator');
+  http2Req = reqDecorator(Object.create(http2.Http2ServerRequest.prototype));
+  http2Res = resDecorator(Object.create(http2.Http2ServerResponse.prototype));
+}
+
+function createApp(){
+  var app = express();
+  if(process.env.HTTP2_TEST){
+    app.request = Object.create(http2Req, {
+      app: { configurable: true, enumerable: true, writable: true, value: app }
+    });
+    app.response = Object.create(http2Res, {
+      app: { configurable: true, enumerable: true, writable: true, value: app }
+    });
+  }
+  return app;
+}
+
+module.exports = createApp;