@solana/web3.js 1.73.1 → 1.73.2

package/lib/index.cjs.js

@@ -19,9 +19,10 @@ var require$$1 = require('path');
 var require$$0$4 = require('http');
 var require$$0$5 = require('https');
 var superstruct = require('superstruct');
-var rpcWebsockets = require('rpc-websockets');
 var RpcClient = require('jayson/lib/client/browser');
 var nodeFetch = require('node-fetch');
+var RpcWebSocketCommonClient = require('rpc-websockets/dist/lib/client');
+var WebsocketFactory = require('rpc-websockets/dist/lib/client/websocket');
 var sha3 = require('@noble/hashes/sha3');
 var hmac = require('@noble/hashes/hmac');
 var secp256k1 = require('@noble/secp256k1');
@@ -59,6 +60,8 @@ var require$$0__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$0$4);
 var require$$0__default$5 = /*#__PURE__*/_interopDefaultLegacy(require$$0$5);
 var RpcClient__default = /*#__PURE__*/_interopDefaultLegacy(RpcClient);
 var nodeFetch__namespace = /*#__PURE__*/_interopNamespace(nodeFetch);
+var RpcWebSocketCommonClient__default = /*#__PURE__*/_interopDefaultLegacy(RpcWebSocketCommonClient);
+var WebsocketFactory__default = /*#__PURE__*/_interopDefaultLegacy(WebsocketFactory);
 var secp256k1__namespace = /*#__PURE__*/_interopNamespace(secp256k1);
 
 /**
@@ -3349,7 +3352,11 @@ function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
 
-var agentkeepalive = {exports: {}};
+var agentkeepaliveExports = {};
+var agentkeepalive = {
+  get exports(){ return agentkeepaliveExports; },
+  set exports(v){ agentkeepaliveExports = v; },
+};
 
 /**
  * Helpers.
@@ -3537,9 +3544,17 @@ var humanizeMs = function (t) {
   return r;
 };
 
-var src = {exports: {}};
+var srcExports = {};
+var src = {
+  get exports(){ return srcExports; },
+  set exports(v){ srcExports = v; },
+};
 
-var browser = {exports: {}};
+var browserExports = {};
+var browser = {
+  get exports(){ return browserExports; },
+  set exports(v){ browserExports = v; },
+};
 
 var common;
 var hasRequiredCommon;
@@ -3828,7 +3843,7 @@ function requireCommon () {
 var hasRequiredBrowser;
 
 function requireBrowser () {
-	if (hasRequiredBrowser) return browser.exports;
+	if (hasRequiredBrowser) return browserExports;
 	hasRequiredBrowser = 1;
 	(function (module, exports) {
 		/**
@@ -4098,11 +4113,15 @@ function requireBrowser () {
 				return '[UnexpectedJSONParseError]: ' + error.message;
 			}
 		};
-} (browser, browser.exports));
-	return browser.exports;
+} (browser, browserExports));
+	return browserExports;
 }
 
-var node = {exports: {}};
+var nodeExports = {};
+var node = {
+  get exports(){ return nodeExports; },
+  set exports(v){ nodeExports = v; },
+};
 
 var hasFlag;
 var hasRequiredHasFlag;
@@ -4266,7 +4285,7 @@ function requireSupportsColor () {
 var hasRequiredNode;
 
 function requireNode () {
-	if (hasRequiredNode) return node.exports;
+	if (hasRequiredNode) return nodeExports;
 	hasRequiredNode = 1;
 	(function (module, exports) {
 		const tty = require$$0__default$2["default"];
@@ -4528,8 +4547,8 @@ function requireNode () {
 			this.inspectOpts.colors = this.useColors;
 			return util.inspect(v, this.inspectOpts);
 		};
-} (node, node.exports));
-	return node.exports;
+} (node, nodeExports));
+	return nodeExports;
 }
 
 /**
@@ -4545,7 +4564,11 @@ function requireNode () {
 	}
 } (src));
 
-var compat = {exports: {}};
+var compatExports = {};
+var compat = {
+  get exports(){ return compatExports; },
+  set exports(v){ compatExports = v; },
+};
 
 /*!
  * depd
@@ -4779,8 +4802,8 @@ function requireEventListenerCount () {
  * Module dependencies.
  */
 
-var callSiteToString = compat.exports.callSiteToString;
-var eventListenerCount = compat.exports.eventListenerCount;
+var callSiteToString = compatExports.callSiteToString;
+var eventListenerCount = compatExports.eventListenerCount;
 var relative = require$$1__default["default"].relative;
 
 /**
@@ -5306,7 +5329,7 @@ var constants = {
 
 const OriginalAgent = require$$0__default$4["default"].Agent;
 const ms = humanizeMs;
-const debug = src.exports('agentkeepalive');
+const debug = srcExports('agentkeepalive');
 const deprecate = depd_1('agentkeepalive');
 const {
   INIT_SOCKET: INIT_SOCKET$1,
@@ -5758,7 +5781,7 @@ var https_agent = HttpsAgent;
 	module.exports.constants = constants;
 } (agentkeepalive));
 
-var HttpKeepAliveAgent = /*@__PURE__*/getDefaultExportFromCjs(agentkeepalive.exports);
+var HttpKeepAliveAgent = /*@__PURE__*/getDefaultExportFromCjs(agentkeepaliveExports);
 
 var objToString = Object.prototype.toString;
 var objKeys = Object.keys || function(obj) {
@@ -5981,6 +6004,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 = WebsocketFactory__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) {
+    const readyState = this.underlyingSocket?.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) {
+    const readyState = this.underlyingSocket?.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
 
@@ -6360,7 +6433,7 @@ function createRpcClient(url, httpHeaders, customFetch, fetchMiddleware, disable
         };
 
         if (url.startsWith('https:')) {
-          agent = new agentkeepalive.exports.HttpsAgent(agentOptions);
+          agent = new agentkeepaliveExports.HttpsAgent(agentOptions);
         } else {
           agent = new HttpKeepAliveAgent(agentOptions);
         }
@@ -7310,7 +7383,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
     });
@@ -9758,7 +9831,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();
@@ -10106,9 +10183,7 @@ class Connection {
    */
   args) {
     const clientSubscriptionId = this._nextClientSubscriptionId++;
-    const hash = fastStableStringify$1([subscriptionConfig.method, args], true
-    /* isArrayProp */
-    );
+    const hash = fastStableStringify$1([subscriptionConfig.method, args]);
     const existingSubscription = this._subscriptionsByHash[hash];
 
     if (existingSubscription === undefined) {