Override the @solana/web3.js transitive dependency of spl-token and buffer-layout-utils in a more targeted way

.changeset/early-eyes-mix.md

@@ -0,0 +1,5 @@
+---
+'@solana/rpc': patch
+---
+
+Fixed a bug where coalesced RPC calls could end up aborted even though there were still interested consumers. This would happen if the consumer count fell to zero, then rose above zero again, in the same runloop.

package.json

@@ -58,7 +58,10 @@
     "packageManager": "pnpm@9.1.0",
     "pnpm": {
         "overrides": {
-            "@solana/web3.js": "workspace:*",
+            "@solana/buffer-layout-utils>@solana/web3.js": "workspace:*",
+            "@solana/spl-token>@solana/web3.js": "workspace:*",
+            "@solana/spl-token-group>@solana/web3.js": "workspace:*",
+            "@solana/spl-token-metadata>@solana/web3.js": "workspace:*",
             "@wallet-standard/base": "pre",
             "conventional-changelog-conventionalcommits": ">= 8.0.0",
             "jsdom": "^22",

packages/rpc/src/__tests__/rpc-request-coalescer-test.ts

@@ -79,6 +79,22 @@ describe('RPC request coalescer', () => {
             const expectationB = expect(responsePromiseB).rejects.toBe(mockErrorB);
             await Promise.all([expectationA, expectationB]);
         });
+        it('does not abort the transport when the number of consumers increases, falls to zero, then increases again in the same runloop', async () => {
+            expect.assertions(2);
+            const abortControllerA = new AbortController();
+            const abortControllerB = new AbortController();
+            coalescedTransport({ payload: null, signal: abortControllerA.signal }).catch(() => {});
+            coalescedTransport({ payload: null, signal: abortControllerB.signal }).catch(() => {});
+            // Both abort, bringing the consumer count to zero.
+            abortControllerA.abort('o no A');
+            abortControllerB.abort('o no B');
+            // New request comes in at the last moment before the end of the runloop.
+            coalescedTransport({ payload: null });
+            await jest.runOnlyPendingTimersAsync();
+            expect(mockTransport).toHaveBeenCalledTimes(1);
+            const transportAbortSignal = mockTransport.mock.lastCall![0].signal!;
+            expect(transportAbortSignal.aborted).toBe(false);
+        });
         describe('multiple coalesced requests each with an abort signal', () => {
             let abortControllerA: AbortController;
             let abortControllerB: AbortController;
@@ -120,9 +136,13 @@ describe('RPC request coalescer', () => {
                 abortControllerA.abort('o no');
                 await expect(responsePromiseA).rejects.toBe('o no');
             });
-            it('aborts the transport when all of the requests abort', () => {
+            it('aborts the transport at the end of the runloop when all of the requests abort', async () => {
+                expect.assertions(1);
+                responsePromiseA.catch(() => {});
+                responsePromiseB.catch(() => {});
                 abortControllerA.abort('o no A');
                 abortControllerB.abort('o no B');
+                await jest.runOnlyPendingTimersAsync();
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 const transportAbortSignal = mockTransport.mock.lastCall![0].signal!;
                 expect(transportAbortSignal.aborted).toBe(true);

packages/rpc/src/rpc-request-coalescer.ts

@@ -69,10 +69,12 @@ export function getRpcTransportWithRequestCoalescing<TTransport extends RpcTrans
                 const handleAbort = (e: AbortSignalEventMap['abort']) => {
                     signal.removeEventListener('abort', handleAbort);
                     coalescedRequest.numConsumers -= 1;
-                    if (coalescedRequest.numConsumers === 0) {
-                        const abortController = coalescedRequest.abortController;
-                        abortController.abort(EXPLICIT_ABORT_TOKEN);
-                    }
+                    Promise.resolve().then(() => {
+                        if (coalescedRequest.numConsumers === 0) {
+                            const abortController = coalescedRequest.abortController;
+                            abortController.abort(EXPLICIT_ABORT_TOKEN);
+                        }
+                    });
                     reject((e.target as AbortSignal).reason);
                 };
                 signal.addEventListener('abort', handleAbort);