stream: use cause options in AbortError constructors

Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #41008 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Robert Nagy <ronagy@icloud.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
nodejs · Dec 13, 2021 · 01e8c15 · 01e8c15
1 parent 67124ac
commit 01e8c15
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/lib/internal/streams/add-abort-signal.js b/lib/internal/streams/add-abort-signal.js
@@ -34,7 +34,7 @@ module.exports.addAbortSignalNoValidate = function(signal, stream) {
     return stream;
   }
   const onAbort = () => {
-    stream.destroy(new AbortError());
+    stream.destroy(new AbortError(undefined, { cause: signal.reason }));
   };
   if (signal.aborted) {
     onAbort();

diff --git a/lib/internal/streams/duplexify.js b/lib/internal/streams/duplexify.js
@@ -214,7 +214,8 @@ function fromAsyncGen(fn) {
       const { chunk, done, cb } = await _promise;
       process.nextTick(cb);
       if (done) return;
-      if (signal.aborted) throw new AbortError();
+      if (signal.aborted)
+        throw new AbortError(undefined, { cause: signal.reason });
       ({ promise, resolve } = createDeferredPromise());
       yield chunk;
     }

diff --git a/lib/internal/streams/end-of-stream.js b/lib/internal/streams/end-of-stream.js
@@ -215,7 +215,9 @@ function eos(stream, options, callback) {
       // Keep it because cleanup removes it.
       const endCallback = callback;
       cleanup();
-      endCallback.call(stream, new AbortError());
+      endCallback.call(
+        stream,
+        new AbortError(undefined, { cause: options.signal.reason }));
     };
     if (options.signal.aborted) {
       process.nextTick(abort);

diff --git a/lib/internal/webstreams/adapters.js b/lib/internal/webstreams/adapters.js
@@ -122,8 +122,7 @@ function newWritableStreamFromStreamWritable(streamWritable) {
 
   const cleanup = finished(streamWritable, (error) => {
     if (error?.code === 'ERR_STREAM_PREMATURE_CLOSE') {
-      const err = new AbortError();
-      err.cause = error;
+      const err = new AbortError(undefined, { cause: error });
       error = err;
     }
 
@@ -403,8 +402,7 @@ function newReadableStreamFromStreamReadable(streamReadable) {
 
   const cleanup = finished(streamReadable, (error) => {
     if (error?.code === 'ERR_STREAM_PREMATURE_CLOSE') {
-      const err = new AbortError();
-      err.cause = error;
+      const err = new AbortError(undefined, { cause: error });
       error = err;
     }