@solana/web3.js 1.14.1 → 1.15.1

package/lib/index.browser.esm.js

@@ -4286,6 +4286,24 @@ function promiseTimeout(promise, timeoutMs) {
   });
 }
 
+function makeWebsocketUrl(endpoint) {
+  let url = urlParse(endpoint);
+  const useHttps = url.protocol === 'https:';
+  url.protocol = useHttps ? 'wss:' : 'ws:';
+  url.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.port !== null) {
+    url.port = String(Number(url.port) + 1);
+  }
+
+  return urlFormat(url);
+}
+
 const PublicKeyFromString = coerce(instance(PublicKey), string(), value => new PublicKey(value));
 const RawAccountDataResult = tuple([string(), literal('base64')]);
 const BufferFromRawAccountData = coerce(instance(Buffer), RawAccountDataResult, value => Buffer.from(value[0], 'base64'));
@@ -5151,6 +5169,10 @@ class Connection {
 
   /** @internal */
 
+  /** @internal */
+
+  /** @internal */
+
   /**
    * Establish a JSON RPC connection
    *
@@ -5168,6 +5190,13 @@ class Connection {
 
     _defineProperty(this, "_pollingBlockhash", false);
 
+    _defineProperty(this, "_blockhashInfo", {
+      recentBlockhash: null,
+      lastFetch: 0,
+      transactionSignatures: [],
+      simulatedSignatures: []
+    });
+
     _defineProperty(this, "_accountChangeSubscriptionCounter", 0);
 
     _defineProperty(this, "_accountChangeSubscriptions", {});
@@ -5196,9 +5225,9 @@ class Connection {
 
     _defineProperty(this, "_slotUpdateSubscriptions", {});
 
-    this._rpcEndpoint = endpoint;
     let url = urlParse(endpoint);
     const useHttps = url.protocol === 'https:';
+    let wsEndpoint;
     let httpHeaders;
     let fetchMiddleware;
 
@@ -5206,32 +5235,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.href, useHttps, httpHeaders, fetchMiddleware);
     this._rpcRequest = createRpcRequest(this._rpcClient);
     this._rpcBatchRequest = createRpcBatchRequest(this._rpcClient);
-    this._blockhashInfo = {
-      recentBlockhash: null,
-      lastFetch: 0,
-      transactionSignatures: [],
-      simulatedSignatures: []
-    };
-    url.protocol = useHttps ? 'wss:' : 'ws:';
-    url.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.port !== null) {
-      url.port = String(Number(url.port) + 1);
-    }
-
-    this._rpcWebSocket = new Client(urlFormat(url), {
+    this._rpcWebSocket = new Client(this._rpcWsEndpoint, {
       autoconnect: false,
       max_reconnects: Infinity
     });