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(mobile): 缓存清理失败后仍尝试其余删除

Dashea8ce325bb29
diff --git a/apps/mobile/src/__tests__/messageCacheStorage.test.ts b/apps/mobile/src/__tests__/messageCacheStorage.test.ts
index ac31b99557..da1eb4203d 100644
--- a/apps/mobile/src/__tests__/messageCacheStorage.test.ts
+++ b/apps/mobile/src/__tests__/messageCacheStorage.test.ts
@@ -53,13 +53,14 @@ describe('message cache file migration', () => {
await storage.setItem('cache.a', 'new');
expect(await storage.getItem('cache.a')).toBe('new');
});
- it('propagates failed legacy deletion without removing the authoritative file', async () => {
- state.legacy.set('cache.a', 'old');
+ it('removes the file even when deleting an absent legacy entry rejects', async () => {
state.files.set('cache.a.json', 'new');
vi.mocked(AsyncStorage.removeItem).mockRejectedValueOnce(new Error('busy'));
await expect(storage.removeItem('cache.a')).rejects.toThrow();
- expect(await storage.getItem('cache.a')).toBe('new');
- await storage.removeItem('cache.a');
+ expect(state.files.size).toBe(0);
+ vi.resetModules();
+ const restarted = (await import('@/session/messageCacheStorage')).messageCacheStorage;
+ expect(await restarted.getItem('cache.a')).toBeNull();
expect(await storage.getItem('cache.a')).toBeNull();
});
it('deletes both backends without writing when the disk is full', async () => {
@@ -78,10 +79,33 @@ describe('message cache file migration', () => {
if (kind === 'legacy') vi.mocked(AsyncStorage.multiRemove).mockRejectedValueOnce(error);
if (kind === 'files') io.remove.mockRejectedValueOnce(error);
await expect(storage.clear('cache')).rejects.toThrow(error);
+ if (kind !== 'files') expect(state.files.size).toBe(0);
+ if (kind === 'files') expect(state.legacy.size).toBe(0);
await storage.clear('cache');
expect(await storage.getItem('cache.a')).toBeNull();
expect(io.write).not.toHaveBeenCalled();
});
+ it('waits for file deletion after legacy failure before rejecting', async () => {
+ vi.mocked(AsyncStorage.removeItem).mockRejectedValueOnce(new Error('legacy unavailable'));
+ let finish!: () => void;
+ io.remove.mockImplementationOnce(() => new Promise<void>(resolve => { finish = resolve; }));
+ let settled = false;
+ const deletion = storage.removeItem('cache.a').catch(error => { settled = true; return error; });
+ await vi.waitFor(() => expect(finish).toBeTypeOf('function'));
+ expect(settled).toBe(false);
+ finish();
+ expect(await deletion).toBeInstanceOf(Error);
+ });
+ it('attempts later files and aggregates independent backend failures', async () => {
+ state.files.set('cache.a.json', 'a'); state.files.set('cache.b.json', 'b');
+ const legacyError = new Error('legacy unavailable');
+ const fileError = new Error('file unavailable');
+ vi.mocked(AsyncStorage.getAllKeys).mockRejectedValueOnce(legacyError);
+ io.remove.mockRejectedValueOnce(fileError);
+ await expect(storage.clear('cache')).rejects.toMatchObject({ errors: [legacyError, fileError] });
+ expect(state.files.has('cache.b.json')).toBe(false);
+ expect(io.write).not.toHaveBeenCalled();
+ });
it('does not hide an IO failure by falling back to older data', async () => {
state.legacy.set('cache.a', 'old');
io.read.mockRejectedValueOnce(new Error('read failed'));
diff --git a/apps/mobile/src/session/messageCacheStorage.ts b/apps/mobile/src/session/messageCacheStorage.ts
index f136de7f37..30e4675e3c 100644
--- a/apps/mobile/src/session/messageCacheStorage.ts
+++ b/apps/mobile/src/session/messageCacheStorage.ts
@@ -18,6 +18,17 @@ function write(key: string, value: string): Promise<void> {
return persist(async () => { await (await disk()).write(`${key}.json`, value); });
}
+// Exhaust every deletion before rejecting. One unavailable backend/file must not
+// prevent another from being removed, or let account cleanup finish early.
+async function removeAll(operations: Array<() => Promise<void>>): Promise<void> {
+ const errors: unknown[] = [];
+ for (const operation of operations) {
+ try { await operation(); } catch (error) { errors.push(error); }
+ }
+ if (errors.length === 1) throw errors[0];
+ if (errors.length > 1) throw new AggregateError(errors, 'Cache cleanup failed');
+}
+
// Callers serialize operations per key and fence reads/writes against logout.
// Both mobile platforms use the same private cache files, with no total quota/TTL.
export const messageCacheStorage = {
@@ -39,19 +50,21 @@ export const messageCacheStorage = {
await AsyncStorage.removeItem(key).catch(() => undefined);
},
async removeItem(key: string): Promise<void> {
- await persist(async () => {
- const files = await disk();
- // Delete fallback first: deletion must not need free space for a new file.
- await AsyncStorage.removeItem(key);
- await files.remove(`${key}.json`);
- });
+ await persist(() => removeAll([
+ () => AsyncStorage.removeItem(key),
+ async () => { await (await disk()).remove(`${key}.json`); },
+ ]));
},
async clear(prefix: string): Promise<void> {
- await persist(async () => {
- const files = await disk();
- const keys = (await AsyncStorage.getAllKeys()).filter(key => key.startsWith(`${prefix}.`));
- if (keys.length) await AsyncStorage.multiRemove(keys);
- for (const name of await files.files()) await files.remove(name);
- });
+ await persist(() => removeAll([
+ async () => {
+ const keys = (await AsyncStorage.getAllKeys()).filter(key => key.startsWith(`${prefix}.`));
+ if (keys.length) await AsyncStorage.multiRemove(keys);
+ },
+ async () => {
+ const files = await disk();
+ await removeAll((await files.files()).map(name => () => files.remove(name)));
+ },
+ ]));
},
};
diff --git a/docs/dev-rules/mobile-development.md b/docs/dev-rules/mobile-development.md
index e8cdabe344..d426aba791 100644
--- a/docs/dev-rules/mobile-development.md
+++ b/docs/dev-rules/mobile-development.md
@@ -89,7 +89,9 @@ pnpm --filter mobile test:smoke
- 旧 AsyncStorage 消息按需迁移:仅在文件缺失时读取旧条目,成功原子写入后再删除旧值;
失败保留旧条目。回退到旧版不会读取新文件,会重新从主机获取消息。
迁移与同一任务的写入/删除共用队列,退出账号等待在途迁移后清理两种存储。
-- 删除先清理旧条目,再删除文件,不依赖新增文件写入。新登录或切换账号必须在持久化
+- 删除逐项尝试旧条目和文件,不依赖新增文件写入;任一后端失败不阻止另一后端清理,
+ 单个文件失败也不阻止后续文件删除,全部尝试结束后统一报告失败。清理报错时可能仍有
+ 无法删除的残留,不能视为清理成功。新登录或切换账号必须在持久化
新身份前完成缓存清理;清理失败沿用登录错误与回滚路径,不能激活下一账号。
退出账号仍完成凭证清除;若缓存清理失败,下次登录会先重试。无有效账号期间禁止
读取或写入消息缓存,避免退出后的卸载回调重新落盘。