{"patch":"diff --git a\/packages\/react-client\/src\/ReactFlightClient.js b\/packages\/react-client\/src\/ReactFlightClient.js\nindex 503f79e4cc..2a5936be0f 100644\n--- a\/packages\/react-client\/src\/ReactFlightClient.js\n+++ b\/packages\/react-client\/src\/ReactFlightClient.js\n@@ -367,6 +367,7 @@ type Response = {\n _debugRootStack?: null | Error, \/\/ DEV-only\n _debugRootTask?: null | ConsoleTask, \/\/ DEV-only\n _debugStartTime: number, \/\/ DEV-only\n+ _debugEndTime?: number, \/\/ DEV-only\n _debugIOStarted: boolean, \/\/ DEV-only\n _debugFindSourceMapURL?: void | FindSourceMapURLCallback, \/\/ DEV-only\n _debugChannel?: void | DebugChannel, \/\/ DEV-only\n@@ -500,6 +501,34 @@ function createErrorChunk(\n return new ReactPromise(ERRORED, null, error);\n }\n \n+function filterDebugInfo(\n+ response: Response,\n+ value: {_debugInfo: ReactDebugInfo, ...},\n+) {\n+ if (response._debugEndTime === null) {\n+ \/\/ No end time was defined, so we keep all debug info entries.\n+ return;\n+ }\n+\n+ \/\/ Remove any debug info entries that arrived after the defined end time.\n+ const relativeEndTime =\n+ response._debugEndTime -\n+ \/\/ $FlowFixMe[prop-missing]\n+ performance.timeOrigin;\n+ const debugInfo = [];\n+ for (let i = 0; i < value._debugInfo.length; i++) {\n+ const info = value._debugInfo[i];\n+ if (typeof info.time === 'number' && info.time > relativeEndTime) {\n+ break;\n+ }\n+ if (info.awaited != null && info.awaited.end > relativeEndTime) {\n+ break;\n+ }\n+ debugInfo.push(info);\n+ }\n+ value._debugInfo = debugInfo;\n+}\n+\n function moveDebugInfoFromChunkToInnerValue(\n chunk: InitializedChunk | InitializedStreamChunk,\n value: T,\n@@ -534,7 +563,17 @@ function moveDebugInfoFromChunkToInnerValue(\n }\n }\n \n+function processChunkDebugInfo(\n+ response: Response,\n+ chunk: InitializedChunk | InitializedStreamChunk,\n+ value: T,\n+): void {\n+ filterDebugInfo(response, chunk);\n+ moveDebugInfoFromChunkToInnerValue(chunk, value);\n+}\n+\n function wakeChunk(\n+ response: Response,\n listeners: Array mixed)>,\n value: T,\n chunk: InitializedChunk,\n@@ -544,16 +583,17 @@ function wakeChunk(\n if (typeof listener === 'function') {\n listener(value);\n } else {\n- fulfillReference(listener, value, chunk);\n+ fulfillReference(response, listener, value, chunk);\n }\n }\n \n if (__DEV__) {\n- moveDebugInfoFromChunkToInnerValue(chunk, value);\n+ processChunkDebugInfo(response, chunk, value);\n }\n }\n \n function rejectChunk(\n+ response: Response,\n listeners: Array mixed)>,\n error: mixed,\n ): void {\n@@ -562,7 +602,7 @@ function rejectChunk(\n if (typeof listener === 'function') {\n listener(error);\n } else {\n- rejectReference(listener, error);\n+ rejectReference(response, listener.handler, error);\n }\n }\n }\n@@ -595,13 +635,14 @@ function resolveBlockedCycle(\n }\n \n function wakeChunkIfInitialized(\n+ response: Response,\n chunk: SomeChunk,\n resolveListeners: Array mixed)>,\n rejectListeners: null | Array mixed)>,\n ): void {\n switch (chunk.status) {\n case INITIALIZED:\n- wakeChunk(resolveListeners, chunk.value, chunk);\n+ wakeChunk(response, resolveListeners, chunk.value, chunk);\n break;\n case BLOCKED:\n \/\/ It is possible that we're blocked on our own chunk if it's a cycle.\n@@ -615,7 +656,7 @@ function wakeChunkIfInitialized(\n if (cyclicHandler !== null) {\n \/\/ This reference points back to this chunk. We can resolve the cycle by\n \/\/ using the value from that handler.\n- fulfillReference(reference, cyclicHandler.value, chunk);\n+ fulfillReference(response, reference, cyclicHandler.value, chunk);\n resolveListeners.splice(i, 1);\n i--;\n if (rejectListeners !== null) {\n@@ -629,6 +670,7 @@ function wakeChunkIfInitialized(\n case INITIALIZED:\n const initializedChunk: InitializedChunk = (chunk: any);\n wakeChunk(\n+ response,\n resolveListeners,\n initializedChunk.value,\n initializedChunk,\n@@ -636,7 +678,7 @@ function wakeChunkIfInitialized(\n return;\n case ERRORED:\n if (rejectListeners !== null) {\n- rejectChunk(rejectListeners, chunk.reason);\n+ rejectChunk(response, rejectListeners, chunk.reason);\n }\n return;\n }\n@@ -666,7 +708,7 @@ function wakeChunkIfInitialized(\n break;\n case ERRORED:\n if (rejectListeners) {\n- rejectChunk(rejectListeners, chunk.reason);\n+ rejectChunk(response, rejectListeners, chunk.reason);\n }\n break;\n }\n@@ -724,7 +766,7 @@ function triggerErrorOnChunk(\n erroredChunk.status = ERRORED;\n erroredChunk.reason = error;\n if (listeners !== null) {\n- rejectChunk(listeners, error);\n+ rejectChunk(response, listeners, error);\n }\n }\n \n@@ -832,7 +874,7 @@ function resolveModelChunk(\n \/\/ longer be rendered or might not be the highest pri.\n initializeModelChunk(resolvedChunk);\n \/\/ The status might have changed after initialization.\n- wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);\n+ wakeChunkIfInitialized(response, chunk, resolveListeners, rejectListeners);\n }\n }\n \n@@ -861,12 +903,11 @@ function resolveModuleChunk(\n }\n if (resolveListeners !== null) {\n initializeModuleChunk(resolvedChunk);\n- wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);\n+ wakeChunkIfInitialized(response, chunk, resolveListeners, rejectListeners);\n }\n }\n \n type InitializationReference = {\n- response: Response, \/\/ TODO: Remove Response from here and pass it through instead.\n handler: InitializationHandler,\n parentObject: Object,\n key: string,\n@@ -1005,7 +1046,7 @@ function initializeModelChunk(chunk: ResolvedModelChunk): void {\n if (typeof listener === 'function') {\n listener(value);\n } else {\n- fulfillReference(listener, value, cyclicChunk);\n+ fulfillReference(response, listener, value, cyclicChunk);\n }\n }\n }\n@@ -1026,7 +1067,7 @@ function initializeModelChunk(chunk: ResolvedModelChunk): void {\n initializedChunk.value = value;\n \n if (__DEV__) {\n- moveDebugInfoFromChunkToInnerValue(initializedChunk, value);\n+ processChunkDebugInfo(response, initializedChunk, value);\n }\n } catch (error) {\n const erroredChunk: ErroredChunk = (chunk: any);\n@@ -1413,11 +1454,12 @@ function getChunk(response: Response, id: number): SomeChunk {\n }\n \n function fulfillReference(\n+ response: Response,\n reference: InitializationReference,\n value: any,\n fulfilledChunk: SomeChunk,\n ): void {\n- const {response, handler, parentObject, key, map, path} = reference;\n+ const {handler, parentObject, key, map, path} = reference;\n \n for (let i = 1; i < path.length; i++) {\n while (\n@@ -1487,7 +1529,11 @@ function fulfillReference(\n return;\n }\n default: {\n- rejectReference(reference, referencedChunk.reason);\n+ rejectReference(\n+ response,\n+ reference.handler,\n+ referencedChunk.reason,\n+ );\n return;\n }\n }\n@@ -1585,21 +1631,20 @@ function fulfillReference(\n initializedChunk.value = handler.value;\n initializedChunk.reason = handler.reason; \/\/ Used by streaming chunks\n if (resolveListeners !== null) {\n- wakeChunk(resolveListeners, handler.value, initializedChunk);\n+ wakeChunk(response, resolveListeners, handler.value, initializedChunk);\n } else {\n if (__DEV__) {\n- moveDebugInfoFromChunkToInnerValue(initializedChunk, handler.value);\n+ processChunkDebugInfo(response, initializedChunk, handler.value);\n }\n }\n }\n }\n \n function rejectReference(\n- reference: InitializationReference,\n+ response: Response,\n+ handler: InitializationHandler,\n error: mixed,\n ): void {\n- const {handler, response} = reference;\n-\n if (handler.errored) {\n \/\/ We've already errored. We could instead build up an AggregateError\n \/\/ but if there are multiple errors we just take the first one like\n@@ -1690,7 +1735,6 @@ function waitForReference(\n }\n \n const reference: InitializationReference = {\n- response,\n handler,\n parentObject,\n key,\n@@ -1838,10 +1882,10 @@ function loadServerReference, T>(\n initializedChunk.status = INITIALIZED;\n initializedChunk.value = handler.value;\n if (resolveListeners !== null) {\n- wakeChunk(resolveListeners, handler.value, initializedChunk);\n+ wakeChunk(response, resolveListeners, handler.value, initializedChunk);\n } else {\n if (__DEV__) {\n- moveDebugInfoFromChunkToInnerValue(initializedChunk, handler.value);\n+ processChunkDebugInfo(response, initializedChunk, handler.value);\n }\n }\n }\n@@ -2578,6 +2622,7 @@ function ResponseInstance(\n replayConsole: boolean, \/\/ DEV-only\n environmentName: void | string, \/\/ DEV-only\n debugStartTime: void | number, \/\/ DEV-only\n+ debugEndTime: void | number, \/\/ DEV-only\n debugChannel: void | DebugChannel, \/\/ DEV-only\n ) {\n const chunks: Map> = new Map();\n@@ -2645,6 +2690,7 @@ function ResponseInstance(\n \/\/ and is not considered I\/O required to load the stream.\n setTimeout(markIOStarted.bind(this), 0);\n }\n+ this._debugEndTime = debugEndTime == null ? null : debugEndTime;\n this._debugFindSourceMapURL = findSourceMapURL;\n this._debugChannel = debugChannel;\n this._blockedConsole = null;\n@@ -2688,6 +2734,7 @@ export function createResponse(\n replayConsole: boolean, \/\/ DEV-only\n environmentName: void | string, \/\/ DEV-only\n debugStartTime: void | number, \/\/ DEV-only\n+ debugEndTime: void | number, \/\/ DEV-only\n debugChannel: void | DebugChannel, \/\/ DEV-only\n ): WeakResponse {\n return getWeakResponse(\n@@ -2704,6 +2751,7 @@ export function createResponse(\n replayConsole,\n environmentName,\n debugStartTime,\n+ debugEndTime,\n debugChannel,\n ),\n );\n@@ -3075,10 +3123,10 @@ function resolveStream>(\n resolvedChunk.value = stream;\n resolvedChunk.reason = controller;\n if (resolveListeners !== null) {\n- wakeChunk(resolveListeners, chunk.value, (chunk: any));\n+ wakeChunk(response, resolveListeners, chunk.value, (chunk: any));\n } else {\n if (__DEV__) {\n- moveDebugInfoFromChunkToInnerValue(resolvedChunk, stream);\n+ processChunkDebugInfo(response, resolvedChunk, stream);\n }\n }\n }\n@@ -3218,7 +3266,12 @@ function startAsyncIterable(\n initializedChunk.status = INITIALIZED;\n initializedChunk.value = {done: false, value: value};\n if (resolveListeners !== null) {\n- wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);\n+ wakeChunkIfInitialized(\n+ response,\n+ chunk,\n+ resolveListeners,\n+ rejectListeners,\n+ );\n }\n }\n nextWriteIndex++;\ndiff --git a\/packages\/react-server-dom-esm\/src\/client\/ReactFlightDOMClientBrowser.js b\/packages\/react-server-dom-esm\/src\/client\/ReactFlightDOMClientBrowser.js\nindex 371f08abc9..ee2475287d 100644\n--- a\/packages\/react-server-dom-esm\/src\/client\/ReactFlightDOMClientBrowser.js\n+++ b\/packages\/react-server-dom-esm\/src\/client\/ReactFlightDOMClientBrowser.js\n@@ -53,6 +53,7 @@ export type Options = {\n replayConsoleLogs?: boolean,\n environmentName?: string,\n startTime?: number,\n+ endTime?: number,\n };\n \n function createDebugCallbackFromWritableStream(\n@@ -107,6 +108,7 @@ function createResponseFromOptions(options: void | Options) {\n __DEV__ && options && options.startTime != null\n ? options.startTime\n : undefined,\n+ __DEV__ && options && options.endTime != null ? options.endTime : undefined,\n debugChannel,\n );\n }\ndiff --git a\/packages\/react-server-dom-esm\/src\/client\/ReactFlightDOMClientNode.js b\/packages\/react-server-dom-esm\/src\/client\/ReactFlightDOMClientNode.js\nindex 78dce93615..38ac43d013 100644\n--- a\/packages\/react-server-dom-esm\/src\/client\/ReactFlightDOMClientNode.js\n+++ b\/packages\/react-server-dom-esm\/src\/client\/ReactFlightDOMClientNode.js\n@@ -58,6 +58,7 @@ export type Options = {\n replayConsoleLogs?: boolean,\n environmentName?: string,\n startTime?: number,\n+ endTime?: number,\n \/\/ For the Node.js client we only support a single-direction debug channel.\n debugChannel?: Readable,\n };\n@@ -116,6 +117,7 @@ function createFromNodeStream(\n __DEV__ && options && options.startTime != null\n ? options.startTime\n : undefined,\n+ __DEV__ && options && options.endTime != null ? options.endTime : undefined,\n debugChannel,\n );\n \ndiff --git a\/packages\/react-server-dom-parcel\/src\/client\/ReactFlightDOMClientBrowser.js b\/packages\/react-server-dom-parcel\/src\/client\/ReactFlightDOMClientBrowser.js\nindex 0f0141e640..b304d44204 100644\n--- a\/packages\/react-server-dom-parcel\/src\/client\/ReactFlightDOMClientBrowser.js\n+++ b\/packages\/react-server-dom-parcel\/src\/client\/ReactFlightDOMClientBrowser.js\n@@ -132,6 +132,7 @@ function createResponseFromOptions(options: void | Options) {\n __DEV__ && options && options.startTime != null\n ? options.startTime\n : undefined,\n+ __DEV__ && options && options.endTime != null ? options.endTime : undefined,\n debugChannel,\n );\n }\n@@ -209,6 +210,7 @@ export type Options = {\n replayConsoleLogs?: boolean,\n environmentName?: string,\n startTime?: number,\n+ endTime?: number,\n };\n \n export function createFromReadableStream(\ndiff --git a\/packages\/react-server-dom-parcel\/src\/client\/ReactFlightDOMClientEdge.js b\/packages\/react-server-dom-parcel\/src\/client\/ReactFlightDOMClientEdge.js\nindex 5c8d1023b2..f58f853434 100644\n--- a\/packages\/react-server-dom-parcel\/src\/client\/ReactFlightDOMClientEdge.js\n+++ b\/packages\/react-server-dom-parcel\/src\/client\/ReactFlightDOMClientEdge.js\n@@ -80,6 +80,7 @@ export type Options = {\n replayConsoleLogs?: boolean,\n environmentName?: string,\n startTime?: number,\n+ endTime?: number,\n \/\/ For the Edge client we only support a single-direction debug channel.\n debugChannel?: {readable?: ReadableStream, ...},\n };\n@@ -111,6 +112,7 @@ function createResponseFromOptions(options?: Options) {\n __DEV__ && options && options.startTime != null\n ? options.startTime\n : undefined,\n+ __DEV__ && options && options.endTime != null ? options.endTime : undefined,\n debugChannel,\n );\n }\ndiff --git a\/packages\/react-server-dom-parcel\/src\/client\/ReactFlightDOMClientNode.js b\/packages\/react-server-dom-parcel\/src\/client\/ReactFlightDOMClientNode.js\nindex fbc633a175..a9b82e343f 100644\n--- a\/packages\/react-server-dom-parcel\/src\/client\/ReactFlightDOMClientNode.js\n+++ b\/packages\/react-server-dom-parcel\/src\/client\/ReactFlightDOMClientNode.js\n@@ -53,6 +53,7 @@ export type Options = {\n replayConsoleLogs?: boolean,\n environmentName?: string,\n startTime?: number,\n+ endTime?: number,\n \/\/ For the Node.js client we only support a single-direction debug channel.\n debugChannel?: Readable,\n };\n@@ -107,6 +108,7 @@ export function createFromNodeStream(\n __DEV__ && options && options.startTime != null\n ? options.startTime\n : undefined,\n+ __DEV__ && options && options.endTime != null ? options.endTime : undefined,\n debugChannel,\n );\n \ndiff --git a\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientBrowser.js b\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientBrowser.js\nindex b3d31bd1bb..0bf6150019 100644\n--- a\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientBrowser.js\n+++ b\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientBrowser.js\n@@ -52,6 +52,7 @@ export type Options = {\n replayConsoleLogs?: boolean,\n environmentName?: string,\n startTime?: number,\n+ endTime?: number,\n };\n \n function createDebugCallbackFromWritableStream(\n@@ -106,6 +107,7 @@ function createResponseFromOptions(options: void | Options) {\n __DEV__ && options && options.startTime != null\n ? options.startTime\n : undefined,\n+ __DEV__ && options && options.endTime != null ? options.endTime : undefined,\n debugChannel,\n );\n }\ndiff --git a\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientEdge.js b\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientEdge.js\nindex 5517e0f73c..c6dd4ee94a 100644\n--- a\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientEdge.js\n+++ b\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientEdge.js\n@@ -80,6 +80,7 @@ export type Options = {\n replayConsoleLogs?: boolean,\n environmentName?: string,\n startTime?: number,\n+ endTime?: number,\n \/\/ For the Edge client we only support a single-direction debug channel.\n debugChannel?: {readable?: ReadableStream, ...},\n };\n@@ -113,6 +114,7 @@ function createResponseFromOptions(options: Options) {\n __DEV__ && options && options.startTime != null\n ? options.startTime\n : undefined,\n+ __DEV__ && options && options.endTime != null ? options.endTime : undefined,\n debugChannel,\n );\n }\ndiff --git a\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientNode.js b\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientNode.js\nindex 6d117929df..73d79800c9 100644\n--- a\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientNode.js\n+++ b\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientNode.js\n@@ -61,6 +61,7 @@ export type Options = {\n replayConsoleLogs?: boolean,\n environmentName?: string,\n startTime?: number,\n+ endTime?: number,\n \/\/ For the Node.js client we only support a single-direction debug channel.\n debugChannel?: Readable,\n };\n@@ -118,6 +119,7 @@ function createFromNodeStream(\n __DEV__ && options && options.startTime != null\n ? options.startTime\n : undefined,\n+ __DEV__ && options && options.endTime != null ? options.endTime : undefined,\n debugChannel,\n );\n \ndiff --git a\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMNode-test.js b\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMNode-test.js\nindex d59f298f99..646735a54b 100644\n--- a\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMNode-test.js\n+++ b\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMNode-test.js\n@@ -86,12 +86,25 @@ describe('ReactFlightDOMNode', () => {\n );\n }\n \n- function normalizeCodeLocInfo(str) {\n+ const relativeFilename = path.relative(__dirname, __filename);\n+\n+ function normalizeCodeLocInfo(str, {preserveLocation = false} = {}) {\n return (\n str &&\n- str.replace(\/^ +(?:at|in) ([\\S]+)[^\\n]*\/gm, function (m, name) {\n- return ' in ' + name + (\/\\d\/.test(m) ? ' (at **)' : '');\n- })\n+ str.replace(\n+ \/^ +(?:at|in) ([\\S]+) ([^\\n]*)\/gm,\n+ function (m, name, location) {\n+ return (\n+ ' in ' +\n+ name +\n+ (\/\\d\/.test(m)\n+ ? preserveLocation\n+ ? ' ' + location.replace(__filename, relativeFilename)\n+ : ' (at **)'\n+ : '')\n+ );\n+ },\n+ )\n );\n }\n \n@@ -1169,4 +1182,221 @@ describe('ReactFlightDOMNode', () => {\n \/\/ Must not throw an error.\n await readable.pipeTo(writable);\n });\n+\n+ describe('with real timers', () => {\n+ \/\/ These tests schedule their rendering in a way that requires real timers\n+ \/\/ to be used to accurately represent how this interacts with React's\n+ \/\/ internal scheduling.\n+\n+ beforeEach(() => {\n+ jest.useRealTimers();\n+ });\n+\n+ afterEach(() => {\n+ jest.useFakeTimers();\n+ });\n+\n+ it('should use late-arriving I\/O debug info to enhance component and owner stacks when aborting a prerender', async () => {\n+ \/\/ This test is constructing a scenario where a framework might separate\n+ \/\/ I\/O into different phases, e.g. runtime I\/O and dynamic I\/O. The\n+ \/\/ framework might choose to define an end time for the Flight client,\n+ \/\/ indicating that all I\/O info (or any debug info for that matter) that\n+ \/\/ arrives after that time should be ignored. When rendering in Fizz is\n+ \/\/ then aborted, the late-arriving debug info that's used to enhance the\n+ \/\/ owner stack only includes I\/O info up to that end time.\n+ let resolveRuntimeData;\n+ let resolveDynamicData;\n+\n+ async function getRuntimeData() {\n+ return new Promise(resolve => {\n+ resolveRuntimeData = resolve;\n+ });\n+ }\n+\n+ async function getDynamicData() {\n+ return new Promise(resolve => {\n+ resolveDynamicData = resolve;\n+ });\n+ }\n+\n+ async function Dynamic() {\n+ const runtimeData = await getRuntimeData();\n+ const dynamicData = await getDynamicData();\n+\n+ return (\n+

\n+ {runtimeData} {dynamicData}\n+ <\/p>\n+ );\n+ }\n+\n+ function App() {\n+ return ReactServer.createElement(\n+ 'html',\n+ null,\n+ ReactServer.createElement(\n+ 'body',\n+ null,\n+ ReactServer.createElement(Dynamic),\n+ ),\n+ );\n+ }\n+\n+ const stream = await ReactServerDOMServer.renderToPipeableStream(\n+ ReactServer.createElement(App),\n+ webpackMap,\n+ {filterStackFrame},\n+ );\n+\n+ const initialChunks = [];\n+ const dynamicChunks = [];\n+ let isDynamic = false;\n+\n+ const passThrough = new Stream.PassThrough(streamOptions);\n+ stream.pipe(passThrough);\n+\n+ passThrough.on('data', chunk => {\n+ if (isDynamic) {\n+ dynamicChunks.push(chunk);\n+ } else {\n+ initialChunks.push(chunk);\n+ }\n+ });\n+\n+ let endTime;\n+\n+ await new Promise(resolve => {\n+ setTimeout(() => {\n+ resolveRuntimeData('Hi');\n+ });\n+ setTimeout(() => {\n+ isDynamic = true;\n+ endTime = performance.now() + performance.timeOrigin;\n+ resolveDynamicData('Josh');\n+ resolve();\n+ });\n+ });\n+\n+ await new Promise(resolve => {\n+ passThrough.on('end', resolve);\n+ });\n+\n+ \/\/ Create a new Readable and push all initial chunks immediately.\n+ const readable = new Stream.Readable({...streamOptions, read() {}});\n+ for (let i = 0; i < initialChunks.length; i++) {\n+ readable.push(initialChunks[i]);\n+ }\n+\n+ const abortController = new AbortController();\n+\n+ \/\/ When prerendering is aborted, push all dynamic chunks. They won't be\n+ \/\/ considered for rendering, but they include debug info we want to use.\n+ abortController.signal.addEventListener(\n+ 'abort',\n+ () => {\n+ for (let i = 0; i < dynamicChunks.length; i++) {\n+ readable.push(dynamicChunks[i]);\n+ }\n+ },\n+ {once: true},\n+ );\n+\n+ const response = ReactServerDOMClient.createFromNodeStream(\n+ readable,\n+ {\n+ serverConsumerManifest: {\n+ moduleMap: null,\n+ moduleLoading: null,\n+ },\n+ },\n+ {\n+ \/\/ Debug info arriving after this end time will be ignored, e.g. the\n+ \/\/ I\/O info for the dynamic data.\n+ endTime,\n+ },\n+ );\n+\n+ function ClientRoot() {\n+ return use(response);\n+ }\n+\n+ let componentStack;\n+ let ownerStack;\n+\n+ const {prelude} = await new Promise(resolve => {\n+ let result;\n+\n+ setTimeout(() => {\n+ result = ReactDOMFizzStatic.prerenderToNodeStream(\n+ React.createElement(ClientRoot),\n+ {\n+ signal: abortController.signal,\n+ onError(error, errorInfo) {\n+ componentStack = errorInfo.componentStack;\n+ ownerStack = React.captureOwnerStack\n+ ? React.captureOwnerStack()\n+ : null;\n+ },\n+ },\n+ );\n+ });\n+\n+ setTimeout(() => {\n+ abortController.abort();\n+ resolve(result);\n+ });\n+ });\n+\n+ const prerenderHTML = await readResult(prelude);\n+\n+ expect(prerenderHTML).toBe('');\n+\n+ if (__DEV__) {\n+ expect(\n+ normalizeCodeLocInfo(componentStack, {preserveLocation: true}),\n+ ).toBe(\n+ '\\n' +\n+ ' in Dynamic' +\n+ (gate(flags => flags.enableAsyncDebugInfo)\n+ ? ' (file:\/\/ReactFlightDOMNode-test.js:1223:33)\\n'\n+ : '\\n') +\n+ ' in body\\n' +\n+ ' in html\\n' +\n+ ' in App (file:\/\/ReactFlightDOMNode-test.js:1240:25)\\n' +\n+ ' in ClientRoot (ReactFlightDOMNode-test.js:1320:16)',\n+ );\n+ } else {\n+ expect(\n+ normalizeCodeLocInfo(componentStack, {preserveLocation: true}),\n+ ).toBe(\n+ '\\n' +\n+ ' in body\\n' +\n+ ' in html\\n' +\n+ ' in ClientRoot (ReactFlightDOMNode-test.js:1320:16)',\n+ );\n+ }\n+\n+ if (__DEV__) {\n+ if (gate(flags => flags.enableAsyncDebugInfo)) {\n+ expect(\n+ normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),\n+ ).toBe(\n+ '\\n' +\n+ ' in Dynamic (file:\/\/ReactFlightDOMNode-test.js:1223:33)\\n' +\n+ ' in App (file:\/\/ReactFlightDOMNode-test.js:1240:25)',\n+ );\n+ } else {\n+ expect(\n+ normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),\n+ ).toBe(\n+ '' +\n+ '\\n' +\n+ ' in App (file:\/\/ReactFlightDOMNode-test.js:1240:25)',\n+ );\n+ }\n+ } else {\n+ expect(ownerStack).toBeNull();\n+ }\n+ });\n+ });\n });\ndiff --git a\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientBrowser.js b\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientBrowser.js\nindex b3d31bd1bb..0bf6150019 100644\n--- a\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientBrowser.js\n+++ b\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientBrowser.js\n@@ -52,6 +52,7 @@ export type Options = {\n replayConsoleLogs?: boolean,\n environmentName?: string,\n startTime?: number,\n+ endTime?: number,\n };\n \n function createDebugCallbackFromWritableStream(\n@@ -106,6 +107,7 @@ function createResponseFromOptions(options: void | Options) {\n __DEV__ && options && options.startTime != null\n ? options.startTime\n : undefined,\n+ __DEV__ && options && options.endTime != null ? options.endTime : undefined,\n debugChannel,\n );\n }\ndiff --git a\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientEdge.js b\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientEdge.js\nindex bc4caac767..2cf668f679 100644\n--- a\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientEdge.js\n+++ b\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientEdge.js\n@@ -80,6 +80,7 @@ export type Options = {\n replayConsoleLogs?: boolean,\n environmentName?: string,\n startTime?: number,\n+ endTime?: number,\n \/\/ For the Edge client we only support a single-direction debug channel.\n debugChannel?: {readable?: ReadableStream, ...},\n };\n@@ -113,6 +114,7 @@ function createResponseFromOptions(options: Options) {\n __DEV__ && options && options.startTime != null\n ? options.startTime\n : undefined,\n+ __DEV__ && options && options.endTime != null ? options.endTime : undefined,\n debugChannel,\n );\n }\ndiff --git a\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientNode.js b\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientNode.js\nindex 6d117929df..73d79800c9 100644\n--- a\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientNode.js\n+++ b\/packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientNode.js\n@@ -61,6 +61,7 @@ export type Options = {\n replayConsoleLogs?: boolean,\n environmentName?: string,\n startTime?: number,\n+ endTime?: number,\n \/\/ For the Node.js client we only support a single-direction debug channel.\n debugChannel?: Readable,\n };\n@@ -118,6 +119,7 @@ function createFromNodeStream(\n __DEV__ && options && options.startTime != null\n ? options.startTime\n : undefined,\n+ __DEV__ && options && options.endTime != null ? options.endTime : undefined,\n debugChannel,\n );\n \ndiff --git a\/packages\/react-server\/src\/ReactFizzServer.js b\/packages\/react-server\/src\/ReactFizzServer.js\nindex 33c0ab68a8..6259357c83 100644\n--- a\/packages\/react-server\/src\/ReactFizzServer.js\n+++ b\/packages\/react-server\/src\/ReactFizzServer.js\n@@ -1004,14 +1004,6 @@ function pushHaltedAwaitOnComponentStack(\n if (debugInfo != null) {\n for (let i = debugInfo.length - 1; i >= 0; i--) {\n const info = debugInfo[i];\n- if (typeof info.name === 'string') {\n- \/\/ This is a Server Component. Any awaits in previous Server Components already resolved.\n- break;\n- }\n- if (typeof info.time === 'number') {\n- \/\/ This had an end time. Any awaits before this must have already resolved.\n- break;\n- }\n if (info.awaited != null) {\n const asyncInfo: ReactAsyncInfo = (info: any);\n const bestStack =\n@@ -4653,10 +4645,36 @@ function abortTask(task: Task, request: Request, error: mixed): void {\n \/\/ If the task is not rendering, then this is an async abort. Conceptually it's as if\n \/\/ the abort happened inside the async gap. The abort reason's stack frame won't have that\n \/\/ on the stack so instead we use the owner stack and debug task of any halted async debug info.\n- const node: any = task.node;\n+ let node: any = task.node;\n if (node !== null && typeof node === 'object') {\n \/\/ Push a fake component stack frame that represents the await.\n- pushHaltedAwaitOnComponentStack(task, node._debugInfo);\n+ let debugInfo = node._debugInfo;\n+ \/\/ First resolve lazy nodes to find debug info that has been transferred\n+ \/\/ to the inner value.\n+ while (\n+ typeof node === 'object' &&\n+ node !== null &&\n+ node.$$typeof === REACT_LAZY_TYPE\n+ ) {\n+ const payload = node._payload;\n+ if (payload.status === 'fulfilled') {\n+ node = payload.value;\n+ continue;\n+ }\n+ break;\n+ }\n+ if (\n+ typeof node === 'object' &&\n+ node !== null &&\n+ (isArray(node) ||\n+ typeof node[ASYNC_ITERATOR] === 'function' ||\n+ node.$$typeof === REACT_ELEMENT_TYPE ||\n+ node.$$typeof === REACT_LAZY_TYPE) &&\n+ isArray(node._debugInfo)\n+ ) {\n+ debugInfo = node._debugInfo;\n+ }\n+ pushHaltedAwaitOnComponentStack(task, debugInfo);\n \/*\n if (task.thenableState !== null) {\n \/\/ TODO: If we were stalled inside use() of a Client Component then we should\n","commit":{"subject":"[Fizz] Push halted await to the owner stack for late-arriving I\/O info (#35019)","authoredAt":"2025-11-01T16:03:09+01:00","revision":"561ee24d4a7c805e9837ee4cfbb5671a35e41b5a","shortRevision":"561ee24d4a","authorName":"Hendrik Liebau","authorEmail":"mail@hendrik-liebau.de"},"parents":["488d88b018ee8fd1fac56cab22dfa8796ebce30b"],"body":"","files":[{"status":"M","path":"packages\/react-client\/src\/ReactFlightClient.js"},{"status":"M","path":"packages\/react-server-dom-esm\/src\/client\/ReactFlightDOMClientBrowser.js"},{"status":"M","path":"packages\/react-server-dom-esm\/src\/client\/ReactFlightDOMClientNode.js"},{"status":"M","path":"packages\/react-server-dom-parcel\/src\/client\/ReactFlightDOMClientBrowser.js"},{"status":"M","path":"packages\/react-server-dom-parcel\/src\/client\/ReactFlightDOMClientEdge.js"},{"status":"M","path":"packages\/react-server-dom-parcel\/src\/client\/ReactFlightDOMClientNode.js"},{"status":"M","path":"packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientBrowser.js"},{"status":"M","path":"packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientEdge.js"},{"status":"M","path":"packages\/react-server-dom-turbopack\/src\/client\/ReactFlightDOMClientNode.js"},{"status":"M","path":"packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMNode-test.js"},{"status":"M","path":"packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientBrowser.js"},{"status":"M","path":"packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientEdge.js"},{"status":"M","path":"packages\/react-server-dom-webpack\/src\/client\/ReactFlightDOMClientNode.js"},{"status":"M","path":"packages\/react-server\/src\/ReactFizzServer.js"}]}

dillon1000/react

Files changed