vinext 0.0.46 → 0.0.48

package/dist/server/app-post-middleware-context.d.ts

@@ -0,0 +1,16 @@
+import { RequestContext } from "../config/config-matchers.js";
+
+//#region src/server/app-post-middleware-context.d.ts
+/**
+ * Build a request context from the live ALS HeadersContext, which reflects
+ * any x-middleware-request-* header mutations applied by middleware.
+ * Used for afterFiles and fallback rewrite has/missing evaluation — these
+ * run after middleware in the App Router execution order.
+ *
+ * Falls back to `requestContextFromRequest(request)` when no HeadersContext
+ * is set (no middleware ran, or middleware didn't set request headers).
+ */
+declare function buildPostMwRequestContext(request: Request): RequestContext;
+//#endregion
+export { buildPostMwRequestContext };
+//# sourceMappingURL=app-post-middleware-context.d.ts.map

package/dist/server/app-post-middleware-context.js

@@ -0,0 +1,28 @@
+import { normalizeHost, requestContextFromRequest } from "../config/config-matchers.js";
+import { getHeadersContext } from "../shims/headers.js";
+//#region src/server/app-post-middleware-context.ts
+/**
+* Build a request context from the live ALS HeadersContext, which reflects
+* any x-middleware-request-* header mutations applied by middleware.
+* Used for afterFiles and fallback rewrite has/missing evaluation — these
+* run after middleware in the App Router execution order.
+*
+* Falls back to `requestContextFromRequest(request)` when no HeadersContext
+* is set (no middleware ran, or middleware didn't set request headers).
+*/
+function buildPostMwRequestContext(request) {
+	const url = new URL(request.url);
+	const ctx = getHeadersContext();
+	if (!ctx) return requestContextFromRequest(request);
+	const cookiesRecord = Object.fromEntries(ctx.cookies);
+	return {
+		headers: ctx.headers,
+		cookies: cookiesRecord,
+		query: url.searchParams,
+		host: normalizeHost(ctx.headers.get("host"), url.hostname)
+	};
+}
+//#endregion
+export { buildPostMwRequestContext };
+
+//# sourceMappingURL=app-post-middleware-context.js.map

package/dist/server/app-post-middleware-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-post-middleware-context.js","names":[],"sources":["../../src/server/app-post-middleware-context.ts"],"sourcesContent":["import { getHeadersContext } from \"vinext/shims/headers\";\nimport { normalizeHost, requestContextFromRequest } from \"../config/config-matchers.js\";\nimport type { RequestContext } from \"../config/config-matchers.js\";\n\n/**\n * Build a request context from the live ALS HeadersContext, which reflects\n * any x-middleware-request-* header mutations applied by middleware.\n * Used for afterFiles and fallback rewrite has/missing evaluation — these\n * run after middleware in the App Router execution order.\n *\n * Falls back to `requestContextFromRequest(request)` when no HeadersContext\n * is set (no middleware ran, or middleware didn't set request headers).\n */\nexport function buildPostMwRequestContext(request: Request): RequestContext {\n  const url = new URL(request.url);\n  const ctx = getHeadersContext();\n  if (!ctx) return requestContextFromRequest(request);\n  const cookiesRecord: Record<string, string> = Object.fromEntries(ctx.cookies);\n  return {\n    headers: ctx.headers,\n    cookies: cookiesRecord,\n    query: url.searchParams,\n    host: normalizeHost(ctx.headers.get(\"host\"), url.hostname),\n  };\n}\n"],"mappings":";;;;;;;;;;;;AAaA,SAAgB,0BAA0B,SAAkC;CAC1E,MAAM,MAAM,IAAI,IAAI,QAAQ,IAAI;CAChC,MAAM,MAAM,mBAAmB;AAC/B,KAAI,CAAC,IAAK,QAAO,0BAA0B,QAAQ;CACnD,MAAM,gBAAwC,OAAO,YAAY,IAAI,QAAQ;AAC7E,QAAO;EACL,SAAS,IAAI;EACb,SAAS;EACT,OAAO,IAAI;EACX,MAAM,cAAc,IAAI,QAAQ,IAAI,OAAO,EAAE,IAAI,SAAS;EAC3D"}

package/dist/server/app-prerender-endpoints.js

@@ -1,3 +1,4 @@
+import { notFoundResponse } from "./http-error-responses.js";
 import { callAppPrerenderStaticParams } from "./app-prerender-static-params.js";
 //#region src/server/app-prerender-endpoints.ts
 const STATIC_PARAMS_ENDPOINT = "/__vinext/prerender/static-params";
@@ -12,7 +13,7 @@ async function handleAppPrerenderEndpoint(request, options) {
 	return null;
 }
 async function handleStaticParamsEndpoint(request, options) {
-	if (!isEnabled(options)) return new Response("Not Found", { status: 404 });
+	if (!isEnabled(options)) return notFoundResponse();
 	const url = new URL(request.url);
 	const pattern = url.searchParams.get("pattern");
 	if (!pattern) return new Response("missing pattern", { status: 400 });
@@ -30,7 +31,7 @@ async function handleStaticParamsEndpoint(request, options) {
 	}
 }
 async function handlePagesStaticPathsEndpoint(request, options) {
-	if (!isEnabled(options)) return new Response("Not Found", { status: 404 });
+	if (!isEnabled(options)) return notFoundResponse();
 	const url = new URL(request.url);
 	const pattern = url.searchParams.get("pattern");
 	if (!pattern) return new Response("missing pattern", { status: 400 });

package/dist/server/app-prerender-endpoints.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-prerender-endpoints.js","names":[],"sources":["../../src/server/app-prerender-endpoints.ts"],"sourcesContent":["import { callAppPrerenderStaticParams } from \"./app-prerender-static-params.js\";\nimport type { RootParams } from \"vinext/shims/root-params\";\n\ntype GenerateStaticParams = (args: { params: RootParams }) => unknown;\n\ntype AppPrerenderStaticParamsMap = Record<string, GenerateStaticParams | null | undefined>;\ntype RootParamNamesMap = Record<string, readonly string[] | undefined>;\n\ntype AppPrerenderPageRoute = {\n  pattern: string;\n  module?: {\n    getStaticPaths?: (opts: { locales: string[]; defaultLocale: string }) => unknown;\n  };\n};\n\ntype HandleAppPrerenderEndpointOptions = {\n  isPrerenderEnabled?: () => boolean;\n  loadPagesRoutes?: () => Promise<unknown>;\n  pathname: string;\n  rootParamNamesByPattern?: RootParamNamesMap;\n  staticParamsMap: AppPrerenderStaticParamsMap;\n};\n\nconst STATIC_PARAMS_ENDPOINT = \"/__vinext/prerender/static-params\";\nconst PAGES_STATIC_PATHS_ENDPOINT = \"/__vinext/prerender/pages-static-paths\";\nconst JSON_HEADERS = { \"content-type\": \"application/json\" };\n\nexport async function handleAppPrerenderEndpoint(\n  request: Request,\n  options: HandleAppPrerenderEndpointOptions,\n): Promise<Response | null> {\n  if (options.pathname === STATIC_PARAMS_ENDPOINT) {\n    return handleStaticParamsEndpoint(request, options);\n  }\n\n  if (options.pathname === PAGES_STATIC_PATHS_ENDPOINT) {\n    if (!options.loadPagesRoutes) return null;\n    return handlePagesStaticPathsEndpoint(request, options);\n  }\n\n  return null;\n}\n\nasync function handleStaticParamsEndpoint(\n  request: Request,\n  options: HandleAppPrerenderEndpointOptions,\n): Promise<Response> {\n  if (!isEnabled(options)) {\n    return new Response(\"Not Found\", { status: 404 });\n  }\n\n  const url = new URL(request.url);\n  const pattern = url.searchParams.get(\"pattern\");\n  if (!pattern) return new Response(\"missing pattern\", { status: 400 });\n\n  const generateStaticParams = options.staticParamsMap[pattern];\n  if (typeof generateStaticParams !== \"function\") {\n    return jsonNullResponse();\n  }\n\n  try {\n    const params = parseParentParams(url.searchParams.get(\"parentParams\"));\n    const result = await callAppPrerenderStaticParams({\n      fn: generateStaticParams,\n      params,\n      pattern,\n      rootParamNamesByPattern: options.rootParamNamesByPattern ?? {},\n    });\n    return jsonResponse(result);\n  } catch (error) {\n    return jsonResponse({ error: String(error) }, 500);\n  }\n}\n\nasync function handlePagesStaticPathsEndpoint(\n  request: Request,\n  options: HandleAppPrerenderEndpointOptions,\n): Promise<Response> {\n  if (!isEnabled(options)) {\n    return new Response(\"Not Found\", { status: 404 });\n  }\n\n  const url = new URL(request.url);\n  const pattern = url.searchParams.get(\"pattern\");\n  if (!pattern) return new Response(\"missing pattern\", { status: 400 });\n\n  try {\n    const pageRoutes = await options.loadPagesRoutes?.();\n    const route = findPageRoute(pageRoutes, pattern);\n    const getStaticPaths = route?.module?.getStaticPaths;\n    if (typeof getStaticPaths !== \"function\") {\n      return jsonNullResponse();\n    }\n\n    const locales = parseLocales(url.searchParams.get(\"locales\"));\n    const defaultLocale = url.searchParams.get(\"defaultLocale\") ?? \"\";\n    const result = await getStaticPaths({ locales, defaultLocale });\n    return jsonResponse(result);\n  } catch (error) {\n    return jsonResponse({ error: String(error) }, 500);\n  }\n}\n\nfunction isEnabled(options: HandleAppPrerenderEndpointOptions): boolean {\n  return options.isPrerenderEnabled?.() ?? false;\n}\n\nfunction jsonResponse(body: unknown, status = 200): Response {\n  return new Response(JSON.stringify(body), {\n    headers: JSON_HEADERS,\n    status,\n  });\n}\n\nfunction jsonNullResponse(): Response {\n  return new Response(\"null\", {\n    headers: JSON_HEADERS,\n    status: 200,\n  });\n}\n\nfunction parseParentParams(raw: string | null): RootParams {\n  if (!raw) return {};\n\n  const value = JSON.parse(raw);\n  if (!isPlainObject(value)) return {};\n\n  const params: RootParams = {};\n  for (const [key, paramValue] of Object.entries(value)) {\n    if (typeof paramValue === \"string\" || paramValue === undefined || isStringArray(paramValue)) {\n      params[key] = paramValue;\n    }\n  }\n  return params;\n}\n\nfunction parseLocales(raw: string | null): string[] {\n  if (!raw) return [];\n\n  const value = JSON.parse(raw);\n  if (!Array.isArray(value)) return [];\n\n  return value.filter((locale) => typeof locale === \"string\");\n}\n\nfunction findPageRoute(value: unknown, pattern: string): AppPrerenderPageRoute | undefined {\n  if (!Array.isArray(value)) return undefined;\n\n  for (const route of value) {\n    if (isPageRoute(route) && route.pattern === pattern) {\n      return route;\n    }\n  }\n\n  return undefined;\n}\n\nfunction isPageRoute(value: unknown): value is AppPrerenderPageRoute {\n  if (!isPlainObject(value) || typeof value.pattern !== \"string\") return false;\n  if (value.module === undefined) return true;\n  if (!isPlainObject(value.module)) return false;\n\n  return (\n    value.module.getStaticPaths === undefined || typeof value.module.getStaticPaths === \"function\"\n  );\n}\n\nfunction isPlainObject(value: unknown): value is Record<string, unknown> {\n  return typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\nfunction isStringArray(value: unknown): value is string[] {\n  return Array.isArray(value) && value.every((item) => typeof item === \"string\");\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-prerender-endpoints.js","names":[],"sources":["../../src/server/app-prerender-endpoints.ts"],"sourcesContent":["import { callAppPrerenderStaticParams } from \"./app-prerender-static-params.js\";\nimport { notFoundResponse } from \"./http-error-responses.js\";\nimport type { RootParams } from \"vinext/shims/root-params\";\n\ntype GenerateStaticParams = (args: { params: RootParams }) => unknown;\n\ntype AppPrerenderStaticParamsMap = Record<string, GenerateStaticParams | null | undefined>;\ntype RootParamNamesMap = Record<string, readonly string[] | undefined>;\n\ntype AppPrerenderPageRoute = {\n  pattern: string;\n  module?: {\n    getStaticPaths?: (opts: { locales: string[]; defaultLocale: string }) => unknown;\n  };\n};\n\ntype HandleAppPrerenderEndpointOptions = {\n  isPrerenderEnabled?: () => boolean;\n  loadPagesRoutes?: () => Promise<unknown>;\n  pathname: string;\n  rootParamNamesByPattern?: RootParamNamesMap;\n  staticParamsMap: AppPrerenderStaticParamsMap;\n};\n\nconst STATIC_PARAMS_ENDPOINT = \"/__vinext/prerender/static-params\";\nconst PAGES_STATIC_PATHS_ENDPOINT = \"/__vinext/prerender/pages-static-paths\";\nconst JSON_HEADERS = { \"content-type\": \"application/json\" };\n\nexport async function handleAppPrerenderEndpoint(\n  request: Request,\n  options: HandleAppPrerenderEndpointOptions,\n): Promise<Response | null> {\n  if (options.pathname === STATIC_PARAMS_ENDPOINT) {\n    return handleStaticParamsEndpoint(request, options);\n  }\n\n  if (options.pathname === PAGES_STATIC_PATHS_ENDPOINT) {\n    if (!options.loadPagesRoutes) return null;\n    return handlePagesStaticPathsEndpoint(request, options);\n  }\n\n  return null;\n}\n\nasync function handleStaticParamsEndpoint(\n  request: Request,\n  options: HandleAppPrerenderEndpointOptions,\n): Promise<Response> {\n  if (!isEnabled(options)) {\n    return notFoundResponse();\n  }\n\n  const url = new URL(request.url);\n  const pattern = url.searchParams.get(\"pattern\");\n  if (!pattern) return new Response(\"missing pattern\", { status: 400 });\n\n  const generateStaticParams = options.staticParamsMap[pattern];\n  if (typeof generateStaticParams !== \"function\") {\n    return jsonNullResponse();\n  }\n\n  try {\n    const params = parseParentParams(url.searchParams.get(\"parentParams\"));\n    const result = await callAppPrerenderStaticParams({\n      fn: generateStaticParams,\n      params,\n      pattern,\n      rootParamNamesByPattern: options.rootParamNamesByPattern ?? {},\n    });\n    return jsonResponse(result);\n  } catch (error) {\n    return jsonResponse({ error: String(error) }, 500);\n  }\n}\n\nasync function handlePagesStaticPathsEndpoint(\n  request: Request,\n  options: HandleAppPrerenderEndpointOptions,\n): Promise<Response> {\n  if (!isEnabled(options)) {\n    return notFoundResponse();\n  }\n\n  const url = new URL(request.url);\n  const pattern = url.searchParams.get(\"pattern\");\n  if (!pattern) return new Response(\"missing pattern\", { status: 400 });\n\n  try {\n    const pageRoutes = await options.loadPagesRoutes?.();\n    const route = findPageRoute(pageRoutes, pattern);\n    const getStaticPaths = route?.module?.getStaticPaths;\n    if (typeof getStaticPaths !== \"function\") {\n      return jsonNullResponse();\n    }\n\n    const locales = parseLocales(url.searchParams.get(\"locales\"));\n    const defaultLocale = url.searchParams.get(\"defaultLocale\") ?? \"\";\n    const result = await getStaticPaths({ locales, defaultLocale });\n    return jsonResponse(result);\n  } catch (error) {\n    return jsonResponse({ error: String(error) }, 500);\n  }\n}\n\nfunction isEnabled(options: HandleAppPrerenderEndpointOptions): boolean {\n  return options.isPrerenderEnabled?.() ?? false;\n}\n\nfunction jsonResponse(body: unknown, status = 200): Response {\n  return new Response(JSON.stringify(body), {\n    headers: JSON_HEADERS,\n    status,\n  });\n}\n\nfunction jsonNullResponse(): Response {\n  return new Response(\"null\", {\n    headers: JSON_HEADERS,\n    status: 200,\n  });\n}\n\nfunction parseParentParams(raw: string | null): RootParams {\n  if (!raw) return {};\n\n  const value = JSON.parse(raw);\n  if (!isPlainObject(value)) return {};\n\n  const params: RootParams = {};\n  for (const [key, paramValue] of Object.entries(value)) {\n    if (typeof paramValue === \"string\" || paramValue === undefined || isStringArray(paramValue)) {\n      params[key] = paramValue;\n    }\n  }\n  return params;\n}\n\nfunction parseLocales(raw: string | null): string[] {\n  if (!raw) return [];\n\n  const value = JSON.parse(raw);\n  if (!Array.isArray(value)) return [];\n\n  return value.filter((locale) => typeof locale === \"string\");\n}\n\nfunction findPageRoute(value: unknown, pattern: string): AppPrerenderPageRoute | undefined {\n  if (!Array.isArray(value)) return undefined;\n\n  for (const route of value) {\n    if (isPageRoute(route) && route.pattern === pattern) {\n      return route;\n    }\n  }\n\n  return undefined;\n}\n\nfunction isPageRoute(value: unknown): value is AppPrerenderPageRoute {\n  if (!isPlainObject(value) || typeof value.pattern !== \"string\") return false;\n  if (value.module === undefined) return true;\n  if (!isPlainObject(value.module)) return false;\n\n  return (\n    value.module.getStaticPaths === undefined || typeof value.module.getStaticPaths === \"function\"\n  );\n}\n\nfunction isPlainObject(value: unknown): value is Record<string, unknown> {\n  return typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\nfunction isStringArray(value: unknown): value is string[] {\n  return Array.isArray(value) && value.every((item) => typeof item === \"string\");\n}\n"],"mappings":"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"}

package/dist/server/app-request-context.d.ts

@@ -0,0 +1,22 @@
+import { NavigationContext } from "../shims/navigation.js";
+
+//#region src/server/app-request-context.d.ts
+/**
+ * Set navigation context in the ALS-backed store. "use client" components
+ * rendered during SSR need the pathname/searchParams/params but the SSR
+ * environment has a separate module instance of next/navigation.
+ *
+ * Clearing nav context (ctx === null) also clears root params.
+ */
+declare function setAppNavigationContext(ctx: NavigationContext | null): void;
+/**
+ * Clear all per-request ALS state owned by the App Router handler.
+ * Must be called before returning a non-page response (redirect, public
+ * file proxy, etc.) to prevent state leaking between requests on Workers.
+ *
+ * Clears: headers, navigation context, root params.
+ */
+declare function clearAppRequestContext(): void;
+//#endregion
+export { clearAppRequestContext, setAppNavigationContext };
+//# sourceMappingURL=app-request-context.d.ts.map

package/dist/server/app-request-context.js

@@ -0,0 +1,30 @@
+import { setHeadersContext } from "../shims/headers.js";
+import { setNavigationContext } from "../shims/navigation.js";
+import { setRootParams } from "../shims/root-params.js";
+//#region src/server/app-request-context.ts
+/**
+* Set navigation context in the ALS-backed store. "use client" components
+* rendered during SSR need the pathname/searchParams/params but the SSR
+* environment has a separate module instance of next/navigation.
+*
+* Clearing nav context (ctx === null) also clears root params.
+*/
+function setAppNavigationContext(ctx) {
+	setNavigationContext(ctx);
+	if (ctx === null) setRootParams(null);
+}
+/**
+* Clear all per-request ALS state owned by the App Router handler.
+* Must be called before returning a non-page response (redirect, public
+* file proxy, etc.) to prevent state leaking between requests on Workers.
+*
+* Clears: headers, navigation context, root params.
+*/
+function clearAppRequestContext() {
+	setHeadersContext(null);
+	setAppNavigationContext(null);
+}
+//#endregion
+export { clearAppRequestContext, setAppNavigationContext };
+
+//# sourceMappingURL=app-request-context.js.map

package/dist/server/app-request-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-request-context.js","names":[],"sources":["../../src/server/app-request-context.ts"],"sourcesContent":["import { setHeadersContext } from \"vinext/shims/headers\";\nimport {\n  setNavigationContext as setNavigationContextOrig,\n  type NavigationContext,\n} from \"vinext/shims/navigation\";\nimport { setRootParams } from \"vinext/shims/root-params\";\n\n/**\n * Set navigation context in the ALS-backed store. \"use client\" components\n * rendered during SSR need the pathname/searchParams/params but the SSR\n * environment has a separate module instance of next/navigation.\n *\n * Clearing nav context (ctx === null) also clears root params.\n */\nexport function setAppNavigationContext(ctx: NavigationContext | null): void {\n  setNavigationContextOrig(ctx);\n  if (ctx === null) setRootParams(null);\n}\n\n/**\n * Clear all per-request ALS state owned by the App Router handler.\n * Must be called before returning a non-page response (redirect, public\n * file proxy, etc.) to prevent state leaking between requests on Workers.\n *\n * Clears: headers, navigation context, root params.\n */\nexport function clearAppRequestContext(): void {\n  setHeadersContext(null);\n  setAppNavigationContext(null);\n}\n"],"mappings":";;;;;;;;;;;AAcA,SAAgB,wBAAwB,KAAqC;AAC3E,sBAAyB,IAAI;AAC7B,KAAI,QAAQ,KAAM,eAAc,KAAK;;;;;;;;;AAUvC,SAAgB,yBAA+B;AAC7C,mBAAkB,KAAK;AACvB,yBAAwB,KAAK"}

package/dist/server/app-route-handler-cache.d.ts

@@ -28,6 +28,7 @@ type ReadAppRouteHandlerCacheOptions = {
   params: AppRouteParams;
   requestUrl: string;
   revalidateSearchParams: URLSearchParams;
+  expireSeconds?: number;
   revalidateSeconds: number;
   routePattern: string;
   runInRevalidationContext: RouteHandlerRevalidationContextRunner;

package/dist/server/app-route-handler-cache.js

@@ -1,3 +1,4 @@
+import { makeThenableParams } from "../shims/thenable-params.js";
 import { markKnownDynamicAppRoute } from "./app-route-handler-runtime.js";
 import { applyRouteHandlerMiddlewareContext, assertSupportedAppRouteHandlerResponse, buildAppRouteCacheValue, buildRouteHandlerCachedResponse } from "./app-route-handler-response.js";
 import { runAppRouteHandler } from "./app-route-handler-execution.js";
@@ -15,6 +16,8 @@ async function readAppRouteHandlerCacheResponse(options) {
 			options.clearRequestContext();
 			return applyRouteHandlerMiddlewareContext(buildRouteHandlerCachedResponse(cachedValue, {
 				cacheState: "HIT",
+				cacheControl: cached?.value.cacheControl,
+				expireSeconds: options.expireSeconds,
 				isHead: options.isAutoHead,
 				revalidateSeconds: options.revalidateSeconds
 			}), options.middlewareContext);
@@ -36,7 +39,7 @@ async function readAppRouteHandlerCacheResponse(options) {
 						handlerFn: options.handlerFn,
 						i18n: options.i18n,
 						markDynamicUsage: options.markDynamicUsage,
-						params: options.params,
+						params: makeThenableParams(options.params),
 						request: new Request(options.requestUrl, { method: "GET" }),
 						routePattern: options.routePattern,
 						setHeadersAccessPhase: options.setHeadersAccessPhase
@@ -50,7 +53,7 @@ async function readAppRouteHandlerCacheResponse(options) {
 					}
 					const routeTags = options.buildPageCacheTags(options.cleanPathname, options.getCollectedFetchTags());
 					const routeCacheValue = await buildAppRouteCacheValue(response);
-					await options.isrSet(routeKey, routeCacheValue, options.revalidateSeconds, routeTags);
+					await options.isrSet(routeKey, routeCacheValue, options.revalidateSeconds, routeTags, options.expireSeconds);
 					options.isrDebug?.("route regen complete", routeKey);
 				});
 			});
@@ -58,6 +61,8 @@ async function readAppRouteHandlerCacheResponse(options) {
 			options.clearRequestContext();
 			return applyRouteHandlerMiddlewareContext(buildRouteHandlerCachedResponse(staleValue, {
 				cacheState: "STALE",
+				cacheControl: cached.value.cacheControl,
+				expireSeconds: options.expireSeconds,
 				isHead: options.isAutoHead,
 				revalidateSeconds: options.revalidateSeconds
 			}), options.middlewareContext);

package/dist/server/app-route-handler-cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-route-handler-cache.js","names":[],"sources":["../../src/server/app-route-handler-cache.ts"],"sourcesContent":["import type { NextI18nConfig } from \"../config/next-config.js\";\nimport type { HeadersAccessPhase } from \"vinext/shims/headers\";\nimport type { ISRCacheEntry } from \"./isr-cache.js\";\nimport type { RouteHandlerMiddlewareContext } from \"./app-route-handler-response.js\";\nimport {\n  applyRouteHandlerMiddlewareContext,\n  assertSupportedAppRouteHandlerResponse,\n  buildAppRouteCacheValue,\n  buildRouteHandlerCachedResponse,\n} from \"./app-route-handler-response.js\";\nimport { markKnownDynamicAppRoute } from \"./app-route-handler-runtime.js\";\nimport {\n  runAppRouteHandler,\n  type AppRouteDebugLogger,\n  type AppRouteDynamicUsageFn,\n  type AppRouteHandlerFunction,\n  type AppRouteParams,\n  type MarkAppRouteDynamicUsageFn,\n  type RouteHandlerCacheSetter,\n} from \"./app-route-handler-execution.js\";\n\ntype RouteHandlerCacheGetter = (key: string) => Promise<ISRCacheEntry | null>;\ntype RouteHandlerBackgroundRegenerator = (key: string, renderFn: () => Promise<void>) => void;\ntype RouteHandlerRevalidationContextRunner = (renderFn: () => Promise<void>) => Promise<void>;\n\ntype ReadAppRouteHandlerCacheOptions = {\n  basePath?: string;\n  buildPageCacheTags: (pathname: string, extraTags: string[]) => string[];\n  cleanPathname: string;\n  clearRequestContext: () => void;\n  consumeDynamicUsage: AppRouteDynamicUsageFn;\n  dynamicConfig?: string;\n  getCollectedFetchTags: () => string[];\n  handlerFn: AppRouteHandlerFunction;\n  i18n?: NextI18nConfig | null;\n  isAutoHead: boolean;\n  isrDebug?: AppRouteDebugLogger;\n  isrGet: RouteHandlerCacheGetter;\n  isrRouteKey: (pathname: string) => string;\n  isrSet: RouteHandlerCacheSetter;\n  markDynamicUsage: MarkAppRouteDynamicUsageFn;\n  middlewareContext: RouteHandlerMiddlewareContext;\n  params: AppRouteParams;\n  requestUrl: string;\n  revalidateSearchParams: URLSearchParams;\n  revalidateSeconds: number;\n  routePattern: string;\n  runInRevalidationContext: RouteHandlerRevalidationContextRunner;\n  scheduleBackgroundRegeneration: RouteHandlerBackgroundRegenerator;\n  setHeadersAccessPhase: (phase: HeadersAccessPhase) => HeadersAccessPhase;\n  setNavigationContext: (\n    context: {\n      pathname: string;\n      searchParams: URLSearchParams;\n      params: AppRouteParams;\n    } | null,\n  ) => void;\n};\n\nfunction getCachedAppRouteValue(entry: ISRCacheEntry | null) {\n  return entry?.value.value && entry.value.value.kind === \"APP_ROUTE\" ? entry.value.value : null;\n}\n\nexport async function readAppRouteHandlerCacheResponse(\n  options: ReadAppRouteHandlerCacheOptions,\n): Promise<Response | null> {\n  const routeKey = options.isrRouteKey(options.cleanPathname);\n\n  try {\n    const cached = await options.isrGet(routeKey);\n    const cachedValue = getCachedAppRouteValue(cached);\n\n    if (cachedValue && !cached?.isStale) {\n      options.isrDebug?.(\"HIT (route)\", options.cleanPathname);\n      options.clearRequestContext();\n      return applyRouteHandlerMiddlewareContext(\n        buildRouteHandlerCachedResponse(cachedValue, {\n          cacheState: \"HIT\",\n          isHead: options.isAutoHead,\n          revalidateSeconds: options.revalidateSeconds,\n        }),\n        options.middlewareContext,\n      );\n    }\n\n    if (cached?.isStale && cachedValue) {\n      const staleValue = cachedValue;\n      const revalidateSearchParams = new URLSearchParams(options.revalidateSearchParams);\n\n      options.scheduleBackgroundRegeneration(routeKey, async () => {\n        await options.runInRevalidationContext(async () => {\n          options.setNavigationContext({\n            pathname: options.cleanPathname,\n            searchParams: revalidateSearchParams,\n            params: options.params,\n          });\n\n          const { dynamicUsedInHandler, response } = await runAppRouteHandler({\n            basePath: options.basePath,\n            consumeDynamicUsage: options.consumeDynamicUsage,\n            dynamicConfig: options.dynamicConfig,\n            handlerFn: options.handlerFn,\n            i18n: options.i18n,\n            markDynamicUsage: options.markDynamicUsage,\n            params: options.params,\n            request: new Request(options.requestUrl, { method: \"GET\" }),\n            routePattern: options.routePattern,\n            setHeadersAccessPhase: options.setHeadersAccessPhase,\n          });\n\n          options.setNavigationContext(null);\n          assertSupportedAppRouteHandlerResponse(response);\n\n          if (dynamicUsedInHandler) {\n            markKnownDynamicAppRoute(options.routePattern);\n            options.isrDebug?.(\"route regen skipped (dynamic usage)\", options.cleanPathname);\n            return;\n          }\n\n          const routeTags = options.buildPageCacheTags(\n            options.cleanPathname,\n            options.getCollectedFetchTags(),\n          );\n          const routeCacheValue = await buildAppRouteCacheValue(response);\n          await options.isrSet(routeKey, routeCacheValue, options.revalidateSeconds, routeTags);\n          options.isrDebug?.(\"route regen complete\", routeKey);\n        });\n      });\n\n      options.isrDebug?.(\"STALE (route)\", options.cleanPathname);\n      options.clearRequestContext();\n      return applyRouteHandlerMiddlewareContext(\n        buildRouteHandlerCachedResponse(staleValue, {\n          cacheState: \"STALE\",\n          isHead: options.isAutoHead,\n          revalidateSeconds: options.revalidateSeconds,\n        }),\n        options.middlewareContext,\n      );\n    }\n  } catch (routeCacheError) {\n    console.error(\"[vinext] ISR route cache read error:\", routeCacheError);\n  }\n\n  return null;\n}\n"],"mappings":";;;;AA2DA,SAAS,uBAAuB,OAA6B;AAC3D,QAAO,OAAO,MAAM,SAAS,MAAM,MAAM,MAAM,SAAS,cAAc,MAAM,MAAM,QAAQ;;AAG5F,eAAsB,iCACpB,SAC0B;CAC1B,MAAM,WAAW,QAAQ,YAAY,QAAQ,cAAc;AAE3D,KAAI;EACF,MAAM,SAAS,MAAM,QAAQ,OAAO,SAAS;EAC7C,MAAM,cAAc,uBAAuB,OAAO;AAElD,MAAI,eAAe,CAAC,QAAQ,SAAS;AACnC,WAAQ,WAAW,eAAe,QAAQ,cAAc;AACxD,WAAQ,qBAAqB;AAC7B,UAAO,mCACL,gCAAgC,aAAa;IAC3C,YAAY;IACZ,QAAQ,QAAQ;IAChB,mBAAmB,QAAQ;IAC5B,CAAC,EACF,QAAQ,kBACT;;AAGH,MAAI,QAAQ,WAAW,aAAa;GAClC,MAAM,aAAa;GACnB,MAAM,yBAAyB,IAAI,gBAAgB,QAAQ,uBAAuB;AAElF,WAAQ,+BAA+B,UAAU,YAAY;AAC3D,UAAM,QAAQ,yBAAyB,YAAY;AACjD,aAAQ,qBAAqB;MAC3B,UAAU,QAAQ;MAClB,cAAc;MACd,QAAQ,QAAQ;MACjB,CAAC;KAEF,MAAM,EAAE,sBAAsB,aAAa,MAAM,mBAAmB;MAClE,UAAU,QAAQ;MAClB,qBAAqB,QAAQ;MAC7B,eAAe,QAAQ;MACvB,WAAW,QAAQ;MACnB,MAAM,QAAQ;MACd,kBAAkB,QAAQ;MAC1B,QAAQ,QAAQ;MAChB,SAAS,IAAI,QAAQ,QAAQ,YAAY,EAAE,QAAQ,OAAO,CAAC;MAC3D,cAAc,QAAQ;MACtB,uBAAuB,QAAQ;MAChC,CAAC;AAEF,aAAQ,qBAAqB,KAAK;AAClC,4CAAuC,SAAS;AAEhD,SAAI,sBAAsB;AACxB,+BAAyB,QAAQ,aAAa;AAC9C,cAAQ,WAAW,uCAAuC,QAAQ,cAAc;AAChF;;KAGF,MAAM,YAAY,QAAQ,mBACxB,QAAQ,eACR,QAAQ,uBAAuB,CAChC;KACD,MAAM,kBAAkB,MAAM,wBAAwB,SAAS;AAC/D,WAAM,QAAQ,OAAO,UAAU,iBAAiB,QAAQ,mBAAmB,UAAU;AACrF,aAAQ,WAAW,wBAAwB,SAAS;MACpD;KACF;AAEF,WAAQ,WAAW,iBAAiB,QAAQ,cAAc;AAC1D,WAAQ,qBAAqB;AAC7B,UAAO,mCACL,gCAAgC,YAAY;IAC1C,YAAY;IACZ,QAAQ,QAAQ;IAChB,mBAAmB,QAAQ;IAC5B,CAAC,EACF,QAAQ,kBACT;;UAEI,iBAAiB;AACxB,UAAQ,MAAM,wCAAwC,gBAAgB;;AAGxE,QAAO"}
+{"version":3,"file":"app-route-handler-cache.js","names":[],"sources":["../../src/server/app-route-handler-cache.ts"],"sourcesContent":["import type { NextI18nConfig } from \"../config/next-config.js\";\nimport type { HeadersAccessPhase } from \"vinext/shims/headers\";\nimport type { ISRCacheEntry } from \"./isr-cache.js\";\nimport type { RouteHandlerMiddlewareContext } from \"./app-route-handler-response.js\";\nimport {\n  applyRouteHandlerMiddlewareContext,\n  assertSupportedAppRouteHandlerResponse,\n  buildAppRouteCacheValue,\n  buildRouteHandlerCachedResponse,\n} from \"./app-route-handler-response.js\";\nimport { markKnownDynamicAppRoute } from \"./app-route-handler-runtime.js\";\nimport { makeThenableParams } from \"vinext/shims/thenable-params\";\nimport {\n  runAppRouteHandler,\n  type AppRouteDebugLogger,\n  type AppRouteDynamicUsageFn,\n  type AppRouteHandlerFunction,\n  type AppRouteParams,\n  type MarkAppRouteDynamicUsageFn,\n  type RouteHandlerCacheSetter,\n} from \"./app-route-handler-execution.js\";\n\ntype RouteHandlerCacheGetter = (key: string) => Promise<ISRCacheEntry | null>;\ntype RouteHandlerBackgroundRegenerator = (key: string, renderFn: () => Promise<void>) => void;\ntype RouteHandlerRevalidationContextRunner = (renderFn: () => Promise<void>) => Promise<void>;\n\ntype ReadAppRouteHandlerCacheOptions = {\n  basePath?: string;\n  buildPageCacheTags: (pathname: string, extraTags: string[]) => string[];\n  cleanPathname: string;\n  clearRequestContext: () => void;\n  consumeDynamicUsage: AppRouteDynamicUsageFn;\n  dynamicConfig?: string;\n  getCollectedFetchTags: () => string[];\n  handlerFn: AppRouteHandlerFunction;\n  i18n?: NextI18nConfig | null;\n  isAutoHead: boolean;\n  isrDebug?: AppRouteDebugLogger;\n  isrGet: RouteHandlerCacheGetter;\n  isrRouteKey: (pathname: string) => string;\n  isrSet: RouteHandlerCacheSetter;\n  markDynamicUsage: MarkAppRouteDynamicUsageFn;\n  middlewareContext: RouteHandlerMiddlewareContext;\n  params: AppRouteParams;\n  requestUrl: string;\n  revalidateSearchParams: URLSearchParams;\n  expireSeconds?: number;\n  revalidateSeconds: number;\n  routePattern: string;\n  runInRevalidationContext: RouteHandlerRevalidationContextRunner;\n  scheduleBackgroundRegeneration: RouteHandlerBackgroundRegenerator;\n  setHeadersAccessPhase: (phase: HeadersAccessPhase) => HeadersAccessPhase;\n  setNavigationContext: (\n    context: {\n      pathname: string;\n      searchParams: URLSearchParams;\n      params: AppRouteParams;\n    } | null,\n  ) => void;\n};\n\nfunction getCachedAppRouteValue(entry: ISRCacheEntry | null) {\n  return entry?.value.value && entry.value.value.kind === \"APP_ROUTE\" ? entry.value.value : null;\n}\n\nexport async function readAppRouteHandlerCacheResponse(\n  options: ReadAppRouteHandlerCacheOptions,\n): Promise<Response | null> {\n  const routeKey = options.isrRouteKey(options.cleanPathname);\n\n  try {\n    const cached = await options.isrGet(routeKey);\n    const cachedValue = getCachedAppRouteValue(cached);\n\n    if (cachedValue && !cached?.isStale) {\n      options.isrDebug?.(\"HIT (route)\", options.cleanPathname);\n      options.clearRequestContext();\n      return applyRouteHandlerMiddlewareContext(\n        buildRouteHandlerCachedResponse(cachedValue, {\n          cacheState: \"HIT\",\n          cacheControl: cached?.value.cacheControl,\n          expireSeconds: options.expireSeconds,\n          isHead: options.isAutoHead,\n          revalidateSeconds: options.revalidateSeconds,\n        }),\n        options.middlewareContext,\n      );\n    }\n\n    if (cached?.isStale && cachedValue) {\n      const staleValue = cachedValue;\n      const revalidateSearchParams = new URLSearchParams(options.revalidateSearchParams);\n\n      options.scheduleBackgroundRegeneration(routeKey, async () => {\n        await options.runInRevalidationContext(async () => {\n          options.setNavigationContext({\n            pathname: options.cleanPathname,\n            searchParams: revalidateSearchParams,\n            params: options.params,\n          });\n\n          const { dynamicUsedInHandler, response } = await runAppRouteHandler({\n            basePath: options.basePath,\n            consumeDynamicUsage: options.consumeDynamicUsage,\n            dynamicConfig: options.dynamicConfig,\n            handlerFn: options.handlerFn,\n            i18n: options.i18n,\n            markDynamicUsage: options.markDynamicUsage,\n            params: makeThenableParams(options.params),\n            request: new Request(options.requestUrl, { method: \"GET\" }),\n            routePattern: options.routePattern,\n            setHeadersAccessPhase: options.setHeadersAccessPhase,\n          });\n\n          options.setNavigationContext(null);\n          assertSupportedAppRouteHandlerResponse(response);\n\n          if (dynamicUsedInHandler) {\n            markKnownDynamicAppRoute(options.routePattern);\n            options.isrDebug?.(\"route regen skipped (dynamic usage)\", options.cleanPathname);\n            return;\n          }\n\n          const routeTags = options.buildPageCacheTags(\n            options.cleanPathname,\n            options.getCollectedFetchTags(),\n          );\n          const routeCacheValue = await buildAppRouteCacheValue(response);\n          await options.isrSet(\n            routeKey,\n            routeCacheValue,\n            options.revalidateSeconds,\n            routeTags,\n            options.expireSeconds,\n          );\n          options.isrDebug?.(\"route regen complete\", routeKey);\n        });\n      });\n\n      options.isrDebug?.(\"STALE (route)\", options.cleanPathname);\n      options.clearRequestContext();\n      return applyRouteHandlerMiddlewareContext(\n        buildRouteHandlerCachedResponse(staleValue, {\n          cacheState: \"STALE\",\n          cacheControl: cached.value.cacheControl,\n          expireSeconds: options.expireSeconds,\n          isHead: options.isAutoHead,\n          revalidateSeconds: options.revalidateSeconds,\n        }),\n        options.middlewareContext,\n      );\n    }\n  } catch (routeCacheError) {\n    console.error(\"[vinext] ISR route cache read error:\", routeCacheError);\n  }\n\n  return null;\n}\n"],"mappings":";;;;;AA6DA,SAAS,uBAAuB,OAA6B;AAC3D,QAAO,OAAO,MAAM,SAAS,MAAM,MAAM,MAAM,SAAS,cAAc,MAAM,MAAM,QAAQ;;AAG5F,eAAsB,iCACpB,SAC0B;CAC1B,MAAM,WAAW,QAAQ,YAAY,QAAQ,cAAc;AAE3D,KAAI;EACF,MAAM,SAAS,MAAM,QAAQ,OAAO,SAAS;EAC7C,MAAM,cAAc,uBAAuB,OAAO;AAElD,MAAI,eAAe,CAAC,QAAQ,SAAS;AACnC,WAAQ,WAAW,eAAe,QAAQ,cAAc;AACxD,WAAQ,qBAAqB;AAC7B,UAAO,mCACL,gCAAgC,aAAa;IAC3C,YAAY;IACZ,cAAc,QAAQ,MAAM;IAC5B,eAAe,QAAQ;IACvB,QAAQ,QAAQ;IAChB,mBAAmB,QAAQ;IAC5B,CAAC,EACF,QAAQ,kBACT;;AAGH,MAAI,QAAQ,WAAW,aAAa;GAClC,MAAM,aAAa;GACnB,MAAM,yBAAyB,IAAI,gBAAgB,QAAQ,uBAAuB;AAElF,WAAQ,+BAA+B,UAAU,YAAY;AAC3D,UAAM,QAAQ,yBAAyB,YAAY;AACjD,aAAQ,qBAAqB;MAC3B,UAAU,QAAQ;MAClB,cAAc;MACd,QAAQ,QAAQ;MACjB,CAAC;KAEF,MAAM,EAAE,sBAAsB,aAAa,MAAM,mBAAmB;MAClE,UAAU,QAAQ;MAClB,qBAAqB,QAAQ;MAC7B,eAAe,QAAQ;MACvB,WAAW,QAAQ;MACnB,MAAM,QAAQ;MACd,kBAAkB,QAAQ;MAC1B,QAAQ,mBAAmB,QAAQ,OAAO;MAC1C,SAAS,IAAI,QAAQ,QAAQ,YAAY,EAAE,QAAQ,OAAO,CAAC;MAC3D,cAAc,QAAQ;MACtB,uBAAuB,QAAQ;MAChC,CAAC;AAEF,aAAQ,qBAAqB,KAAK;AAClC,4CAAuC,SAAS;AAEhD,SAAI,sBAAsB;AACxB,+BAAyB,QAAQ,aAAa;AAC9C,cAAQ,WAAW,uCAAuC,QAAQ,cAAc;AAChF;;KAGF,MAAM,YAAY,QAAQ,mBACxB,QAAQ,eACR,QAAQ,uBAAuB,CAChC;KACD,MAAM,kBAAkB,MAAM,wBAAwB,SAAS;AAC/D,WAAM,QAAQ,OACZ,UACA,iBACA,QAAQ,mBACR,WACA,QAAQ,cACT;AACD,aAAQ,WAAW,wBAAwB,SAAS;MACpD;KACF;AAEF,WAAQ,WAAW,iBAAiB,QAAQ,cAAc;AAC1D,WAAQ,qBAAqB;AAC7B,UAAO,mCACL,gCAAgC,YAAY;IAC1C,YAAY;IACZ,cAAc,OAAO,MAAM;IAC3B,eAAe,QAAQ;IACvB,QAAQ,QAAQ;IAChB,mBAAmB,QAAQ;IAC5B,CAAC,EACF,QAAQ,kBACT;;UAEI,iBAAiB;AACxB,UAAQ,MAAM,wCAAwC,gBAAgB;;AAGxE,QAAO"}

package/dist/server/app-route-handler-dispatch.d.ts

@@ -21,6 +21,7 @@ type DispatchAppRouteHandlerOptions = {
   basePath?: string;
   cleanPathname: string;
   clearRequestContext: () => void;
+  expireSeconds?: number;
   i18n?: NextI18nConfig | null;
   isDevelopment?: boolean;
   isProduction?: boolean;

package/dist/server/app-route-handler-dispatch.js

@@ -4,7 +4,8 @@ import { reportRequestError } from "./instrumentation.js";
 import { consumeDynamicUsage, getAndClearPendingCookies, getDraftModeCookieHeader, markDynamicUsage, setHeadersAccessPhase } from "../shims/headers.js";
 import { ensureFetchPatch, getCollectedFetchTags, setCurrentFetchSoftTags } from "../shims/fetch-cache.js";
 import { setNavigationContext } from "../shims/navigation.js";
-import { isKnownDynamicAppRoute } from "./app-route-handler-runtime.js";
+import { makeThenableParams } from "../shims/thenable-params.js";
+import { isKnownDynamicAppRoute, isValidHTTPMethod } from "./app-route-handler-runtime.js";
 import { getAppRouteHandlerRevalidateSeconds, hasAppRouteHandlerDefaultExport, resolveAppRouteHandlerMethod, shouldReadAppRouteHandlerCache } from "./app-route-handler-policy.js";
 import { createStaticGenerationHeadersContext } from "./app-static-generation.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
@@ -15,10 +16,6 @@ import { readAppRouteHandlerCacheResponse } from "./app-route-handler-cache.js";
 function isAppRouteHandlerFunction(value) {
 	return typeof value === "function";
 }
-function makeThenableParams(params) {
-	const plain = { ...params };
-	return Object.assign(Promise.resolve(plain), plain);
-}
 function buildRouteHandlerPageCacheTags(pathname, extraTags, routeSegments) {
 	return buildPageCacheTags(pathname, extraTags, routeSegments, "route");
 }
@@ -45,6 +42,10 @@ async function dispatchAppRouteHandler(options) {
 	const isDevelopment = options.isDevelopment ?? process.env.NODE_ENV === "development";
 	const isProduction = options.isProduction ?? process.env.NODE_ENV === "production";
 	if (hasAppRouteHandlerDefaultExport(handler) && isDevelopment) console.error("[vinext] Detected default export in route handler " + route.pattern + ". Export a named export for each HTTP method instead.");
+	if (!isValidHTTPMethod(method)) {
+		options.clearRequestContext();
+		return applyRouteHandlerMiddlewareContext(new Response(null, { status: 400 }), options.middlewareContext);
+	}
 	const { allowHeaderForOptions, handlerFn, isAutoHead, shouldAutoRespondToOptions } = resolveAppRouteHandlerMethod(handler, method);
 	if (shouldAutoRespondToOptions) {
 		options.clearRequestContext();
@@ -85,6 +86,7 @@ async function dispatchAppRouteHandler(options) {
 			params: options.params,
 			requestUrl: options.request.url,
 			revalidateSearchParams: options.searchParams,
+			expireSeconds: options.expireSeconds,
 			revalidateSeconds,
 			routePattern: route.pattern,
 			runInRevalidationContext(renderFn) {
@@ -134,6 +136,7 @@ async function dispatchAppRouteHandler(options) {
 		params: makeThenableParams(options.params),
 		reportRequestError,
 		request: options.request,
+		expireSeconds: options.expireSeconds,
 		revalidateSeconds,
 		routePattern: route.pattern,
 		setHeadersAccessPhase

package/dist/server/app-route-handler-dispatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-route-handler-dispatch.js","names":[],"sources":["../../src/server/app-route-handler-dispatch.ts"],"sourcesContent":["import type { NextI18nConfig } from \"../config/next-config.js\";\nimport {\n  getCollectedFetchTags,\n  ensureFetchPatch,\n  setCurrentFetchSoftTags,\n} from \"vinext/shims/fetch-cache\";\nimport {\n  consumeDynamicUsage,\n  getAndClearPendingCookies,\n  getDraftModeCookieHeader,\n  markDynamicUsage,\n  setHeadersAccessPhase,\n} from \"vinext/shims/headers\";\nimport { setNavigationContext } from \"vinext/shims/navigation\";\nimport { getRequestExecutionContext } from \"vinext/shims/request-context\";\nimport { createRequestContext, runWithRequestContext } from \"vinext/shims/unified-request-context\";\nimport type { ISRCacheEntry } from \"./isr-cache.js\";\nimport {\n  getAppRouteHandlerRevalidateSeconds,\n  hasAppRouteHandlerDefaultExport,\n  resolveAppRouteHandlerMethod,\n  shouldReadAppRouteHandlerCache,\n  type AppRouteHandlerModule,\n} from \"./app-route-handler-policy.js\";\nimport { readAppRouteHandlerCacheResponse } from \"./app-route-handler-cache.js\";\nimport {\n  executeAppRouteHandler,\n  type AppRouteDebugLogger,\n  type AppRouteHandlerFunction,\n  type AppRouteParams,\n  type RouteHandlerCacheSetter,\n} from \"./app-route-handler-execution.js\";\nimport { isKnownDynamicAppRoute } from \"./app-route-handler-runtime.js\";\nimport {\n  applyRouteHandlerMiddlewareContext,\n  type RouteHandlerMiddlewareContext,\n} from \"./app-route-handler-response.js\";\nimport { createStaticGenerationHeadersContext } from \"./app-static-generation.js\";\nimport { buildPageCacheTags } from \"./implicit-tags.js\";\nimport { reportRequestError } from \"./instrumentation.js\";\n\ntype AppRouteHandlerDispatchRoute = {\n  pattern: string;\n  routeHandler: AppRouteHandlerModule;\n  routeSegments: string[];\n};\n\ntype RouteHandlerCacheGetter = (key: string) => Promise<ISRCacheEntry | null>;\ntype RouteHandlerBackgroundRegenerationErrorContext = {\n  routerKind: \"App Router\";\n  routePath: string;\n  routeType: \"route\";\n};\ntype RouteHandlerBackgroundRegenerator = (\n  key: string,\n  renderFn: () => Promise<void>,\n  errorContext?: RouteHandlerBackgroundRegenerationErrorContext,\n) => void;\n\ntype DispatchAppRouteHandlerOptions = {\n  basePath?: string;\n  cleanPathname: string;\n  clearRequestContext: () => void;\n  i18n?: NextI18nConfig | null;\n  isDevelopment?: boolean;\n  isProduction?: boolean;\n  isrDebug?: AppRouteDebugLogger;\n  isrGet: RouteHandlerCacheGetter;\n  isrRouteKey: (pathname: string) => string;\n  isrSet: RouteHandlerCacheSetter;\n  middlewareContext: RouteHandlerMiddlewareContext;\n  middlewareRequestHeaders?: Headers | null;\n  params: AppRouteParams;\n  request: Request;\n  route: AppRouteHandlerDispatchRoute;\n  scheduleBackgroundRegeneration: RouteHandlerBackgroundRegenerator;\n  searchParams: URLSearchParams;\n};\n\nfunction isAppRouteHandlerFunction(value: unknown): value is AppRouteHandlerFunction {\n  return typeof value === \"function\";\n}\n\nfunction makeThenableParams<T extends AppRouteParams>(params: T): Promise<T> & T {\n  const plain = { ...params };\n  return Object.assign(Promise.resolve(plain), plain);\n}\n\nfunction buildRouteHandlerPageCacheTags(\n  pathname: string,\n  extraTags: string[],\n  routeSegments: string[],\n): string[] {\n  return buildPageCacheTags(pathname, extraTags, routeSegments, \"route\");\n}\n\nasync function runInRouteHandlerRevalidationContext(\n  options: {\n    cleanPathname: string;\n    dynamicConfig?: string;\n    routePattern: string;\n    routeSegments: string[];\n  },\n  renderFn: () => Promise<void>,\n): Promise<void> {\n  const headersContext = createStaticGenerationHeadersContext({\n    dynamicConfig: options.dynamicConfig,\n    routeKind: \"route\",\n    routePattern: options.routePattern,\n  });\n  const requestContext = createRequestContext({\n    headersContext,\n    executionContext: getRequestExecutionContext(),\n    unstableCacheRevalidation: \"foreground\",\n  });\n\n  await runWithRequestContext(requestContext, async () => {\n    ensureFetchPatch();\n    setCurrentFetchSoftTags(\n      buildRouteHandlerPageCacheTags(options.cleanPathname, [], options.routeSegments),\n    );\n    await renderFn();\n  });\n}\n\nexport async function dispatchAppRouteHandler(\n  options: DispatchAppRouteHandlerOptions,\n): Promise<Response> {\n  const { route } = options;\n  const handler = route.routeHandler;\n  const method = options.request.method.toUpperCase();\n  const revalidateSeconds = getAppRouteHandlerRevalidateSeconds(handler);\n  const isDevelopment = options.isDevelopment ?? process.env.NODE_ENV === \"development\";\n  const isProduction = options.isProduction ?? process.env.NODE_ENV === \"production\";\n\n  if (hasAppRouteHandlerDefaultExport(handler) && isDevelopment) {\n    console.error(\n      \"[vinext] Detected default export in route handler \" +\n        route.pattern +\n        \". Export a named export for each HTTP method instead.\",\n    );\n  }\n\n  const { allowHeaderForOptions, handlerFn, isAutoHead, shouldAutoRespondToOptions } =\n    resolveAppRouteHandlerMethod(handler, method);\n\n  if (shouldAutoRespondToOptions) {\n    options.clearRequestContext();\n    return applyRouteHandlerMiddlewareContext(\n      new Response(null, {\n        status: 204,\n        headers: { Allow: allowHeaderForOptions },\n      }),\n      options.middlewareContext,\n    );\n  }\n\n  const resolvedHandlerFn = isAppRouteHandlerFunction(handlerFn) ? handlerFn : undefined;\n\n  if (\n    revalidateSeconds !== null &&\n    shouldReadAppRouteHandlerCache({\n      dynamicConfig: handler.dynamic,\n      handlerFn: resolvedHandlerFn,\n      isAutoHead,\n      isKnownDynamic: isKnownDynamicAppRoute(route.pattern),\n      isProduction,\n      method,\n      revalidateSeconds,\n    }) &&\n    resolvedHandlerFn\n  ) {\n    const cachedRouteResponse = await readAppRouteHandlerCacheResponse({\n      basePath: options.basePath,\n      buildPageCacheTags(pathname, extraTags) {\n        return buildRouteHandlerPageCacheTags(pathname, extraTags, route.routeSegments);\n      },\n      cleanPathname: options.cleanPathname,\n      clearRequestContext: options.clearRequestContext,\n      consumeDynamicUsage,\n      dynamicConfig: handler.dynamic,\n      getCollectedFetchTags,\n      handlerFn: resolvedHandlerFn,\n      i18n: options.i18n,\n      isAutoHead,\n      isrDebug: options.isrDebug,\n      isrGet: options.isrGet,\n      isrRouteKey: options.isrRouteKey,\n      isrSet: options.isrSet,\n      markDynamicUsage,\n      middlewareContext: options.middlewareContext,\n      params: options.params,\n      requestUrl: options.request.url,\n      revalidateSearchParams: options.searchParams,\n      revalidateSeconds,\n      routePattern: route.pattern,\n      runInRevalidationContext(renderFn) {\n        return runInRouteHandlerRevalidationContext(\n          {\n            cleanPathname: options.cleanPathname,\n            dynamicConfig: handler.dynamic,\n            routePattern: route.pattern,\n            routeSegments: route.routeSegments,\n          },\n          renderFn,\n        );\n      },\n      scheduleBackgroundRegeneration(key, renderFn) {\n        options.scheduleBackgroundRegeneration(key, renderFn, {\n          routerKind: \"App Router\",\n          routePath: route.pattern,\n          routeType: \"route\",\n        });\n      },\n      setHeadersAccessPhase,\n      setNavigationContext,\n    });\n    if (cachedRouteResponse) {\n      return cachedRouteResponse;\n    }\n  }\n\n  if (resolvedHandlerFn) {\n    return executeAppRouteHandler({\n      basePath: options.basePath,\n      buildPageCacheTags(pathname, extraTags) {\n        return buildRouteHandlerPageCacheTags(pathname, extraTags, route.routeSegments);\n      },\n      cleanPathname: options.cleanPathname,\n      clearRequestContext: options.clearRequestContext,\n      consumeDynamicUsage,\n      executionContext: getRequestExecutionContext(),\n      getAndClearPendingCookies,\n      getCollectedFetchTags,\n      getDraftModeCookieHeader,\n      handler,\n      handlerFn: resolvedHandlerFn,\n      i18n: options.i18n,\n      isAutoHead,\n      isProduction,\n      isrDebug: options.isrDebug,\n      isrRouteKey: options.isrRouteKey,\n      isrSet: options.isrSet,\n      markDynamicUsage,\n      method,\n      middlewareContext: options.middlewareContext,\n      middlewareRequestHeaders: options.middlewareRequestHeaders,\n      params: makeThenableParams(options.params),\n      reportRequestError,\n      request: options.request,\n      revalidateSeconds,\n      routePattern: route.pattern,\n      setHeadersAccessPhase,\n    });\n  }\n\n  options.clearRequestContext();\n  return applyRouteHandlerMiddlewareContext(\n    new Response(null, {\n      status: 405,\n    }),\n    options.middlewareContext,\n  );\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-route-handler-dispatch.js","names":[],"sources":["../../src/server/app-route-handler-dispatch.ts"],"sourcesContent":["import type { NextI18nConfig } from \"../config/next-config.js\";\nimport {\n  getCollectedFetchTags,\n  ensureFetchPatch,\n  setCurrentFetchSoftTags,\n} from \"vinext/shims/fetch-cache\";\nimport {\n  consumeDynamicUsage,\n  getAndClearPendingCookies,\n  getDraftModeCookieHeader,\n  markDynamicUsage,\n  setHeadersAccessPhase,\n} from \"vinext/shims/headers\";\nimport { setNavigationContext } from \"vinext/shims/navigation\";\nimport { getRequestExecutionContext } from \"vinext/shims/request-context\";\nimport { createRequestContext, runWithRequestContext } from \"vinext/shims/unified-request-context\";\nimport type { ISRCacheEntry } from \"./isr-cache.js\";\nimport {\n  getAppRouteHandlerRevalidateSeconds,\n  hasAppRouteHandlerDefaultExport,\n  resolveAppRouteHandlerMethod,\n  shouldReadAppRouteHandlerCache,\n  type AppRouteHandlerModule,\n} from \"./app-route-handler-policy.js\";\nimport { readAppRouteHandlerCacheResponse } from \"./app-route-handler-cache.js\";\nimport {\n  executeAppRouteHandler,\n  type AppRouteDebugLogger,\n  type AppRouteHandlerFunction,\n  type AppRouteParams,\n  type RouteHandlerCacheSetter,\n} from \"./app-route-handler-execution.js\";\nimport { isKnownDynamicAppRoute, isValidHTTPMethod } from \"./app-route-handler-runtime.js\";\nimport {\n  applyRouteHandlerMiddlewareContext,\n  type RouteHandlerMiddlewareContext,\n} from \"./app-route-handler-response.js\";\nimport { createStaticGenerationHeadersContext } from \"./app-static-generation.js\";\nimport { buildPageCacheTags } from \"./implicit-tags.js\";\nimport { makeThenableParams } from \"vinext/shims/thenable-params\";\nimport { reportRequestError } from \"./instrumentation.js\";\n\ntype AppRouteHandlerDispatchRoute = {\n  pattern: string;\n  routeHandler: AppRouteHandlerModule;\n  routeSegments: string[];\n};\n\ntype RouteHandlerCacheGetter = (key: string) => Promise<ISRCacheEntry | null>;\ntype RouteHandlerBackgroundRegenerationErrorContext = {\n  routerKind: \"App Router\";\n  routePath: string;\n  routeType: \"route\";\n};\ntype RouteHandlerBackgroundRegenerator = (\n  key: string,\n  renderFn: () => Promise<void>,\n  errorContext?: RouteHandlerBackgroundRegenerationErrorContext,\n) => void;\n\ntype DispatchAppRouteHandlerOptions = {\n  basePath?: string;\n  cleanPathname: string;\n  clearRequestContext: () => void;\n  expireSeconds?: number;\n  i18n?: NextI18nConfig | null;\n  isDevelopment?: boolean;\n  isProduction?: boolean;\n  isrDebug?: AppRouteDebugLogger;\n  isrGet: RouteHandlerCacheGetter;\n  isrRouteKey: (pathname: string) => string;\n  isrSet: RouteHandlerCacheSetter;\n  middlewareContext: RouteHandlerMiddlewareContext;\n  middlewareRequestHeaders?: Headers | null;\n  params: AppRouteParams;\n  request: Request;\n  route: AppRouteHandlerDispatchRoute;\n  scheduleBackgroundRegeneration: RouteHandlerBackgroundRegenerator;\n  searchParams: URLSearchParams;\n};\n\nfunction isAppRouteHandlerFunction(value: unknown): value is AppRouteHandlerFunction {\n  return typeof value === \"function\";\n}\n\nfunction buildRouteHandlerPageCacheTags(\n  pathname: string,\n  extraTags: string[],\n  routeSegments: string[],\n): string[] {\n  return buildPageCacheTags(pathname, extraTags, routeSegments, \"route\");\n}\n\nasync function runInRouteHandlerRevalidationContext(\n  options: {\n    cleanPathname: string;\n    dynamicConfig?: string;\n    routePattern: string;\n    routeSegments: string[];\n  },\n  renderFn: () => Promise<void>,\n): Promise<void> {\n  const headersContext = createStaticGenerationHeadersContext({\n    dynamicConfig: options.dynamicConfig,\n    routeKind: \"route\",\n    routePattern: options.routePattern,\n  });\n  const requestContext = createRequestContext({\n    headersContext,\n    executionContext: getRequestExecutionContext(),\n    unstableCacheRevalidation: \"foreground\",\n  });\n\n  await runWithRequestContext(requestContext, async () => {\n    ensureFetchPatch();\n    setCurrentFetchSoftTags(\n      buildRouteHandlerPageCacheTags(options.cleanPathname, [], options.routeSegments),\n    );\n    await renderFn();\n  });\n}\n\nexport async function dispatchAppRouteHandler(\n  options: DispatchAppRouteHandlerOptions,\n): Promise<Response> {\n  const { route } = options;\n  const handler = route.routeHandler;\n  const method = options.request.method.toUpperCase();\n  const revalidateSeconds = getAppRouteHandlerRevalidateSeconds(handler);\n  const isDevelopment = options.isDevelopment ?? process.env.NODE_ENV === \"development\";\n  const isProduction = options.isProduction ?? process.env.NODE_ENV === \"production\";\n\n  if (hasAppRouteHandlerDefaultExport(handler) && isDevelopment) {\n    console.error(\n      \"[vinext] Detected default export in route handler \" +\n        route.pattern +\n        \". Export a named export for each HTTP method instead.\",\n    );\n  }\n\n  // Reject non-standard HTTP methods before any auto-OPTIONS/405 logic.\n  // Next.js returns 400 for invalid methods; vinext mirrors that behavior.\n  // https://github.com/vercel/next.js/blob/canary/packages/next/src/server/route-modules/app-route/module.ts#L390-L392\n  if (!isValidHTTPMethod(method)) {\n    options.clearRequestContext();\n    return applyRouteHandlerMiddlewareContext(\n      new Response(null, { status: 400 }),\n      options.middlewareContext,\n    );\n  }\n\n  const { allowHeaderForOptions, handlerFn, isAutoHead, shouldAutoRespondToOptions } =\n    resolveAppRouteHandlerMethod(handler, method);\n\n  if (shouldAutoRespondToOptions) {\n    options.clearRequestContext();\n    return applyRouteHandlerMiddlewareContext(\n      new Response(null, {\n        status: 204,\n        headers: { Allow: allowHeaderForOptions },\n      }),\n      options.middlewareContext,\n    );\n  }\n\n  const resolvedHandlerFn = isAppRouteHandlerFunction(handlerFn) ? handlerFn : undefined;\n\n  if (\n    revalidateSeconds !== null &&\n    shouldReadAppRouteHandlerCache({\n      dynamicConfig: handler.dynamic,\n      handlerFn: resolvedHandlerFn,\n      isAutoHead,\n      isKnownDynamic: isKnownDynamicAppRoute(route.pattern),\n      isProduction,\n      method,\n      revalidateSeconds,\n    }) &&\n    resolvedHandlerFn\n  ) {\n    const cachedRouteResponse = await readAppRouteHandlerCacheResponse({\n      basePath: options.basePath,\n      buildPageCacheTags(pathname, extraTags) {\n        return buildRouteHandlerPageCacheTags(pathname, extraTags, route.routeSegments);\n      },\n      cleanPathname: options.cleanPathname,\n      clearRequestContext: options.clearRequestContext,\n      consumeDynamicUsage,\n      dynamicConfig: handler.dynamic,\n      getCollectedFetchTags,\n      handlerFn: resolvedHandlerFn,\n      i18n: options.i18n,\n      isAutoHead,\n      isrDebug: options.isrDebug,\n      isrGet: options.isrGet,\n      isrRouteKey: options.isrRouteKey,\n      isrSet: options.isrSet,\n      markDynamicUsage,\n      middlewareContext: options.middlewareContext,\n      params: options.params,\n      requestUrl: options.request.url,\n      revalidateSearchParams: options.searchParams,\n      expireSeconds: options.expireSeconds,\n      revalidateSeconds,\n      routePattern: route.pattern,\n      runInRevalidationContext(renderFn) {\n        return runInRouteHandlerRevalidationContext(\n          {\n            cleanPathname: options.cleanPathname,\n            dynamicConfig: handler.dynamic,\n            routePattern: route.pattern,\n            routeSegments: route.routeSegments,\n          },\n          renderFn,\n        );\n      },\n      scheduleBackgroundRegeneration(key, renderFn) {\n        options.scheduleBackgroundRegeneration(key, renderFn, {\n          routerKind: \"App Router\",\n          routePath: route.pattern,\n          routeType: \"route\",\n        });\n      },\n      setHeadersAccessPhase,\n      setNavigationContext,\n    });\n    if (cachedRouteResponse) {\n      return cachedRouteResponse;\n    }\n  }\n\n  if (resolvedHandlerFn) {\n    return executeAppRouteHandler({\n      basePath: options.basePath,\n      buildPageCacheTags(pathname, extraTags) {\n        return buildRouteHandlerPageCacheTags(pathname, extraTags, route.routeSegments);\n      },\n      cleanPathname: options.cleanPathname,\n      clearRequestContext: options.clearRequestContext,\n      consumeDynamicUsage,\n      executionContext: getRequestExecutionContext(),\n      getAndClearPendingCookies,\n      getCollectedFetchTags,\n      getDraftModeCookieHeader,\n      handler,\n      handlerFn: resolvedHandlerFn,\n      i18n: options.i18n,\n      isAutoHead,\n      isProduction,\n      isrDebug: options.isrDebug,\n      isrRouteKey: options.isrRouteKey,\n      isrSet: options.isrSet,\n      markDynamicUsage,\n      method,\n      middlewareContext: options.middlewareContext,\n      middlewareRequestHeaders: options.middlewareRequestHeaders,\n      params: makeThenableParams(options.params),\n      reportRequestError,\n      request: options.request,\n      expireSeconds: options.expireSeconds,\n      revalidateSeconds,\n      routePattern: route.pattern,\n      setHeadersAccessPhase,\n    });\n  }\n\n  options.clearRequestContext();\n  return applyRouteHandlerMiddlewareContext(\n    new Response(null, {\n      status: 405,\n    }),\n    options.middlewareContext,\n  );\n}\n"],"mappings":"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"}

package/dist/server/app-route-handler-execution.d.ts

@@ -13,7 +13,7 @@ type MarkAppRouteDynamicUsageFn = () => void;
 type AppRouteHandlerFunction = (request: NextRequest, context: {
   params: AppRouteParams;
 }) => Response | Promise<Response>;
-type RouteHandlerCacheSetter = (key: string, data: CachedRouteValue, revalidateSeconds: number, tags: string[]) => Promise<void>;
+type RouteHandlerCacheSetter = (key: string, data: CachedRouteValue, revalidateSeconds: number, tags: string[], expireSeconds?: number) => Promise<void>;
 type AppRouteErrorReporter = (error: Error, request: {
   path: string;
   method: string;
@@ -58,6 +58,7 @@ type ExecuteAppRouteHandlerOptions = {
   method: string;
   middlewareContext: RouteHandlerMiddlewareContext;
   reportRequestError: AppRouteErrorReporter;
+  expireSeconds?: number;
   revalidateSeconds: number | null;
   routePattern: string;
   setHeadersAccessPhase: (phase: HeadersAccessPhase) => HeadersAccessPhase;

package/dist/server/app-route-handler-execution.js

@@ -54,7 +54,7 @@ async function executeAppRouteHandler(options) {
 		})) {
 			const revalidateSeconds = options.revalidateSeconds;
 			if (revalidateSeconds == null) throw new Error("Expected route handler revalidate seconds");
-			applyRouteHandlerRevalidateHeader(response, revalidateSeconds);
+			applyRouteHandlerRevalidateHeader(response, revalidateSeconds, options.expireSeconds);
 		}
 		if (shouldWriteAppRouteHandlerCache({
 			dynamicConfig: options.handler.dynamic,
@@ -74,7 +74,7 @@ async function executeAppRouteHandler(options) {
 			const routeWritePromise = (async () => {
 				try {
 					const routeCacheValue = await buildAppRouteCacheValue(routeClone);
-					await options.isrSet(routeKey, routeCacheValue, revalidateSeconds, routeTags);
+					await options.isrSet(routeKey, routeCacheValue, revalidateSeconds, routeTags, options.expireSeconds);
 					options.isrDebug?.("route cache written", routeKey);
 				} catch (cacheErr) {
 					console.error("[vinext] ISR route cache write error:", cacheErr);

package/dist/server/app-route-handler-execution.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-route-handler-execution.js","names":[],"sources":["../../src/server/app-route-handler-execution.ts"],"sourcesContent":["import type { NextI18nConfig } from \"../config/next-config.js\";\nimport { setHeadersContext, type HeadersAccessPhase } from \"vinext/shims/headers\";\nimport type { ExecutionContextLike } from \"vinext/shims/request-context\";\nimport type { CachedRouteValue } from \"vinext/shims/cache\";\nimport type { NextRequest } from \"vinext/shims/server\";\nimport {\n  createStaticGenerationHeadersContext,\n  getAppRouteStaticGenerationErrorMessage,\n} from \"./app-static-generation.js\";\nimport {\n  isPossibleAppRouteActionRequest,\n  resolveAppRouteHandlerSpecialError,\n  shouldApplyAppRouteHandlerRevalidateHeader,\n  shouldWriteAppRouteHandlerCache,\n  type AppRouteHandlerModule,\n} from \"./app-route-handler-policy.js\";\nimport {\n  applyRouteHandlerMiddlewareContext,\n  applyRouteHandlerRevalidateHeader,\n  assertSupportedAppRouteHandlerResponse,\n  buildAppRouteCacheValue,\n  finalizeRouteHandlerResponse,\n  markRouteHandlerCacheMiss,\n  type RouteHandlerMiddlewareContext,\n} from \"./app-route-handler-response.js\";\nimport {\n  createTrackedAppRouteRequest,\n  markKnownDynamicAppRoute,\n} from \"./app-route-handler-runtime.js\";\n\nexport type AppRouteParams = Record<string, string | string[]>;\nexport type AppRouteDynamicUsageFn = () => boolean;\nexport type MarkAppRouteDynamicUsageFn = () => void;\nexport type AppRouteHandlerFunction = (\n  request: NextRequest,\n  context: { params: AppRouteParams },\n) => Response | Promise<Response>;\nexport type RouteHandlerCacheSetter = (\n  key: string,\n  data: CachedRouteValue,\n  revalidateSeconds: number,\n  tags: string[],\n) => Promise<void>;\ntype AppRouteErrorReporter = (\n  error: Error,\n  request: { path: string; method: string; headers: Record<string, string> },\n  route: { routerKind: \"App Router\"; routePath: string; routeType: \"route\" },\n) => void;\nexport type AppRouteDebugLogger = (event: string, detail: string) => void;\n\ntype RunAppRouteHandlerOptions = {\n  basePath?: string;\n  consumeDynamicUsage: AppRouteDynamicUsageFn;\n  dynamicConfig?: string;\n  handlerFn: AppRouteHandlerFunction;\n  i18n?: NextI18nConfig | null;\n  markDynamicUsage: MarkAppRouteDynamicUsageFn;\n  middlewareRequestHeaders?: Headers | null;\n  params: AppRouteParams;\n  request: Request;\n  routePattern?: string;\n  setHeadersAccessPhase?: (phase: HeadersAccessPhase) => HeadersAccessPhase;\n};\n\ntype RunAppRouteHandlerResult = {\n  dynamicUsedInHandler: boolean;\n  response: Response;\n};\n\ntype ExecuteAppRouteHandlerOptions = {\n  buildPageCacheTags: (pathname: string, extraTags: string[]) => string[];\n  clearRequestContext: () => void;\n  cleanPathname: string;\n  executionContext: ExecutionContextLike | null;\n  getAndClearPendingCookies: () => string[];\n  getCollectedFetchTags: () => string[];\n  getDraftModeCookieHeader: () => string | null | undefined;\n  handler: AppRouteHandlerModule;\n  isAutoHead: boolean;\n  isProduction: boolean;\n  isrDebug?: AppRouteDebugLogger;\n  isrRouteKey: (pathname: string) => string;\n  isrSet: RouteHandlerCacheSetter;\n  method: string;\n  middlewareContext: RouteHandlerMiddlewareContext;\n  reportRequestError: AppRouteErrorReporter;\n  revalidateSeconds: number | null;\n  routePattern: string;\n  setHeadersAccessPhase: (phase: HeadersAccessPhase) => HeadersAccessPhase;\n} & RunAppRouteHandlerOptions;\n\nfunction configureAppRouteStaticGenerationContext(options: RunAppRouteHandlerOptions): void {\n  if (options.dynamicConfig === \"force-static\" || options.dynamicConfig === \"error\") {\n    setHeadersContext(\n      createStaticGenerationHeadersContext({\n        dynamicConfig: options.dynamicConfig,\n        routeKind: \"route\",\n        routePattern: options.routePattern,\n      }),\n    );\n    options.setHeadersAccessPhase?.(\"route-handler\");\n  }\n}\n\nexport async function runAppRouteHandler(\n  options: RunAppRouteHandlerOptions,\n): Promise<RunAppRouteHandlerResult> {\n  options.consumeDynamicUsage();\n  configureAppRouteStaticGenerationContext(options);\n  const trackedRequest = createTrackedAppRouteRequest(options.request, {\n    basePath: options.basePath,\n    i18n: options.i18n,\n    middlewareHeaders: options.middlewareRequestHeaders,\n    onDynamicAccess() {\n      options.markDynamicUsage();\n    },\n    requestMode:\n      options.dynamicConfig === \"force-static\" || options.dynamicConfig === \"error\"\n        ? options.dynamicConfig\n        : \"auto\",\n    staticGenerationErrorMessage(expression) {\n      return getAppRouteStaticGenerationErrorMessage(options.routePattern, expression);\n    },\n  });\n  const response = await options.handlerFn(trackedRequest.request, {\n    params: options.params,\n  });\n\n  return {\n    dynamicUsedInHandler: options.consumeDynamicUsage(),\n    response,\n  };\n}\n\nexport async function executeAppRouteHandler(\n  options: ExecuteAppRouteHandlerOptions,\n): Promise<Response> {\n  const previousHeadersPhase = options.setHeadersAccessPhase(\"route-handler\");\n\n  try {\n    const { dynamicUsedInHandler, response } = await runAppRouteHandler({\n      ...options,\n      dynamicConfig: options.handler.dynamic,\n    });\n    assertSupportedAppRouteHandlerResponse(response);\n    const handlerSetCacheControl = response.headers.has(\"cache-control\");\n\n    if (dynamicUsedInHandler) {\n      markKnownDynamicAppRoute(options.routePattern);\n    }\n\n    if (\n      shouldApplyAppRouteHandlerRevalidateHeader({\n        dynamicUsedInHandler,\n        handlerSetCacheControl,\n        isAutoHead: options.isAutoHead,\n        method: options.method,\n        revalidateSeconds: options.revalidateSeconds,\n      })\n    ) {\n      const revalidateSeconds = options.revalidateSeconds;\n      if (revalidateSeconds == null) {\n        throw new Error(\"Expected route handler revalidate seconds\");\n      }\n      applyRouteHandlerRevalidateHeader(response, revalidateSeconds);\n    }\n\n    if (\n      shouldWriteAppRouteHandlerCache({\n        dynamicConfig: options.handler.dynamic,\n        dynamicUsedInHandler,\n        handlerSetCacheControl,\n        isAutoHead: options.isAutoHead,\n        isProduction: options.isProduction,\n        method: options.method,\n        revalidateSeconds: options.revalidateSeconds,\n      })\n    ) {\n      markRouteHandlerCacheMiss(response);\n      const routeClone = response.clone();\n      const routeKey = options.isrRouteKey(options.cleanPathname);\n      const revalidateSeconds = options.revalidateSeconds;\n      if (revalidateSeconds == null) {\n        throw new Error(\"Expected route handler cache revalidate seconds\");\n      }\n      const routeTags = options.buildPageCacheTags(\n        options.cleanPathname,\n        options.getCollectedFetchTags(),\n      );\n      const routeWritePromise = (async () => {\n        try {\n          const routeCacheValue = await buildAppRouteCacheValue(routeClone);\n          await options.isrSet(routeKey, routeCacheValue, revalidateSeconds, routeTags);\n          options.isrDebug?.(\"route cache written\", routeKey);\n        } catch (cacheErr) {\n          console.error(\"[vinext] ISR route cache write error:\", cacheErr);\n        }\n      })();\n      options.executionContext?.waitUntil(routeWritePromise);\n    }\n\n    const pendingCookies = options.getAndClearPendingCookies();\n    const draftCookie = options.getDraftModeCookieHeader();\n    options.clearRequestContext();\n\n    return applyRouteHandlerMiddlewareContext(\n      finalizeRouteHandlerResponse(response, {\n        pendingCookies,\n        draftCookie,\n        isHead: options.isAutoHead,\n      }),\n      options.middlewareContext,\n    );\n  } catch (error) {\n    const pendingCookies = options.getAndClearPendingCookies();\n    const draftCookie = options.getDraftModeCookieHeader();\n    const specialError = resolveAppRouteHandlerSpecialError(error, options.request.url, {\n      isAction: isPossibleAppRouteActionRequest(options.request),\n    });\n    options.clearRequestContext();\n\n    if (specialError) {\n      if (specialError.kind === \"redirect\") {\n        return applyRouteHandlerMiddlewareContext(\n          finalizeRouteHandlerResponse(\n            new Response(null, {\n              status: specialError.statusCode,\n              headers: { Location: specialError.location },\n            }),\n            {\n              pendingCookies,\n              draftCookie,\n              isHead: options.isAutoHead,\n            },\n          ),\n          options.middlewareContext,\n        );\n      }\n\n      return applyRouteHandlerMiddlewareContext(\n        new Response(null, { status: specialError.statusCode }),\n        options.middlewareContext,\n      );\n    }\n\n    console.error(\"[vinext] Route handler error:\", error);\n    options.reportRequestError(\n      error instanceof Error ? error : new Error(String(error)),\n      {\n        path: options.cleanPathname,\n        method: options.request.method,\n        headers: Object.fromEntries(options.request.headers.entries()),\n      },\n      {\n        routerKind: \"App Router\",\n        routePath: options.routePattern,\n        routeType: \"route\",\n      },\n    );\n\n    return applyRouteHandlerMiddlewareContext(\n      new Response(null, { status: 500 }),\n      options.middlewareContext,\n    );\n  } finally {\n    options.setHeadersAccessPhase(previousHeadersPhase);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-route-handler-execution.js","names":[],"sources":["../../src/server/app-route-handler-execution.ts"],"sourcesContent":["import type { NextI18nConfig } from \"../config/next-config.js\";\nimport { setHeadersContext, type HeadersAccessPhase } from \"vinext/shims/headers\";\nimport type { ExecutionContextLike } from \"vinext/shims/request-context\";\nimport type { CachedRouteValue } from \"vinext/shims/cache\";\nimport type { NextRequest } from \"vinext/shims/server\";\nimport {\n  createStaticGenerationHeadersContext,\n  getAppRouteStaticGenerationErrorMessage,\n} from \"./app-static-generation.js\";\nimport {\n  isPossibleAppRouteActionRequest,\n  resolveAppRouteHandlerSpecialError,\n  shouldApplyAppRouteHandlerRevalidateHeader,\n  shouldWriteAppRouteHandlerCache,\n  type AppRouteHandlerModule,\n} from \"./app-route-handler-policy.js\";\nimport {\n  applyRouteHandlerMiddlewareContext,\n  applyRouteHandlerRevalidateHeader,\n  assertSupportedAppRouteHandlerResponse,\n  buildAppRouteCacheValue,\n  finalizeRouteHandlerResponse,\n  markRouteHandlerCacheMiss,\n  type RouteHandlerMiddlewareContext,\n} from \"./app-route-handler-response.js\";\nimport {\n  createTrackedAppRouteRequest,\n  markKnownDynamicAppRoute,\n} from \"./app-route-handler-runtime.js\";\n\nexport type AppRouteParams = Record<string, string | string[]>;\nexport type AppRouteDynamicUsageFn = () => boolean;\nexport type MarkAppRouteDynamicUsageFn = () => void;\nexport type AppRouteHandlerFunction = (\n  request: NextRequest,\n  context: { params: AppRouteParams },\n) => Response | Promise<Response>;\nexport type RouteHandlerCacheSetter = (\n  key: string,\n  data: CachedRouteValue,\n  revalidateSeconds: number,\n  tags: string[],\n  expireSeconds?: number,\n) => Promise<void>;\ntype AppRouteErrorReporter = (\n  error: Error,\n  request: { path: string; method: string; headers: Record<string, string> },\n  route: { routerKind: \"App Router\"; routePath: string; routeType: \"route\" },\n) => void;\nexport type AppRouteDebugLogger = (event: string, detail: string) => void;\n\ntype RunAppRouteHandlerOptions = {\n  basePath?: string;\n  consumeDynamicUsage: AppRouteDynamicUsageFn;\n  dynamicConfig?: string;\n  handlerFn: AppRouteHandlerFunction;\n  i18n?: NextI18nConfig | null;\n  markDynamicUsage: MarkAppRouteDynamicUsageFn;\n  middlewareRequestHeaders?: Headers | null;\n  params: AppRouteParams;\n  request: Request;\n  routePattern?: string;\n  setHeadersAccessPhase?: (phase: HeadersAccessPhase) => HeadersAccessPhase;\n};\n\ntype RunAppRouteHandlerResult = {\n  dynamicUsedInHandler: boolean;\n  response: Response;\n};\n\ntype ExecuteAppRouteHandlerOptions = {\n  buildPageCacheTags: (pathname: string, extraTags: string[]) => string[];\n  clearRequestContext: () => void;\n  cleanPathname: string;\n  executionContext: ExecutionContextLike | null;\n  getAndClearPendingCookies: () => string[];\n  getCollectedFetchTags: () => string[];\n  getDraftModeCookieHeader: () => string | null | undefined;\n  handler: AppRouteHandlerModule;\n  isAutoHead: boolean;\n  isProduction: boolean;\n  isrDebug?: AppRouteDebugLogger;\n  isrRouteKey: (pathname: string) => string;\n  isrSet: RouteHandlerCacheSetter;\n  method: string;\n  middlewareContext: RouteHandlerMiddlewareContext;\n  reportRequestError: AppRouteErrorReporter;\n  expireSeconds?: number;\n  revalidateSeconds: number | null;\n  routePattern: string;\n  setHeadersAccessPhase: (phase: HeadersAccessPhase) => HeadersAccessPhase;\n} & RunAppRouteHandlerOptions;\n\nfunction configureAppRouteStaticGenerationContext(options: RunAppRouteHandlerOptions): void {\n  if (options.dynamicConfig === \"force-static\" || options.dynamicConfig === \"error\") {\n    setHeadersContext(\n      createStaticGenerationHeadersContext({\n        dynamicConfig: options.dynamicConfig,\n        routeKind: \"route\",\n        routePattern: options.routePattern,\n      }),\n    );\n    options.setHeadersAccessPhase?.(\"route-handler\");\n  }\n}\n\nexport async function runAppRouteHandler(\n  options: RunAppRouteHandlerOptions,\n): Promise<RunAppRouteHandlerResult> {\n  options.consumeDynamicUsage();\n  configureAppRouteStaticGenerationContext(options);\n  const trackedRequest = createTrackedAppRouteRequest(options.request, {\n    basePath: options.basePath,\n    i18n: options.i18n,\n    middlewareHeaders: options.middlewareRequestHeaders,\n    onDynamicAccess() {\n      options.markDynamicUsage();\n    },\n    requestMode:\n      options.dynamicConfig === \"force-static\" || options.dynamicConfig === \"error\"\n        ? options.dynamicConfig\n        : \"auto\",\n    staticGenerationErrorMessage(expression) {\n      return getAppRouteStaticGenerationErrorMessage(options.routePattern, expression);\n    },\n  });\n  const response = await options.handlerFn(trackedRequest.request, {\n    params: options.params,\n  });\n\n  return {\n    dynamicUsedInHandler: options.consumeDynamicUsage(),\n    response,\n  };\n}\n\nexport async function executeAppRouteHandler(\n  options: ExecuteAppRouteHandlerOptions,\n): Promise<Response> {\n  const previousHeadersPhase = options.setHeadersAccessPhase(\"route-handler\");\n\n  try {\n    const { dynamicUsedInHandler, response } = await runAppRouteHandler({\n      ...options,\n      dynamicConfig: options.handler.dynamic,\n    });\n    assertSupportedAppRouteHandlerResponse(response);\n    const handlerSetCacheControl = response.headers.has(\"cache-control\");\n\n    if (dynamicUsedInHandler) {\n      markKnownDynamicAppRoute(options.routePattern);\n    }\n\n    if (\n      shouldApplyAppRouteHandlerRevalidateHeader({\n        dynamicUsedInHandler,\n        handlerSetCacheControl,\n        isAutoHead: options.isAutoHead,\n        method: options.method,\n        revalidateSeconds: options.revalidateSeconds,\n      })\n    ) {\n      const revalidateSeconds = options.revalidateSeconds;\n      if (revalidateSeconds == null) {\n        throw new Error(\"Expected route handler revalidate seconds\");\n      }\n      applyRouteHandlerRevalidateHeader(response, revalidateSeconds, options.expireSeconds);\n    }\n\n    if (\n      shouldWriteAppRouteHandlerCache({\n        dynamicConfig: options.handler.dynamic,\n        dynamicUsedInHandler,\n        handlerSetCacheControl,\n        isAutoHead: options.isAutoHead,\n        isProduction: options.isProduction,\n        method: options.method,\n        revalidateSeconds: options.revalidateSeconds,\n      })\n    ) {\n      markRouteHandlerCacheMiss(response);\n      const routeClone = response.clone();\n      const routeKey = options.isrRouteKey(options.cleanPathname);\n      const revalidateSeconds = options.revalidateSeconds;\n      if (revalidateSeconds == null) {\n        throw new Error(\"Expected route handler cache revalidate seconds\");\n      }\n      const routeTags = options.buildPageCacheTags(\n        options.cleanPathname,\n        options.getCollectedFetchTags(),\n      );\n      const routeWritePromise = (async () => {\n        try {\n          const routeCacheValue = await buildAppRouteCacheValue(routeClone);\n          await options.isrSet(\n            routeKey,\n            routeCacheValue,\n            revalidateSeconds,\n            routeTags,\n            options.expireSeconds,\n          );\n          options.isrDebug?.(\"route cache written\", routeKey);\n        } catch (cacheErr) {\n          console.error(\"[vinext] ISR route cache write error:\", cacheErr);\n        }\n      })();\n      options.executionContext?.waitUntil(routeWritePromise);\n    }\n\n    const pendingCookies = options.getAndClearPendingCookies();\n    const draftCookie = options.getDraftModeCookieHeader();\n    options.clearRequestContext();\n\n    return applyRouteHandlerMiddlewareContext(\n      finalizeRouteHandlerResponse(response, {\n        pendingCookies,\n        draftCookie,\n        isHead: options.isAutoHead,\n      }),\n      options.middlewareContext,\n    );\n  } catch (error) {\n    const pendingCookies = options.getAndClearPendingCookies();\n    const draftCookie = options.getDraftModeCookieHeader();\n    const specialError = resolveAppRouteHandlerSpecialError(error, options.request.url, {\n      isAction: isPossibleAppRouteActionRequest(options.request),\n    });\n    options.clearRequestContext();\n\n    if (specialError) {\n      if (specialError.kind === \"redirect\") {\n        return applyRouteHandlerMiddlewareContext(\n          finalizeRouteHandlerResponse(\n            new Response(null, {\n              status: specialError.statusCode,\n              headers: { Location: specialError.location },\n            }),\n            {\n              pendingCookies,\n              draftCookie,\n              isHead: options.isAutoHead,\n            },\n          ),\n          options.middlewareContext,\n        );\n      }\n\n      return applyRouteHandlerMiddlewareContext(\n        new Response(null, { status: specialError.statusCode }),\n        options.middlewareContext,\n      );\n    }\n\n    console.error(\"[vinext] Route handler error:\", error);\n    options.reportRequestError(\n      error instanceof Error ? error : new Error(String(error)),\n      {\n        path: options.cleanPathname,\n        method: options.request.method,\n        headers: Object.fromEntries(options.request.headers.entries()),\n      },\n      {\n        routerKind: \"App Router\",\n        routePath: options.routePattern,\n        routeType: \"route\",\n      },\n    );\n\n    return applyRouteHandlerMiddlewareContext(\n      new Response(null, { status: 500 }),\n      options.middlewareContext,\n    );\n  } finally {\n    options.setHeadersAccessPhase(previousHeadersPhase);\n  }\n}\n"],"mappings":"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"}

package/dist/server/app-route-handler-policy.js

@@ -1,3 +1,4 @@
+import { parseNextHttpErrorDigest, parseNextRedirectDigest } from "./next-error-digest.js";
 import { buildRouteHandlerAllowHeader, collectRouteHandlerMethods } from "./app-route-handler-runtime.js";
 //#region src/server/app-route-handler-policy.ts
 function isPossibleAppRouteActionRequest(request) {
@@ -7,6 +8,7 @@ function isPossibleAppRouteActionRequest(request) {
 }
 function getAppRouteHandlerRevalidateSeconds(handler) {
 	const { revalidate } = handler;
+	if (revalidate === false) return Infinity;
 	if (typeof revalidate !== "number" || !Number.isFinite(revalidate) || revalidate < 0) return null;
 	return revalidate;
 }
@@ -32,29 +34,27 @@ function resolveAppRouteHandlerMethod(handler, method) {
 	};
 }
 function shouldReadAppRouteHandlerCache(options) {
-	return options.isProduction && options.revalidateSeconds !== null && options.revalidateSeconds > 0 && options.dynamicConfig !== "force-dynamic" && !options.isKnownDynamic && (options.method === "GET" || options.isAutoHead) && typeof options.handlerFn === "function";
+	return options.isProduction && options.revalidateSeconds !== null && options.revalidateSeconds > 0 && options.revalidateSeconds !== Infinity && options.dynamicConfig !== "force-dynamic" && !options.isKnownDynamic && (options.method === "GET" || options.isAutoHead) && typeof options.handlerFn === "function";
 }
 function shouldApplyAppRouteHandlerRevalidateHeader(options) {
 	return options.revalidateSeconds !== null && !options.dynamicUsedInHandler && (options.method === "GET" || options.isAutoHead) && !options.handlerSetCacheControl;
 }
 function shouldWriteAppRouteHandlerCache(options) {
-	return options.isProduction && options.revalidateSeconds !== null && options.revalidateSeconds > 0 && options.dynamicConfig !== "force-dynamic" && shouldApplyAppRouteHandlerRevalidateHeader(options);
+	return options.isProduction && options.revalidateSeconds !== null && options.revalidateSeconds > 0 && options.revalidateSeconds !== Infinity && options.dynamicConfig !== "force-dynamic" && shouldApplyAppRouteHandlerRevalidateHeader(options);
 }
 function resolveAppRouteHandlerSpecialError(error, requestUrl, options) {
 	if (!(error && typeof error === "object" && "digest" in error)) return null;
 	const digest = String(error.digest);
-	if (digest.startsWith("NEXT_REDIRECT;")) {
-		const parts = digest.split(";");
-		const redirectUrl = decodeURIComponent(parts[2]);
-		return {
-			kind: "redirect",
-			location: new URL(redirectUrl, requestUrl).toString(),
-			statusCode: options?.isAction ? 303 : parts[3] ? parseInt(parts[3], 10) : 307
-		};
-	}
-	if (digest === "NEXT_NOT_FOUND" || digest.startsWith("NEXT_HTTP_ERROR_FALLBACK;")) return {
+	const redirect = parseNextRedirectDigest(digest);
+	if (redirect) return {
+		kind: "redirect",
+		location: new URL(redirect.url, requestUrl).toString(),
+		statusCode: options?.isAction ? 303 : redirect.status
+	};
+	const httpError = parseNextHttpErrorDigest(digest);
+	if (httpError) return {
 		kind: "status",
-		statusCode: digest === "NEXT_NOT_FOUND" ? 404 : parseInt(digest.split(";")[1], 10)
+		statusCode: httpError.status
 	};
 	return null;
 }

package/dist/server/app-route-handler-policy.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-route-handler-policy.js","names":[],"sources":["../../src/server/app-route-handler-policy.ts"],"sourcesContent":["import {\n  buildRouteHandlerAllowHeader,\n  collectRouteHandlerMethods,\n  type RouteHandlerHttpMethod,\n  type RouteHandlerModule,\n} from \"./app-route-handler-runtime.js\";\n\nexport type AppRouteHandlerModule = {\n  dynamic?: string;\n  revalidate?: unknown;\n} & RouteHandlerModule;\n\ntype AppRouteHandlerFunction = (...args: unknown[]) => unknown;\n\ntype ResolvedAppRouteHandlerMethod = {\n  allowHeaderForOptions: string;\n  exportedMethods: RouteHandlerHttpMethod[];\n  handlerFn: AppRouteHandlerFunction | undefined;\n  isAutoHead: boolean;\n  shouldAutoRespondToOptions: boolean;\n};\n\ntype AppRouteHandlerCacheReadOptions = {\n  dynamicConfig?: string;\n  handlerFn: unknown;\n  isAutoHead: boolean;\n  isKnownDynamic: boolean;\n  isProduction: boolean;\n  method: string;\n  revalidateSeconds: number | null;\n};\n\ntype AppRouteHandlerResponseCacheOptions = {\n  dynamicConfig?: string;\n  dynamicUsedInHandler: boolean;\n  handlerSetCacheControl: boolean;\n  isAutoHead: boolean;\n  isProduction: boolean;\n  method: string;\n  revalidateSeconds: number | null;\n};\n\ntype AppRouteHandlerSpecialError =\n  | {\n      kind: \"redirect\";\n      location: string;\n      statusCode: number;\n    }\n  | {\n      kind: \"status\";\n      statusCode: number;\n    };\n\ntype AppRouteHandlerSpecialErrorOptions = {\n  isAction: boolean;\n};\n\nexport function isPossibleAppRouteActionRequest(\n  request: Pick<Request, \"headers\" | \"method\">,\n): boolean {\n  if (request.method.toUpperCase() !== \"POST\") return false;\n\n  const contentType = request.headers.get(\"content-type\");\n  return (\n    request.headers.has(\"x-rsc-action\") ||\n    request.headers.has(\"next-action\") ||\n    // Next.js uses strict equality here, so charset variants intentionally do\n    // not classify as action requests even though they are valid form posts.\n    contentType === \"application/x-www-form-urlencoded\" ||\n    contentType?.startsWith(\"multipart/form-data\") === true\n  );\n}\n\nexport function getAppRouteHandlerRevalidateSeconds(\n  handler: Pick<AppRouteHandlerModule, \"revalidate\">,\n): number | null {\n  // 0 is a meaningful value (\"never cache\") and must be preserved so the\n  // header path can emit a no-store Cache-Control. Non-finite values\n  // (Infinity, NaN) are not valid revalidate durations and fall back to\n  // the null (\"no revalidate configured\") branch along with negatives.\n  const { revalidate } = handler;\n  if (typeof revalidate !== \"number\" || !Number.isFinite(revalidate) || revalidate < 0) {\n    return null;\n  }\n  return revalidate;\n}\n\nexport function hasAppRouteHandlerDefaultExport(handler: RouteHandlerModule): boolean {\n  return typeof handler.default === \"function\";\n}\n\nexport function resolveAppRouteHandlerMethod(\n  handler: AppRouteHandlerModule,\n  method: string,\n): ResolvedAppRouteHandlerMethod {\n  const exportedMethods = collectRouteHandlerMethods(handler);\n  const allowHeaderForOptions = buildRouteHandlerAllowHeader(exportedMethods);\n  const shouldAutoRespondToOptions = method === \"OPTIONS\" && typeof handler.OPTIONS !== \"function\";\n\n  let handlerFn =\n    typeof handler[method as RouteHandlerHttpMethod] === \"function\"\n      ? (handler[method as RouteHandlerHttpMethod] as AppRouteHandlerFunction)\n      : undefined;\n  let isAutoHead = false;\n\n  if (\n    method === \"HEAD\" &&\n    typeof handler.HEAD !== \"function\" &&\n    typeof handler.GET === \"function\"\n  ) {\n    handlerFn = handler.GET as AppRouteHandlerFunction;\n    isAutoHead = true;\n  }\n\n  return {\n    allowHeaderForOptions,\n    exportedMethods,\n    handlerFn,\n    isAutoHead,\n    shouldAutoRespondToOptions,\n  };\n}\n\nexport function shouldReadAppRouteHandlerCache(options: AppRouteHandlerCacheReadOptions): boolean {\n  // revalidateSeconds === 0 means \"never cache\" and must skip the ISR read.\n  // A previously written entry (e.g. from before the handler opted out)\n  // must never be replayed once the author set revalidate = 0.\n  return (\n    options.isProduction &&\n    options.revalidateSeconds !== null &&\n    options.revalidateSeconds > 0 &&\n    options.dynamicConfig !== \"force-dynamic\" &&\n    !options.isKnownDynamic &&\n    (options.method === \"GET\" || options.isAutoHead) &&\n    typeof options.handlerFn === \"function\"\n  );\n}\n\nexport function shouldApplyAppRouteHandlerRevalidateHeader(\n  options: Omit<AppRouteHandlerResponseCacheOptions, \"dynamicConfig\" | \"isProduction\">,\n): boolean {\n  // Includes revalidateSeconds === 0. That case emits the no-store\n  // Cache-Control, which is exactly the header a never-cache handler\n  // needs to suppress heuristic caching.\n  return (\n    options.revalidateSeconds !== null &&\n    !options.dynamicUsedInHandler &&\n    (options.method === \"GET\" || options.isAutoHead) &&\n    !options.handlerSetCacheControl\n  );\n}\n\nexport function shouldWriteAppRouteHandlerCache(\n  options: AppRouteHandlerResponseCacheOptions,\n): boolean {\n  // Excludes revalidateSeconds === 0. A never-cache response must not be\n  // persisted to ISR, even though it still needs a Cache-Control header.\n  return (\n    options.isProduction &&\n    options.revalidateSeconds !== null &&\n    options.revalidateSeconds > 0 &&\n    options.dynamicConfig !== \"force-dynamic\" &&\n    shouldApplyAppRouteHandlerRevalidateHeader(options)\n  );\n}\n\nexport function resolveAppRouteHandlerSpecialError(\n  error: unknown,\n  requestUrl: string,\n  options?: AppRouteHandlerSpecialErrorOptions,\n): AppRouteHandlerSpecialError | null {\n  if (!(error && typeof error === \"object\" && \"digest\" in error)) {\n    return null;\n  }\n\n  const digest = String(error.digest);\n  if (digest.startsWith(\"NEXT_REDIRECT;\")) {\n    const parts = digest.split(\";\");\n    const redirectUrl = decodeURIComponent(parts[2]);\n    return {\n      kind: \"redirect\",\n      location: new URL(redirectUrl, requestUrl).toString(),\n      statusCode: options?.isAction ? 303 : parts[3] ? parseInt(parts[3], 10) : 307,\n    };\n  }\n\n  if (digest === \"NEXT_NOT_FOUND\" || digest.startsWith(\"NEXT_HTTP_ERROR_FALLBACK;\")) {\n    return {\n      kind: \"status\",\n      statusCode: digest === \"NEXT_NOT_FOUND\" ? 404 : parseInt(digest.split(\";\")[1], 10),\n    };\n  }\n\n  return null;\n}\n"],"mappings":";;AAyDA,SAAgB,gCACd,SACS;AACT,KAAI,QAAQ,OAAO,aAAa,KAAK,OAAQ,QAAO;CAEpD,MAAM,cAAc,QAAQ,QAAQ,IAAI,eAAe;AACvD,QACE,QAAQ,QAAQ,IAAI,eAAe,IACnC,QAAQ,QAAQ,IAAI,cAAc,IAGlC,gBAAgB,uCAChB,aAAa,WAAW,sBAAsB,KAAK;;AAIvD,SAAgB,oCACd,SACe;CAKf,MAAM,EAAE,eAAe;AACvB,KAAI,OAAO,eAAe,YAAY,CAAC,OAAO,SAAS,WAAW,IAAI,aAAa,EACjF,QAAO;AAET,QAAO;;AAGT,SAAgB,gCAAgC,SAAsC;AACpF,QAAO,OAAO,QAAQ,YAAY;;AAGpC,SAAgB,6BACd,SACA,QAC+B;CAC/B,MAAM,kBAAkB,2BAA2B,QAAQ;CAC3D,MAAM,wBAAwB,6BAA6B,gBAAgB;CAC3E,MAAM,6BAA6B,WAAW,aAAa,OAAO,QAAQ,YAAY;CAEtF,IAAI,YACF,OAAO,QAAQ,YAAsC,aAChD,QAAQ,UACT,KAAA;CACN,IAAI,aAAa;AAEjB,KACE,WAAW,UACX,OAAO,QAAQ,SAAS,cACxB,OAAO,QAAQ,QAAQ,YACvB;AACA,cAAY,QAAQ;AACpB,eAAa;;AAGf,QAAO;EACL;EACA;EACA;EACA;EACA;EACD;;AAGH,SAAgB,+BAA+B,SAAmD;AAIhG,QACE,QAAQ,gBACR,QAAQ,sBAAsB,QAC9B,QAAQ,oBAAoB,KAC5B,QAAQ,kBAAkB,mBAC1B,CAAC,QAAQ,mBACR,QAAQ,WAAW,SAAS,QAAQ,eACrC,OAAO,QAAQ,cAAc;;AAIjC,SAAgB,2CACd,SACS;AAIT,QACE,QAAQ,sBAAsB,QAC9B,CAAC,QAAQ,yBACR,QAAQ,WAAW,SAAS,QAAQ,eACrC,CAAC,QAAQ;;AAIb,SAAgB,gCACd,SACS;AAGT,QACE,QAAQ,gBACR,QAAQ,sBAAsB,QAC9B,QAAQ,oBAAoB,KAC5B,QAAQ,kBAAkB,mBAC1B,2CAA2C,QAAQ;;AAIvD,SAAgB,mCACd,OACA,YACA,SACoC;AACpC,KAAI,EAAE,SAAS,OAAO,UAAU,YAAY,YAAY,OACtD,QAAO;CAGT,MAAM,SAAS,OAAO,MAAM,OAAO;AACnC,KAAI,OAAO,WAAW,iBAAiB,EAAE;EACvC,MAAM,QAAQ,OAAO,MAAM,IAAI;EAC/B,MAAM,cAAc,mBAAmB,MAAM,GAAG;AAChD,SAAO;GACL,MAAM;GACN,UAAU,IAAI,IAAI,aAAa,WAAW,CAAC,UAAU;GACrD,YAAY,SAAS,WAAW,MAAM,MAAM,KAAK,SAAS,MAAM,IAAI,GAAG,GAAG;GAC3E;;AAGH,KAAI,WAAW,oBAAoB,OAAO,WAAW,4BAA4B,CAC/E,QAAO;EACL,MAAM;EACN,YAAY,WAAW,mBAAmB,MAAM,SAAS,OAAO,MAAM,IAAI,CAAC,IAAI,GAAG;EACnF;AAGH,QAAO"}
+{"version":3,"file":"app-route-handler-policy.js","names":[],"sources":["../../src/server/app-route-handler-policy.ts"],"sourcesContent":["import {\n  buildRouteHandlerAllowHeader,\n  collectRouteHandlerMethods,\n  type RouteHandlerHttpMethod,\n  type RouteHandlerModule,\n} from \"./app-route-handler-runtime.js\";\nimport { parseNextHttpErrorDigest, parseNextRedirectDigest } from \"./next-error-digest.js\";\n\nexport type AppRouteHandlerModule = {\n  dynamic?: string;\n  revalidate?: unknown;\n} & RouteHandlerModule;\n\ntype AppRouteHandlerFunction = (...args: unknown[]) => unknown;\n\ntype ResolvedAppRouteHandlerMethod = {\n  allowHeaderForOptions: string;\n  exportedMethods: RouteHandlerHttpMethod[];\n  handlerFn: AppRouteHandlerFunction | undefined;\n  isAutoHead: boolean;\n  shouldAutoRespondToOptions: boolean;\n};\n\ntype AppRouteHandlerCacheReadOptions = {\n  dynamicConfig?: string;\n  handlerFn: unknown;\n  isAutoHead: boolean;\n  isKnownDynamic: boolean;\n  isProduction: boolean;\n  method: string;\n  revalidateSeconds: number | null;\n};\n\ntype AppRouteHandlerResponseCacheOptions = {\n  dynamicConfig?: string;\n  dynamicUsedInHandler: boolean;\n  handlerSetCacheControl: boolean;\n  isAutoHead: boolean;\n  isProduction: boolean;\n  method: string;\n  revalidateSeconds: number | null;\n};\n\ntype AppRouteHandlerSpecialError =\n  | {\n      kind: \"redirect\";\n      location: string;\n      statusCode: number;\n    }\n  | {\n      kind: \"status\";\n      statusCode: number;\n    };\n\ntype AppRouteHandlerSpecialErrorOptions = {\n  isAction: boolean;\n};\n\nexport function isPossibleAppRouteActionRequest(\n  request: Pick<Request, \"headers\" | \"method\">,\n): boolean {\n  if (request.method.toUpperCase() !== \"POST\") return false;\n\n  const contentType = request.headers.get(\"content-type\");\n  return (\n    request.headers.has(\"x-rsc-action\") ||\n    request.headers.has(\"next-action\") ||\n    // Next.js uses strict equality here, so charset variants intentionally do\n    // not classify as action requests even though they are valid form posts.\n    contentType === \"application/x-www-form-urlencoded\" ||\n    contentType?.startsWith(\"multipart/form-data\") === true\n  );\n}\n\nexport function getAppRouteHandlerRevalidateSeconds(\n  handler: Pick<AppRouteHandlerModule, \"revalidate\">,\n): number | null {\n  // 0 is a meaningful value (\"never cache\") and must be preserved so the\n  // header path can emit a no-store Cache-Control.\n  // revalidate = false means \"cache indefinitely\" (Next.js segment config\n  // parity) — return Infinity to signal the cache-later path.\n  const { revalidate } = handler;\n  if (revalidate === false) return Infinity;\n  if (typeof revalidate !== \"number\" || !Number.isFinite(revalidate) || revalidate < 0) {\n    return null;\n  }\n  return revalidate;\n}\n\nexport function hasAppRouteHandlerDefaultExport(handler: RouteHandlerModule): boolean {\n  return typeof handler.default === \"function\";\n}\n\nexport function resolveAppRouteHandlerMethod(\n  handler: AppRouteHandlerModule,\n  method: string,\n): ResolvedAppRouteHandlerMethod {\n  const exportedMethods = collectRouteHandlerMethods(handler);\n  const allowHeaderForOptions = buildRouteHandlerAllowHeader(exportedMethods);\n  const shouldAutoRespondToOptions = method === \"OPTIONS\" && typeof handler.OPTIONS !== \"function\";\n\n  let handlerFn =\n    typeof handler[method as RouteHandlerHttpMethod] === \"function\"\n      ? (handler[method as RouteHandlerHttpMethod] as AppRouteHandlerFunction)\n      : undefined;\n  let isAutoHead = false;\n\n  if (\n    method === \"HEAD\" &&\n    typeof handler.HEAD !== \"function\" &&\n    typeof handler.GET === \"function\"\n  ) {\n    handlerFn = handler.GET as AppRouteHandlerFunction;\n    isAutoHead = true;\n  }\n\n  return {\n    allowHeaderForOptions,\n    exportedMethods,\n    handlerFn,\n    isAutoHead,\n    shouldAutoRespondToOptions,\n  };\n}\n\nexport function shouldReadAppRouteHandlerCache(options: AppRouteHandlerCacheReadOptions): boolean {\n  // revalidateSeconds === 0 means \"never cache\" and must skip the ISR read.\n  // A previously written entry (e.g. from before the handler opted out)\n  // must never be replayed once the author set revalidate = 0.\n  return (\n    options.isProduction &&\n    options.revalidateSeconds !== null &&\n    options.revalidateSeconds > 0 &&\n    options.revalidateSeconds !== Infinity &&\n    options.dynamicConfig !== \"force-dynamic\" &&\n    !options.isKnownDynamic &&\n    (options.method === \"GET\" || options.isAutoHead) &&\n    typeof options.handlerFn === \"function\"\n  );\n}\n\nexport function shouldApplyAppRouteHandlerRevalidateHeader(\n  options: Omit<AppRouteHandlerResponseCacheOptions, \"dynamicConfig\" | \"isProduction\">,\n): boolean {\n  // Includes revalidateSeconds === 0. That case emits the no-store\n  // Cache-Control, which is exactly the header a never-cache handler\n  // needs to suppress heuristic caching.\n  return (\n    options.revalidateSeconds !== null &&\n    !options.dynamicUsedInHandler &&\n    (options.method === \"GET\" || options.isAutoHead) &&\n    !options.handlerSetCacheControl\n  );\n}\n\nexport function shouldWriteAppRouteHandlerCache(\n  options: AppRouteHandlerResponseCacheOptions,\n): boolean {\n  // Excludes revalidateSeconds === 0. A never-cache response must not be\n  // persisted to ISR, even though it still needs a Cache-Control header.\n  return (\n    options.isProduction &&\n    options.revalidateSeconds !== null &&\n    options.revalidateSeconds > 0 &&\n    options.revalidateSeconds !== Infinity &&\n    options.dynamicConfig !== \"force-dynamic\" &&\n    shouldApplyAppRouteHandlerRevalidateHeader(options)\n  );\n}\n\nexport function resolveAppRouteHandlerSpecialError(\n  error: unknown,\n  requestUrl: string,\n  options?: AppRouteHandlerSpecialErrorOptions,\n): AppRouteHandlerSpecialError | null {\n  if (!(error && typeof error === \"object\" && \"digest\" in error)) {\n    return null;\n  }\n\n  const digest = String(error.digest);\n  const redirect = parseNextRedirectDigest(digest);\n  if (redirect) {\n    return {\n      kind: \"redirect\",\n      location: new URL(redirect.url, requestUrl).toString(),\n      statusCode: options?.isAction ? 303 : redirect.status,\n    };\n  }\n\n  const httpError = parseNextHttpErrorDigest(digest);\n  if (httpError) {\n    return {\n      kind: \"status\",\n      statusCode: httpError.status,\n    };\n  }\n\n  return null;\n}\n"],"mappings":";;;AA0DA,SAAgB,gCACd,SACS;AACT,KAAI,QAAQ,OAAO,aAAa,KAAK,OAAQ,QAAO;CAEpD,MAAM,cAAc,QAAQ,QAAQ,IAAI,eAAe;AACvD,QACE,QAAQ,QAAQ,IAAI,eAAe,IACnC,QAAQ,QAAQ,IAAI,cAAc,IAGlC,gBAAgB,uCAChB,aAAa,WAAW,sBAAsB,KAAK;;AAIvD,SAAgB,oCACd,SACe;CAKf,MAAM,EAAE,eAAe;AACvB,KAAI,eAAe,MAAO,QAAO;AACjC,KAAI,OAAO,eAAe,YAAY,CAAC,OAAO,SAAS,WAAW,IAAI,aAAa,EACjF,QAAO;AAET,QAAO;;AAGT,SAAgB,gCAAgC,SAAsC;AACpF,QAAO,OAAO,QAAQ,YAAY;;AAGpC,SAAgB,6BACd,SACA,QAC+B;CAC/B,MAAM,kBAAkB,2BAA2B,QAAQ;CAC3D,MAAM,wBAAwB,6BAA6B,gBAAgB;CAC3E,MAAM,6BAA6B,WAAW,aAAa,OAAO,QAAQ,YAAY;CAEtF,IAAI,YACF,OAAO,QAAQ,YAAsC,aAChD,QAAQ,UACT,KAAA;CACN,IAAI,aAAa;AAEjB,KACE,WAAW,UACX,OAAO,QAAQ,SAAS,cACxB,OAAO,QAAQ,QAAQ,YACvB;AACA,cAAY,QAAQ;AACpB,eAAa;;AAGf,QAAO;EACL;EACA;EACA;EACA;EACA;EACD;;AAGH,SAAgB,+BAA+B,SAAmD;AAIhG,QACE,QAAQ,gBACR,QAAQ,sBAAsB,QAC9B,QAAQ,oBAAoB,KAC5B,QAAQ,sBAAsB,YAC9B,QAAQ,kBAAkB,mBAC1B,CAAC,QAAQ,mBACR,QAAQ,WAAW,SAAS,QAAQ,eACrC,OAAO,QAAQ,cAAc;;AAIjC,SAAgB,2CACd,SACS;AAIT,QACE,QAAQ,sBAAsB,QAC9B,CAAC,QAAQ,yBACR,QAAQ,WAAW,SAAS,QAAQ,eACrC,CAAC,QAAQ;;AAIb,SAAgB,gCACd,SACS;AAGT,QACE,QAAQ,gBACR,QAAQ,sBAAsB,QAC9B,QAAQ,oBAAoB,KAC5B,QAAQ,sBAAsB,YAC9B,QAAQ,kBAAkB,mBAC1B,2CAA2C,QAAQ;;AAIvD,SAAgB,mCACd,OACA,YACA,SACoC;AACpC,KAAI,EAAE,SAAS,OAAO,UAAU,YAAY,YAAY,OACtD,QAAO;CAGT,MAAM,SAAS,OAAO,MAAM,OAAO;CACnC,MAAM,WAAW,wBAAwB,OAAO;AAChD,KAAI,SACF,QAAO;EACL,MAAM;EACN,UAAU,IAAI,IAAI,SAAS,KAAK,WAAW,CAAC,UAAU;EACtD,YAAY,SAAS,WAAW,MAAM,SAAS;EAChD;CAGH,MAAM,YAAY,yBAAyB,OAAO;AAClD,KAAI,UACF,QAAO;EACL,MAAM;EACN,YAAY,UAAU;EACvB;AAGH,QAAO"}

package/dist/server/app-route-handler-response.d.ts

@@ -1,4 +1,4 @@
-import { CachedRouteValue } from "../shims/cache.js";
+import { CacheControlMetadata, CachedRouteValue } from "../shims/cache.js";
 
 //#region src/server/app-route-handler-response.d.ts
 type RouteHandlerMiddlewareContext = {
@@ -6,7 +6,9 @@ type RouteHandlerMiddlewareContext = {
   status: number | null;
 };
 type BuildRouteHandlerCachedResponseOptions = {
+  cacheControl?: CacheControlMetadata;
   cacheState: "HIT" | "STALE";
+  expireSeconds?: number;
   isHead: boolean;
   revalidateSeconds: number;
 };
@@ -18,7 +20,7 @@ type FinalizeRouteHandlerResponseOptions = {
 declare function applyRouteHandlerMiddlewareContext(response: Response, middlewareContext: RouteHandlerMiddlewareContext): Response;
 declare function assertSupportedAppRouteHandlerResponse(response: Response): void;
 declare function buildRouteHandlerCachedResponse(cachedValue: CachedRouteValue, options: BuildRouteHandlerCachedResponseOptions): Response;
-declare function applyRouteHandlerRevalidateHeader(response: Response, revalidateSeconds: number): void;
+declare function applyRouteHandlerRevalidateHeader(response: Response, revalidateSeconds: number, expireSeconds?: number): void;
 declare function markRouteHandlerCacheMiss(response: Response): void;
 declare function buildAppRouteCacheValue(response: Response): Promise<CachedRouteValue>;
 declare function finalizeRouteHandlerResponse(response: Response, options: FinalizeRouteHandlerResponseOptions): Response;