stream: simplify push

PR-URL: #31150 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>

Author: ronag

lib/_stream_readable.js

@@ -218,8 +218,7 @@ function readableAddChunk(stream, chunk, encoding, addToFront){
 debug('readableAddChunk',chunk);
 conststate=stream._readableState;
 
-letskipChunkCheck;
-
+leterr;
 if(!state.objectMode){
 if(typeofchunk==='string'){
 encoding=encoding||state.defaultEncoding;
@@ -231,54 +230,47 @@ function readableAddChunk(stream, chunk, encoding, addToFront){
 chunk=Buffer.from(chunk,encoding);
 encoding='';
 }
-skipChunkCheck=true;
+}elseif(chunkinstanceofBuffer){
+encoding='';
+}elseif(Stream._isUint8Array(chunk)){
+chunk=Stream._uint8ArrayToBuffer(chunk);
+encoding='';
+}elseif(chunk!=null){
+err=newERR_INVALID_ARG_TYPE(
+'chunk',['string','Buffer','Uint8Array'],chunk);
 }
-}else{
-skipChunkCheck=true;
 }
 
-if(chunk===null){
+if(err){
+errorOrDestroy(stream,err);
+}elseif(chunk===null){
 state.reading=false;
 onEofChunk(stream,state);
-}else{
-varer;
-if(!skipChunkCheck)
-er=chunkInvalid(state,chunk);
-if(er){
-errorOrDestroy(stream,er);
-}elseif(state.objectMode||(chunk&&chunk.length>0)){
-if(typeofchunk!=='string'&&
-!state.objectMode&&
-// Do not use Object.getPrototypeOf as it is slower since V8 7.3.
-!(chunkinstanceofBuffer)){
-chunk=Stream._uint8ArrayToBuffer(chunk);
-}
-
-if(addToFront){
-if(state.endEmitted)
-errorOrDestroy(stream,newERR_STREAM_UNSHIFT_AFTER_END_EVENT());
+}elseif(state.objectMode||(chunk&&chunk.length>0)){
+if(addToFront){
+if(state.endEmitted)
+errorOrDestroy(stream,newERR_STREAM_UNSHIFT_AFTER_END_EVENT());
+else
+addChunk(stream,state,chunk,true);
+}elseif(state.ended){
+errorOrDestroy(stream,newERR_STREAM_PUSH_AFTER_EOF());
+}elseif(state.destroyed){
+returnfalse;
+}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);
-}elseif(state.ended){
-errorOrDestroy(stream,newERR_STREAM_PUSH_AFTER_EOF());
-}elseif(state.destroyed){
-returnfalse;
+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);
 }
-}elseif(!addToFront){
-state.reading=false;
-maybeReadMore(stream,state);
 }
+}elseif(!addToFront){
+state.reading=false;
+maybeReadMore(stream,state);
 }
 
 // We can push more data if we are below the highWaterMark.
@@ -306,17 +298,6 @@ function addChunk(stream, state, chunk, addToFront){
 maybeReadMore(stream,state);
 }
 
-functionchunkInvalid(state,chunk){
-if(!Stream._isUint8Array(chunk)&&
-typeofchunk!=='string'&&
-chunk!==undefined&&
-!state.objectMode){
-returnnewERR_INVALID_ARG_TYPE(
-'chunk',['string','Buffer','Uint8Array'],chunk);
-}
-}
-
-
 Readable.prototype.isPaused=function(){
 conststate=this._readableState;
 returnstate[kPaused]===true||state.flowing===false;