stream: only use legacy close listeners if not willEmitClose

Some streams that willEmitClose unecessarily fallback to legacy events. PR-URL: #36649 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>

Author: ronag

lib/internal/streams/end-of-stream.js

@@ -129,7 +129,9 @@ function eos(stream, options, callback){
 
 if(isRequest(stream)){
 stream.on('complete',onfinish);
-stream.on('abort',onclose);
+if(!willEmitClose){
+stream.on('abort',onclose);
+}
 if(stream.req)onrequest();
 elsestream.on('request',onrequest);
 }elseif(writable&&!wState){// legacy streams
@@ -138,7 +140,7 @@ function eos(stream, options, callback){
 }
 
 // Not all streams will emit 'close' after 'aborted'.
-if(typeofstream.aborted==='boolean'){
+if(!willEmitClose&&typeofstream.aborted==='boolean'){
 stream.on('aborted',onclose);
 }
 

test/parallel/test-stream-finished.js

@@ -492,3 +492,26 @@ testClosed((opts) => new Writable({write(){}, ...opts }));
 .on('response',common.mustCall());
 });
 }
+
+
+{
+constw=newWritable({
+write(chunk,encoding,callback){
+process.nextTick(callback);
+}
+});
+w.aborted=false;
+w.end();
+letclosed=false;
+w.on('finish',()=>{
+assert.strictEqual(closed,false);
+w.emit('aborted');
+});
+w.on('close',common.mustCall(()=>{
+closed=true;
+}));
+
+finished(w,common.mustCall(()=>{
+assert.strictEqual(closed,true);
+}));
+}