Skip to content

Commit c1e50e8

Browse files
Merge remote-tracking branch 'origin/main' into L79-18466
2 parents 2362af9 + 571d3bc commit c1e50e8

2 files changed

Lines changed: 44 additions & 6 deletions

File tree

‎apps/server/src/preview/ServerBrowserPage.test.ts‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -370,9 +370,7 @@ describe("server browser drag", () => {
370370
});
371371
});
372372

373-
// TODO(#19913 follow-up): flaky in CI since 2e8b5b9d; the capture can return the pre-resize frame.
374-
// Skipped to unblock main; a proper fix makes the capture wait for the resized frame.
375-
it.skip("captures the native display viewport after page script reassigns the globals", async () => {
373+
it("captures the native display viewport after page script reassigns the globals", async () => {
376374
// Context deviceScaleFactor changes DPR but does not scale raw CDP captures.
377375
const browser = await chromium.launch({
378376
headless: true,
@@ -411,16 +409,25 @@ it.skip("captures the native display viewport after page script reassigns the gl
411409
offset: { x: 0, y: 0 },
412410
});
413411
const { windowId } = await cdp.send("Browser.getWindowForTarget");
414-
// CDP acknowledges the bounds change before the renderer applies the resize.
412+
// CDP acknowledges the bounds change before the renderer applies it, and a resize event can
413+
// fire for a size on the way there. Page script replaced innerWidth, so read the layout.
415414
const resize = await page.evaluateHandle(`({
416-
done: new Promise(resolve => window.addEventListener("resize", () => resolve(), { once: true })),
415+
done: new Promise(resolve => window.addEventListener("resize", () => {
416+
const { clientWidth, clientHeight } = document.documentElement;
417+
if (clientWidth === 390 && clientHeight === 844) resolve();
418+
})),
417419
})`);
418420
await cdp.send("Browser.setWindowBounds", {
419421
windowId,
420422
bounds: { width: 390, height: 844 },
421423
});
422424
await resize.evaluate("resize => resize.done");
423425
await resize.dispose();
426+
expect(await ServerBrowserPage.readPageMetrics(cdp)).toMatchObject({
427+
ratio: 1.5,
428+
width: 390,
429+
height: 844,
430+
});
424431
expect(await snapshotSize()).toEqual({ width: 585, height: 1266 });
425432
} finally {
426433
await browser.close();

‎apps/server/src/preview/ServerBrowserPage.ts‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const MAX_EVALUATION_BYTES = 64_000;
2626
const MAX_VISIBLE_TEXT_LENGTH = 20_000;
2727
const MAX_SCREENSHOT_WIDTH = 1280;
2828
const WAIT_POLL_MS = 100;
29+
const RESIZED_FRAME_MS = 2_000;
2930
export const DIAGNOSTIC_BUFFER_LIMIT = 200;
3031

3132
export class ServerBrowserOperationError extends Error {
@@ -484,6 +485,36 @@ const renderingOf = async (input: SnapshotInput) => {
484485
};
485486
};
486487

488+
// A desktop window reports a resize before its compositor draws a frame at the new size, so an
489+
// unclipped capture can still return the old frame. Bounded: a frame that never matches is kept.
490+
// Headless pages are sized by the server, which awaits each resize.
491+
const captureResized = async (
492+
input: SnapshotInput,
493+
options: {
494+
readonly scale: number;
495+
readonly viewport: Viewport;
496+
readonly offset: { readonly x: number; readonly y: number } | undefined;
497+
readonly renderScale: number;
498+
},
499+
deadline: number,
500+
) => {
501+
if (input.renderScale !== "display")
502+
return captureViewport(input.page, input.cdp, { format: "png", ...options });
503+
const expected = {
504+
width: options.viewport.width * options.renderScale * options.scale,
505+
height: options.viewport.height * options.renderScale * options.scale,
506+
};
507+
const giveUpAt = Math.min(Date.now() + RESIZED_FRAME_MS, deadline - 2_000);
508+
for (;;) {
509+
const data = await captureViewport(input.page, input.cdp, { format: "png", ...options });
510+
const size = pngSize(data);
511+
const matches =
512+
Math.abs(size.width - expected.width) <= 1 && Math.abs(size.height - expected.height) <= 1;
513+
if (matches || Date.now() + WAIT_POLL_MS >= giveUpAt) return data;
514+
await new Promise((resolve) => setTimeout(resolve, WAIT_POLL_MS));
515+
}
516+
};
517+
487518
const capture = async (
488519
input: SnapshotInput,
489520
deadline: number,
@@ -506,7 +537,7 @@ const capture = async (
506537
"url" | "title" | "loading" | "visibleText" | "interactiveElements"
507538
>
508539
>,
509-
captureViewport(input.page, input.cdp, { format: "png", scale, viewport, offset }),
540+
captureResized(input, { scale, viewport, offset, renderScale }, deadline),
510541
]);
511542
void pageAndScreenshot.catch(constVoid);
512543
// Leaves time for the second read; a frame that never loads holds the tree until then.

0 commit comments

Comments
 (0)