Skip to content

Commit 63d1e11

Browse files
author
PR Batch Tester
committed
fix(server): adapt viewport regressions to current preview fixtures
1 parent dce4c95 commit 63d1e11

2 files changed

Lines changed: 38 additions & 39 deletions

File tree

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

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,10 @@ const PNG_HEADER = (() => {
8686
return header.toString("base64");
8787
})();
8888

89-
function makeSession(frame: ReturnType<typeof makeFrame> | undefined, viewport: { width: number; height: number }) {
89+
function makeSession(
90+
frame: ReturnType<typeof makeFrame> | undefined,
91+
viewport: { width: number; height: number },
92+
) {
9093
const events = new NodeEvents.EventEmitter();
9194
return {
9295
on: vi.fn((name: string, callback: (...args: unknown[]) => void) => events.on(name, callback)),
@@ -106,7 +109,12 @@ function makeSession(frame: ReturnType<typeof makeFrame> | undefined, viewport:
106109
if (method === "Page.getFrameTree") return { frameTree: { frame: { id: "main" } } };
107110
if (method === "Page.createIsolatedWorld") {
108111
return {
109-
executionContextId: (input as { worldName?: string }).worldName === "t3-preview-viewport" ? 9 : (input as { worldName?: string }).worldName === "t3-preview" ? 1 : 7,
112+
executionContextId:
113+
(input as { worldName?: string }).worldName === "t3-preview-viewport"
114+
? 9
115+
: (input as { worldName?: string }).worldName === "t3-preview"
116+
? 1
117+
: 7,
110118
};
111119
}
112120
if (method === "Runtime.evaluate" && (input as { contextId?: number }).contextId === 1) {
@@ -123,7 +131,8 @@ function makeSession(frame: ReturnType<typeof makeFrame> | undefined, viewport:
123131
else pageCopy = "";
124132
return { result: { value } };
125133
}
126-
if (method === "Runtime.evaluate" && (input as { contextId?: number }).contextId === 9) return { result: { value: { ...viewport } } };
134+
if (method === "Runtime.evaluate" && (input as { contextId?: number }).contextId === 9)
135+
return { result: { value: { ...viewport } } };
127136
return { result: { value: "evaluated" } };
128137
}),
129138
};
@@ -209,7 +218,8 @@ function makeContext(onClose?: (context: BrowserContext) => void) {
209218
grantPermissions: vi.fn(async () => {}),
210219
newCDPSession: async (target: unknown) => {
211220
const session = makeSession(
212-
target === page ? undefined : (target as ReturnType<typeof makeFrame>), cssViewport,
221+
target === page ? undefined : (target as ReturnType<typeof makeFrame>),
222+
cssViewport,
213223
);
214224
sessions.push(session);
215225
return session;
@@ -278,6 +288,8 @@ let initialNavigation: (() => Promise<void>) | null = null;
278288
let desktopRendersNext = false;
279289
let desktopHiddenNext = false;
280290
const desktopDetaches = new NodeEvents.EventEmitter();
291+
let desktopDetachReady = Promise.withResolvers<void>();
292+
let desktopReleased = Promise.withResolvers<void>();
281293
const desktopTabs = new Set<string>();
282294
const desktopRenders = (tabId: string) => {
283295
if (desktopRendersNext) {
@@ -326,6 +338,7 @@ const dependencies = Layer.mergeAll(
326338
const onDetach = (key: { threadId: string; tabId: string }) =>
327339
Queue.offerUnsafe(queue, key);
328340
desktopDetaches.on("detach", onDetach);
341+
desktopDetachReady.resolve();
329342
return onDetach;
330343
}),
331344
(onDetach) => Effect.sync(() => desktopDetaches.off("detach", onDetach)),
@@ -345,7 +358,10 @@ const dependencies = Layer.mergeAll(
345358
isAttached: (key) => Effect.sync(() => desktopRenders(key.tabId)),
346359
endpoint: (key) =>
347360
Effect.acquireRelease(Effect.succeed(`ws://desktop/${key.tabId}`), () =>
348-
Effect.sync(() => releasedDesktopTabs.push(key.tabId)),
361+
Effect.sync(() => {
362+
releasedDesktopTabs.push(key.tabId);
363+
desktopReleased.resolve();
364+
}),
349365
),
350366
pointer: () => Effect.void,
351367
turn: (threadId, active) => Effect.sync(() => desktopTurns.emit("turn", threadId, active)),
@@ -376,24 +392,13 @@ const viewerInput = (tabId: string, canOperate: boolean) => ({
376392
maxHeight: 800,
377393
quality: 70,
378394
});
379-
/** Waits for a viewport. Pulling drains the queue, so it also discards what arrived with it. */
380395
const stallViewer = (
381396
viewer: ServerBrowser.ServerBrowserViewer,
382397
item: ServerBrowser.ServerBrowserViewerOutput,
383398
) => {
384-
// The service hands out the read side of a queue it also writes to.
385399
const output = viewer.output as unknown as Queue.Queue<ServerBrowser.ServerBrowserViewerOutput>;
386400
while (Queue.offerUnsafe(output, item));
387401
};
388-
const viewerInput = (tabId: string, canOperate: boolean) => ({
389-
threadId: scope.thread.threadId,
390-
tabId,
391-
canOperate,
392-
maxWidth: 1280,
393-
maxHeight: 800,
394-
quality: 70,
395-
});
396-
/** Waits for a viewport. Pulling drains the queue, so it also discards what arrived with it. */
397402
const nextViewerViewport = (viewer: ServerBrowser.ServerBrowserViewer) =>
398403
Stream.fromQueue(viewer.output).pipe(
399404
Stream.filter((item) => item._tag === "viewport"),
@@ -413,6 +418,8 @@ beforeEach(() => {
413418
focusedFrame = null;
414419
desktopTabs.clear();
415420
desktopRendersNext = false;
421+
desktopDetachReady = Promise.withResolvers<void>();
422+
desktopReleased = Promise.withResolvers<void>();
416423
desktopHiddenNext = false;
417424
releasedDesktopTabs.length = 0;
418425
desktopConnections.length = 0;
@@ -1130,6 +1137,11 @@ it.live("a page's file picker goes to the controller and takes its uploaded file
11301137
let offered = yield* Queue.take(viewer.output);
11311138
while (offered._tag !== "fileChooser") offered = yield* Queue.take(viewer.output);
11321139
expect(offered).toMatchObject({ multiple: false, accept: ".csv" });
1140+
stallViewer(viewer, { _tag: "frame", data: Buffer.alloc(0), ack: Effect.void });
1141+
yield* viewer.input({ type: "resize", width: 900, height: 600 });
1142+
expect(yield* Queue.takeAll(viewer.output)).toEqual(
1143+
expect.arrayContaining([{ _tag: "viewport", width: 900, height: 600 }, offered]),
1144+
);
11331145
const file = (name: string) => ({ name, mimeType: "text/csv", buffer: Buffer.from(name) });
11341146
const answer = (chooserId: string) =>
11351147
browser.answerFileChooser({
@@ -1466,8 +1478,7 @@ it.live("a late first desktop size still reaches viewers when a newer read fails
14661478
const context = desktopConnections[0]!.context;
14671479
const cdp = context.sessions[0]!;
14681480
// The viewer attached while hidden, so no size is known yet.
1469-
while (!cdp.send.mock.calls.some(([method]) => method === "Runtime.evaluate"))
1470-
yield* Effect.yieldNow;
1481+
yield* Effect.promise(() => cdp.emitAsync("Page.frameResized"));
14711482
const send = cdp.send.getMockImplementation()!;
14721483
const late = Promise.withResolvers<Record<string, unknown>>();
14731484
yield* Effect.addFinalizer(() => Effect.sync(() => late.resolve({})));
@@ -1593,12 +1604,11 @@ it.live("a desktop reconnect replaces a stalled viewer's full backlog", () =>
15931604
const opened = yield* manager.open({ threadId: scope.thread.threadId, runtime: "server" });
15941605
const viewer = yield* browser.attachViewer(viewerInput(opened.tabId, false));
15951606
yield* nextViewerViewport(viewer);
1596-
while (desktopDetaches.listenerCount("detach") === 0) yield* Effect.yieldNow;
1607+
yield* Effect.promise(() => desktopDetachReady.promise);
15971608
// The viewer stopped reading: its output is full when the desktop takes the page back.
15981609
stallViewer(viewer, { _tag: "frame", data: Buffer.alloc(0), ack: Effect.void });
1599-
const capacity = yield* Queue.size(viewer.output);
16001610
desktopDetaches.emit("detach", { threadId: scope.thread.threadId, tabId: opened.tabId });
1601-
while ((yield* Queue.size(viewer.output)) === capacity) yield* Effect.yieldNow;
1611+
yield* Effect.promise(() => desktopReleased.promise);
16021612
expect(yield* Queue.takeAll(viewer.output)).toEqual([{ _tag: "reconnect" }]);
16031613
}),
16041614
).pipe(Effect.provide(layer)),
@@ -1615,13 +1625,12 @@ it.live("a queued reconnect survives later viewer state on a stalled viewer", ()
16151625
const viewer = yield* browser.attachViewer(viewerInput(opened.tabId, false));
16161626
yield* nextViewerViewport(viewer);
16171627
const cdp = desktopConnections[0]!.context.sessions[0]!;
1618-
while (desktopDetaches.listenerCount("detach") === 0) yield* Effect.yieldNow;
1628+
yield* Effect.promise(() => desktopDetachReady.promise);
16191629
stallViewer(viewer, { _tag: "frame", data: Buffer.alloc(0), ack: Effect.void });
16201630
// One free slot: the reconnect lands as the last queued item.
16211631
yield* Queue.take(viewer.output);
1622-
const capacity = (yield* Queue.size(viewer.output)) + 1;
16231632
desktopDetaches.emit("detach", { threadId: scope.thread.threadId, tabId: opened.tabId });
1624-
while ((yield* Queue.size(viewer.output)) < capacity) yield* Effect.yieldNow;
1633+
yield* Effect.promise(() => desktopReleased.promise);
16251634
yield* Effect.promise(() => cdp.emitAsync("Page.frameResized"));
16261635
expect((yield* Queue.takeAll(viewer.output)).at(-1)).toEqual({ _tag: "reconnect" });
16271636
}),

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

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,7 @@ const make = Effect.gen(function* () {
465465
const previewBrowser = yield* PreviewBrowser.PreviewBrowser;
466466
const desktopChannel = yield* DesktopBrowserChannel.DesktopBrowserChannel;
467467
const agentTurns = yield* (yield* PreviewAgentActivity.PreviewAgentActivity).changes;
468+
const runSync = Effect.runSyncWith(yield* Effect.context<never>());
468469
const runFork = Effect.runForkWith(yield* Effect.context<never>());
469470
const runPromise = Effect.runPromiseWith(yield* Effect.context<never>());
470471
const launchServices = yield* Effect.context<ChildProcessSpawner.ChildProcessSpawner>();
@@ -615,12 +616,8 @@ const make = Effect.gen(function* () {
615616
);
616617
};
617618

618-
/**
619-
* Reads the desktop page's CSS size, including scrollbars and native zoom, in
620-
* an isolated world so page script cannot override it. Keeps the last size
621-
* while a dialog blocks script, when a read fails or times out, when a newer
622-
* read already stored a size, and for a hidden webview's 0x0.
623-
*/
619+
// Desktop pages have no Playwright viewport; an isolated world keeps page script
620+
// from overriding the CSS size, and failed reads preserve the last usable size.
624621
const measureDesktopViewport = async (tab: ServerTab) => {
625622
if (tab.dialog) return tab.desktopViewport;
626623
const read = ++tab.desktopViewportReads;
@@ -655,11 +652,6 @@ const make = Effect.gen(function* () {
655652
return tab.desktopViewport;
656653
};
657654

658-
/**
659-
* The CSS size the page lays out in. A desktop page is measured, since a page
660-
* Playwright reached over CDP has no viewport. A headless page's size is its
661-
* viewport shrunk by the tab's zoom, as Chrome zooms.
662-
*/
663655
const layoutSize = async (tab: ServerTab) => {
664656
if (tab.desktop) return measureDesktopViewport(tab);
665657
const size = tab.page.viewportSize();
@@ -2395,9 +2387,7 @@ const make = Effect.gen(function* () {
23952387
if (next._tag === "frame") runFork(next.ack);
23962388
// State a stalled viewer cannot miss replaces its backlog. It runs
23972389
// synchronously so an older replacement can never land after a newer one.
2398-
else if (
2399-
["gone", "reconnect", "control", "viewport", "fileChooser"].includes(next._tag)
2400-
) {
2390+
else if (["gone", "reconnect", "control", "viewport", "fileChooser"].includes(next._tag)) {
24012391
const dropped = Effect.runSyncExit(Queue.clear(output));
24022392
if (dropped._tag === "Failure") return;
24032393
Queue.offerUnsafe(output, next);
@@ -2417,7 +2407,7 @@ const make = Effect.gen(function* () {
24172407
const notifications = dropped.value.filter((item) =>
24182408
["fileChooserClosed", "popup", "download", "clipboard"].includes(item._tag),
24192409
);
2420-
const room = VIEWER_OUTPUT_LIMIT - Effect.runSync(Queue.size(output));
2410+
const room = VIEWER_OUTPUT_LIMIT - runSync(Queue.size(output));
24212411
for (const item of notifications.slice(Math.max(0, notifications.length - room)))
24222412
Queue.offerUnsafe(output, item);
24232413
for (const item of dropped.value) if (item._tag === "frame") runFork(item.ack);

0 commit comments

Comments
 (0)