Skip to content

Commit ef1cca4

Browse files
ronagdanielleadams
authored andcommitted
stream: avoid premature close when will not emit close
Fixes: #45281 PR-URL: #45301 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Minwoo Jung <[email protected]>
1 parent 62447e7 commit ef1cca4

File tree

2 files changed

+30
-4
lines changed

2 files changed

+30
-4
lines changed

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,18 @@ function eos(stream, options, callback){
151151
callback.call(stream);
152152
};
153153

154+
constonclosed=()=>{
155+
closed=true;
156+
157+
consterrored=isWritableErrored(stream)||isReadableErrored(stream);
158+
159+
if(errored&&typeoferrored!=='boolean'){
160+
returncallback.call(stream,errored);
161+
}
162+
163+
callback.call(stream);
164+
};
165+
154166
constonrequest=()=>{
155167
stream.req.on('finish',onfinish);
156168
};
@@ -186,22 +198,22 @@ function eos(stream, options, callback){
186198
process.nextTick(onclose);
187199
}elseif(wState?.errorEmitted||rState?.errorEmitted){
188200
if(!willEmitClose){
189-
process.nextTick(onclose);
201+
process.nextTick(onclosed);
190202
}
191203
}elseif(
192204
!readable&&
193205
(!willEmitClose||isReadable(stream))&&
194206
(writableFinished||isWritable(stream)===false)
195207
){
196-
process.nextTick(onclose);
208+
process.nextTick(onclosed);
197209
}elseif(
198210
!writable&&
199211
(!willEmitClose||isWritable(stream))&&
200212
(readableFinished||isReadable(stream)===false)
201213
){
202-
process.nextTick(onclose);
214+
process.nextTick(onclosed);
203215
}elseif((rState&&stream.req&&stream.aborted)){
204-
process.nextTick(onclose);
216+
process.nextTick(onclosed);
205217
}
206218

207219
constcleanup=()=>{

‎test/parallel/test-stream-finished.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -667,3 +667,17 @@ testClosed((opts) => new Writable({write(){}, ...opts }));
667667
).end();
668668
});
669669
}
670+
671+
{
672+
conststream=newDuplex({
673+
write(chunk,enc,cb){
674+
setImmediate(cb);
675+
}
676+
});
677+
678+
stream.end('foo');
679+
680+
finished(stream,{readable: false},common.mustCall((err)=>{
681+
assert(!err);
682+
}));
683+
}

0 commit comments

Comments
(0)