http2: avoid bind and properly clean up in compat

Backport-PR-URL: #22850 PR-URL: #20374 Reviewed-By: Anatoli Papirovski <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]>

Author: ronag

lib/internal/http2/compat.js

@@ -7,7 +7,6 @@ const constants = binding.constants;
 consterrors=require('internal/errors');
 const{ kSocket }=require('internal/http2/util');
 
-constkFinish=Symbol('finish');
 constkBeginSend=Symbol('begin-send');
 constkState=Symbol('state');
 constkStream=Symbol('stream');
@@ -211,6 +210,27 @@ const proxySocketHandler ={
 }
 };
 
+functiononStreamCloseRequest(){
+constreq=this[kRequest];
+
+if(req===undefined)
+return;
+
+conststate=req[kState];
+state.closed=true;
+
+req.push(null);
+// if the user didn't interact with incoming data and didn't pipe it,
+// dump it for compatibility with http1
+if(!state.didRead&&!req._readableState.resumeScheduled)
+req.resume();
+
+this[kProxySocket]=null;
+this[kRequest]=undefined;
+
+req.emit('close');
+}
+
 classHttp2ServerRequestextendsReadable{
 constructor(stream,headers,options,rawHeaders){
 super(options);
@@ -234,7 +254,7 @@ class Http2ServerRequest extends Readable{
 stream.on('end',onStreamEnd);
 stream.on('error',onStreamError);
 stream.on('aborted',onStreamAbortedRequest);
-stream.on('close',this[kFinish].bind(this));
+stream.on('close',onStreamCloseRequest);
 this.on('pause',onRequestPause);
 this.on('resume',onRequestResume);
 }
@@ -335,24 +355,30 @@ class Http2ServerRequest extends Readable{
 return;
 this[kStream].setTimeout(msecs,callback);
 }
-
-[kFinish](){
-conststate=this[kState];
-if(state.closed)
-return;
-state.closed=true;
-this.push(null);
-this[kStream][kRequest]=undefined;
-// if the user didn't interact with incoming data and didn't pipe it,
-// dump it for compatibility with http1
-if(!state.didRead&&!this._readableState.resumeScheduled)
-this.resume();
-this.emit('close');
-}
 }
 
 functiononStreamTrailersReady(){
-this[kStream].sendTrailers(this[kTrailers]);
+this.sendTrailers(this[kResponse][kTrailers]);
+}
+
+functiononStreamCloseResponse(){
+constres=this[kResponse];
+
+if(res===undefined)
+return;
+
+conststate=res[kState];
+
+if(this.headRequest!==state.headRequest)
+return;
+
+state.closed=true;
+
+this[kProxySocket]=null;
+this[kResponse]=undefined;
+
+res.emit('finish');
+res.emit('close');
 }
 
 classHttp2ServerResponseextendsStream{
@@ -373,8 +399,8 @@ class Http2ServerResponse extends Stream{
 this.writable=true;
 stream.on('drain',onStreamDrain);
 stream.on('aborted',onStreamAbortedResponse);
-stream.on('close',this[kFinish].bind(this));
-stream.on('wantTrailers',onStreamTrailersReady.bind(this));
+stream.on('close',onStreamCloseResponse);
+stream.on('wantTrailers',onStreamTrailersReady);
 }
 
 // User land modules such as finalhandler just check truthiness of this
@@ -605,7 +631,7 @@ class Http2ServerResponse extends Stream{
 this.writeHead(this[kState].statusCode);
 
 if(isFinished)
-this[kFinish]();
+onStreamCloseResponse.call(stream);
 else
 stream.end();
 }
@@ -649,18 +675,6 @@ class Http2ServerResponse extends Stream{
 this[kStream].respond(headers,options);
 }
 
-[kFinish](){
-conststream=this[kStream];
-conststate=this[kState];
-if(state.closed||stream.headRequest!==state.headRequest)
-return;
-state.closed=true;
-this[kProxySocket]=null;
-stream[kResponse]=undefined;
-this.emit('finish');
-this.emit('close');
-}
-
 // TODO doesn't support callbacks
 writeContinue(){
 conststream=this[kStream];