Do not serve stale values from the assets when there is no KV

.changeset/fluffy-taxis-rescue.md

@@ -0,0 +1,5 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+bump `@opennextjs/aws` dependency to `https://pkg.pr.new/@opennextjs/aws@727`

.changeset/spotty-baboons-rule.md

@@ -0,0 +1,5 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+Fix: make sure that the kvCache doesn't serve stale cache values from assets when there is no KV binding

packages/cloudflare/package.json

@@ -73,7 +73,7 @@
   "dependencies": {
     "@ast-grep/napi": "^0.34.1",
     "@dotenvx/dotenvx": "catalog:",
-    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@724",
+    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@727",
     "enquirer": "^2.4.1",
     "glob": "catalog:",
     "ts-morph": "catalog:",

packages/cloudflare/src/api/kvCache.ts

@@ -1,4 +1,9 @@
-import type { CacheValue, IncrementalCache, WithLastModified } from "@opennextjs/aws/types/overrides";
+import type {
+  CachedFetchValue,
+  CacheValue,
+  IncrementalCache,
+  WithLastModified,
+} from "@opennextjs/aws/types/overrides";
 import { IgnorableError, RecoverableError } from "@opennextjs/aws/utils/error.js";
 
 import { getCloudflareContext } from "./cloudflare-context.js";
@@ -20,7 +25,7 @@ class Cache implements IncrementalCache {
   async get<IsFetch extends boolean = false>(
     key: string,
     isFetch?: IsFetch
-  ): Promise<WithLastModified<CacheValue<IsFetch>>> {
+  ): Promise<WithLastModified<CacheValue<IsFetch>> | null> {
     const cfEnv = getCloudflareContext().env;
     const kv = cfEnv.NEXT_CACHE_WORKERS_KV;
     const assets = cfEnv.ASSETS;
@@ -43,7 +48,7 @@ class Cache implements IncrementalCache {
         const kvKey = this.getKVKey(key, isFetch);
         entry = await kv.get(kvKey, "json");
         if (entry?.status === STATUS_DELETED) {
-          return {};
+          return null;
         }
       }
 
@@ -61,7 +66,22 @@ class Cache implements IncrementalCache {
             lastModified: (globalThis as { __BUILD_TIMESTAMP_MS__?: number }).__BUILD_TIMESTAMP_MS__,
           };
         }
+        if (!kv) {
+          // The cache can not be updated when there is no KV
+          // As we don't want to keep serving stale data for ever,
+          // we pretend the entry is not in cache
+          const entryValue = entry?.value as CachedFetchValue;
+          if (entryValue?.kind === "FETCH") {
+            const expires = entryValue.data.headers?.expires;
+            const expiresTime = new Date(expires as string).getTime();
+            if (!isNaN(expiresTime) && expiresTime <= Date.now()) {
+              this.debug(`found expired entry (expire time: ${expires})`);
+              return null;
+            }
+          }
+        }
       }
+
       this.debug(entry ? `-> hit` : `-> miss`);
       return { value: entry?.value, lastModified: entry?.lastModified };
     } catch {