Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run Middleware within WorkStore #70808

Merged
merged 1 commit into from
Oct 4, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 38 additions & 14 deletions packages/next/src/server/web/adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ import {
type WrapperRenderOpts,
} from '../async-storage/with-request-store'
import { requestAsyncStorage } from '../../client/components/request-async-storage.external'
import { withWorkStore } from '../async-storage/with-work-store'
import { workAsyncStorage } from '../../client/components/work-async-storage.external'
import { NEXT_ROUTER_PREFETCH_HEADER } from '../../client/components/app-router-headers'
import { getTracer } from '../lib/trace/tracer'
import type { TextMapGetter } from 'next/dist/compiled/@opentelemetry/api'
import { MiddlewareSpan } from '../lib/trace/constants'
Expand Down Expand Up @@ -234,27 +237,48 @@ export async function adapter(
try {
const previewProps = getEdgePreviewProps()

return await withRequestStore(
requestAsyncStorage,
return await withWorkStore(
workAsyncStorage,
{
req: request,
res: undefined,
url: request.nextUrl,
page: '/', // Fake Work
fallbackRouteParams: null,
renderOpts: {
onUpdateCookies: (cookies) => {
cookiesFromResponse = cookies
},
previewProps,
waitUntil,
onClose: closeController
? closeController.onClose.bind(closeController)
: undefined,
experimental: {
after: isAfterEnabled,
isRoutePPREnabled: false,
dynamicIO: false,
},
buildId: buildId ?? '',
supportsDynamicResponse: true,
},
requestEndedState: { ended: false },
isPrefetchRequest: request.headers.has(
NEXT_ROUTER_PREFETCH_HEADER
),
},
() => params.handler(request, event)
() =>
withRequestStore(
requestAsyncStorage,
{
req: request,
res: undefined,
url: request.nextUrl,
renderOpts: {
onUpdateCookies: (cookies) => {
cookiesFromResponse = cookies
},
previewProps,
waitUntil,
onClose: closeController
? closeController.onClose.bind(closeController)
: undefined,
experimental: {
after: isAfterEnabled,
},
},
},
() => params.handler(request, event)
)
)
} finally {
// middleware cannot stream, so we can consider the response closed
Expand Down
Loading