Commit b27a467d authored by Luke Sandberg's avatar Luke Sandberg

Fix race conditions in dev error page compilation for turbopack

Three fixes for conflicting turbopack task writes when compiling
fallback error pages in dev mode:

1. Deduplicate concurrent ensurePage('/_error') calls using Batcher,
   so multiple simultaneous requests coalesce into a single
   handlePagesErrorRoute invocation instead of racing.

2. Unify the three handleWrittenEndpoint closures into a single shared
   implementation. The handleEntrypoints closure was missing the
   assetMapper.setPathsForKey() call that both ensurePage closures had,
   causing inconsistent HMR asset tracking state.

3. Add writeToDiskOnce() guard for shared _app/_document/_error endpoint
   writes, preventing handleRouteType and handlePagesErrorRoute from
   issuing concurrent writeToDisk() calls on the same endpoint objects.
Co-Authored-By: 's avatarClaude <noreply@anthropic.com>
parent df88058f
...@@ -42,6 +42,7 @@ import { ...@@ -42,6 +42,7 @@ import {
clearAllModuleContexts, clearAllModuleContexts,
clearModuleContext, clearModuleContext,
} from '../lib/render-server' } from '../lib/render-server'
import { Batcher } from '../../lib/batcher'
import { denormalizePagePath } from '../../shared/lib/page-path/denormalize-page-path' import { denormalizePagePath } from '../../shared/lib/page-path/denormalize-page-path'
import { trace } from '../../trace' import { trace } from '../../trace'
import { import {
...@@ -52,6 +53,7 @@ import { ...@@ -52,6 +53,7 @@ import {
handlePagesErrorRoute, handlePagesErrorRoute,
handleRouteType, handleRouteType,
hasEntrypointForKey, hasEntrypointForKey,
type HandleWrittenEndpoint,
msToNs, msToNs,
type ReadyIds, type ReadyIds,
type SendHmr, type SendHmr,
...@@ -482,6 +484,23 @@ export async function createHotReloaderTurbopack( ...@@ -482,6 +484,23 @@ export async function createHotReloaderTurbopack(
const assetMapper = new AssetMapper() const assetMapper = new AssetMapper()
// Deduplicate concurrent ensurePage('/_error') calls so that concurrent
// requests do not race to call handlePagesErrorRoute simultaneously.
const ensureErrorPageBatcher = Batcher.create<string, void>()
// Shared handleWrittenEndpoint implementation used by both the entrypoints
// subscription and on-demand ensurePage calls, so that assetMapper is always
// updated consistently.
const handleWrittenEndpoint: HandleWrittenEndpoint = (
id,
result,
forceDeleteCache
) => {
currentWrittenEntrypoints.set(id, result)
assetMapper.setPathsForKey(id, result.clientPaths)
return clearRequireCache(id, result, { force: forceDeleteCache })
}
// Deferred entries state management // Deferred entries state management
const deferredEntriesConfig = nextConfig.experimental.deferredEntries const deferredEntriesConfig = nextConfig.experimental.deferredEntries
const hasDeferredEntriesConfig = const hasDeferredEntriesConfig =
...@@ -944,10 +963,7 @@ export async function createHotReloaderTurbopack( ...@@ -944,10 +963,7 @@ export async function createHotReloaderTurbopack(
serverFields, serverFields,
hooks: { hooks: {
handleWrittenEndpoint: (id, result, forceDeleteCache) => { handleWrittenEndpoint,
currentWrittenEntrypoints.set(id, result)
return clearRequireCache(id, result, { force: forceDeleteCache })
},
propagateServerField: propagateServerField.bind(null, opts), propagateServerField: propagateServerField.bind(null, opts),
sendHmr, sendHmr,
startBuilding, startBuilding,
...@@ -1612,6 +1628,7 @@ export async function createHotReloaderTurbopack( ...@@ -1612,6 +1628,7 @@ export async function createHotReloaderTurbopack(
const pathname = definition?.pathname ?? inputPage const pathname = definition?.pathname ?? inputPage
if (page === '/_error') { if (page === '/_error') {
await ensureErrorPageBatcher.batch('/_error', async () => {
let finishBuilding = startBuilding(pathname, requestUrl, false) let finishBuilding = startBuilding(pathname, requestUrl, false)
try { try {
await handlePagesErrorRoute({ await handlePagesErrorRoute({
...@@ -1623,18 +1640,13 @@ export async function createHotReloaderTurbopack( ...@@ -1623,18 +1640,13 @@ export async function createHotReloaderTurbopack(
logErrors: true, logErrors: true,
hooks: { hooks: {
subscribeToChanges: subscribeToClientChanges, subscribeToChanges: subscribeToClientChanges,
handleWrittenEndpoint: (id, result, forceDeleteCache) => { handleWrittenEndpoint,
currentWrittenEntrypoints.set(id, result)
assetMapper.setPathsForKey(id, result.clientPaths)
return clearRequireCache(id, result, {
force: forceDeleteCache,
})
},
}, },
}) })
} finally { } finally {
finishBuilding() finishBuilding()
} }
})
return return
} }
...@@ -1691,13 +1703,7 @@ export async function createHotReloaderTurbopack( ...@@ -1691,13 +1703,7 @@ export async function createHotReloaderTurbopack(
hooks: { hooks: {
subscribeToChanges: subscribeToClientChanges, subscribeToChanges: subscribeToClientChanges,
handleWrittenEndpoint: (id, result, forceDeleteCache) => { handleWrittenEndpoint,
currentWrittenEntrypoints.set(id, result)
assetMapper.setPathsForKey(id, result.clientPaths)
return clearRequireCache(id, result, {
force: forceDeleteCache,
})
},
}, },
}) })
} finally { } finally {
......
...@@ -38,6 +38,29 @@ import { ...@@ -38,6 +38,29 @@ import {
import { MIDDLEWARE_FILENAME, PROXY_FILENAME } from '../../lib/constants' import { MIDDLEWARE_FILENAME, PROXY_FILENAME } from '../../lib/constants'
const onceErrorSet = new Set() const onceErrorSet = new Set()
// Guards against concurrent writeToDisk() on the same Endpoint object.
// This prevents handleRouteType and handlePagesErrorRoute from racing on
// shared _app/_document endpoint writes.
const writeToDiskInFlight = new WeakMap<
object,
Promise<TurbopackResult<WrittenEndpoint>>
>()
async function writeToDiskOnce(
endpoint: Endpoint
): Promise<TurbopackResult<WrittenEndpoint>> {
const existing = writeToDiskInFlight.get(endpoint)
if (existing) return existing
const promise = endpoint.writeToDisk()
writeToDiskInFlight.set(endpoint, promise)
try {
return await promise
} finally {
writeToDiskInFlight.delete(endpoint)
}
}
/** /**
* Check if given issue is a warning to be display only once. * Check if given issue is a warning to be display only once.
* This mimics behavior of get-page-static-info's warnOnce. * This mimics behavior of get-page-static-info's warnOnce.
...@@ -183,7 +206,7 @@ export async function handleRouteType({ ...@@ -183,7 +206,7 @@ export async function handleRouteType({
if (entrypoints.global.app) { if (entrypoints.global.app) {
const key = getEntryKey('pages', 'server', '_app') const key = getEntryKey('pages', 'server', '_app')
const writtenEndpoint = await entrypoints.global.app.writeToDisk() const writtenEndpoint = await writeToDiskOnce(entrypoints.global.app)
documentOrAppChanged ||= documentOrAppChanged ||=
hooks?.handleWrittenEndpoint(key, writtenEndpoint, false) ?? false hooks?.handleWrittenEndpoint(key, writtenEndpoint, false) ?? false
processIssues( processIssues(
...@@ -200,8 +223,9 @@ export async function handleRouteType({ ...@@ -200,8 +223,9 @@ export async function handleRouteType({
if (entrypoints.global.document) { if (entrypoints.global.document) {
const key = getEntryKey('pages', 'server', '_document') const key = getEntryKey('pages', 'server', '_document')
const writtenEndpoint = const writtenEndpoint = await writeToDiskOnce(
await entrypoints.global.document.writeToDisk() entrypoints.global.document
)
documentOrAppChanged ||= documentOrAppChanged ||=
hooks?.handleWrittenEndpoint(key, writtenEndpoint, false) ?? false hooks?.handleWrittenEndpoint(key, writtenEndpoint, false) ?? false
processIssues( processIssues(
...@@ -862,7 +886,7 @@ export async function handlePagesErrorRoute({ ...@@ -862,7 +886,7 @@ export async function handlePagesErrorRoute({
if (entrypoints.global.app) { if (entrypoints.global.app) {
const key = getEntryKey('pages', 'server', '_app') const key = getEntryKey('pages', 'server', '_app')
const writtenEndpoint = await entrypoints.global.app.writeToDisk() const writtenEndpoint = await writeToDiskOnce(entrypoints.global.app)
hooks.handleWrittenEndpoint(key, writtenEndpoint, false) hooks.handleWrittenEndpoint(key, writtenEndpoint, false)
hooks.subscribeToChanges( hooks.subscribeToChanges(
key, key,
...@@ -891,7 +915,7 @@ export async function handlePagesErrorRoute({ ...@@ -891,7 +915,7 @@ export async function handlePagesErrorRoute({
if (entrypoints.global.document) { if (entrypoints.global.document) {
const key = getEntryKey('pages', 'server', '_document') const key = getEntryKey('pages', 'server', '_document')
const writtenEndpoint = await entrypoints.global.document.writeToDisk() const writtenEndpoint = await writeToDiskOnce(entrypoints.global.document)
hooks.handleWrittenEndpoint(key, writtenEndpoint, false) hooks.handleWrittenEndpoint(key, writtenEndpoint, false)
hooks.subscribeToChanges( hooks.subscribeToChanges(
key, key,
...@@ -917,7 +941,7 @@ export async function handlePagesErrorRoute({ ...@@ -917,7 +941,7 @@ export async function handlePagesErrorRoute({
if (entrypoints.global.error) { if (entrypoints.global.error) {
const key = getEntryKey('pages', 'server', '_error') const key = getEntryKey('pages', 'server', '_error')
const writtenEndpoint = await entrypoints.global.error.writeToDisk() const writtenEndpoint = await writeToDiskOnce(entrypoints.global.error)
hooks.handleWrittenEndpoint(key, writtenEndpoint, false) hooks.handleWrittenEndpoint(key, writtenEndpoint, false)
hooks.subscribeToChanges( hooks.subscribeToChanges(
key, key,
......
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