@solana/web3.js 1.14.1 → 1.15.1

package/lib/index.iife.js

@@ -17962,6 +17962,24 @@ var solanaWeb3 = (function (exports) {
 	  });
 	}
 
+	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.Buffer), RawAccountDataResult, value => buffer.Buffer.from(value[0], 'base64'));
@@ -18827,6 +18845,10 @@ var solanaWeb3 = (function (exports) {
 
 	  /** @internal */
 
+	  /** @internal */
+
+	  /** @internal */
+
 	  /**
 	   * Establish a JSON RPC connection
 	   *
@@ -18844,6 +18866,13 @@ var solanaWeb3 = (function (exports) {
 
 	    _defineProperty(this, "_pollingBlockhash", false);
 
+	    _defineProperty(this, "_blockhashInfo", {
+	      recentBlockhash: null,
+	      lastFetch: 0,
+	      transactionSignatures: [],
+	      simulatedSignatures: []
+	    });
+
 	    _defineProperty(this, "_accountChangeSubscriptionCounter", 0);
 
 	    _defineProperty(this, "_accountChangeSubscriptions", {});
@@ -18872,9 +18901,9 @@ var solanaWeb3 = (function (exports) {
 
 	    _defineProperty(this, "_slotUpdateSubscriptions", {});
 
-	    this._rpcEndpoint = endpoint;
 	    let url = urlParse(endpoint);
 	    const useHttps = url.protocol === 'https:';
+	    let wsEndpoint;
 	    let httpHeaders;
 	    let fetchMiddleware;
 
@@ -18882,32 +18911,17 @@ var solanaWeb3 = (function (exports) {
 	      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_1(urlFormat(url), {
+	    this._rpcWebSocket = new Client_1(this._rpcWsEndpoint, {
 	      autoconnect: false,
 	      max_reconnects: Infinity
 	    });