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(archive): 手机端自动化查询设置等待上限,超时按无绑定处理

Dashd33c71e31820
diff --git a/apps/mobile/src/__tests__/archiveScheduleConfirm.test.ts b/apps/mobile/src/__tests__/archiveScheduleConfirm.test.ts
new file mode 100644
index 0000000000..f6cf6b78e0
--- /dev/null
+++ b/apps/mobile/src/__tests__/archiveScheduleConfirm.test.ts
@@ -0,0 +1,56 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+const mocks = vi.hoisted(() => ({
+ list: vi.fn(),
+ mayHave: vi.fn(() => true),
+}));
+
+vi.mock('react-native', () => ({ Alert: { alert: vi.fn() } }));
+vi.mock('@/device-link/mobileMakerTransport', () => ({
+ createMobileMakerTransport: () => ({ schedule: { list: mocks.list } }),
+}));
+vi.mock('@/session/scheduleIndex', () => ({ sessionMayHaveScheduleRuns: mocks.mayHave }));
+
+import {
+ countSessionsWithActiveBoundSchedules,
+ loadActiveBoundScheduleNames,
+ SCHEDULE_LOOKUP_WAIT_MS,
+} from '@/session/archiveScheduleConfirm';
+
+const args = { deviceId: 'pc', invoke: vi.fn(), sessionId: 'task' } as never;
+
+describe('archive schedule lookup deadline', () => {
+ beforeEach(() => {
+ vi.useFakeTimers();
+ mocks.list.mockReset();
+ mocks.mayHave.mockReturnValue(true);
+ });
+ afterEach(() => vi.useRealTimers());
+
+ it('treats a slow list request as no binding instead of blocking archive', async () => {
+ mocks.list.mockReturnValue(new Promise(() => {}));
+
+ const single = loadActiveBoundScheduleNames(args);
+ const bulk = countSessionsWithActiveBoundSchedules({ schedule: { list: mocks.list } } as never, ['task']);
+ await vi.advanceTimersByTimeAsync(SCHEDULE_LOOKUP_WAIT_MS);
+
+ await expect(single).resolves.toEqual([]);
+ await expect(bulk).resolves.toBe(0);
+ });
+
+ it('still reports active non-persistent bindings that arrive in time', async () => {
+ mocks.list.mockResolvedValue([
+ { id: 'a', name: 'Daily', status: 'active', targetSessionId: 'task' },
+ { id: 'b', name: 'Persistent', status: 'active', targetSessionId: 'task', persistentSession: true },
+ ]);
+
+ await expect(loadActiveBoundScheduleNames(args)).resolves.toEqual(['Daily']);
+ });
+
+ it('skips the request for tasks known to be unbound', async () => {
+ mocks.mayHave.mockReturnValue(false);
+
+ await expect(loadActiveBoundScheduleNames(args)).resolves.toEqual([]);
+ expect(mocks.list).not.toHaveBeenCalled();
+ });
+});
diff --git a/apps/mobile/src/session/archiveScheduleConfirm.ts b/apps/mobile/src/session/archiveScheduleConfirm.ts
index 2e19f8fbae..bd8ea744b7 100644
--- a/apps/mobile/src/session/archiveScheduleConfirm.ts
+++ b/apps/mobile/src/session/archiveScheduleConfirm.ts
@@ -12,8 +12,21 @@ import { sessionMayHaveScheduleRuns } from '@/session/scheduleIndex';
/**
* 归档前的自动化提醒:绑定到已归档任务的自动化在下次触发时会被电脑暂停(持续会话除外,
* 它会换绑新任务继续跑),归档前先让用户知道。已知未绑定的普通任务直接放行,不额外请求;
- * 读取失败按无绑定处理。
+ * 读取失败或超过等待上限按无绑定处理。
*/
+/** 查询自动化列表的等待上限:超时按「无绑定」处理,不让归档卡在远程请求上(通道超时预算可达 40 秒)。 */
+export const SCHEDULE_LOOKUP_WAIT_MS = 1500;
+
+function withLookupDeadline<T>(lookup: Promise<T>, fallback: T): Promise<T> {
+ return new Promise((resolve) => {
+ const timer = setTimeout(() => resolve(fallback), SCHEDULE_LOOKUP_WAIT_MS);
+ lookup.then(
+ (value) => { clearTimeout(timer); resolve(value); },
+ () => { clearTimeout(timer); resolve(fallback); },
+ );
+ });
+}
+
function stopsWhenTargetArchived(schedule: RemoteSchedule): boolean {
return schedule.status === 'active' && !schedule.persistentSession && !!schedule.targetSessionId;
}
@@ -26,7 +39,7 @@ export async function countSessionsWithActiveBoundSchedules(
try {
const ids = new Set(sessionIds);
const bound = new Set(
- normalizeScheduleList(await maker.schedule.list())
+ normalizeScheduleList(await withLookupDeadline(maker.schedule.list(), []))
.filter((schedule) => stopsWhenTargetArchived(schedule) && ids.has(schedule.targetSessionId!))
.map((schedule) => schedule.targetSessionId),
);
@@ -50,7 +63,7 @@ export async function loadActiveBoundScheduleNames({
if (!sessionMayHaveScheduleRuns(deviceId, sessionId, source)) return [];
try {
const schedules = normalizeScheduleList(
- await createMobileMakerTransport({ deviceId, invoke }).schedule.list(),
+ await withLookupDeadline(createMobileMakerTransport({ deviceId, invoke }).schedule.list(), []),
);
return schedules
.filter((schedule) => schedule.targetSessionId === sessionId && stopsWhenTargetArchived(schedule))