@solana/web3.js 1.5.1 → 1.6.1

package/lib/index.cjs.js

@@ -2488,22 +2488,38 @@ const SimulatedTransactionResponseStruct = jsonRpcResultAndContext(superstruct.t
   logs: superstruct.nullable(superstruct.array(superstruct.string()))
 }));
 
-function createRpcClient(url, useHttps) {
+function createRpcClient(url, useHttps, httpHeaders, fetchMiddleware) {
   let agentManager;
 
   {
     agentManager = new AgentManager(useHttps);
   }
 
+  let fetchWithMiddleware;
+
+  if (fetchMiddleware) {
+    fetchWithMiddleware = (url, options) => {
+      return new Promise((resolve, reject) => {
+        fetchMiddleware(url, options, async (url, options) => {
+          try {
+            resolve(await fetch__default['default'](url, options));
+          } catch (error) {
+            reject(error);
+          }
+        });
+      });
+    };
+  }
+
   const clientBrowser = new RpcClient__default['default'](async (request, callback) => {
     const agent = agentManager ? agentManager.requestStart() : undefined;
     const options = {
       method: 'POST',
       body: request,
       agent,
-      headers: {
+      headers: Object.assign({
         'Content-Type': 'application/json'
-      }
+      }, httpHeaders || {})
     };
 
     try {
@@ -2512,7 +2528,11 @@ function createRpcClient(url, useHttps) {
       let waitTime = 500;
 
       for (;;) {
-        res = await fetch__default['default'](url, options);
+        if (fetchWithMiddleware) {
+          res = await fetchWithMiddleware(url, options);
+        } else {
+          res = await fetch__default['default'](url, options);
+        }
 
         if (res.status !== 429
         /* Too many requests */
@@ -3140,9 +3160,9 @@ class Connection {
    * Establish a JSON RPC connection
    *
    * @param endpoint URL to the fullnode JSON RPC endpoint
-   * @param commitment optional default commitment level
+   * @param commitmentOrConfig optional default commitment level or optional ConnectionConfig configuration object
    */
-  constructor(endpoint, commitment) {
+  constructor(endpoint, commitmentOrConfig) {
     _defineProperty__default['default'](this, "_commitment", void 0);
 
     _defineProperty__default['default'](this, "_rpcEndpoint", void 0);
@@ -3194,10 +3214,20 @@ class Connection {
     this._rpcEndpoint = endpoint;
     let url$1 = url.parse(endpoint);
     const useHttps = url$1.protocol === 'https:';
-    this._rpcClient = createRpcClient(url$1.href, useHttps);
+    let httpHeaders;
+    let fetchMiddleware;
+
+    if (commitmentOrConfig && typeof commitmentOrConfig === 'string') {
+      this._commitment = commitmentOrConfig;
+    } else if (commitmentOrConfig) {
+      this._commitment = commitmentOrConfig.commitment;
+      httpHeaders = commitmentOrConfig.httpHeaders;
+      fetchMiddleware = commitmentOrConfig.fetchMiddleware;
+    }
+
+    this._rpcClient = createRpcClient(url$1.href, useHttps, httpHeaders, fetchMiddleware);
     this._rpcRequest = createRpcRequest(this._rpcClient);
     this._rpcBatchRequest = createRpcBatchRequest(this._rpcClient);
-    this._commitment = commitment;
     this._blockhashInfo = {
       recentBlockhash: null,
       lastFetch: 0,