events: propagate abortsignal reason in new AbortError ctor in events · nodejs/node@37dbc3b · GitHub

nodejs / node Public

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

• Code
• Issues 635
• Pull requests 755
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 37dbc3b

Browse filesBrowse the repository at this point in the historyBrowse files

jasnell

authored and

danielleadams

committed

events: propagate abortsignal reason in new AbortError ctor in events

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 a1ed7f2 commit 37dbc3b
Copy full SHA for 37dbc3b

1 file changed

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

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib
  • events.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/events.js‎

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

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

Original file line number	Diff line number	Diff line change
@@ -810,7 +810,7 @@ async function once(emitter, name, options = {}) {
810	810	const signal = options?.signal;
811	811	validateAbortSignal(signal, 'options.signal');
812	812	if (signal?.aborted)
813		- throw new AbortError();
	813	+ throw new AbortError(undefined, { cause: signal?.reason });
814	814	return new Promise((resolve, reject) => {
815	815	const errorListener = (err) => {
816	816	emitter.removeListener(name, resolver);
@@ -835,7 +835,7 @@ async function once(emitter, name, options = {}) {
835	835	function abortListener() {
836	836	eventTargetAgnosticRemoveListener(emitter, name, resolver);
837	837	eventTargetAgnosticRemoveListener(emitter, 'error', errorListener);
838		- reject(new AbortError());
	838	+ reject(new AbortError(undefined, { cause: signal?.reason }));
839	839	}
840	840	if (signal != null) {
841	841	eventTargetAgnosticAddListener(
@@ -888,7 +888,7 @@ function on(emitter, event, options) {
888	888	const signal = options?.signal;
889	889	validateAbortSignal(signal, 'options.signal');
890	890	if (signal?.aborted)
891		- throw new AbortError();
	891	+ throw new AbortError(undefined, { cause: signal?.reason });
892	892
893	893	const unconsumedEvents = [];
894	894	const unconsumedPromises = [];
@@ -976,7 +976,7 @@ function on(emitter, event, options) {
976	976	return iterator;
977	977
978	978	function abortListener() {
979		- errorHandler(new AbortError());
	979	+ errorHandler(new AbortError(undefined, { cause: signal?.reason }));
980	980	}
981	981
982	982	function eventHandler(...args) {

0 commit comments

Comments

0 (0)