Skip to content

Commit ce696ef

Browse files
jasnelltargos
authored andcommitted
events: propagate abortsignal reason in new AbortError ctor in events
Signed-off-by: James M Snell <[email protected]> PR-URL: #41008 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Robert Nagy <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]>
1 parent 4462f1a commit ce696ef

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lib/events.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,7 @@ async function once(emitter, name, options = kEmptyObject) {
928928
const signal = options?.signal;
929929
validateAbortSignal(signal, 'options.signal');
930930
if (signal?.aborted)
931-
throw new AbortError();
931+
throw new AbortError(undefined, { cause: signal?.reason });
932932
return new Promise((resolve, reject) => {
933933
const errorListener = (err) => {
934934
emitter.removeListener(name, resolver);
@@ -955,7 +955,7 @@ async function once(emitter, name, options = kEmptyObject) {
955955
function abortListener() {
956956
eventTargetAgnosticRemoveListener(emitter, name, resolver);
957957
eventTargetAgnosticRemoveListener(emitter, 'error', errorListener);
958-
reject(new AbortError());
958+
reject(new AbortError(undefined, { cause: signal?.reason }));
959959
}
960960
if (signal != null) {
961961
eventTargetAgnosticAddListener(
@@ -1006,7 +1006,7 @@ function on(emitter, event, options) {
10061006
const signal = options?.signal;
10071007
validateAbortSignal(signal, 'options.signal');
10081008
if (signal?.aborted)
1009-
throw new AbortError();
1009+
throw new AbortError(undefined, { cause: signal?.reason });
10101010

10111011
const unconsumedEvents = [];
10121012
const unconsumedPromises = [];
@@ -1094,7 +1094,7 @@ function on(emitter, event, options) {
10941094
return iterator;
10951095

10961096
function abortListener() {
1097-
errorHandler(new AbortError());
1097+
errorHandler(new AbortError(undefined, { cause: signal?.reason }));
10981098
}
10991099

11001100
function eventHandler(...args) {

0 commit comments

Comments
 (0)