From d82d5e5a2a9f079e8fc615098025ec8e23d41efc Mon Sep 17 00:00:00 2001 From: Marve10s Date: Sun, 25 Oct 2026 21:55:31 +0300 Subject: [PATCH 1/2] Preserve AbortSignal.any cancellation before source listeners run --- .../webapis/dom/abort-api/AbortSignal.js | 81 +++++++++++++++--- .../__tests__/AbortController-itest.js | 14 ++-- .../__tests__/AbortSignal-any-test.js | 82 +++++++++++++++++++ 3 files changed, 159 insertions(+), 18 deletions(-) create mode 100644 packages/react-native/src/private/webapis/dom/abort-api/__tests__/AbortSignal-any-test.js diff --git a/packages/react-native/src/private/webapis/dom/abort-api/AbortSignal.js b/packages/react-native/src/private/webapis/dom/abort-api/AbortSignal.js index 7fc6e66616d2..fe1ac6388055 100644 --- a/packages/react-native/src/private/webapis/dom/abort-api/AbortSignal.js +++ b/packages/react-native/src/private/webapis/dom/abort-api/AbortSignal.js @@ -42,6 +42,12 @@ import {AbortController} from './AbortController'; const ABORTED_KEY = Symbol('aborted'); const REASON_KEY = Symbol('reason'); +const dependentSignals: WeakMap> = new WeakMap(); +const sourceSignalRefs: WeakMap< + AbortSignal, + ReadonlyArray>, +> = new WeakMap(); + /** * The signal class. * @see https://dom.spec.whatwg.org/#abortsignal @@ -111,22 +117,37 @@ export class AbortSignal extends EventTarget { } } - // Third pass: none of the signals is aborted, so subscribe to all of them - // and abort the resulting signal when any of them aborts. - const controller = new AbortController(); - const listeners = []; - const cleanup = () => listeners.forEach(unsubscribe => unsubscribe()); + const resultSignal = createAbortSignal(); + const resultSources: Set = new Set(); for (let i = 0; i < signals.length; i++) { const signal = signals[i]; - const onAbort = () => { - controller.abort(signal.reason); - cleanup(); - }; - signal.addEventListener('abort', onAbort); - listeners.push(() => signal.removeEventListener('abort', onAbort)); + const sourceRefs = sourceSignalRefs.get(signal); + if (sourceRefs == null) { + resultSources.add(signal); + } else { + for (const sourceRef of sourceRefs) { + const sourceSignal = sourceRef.deref(); + if (sourceSignal != null) { + resultSources.add(sourceSignal); + } + } + } } - return controller.signal; + + const resultSourceRefs: Array> = []; + for (const sourceSignal of resultSources) { + let dependents = dependentSignals.get(sourceSignal); + if (dependents == null) { + dependents = new Set(); + dependentSignals.set(sourceSignal, dependents); + } + dependents.add(resultSignal); + resultSourceRefs.push(new WeakRef(sourceSignal)); + } + sourceSignalRefs.set(resultSignal, resultSourceRefs); + + return resultSignal; } [ABORTED_KEY]: boolean = false; @@ -193,7 +214,43 @@ export function abortSignal( } signal[ABORTED_KEY] = true; signal[REASON_KEY] = reason; + + const dependentSignalsToAbort: Array = []; + const dependents = dependentSignals.get(signal); + if (dependents != null) { + dependentSignals.delete(signal); + for (const dependentSignal of dependents) { + // $FlowExpectedError[invalid-compare] + // $FlowExpectedError[prop-missing] + if (dependentSignal[ABORTED_KEY] === false) { + // $FlowExpectedError[prop-missing] + dependentSignal[ABORTED_KEY] = true; + // $FlowExpectedError[prop-missing] + dependentSignal[REASON_KEY] = reason; + unregisterDependentSignal(dependentSignal); + dependentSignalsToAbort.push(dependentSignal); + } + } + } + dispatchTrustedEvent(signal, new Event('abort')); + for (const dependentSignal of dependentSignalsToAbort) { + dispatchTrustedEvent(dependentSignal, new Event('abort')); + } +} + +function unregisterDependentSignal(dependentSignal: AbortSignal): void { + const sourceRefs = sourceSignalRefs.get(dependentSignal); + if (sourceRefs == null) { + return; + } + sourceSignalRefs.delete(dependentSignal); + for (const sourceRef of sourceRefs) { + const sourceSignal = sourceRef.deref(); + if (sourceSignal != null) { + dependentSignals.get(sourceSignal)?.delete(dependentSignal); + } + } } // Properties should be enumerable. diff --git a/packages/react-native/src/private/webapis/dom/abort-api/__tests__/AbortController-itest.js b/packages/react-native/src/private/webapis/dom/abort-api/__tests__/AbortController-itest.js index 4f2a6dd60a40..435deaf2fad2 100644 --- a/packages/react-native/src/private/webapis/dom/abort-api/__tests__/AbortController-itest.js +++ b/packages/react-native/src/private/webapis/dom/abort-api/__tests__/AbortController-itest.js @@ -340,15 +340,17 @@ describe('AbortController', () => { const second = new AbortController(); const reason = new Error('stop'); - const signal = AbortSignal.any([first.signal, second.signal]); + Fantom.runTask(() => { + const signal = AbortSignal.any([first.signal, second.signal]); - expect(signal).toBeInstanceOf(AbortSignal); - expect(signal.aborted).toBe(false); + expect(signal).toBeInstanceOf(AbortSignal); + expect(signal.aborted).toBe(false); - second.abort(reason); + second.abort(reason); - expect(signal.aborted).toBe(true); - expect(signal.reason).toBe(reason); + expect(signal.aborted).toBe(true); + expect(signal.reason).toBe(reason); + }); }); it('should abort immediately if one of the provided signals is already aborted', () => { diff --git a/packages/react-native/src/private/webapis/dom/abort-api/__tests__/AbortSignal-any-test.js b/packages/react-native/src/private/webapis/dom/abort-api/__tests__/AbortSignal-any-test.js new file mode 100644 index 000000000000..4345b45bbad2 --- /dev/null +++ b/packages/react-native/src/private/webapis/dom/abort-api/__tests__/AbortSignal-any-test.js @@ -0,0 +1,82 @@ +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow strict-local + * @format + */ + +import {AbortController} from '../AbortController'; +import {AbortSignal} from '../AbortSignal'; + +describe('AbortSignal.any', () => { + it('aborts the dependent signal even if a source listener stops propagation', () => { + const source = new AbortController(); + source.signal.addEventListener('abort', event => { + event.stopImmediatePropagation(); + }); + const signal = AbortSignal.any([source.signal]); + + source.abort('cancelled'); + + expect(signal.aborted).toBe(true); + expect(signal.reason).toBe('cancelled'); + }); + + it('marks dependent signals as aborted before dispatching to the source', () => { + const source = new AbortController(); + let observed; + source.signal.addEventListener('abort', () => { + observed = [signal.aborted, signal.reason]; + }); + const signal = AbortSignal.any([source.signal]); + + source.abort('reason'); + + expect(observed).toEqual([true, 'reason']); + }); + + it('dispatches to the source and then to its dependents in creation order', () => { + const first = new AbortController(); + const second = new AbortController(); + const inner = AbortSignal.any([first.signal, second.signal]); + const outer = AbortSignal.any([inner, inner, first.signal]); + const unrelated = AbortSignal.any([second.signal]); + const events: Array = []; + first.signal.addEventListener('abort', () => { + events.push('first'); + }); + inner.addEventListener('abort', () => { + events.push('inner'); + }); + outer.addEventListener('abort', () => { + events.push('outer'); + }); + unrelated.addEventListener('abort', () => { + events.push('unrelated'); + }); + + first.abort('first reason'); + second.abort('second reason'); + + expect(events).toEqual(['first', 'inner', 'outer', 'unrelated']); + expect(outer.reason).toBe('first reason'); + expect(unrelated.reason).toBe('second reason'); + }); + + it('keeps the first reason when a source listener aborts another source', () => { + const first = new AbortController(); + const second = new AbortController(); + first.signal.addEventListener('abort', () => second.abort('second')); + const signal = AbortSignal.any([first.signal, second.signal]); + const listener = jest.fn(); + signal.addEventListener('abort', listener); + + first.abort('first'); + + expect(signal.reason).toBe('first'); + expect(listener).toHaveBeenCalledTimes(1); + }); +}); From 069b4633f867e4a4d0f2d7d244f6fac6a1e60803 Mon Sep 17 00:00:00 2001 From: Marve10s Date: Mon, 16 Nov 2026 17:28:17 +0300 Subject: [PATCH 2/2] Hold AbortSignal.any dependents weakly and move its tests to Fantom --- .../webapis/dom/abort-api/AbortSignal.js | 55 ++++++++----- .../__tests__/AbortController-itest.js | 76 +++++++++++++++++ .../__tests__/AbortSignal-any-test.js | 82 ------------------- 3 files changed, 109 insertions(+), 104 deletions(-) delete mode 100644 packages/react-native/src/private/webapis/dom/abort-api/__tests__/AbortSignal-any-test.js diff --git a/packages/react-native/src/private/webapis/dom/abort-api/AbortSignal.js b/packages/react-native/src/private/webapis/dom/abort-api/AbortSignal.js index fe1ac6388055..19cbb33cc685 100644 --- a/packages/react-native/src/private/webapis/dom/abort-api/AbortSignal.js +++ b/packages/react-native/src/private/webapis/dom/abort-api/AbortSignal.js @@ -42,11 +42,17 @@ import {AbortController} from './AbortController'; const ABORTED_KEY = Symbol('aborted'); const REASON_KEY = Symbol('reason'); -const dependentSignals: WeakMap> = new WeakMap(); -const sourceSignalRefs: WeakMap< +type DependentSignalLinks = { + readonly signalRef: WeakRef, + readonly sourceSignalRefs: ReadonlyArray>, +}; + +const dependentSignalRefs: WeakMap< AbortSignal, - ReadonlyArray>, + Set>, > = new WeakMap(); +const dependentSignalLinks: WeakMap = + new WeakMap(); /** * The signal class. @@ -122,11 +128,11 @@ export class AbortSignal extends EventTarget { for (let i = 0; i < signals.length; i++) { const signal = signals[i]; - const sourceRefs = sourceSignalRefs.get(signal); - if (sourceRefs == null) { + const links = dependentSignalLinks.get(signal); + if (links == null) { resultSources.add(signal); } else { - for (const sourceRef of sourceRefs) { + for (const sourceRef of links.sourceSignalRefs) { const sourceSignal = sourceRef.deref(); if (sourceSignal != null) { resultSources.add(sourceSignal); @@ -135,17 +141,21 @@ export class AbortSignal extends EventTarget { } } + const resultSignalRef = new WeakRef(resultSignal); const resultSourceRefs: Array> = []; for (const sourceSignal of resultSources) { - let dependents = dependentSignals.get(sourceSignal); - if (dependents == null) { - dependents = new Set(); - dependentSignals.set(sourceSignal, dependents); + let dependentRefs = dependentSignalRefs.get(sourceSignal); + if (dependentRefs == null) { + dependentRefs = new Set(); + dependentSignalRefs.set(sourceSignal, dependentRefs); } - dependents.add(resultSignal); + dependentRefs.add(resultSignalRef); resultSourceRefs.push(new WeakRef(sourceSignal)); } - sourceSignalRefs.set(resultSignal, resultSourceRefs); + dependentSignalLinks.set(resultSignal, { + signalRef: resultSignalRef, + sourceSignalRefs: resultSourceRefs, + }); return resultSignal; } @@ -216,13 +226,14 @@ export function abortSignal( signal[REASON_KEY] = reason; const dependentSignalsToAbort: Array = []; - const dependents = dependentSignals.get(signal); - if (dependents != null) { - dependentSignals.delete(signal); - for (const dependentSignal of dependents) { + const dependentRefs = dependentSignalRefs.get(signal); + if (dependentRefs != null) { + dependentSignalRefs.delete(signal); + for (const dependentRef of dependentRefs) { + const dependentSignal = dependentRef.deref(); // $FlowExpectedError[invalid-compare] // $FlowExpectedError[prop-missing] - if (dependentSignal[ABORTED_KEY] === false) { + if (dependentSignal != null && dependentSignal[ABORTED_KEY] === false) { // $FlowExpectedError[prop-missing] dependentSignal[ABORTED_KEY] = true; // $FlowExpectedError[prop-missing] @@ -240,15 +251,15 @@ export function abortSignal( } function unregisterDependentSignal(dependentSignal: AbortSignal): void { - const sourceRefs = sourceSignalRefs.get(dependentSignal); - if (sourceRefs == null) { + const links = dependentSignalLinks.get(dependentSignal); + if (links == null) { return; } - sourceSignalRefs.delete(dependentSignal); - for (const sourceRef of sourceRefs) { + dependentSignalLinks.delete(dependentSignal); + for (const sourceRef of links.sourceSignalRefs) { const sourceSignal = sourceRef.deref(); if (sourceSignal != null) { - dependentSignals.get(sourceSignal)?.delete(dependentSignal); + dependentSignalRefs.get(sourceSignal)?.delete(links.signalRef); } } } diff --git a/packages/react-native/src/private/webapis/dom/abort-api/__tests__/AbortController-itest.js b/packages/react-native/src/private/webapis/dom/abort-api/__tests__/AbortController-itest.js index 435deaf2fad2..25d6b2089e0f 100644 --- a/packages/react-native/src/private/webapis/dom/abort-api/__tests__/AbortController-itest.js +++ b/packages/react-native/src/private/webapis/dom/abort-api/__tests__/AbortController-itest.js @@ -353,6 +353,82 @@ describe('AbortController', () => { }); }); + it('should abort even if a source listener stops propagation', () => { + Fantom.runTask(() => { + const source = new AbortController(); + source.signal.addEventListener('abort', event => { + event.stopImmediatePropagation(); + }); + const signal = AbortSignal.any([source.signal]); + + source.abort('cancelled'); + + expect(signal.aborted).toBe(true); + expect(signal.reason).toBe('cancelled'); + }); + }); + + it('should mark dependent signals as aborted before dispatching to the source', () => { + Fantom.runTask(() => { + const source = new AbortController(); + let observed; + source.signal.addEventListener('abort', () => { + observed = [signal.aborted, signal.reason]; + }); + const signal = AbortSignal.any([source.signal]); + + source.abort('reason'); + + expect(observed).toEqual([true, 'reason']); + }); + }); + + it('should dispatch to the source and then to its dependents in creation order', () => { + Fantom.runTask(() => { + const first = new AbortController(); + const second = new AbortController(); + const inner = AbortSignal.any([first.signal, second.signal]); + const outer = AbortSignal.any([inner, inner, first.signal]); + const unrelated = AbortSignal.any([second.signal]); + const events: Array = []; + first.signal.addEventListener('abort', () => { + events.push('first'); + }); + inner.addEventListener('abort', () => { + events.push('inner'); + }); + outer.addEventListener('abort', () => { + events.push('outer'); + }); + unrelated.addEventListener('abort', () => { + events.push('unrelated'); + }); + + first.abort('first reason'); + second.abort('second reason'); + + expect(events).toEqual(['first', 'inner', 'outer', 'unrelated']); + expect(outer.reason).toBe('first reason'); + expect(unrelated.reason).toBe('second reason'); + }); + }); + + it('should keep the first reason when a source listener aborts another source', () => { + Fantom.runTask(() => { + const first = new AbortController(); + const second = new AbortController(); + first.signal.addEventListener('abort', () => second.abort('second')); + const signal = AbortSignal.any([first.signal, second.signal]); + const listener = createListener(); + signal.addEventListener('abort', listener); + + first.abort('first'); + + expect(signal.reason).toBe('first'); + expect(listener).toHaveBeenCalledTimes(1); + }); + }); + it('should abort immediately if one of the provided signals is already aborted', () => { const first = new AbortController(); const second = new AbortController(); diff --git a/packages/react-native/src/private/webapis/dom/abort-api/__tests__/AbortSignal-any-test.js b/packages/react-native/src/private/webapis/dom/abort-api/__tests__/AbortSignal-any-test.js deleted file mode 100644 index 4345b45bbad2..000000000000 --- a/packages/react-native/src/private/webapis/dom/abort-api/__tests__/AbortSignal-any-test.js +++ /dev/null @@ -1,82 +0,0 @@ -/** - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @flow strict-local - * @format - */ - -import {AbortController} from '../AbortController'; -import {AbortSignal} from '../AbortSignal'; - -describe('AbortSignal.any', () => { - it('aborts the dependent signal even if a source listener stops propagation', () => { - const source = new AbortController(); - source.signal.addEventListener('abort', event => { - event.stopImmediatePropagation(); - }); - const signal = AbortSignal.any([source.signal]); - - source.abort('cancelled'); - - expect(signal.aborted).toBe(true); - expect(signal.reason).toBe('cancelled'); - }); - - it('marks dependent signals as aborted before dispatching to the source', () => { - const source = new AbortController(); - let observed; - source.signal.addEventListener('abort', () => { - observed = [signal.aborted, signal.reason]; - }); - const signal = AbortSignal.any([source.signal]); - - source.abort('reason'); - - expect(observed).toEqual([true, 'reason']); - }); - - it('dispatches to the source and then to its dependents in creation order', () => { - const first = new AbortController(); - const second = new AbortController(); - const inner = AbortSignal.any([first.signal, second.signal]); - const outer = AbortSignal.any([inner, inner, first.signal]); - const unrelated = AbortSignal.any([second.signal]); - const events: Array = []; - first.signal.addEventListener('abort', () => { - events.push('first'); - }); - inner.addEventListener('abort', () => { - events.push('inner'); - }); - outer.addEventListener('abort', () => { - events.push('outer'); - }); - unrelated.addEventListener('abort', () => { - events.push('unrelated'); - }); - - first.abort('first reason'); - second.abort('second reason'); - - expect(events).toEqual(['first', 'inner', 'outer', 'unrelated']); - expect(outer.reason).toBe('first reason'); - expect(unrelated.reason).toBe('second reason'); - }); - - it('keeps the first reason when a source listener aborts another source', () => { - const first = new AbortController(); - const second = new AbortController(); - first.signal.addEventListener('abort', () => second.abort('second')); - const signal = AbortSignal.any([first.signal, second.signal]); - const listener = jest.fn(); - signal.addEventListener('abort', listener); - - first.abort('first'); - - expect(signal.reason).toBe('first'); - expect(listener).toHaveBeenCalledTimes(1); - }); -});