@solana/web3.js 1.14.1 → 1.15.1

package/lib/index.cjs.js

@@ -2378,6 +2378,24 @@ function promiseTimeout(promise, timeoutMs) {
   });
 }
 
+function makeWebsocketUrl(endpoint) {
+  let url$1 = url.parse(endpoint);
+  const useHttps = url$1.protocol === 'https:';
+  url$1.protocol = useHttps ? 'wss:' : 'ws:';
+  url$1.host = ''; // Only shift the port by +1 as a convention for ws(s) only if given endpoint
+  // is explictly specifying the endpoint port (HTTP-based RPC), assuming
+  // we're directly trying to connect to solana-validator's ws listening port.
+  // When the endpoint omits the port, we're connecting to the protocol
+  // default ports: http(80) or https(443) and it's assumed we're behind a reverse
+  // proxy which manages WebSocket upgrade and backend port redirection.
+
+  if (url$1.port !== null) {
+    url$1.port = String(Number(url$1.port) + 1);
+  }
+
+  return url.format(url$1);
+}
+
 const PublicKeyFromString = superstruct.coerce(superstruct.instance(PublicKey), superstruct.string(), value => new PublicKey(value));
 const RawAccountDataResult = superstruct.tuple([superstruct.string(), superstruct.literal('base64')]);
 const BufferFromRawAccountData = superstruct.coerce(superstruct.instance(buffer.Buffer), RawAccountDataResult, value => buffer.Buffer.from(value[0], 'base64'));
@@ -3249,6 +3267,10 @@ class Connection {
 
   /** @internal */
 
+  /** @internal */
+
+  /** @internal */
+
   /**
    * Establish a JSON RPC connection
    *
@@ -3266,6 +3288,13 @@ class Connection {
 
     _defineProperty__default['default'](this, "_pollingBlockhash", false);
 
+    _defineProperty__default['default'](this, "_blockhashInfo", {
+      recentBlockhash: null,
+      lastFetch: 0,
+      transactionSignatures: [],
+      simulatedSignatures: []
+    });
+
     _defineProperty__default['default'](this, "_accountChangeSubscriptionCounter", 0);
 
     _defineProperty__default['default'](this, "_accountChangeSubscriptions", {});
@@ -3294,9 +3323,9 @@ class Connection {
 
     _defineProperty__default['default'](this, "_slotUpdateSubscriptions", {});
 
-    this._rpcEndpoint = endpoint;
     let url$1 = url.parse(endpoint);
     const useHttps = url$1.protocol === 'https:';
+    let wsEndpoint;
     let httpHeaders;
     let fetchMiddleware;
 
@@ -3304,32 +3333,17 @@ class Connection {
       this._commitment = commitmentOrConfig;
     } else if (commitmentOrConfig) {
       this._commitment = commitmentOrConfig.commitment;
+      wsEndpoint = commitmentOrConfig.wsEndpoint;
       httpHeaders = commitmentOrConfig.httpHeaders;
       fetchMiddleware = commitmentOrConfig.fetchMiddleware;
     }
 
+    this._rpcEndpoint = endpoint;
+    this._rpcWsEndpoint = wsEndpoint || makeWebsocketUrl(endpoint);
     this._rpcClient = createRpcClient(url$1.href, useHttps, httpHeaders, fetchMiddleware);
     this._rpcRequest = createRpcRequest(this._rpcClient);
     this._rpcBatchRequest = createRpcBatchRequest(this._rpcClient);
-    this._blockhashInfo = {
-      recentBlockhash: null,
-      lastFetch: 0,
-      transactionSignatures: [],
-      simulatedSignatures: []
-    };
-    url$1.protocol = useHttps ? 'wss:' : 'ws:';
-    url$1.host = ''; // Only shift the port by +1 as a convention for ws(s) only if given endpoint
-    // is explictly specifying the endpoint port (HTTP-based RPC), assuming
-    // we're directly trying to connect to solana-validator's ws listening port.
-    // When the endpoint omits the port, we're connecting to the protocol
-    // default ports: http(80) or https(443) and it's assumed we're behind a reverse
-    // proxy which manages WebSocket upgrade and backend port redirection.
-
-    if (url$1.port !== null) {
-      url$1.port = String(Number(url$1.port) + 1);
-    }
-
-    this._rpcWebSocket = new rpcWebsockets.Client(url.format(url$1), {
+    this._rpcWebSocket = new rpcWebsockets.Client(this._rpcWsEndpoint, {
       autoconnect: false,
       max_reconnects: Infinity
     });