review

Author: sommeeeer

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

@@ -1,7 +1,11 @@
 import { createHash } from "node:crypto";
 
 import { NextConfig, PrerenderManifest } from "config/index";
-import type { InternalEvent, InternalResult } from "types/open-next";
+import type {
+  InternalEvent,
+  InternalResult,
+  MiddlewareEvent,
+} from "types/open-next";
 import type { CacheValue } from "types/overrides";
 import { emptyReadableStream, toReadableStream } from "utils/stream";
 
@@ -100,7 +104,7 @@ async function computeCacheControl(
 }
 
 async function generateResult(
-  event: InternalEvent,
+  event: MiddlewareEvent,
   localizedPath: string,
   cachedValue: CacheValue<"cache">,
   lastModified?: number,
@@ -183,7 +187,7 @@ function decodePathParams(pathname: string): string {
 }
 
 export async function cacheInterceptor(
-  event: InternalEvent,
+  event: MiddlewareEvent,
 ): Promise<InternalEvent | InternalResult> {
   if (
     Boolean(event.headers["next-action"]) ||

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

@@ -6,7 +6,11 @@ import {
   NextConfig,
   PrerenderManifest,
 } from "config/index.js";
-import type { InternalEvent, InternalResult } from "types/open-next.js";
+import type {
+  InternalEvent,
+  InternalResult,
+  MiddlewareEvent,
+} from "types/open-next.js";
 import { emptyReadableStream } from "utils/stream.js";
 
 import { getQueryFromSearchParams } from "../../overrides/converters/utils.js";
@@ -28,12 +32,6 @@ const middleMatch = getMiddlewareMatch(
 
 const REDIRECTS = new Set([301, 302, 303, 307, 308]);
 
-type MiddlewareEvent = InternalEvent & {
-  responseHeaders?: Record<string, string | string[]>;
-  isExternalRewrite?: boolean;
-  rewriteStatusCode?: number;
-};
-
 type Middleware = (request: Request) => Response | Promise<Response>;
 type MiddlewareLoader = () => Promise<{ default: Middleware }>;
 

packages/open-next/src/types/open-next.ts

@@ -30,10 +30,14 @@ export type InternalEvent = {
   readonly query: Record<string, string | string[]>;
   readonly cookies: Record<string, string>;
   readonly remoteAddress: string;
-  // Used for NextResponse.rewrite's status code in middleware
-  readonly rewriteStatusCode?: number;
 } & BaseEventOrResult<"core">;
 
+export type MiddlewareEvent = InternalEvent & {
+  responseHeaders?: Record<string, string | string[]>;
+  isExternalRewrite?: boolean;
+  rewriteStatusCode?: number;
+};
+
 export type InternalResult = {
   statusCode: number;
   headers: Record<string, string | string[]>;