ponder 0.12.20 → 0.12.21

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # ponder
 
+## 0.12.21
+
+### Patch Changes
+
+- [#2006](https://github.com/ponder-sh/ponder/pull/2006) [`908b4b2`](https://github.com/ponder-sh/ponder/commit/908b4b2034174ff96900f98ad60141581fac9c49) Thanks [@kyscott18](https://github.com/kyscott18)! - Improved websocket handling.
+
 ## 0.12.20
 
 ### Patch Changes

package/dist/esm/rpc/index.js

@@ -5,6 +5,7 @@ import { startClock } from '../utils/timer.js';
 import { wait } from '../utils/wait.js';
 import { getLogsRetryHelper, } from "@ponder/utils";
 import { http, HttpRequestError, JsonRpcVersionUnsupportedError, MethodNotFoundRpcError, MethodNotSupportedRpcError, ParseRpcError, TimeoutError, isHex, webSocket, } from "viem";
+import { WebSocket } from "ws";
 const RETRY_COUNT = 9;
 const BASE_DURATION = 125;
 const INITIAL_REACTIVATION_DELAY = 100;
@@ -144,17 +145,9 @@ export const createRpc = ({ common, chain, concurrency = 25, }) => {
             }).request,
         ];
     }
-    let wsTransport = undefined;
     if (typeof chain.ws === "string") {
         const protocol = new url.URL(chain.ws).protocol;
-        if (protocol === "wss:" || protocol === "ws:") {
-            wsTransport = webSocket(chain.ws, { keepAlive: true, reconnect: false })({
-                chain: chain.viemChain,
-                retryCount: 0,
-                timeout: 5000,
-            });
-        }
-        else {
+        if (protocol !== "wss:" && protocol !== "ws:") {
             throw new Error(`Inconsistent RPC URL protocol: ${protocol}. Expected wss or ws.`);
         }
     }
@@ -311,134 +304,182 @@ export const createRpc = ({ common, chain, concurrency = 25, }) => {
             throw "unreachable";
         },
     });
-    let interval;
+    let ws;
+    let isUnsubscribed = false;
+    let subscriptionId;
     let webSocketErrorCount = 0;
-    const disconnect = async () => {
-        const conn = await wsTransport.value.getRpcClient();
-        conn.close();
-    };
+    let interval;
     const rpc = {
         // @ts-ignore
         request: queue.add,
-        async subscribe({ onBlock, onError, polling = false }) {
-            let isFetching = false;
-            let isSubscribed = false;
-            if (polling || wsTransport === undefined) {
-                interval = setInterval(async () => {
-                    if (isFetching)
+        subscribe({ onBlock, onError }) {
+            (async () => {
+                while (true) {
+                    if (isUnsubscribed)
                         return;
-                    isFetching = true;
-                    try {
-                        const block = await _eth_getBlockByNumber(rpc, {
-                            blockTag: "latest",
+                    let isFetching = false;
+                    if (chain.ws === undefined || webSocketErrorCount >= RETRY_COUNT) {
+                        common.logger.debug({
+                            service: "rpc",
+                            msg: `Created '${chain.name}' polling subscription`,
                         });
-                        // Note: `onBlock` should never throw.
-                        await onBlock(block);
-                    }
-                    catch (error) {
-                        onError(error);
-                    }
-                    finally {
-                        isFetching = false;
-                    }
-                }, chain.pollingInterval);
-                common.shutdown.add(() => {
-                    clearInterval(interval);
-                });
-                return;
-            }
-            for (let i = 0; i <= RETRY_COUNT; ++i) {
-                try {
-                    await wsTransport.value.subscribe({
-                        params: ["newHeads"],
-                        onData: async (data) => {
-                            if (data.error === undefined && data.result !== undefined) {
-                                onBlock(standardizeBlock(data.result, true));
-                                common.logger.debug({
-                                    service: "rpc",
-                                    msg: `Received successful '${chain.name}' newHeads subscription data`,
+                        interval = setInterval(async () => {
+                            if (isFetching)
+                                return;
+                            isFetching = true;
+                            try {
+                                const block = await _eth_getBlockByNumber(rpc, {
+                                    blockTag: "latest",
                                 });
-                                webSocketErrorCount = 0;
+                                // Note: `onBlock` should never throw.
+                                await onBlock(block);
                             }
-                            else {
-                                if (!isSubscribed)
-                                    return;
-                                const error = data.error;
-                                if (webSocketErrorCount === RETRY_COUNT) {
+                            catch (error) {
+                                onError(error);
+                            }
+                            finally {
+                                isFetching = false;
+                            }
+                        }, chain.pollingInterval);
+                        common.shutdown.add(() => {
+                            clearInterval(interval);
+                        });
+                        return;
+                    }
+                    await new Promise((resolve) => {
+                        ws = new WebSocket(chain.ws);
+                        ws.on("open", () => {
+                            common.logger.debug({
+                                service: "rpc",
+                                msg: `Created '${chain.name}' websocket subscription`,
+                            });
+                            const subscriptionRequest = {
+                                jsonrpc: "2.0",
+                                id: 1,
+                                method: "eth_subscribe",
+                                params: ["newHeads"],
+                            };
+                            ws?.send(JSON.stringify(subscriptionRequest));
+                        });
+                        ws.on("message", (data) => {
+                            try {
+                                const msg = JSON.parse(data.toString());
+                                if (msg.method === "eth_subscription" &&
+                                    msg.params.subscription === subscriptionId) {
+                                    onBlock(standardizeBlock(msg.params.result, true));
+                                    common.logger.debug({
+                                        service: "rpc",
+                                        msg: `Received successful '${chain.name}' websocket subscription data`,
+                                    });
+                                    webSocketErrorCount = 0;
+                                }
+                                else if (msg.result) {
+                                    subscriptionId = msg.result;
+                                }
+                                else if (msg.error) {
+                                    if (webSocketErrorCount === RETRY_COUNT) {
+                                        common.logger.warn({
+                                            service: "rpc",
+                                            msg: `Failed '${chain.name}' websocket subscription after ${webSocketErrorCount + 1} consecutive errors. Switching to polling`,
+                                            error: msg.error,
+                                        });
+                                    }
+                                    else {
+                                        common.logger.debug({
+                                            service: "rpc",
+                                            msg: `Received '${chain.name}' websocket subscription error`,
+                                            error: msg.error,
+                                        });
+                                        webSocketErrorCount += 1;
+                                    }
+                                    ws?.close();
+                                }
+                                else {
+                                    common.logger.debug({
+                                        service: "rpc",
+                                        msg: `Received unrecognized '${chain.name}' websocket message`,
+                                    });
+                                }
+                            }
+                            catch (error) {
+                                if (webSocketErrorCount >= RETRY_COUNT) {
                                     common.logger.warn({
                                         service: "rpc",
-                                        msg: `Failed '${chain.name}' newHeads subscription after ${webSocketErrorCount + 1} consecutive errors. Switching to polling`,
-                                        error,
+                                        msg: `Failed '${chain.name}' websocket subscription after ${webSocketErrorCount + 1} consecutive errors. Switching to polling`,
+                                        error: error,
                                     });
-                                    await disconnect();
-                                    rpc.subscribe({ onBlock, onError, polling: true });
                                 }
                                 else {
                                     common.logger.debug({
                                         service: "rpc",
-                                        msg: `Received '${chain.name}' newHeads subscription error`,
-                                        error,
+                                        msg: `Received '${chain.name}' websocket subscription error`,
+                                        error: error,
                                     });
+                                    webSocketErrorCount += 1;
                                 }
-                                webSocketErrorCount += 1;
+                                ws?.close();
                             }
-                        },
-                        onError: async (_error) => {
-                            // Note: Since the viem webSocket transaport impl throws the promise and calls onError callback on failed subscribe, it should be debounced.
-                            if (!isSubscribed)
-                                return;
-                            const error = _error;
-                            if (webSocketErrorCount === RETRY_COUNT) {
+                        });
+                        ws.on("error", async (error) => {
+                            if (webSocketErrorCount >= RETRY_COUNT) {
                                 common.logger.warn({
                                     service: "rpc",
-                                    msg: `Failed '${chain.name}' newHeads subscription after ${webSocketErrorCount + 1} consecutive errors. Switching to polling`,
+                                    msg: `Failed '${chain.name}' websocket subscription after ${webSocketErrorCount + 1} consecutive errors. Switching to polling`,
                                     error,
                                 });
-                                await disconnect();
-                                rpc.subscribe({ onBlock, onError, polling: true });
                             }
                             else {
                                 common.logger.debug({
                                     service: "rpc",
-                                    msg: `Failed '${chain.name}' newHeads subscription`,
+                                    msg: `Received '${chain.name}' websocket subscription error`,
                                     error,
                                 });
                                 webSocketErrorCount += 1;
-                                await disconnect();
-                                rpc.subscribe({ onBlock, onError, polling: false });
                             }
-                        },
-                    });
-                    isSubscribed = true;
-                    return;
-                }
-                catch (_error) {
-                    const error = _error;
-                    if (i === RETRY_COUNT) {
-                        common.logger.warn({
-                            service: "rpc",
-                            msg: `Failed '${chain.name}' eth_subscribe request after ${i + 1} consecutive errors. Switching to polling`,
-                            error,
+                            if (ws && ws.readyState === ws.OPEN) {
+                                ws.close();
+                            }
+                            else {
+                                resolve();
+                            }
                         });
-                        rpc.subscribe({ onBlock, onError, polling: true });
-                        return;
-                    }
-                    else {
-                        const duration = BASE_DURATION * 2 ** i;
-                        common.logger.debug({
-                            service: "rpc",
-                            msg: `Failed '${chain.name}' eth_subscribe request, retrying after ${duration} milliseconds`,
-                            error,
+                        ws.on("close", async () => {
+                            common.logger.debug({
+                                service: "rpc",
+                                msg: `Closed '${chain.name}' websocket connection`,
+                            });
+                            ws = undefined;
+                            if (isUnsubscribed || webSocketErrorCount >= RETRY_COUNT) {
+                                resolve();
+                            }
+                            else {
+                                const duration = BASE_DURATION * 2 ** webSocketErrorCount;
+                                common.logger.debug({
+                                    service: "rpc",
+                                    msg: `Retrying '${chain.name}' websocket connection after ${duration} milliseconds`,
+                                });
+                                await wait(duration);
+                                resolve();
+                            }
                         });
-                        await wait(duration);
-                    }
+                    });
                 }
-            }
+            })();
         },
         async unsubscribe() {
             clearInterval(interval);
-            if (wsTransport) {
-                await disconnect();
+            isUnsubscribed = true;
+            if (ws) {
+                if (subscriptionId) {
+                    const unsubscribeRequest = {
+                        jsonrpc: "2.0",
+                        id: 1,
+                        method: "eth_unsubscribe",
+                        params: [subscriptionId],
+                    };
+                    ws.send(JSON.stringify(unsubscribeRequest));
+                }
+                ws.close();
             }
         },
     };

package/dist/esm/rpc/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/rpc/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/rpc/index.ts"],"names":[],"mappings":"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"}

package/dist/types/rpc/index.d.ts

@@ -11,8 +11,7 @@ export type Rpc = {
     subscribe: (params: {
         onBlock: (block: SyncBlock | SyncBlockHeader) => Promise<boolean>;
         onError: (error: Error) => void;
-        polling?: boolean;
-    }) => Promise<void>;
+    }) => void;
     unsubscribe: () => Promise<void>;
 };
 export declare const createRpc: ({ common, chain, concurrency, }: {

package/dist/types/rpc/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rpc/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAa7E,OAAO,EAEL,KAAK,iBAAiB,EAOtB,KAAK,eAAe,EAMrB,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,KAAK,MAAM,GAAG,CAAC,GAAG,eAAe,EAAE,GAAG,cAAc,CAAC,CAAC;AAEtD,KAAK,iBAAiB,CAAC,MAAM,SAAS,iBAAiB,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,IACvE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,YAAY,CAAC,CAAC;AAE5D,MAAM,MAAM,GAAG,GAAG;IAChB,OAAO,EAAE,CAAC,WAAW,SAAS,iBAAiB,CAAC,MAAM,CAAC,EACrD,UAAU,EAAE,WAAW,KACpB,OAAO,CAAC,iBAAiB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACvD,SAAS,EAAE,CAAC,MAAM,EAAE;QAClB,OAAO,EAAE,CAAC,KAAK,EAAE,SAAS,GAAG,eAAe,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;QAClE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;QAChC,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAClC,CAAC;AAmIF,eAAO,MAAM,SAAS;YAIT,MAAM;WAAS,KAAK;;MAA2B,GAkb3D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rpc/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAa7E,OAAO,EAEL,KAAK,iBAAiB,EAOtB,KAAK,eAAe,EAKrB,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,KAAK,MAAM,GAAG,CAAC,GAAG,eAAe,EAAE,GAAG,cAAc,CAAC,CAAC;AAEtD,KAAK,iBAAiB,CAAC,MAAM,SAAS,iBAAiB,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,IACvE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,YAAY,CAAC,CAAC;AAE5D,MAAM,MAAM,GAAG,GAAG;IAChB,OAAO,EAAE,CAAC,WAAW,SAAS,iBAAiB,CAAC,MAAM,CAAC,EACrD,UAAU,EAAE,WAAW,KACpB,OAAO,CAAC,iBAAiB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACvD,SAAS,EAAE,CAAC,MAAM,EAAE;QAClB,OAAO,EAAE,CAAC,KAAK,EAAE,SAAS,GAAG,eAAe,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;QAClE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;KACjC,KAAK,IAAI,CAAC;IACX,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAClC,CAAC;AAmIF,eAAO,MAAM,SAAS;YAIT,MAAM;WAAS,KAAK;;MAA2B,GA4d3D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ponder",
-  "version": "0.12.20",
+  "version": "0.12.21",
   "description": "An open-source framework for crypto application backends",
   "license": "MIT",
   "type": "module",
@@ -79,6 +79,7 @@
     "vite": "5.0.7",
     "vite-node": "1.0.2",
     "vite-tsconfig-paths": "4.3.1",
+    "ws": "^8.18.3",
     "@ponder/utils": "0.2.12"
   },
   "devDependencies": {
@@ -89,6 +90,7 @@
     "@types/pg": "^8.10.9",
     "@types/pg-copy-streams": "^1.2.5",
     "@types/semver": "^7.5.8",
+    "@types/ws": "^8.18.1",
     "@viem/anvil": "^0.0.6",
     "@wagmi/cli": "^1.5.2",
     "chokidar": "^4.0.3",
@@ -97,7 +99,7 @@
     "rimraf": "^5.0.5",
     "tsx": "^4.19.2",
     "vitest": "^1.0.2",
-    "@ponder/client": "0.12.20"
+    "@ponder/client": "0.12.21"
   },
   "engines": {
     "node": ">=18.14"

package/src/rpc/index.ts

@@ -25,10 +25,10 @@ import {
   type PublicRpcSchema,
   type RpcError,
   TimeoutError,
-  type WebSocketTransport,
   isHex,
   webSocket,
 } from "viem";
+import { WebSocket } from "ws";
 import type { DebugRpcSchema } from "../utils/debug.js";
 
 type Schema = [...PublicRpcSchema, ...DebugRpcSchema];
@@ -43,8 +43,7 @@ export type Rpc = {
   subscribe: (params: {
     onBlock: (block: SyncBlock | SyncBlockHeader) => Promise<boolean>;
     onError: (error: Error) => void;
-    polling?: boolean;
-  }) => Promise<void>;
+  }) => void;
   unsubscribe: () => Promise<void>;
 };
 
@@ -234,18 +233,10 @@ export const createRpc = ({
     ];
   }
 
-  let wsTransport: ReturnType<WebSocketTransport> | undefined = undefined;
-
   if (typeof chain.ws === "string") {
     const protocol = new url.URL(chain.ws).protocol;
 
-    if (protocol === "wss:" || protocol === "ws:") {
-      wsTransport = webSocket(chain.ws, { keepAlive: true, reconnect: false })({
-        chain: chain.viemChain,
-        retryCount: 0,
-        timeout: 5_000,
-      });
-    } else {
+    if (protocol !== "wss:" && protocol !== "ws:") {
       throw new Error(
         `Inconsistent RPC URL protocol: ${protocol}. Expected wss or ws.`,
       );
@@ -463,146 +454,196 @@ export const createRpc = ({
     },
   });
 
-  let interval: NodeJS.Timeout | undefined;
+  let ws: WebSocket | undefined;
+  let isUnsubscribed = false;
+  let subscriptionId: string | undefined;
   let webSocketErrorCount = 0;
-  const disconnect = async () => {
-    const conn = await wsTransport!.value!.getRpcClient();
-    conn.close();
-  };
+  let interval: NodeJS.Timeout | undefined;
 
   const rpc: Rpc = {
     // @ts-ignore
     request: queue.add,
-    async subscribe({ onBlock, onError, polling = false }) {
-      let isFetching = false;
-      let isSubscribed = false;
+    subscribe({ onBlock, onError }) {
+      (async () => {
+        while (true) {
+          if (isUnsubscribed) return;
+          let isFetching = false;
 
-      if (polling || wsTransport === undefined) {
-        interval = setInterval(async () => {
-          if (isFetching) return;
+          if (chain.ws === undefined || webSocketErrorCount >= RETRY_COUNT) {
+            common.logger.debug({
+              service: "rpc",
+              msg: `Created '${chain.name}' polling subscription`,
+            });
+
+            interval = setInterval(async () => {
+              if (isFetching) return;
 
-          isFetching = true;
+              isFetching = true;
 
-          try {
-            const block = await _eth_getBlockByNumber(rpc, {
-              blockTag: "latest",
+              try {
+                const block = await _eth_getBlockByNumber(rpc, {
+                  blockTag: "latest",
+                });
+                // Note: `onBlock` should never throw.
+                await onBlock(block);
+              } catch (error) {
+                onError(error as Error);
+              } finally {
+                isFetching = false;
+              }
+            }, chain.pollingInterval);
+            common.shutdown.add(() => {
+              clearInterval(interval);
             });
-            // Note: `onBlock` should never throw.
-            await onBlock(block);
-          } catch (error) {
-            onError(error as Error);
-          } finally {
-            isFetching = false;
+
+            return;
           }
-        }, chain.pollingInterval);
-        common.shutdown.add(() => {
-          clearInterval(interval);
-        });
 
-        return;
-      }
+          await new Promise<void>((resolve) => {
+            ws = new WebSocket(chain.ws!);
 
-      for (let i = 0; i <= RETRY_COUNT; ++i) {
-        try {
-          await wsTransport.value!.subscribe({
-            params: ["newHeads"],
-            onData: async (data) => {
-              if (data.error === undefined && data.result !== undefined) {
-                onBlock(standardizeBlock(data.result, true));
+            ws.on("open", () => {
+              common.logger.debug({
+                service: "rpc",
+                msg: `Created '${chain.name}' websocket subscription`,
+              });
 
-                common.logger.debug({
-                  service: "rpc",
-                  msg: `Received successful '${chain.name}' newHeads subscription data`,
-                });
-                webSocketErrorCount = 0;
-              } else {
-                if (!isSubscribed) return;
-                const error = data.error as Error;
+              const subscriptionRequest = {
+                jsonrpc: "2.0",
+                id: 1,
+                method: "eth_subscribe",
+                params: ["newHeads"],
+              };
+
+              ws?.send(JSON.stringify(subscriptionRequest));
+            });
 
-                if (webSocketErrorCount === RETRY_COUNT) {
+            ws.on("message", (data: Buffer) => {
+              try {
+                const msg = JSON.parse(data.toString());
+                if (
+                  msg.method === "eth_subscription" &&
+                  msg.params.subscription === subscriptionId
+                ) {
+                  onBlock(standardizeBlock(msg.params.result, true));
+
+                  common.logger.debug({
+                    service: "rpc",
+                    msg: `Received successful '${chain.name}' websocket subscription data`,
+                  });
+                  webSocketErrorCount = 0;
+                } else if (msg.result) {
+                  subscriptionId = msg.result;
+                } else if (msg.error) {
+                  if (webSocketErrorCount === RETRY_COUNT) {
+                    common.logger.warn({
+                      service: "rpc",
+                      msg: `Failed '${chain.name}' websocket subscription after ${webSocketErrorCount + 1} consecutive errors. Switching to polling`,
+                      error: msg.error as Error,
+                    });
+                  } else {
+                    common.logger.debug({
+                      service: "rpc",
+                      msg: `Received '${chain.name}' websocket subscription error`,
+                      error: msg.error as Error,
+                    });
+
+                    webSocketErrorCount += 1;
+                  }
+
+                  ws?.close();
+                } else {
+                  common.logger.debug({
+                    service: "rpc",
+                    msg: `Received unrecognized '${chain.name}' websocket message`,
+                  });
+                }
+              } catch (error) {
+                if (webSocketErrorCount >= RETRY_COUNT) {
                   common.logger.warn({
                     service: "rpc",
-                    msg: `Failed '${chain.name}' newHeads subscription after ${webSocketErrorCount + 1} consecutive errors. Switching to polling`,
-                    error,
+                    msg: `Failed '${chain.name}' websocket subscription after ${webSocketErrorCount + 1} consecutive errors. Switching to polling`,
+                    error: error as Error,
                   });
-
-                  await disconnect();
-
-                  rpc.subscribe({ onBlock, onError, polling: true });
                 } else {
                   common.logger.debug({
                     service: "rpc",
-                    msg: `Received '${chain.name}' newHeads subscription error`,
-                    error,
+                    msg: `Received '${chain.name}' websocket subscription error`,
+                    error: error as Error,
                   });
+
+                  webSocketErrorCount += 1;
                 }
 
-                webSocketErrorCount += 1;
+                ws?.close();
               }
-            },
-            onError: async (_error) => {
-              // Note: Since the viem webSocket transaport impl throws the promise and calls onError callback on failed subscribe, it should be debounced.
-              if (!isSubscribed) return;
-              const error = _error as Error;
+            });
 
-              if (webSocketErrorCount === RETRY_COUNT) {
+            ws.on("error", async (error) => {
+              if (webSocketErrorCount >= RETRY_COUNT) {
                 common.logger.warn({
                   service: "rpc",
-                  msg: `Failed '${chain.name}' newHeads subscription after ${webSocketErrorCount + 1} consecutive errors. Switching to polling`,
+                  msg: `Failed '${chain.name}' websocket subscription after ${webSocketErrorCount + 1} consecutive errors. Switching to polling`,
                   error,
                 });
-
-                await disconnect();
-
-                rpc.subscribe({ onBlock, onError, polling: true });
               } else {
                 common.logger.debug({
                   service: "rpc",
-                  msg: `Failed '${chain.name}' newHeads subscription`,
+                  msg: `Received '${chain.name}' websocket subscription error`,
                   error,
                 });
 
                 webSocketErrorCount += 1;
+              }
 
-                await disconnect();
-
-                rpc.subscribe({ onBlock, onError, polling: false });
+              if (ws && ws.readyState === ws.OPEN) {
+                ws.close();
+              } else {
+                resolve();
               }
-            },
-          });
+            });
 
-          isSubscribed = true;
+            ws.on("close", async () => {
+              common.logger.debug({
+                service: "rpc",
+                msg: `Closed '${chain.name}' websocket connection`,
+              });
 
-          return;
-        } catch (_error) {
-          const error = _error as Error;
+              ws = undefined;
 
-          if (i === RETRY_COUNT) {
-            common.logger.warn({
-              service: "rpc",
-              msg: `Failed '${chain.name}' eth_subscribe request after ${i + 1} consecutive errors. Switching to polling`,
-              error,
-            });
+              if (isUnsubscribed || webSocketErrorCount >= RETRY_COUNT) {
+                resolve();
+              } else {
+                const duration = BASE_DURATION * 2 ** webSocketErrorCount;
 
-            rpc.subscribe({ onBlock, onError, polling: true });
+                common.logger.debug({
+                  service: "rpc",
+                  msg: `Retrying '${chain.name}' websocket connection after ${duration} milliseconds`,
+                });
 
-            return;
-          } else {
-            const duration = BASE_DURATION * 2 ** i;
-            common.logger.debug({
-              service: "rpc",
-              msg: `Failed '${chain.name}' eth_subscribe request, retrying after ${duration} milliseconds`,
-              error,
+                await wait(duration);
+
+                resolve();
+              }
             });
-            await wait(duration);
-          }
+          });
         }
-      }
+      })();
     },
     async unsubscribe() {
       clearInterval(interval);
-      if (wsTransport) {
-        await disconnect();
+      isUnsubscribed = true;
+      if (ws) {
+        if (subscriptionId) {
+          const unsubscribeRequest = {
+            jsonrpc: "2.0",
+            id: 1,
+            method: "eth_unsubscribe",
+            params: [subscriptionId],
+          };
+          ws.send(JSON.stringify(unsubscribeRequest));
+        }
+        ws.close();
       }
     },
   };