review

Author: conico974

packages/cloudflare/src/api/constants.ts

@@ -0,0 +1 @@
+export const DEFAULT_NEXT_CACHE_D1_REVALIDATIONS_TABLE = "revalidations";

packages/cloudflare/src/api/d1-next-tag-cache.ts

@@ -4,18 +4,19 @@ import type { NextModeTagCache } from "@opennextjs/aws/types/overrides.js";
 import { RecoverableError } from "@opennextjs/aws/utils/error.js";
 
 import { getCloudflareContext } from "./cloudflare-context.js";
+import { DEFAULT_NEXT_CACHE_D1_REVALIDATIONS_TABLE } from "./constants.js";
 
 export class D1NextModeTagCache implements NextModeTagCache {
-  mode = "nextMode" as const;
-  name = "d1-next-mode-tag-cache";
+  readonly mode = "nextMode" as const;
+  readonly name = "d1-next-mode-tag-cache";
 
   async hasBeenRevalidated(tags: string[], lastModified?: number): Promise<boolean> {
     const { isDisabled, db, tables } = this.getConfig();
     if (isDisabled) return false;
     try {
       const result = await db
         .prepare(
-          `SELECT COUNT(*) as cnt FROM ${JSON.stringify(tables.revalidations)} WHERE tag IN (${tags.map(() => "?").join(", ")}) AND revalidatedAt > ?`
+          `SELECT COUNT(*) as cnt FROM ${JSON.stringify(tables.revalidations)} WHERE tag IN (${tags.map(() => "?").join(", ")}) AND revalidatedAt > ? LIMIT 1`
         )
         .bind(...tags.map((tag) => this.getCacheKey(tag)), lastModified ?? Date.now())
         .first<{ cnt: number }>();
@@ -60,7 +61,7 @@ export class D1NextModeTagCache implements NextModeTagCache {
       isDisabled: false as const,
       db,
       tables: {
-        revalidations: cfEnv.NEXT_CACHE_D1_REVALIDATIONS_TABLE ?? "revalidations",
+        revalidations: cfEnv.NEXT_CACHE_D1_REVALIDATIONS_TABLE ?? DEFAULT_NEXT_CACHE_D1_REVALIDATIONS_TABLE,
       },
     };
   }

packages/cloudflare/src/api/d1-tag-cache.ts

@@ -4,6 +4,7 @@ import type { OriginalTagCache } from "@opennextjs/aws/types/overrides.js";
 import { RecoverableError } from "@opennextjs/aws/utils/error.js";
 
 import { getCloudflareContext } from "./cloudflare-context.js";
+import { DEFAULT_NEXT_CACHE_D1_REVALIDATIONS_TABLE } from "./constants.js";
 
 /**
  * An instance of the Tag Cache that uses a D1 binding (`NEXT_CACHE_D1`) as it's underlying data store.
@@ -154,7 +155,7 @@ class D1TagCache implements OriginalTagCache {
       db,
       tables: {
         tags: cfEnv.NEXT_CACHE_D1_TAGS_TABLE ?? "tags",
-        revalidations: cfEnv.NEXT_CACHE_D1_REVALIDATIONS_TABLE ?? "revalidations",
+        revalidations: cfEnv.NEXT_CACHE_D1_REVALIDATIONS_TABLE ?? DEFAULT_NEXT_CACHE_D1_REVALIDATIONS_TABLE,
       },
     };
   }