@opennextjs/cloudflare 0.5.9 → 0.5.10

package/dist/api/cloudflare-context.d.ts

@@ -4,6 +4,7 @@ declare global {
         NEXT_CACHE_D1?: D1Database;
         NEXT_CACHE_D1_TAGS_TABLE?: string;
         NEXT_CACHE_D1_REVALIDATIONS_TABLE?: string;
+        NEXT_CACHE_REVALIDATION_WORKER?: Service;
         ASSETS?: Fetcher;
     }
 }

package/dist/api/memory-queue.d.ts

@@ -4,6 +4,8 @@ export declare const DEFAULT_REVALIDATION_TIMEOUT_MS = 10000;
  * The Memory Queue offers basic ISR revalidation by directly requesting a revalidation of a route.
  *
  * It offers basic support for in-memory de-duping per isolate.
+ *
+ * A service binding called `NEXT_CACHE_REVALIDATION_WORKER` that points to your worker is required.
  */
 export declare class MemoryQueue implements Queue {
     private opts;

package/dist/api/memory-queue.js

@@ -1,9 +1,13 @@
 import logger from "@opennextjs/aws/logger.js";
+import { IgnorableError } from "@opennextjs/aws/utils/error.js";
+import { getCloudflareContext } from "./cloudflare-context";
 export const DEFAULT_REVALIDATION_TIMEOUT_MS = 10_000;
 /**
  * The Memory Queue offers basic ISR revalidation by directly requesting a revalidation of a route.
  *
  * It offers basic support for in-memory de-duping per isolate.
+ *
+ * A service binding called `NEXT_CACHE_REVALIDATION_WORKER` that points to your worker is required.
  */
 export class MemoryQueue {
     opts;
@@ -13,6 +17,9 @@ export class MemoryQueue {
         this.opts = opts;
     }
     async send({ MessageBody: { host, url }, MessageGroupId }) {
+        const service = getCloudflareContext().env.NEXT_CACHE_REVALIDATION_WORKER;
+        if (!service)
+            throw new IgnorableError("No service binding for cache revalidation worker");
         if (this.revalidatedPaths.has(MessageGroupId))
             return;
         this.revalidatedPaths.set(MessageGroupId, 
@@ -23,7 +30,7 @@ export class MemoryQueue {
             // TODO: Drop the import - https://github.com/opennextjs/opennextjs-cloudflare/issues/361
             // @ts-ignore
             const manifest = await import("./.next/prerender-manifest.json");
-            await globalThis.internalFetch(`${protocol}://${host}${url}`, {
+            await service.fetch(`${protocol}://${host}${url}`, {
                 method: "HEAD",
                 headers: {
                     "x-prerender-revalidate": manifest.preview.previewModeId,

package/dist/api/memory-queue.spec.js

@@ -1,7 +1,13 @@
 import { generateMessageGroupId } from "@opennextjs/aws/core/routing/queue.js";
 import { afterEach, beforeAll, describe, expect, it, vi } from "vitest";
-import cache, { DEFAULT_REVALIDATION_TIMEOUT_MS } from "./memory-queue";
+import cache, { DEFAULT_REVALIDATION_TIMEOUT_MS } from "./memory-queue.js";
 vi.mock("./.next/prerender-manifest.json", () => Promise.resolve({ preview: { previewModeId: "id" } }));
+const mockServiceWorkerFetch = vi.fn();
+vi.mock("./cloudflare-context", () => ({
+    getCloudflareContext: () => ({
+        env: { NEXT_CACHE_REVALIDATION_WORKER: { fetch: mockServiceWorkerFetch } },
+    }),
+}));
 describe("MemoryQueue", () => {
     beforeAll(() => {
         vi.useFakeTimers();
@@ -16,7 +22,7 @@ describe("MemoryQueue", () => {
         });
         vi.advanceTimersByTime(DEFAULT_REVALIDATION_TIMEOUT_MS);
         await firstRequest;
-        expect(globalThis.internalFetch).toHaveBeenCalledTimes(1);
+        expect(mockServiceWorkerFetch).toHaveBeenCalledTimes(1);
         const secondRequest = cache.send({
             MessageBody: { host: "test.local", url: "/test" },
             MessageGroupId: generateMessageGroupId("/test"),
@@ -24,7 +30,7 @@ describe("MemoryQueue", () => {
         });
         vi.advanceTimersByTime(1);
         await secondRequest;
-        expect(globalThis.internalFetch).toHaveBeenCalledTimes(2);
+        expect(mockServiceWorkerFetch).toHaveBeenCalledTimes(2);
     });
     it("should process revalidations for multiple paths", async () => {
         const firstRequest = cache.send({
@@ -34,7 +40,7 @@ describe("MemoryQueue", () => {
         });
         vi.advanceTimersByTime(1);
         await firstRequest;
-        expect(globalThis.internalFetch).toHaveBeenCalledTimes(1);
+        expect(mockServiceWorkerFetch).toHaveBeenCalledTimes(1);
         const secondRequest = cache.send({
             MessageBody: { host: "test.local", url: "/test" },
             MessageGroupId: generateMessageGroupId("/other"),
@@ -42,7 +48,7 @@ describe("MemoryQueue", () => {
         });
         vi.advanceTimersByTime(1);
         await secondRequest;
-        expect(globalThis.internalFetch).toHaveBeenCalledTimes(2);
+        expect(mockServiceWorkerFetch).toHaveBeenCalledTimes(2);
     });
     it("should de-dupe revalidations", async () => {
         const requests = [
@@ -59,6 +65,6 @@ describe("MemoryQueue", () => {
         ];
         vi.advanceTimersByTime(1);
         await Promise.all(requests);
-        expect(globalThis.internalFetch).toHaveBeenCalledTimes(1);
+        expect(mockServiceWorkerFetch).toHaveBeenCalledTimes(1);
     });
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.5.9",
+  "version": "0.5.10",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"