Unverified Commit da8f4e92 authored by Jan Kassens's avatar Jan Kassens Committed by GitHub

Pass Server Action request metadata into App rendering (#100274)

## Summary

Pass the existing Server Action classification result into App Router
rendering instead of repeatedly inspecting the request.
`ServerActionRequestMetadata` now flows from Node, Edge, direct-server,
and export adapters through render preparation and action dispatch;
`prepareAppPage` no longer needs the request object.

Classification rules and action execution behavior are unchanged. This
continues the request/response boundary cleanup in #99269.

## Verification

Validated on the exact #99269 base: the Node/Edge unrecognized-action
suite passed in Turbopack development and Webpack production (26 tests
each), plus standalone Server Actions in Turbopack production (2 tests).

<!-- NEXT_JS_LLM -->
parent ddafc990
......@@ -50,7 +50,7 @@ import { setManifestsSingleton } from '../../server/app-render/manifests-singlet
import { shouldServeStreamingMetadata } from '../../server/lib/streaming-metadata' with { 'turbopack-transition': 'next-server-utility' }
import { normalizeAppPath } from '../../shared/lib/router/utils/app-paths' with { 'turbopack-transition': 'next-server-utility' }
import { parseNormalizedAppRoute } from '../../shared/lib/router/routes/app' with { 'turbopack-transition': 'next-server-utility' }
import { getIsPossibleServerAction } from '../../server/lib/server-action-request-meta' with { 'turbopack-transition': 'next-server-utility' }
import { getServerActionRequestMetadata } from '../../server/lib/server-action-request-meta' with { 'turbopack-transition': 'next-server-utility' }
import {
RSC_HEADER,
NEXT_ROUTER_PREFETCH_HEADER,
......@@ -323,7 +323,8 @@ export function createAppPageEntrypoint({
getRequestMeta(req, 'isRSCRequest') ??
isRSCRequestHeader(req.headers[RSC_HEADER])
const isPossibleServerAction = getIsPossibleServerAction(req)
const serverActionRequestMetadata = getServerActionRequestMetadata(req)
const { isPossibleServerAction } = serverActionRequestMetadata
// For subresource requests (e.g. images or fonts), return plain text 404
// instead of rendering the not-found route.
......@@ -901,6 +902,7 @@ export function createAppPageEntrypoint({
page: normalizedSrcPage,
routeMatch,
parsedRequestHeaders,
serverActionRequestMetadata,
sharedContext: {
buildId,
deploymentId,
......
......@@ -27,7 +27,7 @@ import type {
} from '../../server/route-modules/app-page/module.compiled'
import type { AppPageRenderResultMetadata } from '../../server/render-result'
import type RenderResult from '../../server/render-result'
import { getIsPossibleServerAction } from '../../server/lib/server-action-request-meta'
import { getServerActionRequestMetadata } from '../../server/lib/server-action-request-meta'
import { getBotType } from '../../shared/lib/router/utils/is-bot'
import { shouldServeStreamingMetadata } from '../../server/lib/streaming-metadata'
import { interopDefault } from '../../lib/interop-default'
......@@ -107,7 +107,8 @@ async function requestHandler(
cacheHandlers.initializeCacheHandlers(nextConfig.cacheMaxMemorySize)
// INJECT_RAW:cacheHandlerRegistration
const isPossibleServerAction = getIsPossibleServerAction(req)
const serverActionRequestMetadata = getServerActionRequestMetadata(baseReq)
const { isPossibleServerAction } = serverActionRequestMetadata
const userAgent = req.headers.get('User-Agent') || ''
const botType = getBotType(userAgent)
const { isOnDemandRevalidate } = checkIsOnDemandRevalidate(
......@@ -124,6 +125,7 @@ async function requestHandler(
'parsedRequestHeaders'
> = {
requestUrl: baseReq.url,
serverActionRequestMetadata,
page: normalizedSrcPage,
routeMatch,
query,
......
......@@ -32,6 +32,7 @@ import { AfterRunner } from '../../server/after/run-with-after'
import type { RequestLifecycleOpts } from '../../server/base-server'
import type { AppSharedContext } from '../../server/app-render/app-render'
import type { RouteMatch } from '../../server/route-modules/app-page/module'
import { getServerActionRequestMetadata } from '../../server/lib/server-action-request-meta'
import type { MultiFileWriter } from '../../lib/multi-file-writer'
import {
deflateResumeDataCache,
......@@ -105,7 +106,8 @@ export async function exportAppPage(
undefined, // dev
sharedContext,
routeMatch,
parsedRequestHeaders
parsedRequestHeaders,
getServerActionRequestMetadata(nextReq)
)
if ('error' in result) {
......
......@@ -47,7 +47,7 @@ import {
NEXT_RESUME_HEADER,
NEXT_RESUME_STATE_LENGTH_HEADER,
} from '../../lib/constants'
import { getServerActionRequestMetadata } from '../lib/server-action-request-meta'
import type { ServerActionRequestMetadata } from '../lib/server-action-request-meta'
import { isCsrfOriginAllowed } from './csrf-protection'
import { warn } from '../../build/output/log'
import { RequestCookies, ResponseCookies } from '../web/spec-extension/cookies'
......@@ -615,6 +615,7 @@ function getRevalidationWaitUntil(
export async function handleAction({
req,
serverActionRequestMetadata,
res,
ComponentMod,
generateFlight,
......@@ -625,6 +626,7 @@ export async function handleAction({
metadata,
}: {
req: BaseNextRequest
serverActionRequestMetadata: ServerActionRequestMetadata
res: BaseNextResponse
ComponentMod: AppPageModule
generateFlight: GenerateFlight
......@@ -644,7 +646,7 @@ export async function handleAction({
isFetchAction,
isURLEncodedAction,
isPossibleServerAction,
} = getServerActionRequestMetadata(req)
} = serverActionRequestMetadata
const handleUnrecognizedAction = (
err: unknown,
......
......@@ -169,7 +169,7 @@ import {
getPostponedFromState,
} from './postponed-state'
import { isDynamicServerError } from '../../client/components/hooks-server-context'
import { getServerActionRequestMetadata } from '../lib/server-action-request-meta'
import type { ServerActionRequestMetadata } from '../lib/server-action-request-meta'
import { getFlightStream } from './use-flight-response'
import {
StaticGenBailoutError,
......@@ -221,7 +221,6 @@ import {
} from '../../shared/lib/router/utils/parse-relative-url'
import AppRouter from '../../client/components/app-router'
import type { RequestErrorContext } from '../instrumentation/types'
import { getIsPossibleServerAction } from '../lib/server-action-request-meta'
import { createInitialRouterState } from '../../client/components/router-reducer/create-initial-router-state'
import { createMutableActionQueue } from '../../client/components/app-router-instance'
import { getRevalidateReason } from '../instrumentation/utils'
......@@ -2549,6 +2548,7 @@ function installGlobalModuleLoadingHandlers(
}
type PreparedAppPageRender = {
serverActionRequestMetadata: ServerActionRequestMetadata
req: BaseNextRequest
ctx: AppRenderContext
metadata: AppPageRenderResultMetadata
......@@ -2622,6 +2622,7 @@ async function prepareAppPageRender(
renderOpts: RenderOpts,
workStore: WorkStore,
parsedRequestHeaders: ParsedRequestHeaders,
serverActionRequestMetadata: ServerActionRequestMetadata,
sharedContext: AppSharedContext,
interpolatedParams: Params,
fallbackRouteParams: OpaqueFallbackRouteParams | null,
......@@ -2729,8 +2730,6 @@ async function prepareAppPageRender(
renderOpts.experimental.optimisticRouting
)
const isPossibleActionRequest = getIsPossibleServerAction(req)
const implicitTags = await getImplicitTags(
workStore.page,
routeMatch.resolvedPathname,
......@@ -2751,7 +2750,7 @@ async function prepareAppPageRender(
fallbackRouteParams,
query,
isPrefetch: isPrefetchRequest,
isPossibleServerAction: isPossibleActionRequest,
isPossibleServerAction: serverActionRequestMetadata.isPossibleServerAction,
requestTimestamp,
appUsingSizeAdjustment,
flightRouterState,
......@@ -2769,6 +2768,7 @@ async function prepareAppPageRender(
getTracer().setRootSpanAttribute('next.route', pagePath)
return {
serverActionRequestMetadata,
req,
ctx,
metadata,
......@@ -2923,7 +2923,13 @@ async function prerenderAppPage({
}
async function renderAppPage(
{ req, ctx, metadata, loaderTree }: PreparedAppPageRender,
{
req,
ctx,
metadata,
loaderTree,
serverActionRequestMetadata,
}: PreparedAppPageRender,
postponedState: PostponedState | null,
dev: DevRenderContext | undefined
) {
......@@ -3060,6 +3066,7 @@ async function renderAppPage(
// For action requests, we handle them differently with a special render result.
const actionRequestResult = await handleAction({
req,
serverActionRequestMetadata,
res,
ComponentMod,
generateFlight: generateDynamicFlightRenderResult,
......@@ -3215,6 +3222,7 @@ async function renderToHTMLOrFlightImpl(
renderOpts: RenderOpts,
workStore: WorkStore,
parsedRequestHeaders: ParsedRequestHeaders,
serverActionRequestMetadata: ServerActionRequestMetadata,
postponedState: PostponedState | null,
dev: DevRenderContext | undefined,
sharedContext: AppSharedContext,
......@@ -3238,6 +3246,7 @@ async function renderToHTMLOrFlightImpl(
renderOpts,
workStore,
parsedRequestHeaders,
serverActionRequestMetadata,
sharedContext,
interpolatedParams,
fallbackRouteParams,
......@@ -3266,6 +3275,7 @@ async function prerenderToHTMLOrFlightImpl(
renderOpts: RenderOpts,
workStore: WorkStore,
parsedRequestHeaders: ParsedRequestHeaders,
serverActionRequestMetadata: ServerActionRequestMetadata,
sharedContext: AppSharedContext,
interpolatedParams: Params,
fallbackRouteParams: OpaqueFallbackRouteParams | null,
......@@ -3288,6 +3298,7 @@ async function prerenderToHTMLOrFlightImpl(
renderOpts,
workStore,
parsedRequestHeaders,
serverActionRequestMetadata,
sharedContext,
interpolatedParams,
fallbackRouteParams,
......@@ -3317,7 +3328,8 @@ export type AppPageRender = (
dev: DevRenderContext | undefined,
sharedContext: AppSharedContext,
routeMatch: RouteMatch,
parsedRequestHeaders: ParsedRequestHeaders
parsedRequestHeaders: ParsedRequestHeaders,
serverActionRequestMetadata: ServerActionRequestMetadata
) => Promise<RenderResult<AppPageRenderResultMetadata>>
export type AppPagePrerender = (
......@@ -3331,7 +3343,7 @@ type AppPagePreparation = {
}
function prepareAppPage(
req: BaseNextRequest,
serverActionRequestMetadata: ServerActionRequestMetadata,
requestUrl: string,
pagePath: string,
fallbackRouteParams: OpaqueFallbackRouteParams | null,
......@@ -3355,7 +3367,7 @@ function prepareAppPage(
let postponedState: PostponedState | null = null
if (typeof renderOpts.postponed === 'string') {
if (fallbackRouteParams) {
if (!getServerActionRequestMetadata(req).isFetchAction) {
if (!serverActionRequestMetadata.isFetchAction) {
throw new InvariantError(
'postponed state should not be provided when fallback params are provided'
)
......@@ -3408,10 +3420,11 @@ export const renderToHTMLOrFlight: AppPageRender = (
dev,
sharedContext,
routeMatch,
parsedRequestHeaders
parsedRequestHeaders,
serverActionRequestMetadata
) => {
const { url, interpolatedParams, postponedState } = prepareAppPage(
req,
serverActionRequestMetadata,
requestUrl,
pagePath,
fallbackRouteParams,
......@@ -3442,6 +3455,7 @@ export const renderToHTMLOrFlight: AppPageRender = (
renderOpts,
workStore,
parsedRequestHeaders,
serverActionRequestMetadata,
postponedState,
dev,
sharedContext,
......@@ -3462,10 +3476,11 @@ export const prerenderToHTMLOrFlight: AppPagePrerender = (
_dev,
sharedContext,
routeMatch,
parsedRequestHeaders
parsedRequestHeaders,
serverActionRequestMetadata
) => {
const { url, interpolatedParams } = prepareAppPage(
req,
serverActionRequestMetadata,
requestUrl,
pagePath,
fallbackRouteParams,
......@@ -3496,6 +3511,7 @@ export const prerenderToHTMLOrFlight: AppPagePrerender = (
renderOpts,
workStore,
parsedRequestHeaders,
serverActionRequestMetadata,
sharedContext,
interpolatedParams,
fallbackRouteParams,
......
......@@ -3,15 +3,17 @@ import type { BaseNextRequest } from '../base-http'
import type { NextRequest } from '../web/exports'
import { ACTION_HEADER } from '../../client/components/app-router-headers'
export type ServerActionRequestMetadata = {
readonly actionId: string | null
readonly isURLEncodedAction: boolean
readonly isMultipartAction: boolean
readonly isFetchAction: boolean
readonly isPossibleServerAction: boolean
}
export function getServerActionRequestMetadata(
req: IncomingMessage | BaseNextRequest | NextRequest
): {
actionId: string | null
isURLEncodedAction: boolean
isMultipartAction: boolean
isFetchAction: boolean
isPossibleServerAction: boolean
} {
): ServerActionRequestMetadata {
let actionId: string | null
let contentType: string | null
......
......@@ -30,6 +30,7 @@ import type {
RouteMatch as AppRenderRouteMatch,
} from './route-modules/app-page/module'
import { createDevRenderContext } from './route-modules/app-page/dev-render-context'
import { getServerActionRequestMetadata } from './lib/server-action-request-meta'
import type { IncomingMessage, ServerResponse } from 'http'
import type { ParsedUrlQuery } from 'querystring'
import type { ParsedUrl } from '../shared/lib/router/utils/parse-url'
......@@ -720,7 +721,8 @@ export default class NextNodeServer extends BaseServer<
: this.deploymentId,
},
routeMatch,
parsedRequestHeaders
parsedRequestHeaders,
getServerActionRequestMetadata(req)
)
if ('error' in result) {
throw result.error
......
......@@ -25,6 +25,7 @@ import type { OpaqueFallbackRouteParams } from '../../request/fallback-params'
import { PrerenderManifestMatcher } from './helpers/prerender-manifest-matcher'
import type { DeepReadonly } from '../../../shared/lib/deep-readonly'
import type { ParsedRequestHeaders } from './parse-request-headers'
import type { ServerActionRequestMetadata } from '../../lib/server-action-request-meta'
import {
NEXT_ROUTER_PREFETCH_HEADER,
NEXT_ROUTER_SEGMENT_PREFETCH_HEADER,
......@@ -96,6 +97,7 @@ export interface AppPageRouteHandlerContext extends RouteModuleHandleContext {
renderOpts: RenderOpts
dev: DevRenderContext | undefined
parsedRequestHeaders: ParsedRequestHeaders
serverActionRequestMetadata: ServerActionRequestMetadata
sharedContext: AppSharedContext
}
......@@ -194,7 +196,8 @@ export class AppPageRouteModule extends RouteModule<
context.dev,
context.sharedContext,
context.routeMatch,
context.parsedRequestHeaders
context.parsedRequestHeaders,
context.serverActionRequestMetadata
)
}
......@@ -214,7 +217,8 @@ export class AppPageRouteModule extends RouteModule<
undefined,
context.sharedContext,
context.routeMatch,
context.parsedRequestHeaders
context.parsedRequestHeaders,
context.serverActionRequestMetadata
)
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment