Fix http2 request with node 10.

.travis.yml

@@ -14,4 +14,6 @@ matrix:
  include:
  - node_js: "9"
  env: BROWSER=1
-
+ include:
+ - node_js: "10"
+ env: HTTP2_TEST=1

lib/node/http2wrapper.js

@@ -80,7 +80,9 @@ Request.prototype.createUnixConnection = function (authority, options) {
 }
 
 Request.prototype.setNoDelay = function (bool) {
- this.session.socket.setNoDelay(bool);
+ // We can not use setNoDelay with HTTP/2.
+ // Node 10 limits http2session.socket methods to ones safe to use with HTTP/2.
+ // See also https://nodejs.org/api/http2.html#http2_http2session_socket
 }
 
 Request.prototype.getFrame = function () {
@@ -180,7 +182,7 @@ Request.prototype.end = function (data) {
 Request.prototype.abort = function (data) {
  const frame = this.getFrame();
  frame.close(NGHTTP2_CANCEL);
- this.session.close();
+ this.session.destroy();
 }
 
 exports.setProtocol = setProtocol;

test/node/agency.js

@@ -2,7 +2,7 @@
 
 require("should-http");
 
-const express = require("express");
+const express = require("../support/express");
 const app = express();
 const request = require("../support/client");
 const assert = require("assert");

test/node/https.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const request = require("../support/client");
-const express = require("express");
+const express = require("../support/express");;
 const assert = require("assert");
 const app = express();
 const url = require("url");

test/node/inflate.js

@@ -4,7 +4,7 @@ require("should-http");
 
 const request = require("../support/client");
 const assert = require("assert");
-const express = require("express");
+const express = require("../support/express");
 const zlib = require("zlib");
 let http = require('http');
 if(process.env.HTTP2_TEST){

test/node/network-error.js

@@ -1,6 +1,6 @@
 "use strict";
 const request = require("../support/client"),
- express = require("express"),
+ express = require("../support/express"),
  assert = require("assert"),
  net = require("net");
 

test/node/pipe.js

@@ -1,6 +1,6 @@
 "use strict";
 const request = require("../support/client"),
- express = require("express"),
+ express = require("../support/express"),
  app = express(),
  fs = require("fs"),
  bodyParser = require("body-parser");

test/node/query.js

@@ -1,6 +1,6 @@
 "use strict";
 const request = require("../support/client"),
- express = require("express"),
+ express = require("../support/express"),
  assert = require("assert"),
  fs = require("fs"),
  app = express();

test/node/redirects-other-host.js

@@ -1,6 +1,6 @@
 "use strict";
 const request = require("../support/client"),
- express = require("express"),
+ express = require("../support/express"),
  assert = require("assert"),
  app = express(),
  app2 = express(),

test/node/response-readable-stream.js

@@ -1,6 +1,6 @@
 "use strict";
 const request = require("../support/client"),
- express = require("express"),
+ express = require("../support/express"),
  app = express(),
  fs = require("fs");
 let http = require('http');

test/node/set-host.js

@@ -1,6 +1,6 @@
 "use strict";
 const request = require("../support/client"),
- express = require("express"),
+ express = require("../support/express"),
  app = express();
 let http = require('http');
 

test/node/toError.js

@@ -1,6 +1,6 @@
 "use strict";
 const request = require("../support/client"),
- express = require("express"),
+ express = require("../support/express"),
  assert = require("assert"),
  app = express();
 let http = require('http');

test/node/unix-sockets.js

@@ -1,6 +1,6 @@
 "use strict";
 const request = require("../support/client");
-const express = require("express");
+const express = require("../support/express");
 const assert = require("assert");
 const app = express();
 let http = require("http");

test/support/express/index.js

@@ -0,0 +1,25 @@
+const express = require('express');
+let http2Req;
+let http2Res;
+if(process.env.HTTP2_TEST){
+ const http2 = require('http2');
+ const reqDecorator = require('./requestDecorator');
+ const resDecorator = require('./responseDecorator');
+ http2Req = reqDecorator(Object.create(http2.Http2ServerRequest.prototype));
+ http2Res = resDecorator(Object.create(http2.Http2ServerResponse.prototype));
+}
+
+function createApp(){
+ const 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;