@opennextjs/cloudflare 1.7.0 → 1.7.1

package/dist/api/overrides/cache-purge/index.js

@@ -1,3 +1,4 @@
+import { error } from "@opennextjs/aws/adapters/logger.js";
 import { getCloudflareContext } from "../../cloudflare-context.js";
 import { debugCache, internalPurgeCacheByTags } from "../internal.js";
 export const purgeCache = ({ type = "direct" }) => {
@@ -13,7 +14,7 @@ export const purgeCache = ({ type = "direct" }) => {
             else {
                 const durableObject = env.NEXT_CACHE_DO_PURGE;
                 if (!durableObject) {
-                    debugCache("cdnInvalidation", "No durable object found. Skipping cache purge.");
+                    error("Purge cache: NEXT_CACHE_DO_PURGE not found. Skipping cache purge.");
                     return;
                 }
                 const id = durableObject.idFromName("cache-purge");

package/dist/api/overrides/internal.js

@@ -1,4 +1,5 @@
 import { createHash } from "node:crypto";
+import { error } from "@opennextjs/aws/adapters/logger.js";
 import { getCloudflareContext } from "../cloudflare-context.js";
 export const debugCache = (name, ...args) => {
     if (process.env.NEXT_PRIVATE_DEBUG_CACHE) {
@@ -31,7 +32,7 @@ export async function purgeCacheByTags(tags) {
 export async function internalPurgeCacheByTags(env, tags) {
     if (!env.CACHE_PURGE_ZONE_ID && !env.CACHE_PURGE_API_TOKEN) {
         // THIS IS A NO-OP
-        debugCache("purgeCacheByTags", "No cache zone ID or API token provided. Skipping cache purge.");
+        error("No cache zone ID or API token provided. Skipping cache purge.");
         return "missing-credentials";
     }
     let response;
@@ -48,12 +49,12 @@ export async function internalPurgeCacheByTags(env, tags) {
         });
         if (response.status === 429) {
             // Rate limit exceeded
-            debugCache("purgeCacheByTags", "Rate limit exceeded. Skipping cache purge.");
+            error("purgeCacheByTags: Rate limit exceeded. Skipping cache purge.");
             return "rate-limit-exceeded";
         }
         const bodyResponse = (await response.json());
         if (!bodyResponse.success) {
-            debugCache("purgeCacheByTags", "Cache purge failed. Errors:", bodyResponse.errors.map((error) => `${error.code}: ${error.message}`));
+            error("purgeCacheByTags: Cache purge failed. Errors:", bodyResponse.errors.map((error) => `${error.code}: ${error.message}`));
             return "purge-failed";
         }
         debugCache("purgeCacheByTags", "Cache purged successfully for tags:", tags);

package/dist/cli/build/patches/plugins/next-server.d.ts

@@ -22,3 +22,23 @@ export declare const buildIdRule = "\nrule:\n  pattern:\n    selector: method_de
  */
 export declare function createCacheHandlerRule(handlerPath: string): string;
 export declare function createComposableCacheHandlersRule(handlerPath: string): string;
+/**
+ * `attachRequestMeta` sets `initUrl` to always be with `https` cause this.fetchHostname && this.port is undefined in our case.
+ * this.nextConfig.experimental.trustHostHeader is also true.
+ *
+ * This patch checks if the original protocol was "http:" and rewrites the `initUrl` to reflect the actual host protocol.
+ * It will make `request.url` in route handlers end up with the correct protocol.
+ *
+ * Note: We cannot use the already defined `initURL` we passed in as requestMetaData to NextServer's request handler as pages router
+ * data routes would fail. It would miss the `_next/data` part in the path in that case.
+ *
+ * Therefor we just replace the protocol if necessary in the value from this template string:
+ * https://github.com/vercel/next.js/blob/ea08bf27/packages/next/src/server/next-server.ts#L1920
+ *
+ * Affected lines:
+ * https://github.com/vercel/next.js/blob/ea08bf27/packages/next/src/server/next-server.ts#L1916-L1923
+ *
+ * Callstack: handleRequest-> handleRequestImpl -> attachRequestMeta
+ *
+ */
+export declare const attachRequestMetaRule = "\nrule:\n  kind: identifier\n  regex: ^initUrl$\n  inside:\n    kind: arguments\n    all:\n      - has: {kind: identifier, regex: ^req$}\n      - has: {kind: string, regex: initURL}\n    inside:\n      kind: call_expression\n      all:\n        - has: {kind: parenthesized_expression, regex: '0'}\n        - has: { regex: _requestmeta.addRequestMeta}\n      inside:\n        kind: expression_statement\n        inside:\n          kind: statement_block\n          inside:\n            kind: method_definition\n            has:\n              kind: property_identifier\n              regex: ^attachRequestMeta$\nfix:\n  'req[Symbol.for(\"NextInternalRequestMeta\")]?.initProtocol === \"http:\" && initUrl.startsWith(\"https://\") ? `http://${initUrl.slice(8)}`: initUrl'";

package/dist/cli/build/patches/plugins/next-server.js

@@ -28,6 +28,7 @@ export function patchNextServer(updater, buildOpts) {
                 contents = patchCode(contents, createComposableCacheHandlersRule(composableCacheHandler));
                 // Node middleware are not supported on Cloudflare yet
                 contents = patchCode(contents, disableNodeMiddlewareRule);
+                contents = patchCode(contents, attachRequestMetaRule);
                 return contents;
             },
         },
@@ -100,3 +101,47 @@ fix: |-
   globalThis[handlersSetSymbol] = new Set(globalThis[handlersMapSymbol].values());
 `;
 }
+/**
+ * `attachRequestMeta` sets `initUrl` to always be with `https` cause this.fetchHostname && this.port is undefined in our case.
+ * this.nextConfig.experimental.trustHostHeader is also true.
+ *
+ * This patch checks if the original protocol was "http:" and rewrites the `initUrl` to reflect the actual host protocol.
+ * It will make `request.url` in route handlers end up with the correct protocol.
+ *
+ * Note: We cannot use the already defined `initURL` we passed in as requestMetaData to NextServer's request handler as pages router
+ * data routes would fail. It would miss the `_next/data` part in the path in that case.
+ *
+ * Therefor we just replace the protocol if necessary in the value from this template string:
+ * https://github.com/vercel/next.js/blob/ea08bf27/packages/next/src/server/next-server.ts#L1920
+ *
+ * Affected lines:
+ * https://github.com/vercel/next.js/blob/ea08bf27/packages/next/src/server/next-server.ts#L1916-L1923
+ *
+ * Callstack: handleRequest-> handleRequestImpl -> attachRequestMeta
+ *
+ */
+export const attachRequestMetaRule = `
+rule:
+  kind: identifier
+  regex: ^initUrl$
+  inside:
+    kind: arguments
+    all:
+      - has: {kind: identifier, regex: ^req$}
+      - has: {kind: string, regex: initURL}
+    inside:
+      kind: call_expression
+      all:
+        - has: {kind: parenthesized_expression, regex: '0'}
+        - has: { regex: _requestmeta.addRequestMeta}
+      inside:
+        kind: expression_statement
+        inside:
+          kind: statement_block
+          inside:
+            kind: method_definition
+            has:
+              kind: property_identifier
+              regex: ^attachRequestMeta$
+fix:
+  'req[Symbol.for("NextInternalRequestMeta")]?.initProtocol === "http:" && initUrl.startsWith("https://") ? \`http://\${initUrl.slice(8)}\`: initUrl'`;

package/package.json

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