http2: add req and res options to server creation

Add optional Http2ServerRequest and Http2ServerResponse options to createServer and createSecureServer. Allows custom req & res classes that extend the default ones to be used without overriding the prototype. PR-URL: #15560 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Anatoli Papirovski <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>

Author: Peter Marton

doc/api/http2.md

@@ -1714,6 +1714,14 @@ changes:
 *`Http1ServerResponse`{http.ServerResponse} Specifies the ServerResponse
  class to used for HTTP/1 fallback. Useful for extending the original
 `http.ServerResponse`. **Default:**`http.ServerResponse`
+*`Http2ServerRequest`{http2.Http2ServerRequest} Specifies the
+ Http2ServerRequest class to use.
+ Useful for extending the original `Http2ServerRequest`.
+**Default:**`Http2ServerRequest`
+*`Http2ServerResponse`{htt2.Http2ServerResponse} Specifies the
+ Http2ServerResponse class to use.
+ Useful for extending the original `Http2ServerResponse`.
+**Default:**`Http2ServerResponse`
 *`onRequestHandler`{Function} See [Compatibility API][]
 * Returns:{Http2Server}
 

lib/internal/http2/compat.js

@@ -661,11 +661,11 @@ class Http2ServerResponse extends Stream{
 }
 }
 
-functiononServerStream(stream,headers,flags,rawHeaders){
+functiononServerStream(ServerRequest,ServerResponse,
+stream,headers,flags,rawHeaders){
 constserver=this;
-constrequest=newHttp2ServerRequest(stream,headers,undefined,
-rawHeaders);
-constresponse=newHttp2ServerResponse(stream);
+constrequest=newServerRequest(stream,headers,undefined,rawHeaders);
+constresponse=newServerResponse(stream);
 
 // Check for the CONNECT method
 constmethod=headers[HTTP2_HEADER_METHOD];

lib/internal/http2/core.js

@@ -2487,6 +2487,10 @@ function initializeOptions(options){
 options.Http1ServerResponse=options.Http1ServerResponse||
 http.ServerResponse;
 
+options.Http2ServerRequest=options.Http2ServerRequest||
+Http2ServerRequest;
+options.Http2ServerResponse=options.Http2ServerResponse||
+Http2ServerResponse;
 returnoptions;
 }
 
@@ -2552,7 +2556,11 @@ class Http2Server extends NETServer{
 functionsetupCompat(ev){
 if(ev==='request'){
 this.removeListener('newListener',setupCompat);
-this.on('stream',onServerStream);
+this.on('stream',onServerStream.bind(
+this,
+this[kOptions].Http2ServerRequest,
+this[kOptions].Http2ServerResponse)
+);
 }
 }
 

test/parallel/test-http2-options-server-request.js

@@ -0,0 +1,40 @@
+'use strict';
+
+constcommon=require('../common');
+if(!common.hasCrypto)
+common.skip('missing crypto');
+constassert=require('assert');
+consth2=require('http2');
+
+classMyServerRequestextendsh2.Http2ServerRequest{
+getUserAgent(){
+returnthis.headers['user-agent']||'unknown';
+}
+}
+
+constserver=h2.createServer({
+Http2ServerRequest: MyServerRequest
+},(req,res)=>{
+assert.strictEqual(req.getUserAgent(),'node-test');
+
+res.writeHead(200,{'Content-Type': 'text/plain'});
+res.end();
+});
+server.listen(0);
+
+server.on('listening',common.mustCall(()=>{
+
+constclient=h2.connect(`http://localhost:${server.address().port}`);
+constreq=client.request({
+':path': '/',
+'User-Agent': 'node-test'
+});
+
+req.on('response',common.mustCall());
+
+req.resume();
+req.on('end',common.mustCall(()=>{
+server.close();
+client.destroy();
+}));
+}));

test/parallel/test-http2-options-server-response.js

@@ -0,0 +1,34 @@
+'use strict';
+
+constcommon=require('../common');
+if(!common.hasCrypto)
+common.skip('missing crypto');
+consth2=require('http2');
+
+classMyServerResponseextendsh2.Http2ServerResponse{
+status(code){
+returnthis.writeHead(code,{'Content-Type': 'text/plain'});
+}
+}
+
+constserver=h2.createServer({
+Http2ServerResponse: MyServerResponse
+},(req,res)=>{
+res.status(200);
+res.end();
+});
+server.listen(0);
+
+server.on('listening',common.mustCall(()=>{
+
+constclient=h2.connect(`http://localhost:${server.address().port}`);
+constreq=client.request({':path': '/'});
+
+req.on('response',common.mustCall());
+
+req.resume();
+req.on('end',common.mustCall(()=>{
+server.close();
+client.destroy();
+}));
+}));