diff --git a/lib/internal/streams/end-of-stream.js b/lib/internal/streams/end-of-stream.js index 877db6fbe1cb34..d6e1c5804eaf4a 100644 --- a/lib/internal/streams/end-of-stream.js +++ b/lib/internal/streams/end-of-stream.js @@ -25,6 +25,13 @@ function isWritable(stream) { !!stream._writableState; } +function isWritableFinished(stream) { + if (stream.writableFinished) return true; + const wState = stream._writableState; + if (!wState || wState.errored) return false; + return wState.finished || (wState.ended && wState.length === 0); +} + function eos(stream, opts, callback) { if (arguments.length === 2) { callback = opts; @@ -49,10 +56,11 @@ function eos(stream, opts, callback) { if (!stream.writable) onfinish(); }; - let writableEnded = stream._writableState && stream._writableState.finished; + let writableFinished = stream.writableFinished || + (stream._writableState && stream._writableState.finished); const onfinish = () => { writable = false; - writableEnded = true; + writableFinished = true; if (!readable) callback.call(stream); }; @@ -75,8 +83,8 @@ function eos(stream, opts, callback) { err = new ERR_STREAM_PREMATURE_CLOSE(); return callback.call(stream, err); } - if (writable && !writableEnded) { - if (!stream._writableState || !stream._writableState.ended) + if (writable && !writableFinished) { + if (!isWritableFinished(stream)) err = new ERR_STREAM_PREMATURE_CLOSE(); return callback.call(stream, err); } diff --git a/test/parallel/test-stream-finished.js b/test/parallel/test-stream-finished.js index 5b26349d7476e2..f6515a01b8d077 100644 --- a/test/parallel/test-stream-finished.js +++ b/test/parallel/test-stream-finished.js @@ -202,3 +202,16 @@ const { promisify } = require('util'); assert.strictEqual(err.code, 'ERR_STREAM_PREMATURE_CLOSE'); })); } + +{ + const w = new Writable({ + write(chunk, encoding, callback) { + setImmediate(callback); + } + }); + finished(w, common.mustCall((err) => { + assert.strictEqual(err.code, 'ERR_STREAM_PREMATURE_CLOSE'); + })); + w.end('asd'); + w.destroy(); +}