@solana/web3.js 1.69.0 → 1.70.0

package/lib/index.cjs.js

@@ -11,11 +11,11 @@ var sha256 = require('@noble/hashes/sha256');
 var borsh = require('borsh');
 var BufferLayout = require('@solana/buffer-layout');
 var bigintBuffer = require('bigint-buffer');
+var https = require('https');
 var superstruct = require('superstruct');
 var rpcWebsockets = require('rpc-websockets');
 var RpcClient = require('jayson/lib/client/browser');
 var http = require('http');
-var https = require('https');
 var nodeFetch = require('node-fetch');
 var sha3 = require('@noble/hashes/sha3');
 var hmac = require('@noble/hashes/hmac');
@@ -45,9 +45,9 @@ var ed25519__namespace = /*#__PURE__*/_interopNamespace(ed25519);
 var BN__default = /*#__PURE__*/_interopDefaultLegacy(BN);
 var bs58__default = /*#__PURE__*/_interopDefaultLegacy(bs58);
 var BufferLayout__namespace = /*#__PURE__*/_interopNamespace(BufferLayout);
+var https__default = /*#__PURE__*/_interopDefaultLegacy(https);
 var RpcClient__default = /*#__PURE__*/_interopDefaultLegacy(RpcClient);
 var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
-var https__default = /*#__PURE__*/_interopDefaultLegacy(https);
 var nodeFetch__namespace = /*#__PURE__*/_interopNamespace(nodeFetch);
 var secp256k1__namespace = /*#__PURE__*/_interopNamespace(secp256k1);
 
@@ -3949,14 +3949,34 @@ const BlockProductionResponseStruct = jsonRpcResultAndContext(superstruct.type({
  * A performance sample
  */
 
-function createRpcClient(url, httpHeaders, customFetch, fetchMiddleware, disableRetryOnRateLimit) {
+function createRpcClient(url, httpHeaders, customFetch, fetchMiddleware, disableRetryOnRateLimit, httpAgent) {
   const fetch = customFetch ? customFetch : fetchImpl;
   let agentManager;
 
   {
-    agentManager = new AgentManager(url.startsWith('https:')
-    /* useHttps */
-    );
+    if (httpAgent == null) {
+      {
+        agentManager = new AgentManager(url.startsWith('https:')
+        /* useHttps */
+        );
+      }
+    } else {
+      if (httpAgent !== false) {
+        const isHttps = url.startsWith('https:');
+
+        if (isHttps && !(httpAgent instanceof https.Agent)) {
+          throw new Error('The endpoint `' + url + '` can only be paired with an `https.Agent`. You have, instead, supplied an ' + '`http.Agent` through `httpAgent`.');
+        } else if (!isHttps && httpAgent instanceof https.Agent) {
+          throw new Error('The endpoint `' + url + '` can only be paired with an `http.Agent`. You have, instead, supplied an ' + '`https.Agent` through `httpAgent`.');
+        }
+
+        agentManager = {
+          requestEnd() {},
+
+          requestStart: () => httpAgent
+        };
+      }
+    }
   }
 
   let fetchWithMiddleware;
@@ -4866,6 +4886,7 @@ class Connection {
     let fetch;
     let fetchMiddleware;
     let disableRetryOnRateLimit;
+    let httpAgent;
 
     if (commitmentOrConfig && typeof commitmentOrConfig === 'string') {
       this._commitment = commitmentOrConfig;
@@ -4877,11 +4898,12 @@ class Connection {
       fetch = commitmentOrConfig.fetch;
       fetchMiddleware = commitmentOrConfig.fetchMiddleware;
       disableRetryOnRateLimit = commitmentOrConfig.disableRetryOnRateLimit;
+      httpAgent = commitmentOrConfig.httpAgent;
     }
 
     this._rpcEndpoint = assertEndpointUrl(endpoint);
     this._rpcWsEndpoint = wsEndpoint || makeWebsocketUrl(endpoint);
-    this._rpcClient = createRpcClient(endpoint, httpHeaders, fetch, fetchMiddleware, disableRetryOnRateLimit);
+    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, {