From 20a7d877aa9826f18dcf45afa321b53b7f1b20b2 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 20 May 2026 19:22:54 +0200 Subject: [PATCH 1/3] fix(core): simplify `addAbortListener` util --- lib/core/util.js | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/lib/core/util.js b/lib/core/util.js index 98337c596c7..ea1724a5456 100644 --- a/lib/core/util.js +++ b/lib/core/util.js @@ -698,17 +698,7 @@ function isFormDataLike (object) { } function addAbortListener (signal, listener) { - if (signal instanceof AbortSignal) { - const disposable = addAbortListenerNative(signal, listener) - return () => disposable[Symbol.dispose]() - } - - if (typeof signal.addEventListener === 'function') { - signal.addEventListener('abort', listener, { once: true }) - return () => signal.removeEventListener('abort', listener) - } - signal.once('abort', listener) - return () => signal.removeListener('abort', listener) + return addAbortListenerNative(signal, listener)[Symbol.dispose] } const validTokenChars = new Uint8Array([ From 12b8fbb4dd696c0f908838a0be951a2e69e8da30 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 21 May 2026 15:05:59 +0200 Subject: [PATCH 2/3] fixup! fix(core): simplify `addAbortListener` util --- lib/core/util.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/core/util.js b/lib/core/util.js index ea1724a5456..85c7a8a2893 100644 --- a/lib/core/util.js +++ b/lib/core/util.js @@ -698,7 +698,16 @@ function isFormDataLike (object) { } function addAbortListener (signal, listener) { - return addAbortListenerNative(signal, listener)[Symbol.dispose] + if (!signal || 'aborted' in signal) { + return addAbortListenerNative(signal, listener)[Symbol.dispose] + } + + if (typeof signal.addEventListener === 'function') { + signal.addEventListener('abort', listener, { once: true }) + } else { + signal.once('abort', listener) + } + return () => signal.removeListener('abort', listener) } const validTokenChars = new Uint8Array([ From c4e92a5d963ece75c55a07b99d1190af2636b80e Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 21 May 2026 15:34:20 +0200 Subject: [PATCH 3/3] fixup! fixup! fix(core): simplify `addAbortListener` util --- lib/core/util.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/core/util.js b/lib/core/util.js index 85c7a8a2893..23e94651562 100644 --- a/lib/core/util.js +++ b/lib/core/util.js @@ -704,9 +704,9 @@ function addAbortListener (signal, listener) { if (typeof signal.addEventListener === 'function') { signal.addEventListener('abort', listener, { once: true }) - } else { - signal.once('abort', listener) + return () => signal.removeEventListener('abort', listener) } + signal.once('abort', listener) return () => signal.removeListener('abort', listener) }