@solana/web3.js 1.70.1-pr-29195.5 → 1.70.2

package/lib/index.browser.cjs.js

@@ -12,9 +12,8 @@ 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');
@@ -44,8 +43,6 @@ 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);
 
 /**
@@ -222,7 +219,7 @@ class PublicKey extends Struct {
     return this.toBase58();
   }
   /**
-   * Return the byte array representation of the public key
+   * Return the byte array representation of the public key in big endian
    */
 
 
@@ -230,7 +227,7 @@ class PublicKey extends Struct {
     return this.toBuffer();
   }
   /**
-   * Return the Buffer representation of the public key
+   * Return the Buffer representation of the public key in big endian
    */
 
 
@@ -3547,60 +3544,6 @@ 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
 
@@ -3956,6 +3899,7 @@ const BlockProductionResponseStruct = jsonRpcResultAndContext(superstruct.type({
 
 function createRpcClient(url, httpHeaders, customFetch, fetchMiddleware, disableRetryOnRateLimit, httpAgent) {
   const fetch = customFetch ? customFetch : fetchImpl;
+  let agent;
 
   {
     if (httpAgent != null) {
@@ -3979,7 +3923,6 @@ function createRpcClient(url, httpHeaders, customFetch, fetchMiddleware, disable
   }
 
   const clientBrowser = new RpcClient__default["default"](async (request, callback) => {
-    const agent = undefined;
     const options = {
       method: 'POST',
       body: request,
@@ -4031,7 +3974,6 @@ function createRpcClient(url, httpHeaders, customFetch, fetchMiddleware, disable
       }
     } catch (err) {
       if (err instanceof Error) callback(err);
-    } finally {
     }
   }, {});
   return clientBrowser;
@@ -4759,7 +4701,7 @@ const LogsNotificationResult = superstruct.type({
 
 /** @internal */
 const COMMON_HTTP_HEADERS = {
-  'solana-client': `js/${(_process$env$npm_pack = "1.70.1-pr-29195.4") !== null && _process$env$npm_pack !== void 0 ? _process$env$npm_pack : 'UNKNOWN'}`
+  'solana-client': `js/${(_process$env$npm_pack = "0.0.0-development") !== null && _process$env$npm_pack !== void 0 ? _process$env$npm_pack : 'UNKNOWN'}`
 };
 /**
  * A connection to a fullnode JSON RPC endpoint
@@ -4889,7 +4831,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 RpcWebSocketClient(this._rpcWsEndpoint, {
+    this._rpcWebSocket = new rpcWebsockets.Client(this._rpcWsEndpoint, {
       autoconnect: false,
       max_reconnects: Infinity
     });
@@ -7328,11 +7270,7 @@ class Connection {
     this._rpcWebSocketConnected = true;
     this._rpcWebSocketHeartbeat = setInterval(() => {
       // Ping server every 5s to prevent idle timeouts
-      (async () => {
-        try {
-          await this._rpcWebSocket.notify('ping'); // eslint-disable-next-line no-empty
-        } catch {}
-      })();
+      this._rpcWebSocket.notify('ping').catch(() => {});
     }, 5000);
 
     this._updateSubscriptions();