stream: forward errored to callback

Refs: #39356
nodejs · Jul 12, 2021 · 2f9bc11 · 2f9bc11
1 parent de85b1e
commit 2f9bc11
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/lib/internal/streams/writable.js b/lib/internal/streams/writable.js
@@ -514,12 +514,12 @@ function errorBuffer(state) {
  const { chunk, callback } = state.buffered[n];
  const len = state.objectMode ? 1 : chunk.length;
  state.length -= len;
- callback(new ERR_STREAM_DESTROYED('write'));
+ callback(state.errored ?? new ERR_STREAM_DESTROYED('write'));
  }
 
  const onfinishCallbacks = state[kOnFinished].splice(0);
  for (let i = 0; i < onfinishCallbacks.length; i++) {
- onfinishCallbacks[i](new ERR_STREAM_DESTROYED('end'));
+ onfinishCallbacks[i](state.errored ?? new ERR_STREAM_DESTROYED('end'));
  }
 
  resetBuffer(state);

diff --git a/test/parallel/test-stream-writable-destroy.js b/test/parallel/test-stream-writable-destroy.js
@@ -471,3 +471,16 @@ const assert = require('assert');
  write.destroy();
  write.destroy();
 }
+
+{
+ // https://github.com/nodejs/node/issues/39356
+ const s = new Writable({
+ final() {}
+ });
+ const _err = new Error('oh no');
+ // Remove `callback` and it works
+ s.end(common.mustCall((err) => {
+ assert.strictEqual(err, _err);
+ }));
+ s.destroy(_err);
+}
diff --git a/test/parallel/test-stream-writable-end-cb-uncaught.js b/test/parallel/test-stream-writable-end-cb-uncaught.js
@@ -9,15 +9,16 @@ process.on('uncaughtException', common.mustCall((err) => {
 }));
 
 const writable = new stream.Writable();
+const _err = new Error('kaboom');
 
 writable._write = (chunk, encoding, cb) => {
  cb();
 };
 writable._final = (cb) => {
- cb(new Error('kaboom'));
+ cb(_err);
 };
 
 writable.write('asd');
 writable.end(common.mustCall((err) => {
- assert.strictEqual(err.code, 'ERR_STREAM_DESTROYED');
+ assert.strictEqual(err, _err);
 }));