stream: cleanup eos

PR-URL: nodejs#40998 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: James M Snell <[email protected]>
Linkgoron · Jan 31, 2022 · 9ea30b8 · 9ea30b8
1 parent da7d8dc
commit 9ea30b8
Showing 1 changed file with 34 additions and 17 deletions.
diff --git a/lib/internal/streams/end-of-stream.js b/lib/internal/streams/end-of-stream.js
@@ -51,14 +51,10 @@ function eos(stream, options, callback) {
 
   callback = once(callback);
 
-  const readable = options.readable ||
-    (options.readable !== false && isReadableNodeStream(stream));
-  const writable = options.writable ||
-    (options.writable !== false && isWritableNodeStream(stream));
+  const readable = options.readable ?? isReadableNodeStream(stream);
+  const writable = options.writable ?? isWritableNodeStream(stream);
 
-  if (isNodeStream(stream)) {
-    // Do nothing...
-  } else {
+  if (!isNodeStream(stream)) {
     // TODO: Webstreams.
     // TODO: Throw INVALID_ARG_TYPE.
   }
@@ -67,7 +63,9 @@ function eos(stream, options, callback) {
   const rState = stream._readableState;
 
   const onlegacyfinish = () => {
-    if (!stream.writable) onfinish();
+    if (!stream.writable) {
+      onfinish();
+    }
   };
 
   // TODO (ronag): Improve soft detection to include core modules and
@@ -85,10 +83,17 @@ function eos(stream, options, callback) {
     // Stream should not be destroyed here. If it is that
     // means that user space is doing something differently and
     // we cannot trust willEmitClose.
-    if (stream.destroyed) willEmitClose = false;
+    if (stream.destroyed) {
+      willEmitClose = false;
+    }
 
-    if (willEmitClose && (!stream.readable || readable)) return;
-    if (!readable || readableFinished) callback.call(stream);
+    if (willEmitClose && (!stream.readable || readable)) {
+      return;
+    }
+
+    if (!readable || readableFinished) {
+      callback.call(stream);
+    }
   };
 
   let readableFinished = isReadableFinished(stream, false);
@@ -97,10 +102,17 @@ function eos(stream, options, callback) {
     // Stream should not be destroyed here. If it is that
     // means that user space is doing something differently and
     // we cannot trust willEmitClose.
-    if (stream.destroyed) willEmitClose = false;
+    if (stream.destroyed) {
+      willEmitClose = false;
+    }
 
-    if (willEmitClose && (!stream.writable || writable)) return;
-    if (!writable || writableFinished) callback.call(stream);
+    if (willEmitClose && (!stream.writable || writable)) {
+      return;
+    }
+
+    if (!writable || writableFinished) {
+      callback.call(stream);
+    }
   };
 
   const onerror = (err) => {
@@ -141,8 +153,11 @@ function eos(stream, options, callback) {
     if (!willEmitClose) {
       stream.on('abort', onclose);
     }
-    if (stream.req) onrequest();
-    else stream.on('request', onrequest);
+    if (stream.req) {
+      onrequest();
+    } else {
+      stream.on('request', onrequest);
+    }
   } else if (writable && !wState) { // legacy streams
     stream.on('end', onlegacyfinish);
     stream.on('close', onlegacyfinish);
@@ -155,7 +170,9 @@ function eos(stream, options, callback) {
 
   stream.on('end', onend);
   stream.on('finish', onfinish);
-  if (options.error !== false) stream.on('error', onerror);
+  if (options.error !== false) {
+    stream.on('error', onerror);
+  }
   stream.on('close', onclose);
 
   if (closed) {