make it work with original mode

Author: conico974

packages/open-next/src/adapters/composable-cache.ts

@@ -15,6 +15,28 @@ export default {
 
       debug("composable cache result", result);
 
+      // We need to check if the tags associated with this entry has been revalidated
+      if (
+        globalThis.tagCache.mode === "nextMode" &&
+        result.value.tags.length > 0
+      ) {
+        const hasBeenRevalidated = await globalThis.tagCache.hasBeenRevalidated(
+          result.value.tags,
+          result.lastModified,
+        );
+        if (hasBeenRevalidated) return undefined;
+      } else if (
+        globalThis.tagCache.mode === "original" ||
+        globalThis.tagCache.mode === undefined
+      ) {
+        const hasBeenRevalidated =
+          (await globalThis.tagCache.getLastModified(
+            cacheKey,
+            result.lastModified,
+          )) === -1;
+        if (hasBeenRevalidated) return undefined;
+      }
+
       return {
         ...result.value,
         value: toReadableStream(result.value.value),
@@ -36,6 +58,15 @@ export default {
       },
       "composable",
     );
+    if (globalThis.tagCache.mode === "original") {
+      const storedTags = await globalThis.tagCache.getByPath(cacheKey);
+      const tagsToWrite = entry.tags.filter((tag) => !storedTags.includes(tag));
+      if (tagsToWrite.length > 0) {
+        await globalThis.tagCache.writeTags(
+          tagsToWrite.map((tag) => ({ tag, path: cacheKey })),
+        );
+      }
+    }
   },
 
   async refreshTags() {
@@ -46,12 +77,33 @@ export default {
     if (globalThis.tagCache.mode === "nextMode") {
       return globalThis.tagCache.getLastRevalidated(tags);
     }
-    //TODO: Not supported for now - I'll need to figure out a way, maybe we'd want to merge both type into one
+    // We always return 0 here, original tag cache are handled directly in the get part
+    // TODO: We need to test this more, i'm not entirely sure that this is working as expected
     return 0;
   },
   async expireTags(...tags: string[]) {
     if (globalThis.tagCache.mode === "nextMode") {
       return globalThis.tagCache.writeTags(tags);
     }
+    const tagCache = globalThis.tagCache;
+    const revalidatedAt = Date.now();
+    // For the original mode, we have more work to do here.
+    // We need to find all paths linked to to these tags
+    const pathsToUpdate = await Promise.all(
+      tags.map(async (tag) => {
+        const paths = await tagCache.getByTag(tag);
+        return paths.map((path) => ({
+          path,
+          tag,
+          revalidatedAt,
+        }));
+      }),
+    );
+    // We need to deduplicate paths, we use a set for that
+    const setToWrite = new Set<{ path: string; tag: string }>();
+    for (const entry of pathsToUpdate.flat()) {
+      setToWrite.add(entry);
+    }
+    await globalThis.tagCache.writeTags(Array.from(setToWrite));
   },
 } satisfies ComposableCacheHandler;

packages/open-next/src/overrides/tagCache/fs-dev.ts

@@ -2,6 +2,7 @@ import type { TagCache } from "types/overrides";
 
 import fs from "node:fs";
 
+// TODO: fix this for monorepo
 const tagFile = "../../dynamodb-provider/dynamodb-cache.json";
 
 const tagContent = fs.readFileSync(tagFile, "utf-8");
@@ -44,7 +45,7 @@ const tagCache: TagCache = {
       newTags.map((tag) => ({
         tag: { S: tag.tag },
         path: { S: tag.path },
-        revalidatedAt: { N: String(tag.revalidatedAt) },
+        revalidatedAt: { N: String(tag.revalidatedAt ?? 1) },
       })),
     );
   },