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): replay appearance updates during detached startup

DavidShen761251e1aeed
diff --git a/apps/desktop/src/preload/__tests__/appearanceSnapshot.test.ts b/apps/desktop/src/preload/__tests__/appearanceSnapshot.test.ts
new file mode 100644
index 0000000000..7b9c316b75
--- /dev/null
+++ b/apps/desktop/src/preload/__tests__/appearanceSnapshot.test.ts
@@ -0,0 +1,81 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { DEFAULT_APPEARANCE_SETTINGS, type AppearanceSettings } from '../../shared/appearanceSettings';
+
+const mocks = vi.hoisted(() => ({
+ listeners: new Map<string, Set<(event: unknown, payload: unknown) => void>>(),
+ expose: vi.fn(),
+ sendSync: vi.fn(),
+}));
+vi.mock('electron', () => ({
+ contextBridge: { exposeInMainWorld: mocks.expose },
+ ipcRenderer: {
+ sendSync: mocks.sendSync,
+ on: (channel: string, listener: (event: unknown, payload: unknown) => void) => {
+ if (!mocks.listeners.has(channel)) mocks.listeners.set(channel, new Set());
+ mocks.listeners.get(channel)!.add(listener);
+ },
+ removeListener: (channel: string, listener: (event: unknown, payload: unknown) => void) =>
+ mocks.listeners.get(channel)?.delete(listener),
+ },
+}));
+
+function emit(settings: AppearanceSettings) {
+ for (const listener of mocks.listeners.get('appearance-settings:changed') ?? [])
+ listener({ sender: 'must not cross the bridge' }, settings);
+}
+
+afterEach(() => vi.unstubAllGlobals());
+describe.each(['sidebar', 'resource', 'ghost-panel'])('%s appearance startup', (kind) => {
+ let bridge: {
+ getSync(): AppearanceSettings | null;
+ onChanged(callback: (settings: AppearanceSettings) => void): () => void;
+ };
+ beforeEach(async () => {
+ vi.resetModules();
+ mocks.listeners.clear();
+ mocks.expose.mockClear();
+ mocks.sendSync.mockImplementation((channel) =>
+ channel === 'appearance-settings:get-sync' ? DEFAULT_APPEARANCE_SETTINGS : null,
+ );
+ vi.stubGlobal('window', { location: { search: '?ghostPanelWindow=fixture' } });
+ if (kind === 'sidebar') await import('../sidebarWindowPreload');
+ else if (kind === 'resource') await import('../resourceUsagePreload');
+ else await import('../ghostPanelWindowPreload');
+ bridge = mocks.expose.mock.calls.at(-1)![1].appearanceSettings;
+ });
+
+ it('reads the latest wallpaper when broadcasts precede lazy renderer startup', () => {
+ const latest = { ...DEFAULT_APPEARANCE_SETTINGS, wallpaperId: 'cindy-dream' as const };
+ expect(bridge.getSync()).toEqual(DEFAULT_APPEARANCE_SETTINGS);
+ emit({ ...latest, wallpaperId: 'cindy-window' });
+ emit(latest);
+ expect(bridge.getSync()).toEqual(latest);
+ // Detached hosts remain read-only, without a new invoke capability.
+ expect(Object.keys(bridge).sort()).toEqual(['getSync', 'onChanged']);
+ });
+
+ it('replays updates between the initial render read and effect subscription', () => {
+ bridge.getSync();
+ const latest = { ...DEFAULT_APPEARANCE_SETTINGS, wallpaperId: 'custom' as const,
+ customWallpaperUrl: `cindy-media://client-wallpaper/${'b'.repeat(64)}.webp` };
+ emit(latest);
+ const callback = vi.fn();
+ const off = bridge.onChanged(callback);
+ expect(callback.mock.calls).toEqual([[latest]]);
+ emit(DEFAULT_APPEARANCE_SETTINGS);
+ expect(callback.mock.calls).toEqual([[latest], [DEFAULT_APPEARANCE_SETTINGS]]);
+ off();
+ });
+
+ it('keeps the cache current after unsubscribe and replays removal on remount', () => {
+ const latest = { ...DEFAULT_APPEARANCE_SETTINGS, wallpaperId: 'cindy-studio' as const };
+ emit(latest);
+ const first = vi.fn();
+ bridge.onChanged(first)();
+ emit(DEFAULT_APPEARANCE_SETTINGS);
+ expect(first.mock.calls).toEqual([[latest]]);
+ const remount = vi.fn();
+ bridge.onChanged(remount)();
+ expect(remount.mock.calls).toEqual([[DEFAULT_APPEARANCE_SETTINGS]]);
+ });
+});
diff --git a/apps/desktop/src/preload/appearanceSnapshot.ts b/apps/desktop/src/preload/appearanceSnapshot.ts
new file mode 100644
index 0000000000..7062dff903
--- /dev/null
+++ b/apps/desktop/src/preload/appearanceSnapshot.ts
@@ -0,0 +1,21 @@
+import { ipcRenderer } from 'electron';
+import type { AppearanceSettings } from '../shared/appearanceSettings';
+
+/** Read-only appearance for lazy detached renderers; no settings mutation IPC. */
+export function createAppearanceSnapshotBridge() {
+ let current = ipcRenderer.sendSync('appearance-settings:get-sync') as AppearanceSettings | null;
+ // Keep listening even with no renderer subscribers (startup, hidden or HMR).
+ ipcRenderer.on('appearance-settings:changed', (_event, next: AppearanceSettings) => {
+ current = next;
+ });
+ return {
+ getSync: (): AppearanceSettings | null => current,
+ onChanged: (callback: (settings: AppearanceSettings) => void): (() => void) => {
+ const listener = (_event: Electron.IpcRendererEvent, next: AppearanceSettings) => callback(next);
+ ipcRenderer.on('appearance-settings:changed', listener);
+ // Also closes the render -> effect gap after getSync has already run.
+ if (current) callback(current);
+ return () => ipcRenderer.removeListener('appearance-settings:changed', listener);
+ },
+ };
+}
diff --git a/apps/desktop/src/preload/ghostPanelWindowPreload.ts b/apps/desktop/src/preload/ghostPanelWindowPreload.ts
index 67f32065f8..68972e2dde 100644
--- a/apps/desktop/src/preload/ghostPanelWindowPreload.ts
+++ b/apps/desktop/src/preload/ghostPanelWindowPreload.ts
@@ -17,7 +17,7 @@
import { contextBridge, ipcRenderer } from 'electron';
-import type { AppearanceSettings } from '../shared/appearanceSettings';
+import { createAppearanceSnapshotBridge } from './appearanceSnapshot';
import type { LocalThemesResult } from '../shared/local-themes';
import type { GhostPanelWindowsState } from '../shared/ghostPanelWindow';
import { isValidGhostId } from '../shared/ghost';
@@ -114,9 +114,7 @@ function onCurrentGhostUnreadSnapshot(
return () => ipcRenderer.removeListener('ghosts:unread-snapshot', listener);
}
-const appearanceSettings = ipcRenderer.sendSync(
- 'appearance-settings:get-sync',
-) as AppearanceSettings | null;
+const appearanceSnapshot = createAppearanceSnapshotBridge();
const fanOutFullscreenChange = (cb: (isFullscreen: boolean) => void): Unsub =>
onPayload('fullscreen-change', cb);
@@ -134,11 +132,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
): void => ipcRenderer.send('renderer:log', level, scope, msg),
onLocaleChanged: (cb: (locale: SupportedLocale) => void): Unsub =>
onPayload(GHOST_PANEL_WINDOW_LOCALE_CHANGED_CHANNEL, cb),
- appearanceSettings: {
- getSync: (): AppearanceSettings | null => appearanceSettings,
- onChanged: (cb: (settings: AppearanceSettings) => void): Unsub =>
- onPayload('appearance-settings:changed', cb),
- },
+ appearanceSettings: appearanceSnapshot,
localThemes: {
listSync: (): LocalThemesResult => {
try {
diff --git a/apps/desktop/src/preload/resourceUsagePreload.ts b/apps/desktop/src/preload/resourceUsagePreload.ts
index aff81a2536..3cbb5c345d 100644
--- a/apps/desktop/src/preload/resourceUsagePreload.ts
+++ b/apps/desktop/src/preload/resourceUsagePreload.ts
@@ -2,7 +2,7 @@
import { contextBridge, ipcRenderer } from 'electron';
-import type { AppearanceSettings } from '../shared/appearanceSettings';
+import { createAppearanceSnapshotBridge } from './appearanceSnapshot';
import type { LocalThemesResult } from '../shared/local-themes';
import { DEFAULT_LOCALE, SUPPORTED_LOCALES, type SupportedLocale } from '../shared/locale';
import {
@@ -48,9 +48,7 @@ function readPreferredSystemLocale(): ApplicationMenuLocale {
}
}
-const appearanceSettings = ipcRenderer.sendSync(
- 'appearance-settings:get-sync',
-) as AppearanceSettings | null;
+const appearanceSnapshot = createAppearanceSnapshotBridge();
const fanOutFullscreenChange = (cb: (isFullscreen: boolean) => void): (() => void) =>
onPayload('fullscreen-change', cb);
@@ -71,11 +69,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
scope: string,
msg: string,
): void => ipcRenderer.send('renderer:log', level, scope, msg),
- appearanceSettings: {
- getSync: (): AppearanceSettings | null => appearanceSettings,
- onChanged: (cb: (settings: AppearanceSettings) => void): (() => void) =>
- onPayload('appearance-settings:changed', cb),
- },
+ appearanceSettings: appearanceSnapshot,
localThemes: {
listSync: (): LocalThemesResult => {
try {
diff --git a/apps/desktop/src/preload/sidebarWindowPreload.ts b/apps/desktop/src/preload/sidebarWindowPreload.ts
index c765a7f0a1..95efedc34d 100644
--- a/apps/desktop/src/preload/sidebarWindowPreload.ts
+++ b/apps/desktop/src/preload/sidebarWindowPreload.ts
@@ -17,7 +17,7 @@ import { COPY_PNG_TO_CLIPBOARD_CHANNEL, type CopyPngToClipboardParams } from '..
import { contextBridge, ipcRenderer, webUtils } from 'electron';
-import type { AppearanceSettings } from '../shared/appearanceSettings';
+import { createAppearanceSnapshotBridge } from './appearanceSnapshot';
import { DEVICE_LINK_INVOKE, DEVICE_LINK_PUSH } from '../shared/deviceLinkIpc';
import type { LocalThemesResult } from '../shared/local-themes';
import { DEFAULT_LOCALE, SUPPORTED_LOCALES, type SupportedLocale } from '../shared/locale';
@@ -67,9 +67,7 @@ function readPreferredSystemLocale(): ApplicationMenuLocale {
}
}
-const appearanceSettings = ipcRenderer.sendSync(
- 'appearance-settings:get-sync',
-) as AppearanceSettings | null;
+const appearanceSnapshot = createAppearanceSnapshotBridge();
const fanOutFullscreenChange = (cb: (isFullscreen: boolean) => void): (() => void) =>
onPayload('fullscreen-change', cb);
@@ -92,11 +90,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
): void => ipcRenderer.send('renderer:log', level, scope, msg),
onLocaleChanged: (cb: (locale: SupportedLocale) => void): (() => void) =>
onPayload(RSB_WINDOW_LOCALE_CHANGED_CHANNEL, cb),
- appearanceSettings: {
- getSync: (): AppearanceSettings | null => appearanceSettings,
- onChanged: (cb: (settings: AppearanceSettings) => void): (() => void) =>
- onPayload('appearance-settings:changed', cb),
- },
+ appearanceSettings: appearanceSnapshot,
localThemes: {
listSync: (): LocalThemesResult => {
try {