Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(desktop): 远程桌面隐藏暂停需编码器确认,隐藏后才就绪不断开会话

Dash150862b6c191
diff --git a/apps/desktop/src/main/remote-desktop/__tests__/controller.test.ts b/apps/desktop/src/main/remote-desktop/__tests__/controller.test.ts
index 0f8c168314..6e5d2d48e1 100644
--- a/apps/desktop/src/main/remote-desktop/__tests__/controller.test.ts
+++ b/apps/desktop/src/main/remote-desktop/__tests__/controller.test.ts
@@ -1415,7 +1415,7 @@ it('forwards viewerHidden for the bound lease without needing control', async ()
await expect(
h.controller.request('phone', { op: 'viewerHidden', lease, hidden: true }),
).rejects.toThrow('DESKTOP_VIDEO_UNAVAILABLE');
- h.deps.viewerHidden = vi.fn();
+ h.deps.viewerHidden = vi.fn(async () => {});
await expect(
h.controller.request('phone', { op: 'viewerHidden', lease, hidden: true }),
).resolves.toEqual({ hidden: true });
@@ -1427,4 +1427,11 @@ it('forwards viewerHidden for the bound lease without needing control', async ()
).rejects.toThrow();
expect(h.deps.viewerHidden).toHaveBeenCalledTimes(2);
expect(h.controller.state?.controlling).toBe(false);
+ // A resume the encoder did not apply must fail so the viewer rebuilds the video.
+ h.deps.viewerHidden = vi.fn(async () => {
+ throw new Error('DESKTOP_VIDEO_UNAVAILABLE');
+ });
+ await expect(
+ h.controller.request('phone', { op: 'viewerHidden', lease, hidden: false }),
+ ).rejects.toThrow('DESKTOP_VIDEO_UNAVAILABLE');
});
diff --git a/apps/desktop/src/main/remote-desktop/controller.ts b/apps/desktop/src/main/remote-desktop/controller.ts
index 91507ea8cc..b8508c9ba7 100644
--- a/apps/desktop/src/main/remote-desktop/controller.ts
+++ b/apps/desktop/src/main/remote-desktop/controller.ts
@@ -110,8 +110,8 @@ export interface DesktopControllerDeps {
stopPrivacyScreen?(): void;
hostMute?(enabled: boolean): Promise<void>;
stopHostMute?(): Promise<void>;
- /** Pauses or resumes sending the lease's current video stream. */
- viewerHidden?(lease: string, hidden: boolean): void;
+ /** Pauses or resumes sending the lease's current video stream; rejects if not applied. */
+ viewerHidden?(lease: string, hidden: boolean): Promise<void>;
changed(): void;
now?: () => number;
}
@@ -664,7 +664,7 @@ export class RemoteDesktopController {
}
case 'viewerHidden': {
if (!this.deps.viewerHidden) throw new Error('DESKTOP_VIDEO_UNAVAILABLE');
- this.deps.viewerHidden(active.lease, request.hidden);
+ await this.deps.viewerHidden(active.lease, request.hidden);
return { hidden: request.hidden };
}
case 'clipboardVersion': {
diff --git a/apps/desktop/src/main/remote-desktop/index.ts b/apps/desktop/src/main/remote-desktop/index.ts
index f6405554dc..4aa30144df 100644
--- a/apps/desktop/src/main/remote-desktop/index.ts
+++ b/apps/desktop/src/main/remote-desktop/index.ts
@@ -215,7 +215,7 @@ let preparingOffer = false;
let videoAttempt: string | undefined;
let pending: {
id: string;
- op: 'offer' | 'ice' | 'frame' | 'display-swap';
+ op: 'offer' | 'ice' | 'frame' | 'display-swap' | 'viewer-hidden';
resolve(result: DesktopHostReply): void;
reject(error: Error): void;
timer: ReturnType<typeof setTimeout>;
@@ -254,15 +254,12 @@ async function resumeVideo(display: RemoteDesktopDisplay): Promise<boolean> {
return false;
}
}
-/** The viewer is hidden: the capture page stops sending the current stream until shown. */
-function setViewerHidden(lease: string, hidden: boolean): void {
- if (lease !== videoLease || !host || host.isDestroyed()) return;
- host.send(DESKTOP_LOCAL.COMMAND, {
- id: randomUUID(),
- op: 'viewer-hidden',
- lease,
- hidden,
- } satisfies DesktopHostCommand);
+/** The viewer is hidden: the capture page stops sending the current stream until shown.
+ * Resolves only once the encoder applied it, so a failed resume reaches the viewer. */
+async function setViewerHidden(lease: string, hidden: boolean): Promise<void> {
+ if (lease !== videoLease) throw new Error('DESKTOP_VIDEO_STOPPED');
+ const applied = await requestHost({ id: randomUUID(), op: 'viewer-hidden', lease, hidden }, 2000);
+ if (applied !== true || lease !== videoLease) throw new Error('DESKTOP_VIDEO_UNAVAILABLE');
}
function stopVideo(): void {
videoPaused = false;
@@ -449,7 +446,9 @@ async function offer(
/** One bounded command to the existing capture owner; never reset the shared device link. */
function requestHost(
- command: DesktopHostCommand & { op: 'offer' | 'ice' | 'frame' | 'display-swap' },
+ command: DesktopHostCommand & {
+ op: 'offer' | 'ice' | 'frame' | 'display-swap' | 'viewer-hidden';
+ },
timeoutMs: number,
): Promise<DesktopHostReply> {
const currentHost = host;
@@ -1158,7 +1157,11 @@ export function registerRemoteDesktopIpc(
/^[A-Za-z0-9+/]+={0,2}$/.test(sdp)))
)
request.resolve(sdp);
- else if (request.op === 'display-swap' && typeof sdp === 'boolean') request.resolve(sdp);
+ else if (
+ (request.op === 'display-swap' || request.op === 'viewer-hidden') &&
+ typeof sdp === 'boolean'
+ )
+ request.resolve(sdp);
else if (request.op === 'ice') {
const result = parseDesktopIceReply(sdp);
if (result.attemptId !== videoAttempt) throw new Error('DESKTOP_VIDEO_STOPPED');
diff --git a/apps/desktop/src/main/resource-usage-window/__tests__/controller.test.ts b/apps/desktop/src/main/resource-usage-window/__tests__/controller.test.ts
index d9f679744e..0ddae13b40 100644
--- a/apps/desktop/src/main/resource-usage-window/__tests__/controller.test.ts
+++ b/apps/desktop/src/main/resource-usage-window/__tests__/controller.test.ts
@@ -777,7 +777,9 @@ describe('ResourceUsageWindowController', () => {
it('still cancels a cold open on native hide when pauseWhenHidden is false', () => {
const windows: FakeWindow[] = [];
const mainSender = { id: 100 } as WebContents;
+ const onActivityChanged = vi.fn();
const controller = new ResourceUsageWindowController({
+ onActivityChanged,
createWindow: () => {
const win = fakeWindow(windows.length + 1);
windows.push(win);
@@ -788,11 +790,14 @@ describe('ResourceUsageWindowController', () => {
openTimeoutMs: 1000,
});
controller.open(mainSender);
+ onActivityChanged.mockClear();
windows[0]?.emitWindow('hide');
controller.markPresentationReady(windows[0]!.webContents);
vi.advanceTimersByTime(1000);
expect(windows[0]?.show).not.toHaveBeenCalled();
expect(windows[0]?.focus).not.toHaveBeenCalled();
+ // The live session survives; only the reopening is cancelled.
+ expect(onActivityChanged).not.toHaveBeenCalledWith(expect.anything(), false);
});
it('shows a loading fallback only after the renderer shell has mounted', () => {
diff --git a/apps/desktop/src/main/resource-usage-window/controller.ts b/apps/desktop/src/main/resource-usage-window/controller.ts
index 7f24bc1de3..471db3ded3 100644
--- a/apps/desktop/src/main/resource-usage-window/controller.ts
+++ b/apps/desktop/src/main/resource-usage-window/controller.ts
@@ -142,7 +142,9 @@ export class ResourceUsageWindowController {
this.showAndFocus(win);
return true;
}
- if (!this.visible && !this.pendingOpen) this.setSamplingActive(win, false);
+ // 隐藏不暂停的窗口(远程桌面)在隐藏后才就绪时保留会话,只是不再显示。
+ if (!this.visible && !this.pendingOpen && this.deps.pauseWhenHidden !== false)
+ this.setSamplingActive(win, false);
return true;
}
diff --git a/apps/desktop/src/renderer/features/remote-desktop/__tests__/captureAudioRecovery.test.ts b/apps/desktop/src/renderer/features/remote-desktop/__tests__/captureAudioRecovery.test.ts
index f18dd3a945..8b68d20457 100644
--- a/apps/desktop/src/renderer/features/remote-desktop/__tests__/captureAudioRecovery.test.ts
+++ b/apps/desktop/src/renderer/features/remote-desktop/__tests__/captureAudioRecovery.test.ts
@@ -619,9 +619,11 @@ it('pauses and resumes the video encoder in place while the viewer is hidden', a
h.hide(true, 'other-lease');
await flush();
expect(setParameters).not.toHaveBeenCalled();
+ expect(h.reply).toHaveBeenLastCalledWith('hide', false);
h.hide(true);
await flush();
expect(current.encodings).toEqual([{ active: false }]);
+ expect(h.reply).toHaveBeenLastCalledWith('hide', true);
// Motion updates keep the pause instead of overwriting it.
vi.mocked(nativeCaptureStream).mock.calls.at(-1)?.[5]?.(false);
await flush();
@@ -651,3 +653,22 @@ it('applies a pause that arrives while the new peer is still being set up', asyn
expect.objectContaining({ encodings: [expect.objectContaining({ active: false })] }),
);
});
+
+it('reports a rejected encoder resume so the viewer rebuilds the video', async () => {
+ const h = setup();
+ h.offer(false, true, false, 'auto');
+ await flush();
+ const [peer] = h.peers;
+ peer.video.setParameters = vi.fn(async () => {
+ throw new Error('InvalidModificationError');
+ });
+ h.hide(false);
+ await flush();
+ expect(h.reply).toHaveBeenLastCalledWith('hide', false);
+ // A rejected update does not block later ones.
+ peer.video.setParameters = vi.fn(async (_parameters: unknown) => {});
+ h.hide(true);
+ await flush();
+ expect(h.reply).toHaveBeenLastCalledWith('hide', true);
+ expect(peer.close).not.toHaveBeenCalled();
+});
diff --git a/apps/desktop/src/renderer/features/remote-desktop/captureHost.ts b/apps/desktop/src/renderer/features/remote-desktop/captureHost.ts
index e80e2c37d6..db14cd8b61 100644
--- a/apps/desktop/src/renderer/features/remote-desktop/captureHost.ts
+++ b/apps/desktop/src/renderer/features/remote-desktop/captureHost.ts
@@ -59,19 +59,25 @@ export function startDesktopCaptureHost(api: DesktopCaptureApi): () => void {
let viewerHidden = false;
// setParameters rejects stale parameters, so every sender update is queued.
let senderUpdates = Promise.resolve();
- const updateVideoSenders = (update: (parameters: RTCRtpSendParameters) => boolean) => {
+ /** Resolves false when an encoder update was rejected. */
+ const updateVideoSenders = (
+ update: (parameters: RTCRtpSendParameters) => boolean,
+ ): Promise<boolean> => {
const rtc = peer,
current = generation;
- senderUpdates = senderUpdates
- .then(async () => {
- for (const sender of rtc?.getSenders() ?? []) {
- if (current !== generation || sender.track?.kind !== 'video') continue;
- const parameters = sender.getParameters();
- if (parameters.encodings?.length && update(parameters))
- await sender.setParameters(parameters);
- }
- })
- .catch(() => {});
+ const run = senderUpdates.then(async () => {
+ for (const sender of rtc?.getSenders() ?? []) {
+ if (current !== generation || sender.track?.kind !== 'video') continue;
+ const parameters = sender.getParameters();
+ if (parameters.encodings?.length && update(parameters))
+ await sender.setParameters(parameters);
+ }
+ });
+ senderUpdates = run.catch(() => {});
+ return run.then(
+ () => true,
+ () => false,
+ );
};
const applyViewerHidden = () =>
updateVideoSenders((parameters) => {
@@ -194,9 +200,12 @@ export function startDesktopCaptureHost(api: DesktopCaptureApi): () => void {
return;
}
if (command.op === 'viewer-hidden') {
- if (command.lease !== activeLease || typeof command.hidden !== 'boolean') return;
+ if (command.lease !== activeLease || typeof command.hidden !== 'boolean') {
+ void api.reply(command.id, false).catch(() => {});
+ return;
+ }
viewerHidden = command.hidden;
- applyViewerHidden();
+ void applyViewerHidden().then((applied) => api.reply(command.id, applied).catch(() => {}));
return;
}
stop();
@@ -225,7 +234,7 @@ export function startDesktopCaptureHost(api: DesktopCaptureApi): () => void {
const onMotion = (next: boolean) => {
moving = next;
if (!tuned || current !== generation) return;
- updateVideoSenders((parameters) => {
+ void updateVideoSenders((parameters) => {
if (parameters.degradationPreference === degradation()) return false;
parameters.degradationPreference = degradation();
return true;
@@ -591,7 +600,7 @@ export function startDesktopCaptureHost(api: DesktopCaptureApi): () => void {
await sender.setParameters(parameters);
}
// A pause that arrived while this peer was still being set up applies now.
- if (viewerHidden) applyViewerHidden();
+ if (viewerHidden) void applyViewerHidden();
if (!command.attemptId)
await new Promise<void>((resolve) => {
finishGathering = resolve;
diff --git a/apps/desktop/src/shared/remoteDesktop.ts b/apps/desktop/src/shared/remoteDesktop.ts
index f260dc1329..cb01f96801 100644
--- a/apps/desktop/src/shared/remoteDesktop.ts
+++ b/apps/desktop/src/shared/remoteDesktop.ts
@@ -67,7 +67,8 @@ export interface DesktopLocalState {
}
export type DesktopHostReply =
| string
- /** display-swap: true only when native capture kept a live stream. */
+ /** display-swap: true only when native capture kept a live stream;
+ * viewer-hidden: true once the video encoder applied the change. */
| boolean
| RemoteDesktopIceReply
| {
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index e3feaf1e12..bc6b8deec5 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -199,7 +199,8 @@ hd→20M):旧被控端只校验 `bitrate` 并忽略 `quality`,无需新增
被控端以可选能力 `viewerHidden` 声明支持 `{ op: "viewerHidden", lease, hidden }`:控制端窗口
隐藏、最小化、切换 macOS Space 或被完全遮挡时,被控端截屏页把当前视频发送端的
`encoding.active` 置为 `false`,原地停发视频;音频、输入、数据通道与 lease 不受影响,
-`hidden: false` 原地恢复,不重新协商。请求只要求当前 lease,不要求操作权;每次新 offer
+`hidden: false` 原地恢复,不重新协商。被控端等截屏页确认编码器已应用才回复成功,未应用(含截屏页忙)
+时返回错误,控制端据此重建视频。请求只要求当前 lease,不要求操作权;每次新 offer
从未暂停开始,控制端在视频重新播放后按当前可见性重发。显示切换期间同样接受该请求。
新版 Desktop 控制端仅在能力为真时发送,并在持续隐藏 1.5 秒后才暂停(macOS 原生全屏切换