review fix

Author: conico974

packages/open-next/src/adapters/middleware.ts

@@ -14,7 +14,11 @@ import {
   resolveQueue,
   resolveTagCache,
 } from "../core/resolve";
-import routingHandler from "../core/routingHandler";
+import routingHandler, {
+  INTERNAL_HEADER_INITIAL_PATH,
+  INTERNAL_HEADER_RESOLVED_ROUTE,
+  INTERNAL_HEADER_ROUTE_TYPE,
+} from "../core/routingHandler";
 
 globalThis.internalFetch = fetch;
 globalThis.__openNextAls = new AsyncLocalStorage();
@@ -61,9 +65,9 @@ const defaultHandler = async (
               ...result.internalEvent,
               headers: {
                 ...result.internalEvent.headers,
-                "x-opennext-initial-path": internalEvent.rawPath,
-                "x-opennext-resolved-route": result.resolvedRoute ?? "",
-                "x-opennext-route-type": result.routeType ?? "",
+                [INTERNAL_HEADER_INITIAL_PATH]: internalEvent.rawPath,
+                [INTERNAL_HEADER_RESOLVED_ROUTE]: result.resolvedRoute ?? "",
+                [INTERNAL_HEADER_ROUTE_TYPE]: result.routeType ?? "",
               },
             },
             isExternalRewrite: result.isExternalRewrite,

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

@@ -15,7 +15,9 @@ import { debug, error, warn } from "../adapters/logger";
 import { patchAsyncStorage } from "./patchAsyncStorage";
 import { convertRes, createServerResponse } from "./routing/util";
 import routingHandler, {
-  INTERNAL_HEADER_PREFIX,
+  INTERNAL_HEADER_INITIAL_PATH,
+  INTERNAL_HEADER_RESOLVED_ROUTE,
+  INTERNAL_HEADER_ROUTE_TYPE,
   MIDDLEWARE_HEADER_PREFIX,
   MIDDLEWARE_HEADER_PREFIX_LEN,
 } from "./routingHandler";
@@ -39,20 +41,23 @@ export async function openNextHandler(
       }
       debug("internalEvent", internalEvent);
 
+      // These 3 will get overwritten by the routing handler if not using an external middleware
+      const internalHeaders = {
+        initialPath:
+          internalEvent.headers[INTERNAL_HEADER_INITIAL_PATH] ??
+          internalEvent.rawPath,
+        resolvedRoute: internalEvent.headers[INTERNAL_HEADER_RESOLVED_ROUTE],
+        routeType: internalEvent.headers[INTERNAL_HEADER_ROUTE_TYPE] as
+          | RouteType
+          | undefined,
+      };
+
       let routingResult: InternalResult | RoutingResult = {
         internalEvent,
         isExternalRewrite: false,
         origin: false,
         isISR: false,
-        // These 3 will get overwritten by the routing handler if not using an external middleware
-        initialPath:
-          internalEvent.headers[`${INTERNAL_HEADER_PREFIX}-initial-path`] ??
-          internalEvent.rawPath,
-        resolvedRoute:
-          internalEvent.headers[`${INTERNAL_HEADER_PREFIX}-resolved-route`],
-        routeType: internalEvent.headers[
-          `${INTERNAL_HEADER_PREFIX}-route-type`
-        ] as RouteType | undefined,
+        ...internalHeaders,
       };
 
       //#override withRouting

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

@@ -26,6 +26,9 @@ import { handleMiddleware } from "./routing/middleware";
 
 export const MIDDLEWARE_HEADER_PREFIX = "x-middleware-response-";
 export const INTERNAL_HEADER_PREFIX = "x-opennext-";
+export const INTERNAL_HEADER_INITIAL_PATH = `${INTERNAL_HEADER_PREFIX}initial-path`;
+export const INTERNAL_HEADER_RESOLVED_ROUTE = `${INTERNAL_HEADER_PREFIX}resolved-route`;
+export const INTERNAL_HEADER_ROUTE_TYPE = `${INTERNAL_HEADER_PREFIX}route-type`;
 export const MIDDLEWARE_HEADER_PREFIX_LEN = MIDDLEWARE_HEADER_PREFIX.length;
 
 // Add the locale prefix to the regex so we correctly match the rawPath
@@ -191,7 +194,7 @@ export default async function routingHandler(
   const foundDynamicRoute = dynamicRouteMatcher(internalEvent.rawPath);
   const isDynamicRoute = !isExternalRewrite && Boolean(foundDynamicRoute);
 
-  if (!isDynamicRoute && !isStaticRoute && !isExternalRewrite) {
+  if (!(isDynamicRoute || isStaticRoute || isExternalRewrite)) {
     // Fallback rewrite to be applied
     const fallbackRewrites = handleRewrites(
       internalEvent,
@@ -216,12 +219,14 @@ export default async function routingHandler(
   // If we still haven't found a route, we show the 404 page
   // We need to ensure that rewrites are applied before showing the 404 page
   if (
-    !isRouteFoundBeforeAllRewrites &&
-    !isApiRoute &&
-    !isNextImageRoute &&
-    // We need to check again once all rewrites have been applied
-    !staticRouteMatcher(internalEvent.rawPath) &&
-    !dynamicRouteMatcher(internalEvent.rawPath)
+    !(
+      isRouteFoundBeforeAllRewrites ||
+      isApiRoute ||
+      isNextImageRoute ||
+      // We need to check again once all rewrites have been applied
+      staticRouteMatcher(internalEvent.rawPath) ||
+      dynamicRouteMatcher(internalEvent.rawPath)
+    )
   ) {
     internalEvent = {
       ...internalEvent,
@@ -260,20 +265,20 @@ export default async function routingHandler(
     ...nextHeaders,
   });
 
-  const resolvedRoute = foundStaticRoute
-    ? foundStaticRoute.page
-    : foundDynamicRoute
-      ? foundDynamicRoute.page
-      : undefined;
+  let resolvedRoute: string | undefined;
+  let routeType: RouteType | undefined;
+
+  if (foundStaticRoute) {
+    resolvedRoute = foundStaticRoute.page;
+    routeType = foundStaticRoute.routeType;
+  } else if (foundDynamicRoute) {
+    resolvedRoute = foundDynamicRoute.page;
+    routeType = foundDynamicRoute.routeType;
+  } else if (isApiRoute) {
+    // For /api paths we assume that they're route types
+    routeType = "route";
+  }
 
-  const routeType = foundStaticRoute
-    ? foundStaticRoute.routeType
-    : foundDynamicRoute
-      ? foundDynamicRoute.routeType
-      : // For /api paths we assume that they're route types
-        internalEvent.rawPath.startsWith("/api")
-        ? "route"
-        : undefined;
   return {
     internalEvent,
     isExternalRewrite,