@opennextjs/cloudflare 1.0.3 → 1.0.4

package/dist/api/config.d.ts

@@ -46,6 +46,13 @@ interface OpenNextConfig extends AwsOpenNextConfig {
          * @default true
          */
         useWorkerdCondition?: boolean;
+        /**
+         * Disable throwing an error when the config validation fails.
+         * This is useful for overriding some of the default provided by cloudflare.
+         * **USE AT YOUR OWN RISK**
+         * @default false
+         */
+        dangerousDisableConfigValidation?: boolean;
     };
 }
 /**

package/dist/api/durable-objects/queue.js

@@ -1,4 +1,4 @@
-import { debug, error } from "@opennextjs/aws/adapters/logger.js";
+import { debug, error, warn } from "@opennextjs/aws/adapters/logger.js";
 import { FatalError, IgnorableError, isOpenNextError, RecoverableError, } from "@opennextjs/aws/utils/error.js";
 import { DurableObject } from "cloudflare:workers";
 const DEFAULT_MAX_REVALIDATION = 5;
@@ -47,6 +47,9 @@ export class DOQueueHandler extends DurableObject {
         debug(`Durable object initialized`);
     }
     async revalidate(msg) {
+        if (this.ongoingRevalidations.size > 2 * this.maxRevalidations) {
+            warn(`Your durable object has 2 times the maximum number of revalidations (${this.maxRevalidations}) in progress. If this happens often, you should consider increasing the NEXT_CACHE_DO_QUEUE_MAX_REVALIDATION or the number of durable objects with the MAX_REVALIDATE_CONCURRENCY env var.`);
+        }
         // If there is already an ongoing revalidation, we don't need to revalidate again
         if (this.ongoingRevalidations.has(msg.MessageDeduplicationId))
             return;
@@ -59,19 +62,18 @@ export class DOQueueHandler extends DurableObject {
             return;
         if (this.ongoingRevalidations.size >= this.maxRevalidations) {
             debug(`The maximum number of revalidations (${this.maxRevalidations}) is reached. Blocking until one of the revalidations finishes.`);
-            const ongoingRevalidations = this.ongoingRevalidations.values();
-            // When there is more than the max revalidations, we block concurrency until one of the revalidations finishes
-            // We still await the promise to ensure the revalidation is completed
-            // This is fine because the queue itself run inside a waitUntil
-            await this.ctx.blockConcurrencyWhile(async () => {
+            // TODO: need more investigation
+            // We don't use `blockConcurrencyWhile` here because it block the whole durable object for 30 seconds
+            // if we exceed the max revalidations too fast
+            while (this.ongoingRevalidations.size >= this.maxRevalidations) {
+                const ongoingRevalidations = this.ongoingRevalidations.values();
                 debug(`Waiting for one of the revalidations to finish`);
                 await Promise.race(ongoingRevalidations);
-            });
+            }
         }
         const revalidationPromise = this.executeRevalidation(msg);
         // We store the promise to dedupe the revalidation
         this.ongoingRevalidations.set(msg.MessageDeduplicationId, revalidationPromise);
-        // TODO: check if the object stays up during waitUntil so that the internal state is maintained
         this.ctx.waitUntil(revalidationPromise);
     }
     async executeRevalidation(msg) {
@@ -86,6 +88,7 @@ export class DOQueueHandler extends DurableObject {
                     "x-prerender-revalidate": process.env.__NEXT_PREVIEW_MODE_ID,
                     "x-isr": "1",
                 },
+                // This one is kind of problematic, it will always show the wall time of the revalidation to `this.revalidationTimeout`
                 signal: AbortSignal.timeout(this.revalidationTimeout),
             });
             // Now we need to handle errors from the fetch
@@ -202,6 +205,7 @@ export class DOQueueHandler extends DurableObject {
         // We create the sync table to handle eventually consistent incremental cache
         this.sql.exec("CREATE TABLE IF NOT EXISTS sync (id TEXT PRIMARY KEY, lastSuccess INTEGER, buildId TEXT)");
         // Before doing anything else, we clear the DB for any potential old data
+        // TODO: extract this to a function so that it could be called by the user at another time than init
         this.sql.exec("DELETE FROM failed_state WHERE buildId != ?", process.env.__NEXT_BUILD_ID);
         this.sql.exec("DELETE FROM sync WHERE buildId != ?", process.env.__NEXT_BUILD_ID);
         const failedStateCursor = this.sql.exec("SELECT * FROM failed_state");

package/dist/api/durable-objects/queue.spec.js

@@ -82,9 +82,6 @@ describe("DurableObjectQueue", () => {
             expect(queue.ongoingRevalidations.size).toBe(queue.maxRevalidations);
             expect(queue.ongoingRevalidations.has("id6")).toBe(false);
             expect(Array.from(queue.ongoingRevalidations.keys())).toEqual(["id", "id2", "id3", "id4", "id5"]);
-            // BlockConcurrencyWhile is called twice here, first time during creation of the object and second time when we try to revalidate
-            // @ts-expect-error
-            expect(queue.ctx.blockConcurrencyWhile).toHaveBeenCalledTimes(2);
             // Here we await the blocked request to ensure it's resolved
             await blockedReq;
             // We then need to await for the actual revalidation to finish

package/dist/cli/build/utils/ensure-cf-config.js

@@ -28,7 +28,7 @@ export function ensureCloudflareConfig(config) {
         logger.warn("The direct mode queue is not recommended for use in production.");
     }
     if (Object.values(requirements).some((satisfied) => !satisfied)) {
-        throw new Error("The `open-next.config.ts` should have a default export like this:\n\n" +
+        const errorMessage = "The `open-next.config.ts` should have a default export like this:\n\n" +
             `{
           default: {
             override: {
@@ -52,6 +52,11 @@ export function ensureCloudflareConfig(config) {
               queue: "dummy" | "direct" | function,
             },
           },
-        }\n\n`.replace(/^ {8}/gm, ""));
+        }\n\n`.replace(/^ {8}/gm, "");
+        if (config.cloudflare?.dangerousDisableConfigValidation) {
+            logger.warn(errorMessage);
+            return;
+        }
+        throw new Error(errorMessage);
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -43,7 +43,7 @@
   "homepage": "https://github.com/opennextjs/opennextjs-cloudflare",
   "dependencies": {
     "@dotenvx/dotenvx": "1.31.0",
-    "@opennextjs/aws": "^3.6.1",
+    "@opennextjs/aws": "^3.6.2",
     "enquirer": "^2.4.1",
     "glob": "^11.0.0",
     "ts-tqdm": "^0.8.6"
@@ -54,7 +54,7 @@
     "@tsconfig/strictest": "^2.0.5",
     "@types/mock-fs": "^4.13.4",
     "@types/node": "^22.2.0",
-    "esbuild": "^0.24.2",
+    "esbuild": "^0.25.4",
     "eslint": "^9.11.1",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",