Revert to external middleware (#656)

* move back to external middleware

* use edge fix

* review fix

* changeset

Author: conico974

.changeset/tame-planes-open.md

@@ -0,0 +1,7 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+revert to using an external middleware
+
+This will reduce cpu time for anything coming from the routing layer (i.e. redirects, rewrites, middleware response or when using cache interception)

packages/cloudflare/package.json

@@ -53,7 +53,7 @@
   "homepage": "https://github.com/opennextjs/opennextjs-cloudflare",
   "dependencies": {
     "@dotenvx/dotenvx": "catalog:",
-    "@opennextjs/aws": "~3.6.0",
+    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@859",
     "enquirer": "^2.4.1",
     "glob": "catalog:",
     "ts-tqdm": "^0.8.6"

packages/cloudflare/src/api/config.ts

@@ -66,6 +66,17 @@ export function defineCloudflareConfig(config: CloudflareOverrides = {}): OpenNe
     dangerous: {
       enableCacheInterception,
     },
+    middleware: {
+      external: true,
+      override: {
+        wrapper: "cloudflare-edge",
+        converter: "edge",
+        proxyExternalRequest: "fetch",
+        incrementalCache: resolveIncrementalCache(incrementalCache),
+        tagCache: resolveTagCache(tagCache),
+        queue: resolveQueue(queue),
+      },
+    },
   };
 }
 

packages/cloudflare/src/cli/build/utils/ensure-cf-config.ts

@@ -9,6 +9,7 @@ import type { OpenNextConfig } from "../../../api/config.js";
  */
 export function ensureCloudflareConfig(config: OpenNextConfig) {
   const requirements = {
+    // Check for the default function
     dftUseCloudflareWrapper: config.default?.override?.wrapper === "cloudflare-node",
     dftUseEdgeConverter: config.default?.override?.converter === "edge",
     dftUseFetchProxy: config.default?.override?.proxyExternalRequest === "fetch",
@@ -22,7 +23,11 @@ export function ensureCloudflareConfig(config: OpenNextConfig) {
       config.default?.override?.queue === "dummy" ||
       config.default?.override?.queue === "direct" ||
       typeof config.default?.override?.queue === "function",
-    mwIsMiddlewareIntegrated: config.middleware === undefined,
+    // Check for the middleware function
+    mwIsMiddlewareExternal: config.middleware?.external === true,
+    mwUseCloudflareWrapper: config.middleware?.override?.wrapper === "cloudflare-edge",
+    mwUseEdgeConverter: config.middleware?.override?.converter === "edge",
+    mwUseFetchProxy: config.middleware?.override?.proxyExternalRequest === "fetch",
     hasCryptoExternal: config.edgeExternals?.includes("node:crypto"),
   };
 
@@ -40,11 +45,22 @@ export function ensureCloudflareConfig(config: OpenNextConfig) {
               converter: "edge",
               proxyExternalRequest: "fetch",
               incrementalCache: "dummy" | function,
-              tagCache: "dummy",
+              tagCache: "dummy" | function,
               queue: "dummy" | "direct" | function,
             },
           },
           edgeExternals: ["node:crypto"],
+          middleware: {
+            external: true,
+            override: {
+              wrapper: "cloudflare-edge",
+              converter: "edge",
+              proxyExternalRequest: "fetch",
+              incrementalCache: "dummy" | function,
+              tagCache: "dummy" | function,
+              queue: "dummy" | "direct" | function,
+            },
+          },
         }\n\n`.replace(/^ {8}/gm, "")
     );
   }

packages/cloudflare/src/cli/templates/init.ts

@@ -96,6 +96,10 @@ function initRuntime() {
     Request: CustomRequest,
     __BUILD_TIMESTAMP_MS__: __BUILD_TIMESTAMP_MS__,
     __NEXT_BASE_PATH__: __NEXT_BASE_PATH__,
+    // The external middleware will use the convertTo function of the `edge` converter
+    // by default it will try to fetch the request, but since we are running everything in the same worker
+    // we need to use the request as is.
+    __dangerous_ON_edge_converter_returns_request: true,
   });
 }
 

packages/cloudflare/src/cli/templates/worker.ts

@@ -1,5 +1,7 @@
 //@ts-expect-error: Will be resolved by wrangler build
 import { runWithCloudflareRequestContext } from "./cloudflare/init.js";
+// @ts-expect-error: Will be resolved by wrangler build
+import { handler as middlewareHandler } from "./middleware/handler.mjs";
 
 //@ts-expect-error: Will be resolved by wrangler build
 export { DOQueueHandler } from "./.build/durable-objects/queue.js";
@@ -32,10 +34,17 @@ export default {
           : fetch(imageUrl, { cf: { cacheEverything: true } });
       }
 
+      // - `Request`s are handled by the Next server
+      const reqOrResp = await middlewareHandler(request, env, ctx);
+
+      if (reqOrResp instanceof Response) {
+        return reqOrResp;
+      }
+
       // @ts-expect-error: resolved by wrangler build
       const { handler } = await import("./server-functions/default/handler.mjs");
 
-      return handler(request, env, ctx);
+      return handler(reqOrResp, env, ctx);
     });
   },
 } satisfies ExportedHandler<CloudflareEnv>;