From 55dbadaa861411c4a5d47431d1b4149b641358a0 Mon Sep 17 00:00:00 2001
From: Robert Nagy <ronagy@icloud.com>
Date: Wed, 1 Jan 2020 20:07:48 +0100
Subject: [PATCH 1/2] stream: simplify push

---
 lib/_stream_readable.js | 87 ++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 53 deletions(-)

diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
index bda03cc1529892..cd3a6b3d1bae31 100644
--- a/lib/_stream_readable.js
+++ b/lib/_stream_readable.js
@@ -275,10 +275,11 @@ function readableAddChunk(stream, chunk, encoding, addToFront) {
   debug('readableAddChunk', chunk);
   const state = stream._readableState;
 
-  let skipChunkCheck;
-
+  let err;
   if (!state.objectMode) {
-    if (typeof chunk === 'string') {
+    if (chunk instanceof Buffer) {
+      encoding = '';
+    } else if (typeof chunk === 'string') {
       encoding = encoding || state.defaultEncoding;
       if (addToFront && state.encoding && state.encoding !== encoding) {
         // When unshifting, if state.encoding is set, we have to save
@@ -288,54 +289,45 @@ function readableAddChunk(stream, chunk, encoding, addToFront) {
         chunk = Buffer.from(chunk, encoding);
         encoding = '';
       }
-      skipChunkCheck = true;
+    } else if (Stream._isUint8Array(chunk)) {
+      chunk = Stream._uint8ArrayToBuffer(chunk);
+      encoding = '';
+    } else if (chunk != null) {
+      err = new ERR_INVALID_ARG_TYPE(
+        'chunk', ['string', 'Buffer', 'Uint8Array'], chunk);
     }
-  } else {
-    skipChunkCheck = true;
   }
 
-  if (chunk === null) {
+  if (err) {
+    errorOrDestroy(stream, err);
+  } else if (chunk === null) {
     state.reading = false;
     onEofChunk(stream, state);
-  } else {
-    var er;
-    if (!skipChunkCheck)
-      er = chunkInvalid(state, chunk);
-    if (er) {
-      errorOrDestroy(stream, er);
-    } else if (state.objectMode || (chunk && chunk.length > 0)) {
-      if (typeof chunk !== 'string' &&
-          !state.objectMode &&
-          // Do not use Object.getPrototypeOf as it is slower since V8 7.3.
-          !(chunk instanceof Buffer)) {
-        chunk = Stream._uint8ArrayToBuffer(chunk);
-      }
-
-      if (addToFront) {
-        if (state.endEmitted)
-          errorOrDestroy(stream, new ERR_STREAM_UNSHIFT_AFTER_END_EVENT());
+  } else if (state.objectMode || (chunk && chunk.length > 0)) {
+    if (addToFront) {
+      if (state.endEmitted)
+        errorOrDestroy(stream, new ERR_STREAM_UNSHIFT_AFTER_END_EVENT());
+      else
+        addChunk(stream, state, chunk, true);
+    } else if (state.ended) {
+      errorOrDestroy(stream, new ERR_STREAM_PUSH_AFTER_EOF());
+    } else if (state.destroyed) {
+      return false;
+    } else {
+      state.reading = false;
+      if (state.decoder && !encoding) {
+        chunk = state.decoder.write(chunk);
+        if (state.objectMode || chunk.length !== 0)
+          addChunk(stream, state, chunk, false);
         else
-          addChunk(stream, state, chunk, true);
-      } else if (state.ended) {
-        errorOrDestroy(stream, new ERR_STREAM_PUSH_AFTER_EOF());
-      } else if (state.destroyed) {
-        return false;
+          maybeReadMore(stream, state);
       } else {
-        state.reading = false;
-        if (state.decoder && !encoding) {
-          chunk = state.decoder.write(chunk);
-          if (state.objectMode || chunk.length !== 0)
-            addChunk(stream, state, chunk, false);
-          else
-            maybeReadMore(stream, state);
-        } else {
-          addChunk(stream, state, chunk, false);
-        }
+        addChunk(stream, state, chunk, false);
       }
-    } else if (!addToFront) {
-      state.reading = false;
-      maybeReadMore(stream, state);
     }
+  } else if (!addToFront) {
+    state.reading = false;
+    maybeReadMore(stream, state);
   }
 
   // We can push more data if we are below the highWaterMark.
@@ -369,17 +361,6 @@ function addChunk(stream, state, chunk, addToFront) {
   maybeReadMore(stream, state);
 }
 
-function chunkInvalid(state, chunk) {
-  if (!Stream._isUint8Array(chunk) &&
-      typeof chunk !== 'string' &&
-      chunk !== undefined &&
-      !state.objectMode) {
-    return new ERR_INVALID_ARG_TYPE(
-      'chunk', ['string', 'Buffer', 'Uint8Array'], chunk);
-  }
-}
-
-
 Readable.prototype.isPaused = function() {
   const state = this._readableState;
   return state[kPaused] === true || state.flowing === false;

From c0112cf6695cd7fe63f1a5aac474df667fae77f9 Mon Sep 17 00:00:00 2001
From: Robert Nagy <ronagy@icloud.com>
Date: Wed, 1 Jan 2020 20:22:53 +0100
Subject: [PATCH 2/2] fixup: typeof before instanceof

---
 lib/_stream_readable.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
index cd3a6b3d1bae31..15a9de095de41e 100644
--- a/lib/_stream_readable.js
+++ b/lib/_stream_readable.js
@@ -277,9 +277,7 @@ function readableAddChunk(stream, chunk, encoding, addToFront) {
 
   let err;
   if (!state.objectMode) {
-    if (chunk instanceof Buffer) {
-      encoding = '';
-    } else if (typeof chunk === 'string') {
+    if (typeof chunk === 'string') {
       encoding = encoding || state.defaultEncoding;
       if (addToFront && state.encoding && state.encoding !== encoding) {
         // When unshifting, if state.encoding is set, we have to save
@@ -289,6 +287,8 @@ function readableAddChunk(stream, chunk, encoding, addToFront) {
         chunk = Buffer.from(chunk, encoding);
         encoding = '';
       }
+    } else if (chunk instanceof Buffer) {
+      encoding = '';
     } else if (Stream._isUint8Array(chunk)) {
       chunk = Stream._uint8ArrayToBuffer(chunk);
       encoding = '';