diff --git a/apps/desktop/src/preview/Manager.test.ts b/apps/desktop/src/preview/Manager.test.ts index b344b1ac93b2b..ab68eb84d0eb2 100644 --- a/apps/desktop/src/preview/Manager.test.ts +++ b/apps/desktop/src/preview/Manager.test.ts @@ -2112,6 +2112,12 @@ describe("PreviewManager", () => { yield* manager.createTab("tab_1", { serverTab }); yield* manager.registerWebview("tab_1", 42); yield* Deferred.await(attached); + const setBackgroundThrottling = vi.fn(); + yield* manager.setMainWindow({ + isDestroyed: () => false, + once: vi.fn(), + webContents: { setBackgroundThrottling }, + } as never); // Navigating rebuilds the tab's state, which must keep the server tab it answers for. yield* manager.navigate("tab_1", "https://example.com/next"); yield* Queue.clear(capturing); @@ -2130,6 +2136,8 @@ describe("PreviewManager", () => { expect(yield* Queue.take(capturing)).toBe(true); screenshot.resolve({ data: "" }); expect(yield* Queue.take(capturing)).toBe(false); + // A hidden, minimized or covered main window commits no frames while throttled. + expect(setBackgroundThrottling.mock.calls).toEqual([[false], [true]]); }).pipe(Effect.provide(managerLayer())), ); diff --git a/apps/desktop/src/preview/Manager.ts b/apps/desktop/src/preview/Manager.ts index 686248bf8892d..94841bf78ff9a 100644 --- a/apps/desktop/src/preview/Manager.ts +++ b/apps/desktop/src/preview/Manager.ts @@ -603,6 +603,8 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function let pendingRecording: PendingRecording | null = null; const displayMediaHandlerSessions = new WeakSet(); let frameCaptureWindowOpen = true; + // Server tabs the client paints for a capture; guarded by frameCaptureSessionsRef like sessions. + const paintingServerTabs = new Set(); let currentMainWindow: BrowserWindow | undefined; let mainWindowCleanupFiber: Fiber.Fiber | undefined; const tabLifecycleLocks = new Map< @@ -822,7 +824,7 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function yield* restoreFrameCaptureWebContentsBackgroundThrottling( current.unthrottledWebContentsIds, ); - if (remainingSessions.size === 0) { + if (remainingSessions.size === 0 && paintingServerTabs.size === 0) { yield* setFrameCaptureBackgroundThrottling(true).pipe( Effect.retry({ times: 2 }), Effect.catch((error) => @@ -1680,7 +1682,7 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function Effect.gen(function* () { // Cleanup or lock acquisition can outlive the replacement window. if (window.isDestroyed()) return [undefined, sessions] as const; - if (sessions.size > 0) { + if (sessions.size > 0 || paintingServerTabs.size > 0) { yield* setWindowBackgroundThrottling(window, false); } yield* Ref.set(mainWindowRef, Option.some(window)); @@ -2829,12 +2831,13 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function }), ] as const; } - if (sessions.size === 0) { + const mainWindowThrottled = sessions.size === 0 && paintingServerTabs.size === 0; + if (mainWindowThrottled) { yield* setFrameCaptureBackgroundThrottling(false); } yield* setFrameCaptureWebContentsBackgroundThrottling(wc, false).pipe( Effect.onError(() => - sessions.size === 0 + mainWindowThrottled ? setFrameCaptureBackgroundThrottling(true).pipe(Effect.ignore) : Effect.void, ), @@ -3437,6 +3440,24 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function readonly key: { readonly threadId: string; readonly tabId: string }; readonly active: boolean; }) { + // A hidden, minimized or covered main window commits no frames while throttled. + yield* SynchronizedRef.modifyEffect(frameCaptureSessionsRef, (sessions) => + Effect.gen(function* () { + const key = `${painting.key.threadId}\u0000${painting.key.tabId}`; + if (paintingServerTabs.has(key) === painting.active) + return [undefined, sessions] as const; + if (painting.active) paintingServerTabs.add(key); + else paintingServerTabs.delete(key); + if (sessions.size === 0 && paintingServerTabs.size === (painting.active ? 1 : 0)) { + yield* setFrameCaptureBackgroundThrottling(!painting.active).pipe( + Effect.catch((error) => + Effect.logWarning("Failed to update preview capture throttling.", { error }), + ), + ); + } + return [undefined, sessions] as const; + }), + ).pipe(Effect.uninterruptible); const tab = [...(yield* SynchronizedRef.get(tabsRef)).values()].find( (candidate) => candidate.serverTab?.threadId === painting.key.threadId &&