fs: propagate abortsignal reason in new AbortSignal constructors

jasnell · targos · commit e04c8a4921d3 · 2022-08-01T16:48:37.000+02:00
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>
diff --git a/lib/fs.js b/lib/fs.js
@@ -359,7 +359,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;
@@ -2104,7 +2104,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
@@ -324,7 +324,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
@@ -317,13 +317,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{
@@ -362,7 +362,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);

-Original file line number
+Diff line change
 functioncheckAborted(signal,callback){
 if(signal?.aborted){
 -callback(newAbortError());
 +callback(newAbortError(undefined,{cause: signal?.reason}));
 returntrue;
+}
 returnfalse;
 functionwriteAll(fd,isUserFd,buffer,offset,length,signal,callback){
 if(signal?.aborted){
 -constabortError=newAbortError();
 +constabortError=newAbortError(undefined,{cause: signal?.reason});
 if(isUserFd){
 callback(abortError);
 }else{
Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ async function fsCall(fn, handle, ...args){`
`324`	`324`
`325`	`325`	`functioncheckAborted(signal){`
`326`	`326`	`if(signal?.aborted)`
`327`		`-thrownewAbortError();`
	`327`	`+thrownewAbortError(undefined,{cause: signal?.reason});`
`328`	`328`	`}`
`329`	`329`
`330`	`330`	`asyncfunctionwriteFileHandle(filehandle,data,signal,encoding){`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,8 @@ class ReadFileContext{`
`88`	`88`	`letlength;`
`89`	`89`
`90`	`90`	`if(this.signal?.aborted){`
`91`		`-returnthis.close(newAbortError());`
	`91`	`+returnthis.close(`
	`92`	`+newAbortError(undefined,{cause: this.signal?.reason}));`
`92`	`93`	`}`
`93`	`94`	`if(this.size===0){`
`94`	`95`	`buffer=Buffer.allocUnsafeSlow(kReadFileUnknownBufferLength);`
-Original file line number
+Diff line change
+}
 if(signal?.aborted)
 -thrownewAbortError();
 +thrownewAbortError(undefined,{cause: signal?.reason});
 consthandle=newFSEvent();
 let{ promise, resolve, reject }=createDeferredPromise();
 constoncancel=()=>{
 handle.close();
 -reject(newAbortError());
 +reject(newAbortError(undefined,{cause: signal?.reason}));
 };
 try{
 yieldawaitpromise;
 ({ promise, resolve, reject }=createDeferredPromise());
+}
 -thrownewAbortError();
 +thrownewAbortError(undefined,{cause: signal?.reason});
 }finally{
 handle.close();
 signal?.removeEventListener('abort',oncancel);