@solana/web3.js 1.70.0 → 1.70.1-pr-29195

package/lib/index.cjs.js

@@ -13,10 +13,11 @@ var BufferLayout = require('@solana/buffer-layout');
 var bigintBuffer = require('bigint-buffer');
 var https = require('https');
 var superstruct = require('superstruct');
-var rpcWebsockets = require('rpc-websockets');
 var RpcClient = require('jayson/lib/client/browser');
 var http = require('http');
 var nodeFetch = require('node-fetch');
+var RpcWebSocketCommonClient = require('rpc-websockets/dist/lib/client');
+var createRpc = require('rpc-websockets/dist/lib/client/websocket');
 var sha3 = require('@noble/hashes/sha3');
 var hmac = require('@noble/hashes/hmac');
 var secp256k1 = require('@noble/secp256k1');
@@ -49,6 +50,8 @@ var https__default = /*#__PURE__*/_interopDefaultLegacy(https);
 var RpcClient__default = /*#__PURE__*/_interopDefaultLegacy(RpcClient);
 var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
 var nodeFetch__namespace = /*#__PURE__*/_interopNamespace(nodeFetch);
+var RpcWebSocketCommonClient__default = /*#__PURE__*/_interopDefaultLegacy(RpcWebSocketCommonClient);
+var createRpc__default = /*#__PURE__*/_interopDefaultLegacy(createRpc);
 var secp256k1__namespace = /*#__PURE__*/_interopNamespace(secp256k1);
 
 /**
@@ -132,6 +135,7 @@ class Enum extends Struct {
 }
 const SOLANA_SCHEMA = new Map();
 
+let _Symbol$toStringTag;
 /**
  * Maximum length of derived pubkey seed
  */
@@ -156,6 +160,7 @@ let uniquePublicKeyCounter = 1;
  * A public key
  */
 
+_Symbol$toStringTag = Symbol.toStringTag;
 class PublicKey extends Struct {
   /** @internal */
 
@@ -246,6 +251,10 @@ class PublicKey extends Struct {
     b.copy(zeroPad, 32 - b.length);
     return zeroPad;
   }
+
+  get [_Symbol$toStringTag]() {
+    return `PublicKey(${this.toString()})`;
+  }
   /**
    * Return the base-58 representation of the public key
    */
@@ -3596,6 +3605,56 @@ async function fetchImpl (input, init) {
   return await nodeFetch__namespace.default(processedInput, init);
 }
 
+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 === WebSocket.OPEN) {
+      return super.call(...args);
+    }
+
+    throw 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 === WebSocket.OPEN) {
+      return super.notify(...args);
+    }
+
+    throw 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
 
@@ -4776,7 +4835,7 @@ const LogsNotificationResult = superstruct.type({
 
 /** @internal */
 const COMMON_HTTP_HEADERS = {
-  'solana-client': `js/${(_process$env$npm_pack = "0.0.0-development") !== null && _process$env$npm_pack !== void 0 ? _process$env$npm_pack : 'UNKNOWN'}`
+  'solana-client': `js/${(_process$env$npm_pack = "1.70.1-pr-29195") !== null && _process$env$npm_pack !== void 0 ? _process$env$npm_pack : 'UNKNOWN'}`
 };
 /**
  * A connection to a fullnode JSON RPC endpoint
@@ -4906,7 +4965,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
     });