fix(cache): set cache item before returning response on first request (…

…#1813)
nitrojs · Oct 19, 2023 · bfe1eaa · bfe1eaa
1 parent 3e9302a
commit bfe1eaa
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/src/runtime/cache.ts b/src/runtime/cache.ts
@@ -129,7 +129,9 @@ export function defineCachedFunction<T, ArgsT extends unknown[] = unknown[]>(
 
     const _resolvePromise = expired ? _resolve() : Promise.resolve();
 
-    if (expired && event && event.waitUntil) {
+    if (entry.value === undefined) {
+      await _resolvePromise;
+    } else if (expired && event && event.waitUntil) {
       event.waitUntil(_resolvePromise);
     }
 

diff --git a/test/fixture/api/cached.ts b/test/fixture/api/cached.ts
@@ -0,0 +1,3 @@
+export default defineCachedEventHandler(() => {
+  return Date.now();
+});
diff --git a/test/tests.ts b/test/tests.ts
@@ -601,4 +601,20 @@ export function testNitro(
       expect(data.runtimeConfig.secret).toBeUndefined();
     });
   });
+
+  describe("cache", () => {
+    it("should setItem before returning response the first time", async () => {
+      const { data: timestamp } = await callHandler({ url: "/api/cached" });
+
+      const calls = await Promise.all([
+        callHandler({ url: "/api/cached" }),
+        callHandler({ url: "/api/cached" }),
+        callHandler({ url: "/api/cached" }),
+      ]);
+
+      for (const call of calls) {
+        expect(call.data).toBe(timestamp);
+      }
+    });
+  });
 }