fs: propagate abortsignal reason in new AbortSignal constructors · nodejs/node@6eda874 · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 633
• Pull requests 757
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 6eda874

Browse filesBrowse the repository at this point in the historyBrowse files

jasnell

authored and

danielleadams

committed

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>

1 parent 4b3bf7e commit 6eda874
Copy full SHA for 6eda874

4 files changed

+8-7Lines changed: 8 additions & 7 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib
  • fs.js
  • internal/fs
    • promises.js
    • read_file_context.js
    • watchers.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/fs.js‎

Copy file name to clipboardExpand all lines: lib/fs.js

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -350,7 +350,7 @@ function readFileAfterStat(err, stats) {
350	350
351	351	function checkAborted(signal, callback) {
352	352	if (signal?.aborted) {
353		- callback(new AbortError());
	353	+ callback(new AbortError(undefined, { cause: signal?.reason }));
354	354	return true;
355	355	}
356	356	return false;
@@ -2050,7 +2050,7 @@ function lutimesSync(path, atime, mtime) {
2050	2050
2051	2051	function writeAll(fd, isUserFd, buffer, offset, length, signal, callback) {
2052	2052	if (signal?.aborted) {
2053		- const abortError = new AbortError();
	2053	+ const abortError = new AbortError(undefined, { cause: signal?.reason });
2054	2054	if (isUserFd) {
2055	2055	callback(abortError);
2056	2056	} else {

Collapse file

‎lib/internal/fs/promises.js‎

Copy file name to clipboardExpand all lines: lib/internal/fs/promises.js

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -370,7 +370,7 @@ async function fsCall(fn, handle, ...args) {
370	370
371	371	function checkAborted(signal) {
372	372	if (signal?.aborted)
373		- throw new AbortError();
	373	+ throw new AbortError(undefined, { cause: signal?.reason });
374	374	}
375	375
376	376	async function writeFileHandle(filehandle, data, signal, encoding) {

Collapse file

‎lib/internal/fs/read_file_context.js‎

Copy file name to clipboardExpand all lines: lib/internal/fs/read_file_context.js

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -88,7 +88,8 @@ class ReadFileContext {
88	88	let length;
89	89
90	90	if (this.signal?.aborted) {
91		- return this.close(new AbortError());
	91	+ return this.close(
	92	+ new AbortError(undefined, { cause: this.signal?.reason }));
92	93	}
93	94	if (this.size === 0) {
94	95	buffer = Buffer.allocUnsafeSlow(kReadFileUnknownBufferLength);

Collapse file

‎lib/internal/fs/watchers.js‎

Copy file name to clipboardExpand all lines: lib/internal/fs/watchers.js

+3-3Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -316,13 +316,13 @@ async function* watch(filename, options = {}) {
316	316	}
317	317
318	318	if (signal?.aborted)
319		- throw new AbortError();
	319	+ throw new AbortError(undefined, { cause: signal?.reason });
320	320
321	321	const handle = new FSEvent();
322	322	let { promise, resolve, reject } = createDeferredPromise();
323	323	const oncancel = () => {
324	324	handle.close();
325		- reject(new AbortError());
	325	+ reject(new AbortError(undefined, { cause: signal?.reason }));
326	326	};
327	327
328	328	try {
@@ -361,7 +361,7 @@ async function* watch(filename, options = {}) {
361	361	yield await promise;
362	362	({ promise, resolve, reject } = createDeferredPromise());
363	363	}
364		- throw new AbortError();
	364	+ throw new AbortError(undefined, { cause: signal?.reason });
365	365	} finally {
366	366	handle.close();
367	367	signal?.removeEventListener('abort', oncancel);

0 commit comments

Comments

0 (0)