fix(area): detach a lookup's abort listener once it settles

Each resolve() that raced the caller's signal added an abort listener and
never removed it, so a long-lived signal collected one listener per
completed lookup. The listener is now removed when the call settles and
is not added at all to a signal that is already aborted.
This commit is contained in:
Sameh Khamis committed 2026-11-03 09:16:52 -08:00
1 parent 3d2896cf27
commit 16b383ab6f
2 files changed
+43 -8

No files matched your search

+13 -8
View File
@@ -626,24 +626,29 @@ export function createAreaResolver({
);
}),
);
// Detached once this call settles: a caller's long-lived signal must not
// collect one listener per completed lookup.
let cancelled = null;
if (signal)
racers.push(
new Promise((resolveAbort) => {
const cancelled = () =>
resolveAbort({
ok: false,
code: 'CANCELLED',
cancelled: true,
error: 'Superseded.',
});
if (signal.aborted) cancelled();
const superseded = {
ok: false,
code: 'CANCELLED',
cancelled: true,
error: 'Superseded.',
};
if (signal.aborted) return resolveAbort(superseded);
cancelled = () => resolveAbort(superseded);
signal.addEventListener?.('abort', cancelled, { once: true });
return undefined;
}),
);
try {
return finish(await Promise.race(racers));
} finally {
clearTimeout(timer);
if (cancelled) signal.removeEventListener?.('abort', cancelled);
}
}