@atomiqlabs/chain-evm 1.0.0-dev.60 → 1.0.0-dev.61

package/dist/evm/SocketProvider.js

@@ -245,7 +245,9 @@ class SocketProvider extends ethers_1.JsonRpcApiProvider {
     async _send(payload) {
         // WebSocket provider doesn't accept batches
         (0, ethers_1.assertArgument)(!Array.isArray(payload), "WebSocket does not support batch send", "payload", payload);
-        if (!__classPrivateFieldGet(this, _SocketProvider_connected, "f"))
+        // Wait until the socket is connected before writing to it
+        await this._waitUntilReady();
+        if (!__classPrivateFieldGet(this, _SocketProvider_connected, "f") && payload.method === "eth_subscribe")
             return Promise.reject((0, ethers_1.makeError)("WebSocket not connected!", "NETWORK_ERROR"));
         // Prepare a promise to respond to
         const promise = new Promise((resolve, reject) => {
@@ -256,10 +258,9 @@ class SocketProvider extends ethers_1.JsonRpcApiProvider {
                 }
             }, this.requestTimeoutSeconds * 1000);
         });
-        // Wait until the socket is connected before writing to it
-        await this._waitUntilReady();
         // Write the request to the socket
-        await this._write(JSON.stringify(payload));
+        if (__classPrivateFieldGet(this, _SocketProvider_connected, "f"))
+            await this._write(JSON.stringify(payload));
         return [await promise];
     }
     _connected() {
@@ -267,20 +268,16 @@ class SocketProvider extends ethers_1.JsonRpcApiProvider {
         this.resume();
         this._forEachSubscriber(subscriber => subscriber.start());
         __classPrivateFieldGet(this, _SocketProvider_callbacks, "f").forEach(val => {
-            if (val.payload.method === "eth_subscribe")
-                return;
-            this._send(val.payload);
+            this._write(JSON.stringify(val.payload));
         });
     }
     _disconnected() {
         __classPrivateFieldSet(this, _SocketProvider_connected, false, "f");
         this.pause(true);
-        __classPrivateFieldGet(this, _SocketProvider_callbacks, "f").forEach((val, key) => {
-            if (val.payload.method === "eth_subscribe") {
-                val.reject((0, ethers_1.makeError)("WebSocket disconnected!", "NETWORK_ERROR"));
-                __classPrivateFieldGet(this, _SocketProvider_callbacks, "f").delete(key);
-            }
+        __classPrivateFieldGet(this, _SocketProvider_callbacks, "f").forEach(val => {
+            val.reject((0, ethers_1.makeError)("WebSocket disconnected!", "NETWORK_ERROR"));
         });
+        __classPrivateFieldGet(this, _SocketProvider_callbacks, "f").clear();
     }
     /**
      *  Sub-classes **must** call this with messages received over their

package/package.json

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

package/src/evm/SocketProvider.ts

@@ -271,7 +271,11 @@ export class SocketProvider extends JsonRpcApiProvider {
         // WebSocket provider doesn't accept batches
         assertArgument(!Array.isArray(payload), "WebSocket does not support batch send", "payload", payload);
 
-        if(!this.#connected) return Promise.reject(makeError("WebSocket not connected!", "NETWORK_ERROR"));
+        // Wait until the socket is connected before writing to it
+        await this._waitUntilReady();
+
+        if(!this.#connected && payload.method==="eth_subscribe")
+            return Promise.reject(makeError("WebSocket not connected!", "NETWORK_ERROR"));
 
         // Prepare a promise to respond to
         const promise = new Promise((resolve, reject) => {
@@ -283,11 +287,8 @@ export class SocketProvider extends JsonRpcApiProvider {
             }, this.requestTimeoutSeconds * 1000);
         });
 
-        // Wait until the socket is connected before writing to it
-        await this._waitUntilReady();
-
         // Write the request to the socket
-        await this._write(JSON.stringify(payload));
+        if(this.#connected) await this._write(JSON.stringify(payload));
 
         return <Array<JsonRpcResult | JsonRpcError>>[ await promise ];
     }
@@ -296,21 +297,20 @@ export class SocketProvider extends JsonRpcApiProvider {
         this.#connected = true;
         this.resume();
         this._forEachSubscriber(subscriber => subscriber.start());
+
         this.#callbacks.forEach(val => {
-            if(val.payload.method==="eth_subscribe") return;
-            this._send(val.payload);
+            this._write(JSON.stringify(val.payload));
         });
     }
 
     _disconnected() {
         this.#connected = false;
         this.pause(true);
-        this.#callbacks.forEach((val, key) => {
-            if(val.payload.method==="eth_subscribe") {
-                val.reject(makeError("WebSocket disconnected!", "NETWORK_ERROR"));
-                this.#callbacks.delete(key);
-            }
+
+        this.#callbacks.forEach(val => {
+            val.reject(makeError("WebSocket disconnected!", "NETWORK_ERROR"))
         });
+        this.#callbacks.clear();
     }
 
     /**