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(usage): observe late peer recovery after relay reconnect

qianboebb3422bc7ab
diff --git a/apps/desktop/src/renderer/__tests__/useRemoteDeviceUsage.test.ts b/apps/desktop/src/renderer/__tests__/useRemoteDeviceUsage.test.ts
index 85001d73b8..49617802ee 100644
--- a/apps/desktop/src/renderer/__tests__/useRemoteDeviceUsage.test.ts
+++ b/apps/desktop/src/renderer/__tests__/useRemoteDeviceUsage.test.ts
@@ -36,6 +36,7 @@ type PushListener = (
const mocks = vi.hoisted(() => ({
invoke: vi.fn<(deviceId: string, channel: string, args: unknown[]) => Promise<unknown>>(),
pushListeners: [] as PushListener[],
+ statusListeners: [] as Array<(value: { status: 'online' | 'connecting' | 'stopped' }) => void>,
presenceListeners: [] as Array<(value: { deviceId: string; online: boolean }) => void>,
}));
@@ -59,6 +60,7 @@ beforeEach(() => {
mocks.invoke.mockReset();
mocks.pushListeners.length = 0;
mocks.presenceListeners.length = 0;
+ mocks.statusListeners.length = 0;
Object.defineProperty(window, 'electronAPI', {
configurable: true,
value: {
@@ -68,7 +70,10 @@ beforeEach(() => {
mocks.presenceListeners.push(listener);
return () => { mocks.presenceListeners = mocks.presenceListeners.filter(item => item !== listener); };
},
- onStatusChanged: () => () => {},
+ onStatusChanged: (listener: (value: { status: 'online' | 'connecting' | 'stopped' }) => void) => {
+ mocks.statusListeners.push(listener);
+ return () => { mocks.statusListeners = mocks.statusListeners.filter(item => item !== listener); };
+ },
onRemotePush: (cb: PushListener) => {
mocks.pushListeners.push(cb);
return () => {
@@ -412,3 +417,24 @@ it('queues a recovery read when a previous quota request is still in flight', as
expect(mocks.invoke).toHaveBeenCalledTimes(2);
expect(a.result.current).toBeNull();
});
+
+it('rereads when the target comes online after an early relay recovery read fails', async () => {
+ const quota = { spend: 12, maxBudget: 100, currency: 'CNY', todaySpend: null, fetchedAt: 1 };
+ mocks.invoke.mockResolvedValue(quota);
+ const view = renderHook(() => useRemoteClaudeAccountUsage('peer-late'));
+ await flushMicrotasks();
+ act(() => mocks.statusListeners.forEach(cb => cb({ status: 'online' })));
+ act(() => mocks.presenceListeners.forEach(cb => cb({ deviceId: 'peer-late', online: true })));
+ await flushMicrotasks();
+ mocks.invoke.mockRejectedValue(new Error('target offline'));
+ act(() => mocks.statusListeners.forEach(cb => cb({ status: 'connecting' })));
+ act(() => mocks.statusListeners.forEach(cb => cb({ status: 'online' })));
+ await flushMicrotasks();
+ expect(view.result.current).toEqual(quota);
+ mocks.invoke.mockClear();
+ mocks.invoke.mockResolvedValue({ quotaState: 'unlimited' });
+ act(() => mocks.presenceListeners.forEach(cb => cb({ deviceId: 'peer-late', online: true })));
+ await flushMicrotasks();
+ expect(mocks.invoke).toHaveBeenCalledTimes(1);
+ expect(view.result.current).toBeNull();
+});
diff --git a/apps/desktop/src/renderer/features/device-link/__tests__/useDeviceLinkReconnectEpoch.test.ts b/apps/desktop/src/renderer/features/device-link/__tests__/useDeviceLinkReconnectEpoch.test.ts
index 292718805a..992c33a747 100644
--- a/apps/desktop/src/renderer/features/device-link/__tests__/useDeviceLinkReconnectEpoch.test.ts
+++ b/apps/desktop/src/renderer/features/device-link/__tests__/useDeviceLinkReconnectEpoch.test.ts
@@ -61,6 +61,22 @@ describe('useDeviceLinkReconnectEpoch', () => {
expect(result.current).toBe(3);
});
+ it('observes target recovery after the relay reconnects without an offline presence event', () => {
+ const { result } = renderHook(() => useDeviceLinkReconnectEpoch('device-1'));
+ act(() => statusListener?.({ status: 'online' }));
+ act(() => presenceListener?.(presence('device-1', true)));
+ const previous = result.current;
+ act(() => statusListener?.({ status: 'connecting' }));
+ act(() => statusListener?.({ status: 'online' }));
+ expect(result.current).toBe(previous + 1);
+ act(() => presenceListener?.(presence('device-2', true)));
+ expect(result.current).toBe(previous + 1);
+ act(() => presenceListener?.(presence('device-1', true)));
+ expect(result.current).toBe(previous + 2);
+ act(() => presenceListener?.(presence('device-1', true)));
+ expect(result.current).toBe(previous + 2);
+ });
+
it('does not subscribe without a target and cleans up listeners', () => {
const api = window.electronAPI.deviceLink;
const initialProps: { deviceId: string | undefined } = {
diff --git a/apps/desktop/src/renderer/features/device-link/useDeviceLinkReconnectEpoch.ts b/apps/desktop/src/renderer/features/device-link/useDeviceLinkReconnectEpoch.ts
index a49263a03a..fc9d4360cc 100644
--- a/apps/desktop/src/renderer/features/device-link/useDeviceLinkReconnectEpoch.ts
+++ b/apps/desktop/src/renderer/features/device-link/useDeviceLinkReconnectEpoch.ts
@@ -26,6 +26,9 @@ export function useDeviceLinkReconnectEpoch(deviceId: string | undefined): numbe
const offStatus = window.electronAPI.deviceLink.onStatusChanged(({ status }) => {
const previous = relayStatusRef.current;
relayStatusRef.current = status;
+ // Presence from a previous relay connection cannot establish that the
+ // target is already online in this generation. It may recover later.
+ if (status !== 'online') targetOnlineRef.current = null;
if (status === 'online' && previous !== 'online') bump();
});