Unverified Commit c237b933 authored by Josh Story's avatar Josh Story Committed by Hendrik Liebau

Improve notFound recovery in error pathway

If the notFound handling in the error pathway doesn't succeed first try the normal error page render
parent 88d64f9e
...@@ -8497,6 +8497,7 @@ async function prerenderToStream( ...@@ -8497,6 +8497,7 @@ async function prerenderToStream(
if (reactServerPrerenderResult === null) { if (reactServerPrerenderResult === null) {
throw err throw err
} }
const fallbackReactServerPrerenderResult = reactServerPrerenderResult
let errorType: MetadataErrorType | 'redirect' | undefined let errorType: MetadataErrorType | 'redirect' | undefined
...@@ -8527,25 +8528,19 @@ async function prerenderToStream( ...@@ -8527,25 +8528,19 @@ async function prerenderToStream(
'/_not-found/page' '/_not-found/page'
) )
const prerenderLegacyStore: PrerenderStore = (prerenderStore = { const recoveryRevalidate =
type: 'prerender-legacy', typeof prerenderStore?.revalidate !== 'undefined'
phase: 'render', ? prerenderStore.revalidate
rootParams, : INFINITE_CACHE
implicitTags: implicitTags, const recoveryExpire =
revalidate: typeof prerenderStore?.expire !== 'undefined'
typeof prerenderStore?.revalidate !== 'undefined' ? prerenderStore.expire
? prerenderStore.revalidate : INFINITE_CACHE
: INFINITE_CACHE, const recoveryStale =
expire: typeof prerenderStore?.stale !== 'undefined'
typeof prerenderStore?.expire !== 'undefined' ? prerenderStore.stale
? prerenderStore.expire : INFINITE_CACHE
: INFINITE_CACHE, const recoveryTags = prerenderStore?.tags || implicitTags.tags
stale:
typeof prerenderStore?.stale !== 'undefined'
? prerenderStore.stale
: INFINITE_CACHE,
tags: [...(prerenderStore?.tags || implicitTags.tags)],
})
let prerenderHTTPError: PrerenderHTTPErrorState | undefined let prerenderHTTPError: PrerenderHTTPErrorState | undefined
if (cacheComponents && isHTTPAccessFallbackError(err)) { if (cacheComponents && isHTTPAccessFallbackError(err)) {
const triggeredStatus = getAccessFallbackHTTPStatus( const triggeredStatus = getAccessFallbackHTTPStatus(
...@@ -8565,52 +8560,11 @@ async function prerenderToStream( ...@@ -8565,52 +8560,11 @@ async function prerenderToStream(
} }
} }
const errorRSCPayload = prerenderHTTPError const renderLegacyErrorResult = async (
? await workUnitAsyncStorage.run( prerenderLegacyStore: PrerenderStore,
prerenderLegacyStore, errorServerStream: AnyStream,
getRSCPayload, flightResult: ReactServerPrerenderResult
tree, ) => {
ctx,
{
is404: errorType === 'not-found',
prerenderHTTPError,
}
)
: await workUnitAsyncStorage.run(
prerenderLegacyStore,
getErrorRSCPayload,
tree,
ctx,
reactServerErrorsByDigest.has((err as any).digest) ? undefined : err,
errorType
)
const errorServerStreamRaw = workUnitAsyncStorage.run(
prerenderLegacyStore,
renderFlightStream,
ComponentMod,
errorRSCPayload,
clientModules,
{
filterStackFrame,
onError: serverComponentsErrorHandler,
}
)
let errorServerStream = errorServerStreamRaw
const errorFlightResultPromise = prerenderHTTPError
? (() => {
// Fizz still needs to read the Flight stream to render ErrorApp, but
// the prerender path also needs a buffered Flight result for the HTML
// prelude and segment data collectors. Tee the stream so each consumer
// gets its own copy.
const [appStream, flightStream] = teeStream(errorServerStreamRaw)
errorServerStream = appStream
return createReactServerPrerenderResultFromRender(flightStream)
})()
: null
try {
const { stream: errorHtmlStream } = await workUnitAsyncStorage.run( const { stream: errorHtmlStream } = await workUnitAsyncStorage.run(
prerenderLegacyStore, prerenderLegacyStore,
renderFizzStream, renderFizzStream,
...@@ -8630,15 +8584,8 @@ async function prerenderToStream( ...@@ -8630,15 +8584,8 @@ async function prerenderToStream(
{ waitForAllReady: true } { waitForAllReady: true }
) )
const resolvedFlightResult = errorFlightResultPromise
? await errorFlightResultPromise
: reactServerPrerenderResult
if (errorFlightResultPromise) {
reactServerPrerenderResult.consume()
}
if (shouldGenerateStaticFlightData(workStore)) { if (shouldGenerateStaticFlightData(workStore)) {
const flightData = await streamToBuffer(resolvedFlightResult.asStream()) const flightData = await streamToBuffer(flightResult.asStream())
metadata.flightData = flightData metadata.flightData = flightData
await collectSegmentData( await collectSegmentData(
flightData, flightData,
...@@ -8650,7 +8597,7 @@ async function prerenderToStream( ...@@ -8650,7 +8597,7 @@ async function prerenderToStream(
) )
} }
const flightStream = resolvedFlightResult.consumeAsStream() const flightStream = flightResult.consumeAsStream()
return { return {
digestErrorsMap: reactServerErrorsByDigest, digestErrorsMap: reactServerErrorsByDigest,
...@@ -8674,15 +8621,107 @@ async function prerenderToStream( ...@@ -8674,15 +8621,107 @@ async function prerenderToStream(
deploymentId: ctx.sharedContext.deploymentId, deploymentId: ctx.sharedContext.deploymentId,
}), }),
dynamicAccess: null, dynamicAccess: null,
collectedRevalidate: collectedRevalidate: prerenderLegacyStore.revalidate,
prerenderStore !== null ? prerenderStore.revalidate : INFINITE_CACHE, collectedExpire: prerenderLegacyStore.expire,
collectedExpire: collectedStale: selectStaleTime(prerenderLegacyStore.stale),
prerenderStore !== null ? prerenderStore.expire : INFINITE_CACHE, collectedTags: prerenderLegacyStore.tags,
collectedStale: selectStaleTime( }
prerenderStore !== null ? prerenderStore.stale : INFINITE_CACHE }
),
collectedTags: prerenderStore !== null ? prerenderStore.tags : null, if (prerenderHTTPError) {
try {
const prerenderLegacyStore: PrerenderStore = {
type: 'prerender-legacy',
phase: 'render',
rootParams,
implicitTags,
revalidate: recoveryRevalidate,
expire: recoveryExpire,
stale: recoveryStale,
tags: [...recoveryTags],
}
const errorRSCPayload = await workUnitAsyncStorage.run(
prerenderLegacyStore,
getRSCPayload,
tree,
ctx,
{
is404: prerenderHTTPError.triggeredStatus === 404,
prerenderHTTPError,
}
)
const errorServerStreamRaw = workUnitAsyncStorage.run(
prerenderLegacyStore,
renderFlightStream,
ComponentMod,
errorRSCPayload,
clientModules,
{
filterStackFrame,
onError: serverComponentsErrorHandler,
}
)
// Fizz still needs to read the Flight stream to render ErrorApp, but
// the prerender path also needs a buffered Flight result for the HTML
// prelude and segment data collectors. Tee the stream so each consumer
// gets its own copy.
const [errorServerStream, flightStream] =
teeStream(errorServerStreamRaw)
const errorFlightResult =
await createReactServerPrerenderResultFromRender(flightStream)
const result = await renderLegacyErrorResult(
prerenderLegacyStore,
errorServerStream,
errorFlightResult
)
fallbackReactServerPrerenderResult.consume()
return result
} catch (recoveryErr: any) {
// If the segment-scoped HTTP fallback recovery throws, fall through to
// the generic error recovery path.
if (!isHTTPAccessFallbackError(recoveryErr)) {
throw recoveryErr
}
}
}
try {
const prerenderLegacyStore: PrerenderStore = {
type: 'prerender-legacy',
phase: 'render',
rootParams,
implicitTags,
revalidate: recoveryRevalidate,
expire: recoveryExpire,
stale: recoveryStale,
tags: [...recoveryTags],
} }
const errorRSCPayload = await workUnitAsyncStorage.run(
prerenderLegacyStore,
getErrorRSCPayload,
tree,
ctx,
reactServerErrorsByDigest.has((err as any).digest) ? undefined : err,
errorType
)
const errorServerStream = workUnitAsyncStorage.run(
prerenderLegacyStore,
renderFlightStream,
ComponentMod,
errorRSCPayload,
clientModules,
{
filterStackFrame,
onError: serverComponentsErrorHandler,
}
)
return await renderLegacyErrorResult(
prerenderLegacyStore,
errorServerStream,
fallbackReactServerPrerenderResult
)
} catch (finalErr: any) { } catch (finalErr: any) {
if ( if (
process.env.__NEXT_DEV_SERVER && process.env.__NEXT_DEV_SERVER &&
......
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