fix: clear inflightRequests after each batch RPC call

Author: arcoraven

.changeset/late-bears-call.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+fix: Clear inflightRequests after each batch RPC call

packages/thirdweb/src/rpc/rpc.ts

@@ -90,7 +90,6 @@ export function getRpcClient(
       DEFAULT_BATCH_TIMEOUT_MS;
 
     // inflight requests
-    // biome-ignore lint/suspicious/noExplicitAny: TODO: fix any
     const inflightRequests = new Map<string, Promise<any>>();
 
     let pendingBatch: Array<{
@@ -100,9 +99,7 @@ export function getRpcClient(
         id: number;
         jsonrpc: "2.0";
       };
-      // biome-ignore lint/suspicious/noExplicitAny: TODO: fix any
       resolve: (value: any) => void;
-      // biome-ignore lint/suspicious/noExplicitAny: TODO: fix any
       reject: (reason?: any) => void;
       requestKey: string;
     }> = [];
@@ -138,46 +135,41 @@ export function getRpcClient(
         requestTimeoutMs: options.config?.requestTimeoutMs,
       })
         .then((responses) => {
-          // for each response, resolve the inflight request
           activeBatch.forEach((inflight, index) => {
+            // Handle the inflight request promise for each response.
             const response = responses[index];
-            // if we didn't get a response at all, reject the inflight request
+
+            // No response.
             if (!response) {
               inflight.reject(new Error("No response"));
-              return;
             }
-            // handle errors in the response
-            if (response instanceof Error) {
+            // Response is an error or error string.
+            else if (response instanceof Error) {
               inflight.reject(response);
-              return;
-            }
-
-            // handle strings as responses??
-            if (typeof response === "string") {
+            } else if ("error" in response) {
+              inflight.reject(response.error);
+            } else if (typeof response === "string") {
               inflight.reject(new Error(response));
-              return;
             }
-
-            if ("error" in response) {
-              inflight.reject(response.error);
-              // otherwise, resolve the inflight request
-            } else if (response.method === "eth_subscription") {
-              // TODO: handle subscription responses
-              throw new Error("Subscriptions not supported yet");
-            } else {
+            // eth_subscription is not supported yet.
+            else if (response.method === "eth_subscription") {
+              inflight.reject("Subscriptions not supported yet");
+            }
+            // Else return the successful response for the inflight request.
+            else {
               inflight.resolve(response.result);
             }
-            // remove the inflight request from the inflightRequests map
-            inflightRequests.delete(inflight.requestKey);
           });
         })
         .catch((err) => {
           // http call failed, reject all inflight requests
           for (const inflight of activeBatch) {
             inflight.reject(err);
-            // remove the inflight request from the inflightRequests map
-            inflightRequests.delete(inflight.requestKey);
           }
+        })
+        .finally(() => {
+          // Clear the inflight requests map so any new requests are re-fetched.
+          inflightRequests.clear();
         });
     }
 
@@ -186,9 +178,7 @@ export function getRpcClient(
       return async (request) => {
         // we can hard-code the id and jsonrpc version
         // we also mutate the request object here to avoid copying it
-        // biome-ignore lint/suspicious/noExplicitAny: TODO: fix any
         (request as any).id = 1;
-        // biome-ignore lint/suspicious/noExplicitAny: TODO: fix any
         (request as any).jsonrpc = "2.0";
         const rpcResponse = await fetchSingleRpc(rpcUrl, options.client, {
           request: request,
@@ -210,20 +200,15 @@ export function getRpcClient(
 
       // if the request for this key is already inflight, return the promise directly
       if (inflightRequests.has(requestKey)) {
-        // biome-ignore lint/style/noNonNullAssertion: the `has` check ensures this is defined
         return inflightRequests.get(requestKey)!;
       }
-      // biome-ignore lint/suspicious/noExplicitAny: TODO: fix any
       let resolve: (value: any) => void;
-      // biome-ignore lint/suspicious/noExplicitAny: TODO: fix any
       let reject: (reason?: any) => void;
-      // biome-ignore lint/suspicious/noExplicitAny: TODO: fix any
       const promise = new Promise<any>((resolve_, reject_) => {
         resolve = resolve_;
         reject = reject_;
       });
       inflightRequests.set(requestKey, promise);
-      // @ts-expect-error - they *are* definitely assgined within the promise constructor
       pendingBatch.push({ request, resolve, reject, requestKey });
       if (batchSize > 1) {
         // if there is no timeout, set one