stream: remove ambiguous code

ronag · ronag · commit 67be60dcf665 · 2019-09-23T11:52:32.000+02:00
diff --git a/lib/internal/streams/end-of-stream.js b/lib/internal/streams/end-of-stream.js
@@ -59,25 +59,23 @@ function eos(stream, opts, callback){
 };
 }
 
- let readable = opts.readable ||
+ const readable = opts.readable ||
 (opts.readable !== false && isReadable(stream));
- let writable = opts.writable ||
+ const writable = opts.writable ||
 (opts.writable !== false && isWritable(stream));
 
 const onlegacyfinish = () =>{
 if (!stream.writable) onfinish();
 };
 
 const onfinish = () =>{
- writable = false;
 writableFinished = true;
- if (!readable) callback.call(stream);
+ if (!readable || readableEnded) callback.call(stream);
 };
 
 const onend = () =>{
- readable = false;
 readableEnded = true;
- if (!writable) callback.call(stream);
+ if (!writable || writableFinished) callback.call(stream);
 };
 
 const onclose = () =>{

-Original file line number
+Diff line change
 };
+}
 -letreadable=opts.readable||
 +constreadable=opts.readable||
 (opts.readable!==false&&isReadable(stream));
 -letwritable=opts.writable||
 +constwritable=opts.writable||
 (opts.writable!==false&&isWritable(stream));
 constonlegacyfinish=()=>{
 if(!stream.writable)onfinish();
 };
 constonfinish=()=>{
 -writable=false;
 writableFinished=true;
 -if(!readable)callback.call(stream);
 +if(!readable||readableEnded)callback.call(stream);
 };
 constonend=()=>{
 -readable=false;
 readableEnded=true;
 -if(!writable)callback.call(stream);
 +if(!writable||writableFinished)callback.call(stream);
 };
 constonclose=()=>{