Merge pull request #39 from gelatodigital/chore/websocket-error-handling

chore: websocket error handling

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gelatonetwork/relay-sdk",
-  "version": "5.5.0",
+  "version": "5.5.2",
   "description": "SDK to integrate with Gelato Relay",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

src/utils/websocketHandler.ts

@@ -123,6 +123,10 @@ export class WebsocketHandler {
       }, this.#reconnectIntervalMillis);
     };
 
+    this.#websocket.onerror = (error: WebSocket.ErrorEvent) => {
+      this._handleError(error);
+    };
+
     this.#websocket.onmessage = async (data: WebSocket.MessageEvent) => {
       const message = JSON.parse(
         data.data.toString()
@@ -133,9 +137,8 @@ export class WebsocketHandler {
           const errorWebsocketMessage = message as ErrorWebsocketMessage;
           const error: Error = errorWebsocketMessage.payload;
 
-          this.#errorHandlers.forEach((handler) => {
-            handler(error);
-          });
+          this._handleError(error);
+
           break;
         }
         case WebsocketEvent.UPDATE: {
@@ -191,7 +194,10 @@ export class WebsocketHandler {
   private async _ensureIsConnected(): Promise<boolean> {
     if (!this.#websocket) {
       this._connect();
-    } else if (this.#websocket.readyState !== WebSocket.OPEN) {
+    } else if (
+      this.#websocket.readyState !== WebSocket.CONNECTING &&
+      this.#websocket.readyState !== WebSocket.OPEN
+    ) {
       this._reconnect();
     }
     return await this._awaitConnection();
@@ -202,17 +208,21 @@ export class WebsocketHandler {
     while (!this.#websocket || this.#websocket.readyState !== WebSocket.OPEN) {
       const elapsed = Date.now() - start;
       if (elapsed > this.#connectTimeoutMillis) {
-        const error = new Error(
-          `Timeout connecting to ${this.#url} after ${elapsed}ms`
+        this._handleError(
+          new Error(`Timeout connecting to ${this.#url} after ${elapsed}ms`)
         );
-        this.#errorHandlers.forEach((handler) => {
-          handler(error);
-        });
+
         return false;
       }
 
       await new Promise((resolve) => setTimeout(resolve, 10));
     }
     return true;
   }
+
+  private _handleError(error: Error) {
+    this.#errorHandlers.forEach((handler) => {
+      handler(error);
+    });
+  }
 }