small improvement to the memory-queue

Author: conico974

packages/cloudflare/src/api/memory-queue.ts

@@ -1,4 +1,4 @@
-import logger from "@opennextjs/aws/logger.js";
+import { debug,error } from "@opennextjs/aws/adapters/logger";
 import type { Queue, QueueMessage } from "@opennextjs/aws/types/overrides.js";
 import { IgnorableError } from "@opennextjs/aws/utils/error.js";
 
@@ -16,7 +16,7 @@ export const DEFAULT_REVALIDATION_TIMEOUT_MS = 10_000;
 export class MemoryQueue implements Queue {
   readonly name = "memory-queue";
 
-  revalidatedPaths = new Map<string, ReturnType<typeof setTimeout>>();
+  revalidatedPaths = new Set<string>();
 
   constructor(private opts = { revalidationTimeoutMs: DEFAULT_REVALIDATION_TIMEOUT_MS }) {}
 
@@ -26,10 +26,8 @@ export class MemoryQueue implements Queue {
 
     if (this.revalidatedPaths.has(MessageDeduplicationId)) return;
 
-    this.revalidatedPaths.set(
+    this.revalidatedPaths.add(
       MessageDeduplicationId,
-      // force remove to allow new revalidations incase something went wrong
-      setTimeout(() => this.revalidatedPaths.delete(MessageDeduplicationId), this.opts.revalidationTimeoutMs)
     );
 
     try {
@@ -38,17 +36,24 @@ export class MemoryQueue implements Queue {
       // TODO: Drop the import - https://github.com/opennextjs/opennextjs-cloudflare/issues/361
       // @ts-ignore
       const manifest = await import("./.next/prerender-manifest.json");
-      await service.fetch(`${protocol}://${host}${url}`, {
+      const response = await service.fetch(`${protocol}://${host}${url}`, {
         method: "HEAD",
         headers: {
           "x-prerender-revalidate": manifest.preview.previewModeId,
           "x-isr": "1",
         },
+        // We want to timeout the revalidation to avoid hanging the queue
+        signal: AbortSignal.timeout(this.opts.revalidationTimeoutMs),
       });
+
+      // Here we want at least to log when the revalidation was not successful
+      if(response.status !== 200 || response.headers.get("x-nextjs-cache") !== "REVALIDATED") {
+        error(`Revalidation failed for ${url} with status ${response.status}`);
+      }
+      debug(`Revalidation successful for ${url}`);
     } catch (e) {
-      logger.error(e);
+      error(e);
     } finally {
-      clearTimeout(this.revalidatedPaths.get(MessageDeduplicationId));
       this.revalidatedPaths.delete(MessageDeduplicationId);
     }
   }