fix: withCache errors cached forever (#598)

* fix withCache errors cached forever * chore: changeset --------- Co-authored-by: moxey.eth <[email protected]>
wevm · May 29, 2023 · baea299 · baea299 · vercel · May 29, 2023
1 parent 57bf239
commit baea299
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/.changeset/brave-islands-agree.md b/.changeset/brave-islands-agree.md
@@ -0,0 +1,5 @@
+---
+"viem": patch
+---
+
+Fixed an issue in `withCache` where the promise cache would not clear upon rejection.
diff --git a/src/utils/promise/withCache.ts b/src/utils/promise/withCache.ts
@@ -59,15 +59,17 @@ export async function withCache<TData>(
     cache.promise.set(promise)
   }
 
-  const data = await promise
+  try {
+    const data = await promise
 
-  // Clear the promise cache so that subsequent invocations will
-  // invoke the promise again.
-  cache.promise.clear()
+    // Store the response in the cache so that subsequent invocations
+    // will return the same response.
+    cache.response.set({ created: new Date(), data })
 
-  // Store the response in the cache so that subsequent invocations
-  // will return the same response.
-  cache.response.set({ created: new Date(), data })
-
-  return data
+    return data
+  } finally {
+    // Clear the promise cache so that subsequent invocations will
+    // invoke the promise again.
+    cache.promise.clear()
+  }
 }