From fcfb7a56dc0e6787bc5f843cf488db517682ab8f Mon Sep 17 00:00:00 2001 From: Matus Balascak Date: Wed, 26 Aug 2026 18:45:13 +0200 Subject: [PATCH] fix: read abort reasons from captured signals --- .changeset/chilly-ads-retire.md | 6 ++++++ .../__tests__/rpc-request-coalescer-test.ts | 19 +++++++++++++++++++ packages/rpc/src/rpc-request-coalescer.ts | 4 ++-- .../confirmation-strategy-timeout-test.ts | 17 +++++++++++++++++ .../src/confirmation-strategy-timeout.ts | 4 ++-- 5 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 .changeset/chilly-ads-retire.md diff --git a/.changeset/chilly-ads-retire.md b/.changeset/chilly-ads-retire.md new file mode 100644 index 000000000..2f76f31d6 --- /dev/null +++ b/.changeset/chilly-ads-retire.md @@ -0,0 +1,6 @@ +--- +'@solana/rpc': patch +'@solana/transaction-confirmation': patch +--- + +Fix transaction confirmation and coalesced RPC request cancellation in environments where abort events have a null target. diff --git a/packages/rpc/src/__tests__/rpc-request-coalescer-test.ts b/packages/rpc/src/__tests__/rpc-request-coalescer-test.ts index 4538703b0..d317ee261 100644 --- a/packages/rpc/src/__tests__/rpc-request-coalescer-test.ts +++ b/packages/rpc/src/__tests__/rpc-request-coalescer-test.ts @@ -96,6 +96,25 @@ describe('RPC request coalescer', () => { const transportAbortSignal = mockTransport.mock.lastCall![0].signal!; expect(transportAbortSignal.aborted).toBe(false); }); + it('rejects with the signal reason when the abort event target is null', async () => { + expect.assertions(2); + const abortController = new AbortController(); + const addEventListenerSpy = jest + .spyOn(abortController.signal, 'addEventListener') + .mockImplementation(() => {}); + const responsePromise = coalescedTransport({ + payload: null, + signal: abortController.signal, + }); + + abortController.abort('o no'); + const abortEvent = new Event('abort'); + expect(abortEvent.target).toBeNull(); + const handleAbort = addEventListenerSpy.mock.calls[0][1] as EventListener; + handleAbort(abortEvent); + + await expect(responsePromise).rejects.toBe('o no'); + }); describe('multiple coalesced requests each with an abort signal', () => { let abortControllerA: AbortController; let abortControllerB: AbortController; diff --git a/packages/rpc/src/rpc-request-coalescer.ts b/packages/rpc/src/rpc-request-coalescer.ts index 9d83032ea..67e7a481b 100644 --- a/packages/rpc/src/rpc-request-coalescer.ts +++ b/packages/rpc/src/rpc-request-coalescer.ts @@ -75,7 +75,7 @@ export function getRpcTransportWithRequestCoalescing>; return await new Promise>((resolve, reject) => { - const handleAbort = (e: AbortSignalEventMap['abort']) => { + const handleAbort = () => { signal.removeEventListener('abort', handleAbort); coalescedRequest.numConsumers -= 1; queueMicrotask(() => { @@ -85,7 +85,7 @@ export function getRpcTransportWithRequestCoalescing { abortController.abort(); await expect(timeoutPromise).rejects.toThrow(/operation was aborted/); }); + it('throws an abort error with the signal reason when the abort event target is null', async () => { + expect.assertions(2); + const abortController = new AbortController(); + const addEventListenerSpy = jest.spyOn(abortController.signal, 'addEventListener').mockImplementation(() => {}); + const timeoutPromise = getTimeoutPromise({ + abortSignal: abortController.signal, + commitment: 'finalized', + }); + + abortController.abort('o no'); + const abortEvent = new Event('abort'); + expect(abortEvent.target).toBeNull(); + const handleAbort = addEventListenerSpy.mock.calls[0][1] as EventListener; + handleAbort(abortEvent); + + await expect(timeoutPromise).rejects.toMatchObject({ message: 'o no', name: 'AbortError' }); + }); it('registers the caller abort listener with an auto-cleanup signal', () => { const abortController = new AbortController(); const addEventListenerSpy = jest.spyOn(abortController.signal, 'addEventListener'); diff --git a/packages/transaction-confirmation/src/confirmation-strategy-timeout.ts b/packages/transaction-confirmation/src/confirmation-strategy-timeout.ts index a08a15962..279b90a46 100644 --- a/packages/transaction-confirmation/src/confirmation-strategy-timeout.ts +++ b/packages/transaction-confirmation/src/confirmation-strategy-timeout.ts @@ -37,9 +37,9 @@ export async function getTimeoutPromise({ abortSignal: callerAbortSignal, commit let timeoutId: ReturnType | undefined; try { return await new Promise((_, reject) => { - const handleAbort = (e: AbortSignalEventMap['abort']) => { + const handleAbort = () => { clearTimeout(timeoutId); - const abortError = new DOMException((e.target as AbortSignal).reason, 'AbortError'); + const abortError = new DOMException(callerAbortSignal.reason, 'AbortError'); reject(abortError); }; callerAbortSignal.addEventListener('abort', handleAbort, { signal: abortController.signal });