Throw abort errors from the channel in cases where the abort is clear

solana-labs · Oct 9, 2024 · 6beb407 · 6beb407
1 parent 6666c55
commit 6beb407
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 21 deletions.
diff --git a/packages/rpc-subscriptions-channel-websocket/src/__tests__/websocket-channel-test.ts b/packages/rpc-subscriptions-channel-websocket/src/__tests__/websocket-channel-test.ts
@@ -60,11 +60,7 @@ describe('createWebSocketChannel', () => {
             signal: abortController.signal,
             url: 'ws://fake', // Wrong URL!
         });
-        await expect(channelPromise).rejects.toThrow(
-            new SolanaError(SOLANA_ERROR__RPC_SUBSCRIPTIONS__CHANNEL_CONNECTION_CLOSED, {
-                cause: abortController.signal.reason,
-            }),
-        );
+        await expect(channelPromise).rejects.toThrow(/operation was aborted/);
     });
     it('throws when the channel is aborted before a connection is established', async () => {
         expect.assertions(2);
@@ -77,11 +73,7 @@ describe('createWebSocketChannel', () => {
         const client = getLatestClient();
         expect(client).toHaveProperty('readyState', WebSocket.CONNECTING);
         abortController.abort();
-        await expect(channelPromise).rejects.toThrow(
-            new SolanaError(SOLANA_ERROR__RPC_SUBSCRIPTIONS__CHANNEL_FAILED_TO_CONNECT, {
-                errorEvent: {} as Event,
-            }),
-        );
+        await expect(channelPromise).rejects.toThrow(/operation was aborted/);
     });
 });
 

diff --git a/packages/rpc-subscriptions-channel-websocket/src/websocket-channel.ts b/packages/rpc-subscriptions-channel-websocket/src/websocket-channel.ts
@@ -22,11 +22,7 @@ export function createWebSocketChannel({
     url,
 }: Config): Promise<RpcSubscriptionsChannel<WebSocketMessage, string>> {
     if (signal.aborted) {
-        return Promise.reject(
-            new SolanaError(SOLANA_ERROR__RPC_SUBSCRIPTIONS__CHANNEL_CONNECTION_CLOSED, {
-                cause: signal.reason,
-            }),
-        );
+        return Promise.reject(signal.reason);
     }
     let bufferDrainWatcher: Readonly<{ onCancel(): void; promise: Promise<void> }> | undefined;
     let hasConnected = false;
@@ -37,14 +33,10 @@ export function createWebSocketChannel({
         });
         listenerRemovers.clear();
     }
-    function handleAbort(ev: Event) {
+    function handleAbort() {
         cleanupListeners();
         if (!hasConnected) {
-            rejectOpen(
-                new SolanaError(SOLANA_ERROR__RPC_SUBSCRIPTIONS__CHANNEL_FAILED_TO_CONNECT, {
-                    errorEvent: ev,
-                }),
-            );
+            rejectOpen(signal.reason);
         }
         if (webSocket.readyState !== WebSocket.CLOSED && webSocket.readyState !== WebSocket.CLOSING) {
             webSocket.close(1000);