Revert "remove dependency on memory queue from kv cache"

james-elicx · james-elicx · commit d33af3c0fcb4 · 2025-02-10T08:47:29.000Z
This reverts commit 42739ae.
diff --git a/packages/cloudflare/package.json b/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@734",
+    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@731",
     "enquirer": "^2.4.1",
     "glob": "catalog:",
     "yaml": "^2.7.0"
diff --git a/packages/cloudflare/src/api/kv-cache.ts b/packages/cloudflare/src/api/kv-cache.ts
@@ -2,6 +2,7 @@ import type { CacheValue, IncrementalCache, WithLastModified } from "@opennextjs
 import { IgnorableError, RecoverableError } from "@opennextjs/aws/utils/error.js";
 
 import { getCloudflareContext } from "./cloudflare-context.js";
+import memoryQueue from "./memory-queue.js";
 
 export const CACHE_ASSET_DIR = "cdn-cgi/_next_cache";
 
@@ -116,6 +117,8 @@ class Cache implements IncrementalCache {
       );
     } catch {
       throw new RecoverableError(`Failed to set cache [${key}]`);
+    } finally {
+      memoryQueue.remove(key);
     }
   }
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ import type { CacheValue, IncrementalCache, WithLastModified } from "@opennextjs`
`2`	`2`	`import { IgnorableError, RecoverableError } from "@opennextjs/aws/utils/error.js";`
`3`	`3`
`4`	`4`	`import { getCloudflareContext } from "./cloudflare-context.js";`
	`5`	`+import memoryQueue from "./memory-queue.js";`
`5`	`6`
`6`	`7`	`export const CACHE_ASSET_DIR = "cdn-cgi/_next_cache";`
`7`	`8`
`@@ -116,6 +117,8 @@ class Cache implements IncrementalCache {`
`116`	`117`	`);`
`117`	`118`	`} catch {`
`118`	`119`	throw new RecoverableError(`Failed to set cache [${key}]`);
	`120`	`+ } finally {`
	`121`	`+ memoryQueue.remove(key);`
`119`	`122`	`}`
`120`	`123`	`}`
`121`	`124`