use generateShardId

Author: conico974

examples/e2e/app-router/open-next.config.ts

@@ -6,6 +6,6 @@ import shardedTagCache from "@opennextjs/cloudflare/do-sharded-tag-cache";
 
 export default defineCloudflareConfig({
   incrementalCache: kvIncrementalCache,
-  tagCache: shardedTagCache,
+  tagCache: shardedTagCache({ numberOfShards: 4 }),
   queue: doQueue,
 });

packages/cloudflare/package.json

@@ -73,12 +73,12 @@
   "dependencies": {
     "@ast-grep/napi": "^0.36.1",
     "@dotenvx/dotenvx": "catalog:",
-    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@773",
+    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@778",
     "enquirer": "^2.4.1",
     "glob": "catalog:",
     "yaml": "^2.7.0"
   },
   "peerDependencies": {
     "wrangler": "catalog:"
   }
-}
+}

packages/cloudflare/src/api/do-sharded-tag-cache.ts

@@ -1,15 +1,20 @@
 import { debug } from "@opennextjs/aws/adapters/logger.js";
-import { generateMessageGroupId } from "@opennextjs/aws/core/routing/queue.js";
+import { generateShardId } from "@opennextjs/aws/core/routing/queue.js";
 import type { OpenNextConfig } from "@opennextjs/aws/types/open-next";
 import type { NextModeTagCache } from "@opennextjs/aws/types/overrides.js";
 import { IgnorableError } from "@opennextjs/aws/utils/error.js";
 
 import { getCloudflareContext } from "./cloudflare-context";
 
+interface ShardedD1TagCacheOptions {
+  numberOfShards: number;
+}
 class ShardedD1TagCache implements NextModeTagCache {
   mode = "nextMode" as const;
   public readonly name = "sharded-d1-tag-cache";
 
+  constructor(private opts: ShardedD1TagCacheOptions = { numberOfShards: 4 }) { }
+
   private getDurableObjectStub(shardId: string) {
     const durableObject = getCloudflareContext().env.NEXT_CACHE_D1_SHARDED;
     if (!durableObject) throw new IgnorableError("No durable object binding for cache revalidation");
@@ -20,7 +25,7 @@ class ShardedD1TagCache implements NextModeTagCache {
 
   private generateShards(tags: string[]) {
     // For each tag, we generate a message group id
-    const messageGroupIds = tags.map((tag) => ({ shardId: generateMessageGroupId(tag), tag }));
+    const messageGroupIds = tags.map((tag) => ({ shardId: generateShardId(tag, this.opts.numberOfShards, "shard"), tag }));
     // We group the tags by shard
     const shards = new Map<string, string[]>();
     for (const { shardId, tag } of messageGroupIds) {
@@ -54,23 +59,20 @@ class ShardedD1TagCache implements NextModeTagCache {
     const { isDisabled } = this.getConfig();
     if (isDisabled) return false;
     const shards = this.generateShards(tags);
-    let hasBeenRevalidated = false;
-    console.log("Checking revalidation for tags", tags, shards);
     // We then create a new durable object for each shard
-    await Promise.all(
+    const shardsResult = await Promise.all(
       Array.from(shards.entries()).map(async ([shardId, shardedTags]) => {
         const stub = this.getDurableObjectStub(shardId);
-        hasBeenRevalidated = hasBeenRevalidated || (await stub.hasBeenRevalidated(shardedTags, lastModified));
+        return stub.hasBeenRevalidated(shardedTags, lastModified)
       })
     );
-    return hasBeenRevalidated;
+    return shardsResult.some((result) => result);
   }
 
   async writeTags(tags: string[]): Promise<void> {
     const { isDisabled } = this.getConfig();
     if (isDisabled) return;
     const shards = this.generateShards(tags);
-    console.log("Writing tags", tags, shards);
     // We then create a new durable object for each shard
     await Promise.all(
       Array.from(shards.entries()).map(async ([shardId, shardedTags]) => {
@@ -81,4 +83,4 @@ class ShardedD1TagCache implements NextModeTagCache {
   }
 }
 
-export default new ShardedD1TagCache();
+export default (opts?: ShardedD1TagCacheOptions) => new ShardedD1TagCache(opts);

packages/cloudflare/src/api/durable-objects/sharded-tag-cache.ts

@@ -21,6 +21,7 @@ export class DOShardedTagCache extends DurableObject<CloudflareEnv> {
         lastModified ?? Date.now()
       )
       .one();
+      console.log("Checking revalidation for tags", tags, result);
     return result.cnt > 0;
   }
 
@@ -32,5 +33,6 @@ export class DOShardedTagCache extends DurableObject<CloudflareEnv> {
         Date.now()
       );
     });
+    console.log("Writing tags", tags);
   }
 }