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(files): 拒绝交付复验不一致的导出结果

Dash630074901b36
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index fb8c8b05bc..2382becced 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -881,8 +881,10 @@ Mobile 复用 `remote-media` 磁盘缓存,放入 realm/账号 SHA-256 命名
大文件沿用 peer/OSS 读取。同账号旧 Host 忽略 `metadataOnly`,新控制端接收原 inline/OSS 结果;
共享任务的旧 Host 使用闭集参数白名单,两端访客不发送 `metadataOnly`,沿用先授权的 inline/OSS
读取。新 Host 同时接受布尔型 `metadataOnly`,不改变成员、附件归属及工作目录校验。
-旧控制端不传此字段,新 Host 保持原行为。两段式导出缺版本时,以导出前后主机版本和大小一致
-作为登记条件,变化或无版本的结果不登记为长期有效。缓存失败不阻断正常读取。
+旧控制端不传此字段,新 Host 保持原行为。两段式导出缺版本而准备阶段有有效版本时,必须确认
+导出前后主机版本、大小及导出大小一致才交付;不一致报 FILE_PEER_CHANGED 并释放导出暂存,
+复验异常或取消也不交付,避免外层缓存发布未确认字节,后台沿用旧副本。无版本旧 Host 保持原读取方式,
+不将其结果登记为主机版本缓存。缓存存储失败不阻断正常读取。
Mobile 的文件浏览器原图、PDF、下载/分享使用完整文件路径,先取当前账号、设备、
完整 URL 对应的本地缓存,再后台检查版本;同源在途后台检查合并。连接恢复也放到缓存读取之后。
HTML 由预览层复用同一账号磁盘缓存并持有独立快照;后台取件跳过传输层的旧快照,
diff --git a/packages/device-link/src/__tests__/fileAccess.test.ts b/packages/device-link/src/__tests__/fileAccess.test.ts
index 1a7ce9028a..9ceefb0459 100644
--- a/packages/device-link/src/__tests__/fileAccess.test.ts
+++ b/packages/device-link/src/__tests__/fileAccess.test.ts
@@ -48,17 +48,47 @@ describe("shared file read policy", () => {
expect(discard).toHaveBeenCalledWith(cached);
expect(prepare).not.toHaveBeenCalled();
});
- it.each([true, false])('only versions a completed fallback when its source is unchanged (%s)', async unchanged => {
+ it.each(['unchanged', 'version', 'source-size', 'export-size', 'denied', 'cancelled'] as const)(
+ 'only delivers a revalidated export to its consumer: %s', async mode => {
const version = 'a'.repeat(64);
const prepared = { ...metadata, version };
- const result = await readDeviceFile({
+ const exported = { ossKey: 'export/key', size: prepared.size + (mode === 'export-size' ? 1 : 0), mimeType: 'application/octet-stream' };
+ const discard = vi.fn(), publish = vi.fn();
+ const abort = new AbortController();
+ const pending = readDeviceFile({
prepare: async () => prepared,
peer: async () => null,
- fallback: async () => ({ ossKey: 'export/key', size: prepared.size, mimeType: 'application/octet-stream' }),
- revalidate: async () => ({ ...prepared, version: unchanged ? version : 'b'.repeat(64) }),
- });
- expect(result.version).toBe(unchanged ? version : undefined);
- expect(result.mimeType).toBe(unchanged ? metadata.mimeType : 'application/octet-stream');
+ fallback: async () => exported,
+ revalidate: async () => {
+ if (mode === 'denied') throw new Error('DENIED');
+ if (mode === 'cancelled') abort.abort();
+ return { ...prepared, version: mode === 'version' ? 'b'.repeat(64) : version,
+ size: prepared.size + (mode === 'source-size' ? 1 : 0) };
+ },
+ signal: abort.signal, discard,
+ }).then(publish);
+ if (mode === 'unchanged') {
+ await pending;
+ expect(publish).toHaveBeenCalledExactlyOnceWith({ ...exported, version, mimeType: metadata.mimeType });
+ expect(discard).not.toHaveBeenCalled();
+ } else {
+ await expect(pending).rejects.toThrow(mode === 'denied' ? 'DENIED' : mode === 'cancelled' ? 'FILE_PEER_CANCELLED' : 'FILE_PEER_CHANGED');
+ expect(publish).not.toHaveBeenCalled();
+ expect(discard).toHaveBeenCalledExactlyOnceWith(exported);
+ }
+ });
+ it('keeps the last good cache when a background export changes during revalidation', async () => {
+ const cached = { ...metadata, version: 'a'.repeat(64), inlineBase64: 'b2xk' };
+ const exported = { ossKey: 'export/changed', size: metadata.size, mimeType: metadata.mimeType };
+ const discard = vi.fn(), retain = vi.fn();
+ expect(await readDeviceFile({
+ cacheFirst: { key: 'changed-export', read: async () => cached, retain },
+ prepare: async () => ({ ...metadata, version: 'b'.repeat(64) }),
+ peer: async () => null, fallback: async () => exported,
+ revalidate: async () => ({ ...metadata, version: 'c'.repeat(64) }), discard,
+ })).toBe(cached);
+ await vi.waitFor(() => expect(discard).toHaveBeenCalledExactlyOnceWith(exported));
+ expect(retain).not.toHaveBeenCalled();
});
it.each(['text/html', 'text/css', 'application/javascript', 'text/plain', 'application/pdf', 'image/png', 'application/zip'])(
'revalidates %s before reusing bytes and replaces changed versions', async (mimeType) => {
diff --git a/packages/device-link/src/fileAccess.ts b/packages/device-link/src/fileAccess.ts
index 8b88d64aa8..840ba2073d 100644
--- a/packages/device-link/src/fileAccess.ts
+++ b/packages/device-link/src/fileAccess.ts
@@ -115,12 +115,15 @@ export async function readDeviceFile<T extends DeviceFileResult>(options: {
const result = await options.fallback();
if (!active()) return discardCancelled(result);
if (!mediaStream && !result.version && validFileVersion(prepared.version) && options.revalidate) {
- let after: DeviceFileResult;
- try { after = await options.revalidate(); }
- catch (error) { await options.discard?.(result); throw error; }
- if (!active()) return discardCancelled(result);
- if (after.version === prepared.version && after.size === prepared.size && result.size === prepared.size)
+ try {
+ const after = await options.revalidate();
+ assertActive();
+ // A result without a version can still be persisted by an outer cache.
+ // Reject inconsistent exports here, before any consumer can publish them.
+ if (after.version !== prepared.version || after.size !== prepared.size || result.size !== prepared.size)
+ throw new Error('FILE_PEER_CHANGED');
return { ...result, version: prepared.version, mimeType: prepared.mimeType };
+ } catch (error) { await options.discard?.(result); throw error; }
}
return result;
}