@solana/web3.js 1.73.0 → 1.73.1-pr-29195.6

package/lib/index.browser.cjs.js

@@ -12,8 +12,9 @@ var borsh = require('borsh');
 var BufferLayout = require('@solana/buffer-layout');
 var bigintBuffer = require('bigint-buffer');
 var superstruct = require('superstruct');
-var rpcWebsockets = require('rpc-websockets');
 var RpcClient = require('jayson/lib/client/browser');
+var RpcWebSocketCommonClient = require('rpc-websockets/dist/lib/client');
+var createRpc = require('rpc-websockets/dist/lib/client/websocket.browser');
 var sha3 = require('@noble/hashes/sha3');
 var hmac = require('@noble/hashes/hmac');
 var secp256k1 = require('@noble/secp256k1');
@@ -43,6 +44,8 @@ var BN__default = /*#__PURE__*/_interopDefaultLegacy(BN);
 var bs58__default = /*#__PURE__*/_interopDefaultLegacy(bs58);
 var BufferLayout__namespace = /*#__PURE__*/_interopNamespace(BufferLayout);
 var RpcClient__default = /*#__PURE__*/_interopDefaultLegacy(RpcClient);
+var RpcWebSocketCommonClient__default = /*#__PURE__*/_interopDefaultLegacy(RpcWebSocketCommonClient);
+var createRpc__default = /*#__PURE__*/_interopDefaultLegacy(createRpc);
 var secp256k1__namespace = /*#__PURE__*/_interopNamespace(secp256k1);
 
 /**
@@ -3547,6 +3550,60 @@ class SolanaJSONRPCError extends Error {
 
 var fetchImpl = globalThis.fetch;
 
+class RpcWebSocketClient extends RpcWebSocketCommonClient__default["default"] {
+  constructor(address, options, generate_request_id) {
+    const webSocketFactory = url => {
+      const rpc = createRpc__default["default"](url, {
+        autoconnect: true,
+        max_reconnects: 5,
+        reconnect: true,
+        reconnect_interval: 1000,
+        ...options
+      });
+
+      if ('socket' in rpc) {
+        this.underlyingSocket = rpc.socket;
+      } else {
+        this.underlyingSocket = rpc;
+      }
+
+      return rpc;
+    };
+
+    super(webSocketFactory, address, options, generate_request_id);
+    this.underlyingSocket = void 0;
+  }
+
+  call(...args) {
+    var _this$underlyingSocke;
+
+    const readyState = (_this$underlyingSocke = this.underlyingSocket) === null || _this$underlyingSocke === void 0 ? void 0 : _this$underlyingSocke.readyState;
+
+    if (readyState === 1
+    /* WebSocket.OPEN */
+    ) {
+      return super.call(...args);
+    }
+
+    return Promise.reject(new Error('Tried to call a JSON-RPC method `' + args[0] + '` but the socket was not `CONNECTING` or `OPEN` (`readyState` was ' + readyState + ')'));
+  }
+
+  notify(...args) {
+    var _this$underlyingSocke2;
+
+    const readyState = (_this$underlyingSocke2 = this.underlyingSocket) === null || _this$underlyingSocke2 === void 0 ? void 0 : _this$underlyingSocke2.readyState;
+
+    if (readyState === 1
+    /* WebSocket.OPEN */
+    ) {
+      return super.notify(...args);
+    }
+
+    return Promise.reject(new Error('Tried to send a JSON-RPC notification `' + args[0] + '` but the socket was not `CONNECTING` or `OPEN` (`readyState` was ' + readyState + ')'));
+  }
+
+}
+
 // TODO: These constants should be removed in favor of reading them out of a
 // Syscall account
 
@@ -4851,7 +4908,7 @@ class Connection {
     this._rpcClient = createRpcClient(endpoint, httpHeaders, fetch, fetchMiddleware, disableRetryOnRateLimit, httpAgent);
     this._rpcRequest = createRpcRequest(this._rpcClient);
     this._rpcBatchRequest = createRpcBatchRequest(this._rpcClient);
-    this._rpcWebSocket = new rpcWebsockets.Client(this._rpcWsEndpoint, {
+    this._rpcWebSocket = new RpcWebSocketClient(this._rpcWsEndpoint, {
       autoconnect: false,
       max_reconnects: Infinity
     });
@@ -7305,7 +7362,11 @@ class Connection {
     this._rpcWebSocketConnected = true;
     this._rpcWebSocketHeartbeat = setInterval(() => {
       // Ping server every 5s to prevent idle timeouts
-      this._rpcWebSocket.notify('ping').catch(() => {});
+      (async () => {
+        try {
+          await this._rpcWebSocket.notify('ping'); // eslint-disable-next-line no-empty
+        } catch {}
+      })();
     }, 5000);
 
     this._updateSubscriptions();