http: fix socketOnWrap edge cases

Properly handle prependListener wrapping on http server
socket, in addition to on and addListener.
PR-URL: #27968
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>

Author: apapirovski

lib/_http_server.js

@@ -407,9 +407,10 @@ function connectionListenerInternal(server, socket) {
 socket.on('resume',onSocketResume);
 socket.on('pause',onSocketPause);
 
-// Override on to unconsume on `data`, `readable` listeners
-socket.on=socketOnWrap;
-socket.addListener=socket.on;
+// Overrides to unconsume on `data`, `readable` listeners
+socket.on=generateSocketListenerWrapper('on');
+socket.addListener=generateSocketListenerWrapper('addListener');
+socket.prependListener=generateSocketListenerWrapper('prependListener');
 
 // We only consume the socket if it has never been consumed before.
 if(socket._handle&&socket._handle.isStreamBase&&
@@ -757,19 +758,21 @@ function unconsume(parser, socket) {
 }
 }
 
-functionsocketOnWrap(ev,fn){
-constres=net.Socket.prototype.on.call(this,ev,fn);
-if(!this.parser){
-this.prependListener=net.Socket.prototype.prependListener;
-this.on=net.Socket.prototype.on;
-this.addListener=this.on;
-returnres;
-}
+functiongenerateSocketListenerWrapper(originalFnName){
+returnfunctionsocketListenerWrap(ev,fn){
+constres=net.Socket.prototype[originalFnName].call(this,ev,fn);
+if(!this.parser){
+this.on=net.Socket.prototype.on;
+this.addListener=net.Socket.prototype.addListener;
+this.prependListener=net.Socket.prototype.prependListener;
+returnres;
+}
 
-if(ev==='data'||ev==='readable')
-unconsume(this.parser,this);
+if(ev==='data'||ev==='readable')
+unconsume(this.parser,this);
 
-returnres;
+returnres;
+};
 }
 
 functionresetHeadersTimeoutOnReqEnd(){

test/parallel/test-http-server-unconsume.js

@@ -1,34 +1,33 @@
 'use strict';
-require('../common');
+constcommon=require('../common');
 constassert=require('assert');
 consthttp=require('http');
 constnet=require('net');
 
-letreceived='';
+['on','addListener','prependListener'].forEach((testFn)=>{
+letreceived='';
 
-constserver=http.createServer(function(req,res){
-res.writeHead(200);
-res.end();
+constserver=http.createServer(function(req,res){
+res.writeHead(200);
+res.end();
 
-req.socket.on('data',function(data){
-received+=data;
-});
+req.socket[testFn]('data',function(data){
+received+=data;
+});
 
-assert.strictEqual(req.socket.on,req.socket.addListener);
-assert.strictEqual(req.socket.prependListener,
-net.Socket.prototype.prependListener);
+server.close();
+}).listen(0,function(){
+constsocket=net.connect(this.address().port,function(){
+socket.write('PUT / HTTP/1.1\r\n\r\n');
 
-server.close();
-}).listen(0,function(){
-constsocket=net.connect(this.address().port,function(){
-socket.write('PUT / HTTP/1.1\r\n\r\n');
+socket.once('data',function(){
+socket.end('hello world');
+});
 
-socket.once('data',function(){
-socket.end('hello world');
+socket.on('end',common.mustCall(()=>{
+assert.strictEqual(received,'hello world',
+`failed for socket.${testFn}`);
+}));
 });
 });
 });
-
-process.on('exit',function(){
-assert.strictEqual(received,'hello world');
-});