stream: eos make const state const

writable & readable is based on type and is not actual state, treat them as such. Backport-PR-URL: #32178 PR-URL: #32031 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>

Author: ronag

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

@@ -47,9 +47,9 @@ function eos(stream, opts, callback){
 
 callback=once(callback);
 
-letreadable=opts.readable||
+constreadable=opts.readable||
 (opts.readable!==false&&isReadable(stream));
-letwritable=opts.writable||
+constwritable=opts.writable||
 (opts.writable!==false&&isWritable(stream));
 
 constonlegacyfinish=()=>{
@@ -59,35 +59,31 @@ function eos(stream, opts, callback){
 letwritableFinished=stream.writableFinished||
 (stream._writableState&&stream._writableState.finished);
 constonfinish=()=>{
-writable=false;
 writableFinished=true;
-if(!readable)callback.call(stream);
+if(!readable||readableEnded)callback.call(stream);
 };
 
 letreadableEnded=stream.readableEnded||
 (stream._readableState&&stream._readableState.endEmitted);
 constonend=()=>{
-readable=false;
 readableEnded=true;
-if(!writable)callback.call(stream);
+if(!writable||writableFinished)callback.call(stream);
 };
 
 constonerror=(err)=>{
 callback.call(stream,err);
 };
 
 constonclose=()=>{
-leterr;
 if(readable&&!readableEnded){
 if(!stream._readableState||!stream._readableState.ended)
-err=newERR_STREAM_PREMATURE_CLOSE();
-returncallback.call(stream,err);
+returncallback.call(stream,newERR_STREAM_PREMATURE_CLOSE());
 }
 if(writable&&!writableFinished){
 if(!isWritableFinished(stream))
-err=newERR_STREAM_PREMATURE_CLOSE();
-returncallback.call(stream,err);
+returncallback.call(stream,newERR_STREAM_PREMATURE_CLOSE());
 }
+callback.call(stream);
 };
 
 constonrequest=()=>{

test/parallel/test-stream-finished.js

@@ -181,7 +181,7 @@ const{promisify } = require('util');
 conststreamLike=newEE();
 streamLike.readableEnded=true;
 streamLike.readable=true;
-finished(streamLike,common.mustCall);
+finished(streamLike,common.mustCall());
 streamLike.emit('close');
 }