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): 移除跨请求后台复验合并

Dash231aef386b0a
diff --git a/apps/desktop/src/main/device-link/fileAccess.ts b/apps/desktop/src/main/device-link/fileAccess.ts
index cfa43b981f..de8b5a7046 100644
--- a/apps/desktop/src/main/device-link/fileAccess.ts
+++ b/apps/desktop/src/main/device-link/fileAccess.ts
@@ -80,7 +80,6 @@ export function readRemoteDeviceFile(
};
return readDeviceFile<LocalFileResult>({
cacheFirst: options.skipCache || options.cacheFirst === false || isSharedTaskPeer(device) ? undefined : {
- key: cacheKey,
read: async () => {
const previous = latestFiles.get(cacheKey);
if (!previous || (options.stream && /^(audio|video)\//.test(previous.metadata.mimeType))) return null;
diff --git a/apps/mobile/src/device-link/mobileMakerTransport.ts b/apps/mobile/src/device-link/mobileMakerTransport.ts
index 3dc4de06c1..cf3a64d55f 100644
--- a/apps/mobile/src/device-link/mobileMakerTransport.ts
+++ b/apps/mobile/src/device-link/mobileMakerTransport.ts
@@ -1143,7 +1143,6 @@ export function createMobileMakerTransport({
() =>
readDeviceFile({
cacheFirst: stream || opts?.skipCache || opts?.thumbnail || isSharedTaskPeer(deviceId) ? undefined : {
- key: JSON.stringify([fileOwner.accountKey, fileOwner.generation, deviceId, url]),
read: async () => (await getFileCache())?.readLatest(deviceId, url, () => fileIsCurrent() && !opts?.signal?.aborted) ?? null,
retain: async (result) => { await opts?.retainBackground?.(withDownload(result), fileIsCurrent); },
},
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index 2382becced..7cf1c9888d 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -886,7 +886,8 @@ Mobile 复用 `remote-media` 磁盘缓存,放入 realm/账号 SHA-256 命名
复验异常或取消也不交付,避免外层缓存发布未确认字节,后台沿用旧副本。无版本旧 Host 保持原读取方式,
不将其结果登记为主机版本缓存。缓存存储失败不阻断正常读取。
Mobile 的文件浏览器原图、PDF、下载/分享使用完整文件路径,先取当前账号、设备、
-完整 URL 对应的本地缓存,再后台检查版本;同源在途后台检查合并。连接恢复也放到缓存读取之后。
+完整 URL 对应的本地缓存,再后台检查版本;每次读取独立复验,取消或过期的旧读取不压住重开后的检查。
+不增加跨请求复验接管或自动重试。连接恢复也放到缓存读取之后。
HTML 由预览层复用同一账号磁盘缓存并持有独立快照;后台取件跳过传输层的旧快照,
避免将旧内容再次写回预览缓存。空文件以明确的 expectedSize === 0 为依据保存。
相对路径到主机 URL 的映射只保留在进程内;Mobile 重启后的首次相对路径读取仍需在线查询
diff --git a/packages/device-link/src/__tests__/fileAccess.test.ts b/packages/device-link/src/__tests__/fileAccess.test.ts
index 9ceefb0459..4d24fe27ec 100644
--- a/packages/device-link/src/__tests__/fileAccess.test.ts
+++ b/packages/device-link/src/__tests__/fileAccess.test.ts
@@ -8,20 +8,26 @@ const metadata = {
transferRequired: true,
};
describe("shared file read policy", () => {
- it('returns cached bytes while the host is pending, and merges background revalidation', async () => {
+ it.each(['cancelled', 'superseded'])('reopens from cache and refreshes independently of a %s read', async mode => {
const cached = { ...metadata, version: 'a'.repeat(64), inlineBase64: 'YQ==' };
+ const fresh = { ...cached, version: 'b'.repeat(64), transferRequired: false, inlineBase64: 'Yg==' };
let reply!: (value: DeviceFileResult) => void;
- const prepare = vi.fn(() => new Promise<DeviceFileResult>(resolve => { reply = resolve; }));
+ const prepare = vi.fn().mockImplementationOnce(() => new Promise<DeviceFileResult>(resolve => { reply = resolve; }))
+ .mockResolvedValue(fresh);
const retain = vi.fn(), discard = vi.fn(), peer = vi.fn();
+ const abort = new AbortController();
+ let current = true;
const options = { prepare, peer, fallback: vi.fn(), discard,
- cacheFirst: { key: 'cache-first-pending', read: async () => cached, retain } };
+ cacheFirst: { read: async () => cached, retain } };
+ expect(await readDeviceFile({ ...options, signal: abort.signal, isCurrent: () => current })).toBe(cached);
+ if (mode === 'cancelled') abort.abort();
+ else current = false;
expect(await readDeviceFile(options)).toBe(cached);
- expect(await readDeviceFile(options)).toBe(cached);
- expect(prepare).toHaveBeenCalledOnce();
- const fresh = { ...cached, version: 'b'.repeat(64), transferRequired: false, inlineBase64: 'Yg==' };
- reply(fresh);
- await vi.waitFor(() => expect(retain).toHaveBeenCalledWith(fresh));
- expect(discard).toHaveBeenCalledWith(fresh);
+ // The reopened request must publish before the obsolete host read settles.
+ try { await vi.waitFor(() => expect(retain).toHaveBeenCalledExactlyOnceWith(fresh)); }
+ finally { reply(cached); }
+ await vi.waitFor(() => expect(discard).toHaveBeenCalledWith(cached));
+ expect(retain).toHaveBeenCalledExactlyOnceWith(fresh);
expect(peer).not.toHaveBeenCalled();
});
it.each(['unchanged', 'offline'] as const)('keeps cached bytes on %s without transferring them again', async mode => {
@@ -32,7 +38,7 @@ describe("shared file read policy", () => {
});
const peer = vi.fn(), fallback = vi.fn(), retain = vi.fn();
expect(await readDeviceFile({ prepare, peer, fallback,
- cacheFirst: { key: mode, read: async () => cached, retain } })).toBe(cached);
+ cacheFirst: { read: async () => cached, retain } })).toBe(cached);
await vi.waitFor(() => expect(prepare).toHaveBeenCalledOnce());
expect(peer).not.toHaveBeenCalled();
expect(fallback).not.toHaveBeenCalled();
@@ -43,7 +49,7 @@ describe("shared file read policy", () => {
const cached = { ...metadata, version: 'a'.repeat(64) };
const discard = vi.fn(), prepare = vi.fn();
await expect(readDeviceFile({ prepare, peer: vi.fn(), fallback: vi.fn(), discard,
- isCurrent: () => current, cacheFirst: { key: 'switched', read: async () => { current = false; return cached; } },
+ isCurrent: () => current, cacheFirst: { read: async () => { current = false; return cached; } },
})).rejects.toThrow('FILE_PEER_CANCELLED');
expect(discard).toHaveBeenCalledWith(cached);
expect(prepare).not.toHaveBeenCalled();
@@ -82,7 +88,7 @@ describe("shared file read policy", () => {
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 },
+ cacheFirst: { 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,
diff --git a/packages/device-link/src/fileAccess.ts b/packages/device-link/src/fileAccess.ts
index 840ba2073d..218d824aaf 100644
--- a/packages/device-link/src/fileAccess.ts
+++ b/packages/device-link/src/fileAccess.ts
@@ -2,7 +2,6 @@ import { validFileVersion } from './fileTransferPolicy';
/** Shared file read policy. UI entry points never choose a transport. */
export const FILE_INLINE_MAX_BYTES = 64 * 1024;
-const revalidatingFiles = new Map<string, Promise<void>>();
export interface DeviceFileResult {
ossKey: string;
@@ -35,7 +34,6 @@ export async function readDeviceFile<T extends DeviceFileResult>(options: {
};
/** Same-owner local bytes may render before the host responds. Explicit refresh omits this. */
cacheFirst?: {
- key: string;
read(): Promise<DeviceFileResult | T | null>;
/** Finish retaining a changed fallback before disposing its temporary result. */
retain?(result: DeviceFileResult | T): Promise<void>;
@@ -65,23 +63,20 @@ export async function readDeviceFile<T extends DeviceFileResult>(options: {
const cached = await options.cacheFirst.read().catch(() => null);
if (!active()) return discardCancelled(cached ?? { ossKey: '', size: 0, mimeType: '' });
if (cached) {
- const { key, retain } = options.cacheFirst;
- if (!revalidatingFiles.has(key)) {
- const refresh = Promise.resolve().then(async () => {
- assertActive();
- const metadata = await options.prepare();
- if (!active()) return discardCancelled(metadata);
- if (validFileVersion(cached.version) && metadata.version === cached.version && metadata.size === cached.size) {
- if (metadata.ossKey) await options.discard?.(metadata);
- return;
- }
- const fresh = await readDeviceFile({ ...options, cacheFirst: undefined, prepare: async () => metadata });
- try { await retain?.(fresh); }
- finally { await options.discard?.(fresh); }
- }).catch(() => { /* Background failure must not replace an already usable preview. */ })
- .finally(() => { if (revalidatingFiles.get(key) === refresh) revalidatingFiles.delete(key); });
- revalidatingFiles.set(key, refresh);
- }
+ const { retain } = options.cacheFirst;
+ // Revalidation belongs to this read; an obsolete caller cannot suppress a reopen.
+ void Promise.resolve().then(async () => {
+ assertActive();
+ const metadata = await options.prepare();
+ if (!active()) return discardCancelled(metadata);
+ if (validFileVersion(cached.version) && metadata.version === cached.version && metadata.size === cached.size) {
+ if (metadata.ossKey) await options.discard?.(metadata);
+ return;
+ }
+ const fresh = await readDeviceFile({ ...options, cacheFirst: undefined, prepare: async () => metadata });
+ try { await retain?.(fresh); }
+ finally { await options.discard?.(fresh); }
+ }).catch(() => { /* Background failure must not replace an already usable preview. */ });
return cached;
}
}