@atomiqlabs/chain-evm 1.0.0-dev.53 → 1.0.0-dev.55

package/dist/evm/ReconnectingWebSocketProvider.d.ts

@@ -2,6 +2,7 @@ import { JsonRpcApiProviderOptions } from "ethers";
 import type { Networkish, WebSocketLike } from "ethers";
 import { SocketProvider } from "./SocketProvider";
 export declare class ReconnectingWebSocketProvider extends SocketProvider {
+    requestTimeoutSeconds: number;
     reconnectSeconds: number;
     pingIntervalSeconds: number;
     pingInterval: any;

package/dist/evm/ReconnectingWebSocketProvider.js

@@ -5,8 +5,9 @@ const SocketProvider_1 = require("./SocketProvider");
 class ReconnectingWebSocketProvider extends SocketProvider_1.SocketProvider {
     constructor(url, network, options) {
         super(network, options);
-        this.reconnectSeconds = 15;
-        this.pingIntervalSeconds = 60;
+        this.requestTimeoutSeconds = 10;
+        this.reconnectSeconds = 5;
+        this.pingIntervalSeconds = 30;
         this.url = url;
         this.connect();
     }
@@ -16,13 +17,21 @@ class ReconnectingWebSocketProvider extends SocketProvider_1.SocketProvider {
             this._connected();
             this._start();
             this.pingInterval = setInterval(() => {
-                this.websocket.send('');
+                this.getBlockNumber().catch(e => {
+                    //Error
+                    if (e.code === "NETWORK_ERROR") {
+                        console.error("Websocket ping error: ", e);
+                        this.websocket.close();
+                    }
+                });
             }, this.pingIntervalSeconds * 1000);
         };
         this.websocket.onerror = (err) => {
             console.error(`Websocket connection error: `, err);
             if (this.destroyed)
                 return;
+            if (this.websocket == null)
+                return;
             this.websocket = null;
             if (this.pingInterval != null)
                 clearInterval(this.pingInterval);
@@ -38,6 +47,8 @@ class ReconnectingWebSocketProvider extends SocketProvider_1.SocketProvider {
             console.error(`Websocket connection closed: `, event);
             if (this.destroyed)
                 return;
+            if (this.websocket == null)
+                return;
             this.websocket = null;
             if (this.pingInterval != null)
                 clearInterval(this.pingInterval);

package/dist/evm/SocketProvider.d.ts

@@ -82,6 +82,7 @@ export declare class SocketEventSubscriber extends SocketSubscriber {
  */
 export declare class SocketProvider extends JsonRpcApiProvider {
     #private;
+    requestTimeoutSeconds: number;
     /**
      *  Creates a new **SocketProvider** connected to %%network%%.
      *

package/dist/evm/SocketProvider.js

@@ -188,6 +188,7 @@ class SocketProvider extends ethers_1.JsonRpcApiProvider {
             options.staticNetwork = true;
         }
         super(network, options);
+        this.requestTimeoutSeconds = 10;
         _SocketProvider_callbacks.set(this, void 0);
         // Maps each filterId to its subscriber
         _SocketProvider_subs.set(this, void 0);
@@ -249,6 +250,11 @@ class SocketProvider extends ethers_1.JsonRpcApiProvider {
         // Prepare a promise to respond to
         const promise = new Promise((resolve, reject) => {
             __classPrivateFieldGet(this, _SocketProvider_callbacks, "f").set(payload.id, { payload, resolve, reject });
+            setTimeout(() => {
+                if (__classPrivateFieldGet(this, _SocketProvider_callbacks, "f").delete(payload.id)) {
+                    reject((0, ethers_1.makeError)("Request timed out!", "NETWORK_ERROR"));
+                }
+            }, this.requestTimeoutSeconds * 1000);
         });
         // Wait until the socket is connected before writing to it
         await this._waitUntilReady();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-evm",
-  "version": "1.0.0-dev.53",
+  "version": "1.0.0-dev.55",
   "description": "EVM specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",

package/src/evm/ReconnectingWebSocketProvider.ts

@@ -5,8 +5,9 @@ import {SocketProvider} from "./SocketProvider";
 
 export class ReconnectingWebSocketProvider extends SocketProvider {
 
-    reconnectSeconds: number = 15;
-    pingIntervalSeconds: number = 60;
+    requestTimeoutSeconds: number = 10;
+    reconnectSeconds: number = 5;
+    pingIntervalSeconds: number = 30;
 
     pingInterval: any;
     reconnectTimer: any;
@@ -28,13 +29,20 @@ export class ReconnectingWebSocketProvider extends SocketProvider {
             this._start();
 
             this.pingInterval = setInterval(() => {
-                this.websocket.send('');
+                this.getBlockNumber().catch(e => {
+                    //Error
+                    if(e.code==="NETWORK_ERROR") {
+                        console.error("Websocket ping error: ", e);
+                        this.websocket.close();
+                    }
+                });
             }, this.pingIntervalSeconds * 1000);
         };
 
         this.websocket.onerror = (err) => {
             console.error(`Websocket connection error: `, err);
             if(this.destroyed) return;
+            if(this.websocket==null) return;
             this.websocket = null;
             if(this.pingInterval!=null) clearInterval(this.pingInterval);
 
@@ -52,6 +60,7 @@ export class ReconnectingWebSocketProvider extends SocketProvider {
         this.websocket.onclose = (event) => {
             console.error(`Websocket connection closed: `, event);
             if(this.destroyed) return;
+            if(this.websocket==null) return;
             this.websocket = null;
             if(this.pingInterval!=null) clearInterval(this.pingInterval);
 

package/src/evm/SocketProvider.ts

@@ -181,6 +181,9 @@ export class SocketEventSubscriber extends SocketSubscriber {
  *  its communication channel.
  */
 export class SocketProvider extends JsonRpcApiProvider {
+
+    requestTimeoutSeconds: number = 10;
+
     #callbacks: Map<number, { payload: JsonRpcPayload, resolve: (r: any) => void, reject: (e: Error) => void }>;
 
     // Maps each filterId to its subscriber
@@ -273,6 +276,11 @@ export class SocketProvider extends JsonRpcApiProvider {
         // Prepare a promise to respond to
         const promise = new Promise((resolve, reject) => {
             this.#callbacks.set(payload.id, { payload, resolve, reject });
+            setTimeout(() => {
+                if(this.#callbacks.delete(payload.id)) {
+                    reject(makeError("Request timed out!", "NETWORK_ERROR"));
+                }
+            }, this.requestTimeoutSeconds * 1000);
         });
 
         // Wait until the socket is connected before writing to it