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): 远程桌面隐藏暂停结果未知时按已生效处理,显示时必恢复

Dashaabd08184e9f
diff --git a/apps/desktop/src/renderer/features/remote-desktop/__tests__/viewerHidden.test.ts b/apps/desktop/src/renderer/features/remote-desktop/__tests__/viewerHidden.test.ts
index 4928ee0f7b..9dba6fb757 100644
--- a/apps/desktop/src/renderer/features/remote-desktop/__tests__/viewerHidden.test.ts
+++ b/apps/desktop/src/renderer/features/remote-desktop/__tests__/viewerHidden.test.ts
@@ -22,7 +22,7 @@ afterEach(() => {
vi.useRealTimers();
});
-async function setup({ viewerHidden = true, failResume = false } = {}) {
+async function setup({ viewerHidden = true, failResume = false, failPause = false } = {}) {
vi.useFakeTimers();
const requests: RemoteDesktopRequest[] = [];
const api = {
@@ -62,6 +62,8 @@ async function setup({ viewerHidden = true, failResume = false } = {}) {
if (request.op === 'frame') return { jpeg: 'AAAA' };
if (request.op === 'viewerHidden' && failResume && !request.hidden)
throw new Error('DESKTOP_REQUEST_FAILED');
+ if (request.op === 'viewerHidden' && failPause && request.hidden)
+ throw new Error('INVOKE_TIMEOUT');
return {};
},
} satisfies RemoteDesktopViewerApi;
@@ -143,3 +145,37 @@ it('stops screenshot polling while hidden and resumes it when shown', async () =
await vi.advanceTimersByTimeAsync(700);
expect(frames()).toBeGreaterThan(paused);
});
+
+it('always resumes on show after a pause whose outcome is unknown', async () => {
+ const h = await setup({ failPause: true });
+ h.receive({ type: 'streaming' });
+ h.controller.setHidden(true);
+ await vi.advanceTimersByTimeAsync(1500);
+ expect(h.hidden()).toEqual([true]);
+ h.controller.setHidden(false);
+ await vi.advanceTimersByTimeAsync(0);
+ expect(h.hidden()).toEqual([true, false]);
+});
+
+it('resumes when shown while an unacknowledged pause was still in flight', async () => {
+ let fail!: (error: Error) => void;
+ const h = await setup();
+ h.receive({ type: 'streaming' });
+ h.controller.setHidden(true);
+ // Hold the pause in flight, then show before it settles.
+ const original = (h.controller as any).request;
+ (h.controller as any).request = (value: any) =>
+ value.op === 'viewerHidden' && value.hidden
+ ? (h.requests.push(value),
+ new Promise((_, reject) => {
+ fail = reject;
+ }))
+ : original(value);
+ await vi.advanceTimersByTimeAsync(1500);
+ h.controller.setHidden(false);
+ await vi.advanceTimersByTimeAsync(0);
+ expect(h.hidden()).toEqual([true]);
+ fail(new Error('INVOKE_TIMEOUT'));
+ await vi.advanceTimersByTimeAsync(0);
+ expect(h.hidden()).toEqual([true, false]);
+});
diff --git a/apps/desktop/src/renderer/features/remote-desktop/viewerController.ts b/apps/desktop/src/renderer/features/remote-desktop/viewerController.ts
index ac83f4affe..8b5f717de5 100644
--- a/apps/desktop/src/renderer/features/remote-desktop/viewerController.ts
+++ b/apps/desktop/src/renderer/features/remote-desktop/viewerController.ts
@@ -533,22 +533,26 @@ export class DesktopViewerController {
return;
const stream = this.videoStream;
this.hiddenBusy = true;
- let next = false;
+ let failed = false;
try {
await this.request({ op: 'viewerHidden', lease: lease.lease, hidden });
- if (stream === this.videoStream) this.videoHidden = hidden;
- next = true;
} catch {
- next = stream !== this.videoStream;
- // A failed resume must not leave the picture frozen: a new offer starts unpaused.
- if (!next && !hidden && this.session.lease === lease) {
+ failed = true;
+ } finally {
+ this.hiddenBusy = false;
+ }
+ if (stream === this.videoStream) {
+ // Even an unacknowledged request may have applied, so track it as applied:
+ // showing then always sends a resume. A resume that may not have applied
+ // must not leave the picture frozen: rebuild, since a new offer starts unpaused.
+ this.videoHidden = hidden;
+ if (failed && !hidden && this.session.lease === lease) {
this.pendingSettings = true;
this.applySettings();
}
- } finally {
- this.hiddenBusy = false;
}
- if (next) void this.syncHidden();
+ // Terminates: after any outcome videoHidden equals the requested state.
+ void this.syncHidden();
}
actualSize(): void {
const lease = this.session.lease;