Skip to content

Commit 9de00c8

Browse files
fix(desktop): release rendering activity for abandoned screenshots
Navigation can advance the screenshot queue while the old CDP capture never settles. Release the activity lease when advancing the turn and make cleanup idempotent so a late reply cannot release it twice. Extend the regression test to verify cleanup and screenshot serialization.
1 parent 9240afd commit 9de00c8

2 files changed

Lines changed: 43 additions & 5 deletions

File tree

‎apps/desktop/src/preview/DesktopBrowserHost.test.ts‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,27 +242,53 @@ describe("DesktopBrowserHost", () => {
242242
}).pipe(Effect.scoped),
243243
);
244244

245-
it.effect("stops waiting on a screenshot the page navigated away from", () =>
245+
it.effect("releases an abandoned screenshot's rendering activity and preserves the queue", () =>
246246
Effect.gen(function* () {
247247
const host = yield* DesktopBrowserHost.make;
248248
const debuggee = makeDebuggee();
249-
host.attach(key, debuggee.tab);
249+
const released: Array<number> = [];
250+
let preparations = 0;
251+
host.attach(key, {
252+
...debuggee.tab,
253+
prepareScreenshot: async () => {
254+
const preparation = ++preparations;
255+
return () => {
256+
released.push(preparation);
257+
};
258+
},
259+
});
250260
const replies = yield* watchReplies(host);
251261

262+
const firstSent = debuggee.nextSend();
252263
yield* command(host, 1, "Page.captureScreenshot");
253264
yield* command(host, 2, "Page.captureScreenshot");
254265
yield* command(host, 3, "Page.captureScreenshot");
266+
yield* Effect.promise(() => firstSent);
267+
expect(debuggee.sent).toEqual([1]);
268+
expect(released).toEqual([]);
269+
270+
const secondSent = debuggee.nextSend();
255271
debuggee.navigate();
272+
expect(released).toEqual([1]);
273+
yield* Effect.promise(() => secondSent);
256274
expect(debuggee.sent).toEqual([1, 2]);
257275

258276
// The superseded screenshot answering late must not start a third beside the second.
259277
debuggee.releaseFirst();
260278
expect(yield* Queue.take(replies)).toBe(1);
279+
expect(released).toEqual([1]);
261280
expect(debuggee.sent).toEqual([1, 2]);
262281

282+
const thirdSent = debuggee.nextSend();
263283
debuggee.releaseFirst();
264284
expect(yield* Queue.take(replies)).toBe(2);
285+
yield* Effect.promise(() => thirdSent);
286+
expect(released).toEqual([1, 2]);
265287
expect(debuggee.sent).toEqual([1, 2, 3]);
288+
289+
debuggee.releaseFirst();
290+
expect(yield* Queue.take(replies)).toBe(3);
291+
expect(released).toEqual([1, 2, 3]);
266292
}).pipe(Effect.scoped),
267293
);
268294

‎apps/desktop/src/preview/DesktopBrowserHost.ts‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,15 @@ export interface DesktopBrowserTabDebugger {
4040

4141
const keyOf = ({ threadId, tabId }: DesktopBrowserTabKey) => `${threadId}\u0000${tabId}`;
4242

43+
interface ScreenshotTurn {
44+
release?: () => void;
45+
}
46+
4347
interface AttachedTab {
4448
readonly key: DesktopBrowserTabKey;
4549
readonly debuggee: DesktopBrowserTabDebugger;
4650
relay: CdpRelayConnection | null;
47-
screenshotTurn: object | null;
51+
screenshotTurn: ScreenshotTurn | null;
4852
readonly waitingScreenshots: Array<() => void>;
4953
downloadDirectory: string | null;
5054
pendingDownloadGuid: string | null;
@@ -89,6 +93,7 @@ export const make = Effect.gen(function* () {
8993
const emit = (event: DesktopBrowserEventType) => runFork(PubSub.publish(outbox, event));
9094

9195
const nextScreenshot = (tab: AttachedTab) => {
96+
tab.screenshotTurn?.release?.();
9297
tab.screenshotTurn = null;
9398
tab.waitingScreenshots.shift()?.();
9499
};
@@ -111,11 +116,18 @@ export const make = Effect.gen(function* () {
111116
nextScreenshot(tab);
112117
return;
113118
}
114-
const turn = {};
119+
const turn: ScreenshotTurn = {};
115120
tab.screenshotTurn = turn;
116121
const prepare = tab.debuggee.prepareScreenshot;
117122
const capturing = prepare
118-
? prepare().then(async (release) => {
123+
? prepare().then(async (acquired) => {
124+
let released = false;
125+
const release = () => {
126+
if (released) return;
127+
released = true;
128+
acquired();
129+
};
130+
turn.release = release;
119131
try {
120132
if (tab.screenshotTurn !== turn || tab.relay !== relay) {
121133
throw new Error("The preview changed while preparing its screenshot.");

0 commit comments

Comments
 (0)