limit scope

nitrojs · Mar 6, 2023 · d1e03d3 · d1e03d3
1 parent 9382261
commit d1e03d3
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/src/runtime/cache.ts b/src/runtime/cache.ts
@@ -92,25 +92,26 @@ export function defineCachedFunction<T = any>(
 
       try {
         entry.value = await pending[key];
-
+      } catch (error) {
+        // Make sure entries that reject get removed.
         if (!isPending) {
-          // Update mtime, integrity + validate and set the value in cache only the first time the request is made.
-          entry.mtime = Date.now();
-          entry.integrity = integrity;
           delete pending[key];
-          if (validate(entry)) {
-            useStorage()
-              .setItem(cacheKey, entry)
-              .catch((error) => console.error("[nitro] [cache]", error));
-          }
         }
-      } catch (error) {
-        // Make sure entries that reject get removed.
-        delete pending[key];
-
         // Re-throw error to make sure the caller knows the task failed.
         throw error;
       }
+
+      if (!isPending) {
+        // Update mtime, integrity + validate and set the value in cache only the first time the request is made.
+        entry.mtime = Date.now();
+        entry.integrity = integrity;
+        delete pending[key];
+        if (validate(entry)) {
+          useStorage()
+            .setItem(cacheKey, entry)
+            .catch((error) => console.error("[nitro] [cache]", error));
+        }
+      }
     };
 
     const _resolvePromise = expired ? _resolve() : Promise.resolve();