@opennextjs/cloudflare 1.5.1 → 1.5.2

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

@@ -77,11 +77,12 @@ export class DOQueueHandler extends DurableObject {
         this.ctx.waitUntil(revalidationPromise);
     }
     async executeRevalidation(msg) {
+        let response;
         try {
             debug(`Revalidating ${msg.MessageBody.host}${msg.MessageBody.url}`);
             const { MessageBody: { host, url }, } = msg;
             const protocol = host.includes("localhost") ? "http" : "https";
-            const response = await this.service.fetch(`${protocol}://${host}${url}`, {
+            response = await this.service.fetch(`${protocol}://${host}${url}`, {
                 method: "HEAD",
                 headers: {
                     // This is defined during build
@@ -134,6 +135,13 @@ export class DOQueueHandler extends DurableObject {
         }
         finally {
             this.ongoingRevalidations.delete(msg.MessageDeduplicationId);
+            // Cancel the stream when it has not been consumed
+            try {
+                await response?.body?.cancel();
+            }
+            catch {
+                // Ignore errors when the stream was actually consumed
+            }
         }
     }
     async alarm() {

package/dist/api/overrides/asset-resolver/index.js

@@ -27,6 +27,7 @@ const resolver = {
             method,
         });
         if (response.status === 404) {
+            await response.body?.cancel();
             return undefined;
         }
         return {

package/dist/api/overrides/incremental-cache/static-assets-incremental-cache.js

@@ -19,8 +19,10 @@ class StaticAssetsIncrementalCache {
         debugCache(`Get ${key}`);
         try {
             const response = await assets.fetch(this.getAssetUrl(key, cacheType));
-            if (!response.ok)
+            if (!response.ok) {
+                await response.body?.cancel();
                 return null;
+            }
             return {
                 value: await response.json(),
                 lastModified: globalThis.__BUILD_TIMESTAMP_MS__,

package/dist/api/overrides/internal.js

@@ -34,8 +34,9 @@ export async function internalPurgeCacheByTags(env, tags) {
         debugCache("purgeCacheByTags", "No cache zone ID or API token provided. Skipping cache purge.");
         return "missing-credentials";
     }
+    let response;
     try {
-        const response = await fetch(`https://api.cloudflare.com/client/v4/zones/${env.CACHE_PURGE_ZONE_ID}/purge_cache`, {
+        response = await fetch(`https://api.cloudflare.com/client/v4/zones/${env.CACHE_PURGE_ZONE_ID}/purge_cache`, {
             headers: {
                 Authorization: `Bearer ${env.CACHE_PURGE_API_TOKEN}`,
                 "Content-Type": "application/json",
@@ -62,4 +63,13 @@ export async function internalPurgeCacheByTags(env, tags) {
         console.error("Error purging cache by tags:", error);
         return "purge-failed";
     }
+    finally {
+        // Cancel the stream when it has not been consumed
+        try {
+            await response?.body?.cancel();
+        }
+        catch {
+            // Ignore errors when the stream was actually consumed
+        }
+    }
 }

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

@@ -24,12 +24,13 @@ export class MemoryQueue {
         if (this.revalidatedPaths.has(MessageDeduplicationId))
             return;
         this.revalidatedPaths.add(MessageDeduplicationId);
+        let response;
         try {
             const protocol = host.includes("localhost") ? "http" : "https";
             // TODO: Drop the import - https://github.com/opennextjs/opennextjs-cloudflare/issues/361
             // @ts-ignore
             const manifest = await import("./.next/prerender-manifest.json");
-            const response = await service.fetch(`${protocol}://${host}${url}`, {
+            response = await service.fetch(`${protocol}://${host}${url}`, {
                 method: "HEAD",
                 headers: {
                     "x-prerender-revalidate": manifest.preview.previewModeId,
@@ -49,6 +50,13 @@ export class MemoryQueue {
         }
         finally {
             this.revalidatedPaths.delete(MessageDeduplicationId);
+            // Cancel the stream when it has not been consumed
+            try {
+                await response?.body?.cancel();
+            }
+            catch {
+                // Ignore errors when the stream was actually consumed
+            }
         }
     }
 }

package/dist/cli/build/patches/plugins/instrumentation.d.ts

@@ -1,5 +1,6 @@
 import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
 import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.js";
 export declare function patchInstrumentation(updater: ContentUpdater, buildOpts: BuildOptions): Plugin;
+export declare function getNext154Rule(builtInstrumentationPath: string | null): string;
 export declare function getNext15Rule(builtInstrumentationPath: string | null): string;
 export declare function getNext14Rule(builtInstrumentationPath: string | null): string;

package/dist/cli/build/patches/plugins/instrumentation.js

@@ -2,9 +2,21 @@ import { existsSync } from "node:fs";
 import { join } from "node:path";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
+import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
 import { normalizePath } from "../../utils/normalize-path.js";
 export function patchInstrumentation(updater, buildOpts) {
     const builtInstrumentationPath = getBuiltInstrumentationPath(buildOpts);
+    updater.updateContent("patch-instrumentation-next15-4", [
+        {
+            field: {
+                filter: getCrossPlatformPathRegex(String.raw `/server/lib/router-utils/instrumentation-globals.external\.js$`, {
+                    escape: false,
+                }),
+                contentFilter: /getInstrumentationModule\(/,
+                callback: ({ contents }) => patchCode(contents, getNext154Rule(builtInstrumentationPath)),
+            },
+        },
+    ]);
     updater.updateContent("patch-instrumentation-next15", [
         {
             field: {
@@ -28,6 +40,27 @@ export function patchInstrumentation(updater, buildOpts) {
         setup() { },
     };
 }
+export function getNext154Rule(builtInstrumentationPath) {
+    return `
+rule:
+  kind: expression_statement
+  has:
+    kind: assignment_expression
+    all:
+      - has: { pattern: "cachedInstrumentationModule" }
+      - has: { kind: call_expression, regex: "INSTRUMENTATION_HOOK_FILENAME"}
+  inside:
+    kind: try_statement
+    stopBy: end
+    has: { regex: "return cachedInstrumentationModule" }
+    inside:
+      kind: function_declaration
+      stopBy: end
+      has: { field: name, pattern: getInstrumentationModule }
+fix: |-
+      cachedInstrumentationModule = ${builtInstrumentationPath ? `require('${builtInstrumentationPath}')` : "null"};
+`;
+}
 export function getNext15Rule(builtInstrumentationPath) {
     return `
     rule:

package/dist/cli/build/patches/plugins/load-manifest.js

@@ -31,7 +31,9 @@ async function getLoadManifestRule(buildOpts) {
     const { outputDir } = buildOpts;
     const baseDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts));
     const dotNextDir = join(baseDir, ".next");
-    const manifests = await glob(join(dotNextDir, "**/*-manifest.json"), { windowsPathsNoEscape: true });
+    const manifests = await glob(join(dotNextDir, "**/{*-manifest,required-server-files}.json"), {
+        windowsPathsNoEscape: true,
+    });
     const returnManifests = (await Promise.all(manifests.map(async (manifest) => `
 if ($PATH.endsWith("${normalizePath("/" + relative(dotNextDir, manifest))}")) {
   return ${await readFile(manifest, "utf-8")};
@@ -46,6 +48,9 @@ function loadManifest($PATH, $$$ARGS) {
         fix: `
 function loadManifest($PATH, $$$ARGS) {
   $PATH = $PATH.replaceAll(${JSON.stringify(sep)}, ${JSON.stringify(posix.sep)});
+  if ($PATH === "/.next/BUILD_ID") {
+  return process.env.NEXT_BUILD_ID;
+	}
   ${returnManifests}
   throw new Error(\`Unexpected loadManifest(\${$PATH}) call!\`);
 }`,

package/dist/cli/templates/images.js

@@ -53,10 +53,10 @@ export async function fetchImage(fetcher, imageUrl, ctx) {
     const buffer = new ArrayBuffer(32);
     try {
         let contentType;
-        // body1 is eventually used for the response
-        // body2 is used to detect the content type
-        const [body1, body2] = imgResponse.body.tee();
-        const reader = body2.getReader({ mode: "byob" });
+        // respBody is eventually used for the response
+        // contentBody is used to detect the content type
+        const [respBody, contentBody] = imgResponse.body.tee();
+        const reader = contentBody.getReader({ mode: "byob" });
         const { value } = await reader.read(new Uint8Array(buffer));
         // Release resources by calling `reader.cancel()`
         // `ctx.waitUntil` keeps the runtime running until the promise settles without having to wait here.
@@ -77,8 +77,10 @@ export async function fetchImage(fetcher, imageUrl, ctx) {
             headers.set("content-type", contentType);
             headers.set("content-disposition", __IMAGES_CONTENT_DISPOSITION__);
             headers.set("content-security-policy", __IMAGES_CONTENT_SECURITY_POLICY__);
-            return new Response(body1, { ...imgResponse, headers });
+            return new Response(respBody, { ...imgResponse, headers });
         }
+        // Cancel the unused stream
+        ctx.waitUntil(respBody.cancel());
         return new Response('"url" parameter is valid but image type is not allowed', {
             status: 400,
         });

package/dist/cli/utils/run-wrangler.js

@@ -52,6 +52,10 @@ export function runWrangler(options, args, wranglerOpts = {}) {
         env: {
             ...process.env,
             ...(wranglerOpts.logging === "error" ? { WRANGLER_LOG: "error" } : undefined),
+            // `.env` files are handled by the adapter.
+            // Wrangler would load `.env.<wrangler env>` while we should load `.env.<process.env.NEXTJS_ENV>`
+            // See https://opennext.js.org/cloudflare/howtos/env-vars
+            CLOUDFLARE_LOAD_DEV_VARS_FROM_DOT_ENV: "false",
         },
     });
     if (result.status !== 0) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -72,7 +72,7 @@
     "vitest": "^2.1.1"
   },
   "peerDependencies": {
-    "wrangler": "^4.23.0"
+    "wrangler": "^4.24.4"
   },
   "scripts": {
     "clean": "rimraf dist",