[Fizz] Push halted await to the owner stack for late-arriving I/O info#35019

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.

Sign up for GitHub

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

Merged
unstubbable merged 9 commits into from
Nov 1, 2025
Merged

[Fizz] Push halted await to the owner stack for late-arriving I/O info #35019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
64c896b
[Fizz] Push halted await to the owner stack for late-arriving I/O info
unstubbable Oct 30, 2025
ebc1668
Always prefer debug info from inner values of lazy nodes
unstubbable Oct 30, 2025
728d854
Fix `prerenderHTML` check
unstubbable Oct 30, 2025
65104ef
Add (debug) end time to Flight client
unstubbable Nov 1, 2025
81a7f26
Filter debug info when debug chunk resolves
unstubbable Oct 31, 2025
c11c2d7
Revert "Filter debug info when debug chunk resolves"
unstubbable Oct 31, 2025
b4b1ba0
Use `endTime` in test
unstubbable Nov 1, 2025
29093b5
Move debug info filtering to correct location
unstubbable Nov 1, 2025
bd8ae71
Remove `response` from `InitializationReference`
unstubbable Nov 1, 2025
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
105 changes: 79 additions & 26 deletions packages/react-client/src/ReactFlightClient.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -367,6 +367,7 @@ type Response = {
_debugRootStack?: null | Error, // DEV-only
_debugRootTask?: null | ConsoleTask, // DEV-only
_debugStartTime: number, // DEV-only
_debugEndTime?: number, // DEV-only
_debugIOStarted: boolean, // DEV-only
_debugFindSourceMapURL?: void | FindSourceMapURLCallback, // DEV-only
_debugChannel?: void | DebugChannel, // DEV-only
Expand DownExpand Up@@ -500,6 +501,34 @@ function createErrorChunk<T>(
return new ReactPromise(ERRORED, null, error);
}

function filterDebugInfo(
response: Response,
value: {_debugInfo: ReactDebugInfo, ...},
) {
if (response._debugEndTime === null) {
// No end time was defined, so we keep all debug info entries.
return;
}

// Remove any debug info entries that arrived after the defined end time.
const relativeEndTime =
response._debugEndTime -
// $FlowFixMe[prop-missing]
performance.timeOrigin;
const debugInfo = [];
for (let i = 0; i < value._debugInfo.length; i++) {
const info = value._debugInfo[i];
if (typeof info.time === 'number' && info.time > relativeEndTime) {
break;
}
if (info.awaited != null && info.awaited.end > relativeEndTime) {
break;
}
debugInfo.push(info);
}
value._debugInfo = debugInfo;
}

function moveDebugInfoFromChunkToInnerValue<T>(
chunk: InitializedChunk<T> | InitializedStreamChunk<any>,
value: T,
Expand DownExpand Up@@ -534,7 +563,17 @@ function moveDebugInfoFromChunkToInnerValue<T>(
}
}

function processChunkDebugInfo<T>(
response: Response,
chunk: InitializedChunk<T> | InitializedStreamChunk<any>,
value: T,
): void {
filterDebugInfo(response, chunk);
moveDebugInfoFromChunkToInnerValue(chunk, value);
}

function wakeChunk<T>(
response: Response,
listeners: Array<InitializationReference | (T => mixed)>,
value: T,
chunk: InitializedChunk<T>,
Expand All@@ -544,16 +583,17 @@ function wakeChunk<T>(
if (typeof listener === 'function') {
listener(value);
} else {
fulfillReference(listener, value, chunk);
fulfillReference(response, listener, value, chunk);
}
}

if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(chunk, value);
processChunkDebugInfo(response, chunk, value);
}
}

function rejectChunk(
response: Response,
listeners: Array<InitializationReference | (mixed => mixed)>,
error: mixed,
): void {
Expand All@@ -562,7 +602,7 @@ function rejectChunk(
if (typeof listener === 'function') {
listener(error);
} else {
rejectReference(listener, error);
rejectReference(response, listener.handler, error);
}
}
}
Expand DownExpand Up@@ -595,13 +635,14 @@ function resolveBlockedCycle<T>(
}

function wakeChunkIfInitialized<T>(
response: Response,
chunk: SomeChunk<T>,
resolveListeners: Array<InitializationReference | (T => mixed)>,
rejectListeners: null | Array<InitializationReference | (mixed => mixed)>,
): void {
switch (chunk.status) {
case INITIALIZED:
wakeChunk(resolveListeners, chunk.value, chunk);
wakeChunk(response, resolveListeners, chunk.value, chunk);
break;
case BLOCKED:
// It is possible that we're blocked on our own chunk if it's a cycle.
Expand All@@ -615,7 +656,7 @@ function wakeChunkIfInitialized<T>(
if (cyclicHandler !== null) {
// This reference points back to this chunk. We can resolve the cycle by
// using the value from that handler.
fulfillReference(reference, cyclicHandler.value, chunk);
fulfillReference(response, reference, cyclicHandler.value, chunk);
resolveListeners.splice(i, 1);
i--;
if (rejectListeners !== null) {
Expand All@@ -629,14 +670,15 @@ function wakeChunkIfInitialized<T>(
case INITIALIZED:
const initializedChunk: InitializedChunk<T> = (chunk: any);
wakeChunk(
response,
resolveListeners,
initializedChunk.value,
initializedChunk,
);
return;
case ERRORED:
if (rejectListeners !== null) {
rejectChunk(rejectListeners, chunk.reason);
rejectChunk(response, rejectListeners, chunk.reason);
}
return;
}
Expand DownExpand Up@@ -666,7 +708,7 @@ function wakeChunkIfInitialized<T>(
break;
case ERRORED:
if (rejectListeners) {
rejectChunk(rejectListeners, chunk.reason);
rejectChunk(response, rejectListeners, chunk.reason);
}
break;
}
Expand DownExpand Up@@ -724,7 +766,7 @@ function triggerErrorOnChunk<T>(
erroredChunk.status = ERRORED;
erroredChunk.reason = error;
if (listeners !== null) {
rejectChunk(listeners, error);
rejectChunk(response, listeners, error);
}
}

Expand DownExpand Up@@ -832,7 +874,7 @@ function resolveModelChunk<T>(
// longer be rendered or might not be the highest pri.
initializeModelChunk(resolvedChunk);
// The status might have changed after initialization.
wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
wakeChunkIfInitialized(response, chunk, resolveListeners, rejectListeners);
}
}

Expand DownExpand Up@@ -861,12 +903,11 @@ function resolveModuleChunk<T>(
}
if (resolveListeners !== null) {
initializeModuleChunk(resolvedChunk);
wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
wakeChunkIfInitialized(response, chunk, resolveListeners, rejectListeners);
}
}

type InitializationReference = {
response: Response, // TODO: Remove Response from here and pass it through instead.
handler: InitializationHandler,
parentObject: Object,
key: string,
Expand DownExpand Up@@ -1005,7 +1046,7 @@ function initializeModelChunk<T>(chunk: ResolvedModelChunk<T>): void {
if (typeof listener === 'function') {
listener(value);
} else {
fulfillReference(listener, value, cyclicChunk);
fulfillReference(response, listener, value, cyclicChunk);
}
}
}
Expand All@@ -1026,7 +1067,7 @@ function initializeModelChunk<T>(chunk: ResolvedModelChunk<T>): void {
initializedChunk.value = value;

if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, value);
processChunkDebugInfo(response, initializedChunk, value);
}
} catch (error) {
const erroredChunk: ErroredChunk<T> = (chunk: any);
Expand DownExpand Up@@ -1413,11 +1454,12 @@ function getChunk(response: Response, id: number): SomeChunk<any> {
}

function fulfillReference(
response: Response,
reference: InitializationReference,
value: any,
fulfilledChunk: SomeChunk<any>,
): void {
const {response, handler, parentObject, key, map, path} = reference;
const {handler, parentObject, key, map, path} = reference;

for (let i = 1; i < path.length; i++) {
while (
Expand DownExpand Up@@ -1487,7 +1529,11 @@ function fulfillReference(
return;
}
default: {
rejectReference(reference, referencedChunk.reason);
rejectReference(
response,
reference.handler,
referencedChunk.reason,
);
return;
}
}
Expand DownExpand Up@@ -1585,21 +1631,20 @@ function fulfillReference(
initializedChunk.value = handler.value;
initializedChunk.reason = handler.reason; // Used by streaming chunks
if (resolveListeners !== null) {
wakeChunk(resolveListeners, handler.value, initializedChunk);
wakeChunk(response, resolveListeners, handler.value, initializedChunk);
} else {
if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, handler.value);
processChunkDebugInfo(response, initializedChunk, handler.value);
}
}
}
}

function rejectReference(
reference: InitializationReference,
response: Response,
handler: InitializationHandler,
error: mixed,
): void {
const {handler, response} = reference;

if (handler.errored) {
// We've already errored. We could instead build up an AggregateError
// but if there are multiple errors we just take the first one like
Expand DownExpand Up@@ -1690,7 +1735,6 @@ function waitForReference<T>(
}

const reference: InitializationReference = {
response,
handler,
parentObject,
key,
Expand DownExpand Up@@ -1838,10 +1882,10 @@ function loadServerReference<A: Iterable<any>, T>(
initializedChunk.status = INITIALIZED;
initializedChunk.value = handler.value;
if (resolveListeners !== null) {
wakeChunk(resolveListeners, handler.value, initializedChunk);
wakeChunk(response, resolveListeners, handler.value, initializedChunk);
} else {
if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, handler.value);
processChunkDebugInfo(response, initializedChunk, handler.value);
}
}
}
Expand DownExpand Up@@ -2578,6 +2622,7 @@ function ResponseInstance(
replayConsole: boolean, // DEV-only
environmentName: void | string, // DEV-only
debugStartTime: void | number, // DEV-only
debugEndTime: void | number, // DEV-only
debugChannel: void | DebugChannel, // DEV-only
) {
const chunks: Map<number, SomeChunk<any>> = new Map();
Expand DownExpand Up@@ -2645,6 +2690,7 @@ function ResponseInstance(
// and is not considered I/O required to load the stream.
setTimeout(markIOStarted.bind(this), 0);
}
this._debugEndTime = debugEndTime == null ? null : debugEndTime;
this._debugFindSourceMapURL = findSourceMapURL;
this._debugChannel = debugChannel;
this._blockedConsole = null;
Expand DownExpand Up@@ -2688,6 +2734,7 @@ export function createResponse(
replayConsole: boolean, // DEV-only
environmentName: void | string, // DEV-only
debugStartTime: void | number, // DEV-only
debugEndTime: void | number, // DEV-only
debugChannel: void | DebugChannel, // DEV-only
): WeakResponse {
return getWeakResponse(
Expand All@@ -2704,6 +2751,7 @@ export function createResponse(
replayConsole,
environmentName,
debugStartTime,
debugEndTime,
debugChannel,
),
);
Expand DownExpand Up@@ -3075,10 +3123,10 @@ function resolveStream<T: ReadableStream | $AsyncIterable<any, any, void>>(
resolvedChunk.value = stream;
resolvedChunk.reason = controller;
if (resolveListeners !== null) {
wakeChunk(resolveListeners, chunk.value, (chunk: any));
wakeChunk(response, resolveListeners, chunk.value, (chunk: any));
} else {
if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(resolvedChunk, stream);
processChunkDebugInfo(response, resolvedChunk, stream);
}
}
}
Expand DownExpand Up@@ -3218,7 +3266,12 @@ function startAsyncIterable<T>(
initializedChunk.status = INITIALIZED;
initializedChunk.value = {done: false, value: value};
if (resolveListeners !== null) {
wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
wakeChunkIfInitialized(
response,
chunk,
resolveListeners,
rejectListeners,
);
}
}
nextWriteIndex++;
Expand Down
2 changes: 2 additions & 0 deletions packages/react-server-dom-esm/src/client/ReactFlightDOMClientBrowser.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ export type Options = {
replayConsoleLogs?: boolean,
environmentName?: string,
startTime?: number,
endTime?: number,
};

function createDebugCallbackFromWritableStream(
Expand DownExpand Up@@ -107,6 +108,7 @@ function createResponseFromOptions(options: void | Options) {
__DEV__ && options && options.startTime != null
? options.startTime
: undefined,
__DEV__ && options && options.endTime != null ? options.endTime : undefined,
debugChannel,
);
}
Expand Down
2 changes: 2 additions & 0 deletions packages/react-server-dom-esm/src/client/ReactFlightDOMClientNode.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ export type Options = {
replayConsoleLogs?: boolean,
environmentName?: string,
startTime?: number,
endTime?: number,
// For the Node.js client we only support a single-direction debug channel.
debugChannel?: Readable,
};
Expand DownExpand Up@@ -116,6 +117,7 @@ function createFromNodeStream<T>(
__DEV__ && options && options.startTime != null
? options.startTime
: undefined,
__DEV__ && options && options.endTime != null ? options.endTime : undefined,
debugChannel,
);

Expand Down
2 changes: 2 additions & 0 deletions packages/react-server-dom-parcel/src/client/ReactFlightDOMClientBrowser.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -132,6 +132,7 @@ function createResponseFromOptions(options: void | Options) {
__DEV__ && options && options.startTime != null
? options.startTime
: undefined,
__DEV__ && options && options.endTime != null ? options.endTime : undefined,
debugChannel,
);
}
Expand DownExpand Up@@ -209,6 +210,7 @@ export type Options = {
replayConsoleLogs?: boolean,
environmentName?: string,
startTime?: number,
endTime?: number,
};

export function createFromReadableStream<T>(
Expand Down
2 changes: 2 additions & 0 deletions packages/react-server-dom-parcel/src/client/ReactFlightDOMClientEdge.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@ export type Options = {
replayConsoleLogs?: boolean,
environmentName?: string,
startTime?: number,
endTime?: number,
// For the Edge client we only support a single-direction debug channel.
debugChannel?: {readable?: ReadableStream, ...},
};
Expand DownExpand Up@@ -111,6 +112,7 @@ function createResponseFromOptions(options?: Options) {
__DEV__ && options && options.startTime != null
? options.startTime
: undefined,
__DEV__ && options && options.endTime != null ? options.endTime : undefined,
debugChannel,
);
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[Fizz] Push halted await to the owner stack for late-arriving I/O info#35019

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.

 Sign up for GitHub

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

 Merged

unstubbable
merged 9 commits into

from

Nov 1, 2025
 Merged


[Fizz] Push halted await to the owner stack for late-arriving I/O info
#35019
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
64c896b

[Fizz] Push halted await to the owner stack for late-arriving I/O info


unstubbable Oct 30, 2025
ebc1668

Always prefer debug info from inner values of lazy nodes


unstubbable Oct 30, 2025
728d854

Fix `prerenderHTML` check


unstubbable Oct 30, 2025
65104ef

Add (debug) end time to Flight client


unstubbable Nov 1, 2025
81a7f26

Filter debug info when debug chunk resolves


unstubbable Oct 31, 2025
c11c2d7

Revert "Filter debug info when debug chunk resolves"


unstubbable Oct 31, 2025
b4b1ba0

Use `endTime` in test


unstubbable Nov 1, 2025
29093b5

Move debug info filtering to correct location


unstubbable Nov 1, 2025
bd8ae71

Remove `response` from `InitializationReference`


unstubbable Nov 1, 2025

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


105 changes: 79 additions & 26 deletions
packages/react-client/src/ReactFlightClient.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -367,6 +367,7 @@ type Response = {
 _debugRootStack?: null | Error, // DEV-only
 _debugRootTask?: null | ConsoleTask, // DEV-only
 _debugStartTime: number, // DEV-only
 _debugEndTime?: number, // DEV-only
 _debugIOStarted: boolean, // DEV-only
 _debugFindSourceMapURL?: void | FindSourceMapURLCallback, // DEV-only
 _debugChannel?: void | DebugChannel, // DEV-only
Expand DownExpand Up@@ -500,6 +501,34 @@ function createErrorChunk<T>(
 return new ReactPromise(ERRORED, null, error);
}

function filterDebugInfo(
 response: Response,
 value: {_debugInfo: ReactDebugInfo, ...},
) {
 if (response._debugEndTime === null) {
 // No end time was defined, so we keep all debug info entries.
 return;
 }

 // Remove any debug info entries that arrived after the defined end time.
 const relativeEndTime =
 response._debugEndTime -
 // $FlowFixMe[prop-missing]
 performance.timeOrigin;
 const debugInfo = [];
 for (let i = 0; i < value._debugInfo.length; i++) {
 const info = value._debugInfo[i];
 if (typeof info.time === 'number' && info.time > relativeEndTime) {
 break;
 }
 if (info.awaited != null && info.awaited.end > relativeEndTime) {
 break;
 }
 debugInfo.push(info);
 }
 value._debugInfo = debugInfo;
}

function moveDebugInfoFromChunkToInnerValue<T>(
 chunk: InitializedChunk<T> | InitializedStreamChunk<any>,
 value: T,
Expand DownExpand Up@@ -534,7 +563,17 @@ function moveDebugInfoFromChunkToInnerValue<T>(
 }
}

function processChunkDebugInfo<T>(
 response: Response,
 chunk: InitializedChunk<T> | InitializedStreamChunk<any>,
 value: T,
): void {
 filterDebugInfo(response, chunk);
 moveDebugInfoFromChunkToInnerValue(chunk, value);
}

function wakeChunk<T>(
 response: Response,
 listeners: Array<InitializationReference | (T => mixed)>,
 value: T,
 chunk: InitializedChunk<T>,
Expand All@@ -544,16 +583,17 @@ function wakeChunk<T>(
 if (typeof listener === 'function') {
 listener(value);
 } else {
 fulfillReference(listener, value, chunk);
 fulfillReference(response, listener, value, chunk);
 }
 }

 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(chunk, value);
processChunkDebugInfo(response, chunk, value);
 }
}

function rejectChunk(
 response: Response,
 listeners: Array<InitializationReference | (mixed => mixed)>,
 error: mixed,
): void {
Expand All@@ -562,7 +602,7 @@ function rejectChunk(
 if (typeof listener === 'function') {
 listener(error);
 } else {
 rejectReference(listener, error);
 rejectReference(response, listener.handler, error);
 }
 }
}
Expand DownExpand Up@@ -595,13 +635,14 @@ function resolveBlockedCycle<T>(
}

function wakeChunkIfInitialized<T>(
 response: Response,
 chunk: SomeChunk<T>,
 resolveListeners: Array<InitializationReference | (T => mixed)>,
 rejectListeners: null | Array<InitializationReference | (mixed => mixed)>,
): void {
 switch (chunk.status) {
 case INITIALIZED:
 wakeChunk(resolveListeners, chunk.value, chunk);
 wakeChunk(response, resolveListeners, chunk.value, chunk);
 break;
 case BLOCKED:
 // It is possible that we're blocked on our own chunk if it's a cycle.
Expand All@@ -615,7 +656,7 @@ function wakeChunkIfInitialized<T>(
 if (cyclicHandler !== null) {
 // This reference points back to this chunk. We can resolve the cycle by
 // using the value from that handler.
 fulfillReference(reference, cyclicHandler.value, chunk);
 fulfillReference(response, reference, cyclicHandler.value, chunk);
 resolveListeners.splice(i, 1);
 i--;
 if (rejectListeners !== null) {
Expand All@@ -629,14 +670,15 @@ function wakeChunkIfInitialized<T>(
 case INITIALIZED:
 const initializedChunk: InitializedChunk<T> = (chunk: any);
 wakeChunk(
 response,
 resolveListeners,
 initializedChunk.value,
 initializedChunk,
 );
 return;
 case ERRORED:
 if (rejectListeners !== null) {
 rejectChunk(rejectListeners, chunk.reason);
 rejectChunk(response, rejectListeners, chunk.reason);
 }
 return;
 }
Expand DownExpand Up@@ -666,7 +708,7 @@ function wakeChunkIfInitialized<T>(
 break;
 case ERRORED:
 if (rejectListeners) {
 rejectChunk(rejectListeners, chunk.reason);
 rejectChunk(response, rejectListeners, chunk.reason);
 }
 break;
 }
Expand DownExpand Up@@ -724,7 +766,7 @@ function triggerErrorOnChunk<T>(
 erroredChunk.status = ERRORED;
 erroredChunk.reason = error;
 if (listeners !== null) {
 rejectChunk(listeners, error);
 rejectChunk(response, listeners, error);
 }
}

Expand DownExpand Up@@ -832,7 +874,7 @@ function resolveModelChunk<T>(
 // longer be rendered or might not be the highest pri.
 initializeModelChunk(resolvedChunk);
 // The status might have changed after initialization.
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(response, chunk, resolveListeners, rejectListeners);
 }
}

Expand DownExpand Up@@ -861,12 +903,11 @@ function resolveModuleChunk<T>(
 }
 if (resolveListeners !== null) {
 initializeModuleChunk(resolvedChunk);
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(response, chunk, resolveListeners, rejectListeners);
 }
}

type InitializationReference = {
 response: Response, // TODO: Remove Response from here and pass it through instead.
 handler: InitializationHandler,
 parentObject: Object,
 key: string,
Expand DownExpand Up@@ -1005,7 +1046,7 @@ function initializeModelChunk<T>(chunk: ResolvedModelChunk<T>): void {
 if (typeof listener === 'function') {
 listener(value);
 } else {
 fulfillReference(listener, value, cyclicChunk);
 fulfillReference(response, listener, value, cyclicChunk);
 }
 }
 }
Expand All@@ -1026,7 +1067,7 @@ function initializeModelChunk<T>(chunk: ResolvedModelChunk<T>): void {
 initializedChunk.value = value;

 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, value);
processChunkDebugInfo(response, initializedChunk, value);
 }
 } catch (error) {
 const erroredChunk: ErroredChunk<T> = (chunk: any);
Expand DownExpand Up@@ -1413,11 +1454,12 @@ function getChunk(response: Response, id: number): SomeChunk<any> {
}

function fulfillReference(
 response: Response,
 reference: InitializationReference,
 value: any,
 fulfilledChunk: SomeChunk<any>,
): void {
 const {response, handler, parentObject, key, map, path} = reference;
 const {handler, parentObject, key, map, path} = reference;

 for (let i = 1; i < path.length; i++) {
 while (
Expand DownExpand Up@@ -1487,7 +1529,11 @@ function fulfillReference(
 return;
 }
 default: {
 rejectReference(reference, referencedChunk.reason);
 rejectReference(
 response,
 reference.handler,
 referencedChunk.reason,
 );
 return;
 }
 }
Expand DownExpand Up@@ -1585,21 +1631,20 @@ function fulfillReference(
 initializedChunk.value = handler.value;
 initializedChunk.reason = handler.reason; // Used by streaming chunks
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, handler.value, initializedChunk);
 wakeChunk(response, resolveListeners, handler.value, initializedChunk);
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, handler.value);
processChunkDebugInfo(response, initializedChunk, handler.value);
 }
 }
 }
}

function rejectReference(
 reference: InitializationReference,
 response: Response,
 handler: InitializationHandler,
 error: mixed,
): void {
 const {handler, response} = reference;

 if (handler.errored) {
 // We've already errored. We could instead build up an AggregateError
 // but if there are multiple errors we just take the first one like
Expand DownExpand Up@@ -1690,7 +1735,6 @@ function waitForReference<T>(
 }

 const reference: InitializationReference = {
 response,
 handler,
 parentObject,
 key,
Expand DownExpand Up@@ -1838,10 +1882,10 @@ function loadServerReference<A: Iterable<any>, T>(
 initializedChunk.status = INITIALIZED;
 initializedChunk.value = handler.value;
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, handler.value, initializedChunk);
 wakeChunk(response, resolveListeners, handler.value, initializedChunk);
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, handler.value);
processChunkDebugInfo(response, initializedChunk, handler.value);
 }
 }
 }
Expand DownExpand Up@@ -2578,6 +2622,7 @@ function ResponseInstance(
 replayConsole: boolean, // DEV-only
 environmentName: void | string, // DEV-only
 debugStartTime: void | number, // DEV-only
 debugEndTime: void | number, // DEV-only
 debugChannel: void | DebugChannel, // DEV-only
) {
 const chunks: Map<number, SomeChunk<any>> = new Map();
Expand DownExpand Up@@ -2645,6 +2690,7 @@ function ResponseInstance(
 // and is not considered I/O required to load the stream.
 setTimeout(markIOStarted.bind(this), 0);
 }
 this._debugEndTime = debugEndTime == null ? null : debugEndTime;
 this._debugFindSourceMapURL = findSourceMapURL;
 this._debugChannel = debugChannel;
 this._blockedConsole = null;
Expand DownExpand Up@@ -2688,6 +2734,7 @@ export function createResponse(
 replayConsole: boolean, // DEV-only
 environmentName: void | string, // DEV-only
 debugStartTime: void | number, // DEV-only
 debugEndTime: void | number, // DEV-only
 debugChannel: void | DebugChannel, // DEV-only
): WeakResponse {
 return getWeakResponse(
Expand All@@ -2704,6 +2751,7 @@ export function createResponse(
 replayConsole,
 environmentName,
 debugStartTime,
 debugEndTime,
 debugChannel,
 ),
 );
Expand DownExpand Up@@ -3075,10 +3123,10 @@ function resolveStream<T: ReadableStream | $AsyncIterable<any, any, void>>(
 resolvedChunk.value = stream;
 resolvedChunk.reason = controller;
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, chunk.value, (chunk: any));
 wakeChunk(response, resolveListeners, chunk.value, (chunk: any));
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(resolvedChunk, stream);
processChunkDebugInfo(response, resolvedChunk, stream);
 }
 }
}
Expand DownExpand Up@@ -3218,7 +3266,12 @@ function startAsyncIterable<T>(
 initializedChunk.status = INITIALIZED;
 initializedChunk.value = {done: false, value: value};
 if (resolveListeners !== null) {
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(
 response,
 chunk,
 resolveListeners,
 rejectListeners,
 );
 }
 }
 nextWriteIndex++;
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-esm/src/client/ReactFlightDOMClientBrowser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
};

function createDebugCallbackFromWritableStream(
Expand DownExpand Up@@ -107,6 +108,7 @@ function createResponseFromOptions(options: void | Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-esm/src/client/ReactFlightDOMClientNode.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
 // For the Node.js client we only support a single-direction debug channel.
 debugChannel?: Readable,
};
Expand DownExpand Up@@ -116,6 +117,7 @@ function createFromNodeStream<T>(
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );

Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-parcel/src/client/ReactFlightDOMClientBrowser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,6 +132,7 @@ function createResponseFromOptions(options: void | Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand DownExpand Up@@ -209,6 +210,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
};

export function createFromReadableStream<T>(
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-parcel/src/client/ReactFlightDOMClientEdge.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
 // For the Edge client we only support a single-direction debug channel.
 debugChannel?: {readable?: ReadableStream, ...},
};
Expand DownExpand Up@@ -111,6 +112,7 @@ function createResponseFromOptions(options?: Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Fizz] Push halted await to the owner stack for late-arriving I/O info#35019

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.

 Sign up for GitHub

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

 Merged

unstubbable
merged 9 commits into

from

Nov 1, 2025
 Merged


[Fizz] Push halted await to the owner stack for late-arriving I/O info
#35019
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
64c896b

[Fizz] Push halted await to the owner stack for late-arriving I/O info


unstubbable Oct 30, 2025
ebc1668

Always prefer debug info from inner values of lazy nodes


unstubbable Oct 30, 2025
728d854

Fix `prerenderHTML` check


unstubbable Oct 30, 2025
65104ef

Add (debug) end time to Flight client


unstubbable Nov 1, 2025
81a7f26

Filter debug info when debug chunk resolves


unstubbable Oct 31, 2025
c11c2d7

Revert "Filter debug info when debug chunk resolves"


unstubbable Oct 31, 2025
b4b1ba0

Use `endTime` in test


unstubbable Nov 1, 2025
29093b5

Move debug info filtering to correct location


unstubbable Nov 1, 2025
bd8ae71

Remove `response` from `InitializationReference`


unstubbable Nov 1, 2025

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


105 changes: 79 additions & 26 deletions
packages/react-client/src/ReactFlightClient.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -367,6 +367,7 @@ type Response = {
 _debugRootStack?: null | Error, // DEV-only
 _debugRootTask?: null | ConsoleTask, // DEV-only
 _debugStartTime: number, // DEV-only
 _debugEndTime?: number, // DEV-only
 _debugIOStarted: boolean, // DEV-only
 _debugFindSourceMapURL?: void | FindSourceMapURLCallback, // DEV-only
 _debugChannel?: void | DebugChannel, // DEV-only
Expand DownExpand Up@@ -500,6 +501,34 @@ function createErrorChunk<T>(
 return new ReactPromise(ERRORED, null, error);
}

function filterDebugInfo(
 response: Response,
 value: {_debugInfo: ReactDebugInfo, ...},
) {
 if (response._debugEndTime === null) {
 // No end time was defined, so we keep all debug info entries.
 return;
 }

 // Remove any debug info entries that arrived after the defined end time.
 const relativeEndTime =
 response._debugEndTime -
 // $FlowFixMe[prop-missing]
 performance.timeOrigin;
 const debugInfo = [];
 for (let i = 0; i < value._debugInfo.length; i++) {
 const info = value._debugInfo[i];
 if (typeof info.time === 'number' && info.time > relativeEndTime) {
 break;
 }
 if (info.awaited != null && info.awaited.end > relativeEndTime) {
 break;
 }
 debugInfo.push(info);
 }
 value._debugInfo = debugInfo;
}

function moveDebugInfoFromChunkToInnerValue<T>(
 chunk: InitializedChunk<T> | InitializedStreamChunk<any>,
 value: T,
Expand DownExpand Up@@ -534,7 +563,17 @@ function moveDebugInfoFromChunkToInnerValue<T>(
 }
}

function processChunkDebugInfo<T>(
 response: Response,
 chunk: InitializedChunk<T> | InitializedStreamChunk<any>,
 value: T,
): void {
 filterDebugInfo(response, chunk);
 moveDebugInfoFromChunkToInnerValue(chunk, value);
}

function wakeChunk<T>(
 response: Response,
 listeners: Array<InitializationReference | (T => mixed)>,
 value: T,
 chunk: InitializedChunk<T>,
Expand All@@ -544,16 +583,17 @@ function wakeChunk<T>(
 if (typeof listener === 'function') {
 listener(value);
 } else {
 fulfillReference(listener, value, chunk);
 fulfillReference(response, listener, value, chunk);
 }
 }

 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(chunk, value);
processChunkDebugInfo(response, chunk, value);
 }
}

function rejectChunk(
 response: Response,
 listeners: Array<InitializationReference | (mixed => mixed)>,
 error: mixed,
): void {
Expand All@@ -562,7 +602,7 @@ function rejectChunk(
 if (typeof listener === 'function') {
 listener(error);
 } else {
 rejectReference(listener, error);
 rejectReference(response, listener.handler, error);
 }
 }
}
Expand DownExpand Up@@ -595,13 +635,14 @@ function resolveBlockedCycle<T>(
}

function wakeChunkIfInitialized<T>(
 response: Response,
 chunk: SomeChunk<T>,
 resolveListeners: Array<InitializationReference | (T => mixed)>,
 rejectListeners: null | Array<InitializationReference | (mixed => mixed)>,
): void {
 switch (chunk.status) {
 case INITIALIZED:
 wakeChunk(resolveListeners, chunk.value, chunk);
 wakeChunk(response, resolveListeners, chunk.value, chunk);
 break;
 case BLOCKED:
 // It is possible that we're blocked on our own chunk if it's a cycle.
Expand All@@ -615,7 +656,7 @@ function wakeChunkIfInitialized<T>(
 if (cyclicHandler !== null) {
 // This reference points back to this chunk. We can resolve the cycle by
 // using the value from that handler.
 fulfillReference(reference, cyclicHandler.value, chunk);
 fulfillReference(response, reference, cyclicHandler.value, chunk);
 resolveListeners.splice(i, 1);
 i--;
 if (rejectListeners !== null) {
Expand All@@ -629,14 +670,15 @@ function wakeChunkIfInitialized<T>(
 case INITIALIZED:
 const initializedChunk: InitializedChunk<T> = (chunk: any);
 wakeChunk(
 response,
 resolveListeners,
 initializedChunk.value,
 initializedChunk,
 );
 return;
 case ERRORED:
 if (rejectListeners !== null) {
 rejectChunk(rejectListeners, chunk.reason);
 rejectChunk(response, rejectListeners, chunk.reason);
 }
 return;
 }
Expand DownExpand Up@@ -666,7 +708,7 @@ function wakeChunkIfInitialized<T>(
 break;
 case ERRORED:
 if (rejectListeners) {
 rejectChunk(rejectListeners, chunk.reason);
 rejectChunk(response, rejectListeners, chunk.reason);
 }
 break;
 }
Expand DownExpand Up@@ -724,7 +766,7 @@ function triggerErrorOnChunk<T>(
 erroredChunk.status = ERRORED;
 erroredChunk.reason = error;
 if (listeners !== null) {
 rejectChunk(listeners, error);
 rejectChunk(response, listeners, error);
 }
}

Expand DownExpand Up@@ -832,7 +874,7 @@ function resolveModelChunk<T>(
 // longer be rendered or might not be the highest pri.
 initializeModelChunk(resolvedChunk);
 // The status might have changed after initialization.
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(response, chunk, resolveListeners, rejectListeners);
 }
}

Expand DownExpand Up@@ -861,12 +903,11 @@ function resolveModuleChunk<T>(
 }
 if (resolveListeners !== null) {
 initializeModuleChunk(resolvedChunk);
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(response, chunk, resolveListeners, rejectListeners);
 }
}

type InitializationReference = {
 response: Response, // TODO: Remove Response from here and pass it through instead.
 handler: InitializationHandler,
 parentObject: Object,
 key: string,
Expand DownExpand Up@@ -1005,7 +1046,7 @@ function initializeModelChunk<T>(chunk: ResolvedModelChunk<T>): void {
 if (typeof listener === 'function') {
 listener(value);
 } else {
 fulfillReference(listener, value, cyclicChunk);
 fulfillReference(response, listener, value, cyclicChunk);
 }
 }
 }
Expand All@@ -1026,7 +1067,7 @@ function initializeModelChunk<T>(chunk: ResolvedModelChunk<T>): void {
 initializedChunk.value = value;

 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, value);
processChunkDebugInfo(response, initializedChunk, value);
 }
 } catch (error) {
 const erroredChunk: ErroredChunk<T> = (chunk: any);
Expand DownExpand Up@@ -1413,11 +1454,12 @@ function getChunk(response: Response, id: number): SomeChunk<any> {
}

function fulfillReference(
 response: Response,
 reference: InitializationReference,
 value: any,
 fulfilledChunk: SomeChunk<any>,
): void {
 const {response, handler, parentObject, key, map, path} = reference;
 const {handler, parentObject, key, map, path} = reference;

 for (let i = 1; i < path.length; i++) {
 while (
Expand DownExpand Up@@ -1487,7 +1529,11 @@ function fulfillReference(
 return;
 }
 default: {
 rejectReference(reference, referencedChunk.reason);
 rejectReference(
 response,
 reference.handler,
 referencedChunk.reason,
 );
 return;
 }
 }
Expand DownExpand Up@@ -1585,21 +1631,20 @@ function fulfillReference(
 initializedChunk.value = handler.value;
 initializedChunk.reason = handler.reason; // Used by streaming chunks
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, handler.value, initializedChunk);
 wakeChunk(response, resolveListeners, handler.value, initializedChunk);
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, handler.value);
processChunkDebugInfo(response, initializedChunk, handler.value);
 }
 }
 }
}

function rejectReference(
 reference: InitializationReference,
 response: Response,
 handler: InitializationHandler,
 error: mixed,
): void {
 const {handler, response} = reference;

 if (handler.errored) {
 // We've already errored. We could instead build up an AggregateError
 // but if there are multiple errors we just take the first one like
Expand DownExpand Up@@ -1690,7 +1735,6 @@ function waitForReference<T>(
 }

 const reference: InitializationReference = {
 response,
 handler,
 parentObject,
 key,
Expand DownExpand Up@@ -1838,10 +1882,10 @@ function loadServerReference<A: Iterable<any>, T>(
 initializedChunk.status = INITIALIZED;
 initializedChunk.value = handler.value;
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, handler.value, initializedChunk);
 wakeChunk(response, resolveListeners, handler.value, initializedChunk);
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, handler.value);
processChunkDebugInfo(response, initializedChunk, handler.value);
 }
 }
 }
Expand DownExpand Up@@ -2578,6 +2622,7 @@ function ResponseInstance(
 replayConsole: boolean, // DEV-only
 environmentName: void | string, // DEV-only
 debugStartTime: void | number, // DEV-only
 debugEndTime: void | number, // DEV-only
 debugChannel: void | DebugChannel, // DEV-only
) {
 const chunks: Map<number, SomeChunk<any>> = new Map();
Expand DownExpand Up@@ -2645,6 +2690,7 @@ function ResponseInstance(
 // and is not considered I/O required to load the stream.
 setTimeout(markIOStarted.bind(this), 0);
 }
 this._debugEndTime = debugEndTime == null ? null : debugEndTime;
 this._debugFindSourceMapURL = findSourceMapURL;
 this._debugChannel = debugChannel;
 this._blockedConsole = null;
Expand DownExpand Up@@ -2688,6 +2734,7 @@ export function createResponse(
 replayConsole: boolean, // DEV-only
 environmentName: void | string, // DEV-only
 debugStartTime: void | number, // DEV-only
 debugEndTime: void | number, // DEV-only
 debugChannel: void | DebugChannel, // DEV-only
): WeakResponse {
 return getWeakResponse(
Expand All@@ -2704,6 +2751,7 @@ export function createResponse(
 replayConsole,
 environmentName,
 debugStartTime,
 debugEndTime,
 debugChannel,
 ),
 );
Expand DownExpand Up@@ -3075,10 +3123,10 @@ function resolveStream<T: ReadableStream | $AsyncIterable<any, any, void>>(
 resolvedChunk.value = stream;
 resolvedChunk.reason = controller;
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, chunk.value, (chunk: any));
 wakeChunk(response, resolveListeners, chunk.value, (chunk: any));
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(resolvedChunk, stream);
processChunkDebugInfo(response, resolvedChunk, stream);
 }
 }
}
Expand DownExpand Up@@ -3218,7 +3266,12 @@ function startAsyncIterable<T>(
 initializedChunk.status = INITIALIZED;
 initializedChunk.value = {done: false, value: value};
 if (resolveListeners !== null) {
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(
 response,
 chunk,
 resolveListeners,
 rejectListeners,
 );
 }
 }
 nextWriteIndex++;
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-esm/src/client/ReactFlightDOMClientBrowser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
};

function createDebugCallbackFromWritableStream(
Expand DownExpand Up@@ -107,6 +108,7 @@ function createResponseFromOptions(options: void | Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-esm/src/client/ReactFlightDOMClientNode.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
 // For the Node.js client we only support a single-direction debug channel.
 debugChannel?: Readable,
};
Expand DownExpand Up@@ -116,6 +117,7 @@ function createFromNodeStream<T>(
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );

Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-parcel/src/client/ReactFlightDOMClientBrowser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,6 +132,7 @@ function createResponseFromOptions(options: void | Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand DownExpand Up@@ -209,6 +210,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
};

export function createFromReadableStream<T>(
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-parcel/src/client/ReactFlightDOMClientEdge.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
 // For the Edge client we only support a single-direction debug channel.
 debugChannel?: {readable?: ReadableStream, ...},
};
Expand DownExpand Up@@ -111,6 +112,7 @@ function createResponseFromOptions(options?: Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Fizz] Push halted await to the owner stack for late-arriving I/O info#35019

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.

 Sign up for GitHub

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

 Merged

unstubbable
merged 9 commits into

from

Nov 1, 2025
 Merged


[Fizz] Push halted await to the owner stack for late-arriving I/O info
#35019
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
64c896b

[Fizz] Push halted await to the owner stack for late-arriving I/O info


unstubbable Oct 30, 2025
ebc1668

Always prefer debug info from inner values of lazy nodes


unstubbable Oct 30, 2025
728d854

Fix `prerenderHTML` check


unstubbable Oct 30, 2025
65104ef

Add (debug) end time to Flight client


unstubbable Nov 1, 2025
81a7f26

Filter debug info when debug chunk resolves


unstubbable Oct 31, 2025
c11c2d7

Revert "Filter debug info when debug chunk resolves"


unstubbable Oct 31, 2025
b4b1ba0

Use `endTime` in test


unstubbable Nov 1, 2025
29093b5

Move debug info filtering to correct location


unstubbable Nov 1, 2025
bd8ae71

Remove `response` from `InitializationReference`


unstubbable Nov 1, 2025

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


105 changes: 79 additions & 26 deletions
packages/react-client/src/ReactFlightClient.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -367,6 +367,7 @@ type Response = {
 _debugRootStack?: null | Error, // DEV-only
 _debugRootTask?: null | ConsoleTask, // DEV-only
 _debugStartTime: number, // DEV-only
 _debugEndTime?: number, // DEV-only
 _debugIOStarted: boolean, // DEV-only
 _debugFindSourceMapURL?: void | FindSourceMapURLCallback, // DEV-only
 _debugChannel?: void | DebugChannel, // DEV-only
Expand DownExpand Up@@ -500,6 +501,34 @@ function createErrorChunk<T>(
 return new ReactPromise(ERRORED, null, error);
}

function filterDebugInfo(
 response: Response,
 value: {_debugInfo: ReactDebugInfo, ...},
) {
 if (response._debugEndTime === null) {
 // No end time was defined, so we keep all debug info entries.
 return;
 }

 // Remove any debug info entries that arrived after the defined end time.
 const relativeEndTime =
 response._debugEndTime -
 // $FlowFixMe[prop-missing]
 performance.timeOrigin;
 const debugInfo = [];
 for (let i = 0; i < value._debugInfo.length; i++) {
 const info = value._debugInfo[i];
 if (typeof info.time === 'number' && info.time > relativeEndTime) {
 break;
 }
 if (info.awaited != null && info.awaited.end > relativeEndTime) {
 break;
 }
 debugInfo.push(info);
 }
 value._debugInfo = debugInfo;
}

function moveDebugInfoFromChunkToInnerValue<T>(
 chunk: InitializedChunk<T> | InitializedStreamChunk<any>,
 value: T,
Expand DownExpand Up@@ -534,7 +563,17 @@ function moveDebugInfoFromChunkToInnerValue<T>(
 }
}

function processChunkDebugInfo<T>(
 response: Response,
 chunk: InitializedChunk<T> | InitializedStreamChunk<any>,
 value: T,
): void {
 filterDebugInfo(response, chunk);
 moveDebugInfoFromChunkToInnerValue(chunk, value);
}

function wakeChunk<T>(
 response: Response,
 listeners: Array<InitializationReference | (T => mixed)>,
 value: T,
 chunk: InitializedChunk<T>,
Expand All@@ -544,16 +583,17 @@ function wakeChunk<T>(
 if (typeof listener === 'function') {
 listener(value);
 } else {
 fulfillReference(listener, value, chunk);
 fulfillReference(response, listener, value, chunk);
 }
 }

 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(chunk, value);
processChunkDebugInfo(response, chunk, value);
 }
}

function rejectChunk(
 response: Response,
 listeners: Array<InitializationReference | (mixed => mixed)>,
 error: mixed,
): void {
Expand All@@ -562,7 +602,7 @@ function rejectChunk(
 if (typeof listener === 'function') {
 listener(error);
 } else {
 rejectReference(listener, error);
 rejectReference(response, listener.handler, error);
 }
 }
}
Expand DownExpand Up@@ -595,13 +635,14 @@ function resolveBlockedCycle<T>(
}

function wakeChunkIfInitialized<T>(
 response: Response,
 chunk: SomeChunk<T>,
 resolveListeners: Array<InitializationReference | (T => mixed)>,
 rejectListeners: null | Array<InitializationReference | (mixed => mixed)>,
): void {
 switch (chunk.status) {
 case INITIALIZED:
 wakeChunk(resolveListeners, chunk.value, chunk);
 wakeChunk(response, resolveListeners, chunk.value, chunk);
 break;
 case BLOCKED:
 // It is possible that we're blocked on our own chunk if it's a cycle.
Expand All@@ -615,7 +656,7 @@ function wakeChunkIfInitialized<T>(
 if (cyclicHandler !== null) {
 // This reference points back to this chunk. We can resolve the cycle by
 // using the value from that handler.
 fulfillReference(reference, cyclicHandler.value, chunk);
 fulfillReference(response, reference, cyclicHandler.value, chunk);
 resolveListeners.splice(i, 1);
 i--;
 if (rejectListeners !== null) {
Expand All@@ -629,14 +670,15 @@ function wakeChunkIfInitialized<T>(
 case INITIALIZED:
 const initializedChunk: InitializedChunk<T> = (chunk: any);
 wakeChunk(
 response,
 resolveListeners,
 initializedChunk.value,
 initializedChunk,
 );
 return;
 case ERRORED:
 if (rejectListeners !== null) {
 rejectChunk(rejectListeners, chunk.reason);
 rejectChunk(response, rejectListeners, chunk.reason);
 }
 return;
 }
Expand DownExpand Up@@ -666,7 +708,7 @@ function wakeChunkIfInitialized<T>(
 break;
 case ERRORED:
 if (rejectListeners) {
 rejectChunk(rejectListeners, chunk.reason);
 rejectChunk(response, rejectListeners, chunk.reason);
 }
 break;
 }
Expand DownExpand Up@@ -724,7 +766,7 @@ function triggerErrorOnChunk<T>(
 erroredChunk.status = ERRORED;
 erroredChunk.reason = error;
 if (listeners !== null) {
 rejectChunk(listeners, error);
 rejectChunk(response, listeners, error);
 }
}

Expand DownExpand Up@@ -832,7 +874,7 @@ function resolveModelChunk<T>(
 // longer be rendered or might not be the highest pri.
 initializeModelChunk(resolvedChunk);
 // The status might have changed after initialization.
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(response, chunk, resolveListeners, rejectListeners);
 }
}

Expand DownExpand Up@@ -861,12 +903,11 @@ function resolveModuleChunk<T>(
 }
 if (resolveListeners !== null) {
 initializeModuleChunk(resolvedChunk);
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(response, chunk, resolveListeners, rejectListeners);
 }
}

type InitializationReference = {
 response: Response, // TODO: Remove Response from here and pass it through instead.
 handler: InitializationHandler,
 parentObject: Object,
 key: string,
Expand DownExpand Up@@ -1005,7 +1046,7 @@ function initializeModelChunk<T>(chunk: ResolvedModelChunk<T>): void {
 if (typeof listener === 'function') {
 listener(value);
 } else {
 fulfillReference(listener, value, cyclicChunk);
 fulfillReference(response, listener, value, cyclicChunk);
 }
 }
 }
Expand All@@ -1026,7 +1067,7 @@ function initializeModelChunk<T>(chunk: ResolvedModelChunk<T>): void {
 initializedChunk.value = value;

 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, value);
processChunkDebugInfo(response, initializedChunk, value);
 }
 } catch (error) {
 const erroredChunk: ErroredChunk<T> = (chunk: any);
Expand DownExpand Up@@ -1413,11 +1454,12 @@ function getChunk(response: Response, id: number): SomeChunk<any> {
}

function fulfillReference(
 response: Response,
 reference: InitializationReference,
 value: any,
 fulfilledChunk: SomeChunk<any>,
): void {
 const {response, handler, parentObject, key, map, path} = reference;
 const {handler, parentObject, key, map, path} = reference;

 for (let i = 1; i < path.length; i++) {
 while (
Expand DownExpand Up@@ -1487,7 +1529,11 @@ function fulfillReference(
 return;
 }
 default: {
 rejectReference(reference, referencedChunk.reason);
 rejectReference(
 response,
 reference.handler,
 referencedChunk.reason,
 );
 return;
 }
 }
Expand DownExpand Up@@ -1585,21 +1631,20 @@ function fulfillReference(
 initializedChunk.value = handler.value;
 initializedChunk.reason = handler.reason; // Used by streaming chunks
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, handler.value, initializedChunk);
 wakeChunk(response, resolveListeners, handler.value, initializedChunk);
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, handler.value);
processChunkDebugInfo(response, initializedChunk, handler.value);
 }
 }
 }
}

function rejectReference(
 reference: InitializationReference,
 response: Response,
 handler: InitializationHandler,
 error: mixed,
): void {
 const {handler, response} = reference;

 if (handler.errored) {
 // We've already errored. We could instead build up an AggregateError
 // but if there are multiple errors we just take the first one like
Expand DownExpand Up@@ -1690,7 +1735,6 @@ function waitForReference<T>(
 }

 const reference: InitializationReference = {
 response,
 handler,
 parentObject,
 key,
Expand DownExpand Up@@ -1838,10 +1882,10 @@ function loadServerReference<A: Iterable<any>, T>(
 initializedChunk.status = INITIALIZED;
 initializedChunk.value = handler.value;
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, handler.value, initializedChunk);
 wakeChunk(response, resolveListeners, handler.value, initializedChunk);
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, handler.value);
processChunkDebugInfo(response, initializedChunk, handler.value);
 }
 }
 }
Expand DownExpand Up@@ -2578,6 +2622,7 @@ function ResponseInstance(
 replayConsole: boolean, // DEV-only
 environmentName: void | string, // DEV-only
 debugStartTime: void | number, // DEV-only
 debugEndTime: void | number, // DEV-only
 debugChannel: void | DebugChannel, // DEV-only
) {
 const chunks: Map<number, SomeChunk<any>> = new Map();
Expand DownExpand Up@@ -2645,6 +2690,7 @@ function ResponseInstance(
 // and is not considered I/O required to load the stream.
 setTimeout(markIOStarted.bind(this), 0);
 }
 this._debugEndTime = debugEndTime == null ? null : debugEndTime;
 this._debugFindSourceMapURL = findSourceMapURL;
 this._debugChannel = debugChannel;
 this._blockedConsole = null;
Expand DownExpand Up@@ -2688,6 +2734,7 @@ export function createResponse(
 replayConsole: boolean, // DEV-only
 environmentName: void | string, // DEV-only
 debugStartTime: void | number, // DEV-only
 debugEndTime: void | number, // DEV-only
 debugChannel: void | DebugChannel, // DEV-only
): WeakResponse {
 return getWeakResponse(
Expand All@@ -2704,6 +2751,7 @@ export function createResponse(
 replayConsole,
 environmentName,
 debugStartTime,
 debugEndTime,
 debugChannel,
 ),
 );
Expand DownExpand Up@@ -3075,10 +3123,10 @@ function resolveStream<T: ReadableStream | $AsyncIterable<any, any, void>>(
 resolvedChunk.value = stream;
 resolvedChunk.reason = controller;
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, chunk.value, (chunk: any));
 wakeChunk(response, resolveListeners, chunk.value, (chunk: any));
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(resolvedChunk, stream);
processChunkDebugInfo(response, resolvedChunk, stream);
 }
 }
}
Expand DownExpand Up@@ -3218,7 +3266,12 @@ function startAsyncIterable<T>(
 initializedChunk.status = INITIALIZED;
 initializedChunk.value = {done: false, value: value};
 if (resolveListeners !== null) {
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(
 response,
 chunk,
 resolveListeners,
 rejectListeners,
 );
 }
 }
 nextWriteIndex++;
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-esm/src/client/ReactFlightDOMClientBrowser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
};

function createDebugCallbackFromWritableStream(
Expand DownExpand Up@@ -107,6 +108,7 @@ function createResponseFromOptions(options: void | Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-esm/src/client/ReactFlightDOMClientNode.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
 // For the Node.js client we only support a single-direction debug channel.
 debugChannel?: Readable,
};
Expand DownExpand Up@@ -116,6 +117,7 @@ function createFromNodeStream<T>(
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );

Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-parcel/src/client/ReactFlightDOMClientBrowser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,6 +132,7 @@ function createResponseFromOptions(options: void | Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand DownExpand Up@@ -209,6 +210,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
};

export function createFromReadableStream<T>(
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-parcel/src/client/ReactFlightDOMClientEdge.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
 // For the Edge client we only support a single-direction debug channel.
 debugChannel?: {readable?: ReadableStream, ...},
};
Expand DownExpand Up@@ -111,6 +112,7 @@ function createResponseFromOptions(options?: Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[Fizz] Push halted await to the owner stack for late-arriving I/O info#35019

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.

 Sign up for GitHub

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

 Merged

unstubbable
merged 9 commits into

from

Nov 1, 2025
 Merged


[Fizz] Push halted await to the owner stack for late-arriving I/O info
#35019
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
64c896b

[Fizz] Push halted await to the owner stack for late-arriving I/O info


unstubbable Oct 30, 2025
ebc1668

Always prefer debug info from inner values of lazy nodes


unstubbable Oct 30, 2025
728d854

Fix `prerenderHTML` check


unstubbable Oct 30, 2025
65104ef

Add (debug) end time to Flight client


unstubbable Nov 1, 2025
81a7f26

Filter debug info when debug chunk resolves


unstubbable Oct 31, 2025
c11c2d7

Revert "Filter debug info when debug chunk resolves"


unstubbable Oct 31, 2025
b4b1ba0

Use `endTime` in test


unstubbable Nov 1, 2025
29093b5

Move debug info filtering to correct location


unstubbable Nov 1, 2025
bd8ae71

Remove `response` from `InitializationReference`


unstubbable Nov 1, 2025

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


105 changes: 79 additions & 26 deletions
packages/react-client/src/ReactFlightClient.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -367,6 +367,7 @@ type Response = {
 _debugRootStack?: null | Error, // DEV-only
 _debugRootTask?: null | ConsoleTask, // DEV-only
 _debugStartTime: number, // DEV-only
 _debugEndTime?: number, // DEV-only
 _debugIOStarted: boolean, // DEV-only
 _debugFindSourceMapURL?: void | FindSourceMapURLCallback, // DEV-only
 _debugChannel?: void | DebugChannel, // DEV-only
Expand DownExpand Up@@ -500,6 +501,34 @@ function createErrorChunk<T>(
 return new ReactPromise(ERRORED, null, error);
}

function filterDebugInfo(
 response: Response,
 value: {_debugInfo: ReactDebugInfo, ...},
) {
 if (response._debugEndTime === null) {
 // No end time was defined, so we keep all debug info entries.
 return;
 }

 // Remove any debug info entries that arrived after the defined end time.
 const relativeEndTime =
 response._debugEndTime -
 // $FlowFixMe[prop-missing]
 performance.timeOrigin;
 const debugInfo = [];
 for (let i = 0; i < value._debugInfo.length; i++) {
 const info = value._debugInfo[i];
 if (typeof info.time === 'number' && info.time > relativeEndTime) {
 break;
 }
 if (info.awaited != null && info.awaited.end > relativeEndTime) {
 break;
 }
 debugInfo.push(info);
 }
 value._debugInfo = debugInfo;
}

function moveDebugInfoFromChunkToInnerValue<T>(
 chunk: InitializedChunk<T> | InitializedStreamChunk<any>,
 value: T,
Expand DownExpand Up@@ -534,7 +563,17 @@ function moveDebugInfoFromChunkToInnerValue<T>(
 }
}

function processChunkDebugInfo<T>(
 response: Response,
 chunk: InitializedChunk<T> | InitializedStreamChunk<any>,
 value: T,
): void {
 filterDebugInfo(response, chunk);
 moveDebugInfoFromChunkToInnerValue(chunk, value);
}

function wakeChunk<T>(
 response: Response,
 listeners: Array<InitializationReference | (T => mixed)>,
 value: T,
 chunk: InitializedChunk<T>,
Expand All@@ -544,16 +583,17 @@ function wakeChunk<T>(
 if (typeof listener === 'function') {
 listener(value);
 } else {
 fulfillReference(listener, value, chunk);
 fulfillReference(response, listener, value, chunk);
 }
 }

 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(chunk, value);
processChunkDebugInfo(response, chunk, value);
 }
}

function rejectChunk(
 response: Response,
 listeners: Array<InitializationReference | (mixed => mixed)>,
 error: mixed,
): void {
Expand All@@ -562,7 +602,7 @@ function rejectChunk(
 if (typeof listener === 'function') {
 listener(error);
 } else {
 rejectReference(listener, error);
 rejectReference(response, listener.handler, error);
 }
 }
}
Expand DownExpand Up@@ -595,13 +635,14 @@ function resolveBlockedCycle<T>(
}

function wakeChunkIfInitialized<T>(
 response: Response,
 chunk: SomeChunk<T>,
 resolveListeners: Array<InitializationReference | (T => mixed)>,
 rejectListeners: null | Array<InitializationReference | (mixed => mixed)>,
): void {
 switch (chunk.status) {
 case INITIALIZED:
 wakeChunk(resolveListeners, chunk.value, chunk);
 wakeChunk(response, resolveListeners, chunk.value, chunk);
 break;
 case BLOCKED:
 // It is possible that we're blocked on our own chunk if it's a cycle.
Expand All@@ -615,7 +656,7 @@ function wakeChunkIfInitialized<T>(
 if (cyclicHandler !== null) {
 // This reference points back to this chunk. We can resolve the cycle by
 // using the value from that handler.
 fulfillReference(reference, cyclicHandler.value, chunk);
 fulfillReference(response, reference, cyclicHandler.value, chunk);
 resolveListeners.splice(i, 1);
 i--;
 if (rejectListeners !== null) {
Expand All@@ -629,14 +670,15 @@ function wakeChunkIfInitialized<T>(
 case INITIALIZED:
 const initializedChunk: InitializedChunk<T> = (chunk: any);
 wakeChunk(
 response,
 resolveListeners,
 initializedChunk.value,
 initializedChunk,
 );
 return;
 case ERRORED:
 if (rejectListeners !== null) {
 rejectChunk(rejectListeners, chunk.reason);
 rejectChunk(response, rejectListeners, chunk.reason);
 }
 return;
 }
Expand DownExpand Up@@ -666,7 +708,7 @@ function wakeChunkIfInitialized<T>(
 break;
 case ERRORED:
 if (rejectListeners) {
 rejectChunk(rejectListeners, chunk.reason);
 rejectChunk(response, rejectListeners, chunk.reason);
 }
 break;
 }
Expand DownExpand Up@@ -724,7 +766,7 @@ function triggerErrorOnChunk<T>(
 erroredChunk.status = ERRORED;
 erroredChunk.reason = error;
 if (listeners !== null) {
 rejectChunk(listeners, error);
 rejectChunk(response, listeners, error);
 }
}

Expand DownExpand Up@@ -832,7 +874,7 @@ function resolveModelChunk<T>(
 // longer be rendered or might not be the highest pri.
 initializeModelChunk(resolvedChunk);
 // The status might have changed after initialization.
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(response, chunk, resolveListeners, rejectListeners);
 }
}

Expand DownExpand Up@@ -861,12 +903,11 @@ function resolveModuleChunk<T>(
 }
 if (resolveListeners !== null) {
 initializeModuleChunk(resolvedChunk);
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(response, chunk, resolveListeners, rejectListeners);
 }
}

type InitializationReference = {
 response: Response, // TODO: Remove Response from here and pass it through instead.
 handler: InitializationHandler,
 parentObject: Object,
 key: string,
Expand DownExpand Up@@ -1005,7 +1046,7 @@ function initializeModelChunk<T>(chunk: ResolvedModelChunk<T>): void {
 if (typeof listener === 'function') {
 listener(value);
 } else {
 fulfillReference(listener, value, cyclicChunk);
 fulfillReference(response, listener, value, cyclicChunk);
 }
 }
 }
Expand All@@ -1026,7 +1067,7 @@ function initializeModelChunk<T>(chunk: ResolvedModelChunk<T>): void {
 initializedChunk.value = value;

 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, value);
processChunkDebugInfo(response, initializedChunk, value);
 }
 } catch (error) {
 const erroredChunk: ErroredChunk<T> = (chunk: any);
Expand DownExpand Up@@ -1413,11 +1454,12 @@ function getChunk(response: Response, id: number): SomeChunk<any> {
}

function fulfillReference(
 response: Response,
 reference: InitializationReference,
 value: any,
 fulfilledChunk: SomeChunk<any>,
): void {
 const {response, handler, parentObject, key, map, path} = reference;
 const {handler, parentObject, key, map, path} = reference;

 for (let i = 1; i < path.length; i++) {
 while (
Expand DownExpand Up@@ -1487,7 +1529,11 @@ function fulfillReference(
 return;
 }
 default: {
 rejectReference(reference, referencedChunk.reason);
 rejectReference(
 response,
 reference.handler,
 referencedChunk.reason,
 );
 return;
 }
 }
Expand DownExpand Up@@ -1585,21 +1631,20 @@ function fulfillReference(
 initializedChunk.value = handler.value;
 initializedChunk.reason = handler.reason; // Used by streaming chunks
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, handler.value, initializedChunk);
 wakeChunk(response, resolveListeners, handler.value, initializedChunk);
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, handler.value);
processChunkDebugInfo(response, initializedChunk, handler.value);
 }
 }
 }
}

function rejectReference(
 reference: InitializationReference,
 response: Response,
 handler: InitializationHandler,
 error: mixed,
): void {
 const {handler, response} = reference;

 if (handler.errored) {
 // We've already errored. We could instead build up an AggregateError
 // but if there are multiple errors we just take the first one like
Expand DownExpand Up@@ -1690,7 +1735,6 @@ function waitForReference<T>(
 }

 const reference: InitializationReference = {
 response,
 handler,
 parentObject,
 key,
Expand DownExpand Up@@ -1838,10 +1882,10 @@ function loadServerReference<A: Iterable<any>, T>(
 initializedChunk.status = INITIALIZED;
 initializedChunk.value = handler.value;
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, handler.value, initializedChunk);
 wakeChunk(response, resolveListeners, handler.value, initializedChunk);
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, handler.value);
processChunkDebugInfo(response, initializedChunk, handler.value);
 }
 }
 }
Expand DownExpand Up@@ -2578,6 +2622,7 @@ function ResponseInstance(
 replayConsole: boolean, // DEV-only
 environmentName: void | string, // DEV-only
 debugStartTime: void | number, // DEV-only
 debugEndTime: void | number, // DEV-only
 debugChannel: void | DebugChannel, // DEV-only
) {
 const chunks: Map<number, SomeChunk<any>> = new Map();
Expand DownExpand Up@@ -2645,6 +2690,7 @@ function ResponseInstance(
 // and is not considered I/O required to load the stream.
 setTimeout(markIOStarted.bind(this), 0);
 }
 this._debugEndTime = debugEndTime == null ? null : debugEndTime;
 this._debugFindSourceMapURL = findSourceMapURL;
 this._debugChannel = debugChannel;
 this._blockedConsole = null;
Expand DownExpand Up@@ -2688,6 +2734,7 @@ export function createResponse(
 replayConsole: boolean, // DEV-only
 environmentName: void | string, // DEV-only
 debugStartTime: void | number, // DEV-only
 debugEndTime: void | number, // DEV-only
 debugChannel: void | DebugChannel, // DEV-only
): WeakResponse {
 return getWeakResponse(
Expand All@@ -2704,6 +2751,7 @@ export function createResponse(
 replayConsole,
 environmentName,
 debugStartTime,
 debugEndTime,
 debugChannel,
 ),
 );
Expand DownExpand Up@@ -3075,10 +3123,10 @@ function resolveStream<T: ReadableStream | $AsyncIterable<any, any, void>>(
 resolvedChunk.value = stream;
 resolvedChunk.reason = controller;
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, chunk.value, (chunk: any));
 wakeChunk(response, resolveListeners, chunk.value, (chunk: any));
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(resolvedChunk, stream);
processChunkDebugInfo(response, resolvedChunk, stream);
 }
 }
}
Expand DownExpand Up@@ -3218,7 +3266,12 @@ function startAsyncIterable<T>(
 initializedChunk.status = INITIALIZED;
 initializedChunk.value = {done: false, value: value};
 if (resolveListeners !== null) {
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(
 response,
 chunk,
 resolveListeners,
 rejectListeners,
 );
 }
 }
 nextWriteIndex++;
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-esm/src/client/ReactFlightDOMClientBrowser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
};

function createDebugCallbackFromWritableStream(
Expand DownExpand Up@@ -107,6 +108,7 @@ function createResponseFromOptions(options: void | Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-esm/src/client/ReactFlightDOMClientNode.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
 // For the Node.js client we only support a single-direction debug channel.
 debugChannel?: Readable,
};
Expand DownExpand Up@@ -116,6 +117,7 @@ function createFromNodeStream<T>(
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );

Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-parcel/src/client/ReactFlightDOMClientBrowser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,6 +132,7 @@ function createResponseFromOptions(options: void | Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand DownExpand Up@@ -209,6 +210,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
};

export function createFromReadableStream<T>(
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-parcel/src/client/ReactFlightDOMClientEdge.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
 // For the Edge client we only support a single-direction debug channel.
 debugChannel?: {readable?: ReadableStream, ...},
};
Expand DownExpand Up@@ -111,6 +112,7 @@ function createResponseFromOptions(options?: Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Fizz] Push halted await to the owner stack for late-arriving I/O info#35019

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.

 Sign up for GitHub

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

 Merged

unstubbable
merged 9 commits into

from

Nov 1, 2025
 Merged


[Fizz] Push halted await to the owner stack for late-arriving I/O info
#35019
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
64c896b

[Fizz] Push halted await to the owner stack for late-arriving I/O info


unstubbable Oct 30, 2025
ebc1668

Always prefer debug info from inner values of lazy nodes


unstubbable Oct 30, 2025
728d854

Fix `prerenderHTML` check


unstubbable Oct 30, 2025
65104ef

Add (debug) end time to Flight client


unstubbable Nov 1, 2025
81a7f26

Filter debug info when debug chunk resolves


unstubbable Oct 31, 2025
c11c2d7

Revert "Filter debug info when debug chunk resolves"


unstubbable Oct 31, 2025
b4b1ba0

Use `endTime` in test


unstubbable Nov 1, 2025
29093b5

Move debug info filtering to correct location


unstubbable Nov 1, 2025
bd8ae71

Remove `response` from `InitializationReference`


unstubbable Nov 1, 2025

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


105 changes: 79 additions & 26 deletions
packages/react-client/src/ReactFlightClient.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -367,6 +367,7 @@ type Response = {
 _debugRootStack?: null | Error, // DEV-only
 _debugRootTask?: null | ConsoleTask, // DEV-only
 _debugStartTime: number, // DEV-only
 _debugEndTime?: number, // DEV-only
 _debugIOStarted: boolean, // DEV-only
 _debugFindSourceMapURL?: void | FindSourceMapURLCallback, // DEV-only
 _debugChannel?: void | DebugChannel, // DEV-only
Expand DownExpand Up@@ -500,6 +501,34 @@ function createErrorChunk<T>(
 return new ReactPromise(ERRORED, null, error);
}

function filterDebugInfo(
 response: Response,
 value: {_debugInfo: ReactDebugInfo, ...},
) {
 if (response._debugEndTime === null) {
 // No end time was defined, so we keep all debug info entries.
 return;
 }

 // Remove any debug info entries that arrived after the defined end time.
 const relativeEndTime =
 response._debugEndTime -
 // $FlowFixMe[prop-missing]
 performance.timeOrigin;
 const debugInfo = [];
 for (let i = 0; i < value._debugInfo.length; i++) {
 const info = value._debugInfo[i];
 if (typeof info.time === 'number' && info.time > relativeEndTime) {
 break;
 }
 if (info.awaited != null && info.awaited.end > relativeEndTime) {
 break;
 }
 debugInfo.push(info);
 }
 value._debugInfo = debugInfo;
}

function moveDebugInfoFromChunkToInnerValue<T>(
 chunk: InitializedChunk<T> | InitializedStreamChunk<any>,
 value: T,
Expand DownExpand Up@@ -534,7 +563,17 @@ function moveDebugInfoFromChunkToInnerValue<T>(
 }
}

function processChunkDebugInfo<T>(
 response: Response,
 chunk: InitializedChunk<T> | InitializedStreamChunk<any>,
 value: T,
): void {
 filterDebugInfo(response, chunk);
 moveDebugInfoFromChunkToInnerValue(chunk, value);
}

function wakeChunk<T>(
 response: Response,
 listeners: Array<InitializationReference | (T => mixed)>,
 value: T,
 chunk: InitializedChunk<T>,
Expand All@@ -544,16 +583,17 @@ function wakeChunk<T>(
 if (typeof listener === 'function') {
 listener(value);
 } else {
 fulfillReference(listener, value, chunk);
 fulfillReference(response, listener, value, chunk);
 }
 }

 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(chunk, value);
processChunkDebugInfo(response, chunk, value);
 }
}

function rejectChunk(
 response: Response,
 listeners: Array<InitializationReference | (mixed => mixed)>,
 error: mixed,
): void {
Expand All@@ -562,7 +602,7 @@ function rejectChunk(
 if (typeof listener === 'function') {
 listener(error);
 } else {
 rejectReference(listener, error);
 rejectReference(response, listener.handler, error);
 }
 }
}
Expand DownExpand Up@@ -595,13 +635,14 @@ function resolveBlockedCycle<T>(
}

function wakeChunkIfInitialized<T>(
 response: Response,
 chunk: SomeChunk<T>,
 resolveListeners: Array<InitializationReference | (T => mixed)>,
 rejectListeners: null | Array<InitializationReference | (mixed => mixed)>,
): void {
 switch (chunk.status) {
 case INITIALIZED:
 wakeChunk(resolveListeners, chunk.value, chunk);
 wakeChunk(response, resolveListeners, chunk.value, chunk);
 break;
 case BLOCKED:
 // It is possible that we're blocked on our own chunk if it's a cycle.
Expand All@@ -615,7 +656,7 @@ function wakeChunkIfInitialized<T>(
 if (cyclicHandler !== null) {
 // This reference points back to this chunk. We can resolve the cycle by
 // using the value from that handler.
 fulfillReference(reference, cyclicHandler.value, chunk);
 fulfillReference(response, reference, cyclicHandler.value, chunk);
 resolveListeners.splice(i, 1);
 i--;
 if (rejectListeners !== null) {
Expand All@@ -629,14 +670,15 @@ function wakeChunkIfInitialized<T>(
 case INITIALIZED:
 const initializedChunk: InitializedChunk<T> = (chunk: any);
 wakeChunk(
 response,
 resolveListeners,
 initializedChunk.value,
 initializedChunk,
 );
 return;
 case ERRORED:
 if (rejectListeners !== null) {
 rejectChunk(rejectListeners, chunk.reason);
 rejectChunk(response, rejectListeners, chunk.reason);
 }
 return;
 }
Expand DownExpand Up@@ -666,7 +708,7 @@ function wakeChunkIfInitialized<T>(
 break;
 case ERRORED:
 if (rejectListeners) {
 rejectChunk(rejectListeners, chunk.reason);
 rejectChunk(response, rejectListeners, chunk.reason);
 }
 break;
 }
Expand DownExpand Up@@ -724,7 +766,7 @@ function triggerErrorOnChunk<T>(
 erroredChunk.status = ERRORED;
 erroredChunk.reason = error;
 if (listeners !== null) {
 rejectChunk(listeners, error);
 rejectChunk(response, listeners, error);
 }
}

Expand DownExpand Up@@ -832,7 +874,7 @@ function resolveModelChunk<T>(
 // longer be rendered or might not be the highest pri.
 initializeModelChunk(resolvedChunk);
 // The status might have changed after initialization.
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(response, chunk, resolveListeners, rejectListeners);
 }
}

Expand DownExpand Up@@ -861,12 +903,11 @@ function resolveModuleChunk<T>(
 }
 if (resolveListeners !== null) {
 initializeModuleChunk(resolvedChunk);
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(response, chunk, resolveListeners, rejectListeners);
 }
}

type InitializationReference = {
 response: Response, // TODO: Remove Response from here and pass it through instead.
 handler: InitializationHandler,
 parentObject: Object,
 key: string,
Expand DownExpand Up@@ -1005,7 +1046,7 @@ function initializeModelChunk<T>(chunk: ResolvedModelChunk<T>): void {
 if (typeof listener === 'function') {
 listener(value);
 } else {
 fulfillReference(listener, value, cyclicChunk);
 fulfillReference(response, listener, value, cyclicChunk);
 }
 }
 }
Expand All@@ -1026,7 +1067,7 @@ function initializeModelChunk<T>(chunk: ResolvedModelChunk<T>): void {
 initializedChunk.value = value;

 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, value);
processChunkDebugInfo(response, initializedChunk, value);
 }
 } catch (error) {
 const erroredChunk: ErroredChunk<T> = (chunk: any);
Expand DownExpand Up@@ -1413,11 +1454,12 @@ function getChunk(response: Response, id: number): SomeChunk<any> {
}

function fulfillReference(
 response: Response,
 reference: InitializationReference,
 value: any,
 fulfilledChunk: SomeChunk<any>,
): void {
 const {response, handler, parentObject, key, map, path} = reference;
 const {handler, parentObject, key, map, path} = reference;

 for (let i = 1; i < path.length; i++) {
 while (
Expand DownExpand Up@@ -1487,7 +1529,11 @@ function fulfillReference(
 return;
 }
 default: {
 rejectReference(reference, referencedChunk.reason);
 rejectReference(
 response,
 reference.handler,
 referencedChunk.reason,
 );
 return;
 }
 }
Expand DownExpand Up@@ -1585,21 +1631,20 @@ function fulfillReference(
 initializedChunk.value = handler.value;
 initializedChunk.reason = handler.reason; // Used by streaming chunks
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, handler.value, initializedChunk);
 wakeChunk(response, resolveListeners, handler.value, initializedChunk);
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, handler.value);
processChunkDebugInfo(response, initializedChunk, handler.value);
 }
 }
 }
}

function rejectReference(
 reference: InitializationReference,
 response: Response,
 handler: InitializationHandler,
 error: mixed,
): void {
 const {handler, response} = reference;

 if (handler.errored) {
 // We've already errored. We could instead build up an AggregateError
 // but if there are multiple errors we just take the first one like
Expand DownExpand Up@@ -1690,7 +1735,6 @@ function waitForReference<T>(
 }

 const reference: InitializationReference = {
 response,
 handler,
 parentObject,
 key,
Expand DownExpand Up@@ -1838,10 +1882,10 @@ function loadServerReference<A: Iterable<any>, T>(
 initializedChunk.status = INITIALIZED;
 initializedChunk.value = handler.value;
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, handler.value, initializedChunk);
 wakeChunk(response, resolveListeners, handler.value, initializedChunk);
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, handler.value);
processChunkDebugInfo(response, initializedChunk, handler.value);
 }
 }
 }
Expand DownExpand Up@@ -2578,6 +2622,7 @@ function ResponseInstance(
 replayConsole: boolean, // DEV-only
 environmentName: void | string, // DEV-only
 debugStartTime: void | number, // DEV-only
 debugEndTime: void | number, // DEV-only
 debugChannel: void | DebugChannel, // DEV-only
) {
 const chunks: Map<number, SomeChunk<any>> = new Map();
Expand DownExpand Up@@ -2645,6 +2690,7 @@ function ResponseInstance(
 // and is not considered I/O required to load the stream.
 setTimeout(markIOStarted.bind(this), 0);
 }
 this._debugEndTime = debugEndTime == null ? null : debugEndTime;
 this._debugFindSourceMapURL = findSourceMapURL;
 this._debugChannel = debugChannel;
 this._blockedConsole = null;
Expand DownExpand Up@@ -2688,6 +2734,7 @@ export function createResponse(
 replayConsole: boolean, // DEV-only
 environmentName: void | string, // DEV-only
 debugStartTime: void | number, // DEV-only
 debugEndTime: void | number, // DEV-only
 debugChannel: void | DebugChannel, // DEV-only
): WeakResponse {
 return getWeakResponse(
Expand All@@ -2704,6 +2751,7 @@ export function createResponse(
 replayConsole,
 environmentName,
 debugStartTime,
 debugEndTime,
 debugChannel,
 ),
 );
Expand DownExpand Up@@ -3075,10 +3123,10 @@ function resolveStream<T: ReadableStream | $AsyncIterable<any, any, void>>(
 resolvedChunk.value = stream;
 resolvedChunk.reason = controller;
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, chunk.value, (chunk: any));
 wakeChunk(response, resolveListeners, chunk.value, (chunk: any));
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(resolvedChunk, stream);
processChunkDebugInfo(response, resolvedChunk, stream);
 }
 }
}
Expand DownExpand Up@@ -3218,7 +3266,12 @@ function startAsyncIterable<T>(
 initializedChunk.status = INITIALIZED;
 initializedChunk.value = {done: false, value: value};
 if (resolveListeners !== null) {
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(
 response,
 chunk,
 resolveListeners,
 rejectListeners,
 );
 }
 }
 nextWriteIndex++;
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-esm/src/client/ReactFlightDOMClientBrowser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
};

function createDebugCallbackFromWritableStream(
Expand DownExpand Up@@ -107,6 +108,7 @@ function createResponseFromOptions(options: void | Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-esm/src/client/ReactFlightDOMClientNode.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
 // For the Node.js client we only support a single-direction debug channel.
 debugChannel?: Readable,
};
Expand DownExpand Up@@ -116,6 +117,7 @@ function createFromNodeStream<T>(
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );

Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-parcel/src/client/ReactFlightDOMClientBrowser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,6 +132,7 @@ function createResponseFromOptions(options: void | Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand DownExpand Up@@ -209,6 +210,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
};

export function createFromReadableStream<T>(
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-parcel/src/client/ReactFlightDOMClientEdge.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
 // For the Edge client we only support a single-direction debug channel.
 debugChannel?: {readable?: ReadableStream, ...},
};
Expand DownExpand Up@@ -111,6 +112,7 @@ function createResponseFromOptions(options?: Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Fizz] Push halted await to the owner stack for late-arriving I/O info#35019

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.

 Sign up for GitHub

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

 Merged

unstubbable
merged 9 commits into

from

Nov 1, 2025
 Merged


[Fizz] Push halted await to the owner stack for late-arriving I/O info
#35019
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
64c896b

[Fizz] Push halted await to the owner stack for late-arriving I/O info


unstubbable Oct 30, 2025
ebc1668

Always prefer debug info from inner values of lazy nodes


unstubbable Oct 30, 2025
728d854

Fix `prerenderHTML` check


unstubbable Oct 30, 2025
65104ef

Add (debug) end time to Flight client


unstubbable Nov 1, 2025
81a7f26

Filter debug info when debug chunk resolves


unstubbable Oct 31, 2025
c11c2d7

Revert "Filter debug info when debug chunk resolves"


unstubbable Oct 31, 2025
b4b1ba0

Use `endTime` in test


unstubbable Nov 1, 2025
29093b5

Move debug info filtering to correct location


unstubbable Nov 1, 2025
bd8ae71

Remove `response` from `InitializationReference`


unstubbable Nov 1, 2025

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


105 changes: 79 additions & 26 deletions
packages/react-client/src/ReactFlightClient.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -367,6 +367,7 @@ type Response = {
 _debugRootStack?: null | Error, // DEV-only
 _debugRootTask?: null | ConsoleTask, // DEV-only
 _debugStartTime: number, // DEV-only
 _debugEndTime?: number, // DEV-only
 _debugIOStarted: boolean, // DEV-only
 _debugFindSourceMapURL?: void | FindSourceMapURLCallback, // DEV-only
 _debugChannel?: void | DebugChannel, // DEV-only
Expand DownExpand Up@@ -500,6 +501,34 @@ function createErrorChunk<T>(
 return new ReactPromise(ERRORED, null, error);
}

function filterDebugInfo(
 response: Response,
 value: {_debugInfo: ReactDebugInfo, ...},
) {
 if (response._debugEndTime === null) {
 // No end time was defined, so we keep all debug info entries.
 return;
 }

 // Remove any debug info entries that arrived after the defined end time.
 const relativeEndTime =
 response._debugEndTime -
 // $FlowFixMe[prop-missing]
 performance.timeOrigin;
 const debugInfo = [];
 for (let i = 0; i < value._debugInfo.length; i++) {
 const info = value._debugInfo[i];
 if (typeof info.time === 'number' && info.time > relativeEndTime) {
 break;
 }
 if (info.awaited != null && info.awaited.end > relativeEndTime) {
 break;
 }
 debugInfo.push(info);
 }
 value._debugInfo = debugInfo;
}

function moveDebugInfoFromChunkToInnerValue<T>(
 chunk: InitializedChunk<T> | InitializedStreamChunk<any>,
 value: T,
Expand DownExpand Up@@ -534,7 +563,17 @@ function moveDebugInfoFromChunkToInnerValue<T>(
 }
}

function processChunkDebugInfo<T>(
 response: Response,
 chunk: InitializedChunk<T> | InitializedStreamChunk<any>,
 value: T,
): void {
 filterDebugInfo(response, chunk);
 moveDebugInfoFromChunkToInnerValue(chunk, value);
}

function wakeChunk<T>(
 response: Response,
 listeners: Array<InitializationReference | (T => mixed)>,
 value: T,
 chunk: InitializedChunk<T>,
Expand All@@ -544,16 +583,17 @@ function wakeChunk<T>(
 if (typeof listener === 'function') {
 listener(value);
 } else {
 fulfillReference(listener, value, chunk);
 fulfillReference(response, listener, value, chunk);
 }
 }

 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(chunk, value);
processChunkDebugInfo(response, chunk, value);
 }
}

function rejectChunk(
 response: Response,
 listeners: Array<InitializationReference | (mixed => mixed)>,
 error: mixed,
): void {
Expand All@@ -562,7 +602,7 @@ function rejectChunk(
 if (typeof listener === 'function') {
 listener(error);
 } else {
 rejectReference(listener, error);
 rejectReference(response, listener.handler, error);
 }
 }
}
Expand DownExpand Up@@ -595,13 +635,14 @@ function resolveBlockedCycle<T>(
}

function wakeChunkIfInitialized<T>(
 response: Response,
 chunk: SomeChunk<T>,
 resolveListeners: Array<InitializationReference | (T => mixed)>,
 rejectListeners: null | Array<InitializationReference | (mixed => mixed)>,
): void {
 switch (chunk.status) {
 case INITIALIZED:
 wakeChunk(resolveListeners, chunk.value, chunk);
 wakeChunk(response, resolveListeners, chunk.value, chunk);
 break;
 case BLOCKED:
 // It is possible that we're blocked on our own chunk if it's a cycle.
Expand All@@ -615,7 +656,7 @@ function wakeChunkIfInitialized<T>(
 if (cyclicHandler !== null) {
 // This reference points back to this chunk. We can resolve the cycle by
 // using the value from that handler.
 fulfillReference(reference, cyclicHandler.value, chunk);
 fulfillReference(response, reference, cyclicHandler.value, chunk);
 resolveListeners.splice(i, 1);
 i--;
 if (rejectListeners !== null) {
Expand All@@ -629,14 +670,15 @@ function wakeChunkIfInitialized<T>(
 case INITIALIZED:
 const initializedChunk: InitializedChunk<T> = (chunk: any);
 wakeChunk(
 response,
 resolveListeners,
 initializedChunk.value,
 initializedChunk,
 );
 return;
 case ERRORED:
 if (rejectListeners !== null) {
 rejectChunk(rejectListeners, chunk.reason);
 rejectChunk(response, rejectListeners, chunk.reason);
 }
 return;
 }
Expand DownExpand Up@@ -666,7 +708,7 @@ function wakeChunkIfInitialized<T>(
 break;
 case ERRORED:
 if (rejectListeners) {
 rejectChunk(rejectListeners, chunk.reason);
 rejectChunk(response, rejectListeners, chunk.reason);
 }
 break;
 }
Expand DownExpand Up@@ -724,7 +766,7 @@ function triggerErrorOnChunk<T>(
 erroredChunk.status = ERRORED;
 erroredChunk.reason = error;
 if (listeners !== null) {
 rejectChunk(listeners, error);
 rejectChunk(response, listeners, error);
 }
}

Expand DownExpand Up@@ -832,7 +874,7 @@ function resolveModelChunk<T>(
 // longer be rendered or might not be the highest pri.
 initializeModelChunk(resolvedChunk);
 // The status might have changed after initialization.
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(response, chunk, resolveListeners, rejectListeners);
 }
}

Expand DownExpand Up@@ -861,12 +903,11 @@ function resolveModuleChunk<T>(
 }
 if (resolveListeners !== null) {
 initializeModuleChunk(resolvedChunk);
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(response, chunk, resolveListeners, rejectListeners);
 }
}

type InitializationReference = {
 response: Response, // TODO: Remove Response from here and pass it through instead.
 handler: InitializationHandler,
 parentObject: Object,
 key: string,
Expand DownExpand Up@@ -1005,7 +1046,7 @@ function initializeModelChunk<T>(chunk: ResolvedModelChunk<T>): void {
 if (typeof listener === 'function') {
 listener(value);
 } else {
 fulfillReference(listener, value, cyclicChunk);
 fulfillReference(response, listener, value, cyclicChunk);
 }
 }
 }
Expand All@@ -1026,7 +1067,7 @@ function initializeModelChunk<T>(chunk: ResolvedModelChunk<T>): void {
 initializedChunk.value = value;

 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, value);
processChunkDebugInfo(response, initializedChunk, value);
 }
 } catch (error) {
 const erroredChunk: ErroredChunk<T> = (chunk: any);
Expand DownExpand Up@@ -1413,11 +1454,12 @@ function getChunk(response: Response, id: number): SomeChunk<any> {
}

function fulfillReference(
 response: Response,
 reference: InitializationReference,
 value: any,
 fulfilledChunk: SomeChunk<any>,
): void {
 const {response, handler, parentObject, key, map, path} = reference;
 const {handler, parentObject, key, map, path} = reference;

 for (let i = 1; i < path.length; i++) {
 while (
Expand DownExpand Up@@ -1487,7 +1529,11 @@ function fulfillReference(
 return;
 }
 default: {
 rejectReference(reference, referencedChunk.reason);
 rejectReference(
 response,
 reference.handler,
 referencedChunk.reason,
 );
 return;
 }
 }
Expand DownExpand Up@@ -1585,21 +1631,20 @@ function fulfillReference(
 initializedChunk.value = handler.value;
 initializedChunk.reason = handler.reason; // Used by streaming chunks
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, handler.value, initializedChunk);
 wakeChunk(response, resolveListeners, handler.value, initializedChunk);
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, handler.value);
processChunkDebugInfo(response, initializedChunk, handler.value);
 }
 }
 }
}

function rejectReference(
 reference: InitializationReference,
 response: Response,
 handler: InitializationHandler,
 error: mixed,
): void {
 const {handler, response} = reference;

 if (handler.errored) {
 // We've already errored. We could instead build up an AggregateError
 // but if there are multiple errors we just take the first one like
Expand DownExpand Up@@ -1690,7 +1735,6 @@ function waitForReference<T>(
 }

 const reference: InitializationReference = {
 response,
 handler,
 parentObject,
 key,
Expand DownExpand Up@@ -1838,10 +1882,10 @@ function loadServerReference<A: Iterable<any>, T>(
 initializedChunk.status = INITIALIZED;
 initializedChunk.value = handler.value;
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, handler.value, initializedChunk);
 wakeChunk(response, resolveListeners, handler.value, initializedChunk);
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, handler.value);
processChunkDebugInfo(response, initializedChunk, handler.value);
 }
 }
 }
Expand DownExpand Up@@ -2578,6 +2622,7 @@ function ResponseInstance(
 replayConsole: boolean, // DEV-only
 environmentName: void | string, // DEV-only
 debugStartTime: void | number, // DEV-only
 debugEndTime: void | number, // DEV-only
 debugChannel: void | DebugChannel, // DEV-only
) {
 const chunks: Map<number, SomeChunk<any>> = new Map();
Expand DownExpand Up@@ -2645,6 +2690,7 @@ function ResponseInstance(
 // and is not considered I/O required to load the stream.
 setTimeout(markIOStarted.bind(this), 0);
 }
 this._debugEndTime = debugEndTime == null ? null : debugEndTime;
 this._debugFindSourceMapURL = findSourceMapURL;
 this._debugChannel = debugChannel;
 this._blockedConsole = null;
Expand DownExpand Up@@ -2688,6 +2734,7 @@ export function createResponse(
 replayConsole: boolean, // DEV-only
 environmentName: void | string, // DEV-only
 debugStartTime: void | number, // DEV-only
 debugEndTime: void | number, // DEV-only
 debugChannel: void | DebugChannel, // DEV-only
): WeakResponse {
 return getWeakResponse(
Expand All@@ -2704,6 +2751,7 @@ export function createResponse(
 replayConsole,
 environmentName,
 debugStartTime,
 debugEndTime,
 debugChannel,
 ),
 );
Expand DownExpand Up@@ -3075,10 +3123,10 @@ function resolveStream<T: ReadableStream | $AsyncIterable<any, any, void>>(
 resolvedChunk.value = stream;
 resolvedChunk.reason = controller;
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, chunk.value, (chunk: any));
 wakeChunk(response, resolveListeners, chunk.value, (chunk: any));
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(resolvedChunk, stream);
processChunkDebugInfo(response, resolvedChunk, stream);
 }
 }
}
Expand DownExpand Up@@ -3218,7 +3266,12 @@ function startAsyncIterable<T>(
 initializedChunk.status = INITIALIZED;
 initializedChunk.value = {done: false, value: value};
 if (resolveListeners !== null) {
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(
 response,
 chunk,
 resolveListeners,
 rejectListeners,
 );
 }
 }
 nextWriteIndex++;
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-esm/src/client/ReactFlightDOMClientBrowser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
};

function createDebugCallbackFromWritableStream(
Expand DownExpand Up@@ -107,6 +108,7 @@ function createResponseFromOptions(options: void | Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-esm/src/client/ReactFlightDOMClientNode.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
 // For the Node.js client we only support a single-direction debug channel.
 debugChannel?: Readable,
};
Expand DownExpand Up@@ -116,6 +117,7 @@ function createFromNodeStream<T>(
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );

Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-parcel/src/client/ReactFlightDOMClientBrowser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,6 +132,7 @@ function createResponseFromOptions(options: void | Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand DownExpand Up@@ -209,6 +210,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
};

export function createFromReadableStream<T>(
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-parcel/src/client/ReactFlightDOMClientEdge.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
 // For the Edge client we only support a single-direction debug channel.
 debugChannel?: {readable?: ReadableStream, ...},
};
Expand DownExpand Up@@ -111,6 +112,7 @@ function createResponseFromOptions(options?: Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[Fizz] Push halted await to the owner stack for late-arriving I/O info#35019

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.

 Sign up for GitHub

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

 Merged

unstubbable
merged 9 commits into

from

Nov 1, 2025
 Merged


[Fizz] Push halted await to the owner stack for late-arriving I/O info
#35019
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
64c896b

[Fizz] Push halted await to the owner stack for late-arriving I/O info


unstubbable Oct 30, 2025
ebc1668

Always prefer debug info from inner values of lazy nodes


unstubbable Oct 30, 2025
728d854

Fix `prerenderHTML` check


unstubbable Oct 30, 2025
65104ef

Add (debug) end time to Flight client


unstubbable Nov 1, 2025
81a7f26

Filter debug info when debug chunk resolves


unstubbable Oct 31, 2025
c11c2d7

Revert "Filter debug info when debug chunk resolves"


unstubbable Oct 31, 2025
b4b1ba0

Use `endTime` in test


unstubbable Nov 1, 2025
29093b5

Move debug info filtering to correct location


unstubbable Nov 1, 2025
bd8ae71

Remove `response` from `InitializationReference`


unstubbable Nov 1, 2025

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


105 changes: 79 additions & 26 deletions
packages/react-client/src/ReactFlightClient.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -367,6 +367,7 @@ type Response = {
 _debugRootStack?: null | Error, // DEV-only
 _debugRootTask?: null | ConsoleTask, // DEV-only
 _debugStartTime: number, // DEV-only
 _debugEndTime?: number, // DEV-only
 _debugIOStarted: boolean, // DEV-only
 _debugFindSourceMapURL?: void | FindSourceMapURLCallback, // DEV-only
 _debugChannel?: void | DebugChannel, // DEV-only
Expand DownExpand Up@@ -500,6 +501,34 @@ function createErrorChunk<T>(
 return new ReactPromise(ERRORED, null, error);
}

function filterDebugInfo(
 response: Response,
 value: {_debugInfo: ReactDebugInfo, ...},
) {
 if (response._debugEndTime === null) {
 // No end time was defined, so we keep all debug info entries.
 return;
 }

 // Remove any debug info entries that arrived after the defined end time.
 const relativeEndTime =
 response._debugEndTime -
 // $FlowFixMe[prop-missing]
 performance.timeOrigin;
 const debugInfo = [];
 for (let i = 0; i < value._debugInfo.length; i++) {
 const info = value._debugInfo[i];
 if (typeof info.time === 'number' && info.time > relativeEndTime) {
 break;
 }
 if (info.awaited != null && info.awaited.end > relativeEndTime) {
 break;
 }
 debugInfo.push(info);
 }
 value._debugInfo = debugInfo;
}

function moveDebugInfoFromChunkToInnerValue<T>(
 chunk: InitializedChunk<T> | InitializedStreamChunk<any>,
 value: T,
Expand DownExpand Up@@ -534,7 +563,17 @@ function moveDebugInfoFromChunkToInnerValue<T>(
 }
}

function processChunkDebugInfo<T>(
 response: Response,
 chunk: InitializedChunk<T> | InitializedStreamChunk<any>,
 value: T,
): void {
 filterDebugInfo(response, chunk);
 moveDebugInfoFromChunkToInnerValue(chunk, value);
}

function wakeChunk<T>(
 response: Response,
 listeners: Array<InitializationReference | (T => mixed)>,
 value: T,
 chunk: InitializedChunk<T>,
Expand All@@ -544,16 +583,17 @@ function wakeChunk<T>(
 if (typeof listener === 'function') {
 listener(value);
 } else {
 fulfillReference(listener, value, chunk);
 fulfillReference(response, listener, value, chunk);
 }
 }

 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(chunk, value);
processChunkDebugInfo(response, chunk, value);
 }
}

function rejectChunk(
 response: Response,
 listeners: Array<InitializationReference | (mixed => mixed)>,
 error: mixed,
): void {
Expand All@@ -562,7 +602,7 @@ function rejectChunk(
 if (typeof listener === 'function') {
 listener(error);
 } else {
 rejectReference(listener, error);
 rejectReference(response, listener.handler, error);
 }
 }
}
Expand DownExpand Up@@ -595,13 +635,14 @@ function resolveBlockedCycle<T>(
}

function wakeChunkIfInitialized<T>(
 response: Response,
 chunk: SomeChunk<T>,
 resolveListeners: Array<InitializationReference | (T => mixed)>,
 rejectListeners: null | Array<InitializationReference | (mixed => mixed)>,
): void {
 switch (chunk.status) {
 case INITIALIZED:
 wakeChunk(resolveListeners, chunk.value, chunk);
 wakeChunk(response, resolveListeners, chunk.value, chunk);
 break;
 case BLOCKED:
 // It is possible that we're blocked on our own chunk if it's a cycle.
Expand All@@ -615,7 +656,7 @@ function wakeChunkIfInitialized<T>(
 if (cyclicHandler !== null) {
 // This reference points back to this chunk. We can resolve the cycle by
 // using the value from that handler.
 fulfillReference(reference, cyclicHandler.value, chunk);
 fulfillReference(response, reference, cyclicHandler.value, chunk);
 resolveListeners.splice(i, 1);
 i--;
 if (rejectListeners !== null) {
Expand All@@ -629,14 +670,15 @@ function wakeChunkIfInitialized<T>(
 case INITIALIZED:
 const initializedChunk: InitializedChunk<T> = (chunk: any);
 wakeChunk(
 response,
 resolveListeners,
 initializedChunk.value,
 initializedChunk,
 );
 return;
 case ERRORED:
 if (rejectListeners !== null) {
 rejectChunk(rejectListeners, chunk.reason);
 rejectChunk(response, rejectListeners, chunk.reason);
 }
 return;
 }
Expand DownExpand Up@@ -666,7 +708,7 @@ function wakeChunkIfInitialized<T>(
 break;
 case ERRORED:
 if (rejectListeners) {
 rejectChunk(rejectListeners, chunk.reason);
 rejectChunk(response, rejectListeners, chunk.reason);
 }
 break;
 }
Expand DownExpand Up@@ -724,7 +766,7 @@ function triggerErrorOnChunk<T>(
 erroredChunk.status = ERRORED;
 erroredChunk.reason = error;
 if (listeners !== null) {
 rejectChunk(listeners, error);
 rejectChunk(response, listeners, error);
 }
}

Expand DownExpand Up@@ -832,7 +874,7 @@ function resolveModelChunk<T>(
 // longer be rendered or might not be the highest pri.
 initializeModelChunk(resolvedChunk);
 // The status might have changed after initialization.
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(response, chunk, resolveListeners, rejectListeners);
 }
}

Expand DownExpand Up@@ -861,12 +903,11 @@ function resolveModuleChunk<T>(
 }
 if (resolveListeners !== null) {
 initializeModuleChunk(resolvedChunk);
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(response, chunk, resolveListeners, rejectListeners);
 }
}

type InitializationReference = {
 response: Response, // TODO: Remove Response from here and pass it through instead.
 handler: InitializationHandler,
 parentObject: Object,
 key: string,
Expand DownExpand Up@@ -1005,7 +1046,7 @@ function initializeModelChunk<T>(chunk: ResolvedModelChunk<T>): void {
 if (typeof listener === 'function') {
 listener(value);
 } else {
 fulfillReference(listener, value, cyclicChunk);
 fulfillReference(response, listener, value, cyclicChunk);
 }
 }
 }
Expand All@@ -1026,7 +1067,7 @@ function initializeModelChunk<T>(chunk: ResolvedModelChunk<T>): void {
 initializedChunk.value = value;

 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, value);
processChunkDebugInfo(response, initializedChunk, value);
 }
 } catch (error) {
 const erroredChunk: ErroredChunk<T> = (chunk: any);
Expand DownExpand Up@@ -1413,11 +1454,12 @@ function getChunk(response: Response, id: number): SomeChunk<any> {
}

function fulfillReference(
 response: Response,
 reference: InitializationReference,
 value: any,
 fulfilledChunk: SomeChunk<any>,
): void {
 const {response, handler, parentObject, key, map, path} = reference;
 const {handler, parentObject, key, map, path} = reference;

 for (let i = 1; i < path.length; i++) {
 while (
Expand DownExpand Up@@ -1487,7 +1529,11 @@ function fulfillReference(
 return;
 }
 default: {
 rejectReference(reference, referencedChunk.reason);
 rejectReference(
 response,
 reference.handler,
 referencedChunk.reason,
 );
 return;
 }
 }
Expand DownExpand Up@@ -1585,21 +1631,20 @@ function fulfillReference(
 initializedChunk.value = handler.value;
 initializedChunk.reason = handler.reason; // Used by streaming chunks
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, handler.value, initializedChunk);
 wakeChunk(response, resolveListeners, handler.value, initializedChunk);
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, handler.value);
processChunkDebugInfo(response, initializedChunk, handler.value);
 }
 }
 }
}

function rejectReference(
 reference: InitializationReference,
 response: Response,
 handler: InitializationHandler,
 error: mixed,
): void {
 const {handler, response} = reference;

 if (handler.errored) {
 // We've already errored. We could instead build up an AggregateError
 // but if there are multiple errors we just take the first one like
Expand DownExpand Up@@ -1690,7 +1735,6 @@ function waitForReference<T>(
 }

 const reference: InitializationReference = {
 response,
 handler,
 parentObject,
 key,
Expand DownExpand Up@@ -1838,10 +1882,10 @@ function loadServerReference<A: Iterable<any>, T>(
 initializedChunk.status = INITIALIZED;
 initializedChunk.value = handler.value;
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, handler.value, initializedChunk);
 wakeChunk(response, resolveListeners, handler.value, initializedChunk);
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(initializedChunk, handler.value);
processChunkDebugInfo(response, initializedChunk, handler.value);
 }
 }
 }
Expand DownExpand Up@@ -2578,6 +2622,7 @@ function ResponseInstance(
 replayConsole: boolean, // DEV-only
 environmentName: void | string, // DEV-only
 debugStartTime: void | number, // DEV-only
 debugEndTime: void | number, // DEV-only
 debugChannel: void | DebugChannel, // DEV-only
) {
 const chunks: Map<number, SomeChunk<any>> = new Map();
Expand DownExpand Up@@ -2645,6 +2690,7 @@ function ResponseInstance(
 // and is not considered I/O required to load the stream.
 setTimeout(markIOStarted.bind(this), 0);
 }
 this._debugEndTime = debugEndTime == null ? null : debugEndTime;
 this._debugFindSourceMapURL = findSourceMapURL;
 this._debugChannel = debugChannel;
 this._blockedConsole = null;
Expand DownExpand Up@@ -2688,6 +2734,7 @@ export function createResponse(
 replayConsole: boolean, // DEV-only
 environmentName: void | string, // DEV-only
 debugStartTime: void | number, // DEV-only
 debugEndTime: void | number, // DEV-only
 debugChannel: void | DebugChannel, // DEV-only
): WeakResponse {
 return getWeakResponse(
Expand All@@ -2704,6 +2751,7 @@ export function createResponse(
 replayConsole,
 environmentName,
 debugStartTime,
 debugEndTime,
 debugChannel,
 ),
 );
Expand DownExpand Up@@ -3075,10 +3123,10 @@ function resolveStream<T: ReadableStream | $AsyncIterable<any, any, void>>(
 resolvedChunk.value = stream;
 resolvedChunk.reason = controller;
 if (resolveListeners !== null) {
 wakeChunk(resolveListeners, chunk.value, (chunk: any));
 wakeChunk(response, resolveListeners, chunk.value, (chunk: any));
 } else {
 if (__DEV__) {
moveDebugInfoFromChunkToInnerValue(resolvedChunk, stream);
processChunkDebugInfo(response, resolvedChunk, stream);
 }
 }
}
Expand DownExpand Up@@ -3218,7 +3266,12 @@ function startAsyncIterable<T>(
 initializedChunk.status = INITIALIZED;
 initializedChunk.value = {done: false, value: value};
 if (resolveListeners !== null) {
 wakeChunkIfInitialized(chunk, resolveListeners, rejectListeners);
 wakeChunkIfInitialized(
 response,
 chunk,
 resolveListeners,
 rejectListeners,
 );
 }
 }
 nextWriteIndex++;
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-esm/src/client/ReactFlightDOMClientBrowser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
};

function createDebugCallbackFromWritableStream(
Expand DownExpand Up@@ -107,6 +108,7 @@ function createResponseFromOptions(options: void | Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-esm/src/client/ReactFlightDOMClientNode.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
 // For the Node.js client we only support a single-direction debug channel.
 debugChannel?: Readable,
};
Expand DownExpand Up@@ -116,6 +117,7 @@ function createFromNodeStream<T>(
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );

Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-parcel/src/client/ReactFlightDOMClientBrowser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,6 +132,7 @@ function createResponseFromOptions(options: void | Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand DownExpand Up@@ -209,6 +210,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
};

export function createFromReadableStream<T>(
Expand Down

2 changes: 2 additions & 0 deletions
packages/react-server-dom-parcel/src/client/ReactFlightDOMClientEdge.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@ export type Options = {
 replayConsoleLogs?: boolean,
 environmentName?: string,
 startTime?: number,
 endTime?: number,
 // For the Edge client we only support a single-direction debug channel.
 debugChannel?: {readable?: ReadableStream, ...},
};
Expand DownExpand Up@@ -111,6 +112,7 @@ function createResponseFromOptions(options?: Options) {
 __DEV__ && options && options.startTime != null
 ? options.startTime
 : undefined,
 __DEV__ && options && options.endTime != null ? options.endTime : undefined,
 debugChannel,
 );
}
Expand Down
Loading
Loading