@solana/web3.js 1.14.1 → 1.15.1

package/lib/index.d.ts

@@ -1285,6 +1285,8 @@ declare module '@solana/web3.js' {
   export type ConnectionConfig = {
     /** Optional commitment level */
     commitment?: Commitment;
+    /** Optional endpoint URL to the fullnode JSON RPC PubSub WebSocket Endpoint */
+    wsEndpoint?: string;
     /** Optional HTTP headers object */
     httpHeaders?: HttpHeaders;
     /** Optional fetch middleware callback */

package/lib/index.esm.js

@@ -8,7 +8,7 @@ import { sha256 } from 'crypto-hash';
 import { serialize, deserialize } from 'borsh';
 import * as BufferLayout from 'buffer-layout';
 import invariant from 'assert';
-import { parse, format } from 'url';
+import { format, parse } from 'url';
 import fetch from 'node-fetch';
 import { coerce, instance, string, tuple, literal, unknown, union, type, optional, any, number, array, nullable, create, boolean, record, assert } from 'superstruct';
 import { Client } from 'rpc-websockets';
@@ -2340,6 +2340,24 @@ function promiseTimeout(promise, timeoutMs) {
   });
 }
 
+function makeWebsocketUrl(endpoint) {
+  let url = parse(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 format(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'));
@@ -3211,6 +3229,10 @@ class Connection {
 
   /** @internal */
 
+  /** @internal */
+
+  /** @internal */
+
   /**
    * Establish a JSON RPC connection
    *
@@ -3228,6 +3250,13 @@ class Connection {
 
     _defineProperty(this, "_pollingBlockhash", false);
 
+    _defineProperty(this, "_blockhashInfo", {
+      recentBlockhash: null,
+      lastFetch: 0,
+      transactionSignatures: [],
+      simulatedSignatures: []
+    });
+
     _defineProperty(this, "_accountChangeSubscriptionCounter", 0);
 
     _defineProperty(this, "_accountChangeSubscriptions", {});
@@ -3256,9 +3285,9 @@ class Connection {
 
     _defineProperty(this, "_slotUpdateSubscriptions", {});
 
-    this._rpcEndpoint = endpoint;
     let url = parse(endpoint);
     const useHttps = url.protocol === 'https:';
+    let wsEndpoint;
     let httpHeaders;
     let fetchMiddleware;
 
@@ -3266,32 +3295,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(format(url), {
+    this._rpcWebSocket = new Client(this._rpcWsEndpoint, {
       autoconnect: false,
       max_reconnects: Infinity
     });