fix tag cache

Author: Nicolas Dorseuil

packages/gitbook-v2/openNext/customWorkers/do.js

@@ -19,66 +19,10 @@ export class R2WriteBuffer extends DurableObject {
     }
 }
 
-// TODO: replace once i figured out why `revalidateTag` is not working in preview
-export class DOShardedTagCache extends DurableObject {
-    sql;
-
-    constructor(state, env) {
-        super(state, env);
-        this.sql = state.storage.sql;
-        state.blockConcurrencyWhile(async () => {
-            this.sql.exec(
-                'CREATE TABLE IF NOT EXISTS revalidations (tag TEXT PRIMARY KEY, revalidatedAt INTEGER)'
-            );
-        });
-    }
-
-    async getLastRevalidated(tags) {
-        try {
-            const result = this.sql
-                .exec(
-                    `SELECT MAX(revalidatedAt) AS time FROM revalidations WHERE tag IN (${tags.map(() => '?').join(', ')})`,
-                    ...tags
-                )
-                .toArray();
-            console.log('getLastRevalidated', tags, result);
-            if (result.length === 0) return 0;
-            // We only care about the most recent revalidation
-            return result[0]?.time ?? 0;
-        } catch (e) {
-            console.error(e);
-            // By default we don't want to crash here, so we return 0
-            return 0;
-        }
-    }
-
-    async hasBeenRevalidated(tags, lastModified) {
-        const result = this.sql
-            .exec(
-                `SELECT 1 FROM revalidations WHERE tag IN (${tags.map(() => '?').join(', ')}) AND revalidatedAt > ? LIMIT 1`,
-                ...tags,
-                lastModified ?? Date.now()
-            )
-            .toArray();
-
-        console.log('hasBeenRevalidated', tags, lastModified, result);
-        return result.length > 0;
-    }
-
-    async writeTags(tags, lastModified) {
-        console.log('writeTags', tags, lastModified);
-        tags.forEach((tag) => {
-            this.sql.exec(
-                'INSERT OR REPLACE INTO revalidations (tag, revalidatedAt) VALUES (?, ?)',
-                tag,
-                lastModified
-            );
-        });
-    }
-}
-
 export { DOQueueHandler } from '../../.open-next/.build/durable-objects/queue.js';
 
+export { DOShardedTagCache } from '../../.open-next/.build/durable-objects/sharded-tag-cache.js';
+
 export default {
     async fetch() {
         // This worker does not handle any requests, it only provides Durable Objects

packages/gitbook-v2/openNext/tagCache/middleware.ts

@@ -6,6 +6,8 @@ import { softTagFilter } from '@opennextjs/cloudflare/overrides/tag-cache/tag-ca
 const originalTagCache = doShardedTagCache({
     baseShardSize: 12,
     regionalCache: true,
+    // We can probably increase this value even further
+    regionalCacheTtlSec: 60,
     shardReplication: {
         numberOfSoftReplicas: 2,
         numberOfHardReplicas: 1,
@@ -35,7 +37,7 @@ export default {
             }
         );
     },
-    hasBeenRevalidated: async (tags: string[]) => {
+    hasBeenRevalidated: async (tags: string[], lastModified?: number) => {
         const tagsToCheck = tags.filter(softTagFilter);
         if (tagsToCheck.length === 0) {
             // If we reach here, it probably means that there is an issue that we'll need to address.
@@ -51,7 +53,7 @@ export default {
                 name: tagsToCheck.join(', '),
             },
             async () => {
-                const result = await originalTagCache.hasBeenRevalidated(tagsToCheck);
+                const result = await originalTagCache.hasBeenRevalidated(tagsToCheck, lastModified);
                 return result;
             }
         );