fs: propagate abortsignal reason in new AbortSignal 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 · 6eda874 · 6eda874
1 parent 4b3bf7e
commit 6eda874
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/lib/fs.js b/lib/fs.js
@@ -350,7 +350,7 @@ function readFileAfterStat(err, stats) {
 
 function checkAborted(signal, callback) {
   if (signal?.aborted) {
-    callback(new AbortError());
+    callback(new AbortError(undefined, { cause: signal?.reason }));
     return true;
   }
   return false;
@@ -2050,7 +2050,7 @@ function lutimesSync(path, atime, mtime) {
 
 function writeAll(fd, isUserFd, buffer, offset, length, signal, callback) {
   if (signal?.aborted) {
-    const abortError = new AbortError();
+    const abortError = new AbortError(undefined, { cause: signal?.reason });
     if (isUserFd) {
       callback(abortError);
     } else {

diff --git a/lib/internal/fs/promises.js b/lib/internal/fs/promises.js
@@ -370,7 +370,7 @@ async function fsCall(fn, handle, ...args) {
 
 function checkAborted(signal) {
   if (signal?.aborted)
-    throw new AbortError();
+    throw new AbortError(undefined, { cause: signal?.reason });
 }
 
 async function writeFileHandle(filehandle, data, signal, encoding) {

diff --git a/lib/internal/fs/read_file_context.js b/lib/internal/fs/read_file_context.js
@@ -88,7 +88,8 @@ class ReadFileContext {
     let length;
 
     if (this.signal?.aborted) {
-      return this.close(new AbortError());
+      return this.close(
+        new AbortError(undefined, { cause: this.signal?.reason }));
     }
     if (this.size === 0) {
       buffer = Buffer.allocUnsafeSlow(kReadFileUnknownBufferLength);

diff --git a/lib/internal/fs/watchers.js b/lib/internal/fs/watchers.js
@@ -316,13 +316,13 @@ async function* watch(filename, options = {}) {
   }
 
   if (signal?.aborted)
-    throw new AbortError();
+    throw new AbortError(undefined, { cause: signal?.reason });
 
   const handle = new FSEvent();
   let { promise, resolve, reject } = createDeferredPromise();
   const oncancel = () => {
     handle.close();
-    reject(new AbortError());
+    reject(new AbortError(undefined, { cause: signal?.reason }));
   };
 
   try {
@@ -361,7 +361,7 @@ async function* watch(filename, options = {}) {
       yield await promise;
       ({ promise, resolve, reject } = createDeferredPromise());
     }
-    throw new AbortError();
+    throw new AbortError(undefined, { cause: signal?.reason });
   } finally {
     handle.close();
     signal?.removeEventListener('abort', oncancel);