review fix

Author: conico974

packages/open-next/src/core/requestHandler.ts

@@ -31,22 +31,22 @@ export async function openNextHandler(
   internalEvent: InternalEvent,
   responseStreaming?: StreamCreator,
 ): Promise<InternalResult> {
+  const initialHeaders = internalEvent.headers;
   // We run everything in the async local storage context so that it is available in the middleware as well as in NextServer
   return runWithOpenNextRequestContext(
-    { isISRRevalidation: internalEvent.headers["x-isr"] === "1" },
+    { isISRRevalidation: initialHeaders["x-isr"] === "1" },
     async () => {
-      if (internalEvent.headers["x-forwarded-host"]) {
-        internalEvent.headers.host = internalEvent.headers["x-forwarded-host"];
+      if (initialHeaders["x-forwarded-host"]) {
+        initialHeaders.host = initialHeaders["x-forwarded-host"];
       }
       debug("internalEvent", internalEvent);
 
       // These 2 will get overwritten by the routing handler if not using an external middleware
       const internalHeaders = {
         initialPath:
-          internalEvent.headers[INTERNAL_HEADER_INITIAL_PATH] ??
-          internalEvent.rawPath,
-        resolvedRoutes: internalEvent.headers[INTERNAL_HEADER_RESOLVED_ROUTES]
-          ? JSON.parse(internalEvent.headers[INTERNAL_HEADER_RESOLVED_ROUTES])
+          initialHeaders[INTERNAL_HEADER_INITIAL_PATH] ?? internalEvent.rawPath,
+        resolvedRoutes: initialHeaders[INTERNAL_HEADER_RESOLVED_ROUTES]
+          ? JSON.parse(initialHeaders[INTERNAL_HEADER_RESOLVED_ROUTES])
           : ([] as ResolvedRoute[]),
       };
 

packages/open-next/src/core/routing/routeMatcher.ts

@@ -18,16 +18,14 @@ export const apiPrefix = RoutesManifest.basePath
   : "/api";
 
 function routeMatcher(routeDefinitions: RouteDefinition[]) {
-  const regexp = routeDefinitions.map((route) => {
-    return {
-      page: route.page,
-      regexp: new RegExp(
-        route.regex
-          .replace("^/", optionalLocalePrefixRegex)
-          .replace("^/", optionalBasepathPrefixRegex),
-      ),
-    };
-  });
+  const regexp = routeDefinitions.map((route) => ({
+    page: route.page,
+    regexp: new RegExp(
+      route.regex
+        .replace("^/", optionalLocalePrefixRegex)
+        .replace("^/", optionalBasepathPrefixRegex),
+    ),
+  }));
 
   // We need to use AppPathRoutesManifest here
   const appPathsSet = new Set(

packages/open-next/src/core/routingHandler.ts

@@ -28,10 +28,10 @@ import {
 } from "./routing/routeMatcher";
 
 export const MIDDLEWARE_HEADER_PREFIX = "x-middleware-response-";
+export const MIDDLEWARE_HEADER_PREFIX_LEN = MIDDLEWARE_HEADER_PREFIX.length;
 export const INTERNAL_HEADER_PREFIX = "x-opennext-";
 export const INTERNAL_HEADER_INITIAL_PATH = `${INTERNAL_HEADER_PREFIX}initial-path`;
 export const INTERNAL_HEADER_RESOLVED_ROUTES = `${INTERNAL_HEADER_PREFIX}resolved-routes`;
-export const MIDDLEWARE_HEADER_PREFIX_LEN = MIDDLEWARE_HEADER_PREFIX.length;
 
 // Geolocation headers starting from Nextjs 15
 // See https://github.com/vercel/vercel/blob/7714b1c/packages/functions/src/headers.ts