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。

perf(device-link): 复用独立文件长连接并持久缓存远程文件

Dash5b38d896efd6
diff --git a/apps/desktop/src/capture-renderer/filePeerHost.ts b/apps/desktop/src/capture-renderer/filePeerHost.ts
index 759b03bd1d..8cec3661a1 100644
--- a/apps/desktop/src/capture-renderer/filePeerHost.ts
+++ b/apps/desktop/src/capture-renderer/filePeerHost.ts
@@ -2,7 +2,9 @@ import { createFilePeerRuntime } from '@cindy/device-link';
import type { FilePeerHostApi } from '../shared/filePeer';
export function startFilePeerHost(api: FilePeerHostApi) {
- const runtime = createFilePeerRuntime(api);
+ const runtime = createFilePeerRuntime({ ...api, writeBatch: api.write,
+ closed: (connection) => { void api.closed(connection).catch(() => {}); },
+ });
const off = api.onCommand((id, c) => {
void (async () => {
try {
diff --git a/apps/desktop/src/main/cindy-media/__tests__/integrationCache.test.ts b/apps/desktop/src/main/cindy-media/__tests__/integrationCache.test.ts
index a4e40e321a..0405e371d2 100644
--- a/apps/desktop/src/main/cindy-media/__tests__/integrationCache.test.ts
+++ b/apps/desktop/src/main/cindy-media/__tests__/integrationCache.test.ts
@@ -167,6 +167,21 @@ describe('miss 路径', () => {
});
describe('staged write rollback', () => {
+ it('accepts a file source without buffering it, and guards owner changes before persistent publication', async () => {
+ const file = path.join(tmpUserData, 'received-file');
+ fs.writeFileSync(file, BYTES_A);
+ const key = 'remote-file:source:version';
+ const written = await integrationCache.integrationCachePut({
+ cacheKey: key, integration: 'remote-file', filePath: file, mimeType: 'image/png',
+ assertStillValid: () => {},
+ }, db);
+ expect(fs.readFileSync(written.absPath)).toEqual(BYTES_A);
+ await expect(integrationCache.integrationCachePut({
+ cacheKey: 'remote-file:cancelled', integration: 'remote-file', filePath: file, mimeType: 'image/png',
+ assertStillValid: () => { throw new Error('owner changed'); },
+ }, db)).rejects.toThrow('owner changed');
+ expect(await integrationCache.integrationCacheGet('remote-file:cancelled', db)).toBeNull();
+ });
it('removes only the integration ref created by that write', async () => {
const first = await integrationCache.integrationCachePut(
{ cacheKey: KEY, integration: 'feishu', buffer: BYTES_A, mimeType: 'image/png' },
diff --git a/apps/desktop/src/main/cindy-media/__tests__/recycler.test.ts b/apps/desktop/src/main/cindy-media/__tests__/recycler.test.ts
index 085a8e18a0..c919740a1f 100644
--- a/apps/desktop/src/main/cindy-media/__tests__/recycler.test.ts
+++ b/apps/desktop/src/main/cindy-media/__tests__/recycler.test.ts
@@ -277,3 +277,26 @@ describe('cleanupTmpFiles(.tmp 残留)', () => {
expect(fs.existsSync(newTmp)).toBe(true);
});
});
+
+it('scopes automatic remote-file cleanup to its own unpinned cache, rechecking new borrowers at deletion', async () => {
+ const own = await seedBlob('remote-only', { isCache: true });
+ const shared = await seedBlob('shared-cache', { isCache: true });
+ const pinned = await seedBlob('chat-attachment', { isCache: false });
+ for (const entry of [own, shared, pinned]) await ledger.addRef({
+ hash: entry.hash, refKind: 'integration-cache', refId: `remote-file:${entry.hash}`,
+ originKind: 'integration', originId: 'remote-file',
+ }, db);
+ await ledger.addRef({ hash: shared.hash, refKind: 'integration-cache', refId: 'feishu:key',
+ originKind: 'integration', originId: 'feishu' }, db);
+ const scan = await recycler.scanCache({ live: new Set(), integration: 'remote-file', limitBytes: 0 }, db);
+ expect(scan.evictable.map(entry => entry.hash)).toEqual([own.hash]);
+ // A new borrower after scanning must also be protected by the DELETE predicate.
+ await ledger.addRef({ hash: own.hash, refKind: 'integration-cache', refId: 'other:key',
+ originKind: 'integration', originId: 'other' }, db);
+ const result = await recycler.evictCacheBlobs({ hashes: [own.hash, shared.hash, pinned.hash],
+ live: new Set(), integration: 'remote-file' }, db);
+ expect(result.deleted).toBe(0);
+ for (const entry of [own, shared, pinned]) expect(fs.existsSync(blobPath(entry.hash, entry.ext))).toBe(true);
+ await ledger.removeRefs({ refKind: 'integration-cache', refId: 'other:key' }, db);
+ expect((await recycler.evictCacheBlobs({ hashes: [own.hash], live: new Set(), integration: 'remote-file' }, db)).deleted).toBe(1);
+});
diff --git a/apps/desktop/src/main/cindy-media/integrationCache.ts b/apps/desktop/src/main/cindy-media/integrationCache.ts
index 7cd4d53a48..be13f1f723 100644
--- a/apps/desktop/src/main/cindy-media/integrationCache.ts
+++ b/apps/desktop/src/main/cindy-media/integrationCache.ts
@@ -78,7 +78,7 @@ export async function integrationCacheGet(
log.warn('integration cache hit in ledger but blob file missing', { cacheKey, hash });
return null;
}
- void ledger.touchBlob(hash, db);
+ void ledger.touchBlob(hash, db).catch(() => undefined);
return {
url: blobStore.blobUrl(hash, info.ext),
absPath: resolved.absPath,
@@ -89,12 +89,13 @@ export async function integrationCacheGet(
/** 写缓存:字节入仓(isCache=true)+ 登记 token→指纹索引(同指纹幂等)。 */
export async function integrationCachePut(
- params: {
+ params: blobStore.BlobSource & {
cacheKey: string;
/** 集成名(出生信息 originId;从 cacheKey 冒号前段传或显式给)。 */
integration: string;
- buffer: Uint8Array;
mimeType: string;
+ /** Capture db and owner together; late work must never enter the next account. */
+ assertStillValid?: () => void;
/**
* 性质标记,默认 true(可再生缓存,吃回收器总量上限 + LRU)。IM 入站
* **用户附件**必须传 false:它语义上是会话附件而非可再生缓存——discord
@@ -106,14 +107,16 @@ export async function integrationCachePut(
): Promise<IntegrationCacheWrite> {
const written = await ingestMedia(
{
- buffer: params.buffer,
+ ...(params.filePath !== undefined ? { filePath: params.filePath } : { buffer: params.buffer }),
mimeType: normalizeIntegrationMime(params.mimeType),
isCache: params.isCache ?? true,
refs: [],
+ assertStillValid: params.assertStillValid,
},
db,
);
const existing = await ledger.getIntegrationCacheHash(params.cacheKey, db);
+ params.assertStillValid?.();
let addedRefId: string | null = null;
if (existing !== written.hash) {
// 新登记 / token 复用换内容:追加索引行,cacheGet 取最新。
@@ -128,6 +131,12 @@ export async function integrationCachePut(
db,
);
}
+ try {
+ params.assertStillValid?.();
+ } catch (error) {
+ if (addedRefId) await ledger.removeRefById(addedRefId, db).catch(() => undefined);
+ throw error;
+ }
const resolved = blobStore.resolveHashRef(written.hash, written.ext);
return {
url: written.url,
diff --git a/apps/desktop/src/main/cindy-media/ledger.ts b/apps/desktop/src/main/cindy-media/ledger.ts
index ba6adb554e..5aa5dec8f6 100644
--- a/apps/desktop/src/main/cindy-media/ledger.ts
+++ b/apps/desktop/src/main/cindy-media/ledger.ts
@@ -602,7 +602,7 @@ export interface CacheBlobRow {
}
/** cache 性质 blob 按 LRU 升序(最久未用在前),供逐出候选规划。 */
-export async function listCacheBlobsByLru(db: LedgerDb = defaultDb()): Promise<CacheBlobRow[]> {
+export async function listCacheBlobsByLru(db: LedgerDb = defaultDb(), integration?: string): Promise<CacheBlobRow[]> {
return await db
.select({
hash: mediaBlobs.hash,
@@ -611,7 +611,11 @@ export async function listCacheBlobsByLru(db: LedgerDb = defaultDb()): Promise<C
lastAccessAt: mediaBlobs.lastAccessAt,
})
.from(mediaBlobs)
- .where(eq(mediaBlobs.isCache, true))
+ .where(and(eq(mediaBlobs.isCache, true), integration ? sql`EXISTS (
+ SELECT 1 FROM ${mediaRefs} WHERE ${mediaRefs.hash} = ${mediaBlobs.hash}
+ AND ${mediaRefs.refKind} = 'integration-cache' AND ${mediaRefs.originId} = ${integration}
+ ) AND NOT EXISTS (SELECT 1 FROM ${mediaRefs} WHERE ${mediaRefs.hash} = ${mediaBlobs.hash}
+ AND (${mediaRefs.refKind} <> 'integration-cache' OR ${mediaRefs.originId} IS NULL OR ${mediaRefs.originId} <> ${integration}))` : undefined))
.orderBy(asc(mediaBlobs.lastAccessAt))
.all();
}
@@ -650,6 +654,7 @@ export async function deleteZeroRefBlobRecord(
export async function deleteCacheBlobRecord(
hash: string,
db: LedgerDb = defaultDb(),
+ integration?: string,
): Promise<boolean> {
const result = await db
.delete(mediaBlobs)
@@ -658,6 +663,10 @@ export async function deleteCacheBlobRecord(
eq(mediaBlobs.hash, hash),
eq(mediaBlobs.isCache, true),
sql`NOT EXISTS (SELECT 1 FROM ${mediaRefs} WHERE ${mediaRefs.hash} = ${mediaBlobs.hash} AND ${mediaRefs.refKind} <> 'integration-cache')`,
+ integration ? sql`NOT EXISTS (SELECT 1 FROM ${mediaRefs} WHERE ${mediaRefs.hash} = ${mediaBlobs.hash}
+ AND (${mediaRefs.originId} IS NULL OR ${mediaRefs.originId} <> ${integration}))` : undefined,
+ integration ? sql`EXISTS (SELECT 1 FROM ${mediaRefs} WHERE ${mediaRefs.hash} = ${mediaBlobs.hash}
+ AND ${mediaRefs.originId} = ${integration})` : undefined,
),
)
.run();
diff --git a/apps/desktop/src/main/cindy-media/recycler.ts b/apps/desktop/src/main/cindy-media/recycler.ts
index 4b21f9a93c..a94a15c87b 100644
--- a/apps/desktop/src/main/cindy-media/recycler.ts
+++ b/apps/desktop/src/main/cindy-media/recycler.ts
@@ -1,7 +1,8 @@
/**
* recycler.ts — 媒体总仓回收器。
* ---------------------------------------------------------------------------
- * 两条清理线,全部**手动触发、先报数后动手**(v1 无任何自动删除):
+ * 两条清理线默认手动触发、先报数后动手。远程文件缓存的例外仅自动清理
+ * remote-file 独占的可再生缓存,调用方必须带 integration 作用域和 owner 闸:
* - 零引用回收:账本无引用 + 缓冲期已过 + 不在活引用集 → 删账(条件 SQL
* 复查)→ 复查无并发重录 → 删字节;
* - cache 瘦身:isCache=true 总量超上限时按 LRU 逐出(可再生,清错也会
@@ -173,11 +174,11 @@ export interface CacheScan {
/** 扫描 cache 用量与逐出候选(LRU 头部起,凑够超限量为止;活引用集剔除)。 */
export async function scanCache(
- params: { live: Set<string>; limitBytes?: number },
+ params: { live: Set<string>; limitBytes?: number; integration?: string },
db?: LedgerDb,
): Promise<CacheScan> {
const limitBytes = params.limitBytes ?? CACHE_LIMIT_BYTES;
- const rows = await ledger.listCacheBlobsByLru(db);
+ const rows = await ledger.listCacheBlobsByLru(db, params.integration);
const totalBytes = rows.reduce((sum, r) => sum + r.bytes, 0);
const scan: CacheScan = {
totalBytes,
@@ -199,12 +200,13 @@ export async function scanCache(
/** 执行 cache 逐出(条件删账 deleteCacheBlobRecord 复查 pin 与引用,同款安全顺序)。 */
export async function evictCacheBlobs(
- params: { hashes: string[]; live: Set<string> },
+ params: { hashes: string[]; live: Set<string>; integration?: string; assertStillValid?: () => void },
db?: LedgerDb,
): Promise<DeleteResult> {
const result: DeleteResult = { deleted: 0, freedBytes: 0, skipped: 0 };
for (const hash of params.hashes) {
try {
+ params.assertStillValid?.();
if (params.live.has(hash)) {
result.skipped++;
continue;
@@ -214,7 +216,7 @@ export async function evictCacheBlobs(
result.skipped++;
continue;
}
- const removed = await ledger.deleteCacheBlobRecord(hash, db);
+ const removed = await ledger.deleteCacheBlobRecord(hash, db, params.integration);
if (!removed) {
result.skipped++;
continue;
@@ -223,6 +225,7 @@ export async function evictCacheBlobs(
result.skipped++;
continue;
}
+ params.assertStillValid?.();
await blobStore.deleteBlobFile(hash, info.ext);
result.deleted++;
result.freedBytes += info.bytes;
diff --git a/apps/desktop/src/main/device-link/__tests__/fileAccess.test.ts b/apps/desktop/src/main/device-link/__tests__/fileAccess.test.ts
index e2be65322b..d29b5e2e3f 100644
--- a/apps/desktop/src/main/device-link/__tests__/fileAccess.test.ts
+++ b/apps/desktop/src/main/device-link/__tests__/fileAccess.test.ts
@@ -8,11 +8,25 @@ vi.mock('../broadcast-tap', () => ({
isDataOwnerBroadcastScopeCurrent: () => true,
}));
import { readRemoteDeviceFile } from '../fileAccess';
+import { invalidateFilePeerScopes } from '../filePeerScope';
beforeEach(() => {
vi.clearAllMocks();
peer.mockResolvedValue(null);
});
describe('desktop shared file access', () => {
+ it('cancels a late file preparation after unlink without starting peer or OSS', async () => {
+ let answer!: (value: unknown) => void;
+ const invoke = vi.fn(() => new Promise<any>(resolve => { answer = resolve; }));
+ const fallback = vi.fn();
+ const read = readRemoteDeviceFile('d', 'xdt-file://test', invoke, { fallback });
+ const cancelled = expect(read).rejects.toThrow('FILE_PEER_CANCELLED');
+ await vi.waitFor(() => expect(invoke).toHaveBeenCalledOnce());
+ invalidateFilePeerScopes('d');
+ answer({ ok: true, result: { ossKey: '', size: 100, mimeType: 'text/plain', transferRequired: true } });
+ await cancelled;
+ expect(peer).not.toHaveBeenCalled();
+ expect(fallback).not.toHaveBeenCalled();
+ });
it.each([false, true])(
'forwards direct progress for workdir and media reads (workdir=%s)',
async (workdir) => {
diff --git a/apps/desktop/src/main/device-link/__tests__/filePeer.test.ts b/apps/desktop/src/main/device-link/__tests__/filePeer.test.ts
index 2e103691cb..2f31178b8d 100644
--- a/apps/desktop/src/main/device-link/__tests__/filePeer.test.ts
+++ b/apps/desktop/src/main/device-link/__tests__/filePeer.test.ts
@@ -15,6 +15,7 @@ const mock = vi.hoisted(() => ({
commands: [] as Record<string, any>[],
commandReply: vi.fn((_action: string): string | undefined => 'v=0'),
now: undefined as number | undefined,
+ userData: '',
receiving: undefined as undefined | { sink: string; reply: () => void },
}));
vi.mock('@cindy/device-link', async (importOriginal) => {
@@ -31,7 +32,11 @@ vi.mock('node:crypto', async (importOriginal) => {
});
vi.mock('electron', () => ({
ipcMain: { handle: (key: string, fn: (...args: any[]) => any) => mock.handlers.set(key, fn) },
- app: { on: vi.fn(), getPath: () => os.tmpdir() },
+ app: { on: vi.fn(), getPath: (kind: string) => kind === 'userData' && mock.userData ? mock.userData : os.tmpdir() },
+}));
+vi.mock('../../appSessionState', () => ({
+ getActiveAppSession: () => ({ mode: 'cloud', dataOwnerId: 'cache-owner' }),
+ activeOwnerScopeKey: () => 'cache-owner:0',
}));
vi.mock('../mediaFetch', () => ({ resolveAuthorizedMedia: mock.resolve }));
vi.mock('../settings-store', () => ({ readDeviceLinkSettings: () => mock.settings }));
@@ -130,19 +135,29 @@ describe('authorized file peer source', () => {
await vi.waitFor(() => expect(mock.receiving).toBeDefined());
expect(progress).toHaveBeenLastCalledWith(0, 5);
mock.replyDelay = delay;
+ // An unrelated RPC can wait 15s while this file keeps making progress.
+ // A genuinely idle file now deliberately falls back after 8s.
+ let next = 0;
+ const chunks = ['aA==', 'ZQ==', 'bA=='];
+ const flowing = delay ? setInterval(() => {
+ const offset = next++;
+ if (offset < chunks.length)
+ void mock.handlers.get('file-peer:host:write')!({}, mock.receiving!.sink, offset, chunks[offset]);
+ }, 4000) : undefined;
expect(
await tryPeerInvoke(peer, 'file-browser:remote-op', [{ op: 'readFile' }], invoke),
).toBeNull();
- await mock.handlers.get('file-peer:host:write')!({}, mock.receiving!.sink, 0, 'aGU=');
+ clearInterval(flowing);
+ if (!delay) await mock.handlers.get('file-peer:host:write')!({}, mock.receiving!.sink, 0, 'aGU=');
// Partial writes must reach the UI before EOF, even when diagnostic RPCs fail.
- expect(progress).toHaveBeenLastCalledWith(2, 5);
- await mock.handlers.get('file-peer:host:write')!({}, mock.receiving!.sink, 2, 'bGxv');
+ expect(progress).toHaveBeenLastCalledWith(delay ? 3 : 2, 5);
+ await mock.handlers.get('file-peer:host:write')!({}, mock.receiving!.sink, delay ? 3 : 2, delay ? 'bG8=' : 'bGxv');
expect(progress).toHaveBeenLastCalledWith(5, 5);
mock.receiving!.reply();
const result = await transfer;
expect(result?.size).toBe(5);
await result?.dispose();
- expect(progress.mock.calls.map(([received]) => received)).toEqual([0, 2, 5]);
+ expect(progress.mock.calls.map(([received]) => received)).toEqual(delay ? [0, 1, 2, 3, 5] : [0, 2, 5]);
},
20_000,
);
@@ -197,7 +212,7 @@ describe('authorized file peer source', () => {
]);
},
);
- it('warms reads, preserves application errors, and retries transport failure only after cooldown', async () => {
+ it('reuses file connections for reads, preserves application errors and cools down transport failures', async () => {
const peer = 'warm-recovery-peer';
const invoke = vi.fn(async (_peer: string, _channel: string, args: unknown[]) => {
const action = (args[0] as { action: string }).action;
@@ -206,6 +221,7 @@ describe('authorized file peer source', () => {
result:
action === 'caps'
? { version: 1, streaming: true }
+ : action === 'open' ? { ticket: 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', size: 5, mimeType: 'text/plain' }
: {
connection: 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa',
sdp: 'v=0',
@@ -213,10 +229,22 @@ describe('authorized file peer source', () => {
};
});
const read = () => tryPeerInvoke(peer, 'file-browser:remote-op', [{ op: 'readFile' }], invoke);
+ const fetchFile = async () => {
+ mock.receiving = undefined;
+ const promise = tryPeerFile(peer, 'test-file', invoke);
+ await vi.waitFor(() => expect(mock.receiving).toBeDefined());
+ await mock.handlers.get('file-peer:host:write')!({}, mock.receiving!.sink, 0, Buffer.from('hello').toString('base64'));
+ mock.receiving!.reply();
+ const result = await promise;
+ expect(result).not.toBeNull();
+ await result!.dispose();
+ };
mock.commandReply.mockImplementation((action) =>
action === 'invoke' ? JSON.stringify({ ok: false, error: 'FILE_NOT_FOUND' }) : 'v=0',
);
expect(await read()).toBeNull();
+ expect(invoke).not.toHaveBeenCalled();
+ await fetchFile();
await vi.waitFor(() => expect(mock.commandReply).toHaveBeenCalledWith('stats'));
expect(await read()).toEqual({ ok: false, error: 'FILE_NOT_FOUND' });
expect(invoke.mock.calls.filter((call) => (call[2][0] as any).action === 'caps')).toHaveLength(
@@ -237,6 +265,7 @@ describe('authorized file peer source', () => {
action === 'invoke' ? JSON.stringify({ ok: true, result: 'recovered' }) : 'v=0',
);
expect(await read()).toBeNull();
+ await fetchFile();
await vi.waitFor(() => expect(mock.commandReply).toHaveBeenCalledWith('stats'));
expect(await read()).toEqual({ ok: true, result: 'recovered' });
expect(
@@ -246,27 +275,18 @@ describe('authorized file peer source', () => {
mock.now = undefined;
}
});
- it('returns cold reads immediately while a single capability request remains pending', async () => {
- let resolve!: (value: { ok: boolean }) => void;
- const invoke = vi.fn(
- () =>
- new Promise<{ ok: boolean }>((done) => {
- resolve = done;
- }),
- );
+ it('does not create a file connection for ordinary cold reads', async () => {
+ const invoke = vi.fn();
expect(
await tryPeerInvoke('cold-peer', 'file-browser:remote-op', [{ op: 'listDir' }], invoke),
).toBeNull();
expect(
await tryPeerInvoke('cold-peer', 'file-browser:remote-op', [{ op: 'readFile' }], invoke),
).toBeNull();
- expect(invoke).toHaveBeenCalledTimes(1);
- resolve({ ok: false });
- await new Promise((done) => setImmediate(done));
expect(
await tryPeerInvoke('cold-peer', 'file-browser:remote-op', [{ op: 'listDir' }], invoke),
).toBeNull();
- expect(invoke).toHaveBeenCalledTimes(1);
+ expect(invoke).not.toHaveBeenCalled();
});
it('reuses host dispatch for peer reads and rechecks revocation without closing another peer', async () => {
const invoke = vi.fn(async () => ({ ok: true, result: 'preview' }));
@@ -327,6 +347,130 @@ describe('authorized file peer source', () => {
}
const read = (connection: string, ticket: string, offset: number) =>
mock.handlers.get('file-peer:host:read')!({}, connection, ticket, offset);
+ it('keeps negotiated connections until release, isolates transport failure and still expires stalled files', async () => {
+ vi.useFakeTimers();
+ try {
+ const bind = async (peer: string) => (await requestFilePeer(peer, { action: 'offer', sdp: 'v=0', sessionBound: true })) as { connection: string };
+ const a = await bind('device-a'), b = await bind('device-b');
+ await vi.advanceTimersByTimeAsync(30 * 60_000);
+ await mock.handlers.get('file-peer:host:closed')!({}, a.connection);
+ await expect(open(a.connection)).rejects.toThrow('FILE_PEER_CLOSED');
+ const source = await open(b.connection, 'device-b');
+ expect(await read(b.connection, source.ticket, 0)).toBe(Buffer.from('hello').toString('base64'));
+ await vi.advanceTimersByTimeAsync(60_001);
+ await expect(read(b.connection, source.ticket, 5)).rejects.toThrow();
+ const c = await bind('device-c');
+ stopFilePeers('device-c');
+ await expect(open(c.connection, 'device-c')).rejects.toThrow('FILE_PEER_CLOSED');
+ } finally { vi.useRealTimers(); }
+ });
+ const receiveInvoke = (version?: string) => vi.fn(async (_peer: string, _channel: string, [request]: any[]) => ({
+ ok: true,
+ result: request.action === 'caps' ? { version: 1, streaming: true, idleMs: 300_000 }
+ : request.action === 'open' ? { ticket: 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', size: 5, mimeType: 'text/plain', version }
+ : { connection: 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', sdp: 'v=0' },
+ }));
+ it.each([false, true])('cancels pending caps and queued reads on release (all=%s), without reconnecting', async (all) => {
+ let answer!: (value: any) => void;
+ const invoke = vi.fn(() => new Promise<any>(resolve => { answer = resolve; }));
+ const first = tryPeerFile('released-peer', 'first', invoke);
+ const second = tryPeerFile('released-peer', 'second', invoke);
+ const failures = Promise.all([
+ expect(first).rejects.toThrow('FILE_PEER_CANCELLED'),
+ expect(second).rejects.toThrow('FILE_PEER_CANCELLED'),
+ ]);
+ await vi.waitFor(() => expect(invoke).toHaveBeenCalledOnce());
+ stopFilePeers(all ? undefined : 'released-peer');
+ answer({ ok: true, result: { version: 1, sessionBound: true } });
+ await failures;
+ expect(invoke).toHaveBeenCalledOnce();
+ expect(mock.sent).not.toContain('offer');
+ // A later intentional request gets a new scope; stopping is not a cooldown.
+ const fresh = receiveInvoke();
+ const read = tryPeerFile('released-peer', 'third', fresh);
+ await vi.waitFor(() => expect(mock.receiving).toBeDefined());
+ await mock.handlers.get('file-peer:host:write')!({}, mock.receiving!.sink, 0, 'aGVsbG8=');
+ mock.receiving!.reply();
+ const result = await read;
+ expect(result?.size).toBe(5);
+ await result?.dispose();
+ });
+ it('falls back a stalled file while another peer keeps writing and completes', async () => {
+ vi.useFakeTimers();
+ try {
+ const invoke = receiveInvoke();
+ const stalled = tryPeerFile('slow-file', 'url', invoke);
+ await vi.waitFor(() => expect(mock.receiving).toBeDefined());
+ mock.receiving = undefined;
+ const healthy = tryPeerFile('healthy-file', 'url', invoke);
+ await vi.waitFor(() => expect(mock.receiving).toBeDefined());
+ const sink = mock.receiving!;
+ for (let offset = 0; offset < 5; offset++) {
+ await mock.handlers.get('file-peer:host:write')!({}, sink.sink, offset, 'YQ==');
+ await vi.advanceTimersByTimeAsync(3200);
+ }
+ await expect(stalled).resolves.toBeNull();
+ sink.reply();
+ const result = await healthy;
+ expect(await fsPromises.readFile(result!.path, 'utf8')).toBe('aaaaa');
+ await result!.dispose();
+ // The failed peer is cooled down; its next file does not pay another handshake.
+ const calls = invoke.mock.calls.length;
+ await expect(tryPeerFile('slow-file', 'next', invoke)).resolves.toBeNull();
+ expect(invoke.mock.calls.length).toBe(calls);
+ } finally { vi.useRealTimers(); }
+ });
+ it('keeps verified copies after consumer disposal, revalidates versions and isolates devices', async () => {
+ mock.userData = await mkdtemp(path.join(os.tmpdir(), 'peer-file-cache-'));
+ const version = 'a'.repeat(64), changed = 'b'.repeat(64);
+ const invoke = receiveInvoke(version);
+ const fetch = async (peer: string, expected = version, content = 'hello', skipCache = false) => {
+ mock.receiving = undefined;
+ const transfer = tryPeerFile(peer, 'cache-url', invoke, undefined, undefined, { version: expected, size: 5, mimeType: 'text/plain', skipCache });
+ await vi.waitFor(() => expect(mock.receiving).toBeDefined());
+ await mock.handlers.get('file-peer:host:write')!({}, mock.receiving!.sink, 0, Buffer.from(content).toString('base64'));
+ mock.receiving!.reply();
+ return (await transfer)!;
+ };
+ try {
+ const first = await fetch('cache-a'); await first.dispose();
+ const before = invoke.mock.calls.length;
+ const hit = await tryPeerFile('cache-a', 'cache-url', invoke, undefined, undefined, { version, size: 5, mimeType: 'text/plain' });
+ expect(invoke.mock.calls.length).toBe(before);
+ expect(await fsPromises.readFile(hit!.path, 'utf8')).toBe('hello');
+ await hit!.dispose();
+ const otherDevice = await fetch('cache-b'); await otherDevice.dispose();
+ invoke.mockImplementation(receiveInvoke(changed));
+ const newer = await fetch('cache-a', changed, 'world');
+ expect(await fsPromises.readFile(newer.path, 'utf8')).toBe('world');
+ await newer.dispose();
+ const refreshed = await fetch('cache-a', changed, 'fixed', true);
+ await refreshed.dispose();
+ const callsAfterRefresh = invoke.mock.calls.length;
+ const repaired = await tryPeerFile('cache-a', 'cache-url', invoke, undefined, undefined,
+ { version: changed, size: 5, mimeType: 'text/plain' });
+ expect(await fsPromises.readFile(repaired!.path, 'utf8')).toBe('fixed');
+ expect(invoke.mock.calls.length).toBe(callsAfterRefresh);
+ await repaired!.dispose();
+ } finally {
+ mock.current = false;
+ await expect(tryPeerFile('cache-a', 'cache-url', invoke)).rejects.toThrow('FILE_PEER_CANCELLED');
+ mock.current = true;
+ await rm(mock.userData, { recursive: true, force: true });
+ mock.userData = '';
+ }
+ });
+ it('retains an idle incoming connection past one minute but expires it after five', async () => {
+ vi.useFakeTimers();
+ try {
+ const { connection } = await connect();
+ await vi.advanceTimersByTimeAsync(120_000);
+ const { ticket } = await open(connection);
+ await read(connection, ticket, 0); await read(connection, ticket, 5);
+ await vi.advanceTimersByTimeAsync(301_000);
+ await expect(open(connection)).rejects.toThrow('FILE_PEER_CLOSED');
+ } finally { vi.useRealTimers(); }
+ });
it('fits slow config, cold host and command reply within the 30s offer RPC', async () => {
vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] });
try {
@@ -395,6 +539,8 @@ describe('authorized file peer source', () => {
attachments: true,
largeAttachments: true,
streamAttachments: true,
+ idleMs: 300_000,
+ sessionBound: true,
});
const first = await connect();
expect((await open(first.connection)).size).toBe(limit);
@@ -807,7 +953,7 @@ describe('authorized file peer source', () => {
expect(invoke).toHaveBeenCalledWith(peer, expect.any(String), [
{ action: 'close', connection: remote },
]);
- expect(await transfer).toBeNull();
+ await expect(transfer).rejects.toThrow('FILE_PEER_CANCELLED');
await vi.waitFor(() => expect(sink.closed && source.closed).toBe(true));
await expect(read(other.connection, ticket, 0)).rejects.toThrow();
await expect(
@@ -838,7 +984,7 @@ describe('authorized file peer source', () => {
await vi.advanceTimersByTimeAsync(150_000);
finish({ ok: true });
await expect(handled).resolves.toBe(JSON.stringify({ ok: true }));
- await vi.advanceTimersByTimeAsync(61_000);
+ await vi.advanceTimersByTimeAsync(301_000);
await expect(
mock.handlers.get('file-peer:host:invoke')!({}, connection, payload),
).rejects.toThrow('FILE_PEER_CLOSED');
@@ -875,7 +1021,7 @@ describe('authorized file peer source', () => {
finishB({ ok: 'b' });
await expect(inflightB).resolves.toBe(JSON.stringify({ ok: 'b' }));
// A 的保活只刷新 A 自己的连接:B 按自身空闲时限关闭,不被 A 延长。
- await vi.advanceTimersByTimeAsync(61_000);
+ await vi.advanceTimersByTimeAsync(301_000);
await expect(handle(b)).rejects.toThrow('FILE_PEER_CLOSED');
finishA({ ok: 'a' });
await expect(stalledA).resolves.toBe(JSON.stringify({ ok: 'a' }));
diff --git a/apps/desktop/src/main/device-link/__tests__/mediaFetch.test.ts b/apps/desktop/src/main/device-link/__tests__/mediaFetch.test.ts
index f37b0ff3c1..9df977ca80 100644
--- a/apps/desktop/src/main/device-link/__tests__/mediaFetch.test.ts
+++ b/apps/desktop/src/main/device-link/__tests__/mediaFetch.test.ts
@@ -158,6 +158,22 @@ describe('fetchLocalMediaToOss — scheme 路由', () => {
expect(logDebug.mock.calls.flat().join('\n')).not.toMatch(/xdt-|path=|\/cache\//);
},
);
+ it('revalidates source identity without reading/uploading bytes, including restored mtime', async () => {
+ let ctimeMs = 1;
+ const read = vi.fn();
+ openMock.mockResolvedValue({
+ stat: async () => ({ isFile: () => true, size: 100_000, mtimeMs: 1, ctimeMs, ino: 2, dev: 3 }),
+ read, close: vi.fn(),
+ });
+ imageResolve.mockReturnValue({ absPath: '/cache/a.png', mimeType: 'image/png' });
+ const args = { url: 'xdt-image://sess/a.png', prepareOnly: true };
+ const first = await fetchLocalMediaToOss(args);
+ expect(first.version).toMatch(/^[a-f0-9]{64}$/);
+ expect((await fetchLocalMediaToOss(args)).version).toBe(first.version);
+ ctimeMs++;
+ expect((await fetchLocalMediaToOss(args)).version).not.toBe(first.version);
+ expect(read).not.toHaveBeenCalled(); expect(uploadLocalFile).not.toHaveBeenCalled();
+ });
it('xdt-image:// → imageCacheStore.resolveSafe,mime 透传给上传', async () => {
imageResolve.mockReturnValue({ absPath: '/cache/a.png', mimeType: 'image/png' });
const r = await fetchLocalMediaToOss({ url: 'xdt-image://sess/a.png' });
diff --git a/apps/desktop/src/main/device-link/__tests__/remoteFileVersionCache.test.ts b/apps/desktop/src/main/device-link/__tests__/remoteFileVersionCache.test.ts
new file mode 100644
index 0000000000..54158f9d98
--- /dev/null
+++ b/apps/desktop/src/main/device-link/__tests__/remoteFileVersionCache.test.ts
@@ -0,0 +1,76 @@
+import { afterEach, beforeEach, expect, it, vi } from 'vitest';
+import { promises as fs } from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+
+const state = vi.hoisted(() => ({ root: '', owner: 'a', generation: 0 }));
+vi.mock('electron', () => ({ app: { getPath: () => state.root } }));
+vi.mock('../../appSessionState', () => ({
+ getActiveAppSession: () => ({ mode: 'cloud', dataOwnerId: state.owner }),
+}));
+vi.mock('../broadcast-tap', () => ({
+ captureDataOwnerBroadcastScope: () => ({ owner: state.owner, generation: state.generation }),
+ isDataOwnerBroadcastScopeCurrent: (scope: typeof state) =>
+ scope.owner === state.owner && scope.generation === state.generation,
+}));
+import { remoteFileVersionCache } from '../remoteFileVersionCache';
+
+beforeEach(async () => {
+ state.root = await fs.mkdtemp(path.join(os.tmpdir(), 'remote-version-cache-'));
+ state.owner = 'a';
+ state.generation = 0;
+});
+afterEach(async () => {
+ await fs.rm(state.root, { recursive: true, force: true });
+});
+const metadata = { version: 'a'.repeat(64), size: 5, mimeType: 'text/html' };
+it('keeps large files across new cache instances and login generations, with independent owner/device/url identities', async () => {
+ const file = path.join(state.root, 'original');
+ const size = 17 * 1024 * 1024;
+ await fs.writeFile(file, Buffer.alloc(size, 42));
+ const meta = { ...metadata, size };
+ const first = remoteFileVersionCache('device', 'url?baseDir=/allowed', meta)!;
+ await first.put(file);
+ await fs.rm(file);
+ state.generation++;
+ await expect(first.get()).rejects.toThrow('FILE_PEER_CANCELLED');
+ const restarted = remoteFileVersionCache('device', 'url?baseDir=/allowed', meta)!;
+ const hit = await restarted.get();
+ expect((await fs.stat(hit!)).size).toBe(size);
+ expect(
+ await remoteFileVersionCache('other-device', 'url?baseDir=/allowed', meta)!.get(),
+ ).toBeNull();
+ expect(await remoteFileVersionCache('device', 'url?baseDir=/other', meta)!.get()).toBeNull();
+ state.owner = 'b';
+ expect(await remoteFileVersionCache('device', 'url?baseDir=/allowed', meta)!.get()).toBeNull();
+ state.owner = 'a';
+ expect(await remoteFileVersionCache('device', 'url?baseDir=/allowed', meta)!.get()).toBe(hit);
+});
+it('removes superseded versions but preserves consumer copies, and treats missing or truncated files as misses', async () => {
+ const file = path.join(state.root, 'source');
+ await fs.writeFile(file, 'hello');
+ const old = remoteFileVersionCache('device', 'url', metadata)!;
+ await old.put(file);
+ const oldPath = (await old.get())!;
+ const consumer = path.join(state.root, 'consumer');
+ await fs.copyFile(oldPath, consumer);
+ const changed = remoteFileVersionCache('device', 'url', {
+ ...metadata,
+ version: 'b'.repeat(64),
+ })!;
+ expect(await changed.get()).toBeNull();
+ await fs.writeFile(file, 'world');
+ await changed.put(file);
+ expect(await old.get()).toBeNull();
+ expect(await fs.readFile(consumer, 'utf8')).toBe('hello');
+ const hit = (await changed.get())!;
+ expect(await fs.readFile(hit, 'utf8')).toBe('world');
+ await fs.truncate(hit, 1);
+ expect(await changed.get()).toBeNull();
+ await fs.rm(hit);
+ expect(await changed.get()).toBeNull();
+});
+it('does not enable persistent reuse without a valid host version', () => {
+ expect(remoteFileVersionCache('device', 'url')).toBeNull();
+ expect(remoteFileVersionCache('device', 'url', { ...metadata, version: '../file' })).toBeNull();
+});
diff --git a/apps/desktop/src/main/device-link/__tests__/remoteInvokeSendGuard.test.ts b/apps/desktop/src/main/device-link/__tests__/remoteInvokeSendGuard.test.ts
index 9c821ed5e4..20169b5fd7 100644
--- a/apps/desktop/src/main/device-link/__tests__/remoteInvokeSendGuard.test.ts
+++ b/apps/desktop/src/main/device-link/__tests__/remoteInvokeSendGuard.test.ts
@@ -1,7 +1,7 @@
import { readFileSync } from 'node:fs';
import ts from 'typescript';
import { expect, it, vi } from 'vitest';
-import { DeviceLinkError, type DeviceLinkClient } from '@cindy/device-link';
+import { DeviceLinkError, FILE_PEER_CHANNEL, type DeviceLinkClient } from '@cindy/device-link';
import { invokeWithClosedLinkRecovery } from '../linkRecovery';
// Run the production adapter with only its host dependencies injected, without
@@ -17,7 +17,7 @@ type PeerInvoke = (peer: string, channel: string, args: unknown[]) => Promise<un
function loadRemoteInvoke(overrides: Record<string, unknown>) {
const dependencies = {
- DeviceLinkError, invokeWithClosedLinkRecovery,
+ DeviceLinkError, FILE_PEER_CHANNEL, invokeWithClosedLinkRecovery,
assertNotStandby: () => {},
assertRemoteControlTargetEnabled: () => {},
openLinkCloseEpochs: new Map<string, number>(),
@@ -128,6 +128,22 @@ it.each(['caller cancelled', 'target disabled', 'link closed', 'still valid'])(
},
);
+it.each([false, true])('never reopens a link for late file cleanup (ready=%s)', async (ready) => {
+ const online = vi.fn();
+ const reopen = vi.fn();
+ const invoke = vi.fn().mockRejectedValue(new DeviceLinkError('LINK_NOT_OPEN', 'closed'));
+ const remoteInvoke = loadRemoteInvoke({
+ ensureOnlineForRequest: online,
+ client: { isLinkReady: () => ready, invoke },
+ openRemoteLink: reopen,
+ });
+ await expect(remoteInvoke('host', FILE_PEER_CHANNEL, [{ action: 'close', connection: 'old' }]))
+ .rejects.toMatchObject({ code: 'LINK_NOT_OPEN' });
+ expect(invoke).toHaveBeenCalledTimes(ready ? 1 : 0);
+ expect(online).not.toHaveBeenCalled();
+ expect(reopen).not.toHaveBeenCalled();
+});
+
// The direct connection keeps this invoke and calls it later from timers (idle close),
// where `void invoke(...).catch(() => {})` only absorbs rejections. A synchronous throw
// there escaped as an uncaughtException and shut the app down.
diff --git a/apps/desktop/src/main/device-link/fileAccess.ts b/apps/desktop/src/main/device-link/fileAccess.ts
index 27e14f4e99..279678de0d 100644
--- a/apps/desktop/src/main/device-link/fileAccess.ts
+++ b/apps/desktop/src/main/device-link/fileAccess.ts
@@ -5,6 +5,7 @@ import {
type DeviceFileResult,
} from '@cindy/device-link';
import { tryPeerFile } from './filePeer';
+import { captureFilePeerScope } from './filePeerScope';
import { removeRemote } from './mediaTransfer';
import { captureDataOwnerBroadcastScope, isDataOwnerBroadcastScopeCurrent } from './broadcast-tap';
@@ -29,8 +30,9 @@ export function readRemoteDeviceFile(
} = {},
) {
const owner = captureDataOwnerBroadcastScope();
+ const isCurrent = captureFilePeerScope(device);
const invoke: Invoke = async (...args) => {
- if (options.signal?.aborted || !isDataOwnerBroadcastScopeCurrent(owner))
+ if (options.signal?.aborted || !isCurrent())
throw new Error('FILE_PEER_CANCELLED');
return rawInvoke(...args);
};
@@ -47,7 +49,7 @@ export function readRemoteDeviceFile(
return readDeviceFile<LocalFileResult>({
stream: options.stream,
signal: options.signal,
- isCurrent: () => isDataOwnerBroadcastScopeCurrent(owner),
+ isCurrent,
discard: async (result) => {
if ('dispose' in result && typeof result.dispose === 'function') await result.dispose();
else if (result.ossKey && isDataOwnerBroadcastScopeCurrent(owner))
@@ -58,7 +60,7 @@ export function readRemoteDeviceFile(
const caps = await invoke(device, 'file-browser:remote-op', [
{ op: 'caps', workdir: options.workdir },
]);
- if (options.signal?.aborted || !isDataOwnerBroadcastScopeCurrent(owner))
+ if (options.signal?.aborted || !isCurrent())
throw new Error('FILE_PEER_CANCELLED');
if (!caps.ok) throw new Error('FILE_CAPABILITY_FAILED');
if (!(caps.result as { fileRead?: boolean })?.fileRead) return options.fallback();
@@ -84,10 +86,11 @@ export function readRemoteDeviceFile(
metadata.size > Math.min(options.maxPeerBytes ?? FILE_PEER_MAX_BYTES, FILE_PEER_MAX_BYTES)
)
return null;
- const result = await tryPeerFile(device, url, invoke, options.signal, options.onProgress);
+ const result = await tryPeerFile(device, url, invoke, options.signal, options.onProgress,
+ options.skipCache ? { ...metadata, skipCache: true } : metadata);
// A failed direct attempt is discarded before OSS starts; do not leave its partial
// percentage/speed on screen during the fallback preparation.
- if (!result && !options.signal?.aborted && isDataOwnerBroadcastScopeCurrent(owner)) {
+ if (!result && !options.signal?.aborted && isCurrent()) {
try {
options.onProgress?.(0, metadata.size);
} catch {
diff --git a/apps/desktop/src/main/device-link/filePeer.ts b/apps/desktop/src/main/device-link/filePeer.ts
index 4a05096716..9b4e8440dc 100644
--- a/apps/desktop/src/main/device-link/filePeer.ts
+++ b/apps/desktop/src/main/device-link/filePeer.ts
@@ -15,6 +15,15 @@ import {
RPC_BODY_MAX_BYTES,
canSendPeerAttachment,
FILE_PEER_IDLE_MS,
+ FILE_PEER_WRITE_BATCH_BYTES,
+ FILE_PEER_COMMAND_TIMEOUT_MS,
+ FILE_PEER_RECEIVE_TIMEOUT_MS,
+ FILE_PEER_PROGRESS_SAMPLE_MS,
+ createFileTransferWatchdog,
+ fileTransferPath,
+ filePeerReuseMs,
+ validFileVersion,
+ type FileTransferPath,
FILE_PEER_CHANNEL,
parseFilePeerRequest,
parseFilePeerFile,
@@ -27,8 +36,10 @@ import { loadDesktopIceServers } from '../remote-desktop/iceConfig';
import { resolveAuthorizedMedia } from './mediaFetch';
import { readDeviceLinkSettings } from './settings-store';
import { captureDataOwnerBroadcastScope, isDataOwnerBroadcastScopeCurrent } from './broadcast-tap';
+import { captureFilePeerScope, invalidateFilePeerScopes } from './filePeerScope';
import { createLogger } from '../logger.js';
import { handlePeerAttachment } from './peerAttachmentStore';
+import { fileVersion } from './fileVersion';
// Local-only diagnostics (scope is not upload-allowlisted): stages, sizes and timings, never paths.
const log = createLogger('device-link:filePeer');
@@ -40,9 +51,10 @@ type Owner = ReturnType<typeof captureDataOwnerBroadcastScope>;
interface Connection {
peer: string;
owner: Owner;
- timer: ReturnType<typeof setTimeout>;
+ timer?: ReturnType<typeof setTimeout>;
incoming: boolean;
opening?: boolean;
+ idleMs?: number | null;
invoke?: (channel: string, args: unknown[]) => Promise<unknown>;
}
interface Source {
@@ -50,6 +62,7 @@ interface Source {
file: FileHandle;
size: number;
mtime: number;
+ ctime: number;
offset: number;
busy: boolean;
openedAt: number;
@@ -73,9 +86,11 @@ interface Outgoing {
largeAttachments?: boolean;
/** 对端接受多块在途与二进制写入;旧端仍逐块等确认、按 base64 发送。 */
streamAttachments?: boolean;
+ path?: FileTransferPath;
}
const outgoing = new Map<string, Outgoing>();
const cooldown = createPeerTransferCooldown();
+type ReceivedFile = { path: string; size: number; mimeType: string; version?: string; dispose(): Promise<void> };
let cooldownOwner: Owner | undefined;
function refreshCooldownOwner() {
if (!cooldownOwner || !isDataOwnerBroadcastScopeCurrent(cooldownOwner)) {
@@ -111,7 +126,7 @@ const monitors = new Map<string, { connection: string; stop(): void }>();
* chunks cannot stretch the 5s budget. Sampling can neither keep alive nor break a
* transfer.
*/
-function probeStats(connection: string): Promise<string | null> {
+function probeStats(connection: string, budgetMs = 5_000): Promise<string | null> {
if (!connections.has(connection) || !host.contents || host.contents.isDestroyed())
return Promise.resolve(null);
return new Promise((resolve) => {
@@ -119,7 +134,7 @@ function probeStats(connection: string): Promise<string | null> {
const timer = setTimeout(() => {
replies.delete(id);
resolve(null);
- }, 5_000);
+ }, budgetMs);
timer.unref();
replies.set(id, {
connection,
@@ -232,7 +247,13 @@ function touch(id: string) {
throw new Error('FILE_PEER_REVOKED');
}
clearTimeout(c.timer);
- c.timer = setTimeout(() => stopConnection(id, 'idle'), FILE_PEER_IDLE_MS);
+ const transferring = [...sources.values(), ...sinks.values()].some((file) => file.connection === id);
+ if (c.idleMs === null && !transferring && !c.opening) {
+ c.timer = undefined;
+ return c;
+ }
+ const idleMs = c.idleMs ?? FILE_PEER_IDLE_MS;
+ c.timer = setTimeout(() => stopConnection(id, 'idle'), transferring ? Math.min(idleMs, FILE_PEER_RECEIVE_TIMEOUT_MS) : idleMs);
c.timer.unref();
return c;
}
@@ -247,7 +268,7 @@ function keepAlive(id: string): () => void {
} catch {
clearInterval(timer);
}
- }, FILE_PEER_IDLE_MS / 2);
+ }, Math.min(30_000, (connections.get(id)?.idleMs ?? FILE_PEER_IDLE_MS) / 2));
timer.unref();
return () => clearInterval(timer);
}
@@ -268,7 +289,7 @@ function notifyPeerClose(invoke: Invoke, peer: string, remote: string): void {
() => {},
);
} catch {
- // The peer still drops the connection on its own idle timeout.
+ // Local teardown still closes WebRTC; the peer observes that transport loss.
}
}
function stopConnection(id: string, reason: string) {
@@ -318,6 +339,7 @@ function stopConnection(id: string, reason: string) {
}
}
export function stopFilePeers(peer?: string) {
+ invalidateFilePeerScopes(peer);
for (const [id, c] of connections) if (!peer || peer === c.peer) stopConnection(id, 'stop');
}
async function prepareHost(connection: string): Promise<void> {
@@ -352,10 +374,10 @@ function sendCommand(c: FilePeerCommand): Promise<string | undefined> {
reject(new Error('FILE_PEER_TIMEOUT'));
},
c.action === 'receive'
- ? 60_000
- : c.action === 'invoke' && c.timeoutMs && c.timeoutMs > 15_000
+ ? FILE_PEER_RECEIVE_TIMEOUT_MS
+ : c.action === 'invoke' && c.timeoutMs && c.timeoutMs > FILE_PEER_COMMAND_TIMEOUT_MS
? c.timeoutMs
- : 15_000,
+ : FILE_PEER_COMMAND_TIMEOUT_MS,
);
timer.unref();
replies.set(id, { connection: c.connection, resolve, reject, timer });
@@ -408,11 +430,14 @@ async function handleFilePeerRequest(
attachments: true,
largeAttachments: true,
streamAttachments: true,
+ idleMs: FILE_PEER_IDLE_MS,
+ sessionBound: true,
};
if (r.action === 'offer') {
const id = randomUUID();
track(id, peer, true);
connections.get(id)!.invoke = invoke;
+ if (r.sessionBound === true) connections.get(id)!.idleMs = null;
try {
// Cold host readiness and TURN configuration share the outer 30s RPC
// budget: max(10s, 8s) + 15s command leaves transport headroom.
@@ -427,6 +452,7 @@ async function handleFilePeerRequest(
servers,
sdp: r.sdp,
});
+ touch(id);
return { connection: id, sdp };
} catch (error) {
stopConnection(id, 'offer-failed');
@@ -488,13 +514,15 @@ async function handleFilePeerRequest(
file,
size: stat.size,
mtime: stat.mtimeMs,
+ ctime: stat.ctimeMs,
offset: 0,
busy: false,
openedAt: Date.now(),
};
sources.set(ticket, source);
+ touch(r.connection);
monitorSend(ticket, source);
- return { ticket, size: stat.size, mimeType };
+ return { ticket, size: stat.size, mimeType, version: fileVersion(authorized.absPath, stat) };
} catch (error) {
await file.close();
throw error;
@@ -550,6 +578,11 @@ export function registerFilePeerIpc() {
return JSON.stringify(result);
});
ipcMain.handle(FILE_PEER_LOCAL.REGISTER, (e) => host.registered(e));
+ ipcMain.handle(FILE_PEER_LOCAL.CLOSED, (e, id: unknown) => {
+ host.assertSender(e);
+ if (typeof id !== 'string' || !/^[a-f0-9-]{36}$/.test(id)) throw new Error('FILE_PEER_CLOSED');
+ stopConnection(id, 'transport-closed');
+ });
ipcMain.handle(FILE_PEER_LOCAL.REPLY, (e, id: unknown, ok: unknown, value: unknown) => {
host.assertSender(e);
if (
@@ -582,7 +615,7 @@ export function registerFilePeerIpc() {
s.busy = true;
try {
const stat = await s.file.stat();
- if (stat.size !== s.size || stat.mtimeMs !== s.mtime) throw new Error('FILE_PEER_CHANGED');
+ if (stat.size !== s.size || stat.mtimeMs !== s.mtime || stat.ctimeMs !== s.ctime) throw new Error('FILE_PEER_CHANGED');
const bytes = Buffer.alloc(Math.min(FILE_PEER_CHUNK_BYTES, s.size - s.offset));
if (bytes.length) {
const read = await s.file.read(bytes, 0, bytes.length, s.offset);
@@ -598,6 +631,7 @@ export function registerFilePeerIpc() {
if (pending.connection === s.connection && !pending.probe) pending.timer.refresh();
if (!bytes.length) {
sources.delete(ticket);
+ touch(connection);
await s.file.close();
log.debug(
`send done conn=${short(connection)} size=${s.size} ms=${Date.now() - s.openedAt}`,
@@ -619,7 +653,7 @@ export function registerFilePeerIpc() {
FILE_PEER_LOCAL.WRITE,
async (e, id: unknown, offset: unknown, base64: unknown) => {
host.assertSender(e);
- if (typeof id !== 'string' || typeof base64 !== 'string' || base64.length > 22000)
+ if (typeof id !== 'string' || typeof base64 !== 'string' || base64.length > Math.ceil(FILE_PEER_WRITE_BATCH_BYTES / 3) * 4)
throw new Error('FILE_PEER_BLOCK');
const s = sinks.get(id),
bytes = Buffer.from(base64, 'base64');
@@ -627,7 +661,7 @@ export function registerFilePeerIpc() {
!s ||
s.busy ||
offset !== s.offset ||
- bytes.length > FILE_PEER_CHUNK_BYTES ||
+ bytes.length > FILE_PEER_WRITE_BATCH_BYTES ||
s.offset + bytes.length > s.size ||
bytes.toString('base64') !== base64
)
@@ -665,21 +699,53 @@ export function tryPeerFile(
invoke: Invoke,
signal?: AbortSignal,
onProgress?: (received: number, total: number) => void,
+ metadata?: import('./remoteFileVersionCache').FileVersionMetadata,
) {
- const owner = captureDataOwnerBroadcastScope();
- if (!cooldownOwner || !isDataOwnerBroadcastScopeCurrent(cooldownOwner)) {
- cooldown.clear();
- cooldownOwner = owner;
- }
+ const isCurrent = captureFilePeerScope(peer);
+ refreshCooldownOwner();
return queuePeerRead(
peer,
- () => {
- if (!isDataOwnerBroadcastScopeCurrent(owner)) throw new Error('FILE_PEER_CANCELLED');
- return receivePeerFile(peer, url, invoke, signal, onProgress);
+ async () => {
+ if (!isCurrent()) throw new Error('FILE_PEER_CANCELLED');
+ const cache = metadata && validFileVersion(metadata.version)
+ ? await import('./remoteFileVersionCache').then((module) => module.remoteFileVersionCache(peer, url, metadata)).catch(() => null)
+ : null;
+ if (metadata?.skipCache) await cache?.invalidate().catch(() => undefined);
+ const cached = metadata?.skipCache ? null : await cache?.get().catch(() => null);
+ if (cached && metadata) {
+ const copy = await copyReceivedFile({ ...metadata, path: cached, dispose: async () => {} }).catch(() => null);
+ if (copy) {
+ if (signal?.aborted || !isCurrent()) {
+ await copy.dispose(); throw new Error('FILE_PEER_CANCELLED');
+ }
+ try { onProgress?.(copy.size, copy.size); } catch { /* observer only */ }
+ log.debug(`cache hit peer=${short(peer)} size=${copy.size}`);
+ return copy;
+ }
+ }
+ if (!isCurrent()) throw new Error('FILE_PEER_CANCELLED');
+ const result = await receivePeerFile(peer, url, invoke, signal, onProgress);
+ if (result && cache && metadata && !signal?.aborted && isCurrent() &&
+ result.version === metadata.version && result.size === metadata.size)
+ await cache.put(result.path).catch(() => undefined);
+ if (signal?.aborted || !isCurrent()) {
+ await result?.dispose();
+ throw new Error('FILE_PEER_CANCELLED');
+ }
+ return result;
},
signal,
);
}
+async function copyReceivedFile(source: ReceivedFile): Promise<ReceivedFile> {
+ const directory = await fs.mkdtemp(path.join(app.getPath('temp'), 'cindy-file-peer-'));
+ const destination = path.join(directory, 'file');
+ const dispose = () => fs.rm(directory, { recursive: true, force: true });
+ try {
+ await fs.copyFile(source.path, destination, constants.COPYFILE_FICLONE);
+ return { ...source, path: destination, dispose };
+ } catch (error) { await dispose(); throw error; }
+}
async function receivePeerFile(
peer: string,
url: string | null,
@@ -697,6 +763,7 @@ async function receivePeerFile(
const startedAt = Date.now();
let step = 'setup';
const owner = captureDataOwnerBroadcastScope();
+ const isCurrent = captureFilePeerScope(peer);
let out = outgoing.get(peer);
if (out?.busy) return null;
if (!out) {
@@ -713,7 +780,7 @@ async function receivePeerFile(
signal?.addEventListener('abort', cancel, { once: true });
if (!remote) {
const caps = await invoke(peer, FILE_PEER_CHANNEL, [{ action: 'caps' }]);
- if (signal?.aborted || !isDataOwnerBroadcastScopeCurrent(owner))
+ if (signal?.aborted || !isCurrent())
throw new Error('FILE_PEER_CANCELLED');
if (!caps.ok || (caps.result as { version?: unknown })?.version !== 1) {
cooldown.fail(peer);
@@ -727,6 +794,8 @@ async function receivePeerFile(
out.streamAttachments =
(caps.result as { streamAttachments?: unknown }).streamAttachments === true;
track(id, peer, false);
+ const lifetime = caps.result as { idleMs?: unknown; sessionBound?: unknown };
+ connections.get(id)!.idleMs = filePeerReuseMs(lifetime.idleMs, lifetime.sessionBound);
const [, servers] = await Promise.all([prepareHost(id), loadDesktopIceServers()]);
const offer = await command({
action: 'offer',
@@ -734,7 +803,9 @@ async function receivePeerFile(
servers,
streaming: (caps.result as { streaming?: unknown }).streaming === true,
});
- const response = await invoke(peer, FILE_PEER_CHANNEL, [{ action: 'offer', sdp: offer }]);
+ const response = await invoke(peer, FILE_PEER_CHANNEL, [{ action: 'offer', sdp: offer,
+ ...(lifetime.sessionBound === true ? { sessionBound: true } : {}),
+ }]);
const r = response.result as { connection?: string; sdp?: string };
if (
!response.ok ||
@@ -747,13 +818,18 @@ async function receivePeerFile(
throw new Error('FILE_PEER_ANSWER');
remote = r.connection;
out.remote = remote;
+ if (signal?.aborted || !isCurrent()) throw new Error('FILE_PEER_CANCELLED');
await command({ action: 'answer', connection: id, sdp: r.sdp });
log.debug(
- `connected peer=${short(peer)} setupMs=${Date.now() - startedAt} stats=${(await probeStats(id)) ?? 'unavailable'}`,
+ `connected peer=${short(peer)} setupMs=${Date.now() - startedAt}`,
);
}
step = 'open';
touch(id);
+ // Advisory path sampling runs alongside open/receive, never ahead of file bytes.
+ void probeStats(id).then((stats) => {
+ if (outgoing.get(peer) === out && stats) out.path = fileTransferPath(stats);
+ });
if (url === null) {
complete = true;
cooldown.success(peer);
@@ -778,7 +854,7 @@ async function receivePeerFile(
size: file.size,
busy: false,
reportProgress: () => {
- if (signal?.aborted || !isDataOwnerBroadcastScopeCurrent(owner)) return;
+ if (signal?.aborted || !isCurrent()) return;
// An observer must never fail a disk write or trigger a transport fallback.
try {
onProgress?.(receiving.offset, receiving.size);
@@ -791,11 +867,22 @@ async function receivePeerFile(
receiving.reportProgress();
step = 'receive';
const transferStartedAt = Date.now();
+ const watch = createFileTransferWatchdog(file.size, () => out.path ?? 'unknown');
+ const watchdog = setInterval(() => {
+ if (signal?.aborted || !isCurrent()) return;
+ const reason = watch(receiving.offset);
+ if (reason) {
+ log.debug(`slow file fallback peer=${short(peer)} path=${out.path ?? 'unknown'} reason=${reason} written=${receiving.offset}/${file.size}`);
+ stopConnection(id, reason);
+ }
+ }, FILE_PEER_PROGRESS_SAMPLE_MS);
+ watchdog.unref();
const stopProgress = startMonitor(`receive:${sink}`, id, async () => {
const stats = await probeStats(id);
// One failed probe skips its sample only; stopProgress() below bounds the
// monitor, so a stats hiccup cannot silence the rest of the transfer.
if (!stats) return sinks.has(sink);
+ out.path = fileTransferPath(stats);
log.debug(
`receive progress peer=${short(peer)} conn=${short(id)} written=${sinks.get(sink)?.offset ?? '?'}/${file.size}B elapsedMs=${Date.now() - transferStartedAt} stats=${stats}`,
);
@@ -812,15 +899,16 @@ async function receivePeerFile(
if (
sinks.get(sink)?.offset !== file.size ||
signal?.aborted ||
- !isDataOwnerBroadcastScopeCurrent(owner)
+ !isCurrent()
)
throw new Error('FILE_PEER_SIZE');
} finally {
+ clearInterval(watchdog);
stopProgress();
sinks.delete(sink);
await handle.close().catch(() => {});
}
- if (signal?.aborted || !isDataOwnerBroadcastScopeCurrent(owner))
+ if (signal?.aborted || !isCurrent())
throw new Error('FILE_PEER_CLOSED');
touch(id);
const ownedDirectory = directory;
@@ -835,10 +923,11 @@ async function receivePeerFile(
path: destination,
size: file.size,
mimeType: file.mimeType,
+ version: file.version,
dispose: () => fs.rm(ownedDirectory, { recursive: true, force: true }),
};
} catch (error) {
- if (signal?.aborted || !isDataOwnerBroadcastScopeCurrent(owner))
+ if (signal?.aborted || !isCurrent())
throw new Error('FILE_PEER_CANCELLED');
const delay = step === 'open' ? 0 : cooldown.fail(peer);
log.debug(
@@ -890,7 +979,6 @@ function untilAborted<T>(promise: Promise<T>, signal?: AbortSignal): Promise<T>
});
}
-const warming = new Set<string>();
/**
* Upload only bytes; the eventual message still uses its original WSS acceptance semantics.
* Aborting `signal` stops hashing or sending within one block, discards the receiver's partial
@@ -906,12 +994,12 @@ export async function tryUploadPeerAttachment(
signal?: AbortSignal,
): Promise<string | null> {
refreshCooldownOwner();
- const owner = captureDataOwnerBroadcastScope();
+ const isCurrent = captureFilePeerScope(peer);
const check = () => {
- if (!isDataOwnerBroadcastScopeCurrent(owner)) throw new Error('FILE_PEER_CANCELLED');
+ if (!isCurrent()) throw new Error('FILE_PEER_CANCELLED');
};
// Block-level checkpoints also honour the caller's cancellation; the cleanup RPC below
- // (uploadPeerAttachment's `cancel`) only needs the owner check.
+ // (uploadPeerAttachment's `cancel`) needs the same owner/session, but ignores that signal.
const checkActive = () => {
check();
if (signal?.aborted) throw new Error('FILE_PEER_CANCELLED');
@@ -929,8 +1017,8 @@ export async function tryUploadPeerAttachment(
// 读整份文件算摘要之前先确认对端能收:对端离线、旧版或不支持时不白读一遍(随后还要走 OSS)。
// The probe is the one wait with no checkpoint of its own; a late answer is ignored.
const caps = await untilAborted(peerAttachmentCaps(peer, invoke), signal);
- if (!canSendPeerAttachment(caps, size)) return null;
checkActive();
+ if (!canSendPeerAttachment(caps, size)) return null;
const read = async (offset: number, length: number) => {
checkActive();
if (!handle) return (source as Buffer).subarray(offset, offset + length);
@@ -1013,7 +1101,7 @@ export async function tryUploadPeerAttachment(
// `finally` has closed the source file, so the caller may delete it straight away (Windows).
return queuePeerRead(peer, upload, signal);
}
-/** Cold reads use WSS immediately; a single background setup prepares subsequent reads. */
+/** Reads may reuse a file connection, but never create one before a file is needed. */
export async function tryPeerInvoke(
peer: string,
channel: string,
@@ -1023,17 +1111,9 @@ export async function tryPeerInvoke(
refreshCooldownOwner();
if (!canUsePeerInvoke(channel, args)) return null;
if (cooldown.remaining(peer)) return null;
- const owner = captureDataOwnerBroadcastScope();
+ const isCurrent = captureFilePeerScope(peer);
const out = outgoing.get(peer);
if (!out?.remote || !out.rpc) {
- if (!out?.remote && !warming.has(peer)) {
- warming.add(peer);
- void queuePeerRead(peer, async () => {
- if (isDataOwnerBroadcastScopeCurrent(owner)) await receivePeerFile(peer, null, invoke);
- })
- .catch(() => {})
- .finally(() => warming.delete(peer));
- }
return null;
}
try {
@@ -1042,12 +1122,12 @@ export async function tryPeerInvoke(
connection: out.id,
payload: JSON.stringify({ channel, args }),
});
- if (!isDataOwnerBroadcastScopeCurrent(owner)) throw new Error('FILE_PEER_CANCELLED');
+ if (!isCurrent()) throw new Error('FILE_PEER_CANCELLED');
const response = JSON.parse(result!);
if (!response || typeof response.ok !== 'boolean') throw new Error('FILE_PEER_REPLY');
return response;
} catch {
- if (!isDataOwnerBroadcastScopeCurrent(owner)) throw new Error('FILE_PEER_CANCELLED');
+ if (!isCurrent()) throw new Error('FILE_PEER_CANCELLED');
cooldown.fail(peer);
if (!out.busy) stopConnection(out.id, 'rpc-failed');
return null;
diff --git a/apps/desktop/src/main/device-link/filePeerScope.ts b/apps/desktop/src/main/device-link/filePeerScope.ts
new file mode 100644
index 0000000000..2f84582e9c
--- /dev/null
+++ b/apps/desktop/src/main/device-link/filePeerScope.ts
@@ -0,0 +1,15 @@
+import { captureDataOwnerBroadcastScope, isDataOwnerBroadcastScopeCurrent } from './broadcast-tap';
+
+// File preparation, queued reads and capability probes precede a connection ID.
+// Keep their cancellation boundary aligned with established file connections.
+const peers = new Map<string, symbol>();
+export function captureFilePeerScope(peer: string): () => boolean {
+ const owner = captureDataOwnerBroadcastScope();
+ let token = peers.get(peer);
+ if (!token) peers.set(peer, (token = Symbol()));
+ return () => peers.get(peer) === token && isDataOwnerBroadcastScopeCurrent(owner);
+}
+export function invalidateFilePeerScopes(peer?: string): void {
+ if (peer) peers.delete(peer);
+ else peers.clear();
+}
diff --git a/apps/desktop/src/main/device-link/fileVersion.ts b/apps/desktop/src/main/device-link/fileVersion.ts
new file mode 100644
index 0000000000..4b7d56c115
--- /dev/null
+++ b/apps/desktop/src/main/device-link/fileVersion.ts
@@ -0,0 +1,9 @@
+import { createHash } from 'node:crypto';
+import type { Stats } from 'node:fs';
+
+/** Same opened file identity in prepare/open; no raw path or stat fields cross the wire. */
+export function fileVersion(absPath: string, stat: Stats): string {
+ return createHash('sha256')
+ .update(JSON.stringify([absPath, stat.dev, stat.ino, stat.size, stat.mtimeMs, stat.ctimeMs]))
+ .digest('hex');
+}
diff --git a/apps/desktop/src/main/device-link/index.ts b/apps/desktop/src/main/device-link/index.ts
index 8b75d27a47..5252dc5b64 100644
--- a/apps/desktop/src/main/device-link/index.ts
+++ b/apps/desktop/src/main/device-link/index.ts
@@ -11,7 +11,7 @@
*/
import os from 'node:os';
-import { tryPeerInvoke } from './filePeer';
+import { tryPeerInvoke, stopFilePeers } from './filePeer';
import { assertBackgroundLinkAccepted, linkOpenCapabilities } from './backgroundLink';
import { deviceName, initializeDeviceName } from './deviceName';
import { desktopTransferCodec } from './transferCodec';
@@ -21,6 +21,7 @@ import { app, BrowserWindow } from 'electron';
import WebSocket from 'ws';
import {
DeviceLinkClient,
+ FILE_PEER_CHANNEL,
isScopedPeer,
parseSharedTaskPeer,
probeSharedTaskHost,
@@ -810,6 +811,7 @@ export function initDeviceLinkService(options: DeviceLinkServiceOptions = {}): v
client.onStatusChange((status) => {
if (status !== 'online') {
+ stopFilePeers();
invalidatePluginOauth();
// The shared relay connection is a larger fault domain than one peer:
// release every active controller projection, but keep remembered topics
@@ -1736,6 +1738,7 @@ export async function openRemoteLink(
/** 控制端:解除控制链路 */
export function closeRemoteLink(deviceId: string): void {
+ stopFilePeers(deviceId);
invalidatePluginOauth(deviceId);
// 取消义务清单(不变量 6):用户显式断开必须终止该设备**全部** per-device
// 恢复机制,漏一个就是「刚关又被自动建回」。当前全量:
@@ -1745,7 +1748,8 @@ export function closeRemoteLink(deviceId: string): void {
// 4. 在途建链(登记删除 + closeEpochs 翻代拦 park 中的等待);
// 5. remoteInvoke / remoteSubscribe 在途调用(经 4 的代次在发送/重开前自败);
// 6. OAuth 授权事务与本机回调监听(翻代后在后续操作前自败);
- // 7. MCP App View 的跨调用轮询与清理(绑定打开时的代次,翻代后自败)。
+ // 7. MCP App View 的跨调用轮询与清理(绑定打开时的代次,翻代后自败);
+ // 8. 独立文件连接及其排队/协商请求(stopFilePeers 翻代,迟到结果只清理)。
// 新增任何 per-device 重试/恢复机制时必须同步登记到本清单。
transportTimeoutReopen.cancel(deviceId);
cancelSubscriptionReplay(deviceId);
@@ -1827,6 +1831,14 @@ export async function remoteInvoke(
assertLinkNotClosedSinceStart();
options?.preSend?.();
};
+ // Cleanup is best effort over the existing link. A late file answer must never
+ // reopen the remote session just to dispose its now-unwanted allocation.
+ if (channel === FILE_PEER_CHANNEL && (args[0] as { action?: unknown } | null)?.action === 'close') {
+ preSend();
+ if (!client?.isLinkReady(deviceId))
+ throw new DeviceLinkError('LINK_NOT_OPEN', 'file cleanup requires an existing link');
+ return client.invoke(deviceId, { channel, args }, resolveRemoteInvokeTimeoutMs(channel, args, 'desktop'), { preSend });
+ }
const invoke = async (): Promise<InvokeResultPayload> => {
// 熔断门禁(外层 guardInvoke)在连接等待之前:open 态快速失败,不消耗 1.5s 等待。
await ensureOnlineForRequest();
diff --git a/apps/desktop/src/main/device-link/mediaFetch.ts b/apps/desktop/src/main/device-link/mediaFetch.ts
index 4fa12c1834..0f7336ce3f 100644
--- a/apps/desktop/src/main/device-link/mediaFetch.ts
+++ b/apps/desktop/src/main/device-link/mediaFetch.ts
@@ -39,6 +39,7 @@ import { createLogger } from '../logger.js';
import { getDeviceLinkInvokeContext } from './invoke-context.js';
import { sharedTaskMediaId, withSharedTaskMedia } from './sharedTaskMediaContext.js';
import { assertSharedTaskMedia } from './sharedTaskMediaAccess.js';
+import { fileVersion } from './fileVersion.js';
const log = createLogger('device-link:mediaFetch');
@@ -73,6 +74,7 @@ export interface MediaFetchResult {
*/
inlineBase64?: string;
transferRequired?: boolean;
+ version?: string;
}
/** 缩略图最长边:手机聊天气泡最宽 ~360pt@3x≈1080px,1024 足够清晰;点开查看器仍取原图。 */
@@ -449,6 +451,7 @@ export async function fetchLocalMediaToOss(arg: unknown): Promise<MediaFetchResu
const result = {
ossKey: '',
size: before.size,
+ version: fileVersion(absPath, before),
mimeType:
mimeType ??
mimeOf((uploadExtHint ?? path.extname(absPath)).replace(/^\./, '').toLowerCase()),
diff --git a/apps/desktop/src/main/device-link/remoteFileVersionCache.ts b/apps/desktop/src/main/device-link/remoteFileVersionCache.ts
new file mode 100644
index 0000000000..20fbb7dcc4
--- /dev/null
+++ b/apps/desktop/src/main/device-link/remoteFileVersionCache.ts
@@ -0,0 +1,127 @@
+import { createHash } from 'node:crypto';
+import { promises as fs } from 'node:fs';
+import { validFileVersion, type DeviceFileResult } from '@cindy/device-link';
+import { getActiveAppSession } from '../appSessionState';
+import { getDbClient } from '../localDb/client/current';
+import {
+ integrationCacheGet,
+ integrationCachePut,
+ supportedMime,
+} from '../cindy-media/integrationCache';
+import { sniffMediaMime } from '../cindy-media/sniffMediaMime';
+import { scanCache, evictCacheBlobs, CACHE_LIMIT_BYTES } from '../cindy-media/recycler';
+import {
+ readVersionedRemoteFile,
+ removeVersionedRemoteFile,
+ writeVersionedRemoteFile,
+} from '../file-browser/remote-file-cache';
+import { captureDataOwnerBroadcastScope, isDataOwnerBroadcastScopeCurrent } from './broadcast-tap';
+import { removeRefs } from '../cindy-media/ledger';
+
+const INTEGRATION = 'remote-file';
+export type FileVersionMetadata = Pick<DeviceFileResult, 'version' | 'size' | 'mimeType'> & {
+ skipCache?: boolean;
+};
+
+/** An adapter to the existing media warehouse / ordinary-file LRU, not another byte store.
+ * Authorization and stat happen on the host before this adapter is called, every time.
+ * Generations guard in-flight work; stable owner IDs key the durable cache across restarts. */
+export function remoteFileVersionCache(
+ device: string,
+ url: string,
+ metadata?: FileVersionMetadata,
+) {
+ if (!metadata || !validFileVersion(metadata.version)) return null;
+ const owner = captureDataOwnerBroadcastScope();
+ const session = getActiveAppSession();
+ if (!session.dataOwnerId || !isDataOwnerBroadcastScopeCurrent(owner)) return null;
+ const { version, size, mimeType } = metadata;
+ const source = createHash('sha256')
+ .update(JSON.stringify([session.mode, session.dataOwnerId, device, url]))
+ .digest('hex');
+ const key = `${INTEGRATION}:${source}:${version}`;
+ const media = /^(image|audio|video|model)\//.test(mimeType);
+ const db = media ? getDbClient().drizzle : undefined;
+ const assertCurrent = () => {
+ if (!isDataOwnerBroadcastScopeCurrent(owner)) throw new Error('FILE_PEER_CANCELLED');
+ };
+ return {
+ async invalidate(): Promise<void> {
+ assertCurrent();
+ if (!media) return removeVersionedRemoteFile(source, version);
+ const hit = await integrationCacheGet(key, db);
+ assertCurrent();
+ if (hit)
+ await evictCacheBlobs(
+ {
+ hashes: [hit.hash],
+ live: new Set(),
+ integration: INTEGRATION,
+ assertStillValid: assertCurrent,
+ },
+ db,
+ );
+ // Shared/pinned bytes survive the conditional eviction; remove only our index.
+ assertCurrent();
+ await removeRefs({ refKind: 'integration-cache', refId: key }, db);
+ },
+ async get(): Promise<string | null> {
+ assertCurrent();
+ if (!media) {
+ const file = await readVersionedRemoteFile(source, version, size);
+ assertCurrent();
+ return file;
+ }
+ const hit = await integrationCacheGet(key, db);
+ assertCurrent();
+ if (!hit) return null;
+ const stat = await fs.lstat(hit.absPath).catch(() => null);
+ assertCurrent();
+ return stat?.isFile() && stat.size === size ? hit.absPath : null;
+ },
+ async put(file: string): Promise<void> {
+ assertCurrent();
+ if (!media) return writeVersionedRemoteFile(source, version, file, size, assertCurrent);
+ // A copy that cannot fit the existing cache budget would evict everything
+ // else and immediately be evicted itself. It remains available to its consumer.
+ if (size > CACHE_LIMIT_BYTES) return;
+ // Bounded sniff; never load a large media file into main-process memory.
+ const handle = await fs.open(file, 'r');
+ let verified: string | null;
+ try {
+ const probe = Buffer.alloc(Math.min(size, 4096));
+ const { bytesRead } = await handle.read(probe, 0, probe.length, 0);
+ verified = sniffMediaMime(probe.subarray(0, bytesRead), mimeType);
+ } finally {
+ await handle.close();
+ }
+ assertCurrent();
+ if (!verified || !supportedMime(verified)) return;
+ const written = await integrationCachePut(
+ {
+ cacheKey: key,
+ integration: INTEGRATION,
+ filePath: file,
+ mimeType: verified,
+ assertStillValid: assertCurrent,
+ },
+ db,
+ );
+ assertCurrent();
+ // Use the warehouse's existing byte budget. Only this integration's cache
+ // is eligible: attachments, pinned media and other integrations stay protected.
+ const live = new Set([written.hash]);
+ const scan = await scanCache({ live, integration: INTEGRATION }, db);
+ assertCurrent();
+ await evictCacheBlobs(
+ {
+ hashes: scan.evictable.map((entry) => entry.hash),
+ live,
+ integration: INTEGRATION,
+ assertStillValid: assertCurrent,
+ },
+ db,
+ );
+ },
+ };
+}
diff --git a/apps/desktop/src/main/file-browser/remote-file-cache.ts b/apps/desktop/src/main/file-browser/remote-file-cache.ts
index ad1c47d400..b7a9db3fdd 100644
--- a/apps/desktop/src/main/file-browser/remote-file-cache.ts
+++ b/apps/desktop/src/main/file-browser/remote-file-cache.ts
@@ -17,7 +17,7 @@
*/
import { createHash, randomUUID } from 'node:crypto';
-import { promises as fs, renameSync } from 'node:fs';
+import { constants, promises as fs, renameSync } from 'node:fs';
import path from 'node:path';
import { app } from 'electron';
@@ -31,6 +31,57 @@ const CHAT_ATTACHMENT_CACHE_DIR_NAME = 'chat-attachment-cache';
/** LRU 字节上限:4GB——够放两个 2GB 文件,超出按最旧访问逐出。 */
const MAX_CACHE_BYTES = 4 * 1024 * 1024 * 1024;
+/** Version-validated transport copies share this store's disk budget and startup sweep.
+ * Both identities are SHA-256 digests; no remote path becomes a local path. */
+function versionedCachePath(source: string, version: string): string {
+ if (!/^[a-f0-9]{64}$/.test(source) || !/^[a-f0-9]{64}$/.test(version))
+ throw new Error('INVALID_CACHE_IDENTITY');
+ return path.join(cacheDir(), `peer-${source}-${version}.bin`);
+}
+
+export async function readVersionedRemoteFile(source: string, version: string, size: number): Promise<string | null> {
+ const file = versionedCachePath(source, version);
+ const stat = await fs.lstat(file).catch(() => null);
+ if (!stat?.isFile() || stat.size !== size) return null;
+ const now = new Date();
+ await fs.utimes(file, now, now).catch(() => undefined);
+ return file;
+}
+
+export async function removeVersionedRemoteFile(source: string, version: string): Promise<void> {
+ await fs.rm(versionedCachePath(source, version), { force: true });
+}
+
+export async function writeVersionedRemoteFile(
+ source: string, version: string, from: string, size: number, assertCurrent: () => void,
+): Promise<void> {
+ if (size > MAX_CACHE_BYTES) return;
+ const destination = versionedCachePath(source, version);
+ assertCurrent();
+ await fs.mkdir(cacheDir(), { recursive: true });
+ // Make room before allocating the new copy, rather than temporarily exceeding
+ // the existing disk quota and failing the write on a nearly full volume.
+ await evictLru(undefined, MAX_CACHE_BYTES - size);
+ assertCurrent();
+ const temporary = path.join(cacheDir(), `${randomUUID()}.part`);
+ try {
+ await fs.copyFile(from, temporary, constants.COPYFILE_FICLONE);
+ if ((await fs.stat(temporary)).size !== size) return;
+ await fs.chmod(temporary, 0o600);
+ assertCurrent();
+ renameSync(temporary, destination);
+ // A changed source replaces its previous versions, regardless of their age.
+ const names = await fs.readdir(cacheDir());
+ for (const name of names) {
+ if (name.startsWith(`peer-${source}-`) && name !== path.basename(destination))
+ await fs.rm(path.join(cacheDir(), name), { force: true }).catch(() => undefined);
+ }
+ await evictLru(destination);
+ } finally {
+ await fs.rm(temporary, { force: true }).catch(() => undefined);
+ }
+}
+
export interface RemoteFileIdentity {
/** Capture before any await so a switched account cannot share an in-flight read. */
scope?: string;
@@ -454,7 +505,7 @@ export async function stageLocalFileToCache(params: {
* MAX + 保护文件超出部分(SSH 通路对单文件大小无上限是产品要求),不会
* 随多次取回持续漂移超容。
*/
-async function evictLru(protectPath?: string): Promise<void> {
+async function evictLru(protectPath?: string, limitBytes = MAX_CACHE_BYTES): Promise<void> {
const dir = cacheDir();
let names: string[];
try {
@@ -478,10 +529,10 @@ async function evictLru(protectPath?: string): Promise<void> {
// 竞态删除,忽略
}
}
- if (total <= MAX_CACHE_BYTES) return;
+ if (total <= limitBytes) return;
files.sort((a, b) => a.mtimeMs - b.mtimeMs);
for (const f of files) {
- if (total <= MAX_CACHE_BYTES) break;
+ if (total <= limitBytes) break;
try {
await fs.rm(f.p, { force: true });
total -= f.size;
diff --git a/apps/desktop/src/preload/desktopCapturePreload.ts b/apps/desktop/src/preload/desktopCapturePreload.ts
index b0876fa506..445e395518 100644
--- a/apps/desktop/src/preload/desktopCapturePreload.ts
+++ b/apps/desktop/src/preload/desktopCapturePreload.ts
@@ -28,6 +28,7 @@ const api: DesktopCaptureApi = {
};
if (location.search === '?mode=files') {
const files: FilePeerHostApi = {
+ closed: (connection) => ipcRenderer.invoke(FILE_PEER_LOCAL.CLOSED, connection),
register: () => ipcRenderer.invoke(FILE_PEER_LOCAL.REGISTER),
onCommand: (listener) => {
const wrapped = (_e: Electron.IpcRendererEvent, id: string, command: FilePeerCommand) =>
diff --git a/apps/desktop/src/shared/filePeer.ts b/apps/desktop/src/shared/filePeer.ts
index 5200cf4aab..e6f9437dfc 100644
--- a/apps/desktop/src/shared/filePeer.ts
+++ b/apps/desktop/src/shared/filePeer.ts
@@ -1,6 +1,7 @@
import type { DesktopIceServer } from '@cindy/device-link';
export const FILE_PEER_LOCAL = {
REGISTER: 'file-peer:host:register',
+ CLOSED: 'file-peer:host:closed',
COMMAND: 'file-peer:host:command',
REPLY: 'file-peer:host:reply',
READ: 'file-peer:host:read',
@@ -17,6 +18,7 @@ export type FilePeerCommand =
| { action: 'receive'; connection: string; ticket: string; size: number; sink: string }
| { action: 'close'; connection: string };
export interface FilePeerHostApi {
+ closed(connection: string): Promise<void>;
register(): Promise<void>;
onCommand(fn: (id: string, command: FilePeerCommand) => void): () => void;
reply(id: string, ok: boolean, value?: string): Promise<void>;
diff --git a/apps/mobile/src/__tests__/mobileMakerTransport.test.ts b/apps/mobile/src/__tests__/mobileMakerTransport.test.ts
index ce2b205cef..f5b8a80288 100644
--- a/apps/mobile/src/__tests__/mobileMakerTransport.test.ts
+++ b/apps/mobile/src/__tests__/mobileMakerTransport.test.ts
@@ -203,7 +203,7 @@ describe("mobile maker transport", () => {
mimeType: "text/plain",
inlineBase64: "",
})
- .mockResolvedValueOnce({ ...direct, transferRequired: true });
+ .mockResolvedValueOnce({ ...direct, transferRequired: true, version: 'a'.repeat(64) });
try {
const maker = createMobileMakerTransport({ deviceId: "d", invoke });
expect(
@@ -214,6 +214,11 @@ describe("mobile maker transport", () => {
direct,
);
expect(peer).toHaveBeenCalledOnce();
+ expect(peer.mock.calls[0]).toEqual(['d', 'xdt-file://open?path=/b', undefined, expect.any(Number), { ...direct, transferRequired: true, version: 'a'.repeat(64) }]);
+ invoke.mockResolvedValueOnce({ ...direct, transferRequired: true, version: 'a'.repeat(64) });
+ await maker.fetchRemoteMedia('xdt-file://open?path=/b', { stream: false, skipCache: true });
+ expect(peer.mock.calls[1]).toEqual(['d', 'xdt-file://open?path=/b', undefined, expect.any(Number),
+ { ...direct, transferRequired: true, version: 'a'.repeat(64), skipCache: true }]);
} finally {
uninstall();
}
diff --git a/apps/mobile/src/__tests__/peerFileCache.test.ts b/apps/mobile/src/__tests__/peerFileCache.test.ts
new file mode 100644
index 0000000000..ec481b1824
--- /dev/null
+++ b/apps/mobile/src/__tests__/peerFileCache.test.ts
@@ -0,0 +1,142 @@
+import { afterEach, expect, it, vi } from "vitest";
+import { createHash } from "node:crypto";
+const disk = vi.hoisted(() => ({
+ files: new Map<string, Uint8Array>(),
+ indexes: new Map<string, string>(),
+ copying: false,
+ gate: undefined as Promise<void> | undefined,
+ seq: 0,
+}));
+vi.mock("expo-crypto", () => ({
+ CryptoDigestAlgorithm: { SHA256: "sha256" },
+ digestStringAsync: async (_algorithm: string, text: string) =>
+ createHash("sha256").update(text).digest("hex"),
+ randomUUID: () => `copy-${++disk.seq}`,
+}));
+vi.mock("expo-file-system", () => ({
+ Paths: { cache: "file:///cache", availableDiskSpace: 10 * 1024 ** 3 },
+ Directory: class {
+ uri: string;
+ constructor(...parts: Array<string | { uri: string }>) {
+ this.uri = parts
+ .map((p) => (typeof p === "string" ? p : p.uri))
+ .join("/");
+ }
+ create() {}
+ },
+ File: class {
+ uri: string;
+ constructor(...parts: Array<string | { uri: string }>) {
+ this.uri = parts
+ .map((p) => (typeof p === "string" ? p : p.uri))
+ .join("/");
+ }
+ get exists() {
+ return disk.files.has(this.uri);
+ }
+ get size() {
+ return disk.files.get(this.uri)?.length ?? 0;
+ }
+ delete() {
+ disk.files.delete(this.uri);
+ }
+ async copy(target: { uri: string }) {
+ disk.copying = true;
+ if (disk.gate) await disk.gate;
+ await new Promise((resolve) => setTimeout(resolve, 0));
+ const bytes = disk.files.get(this.uri);
+ if (!bytes) throw new Error("missing");
+ disk.files.set(target.uri, bytes.slice());
+ disk.copying = false;
+ }
+ },
+}));
+vi.mock("@/session/remoteMediaDiskCacheExpo", () => ({
+ createExpoRemoteMediaDiskCacheIO: (namespace: string) => {
+ const uri = (name: string) => `file:///cache/${namespace}/${name}`;
+ return {
+ ensureDir() {},
+ readIndexText: async () => disk.indexes.get(namespace) ?? null,
+ writeIndexText: (text: string) => {
+ disk.indexes.set(namespace, text);
+ },
+ fileExists: (name: string) => disk.files.has(uri(name)),
+ fileSize: (name: string) => disk.files.get(uri(name))?.length ?? -1,
+ fileUri: uri,
+ deleteFile: (name: string) => {
+ disk.files.delete(uri(name));
+ },
+ listFiles: () =>
+ [...disk.files.keys()]
+ .filter((p) => p.startsWith(`file:///cache/${namespace}/`))
+ .map((p) => p.split("/").at(-1)!),
+ download: async (source: string, name: string) => {
+ const bytes = disk.files.get(source);
+ if (!bytes) return null;
+ disk.files.set(uri(name), bytes.slice());
+ return bytes.length;
+ },
+ };
+ },
+}));
+import { createPeerFileCache } from "@/device-link/peerFileCache";
+import {
+ clearPeerMedia,
+ peerMediaUri,
+ recordPeerMedia,
+ releasePeerMedia,
+} from "@/device-link/peerFileRegistry";
+afterEach(() => {
+ clearPeerMedia();
+ disk.gate = undefined;
+ disk.copying = false;
+});
+const metadata = { size: 5, mimeType: "text/html", version: "a".repeat(64) };
+async function seed(owner: string) {
+ const cache = await createPeerFileCache(owner);
+ const uri = `file:///received/${owner}`;
+ disk.files.set(uri, Uint8Array.from([1, 2, 3, 4, 5]));
+ const media = { ossKey: "", ...metadata };
+ recordPeerMedia(media, uri, () => {
+ disk.files.delete(uri);
+ });
+ await cache.store("device", "url", metadata, media);
+ releasePeerMedia(uri);
+ return cache;
+}
+it("awaits the asynchronous copy before returning, and consumer disposal leaves the durable copy intact", async () => {
+ const cache = await seed("copy-owner");
+ const result = await cache.read("device", "url", metadata, () => true);
+ const uri = peerMediaUri(result!)!;
+ expect(disk.files.get(uri)).toEqual(Uint8Array.from([1, 2, 3, 4, 5]));
+ expect(disk.copying).toBe(false);
+ releasePeerMedia(uri);
+ expect(
+ await cache.read("device", "url", metadata, () => true),
+ ).not.toBeNull();
+ const other = await createPeerFileCache("other-owner");
+ expect(await other.read("device", "url", metadata, () => true)).toBeNull();
+});
+it("discards a copy completed after cancellation and retains only the reusable source", async () => {
+ const cache = await seed("cancel-owner");
+ let resume!: () => void,
+ active = true;
+ disk.gate = new Promise((resolve) => {
+ resume = resolve;
+ });
+ const before = new Set(disk.files.keys());
+ const read = cache.read("device", "url", metadata, () => active);
+ await vi.waitFor(() => expect(disk.copying).toBe(true));
+ active = false;
+ resume();
+ expect(await read).toBeNull();
+ expect(new Set(disk.files.keys())).toEqual(before);
+});
+it("invalidates a bad cache even if the forced transfer later fails, while consumer copies survive", async () => {
+ const cache = await seed("refresh-owner");
+ const old = await cache.read("device", "url", metadata, () => true);
+ const uri = peerMediaUri(old!)!;
+ await cache.invalidate("device", "url");
+ expect(await cache.read("device", "url", metadata, () => true)).toBeNull();
+ expect(disk.files.get(uri)).toEqual(Uint8Array.from([1, 2, 3, 4, 5]));
+});
diff --git a/apps/mobile/src/__tests__/peerFileLifecycle.test.tsx b/apps/mobile/src/__tests__/peerFileLifecycle.test.tsx
new file mode 100644
index 0000000000..6d7fbce9b7
--- /dev/null
+++ b/apps/mobile/src/__tests__/peerFileLifecycle.test.tsx
@@ -0,0 +1,235 @@
+// @vitest-environment jsdom
+import { act, createElement } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, expect, it, vi } from "vitest";
+import { PeerFileTransport } from "@/device-link/peerFileTransport";
+
+const state = vi.hoisted(() => ({
+ props: {} as any,
+ sequence: 0,
+ sessionBound: true,
+ app: "active",
+ change: (_state: string) => {},
+ upload: undefined as any,
+ read: undefined as any,
+ reset: undefined as any,
+ commands: [] as any[],
+ rpc: vi.fn(),
+ open: vi.fn(),
+}));
+vi.mock("react-native", () => ({
+ View: ({ children }: any) => children,
+ AppState: {
+ get currentState() {
+ return state.app;
+ },
+ addEventListener: (_: string, callback: typeof state.change) => {
+ state.change = callback;
+ return { remove() {} };
+ },
+ },
+}));
+vi.mock("react-native-webview", async () => {
+ const { forwardRef, useImperativeHandle } = await import("react");
+ return {
+ WebView: forwardRef((props: any, ref) => {
+ state.props = props;
+ useImperativeHandle(ref, () => ({
+ injectJavaScript(script: string) {
+ const match = /^window.filePeerMessage\((.*)\);true;$/.exec(script);
+ if (!match) return;
+ const message = JSON.parse(match[1]);
+ state.commands.push(message);
+ const result =
+ message.action === "invoke"
+ ? JSON.stringify({ ok: true, result: "preview" })
+ : message.action === "stats"
+ ? JSON.stringify({ path: "relay" })
+ : "v=0";
+ props.onMessage({
+ nativeEvent: {
+ data: JSON.stringify({
+ type: "reply",
+ id: message.id,
+ ok: true,
+ result,
+ }),
+ },
+ });
+ },
+ }));
+ return null;
+ }),
+ };
+});
+vi.mock("expo-file-system", () => ({
+ Directory: class {
+ exists = false;
+ },
+ File: class {},
+ Paths: { cache: "/cache" },
+}));
+vi.mock("expo-crypto", () => ({ randomUUID: () => `id-${++state.sequence}` }));
+vi.mock("@/device-link/peerFileCache", () => ({
+ createPeerFileCache: async () => null,
+}));
+vi.mock("@/auth/AuthContext", () => ({
+ useAuth: () => ({
+ isAuthenticated: true,
+ user: { id: "a" },
+ accountGeneration: 1,
+ }),
+}));
+vi.mock("@/device-link/DeviceLinkContext", () => ({
+ useDeviceLink: () => ({
+ connectionEpoch: 1,
+ invoke: state.rpc,
+ openLink: state.open,
+ }),
+}));
+vi.mock("@/config/env", () => ({
+ DEVICE_LINK_API_BASE_URL: "https://example.test",
+ getActiveMobileSessionRealm: () => "global",
+}));
+vi.mock("@cindy/device-link", async (original) => ({
+ ...(await original<typeof import("@cindy/device-link")>()),
+ resolveDesktopIceServers: async () => [],
+}));
+vi.mock("@/device-link/peerFileRegistry", () => ({
+ installPeerFileDownload: () => () => {},
+ installPeerInvoke: (callback: any) => {
+ state.read = callback;
+ return () => {
+ state.read = undefined;
+ };
+ },
+ installPeerUpload: (callback: any) => {
+ state.upload = callback;
+ return () => {
+ state.upload = undefined;
+ };
+ },
+ installPeerUploadProbe: () => () => {},
+ installPeerReset: (callback: any) => {
+ state.reset = callback;
+ return () => {
+ state.reset = undefined;
+ };
+ },
+ clearPeerMedia() {},
+ recordPeerMedia() {},
+ canStagePeerMedia: () => true,
+}));
+Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true });
+let root: Root;
+const message = (value: unknown) =>
+ state.props.onMessage({ nativeEvent: { data: JSON.stringify(value) } });
+const read = () =>
+ state.read("device", "file-browser:remote-op", [{ op: "readFile" }]);
+// Exercise setup only: this peer supports downloads/RPC but declines attachment uploads.
+const connect = () =>
+ state.upload("device", "/unused", { size: 1, sha256: "a".repeat(64) });
+const offers = () =>
+ state.rpc.mock.calls.filter(([, , [r]]) => r.action === "offer");
+const closes = () =>
+ state.rpc.mock.calls.filter(([, , [r]]) => r.action === "close");
+beforeEach(() => {
+ vi.useFakeTimers();
+ state.sequence = 0;
+ state.sessionBound = true;
+ state.app = "active";
+ state.commands = [];
+ state.open.mockReset().mockResolvedValue(undefined);
+ state.rpc
+ .mockReset()
+ .mockImplementation(async (_device, _channel, [request]) =>
+ request.action === "caps"
+ ? {
+ version: 1,
+ streaming: true,
+ idleMs: 300_000,
+ ...(state.sessionBound ? { sessionBound: true } : {}),
+ }
+ : { connection: "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", sdp: "v=0" },
+ );
+ root = createRoot(document.createElement("div"));
+ act(() => root.render(createElement(PeerFileTransport)));
+ act(() => message({ type: "ready" }));
+});
+afterEach(() => {
+ act(() => root.unmount());
+ vi.useRealTimers();
+});
+
+it("opens lazily, keeps negotiated connection idle and releases the host on background", async () => {
+ expect(await read()).toBeNull();
+ await vi.advanceTimersByTimeAsync(1000);
+ expect(state.rpc).not.toHaveBeenCalled();
+ expect(state.open).not.toHaveBeenCalled();
+ await connect();
+ expect(offers()[0][2][0].sessionBound).toBe(true);
+ await vi.advanceTimersByTimeAsync(30 * 60_000);
+ expect(closes()).toHaveLength(0);
+ expect(await read()).toEqual({ ok: true, result: "preview" });
+ expect(offers()).toHaveLength(1);
+ act(() => {
+ state.app = "background";
+ state.change("background");
+ });
+ expect(closes()).toHaveLength(1);
+ expect(state.read).toBeUndefined();
+ act(() => {
+ state.app = "active";
+ state.change("active");
+ });
+ act(() => message({ type: "ready" }));
+ expect(await read()).toBeNull();
+ expect(offers()).toHaveLength(1);
+ await connect();
+ expect(offers()).toHaveLength(2);
+});
+
+it("keeps legacy idle expiry when the host has not advertised sessionBound", async () => {
+ state.sessionBound = false;
+ await connect();
+ expect(offers()[0][2][0]).not.toHaveProperty("sessionBound");
+ await vi.advanceTimersByTimeAsync(300_000);
+ expect(closes()).toHaveLength(1);
+ expect(await read()).toBeNull();
+});
+
+it("releases a late host answer after backgrounding during setup", async () => {
+ const normal = state.rpc.getMockImplementation()!;
+ let answer!: (value: unknown) => void;
+ state.rpc.mockImplementation((...args) =>
+ args[2][0].action === "offer"
+ ? new Promise((resolve) => {
+ answer = resolve;
+ })
+ : normal(...args),
+ );
+ const transfer = connect();
+ const cancelled = expect(transfer).rejects.toThrow("FILE_PEER_CANCELLED");
+ await vi.waitFor(() => expect(offers()).toHaveLength(1));
+ act(() => {
+ state.app = "background";
+ state.change("background");
+ });
+ answer({ connection: "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", sdp: "v=0" });
+ await cancelled;
+ expect(closes()).toHaveLength(1);
+ expect(state.commands.some((c) => c.action === "answer")).toBe(false);
+});
+
+it("rebuilds only on demand after failure and ignores delayed closure of the old connection", async () => {
+ await connect();
+ const id = state.commands.find((c) => c.action === "offer").args[0];
+ act(() => message({ type: "closed", connection: id }));
+ expect(await read()).toBeNull();
+ await connect();
+ expect(offers()).toHaveLength(2);
+ act(() => message({ type: "closed", connection: id }));
+ expect(await read()).toEqual({ ok: true, result: "preview" });
+ act(() => state.reset("device"));
+ expect(await read()).toBeNull();
+});
diff --git a/apps/mobile/src/__tests__/peerFileRegistry.test.ts b/apps/mobile/src/__tests__/peerFileRegistry.test.ts
index 239224752e..e3b6326952 100644
--- a/apps/mobile/src/__tests__/peerFileRegistry.test.ts
+++ b/apps/mobile/src/__tests__/peerFileRegistry.test.ts
@@ -73,7 +73,10 @@ describe("peer file staging ownership", () => {
const peer = vi.fn(async () => null);
const remove = installPeerFileDownload(peer);
await tryMobilePeerFile("device", "url", undefined, 42);
- expect(peer).toHaveBeenCalledWith("device", "url", undefined, 42);
+ expect(peer).toHaveBeenCalledWith("device", "url", undefined, 42, undefined);
+ const metadata = { version: 'a'.repeat(64), size: 12, mimeType: 'text/html' };
+ await tryMobilePeerFile('device', 'url', undefined, 43, metadata);
+ expect(peer).toHaveBeenLastCalledWith('device', 'url', undefined, 43, metadata);
remove();
});
});
diff --git a/apps/mobile/src/__tests__/remoteMediaDiskCache.test.ts b/apps/mobile/src/__tests__/remoteMediaDiskCache.test.ts
index 53f0fd5bcd..eec98927f8 100644
--- a/apps/mobile/src/__tests__/remoteMediaDiskCache.test.ts
+++ b/apps/mobile/src/__tests__/remoteMediaDiskCache.test.ts
@@ -36,6 +36,62 @@ const URL_B = 'xdt-image://cache/b.png';
const URL_C = 'xdt-image://cache/c.png';
describe('remoteMediaDiskCache', () => {
+ it('recreates a removed cache directory on a later write and rejects invalid version paths', async () => {
+ const h = memoryIO();
+ let directoryExists = false;
+ h.io.ensureDir = () => { directoryExists = true; };
+ h.io.download = async (_url, name) => {
+ if (!directoryExists) return null;
+ h.files.set(name, 1000);
+ return 1000;
+ };
+ const cache = createRemoteMediaDiskCache(h.io);
+ expect(await cache.store(URL_A, 'file:///a', 'text/html', 1000, '../escape')).toBe(false);
+ await cache.store(URL_A, 'file:///a', 'text/html', 1000);
+ directoryExists = false; h.files.clear();
+ expect(await cache.lookup(URL_A)).toBeNull();
+ expect(await cache.store(URL_A, 'file:///a', 'text/html', 1000)).toBe(true);
+ expect(await cache.lookup(URL_A)).not.toBeNull();
+ });
+ it('retains versioned files across restarts and invalidates only a changed source', async () => {
+ const h = memoryIO();
+ const a = 'a'.repeat(64), b = 'b'.repeat(64);
+ const cache = createRemoteMediaDiskCache(h.io);
+ await cache.store(URL_A, 'file:///received/a', 'text/html', 1000, a);
+ await cache.store(URL_B, 'file:///received/b', 'image/png', 1000, a);
+ const restarted = createRemoteMediaDiskCache(h.io, { now: () => Date.now() + 365 * 86400_000 });
+ expect(await restarted.lookup(URL_A, a)).toMatchObject({ size: 1000 });
+ expect(await restarted.lookup(URL_A, b)).toBeNull();
+ expect(await restarted.lookup(URL_B, a)).toMatchObject({ size: 1000 });
+ expect(h.io.download).toHaveBeenCalledTimes(2);
+ });
+ it('cleans the least recently used files only under real disk pressure and persists access order', async () => {
+ const h = memoryIO();
+ let time = 1, capacity = 10_000;
+ const options = { now: () => time++, persistAccess: true, reserveBytes: 500,
+ availableBytes: () => capacity - [...h.files.values()].reduce((sum, n) => sum + n, 0) };
+ const cache = createRemoteMediaDiskCache(h.io, options);
+ await cache.store(URL_A, 'file:///a', 'text/html', 1000);
+ await cache.store(URL_B, 'file:///b', 'text/html', 1000);
+ await cache.lookup(URL_A);
+ const restarted = createRemoteMediaDiskCache(h.io, options);
+ expect(await restarted.prune()).toBe(true);
+ expect(h.io.deleteFile).not.toHaveBeenCalled();
+ capacity = 2500;
+ expect(await restarted.prune(1000)).toBe(true);
+ expect(await restarted.lookup(URL_B)).toBeNull();
+ expect(await restarted.lookup(URL_A)).not.toBeNull();
+ });
+ it('treats truncated bytes as a miss and cannot claim space freed when deletion fails', async () => {
+ const h = memoryIO();
+ const cache = createRemoteMediaDiskCache(h.io);
+ await cache.store(URL_A, 'file:///a', 'text/html', 1000);
+ h.io.fileSize = () => 1;
+ expect(await cache.lookup(URL_A)).toBeNull();
+ const pressured = createRemoteMediaDiskCache(h.io, { availableBytes: () => 0, reserveBytes: 500 });
+ h.io.deleteFile = vi.fn(() => { throw new Error('busy'); });
+ expect(await pressured.prune(1000)).toBe(false);
+ });
it('retains files above the old 150 MiB quota by default across restarts', async () => {
const h = memoryIO();
const size = 200 * 1024 * 1024;
diff --git a/apps/mobile/src/device-link/mobileMakerTransport.ts b/apps/mobile/src/device-link/mobileMakerTransport.ts
index 6c0abb573e..3e850e9c37 100644
--- a/apps/mobile/src/device-link/mobileMakerTransport.ts
+++ b/apps/mobile/src/device-link/mobileMakerTransport.ts
@@ -1127,7 +1127,8 @@ export function createMobileMakerTransport({
metadata.size <= FILE_PEER_MAX_BYTES
? stage(
"direct",
- () => tryMobilePeerFile(deviceId, url, opts?.signal, trace || undefined),
+ () => tryMobilePeerFile(deviceId, url, opts?.signal, trace || undefined,
+ opts?.skipCache ? { ...metadata, skipCache: true } : metadata),
(result) => ({ hit: result !== null }),
)
: Promise.resolve(null),
diff --git a/apps/mobile/src/device-link/peerFileCache.ts b/apps/mobile/src/device-link/peerFileCache.ts
new file mode 100644
index 0000000000..582316d141
--- /dev/null
+++ b/apps/mobile/src/device-link/peerFileCache.ts
@@ -0,0 +1,108 @@
+import { Directory, File, Paths } from "expo-file-system";
+import {
+ CryptoDigestAlgorithm,
+ digestStringAsync,
+ randomUUID,
+} from "expo-crypto";
+import { validFileVersion, type DeviceFileResult } from "@cindy/device-link";
+import { createRemoteMediaDiskCache } from "@/session/remoteMediaDiskCache";
+import { createExpoRemoteMediaDiskCacheIO } from "@/session/remoteMediaDiskCacheExpo";
+import {
+ PEER_FILE_DISK_RESERVE_BYTES,
+ recordPeerMedia,
+ peerMediaUri,
+ type LocalPeerMedia,
+} from "./peerFileRegistry";
+
+type Metadata = Pick<DeviceFileResult, "size" | "mimeType" | "version">;
+/** Reuses the existing disk cache. Stable realm/account identity survives restarts;
+ * auth generations belong to the caller's cancellation guard, never the disk key. */
+const caches = new Map<string, ReturnType<typeof openPeerFileCache>>();
+export function createPeerFileCache(owner: string) {
+ let cache = caches.get(owner);
+ if (!cache) {
+ cache = openPeerFileCache(owner);
+ caches.set(owner, cache);
+ void cache.catch(() => {
+ if (caches.get(owner) === cache) caches.delete(owner);
+ });
+ }
+ return cache;
+}
+async function openPeerFileCache(owner: string) {
+ const namespace = `files-${await digestStringAsync(CryptoDigestAlgorithm.SHA256, owner)}`;
+ const cache = createRemoteMediaDiskCache(
+ createExpoRemoteMediaDiskCacheIO(namespace),
+ {
+ availableBytes: () => Paths.availableDiskSpace,
+ reserveBytes: PEER_FILE_DISK_RESERVE_BYTES,
+ persistAccess: true,
+ },
+ );
+ return {
+ prune: (size: number) => cache.prune(2 * size),
+ invalidate: (device: string, url: string) =>
+ cache.remove(JSON.stringify([device, url])),
+ async read(
+ device: string,
+ url: string,
+ metadata: Metadata | undefined,
+ active: () => boolean,
+ ) {
+ if (!metadata || !validFileVersion(metadata.version)) return null;
+ const hit = await cache.lookup(
+ JSON.stringify([device, url]),
+ metadata.version,
+ );
+ if (!active() || !hit || hit.size !== metadata.size) return null;
+ // The consumer owns a separate staging file; cache eviction never removes it.
+ const directory = new Directory(
+ Paths.cache,
+ "remote-media-share",
+ "file-peer",
+ );
+ directory.create({ intermediates: true, idempotent: true });
+ const copy = new File(directory, randomUUID());
+ const dispose = () => {
+ if (copy.exists) copy.delete();
+ };
+ try {
+ await new File(hit.uri).copy(copy);
+ if (!active() || copy.size !== metadata.size) {
+ dispose();
+ return null;
+ }
+ const result = { ossKey: "", ...metadata };
+ if (recordPeerMedia(result, copy.uri, dispose)) return result;
+ } catch {
+ /* A missing or evicted cache file is a miss. */
+ }
+ dispose();
+ return null;
+ },
+ async store(
+ device: string,
+ url: string,
+ metadata: Metadata | undefined,
+ result: LocalPeerMedia,
+ ) {
+ if (
+ !metadata ||
+ !validFileVersion(metadata.version) ||
+ result.version !== metadata.version ||
+ result.size !== metadata.size
+ )
+ return;
+ const uri = peerMediaUri(result);
+ // Account for both the durable copy and the consumer's upcoming copy.
+ if (!uri || !(await cache.prune(2 * result.size))) return;
+ await cache.store(
+ JSON.stringify([device, url]),
+ uri,
+ result.mimeType,
+ result.size,
+ metadata.version,
+ );
+ },
+ };
+}
diff --git a/apps/mobile/src/device-link/peerFileRegistry.ts b/apps/mobile/src/device-link/peerFileRegistry.ts
index 32cbd3b78e..d33df1fe48 100644
--- a/apps/mobile/src/device-link/peerFileRegistry.ts
+++ b/apps/mobile/src/device-link/peerFileRegistry.ts
@@ -1,5 +1,5 @@
import { FILE_PEER_MAX_BYTES } from '@cindy/device-link';
-import type { InvokeResultPayload } from '@cindy/device-link';
+import type { InvokeResultPayload, DeviceFileResult } from '@cindy/device-link';
import type { PeerAttachment } from '@cindy/device-link';
type PeerUpload = (device: string, uri: string, metadata: Omit<PeerAttachment, 'ticket'>, signal?: AbortSignal) => Promise<string | null>;
let upload: PeerUpload | null = null;
@@ -37,6 +37,7 @@ export interface LocalPeerMedia {
ossKey: string;
size: number;
mimeType: string;
+ version?: string;
}
const localUris = new WeakMap<object, { uri: string; expiresAt: string }>();
const owned = new Map<
@@ -78,11 +79,13 @@ export function recordPeerMedia(
});
return true;
}
+type FileVersionMetadata = Pick<DeviceFileResult, 'version' | 'size' | 'mimeType'> & { skipCache?: boolean };
type Download = (
device: string,
url: string,
signal?: AbortSignal,
trace?: number,
+ metadata?: FileVersionMetadata,
) => Promise<LocalPeerMedia | null>;
let download: Download | null = null;
export function installPeerFileDownload(value: Download) {
@@ -96,13 +99,17 @@ export async function tryMobilePeerFile(
url: string,
signal?: AbortSignal,
trace?: number,
+ metadata?: FileVersionMetadata,
) {
- return download?.(device, url, signal, trace) ?? null;
+ return download?.(device, url, signal, trace, metadata) ?? null;
}
/** Budget includes retained files; reserve room for the consumer copy and keep 256 MiB free. */
export function canStagePeerMedia(size: number, availableBytes = Infinity): boolean {
return Number.isSafeInteger(size) && size >= 0 && size <= FILE_PEER_MAX_BYTES &&
ownedBytes + size <= 4 * 1024 * 1024 * 1024 &&
- availableBytes >= 2 * size + 256 * 1024 * 1024;
+ availableBytes >= 2 * size + PEER_FILE_DISK_RESERVE_BYTES;
}
+
+/** Keep the existing transfer reserve free even when keeping reusable disk copies. */
+export const PEER_FILE_DISK_RESERVE_BYTES = 256 * 1024 * 1024;
diff --git a/apps/mobile/src/device-link/peerFileTransport.tsx b/apps/mobile/src/device-link/peerFileTransport.tsx
index 5dcdac0d2b..49ae4ddfc9 100644
--- a/apps/mobile/src/device-link/peerFileTransport.tsx
+++ b/apps/mobile/src/device-link/peerFileTransport.tsx
@@ -2,12 +2,21 @@ import { canStagePeerMedia } from "./peerFileRegistry";
import {
createFileReadQueue,
createPeerTransferCooldown,
+ createFileTransferWatchdog,
+ fileTransferPath,
+ filePeerReuseMs,
+ FILE_PEER_WRITE_BATCH_BYTES,
+ FILE_PEER_COMMAND_TIMEOUT_MS,
+ FILE_PEER_RECEIVE_TIMEOUT_MS,
+ FILE_PEER_PROGRESS_SAMPLE_MS,
+ type FileTransferPath,
canUsePeerInvoke,
uploadPeerAttachment,
canSendPeerAttachment,
type InvokeResultPayload,
} from "@cindy/device-link";
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
+import { createPeerFileCache } from './peerFileCache';
import { AppState, View } from "react-native";
import { WebView } from "react-native-webview";
import { Directory, File, Paths } from "expo-file-system";
@@ -43,7 +52,7 @@ import {
let swept = false;
const origin = "https://cindy-file-peer.invalid";
/** Transfers slower than one sample interval record runtime stats once per interval. */
-const PROGRESS_SAMPLE_MS = 1000;
+const PROGRESS_SAMPLE_MS = FILE_PEER_PROGRESS_SAMPLE_MS;
/**
* Diagnostics probe budget, independent of the generic 15s command timeout: a stalled
* runtime.stats() voids one sample only and never blocks later sampling ticks.
@@ -61,7 +70,7 @@ const html = `<!doctype html><meta http-equiv="Content-Security-Policy" content=
const pending=new Map();let seq=0;
function call(type,args){return new Promise((resolve,reject)=>{const id=String(++seq);pending.set(id,{resolve,reject});window.ReactNativeWebView.postMessage(JSON.stringify({type,id,args}));});}
${FILE_PEER_RUNTIME_SOURCE}
-const runtime=CindyFilePeerRuntime.createFilePeerRuntime({read:()=>Promise.reject(new Error('denied')),write:(...args)=>call('write',args)});
+const runtime=CindyFilePeerRuntime.createFilePeerRuntime({read:()=>Promise.reject(new Error('denied')),write:(...args)=>call('write',args),writeBatch:(...args)=>call('write',args),closed:connection=>window.ReactNativeWebView.postMessage(JSON.stringify({type:'closed',connection}))});
window.filePeerMessage=async function(m){
if(m.type==='writeReply'){const p=pending.get(m.id);if(p){pending.delete(m.id);m.ok?p.resolve():p.reject(new Error('write'));}return;}
try{const result=await runtime[m.action](...m.args);window.ReactNativeWebView.postMessage(JSON.stringify({type:'reply',id:m.id,ok:true,result}));}
@@ -75,6 +84,7 @@ export function PeerFileTransport() {
const auth = useAuth(),
link = useDeviceLink();
const view = useRef<WebView>(null);
+ const peerClosed = useRef<((id: string) => void) | null>(null);
const [foreground, setForeground] = useState(
AppState.currentState === "active",
);
@@ -87,6 +97,8 @@ export function PeerFileTransport() {
resolve(value: unknown): void;
reject(error: Error): void;
timer: ReturnType<typeof setTimeout>;
+ action: string;
+ connection: unknown;
refresh?(): void;
}
>(),
@@ -99,6 +111,8 @@ export function PeerFileTransport() {
);
const epoch = useRef(0);
const cooldown = useRef(createPeerTransferCooldown());
+ const cacheOwner = JSON.stringify([getActiveMobileSessionRealm(), auth.user?.id]);
+ const fileCache = useMemo(() => createPeerFileCache(cacheOwner).catch(() => null), [cacheOwner]);
const account = `${auth.user?.id ?? ""}:${getActiveMobileSessionRealm()}:${auth.isAuthenticated}:${auth.accountGeneration}`;
const owner = `${account}:${link.connectionEpoch}`;
const viewKey = `${owner}:${crashes}`;
@@ -118,15 +132,18 @@ export function PeerFileTransport() {
reject(new Error("FILE_PEER_TIMEOUT"));
},
action === "receive"
- ? 60_000
- : timeoutMs && timeoutMs > 15000
+ ? FILE_PEER_RECEIVE_TIMEOUT_MS
+ : action === 'stats' ? PROBE_BUDGET_MS
+ : timeoutMs && timeoutMs > FILE_PEER_COMMAND_TIMEOUT_MS
? timeoutMs
- : 15000,
+ : FILE_PEER_COMMAND_TIMEOUT_MS,
);
const entry = {
resolve,
reject,
timer,
+ action,
+ connection: args[0],
refresh:
action === "receive"
? () => {
@@ -134,7 +151,7 @@ export function PeerFileTransport() {
timer = setTimeout(() => {
pending.current.delete(id);
reject(new Error("FILE_PEER_TIMEOUT"));
- }, 60_000);
+ }, FILE_PEER_RECEIVE_TIMEOUT_MS);
entry.timer = timer;
}
: undefined,
@@ -143,6 +160,14 @@ export function PeerFileTransport() {
send({ id, action, args });
});
}
+ function rejectReceive(connection: string, reason: string) {
+ for (const [id, operation] of pending.current) {
+ if (operation.action !== 'receive' || operation.connection !== connection) continue;
+ pending.current.delete(id);
+ clearTimeout(operation.timer);
+ operation.reject(new Error(reason));
+ }
+ }
useEffect(() => {
const subscription = AppState.addEventListener("change", (s) => {
setForeground(s === "active");
@@ -194,15 +219,18 @@ export function PeerFileTransport() {
attachments: boolean;
/** 电脑端直连附件不设固定上限;旧版电脑会拒收超过 OSS 上限的附件。 */
largeAttachments: boolean;
+ path: FileTransferPath;
+ reuseMs: number | null;
} | null = null;
let idle: ReturnType<typeof setTimeout> | undefined;
const close = (notify = true) => {
clearTimeout(idle);
const old = connection;
connection = null;
- if (old && current()) {
- void command("close", [old.id]).catch(() => {});
- if (notify)
+ if (old) {
+ if (current()) void command("close", [old.id]).catch(() => {});
+ // Backgrounding must release the host too, while the existing WSS is alive.
+ if (notify && epoch.current === generation && liveView.current === viewKey)
void link
.invoke(old.device, FILE_PEER_CHANNEL, [
{ action: "close", connection: old.remote },
@@ -210,6 +238,20 @@ export function PeerFileTransport() {
.catch(() => {});
}
};
+ const scheduleIdle = () => {
+ clearTimeout(idle);
+ if (connection && connection.reuseMs !== null) idle = setTimeout(close, connection.reuseMs);
+ };
+ peerClosed.current = (id) => {
+ if (connection?.id !== id) return;
+ close();
+ for (const [key, p] of pending.current) {
+ if (p.connection !== id) continue;
+ pending.current.delete(key);
+ clearTimeout(p.timer);
+ p.reject(new Error('FILE_PEER_UNAVAILABLE'));
+ }
+ };
const transportCurrent = current;
const unregisterReset = installPeerReset((device) => {
deviceGenerations.set(device, {});
@@ -269,6 +311,7 @@ export function PeerFileTransport() {
reuseConnection: !!remote,
});
const cancel = () => {
+ rejectReceive(id, 'FILE_PEER_CANCELLED');
if (current()) void command("close", [id]).catch(() => {});
};
signal?.addEventListener("abort", cancel, { once: true });
@@ -286,6 +329,8 @@ export function PeerFileTransport() {
streaming?: boolean;
attachments?: boolean;
largeAttachments?: boolean;
+ idleMs?: number;
+ sessionBound?: boolean;
};
if (!current() || signal?.aborted)
throw new Error("FILE_PEER_CANCELLED");
@@ -321,7 +366,9 @@ export function PeerFileTransport() {
caps.streaming === true,
]);
step = "host-answer";
- const answer = (await invoke({ action: "offer", sdp })) as {
+ const answer = (await invoke({ action: "offer", sdp,
+ ...(caps.sessionBound === true ? { sessionBound: true } : {}),
+ })) as {
connection?: string;
sdp?: string;
};
@@ -338,6 +385,7 @@ export function PeerFileTransport() {
throw new Error("FILE_PEER_CLOSED");
step = "answer";
await command("answer", [id, answer.sdp]);
+ if (!current() || signal?.aborted) throw new Error('FILE_PEER_CANCELLED');
connection = {
id,
remote,
@@ -345,16 +393,17 @@ export function PeerFileTransport() {
rpc: caps.streaming === true,
attachments: caps.attachments === true,
largeAttachments: caps.largeAttachments === true,
+ path: 'unknown',
+ reuseMs: filePeerReuseMs(caps.idleMs, caps.sessionBound),
};
mobileDebugLog("debug", "files", "direct transfer connected", {
trace,
ms: Date.now() - startedAt,
- // Diagnostics must not turn a connected transfer into a fallback.
- transport: parseTransportStats(
- await command("stats", [id]).catch(() => null),
- ),
});
}
+ void command('stats', [id]).then((raw) => {
+ if (current() && connection?.id === id) connection.path = fileTransferPath(raw);
+ }).catch(() => {});
if (url === null) {
complete = true;
cooldown.current.success(device);
@@ -391,8 +440,19 @@ export function PeerFileTransport() {
// Set when the receive settles: an already-issued stats reply must not append
// a progress line behind the outcome log with a dropped sink offset.
let ended = false;
+ const watch = createFileTransferWatchdog(file.size, () => connection?.path ?? 'unknown');
+ let slow = false;
const sampler = setInterval(() => {
- if (sampling || ended || !current() || !mobileDebugEnabled()) return;
+ if (ended || !current()) return;
+ const reason = watch(sinks.current.get(id)?.offset ?? 0);
+ if (reason && !slow) {
+ slow = true;
+ mobileDebugLog('debug', 'files', 'slow transfer fallback', { trace, reason, path: connection?.path });
+ // Close only this file transport; cancellation is still distinguished below.
+ rejectReceive(id, 'FILE_PEER_SLOW');
+ void command('close', [id]).catch(() => {});
+ }
+ if (slow || sampling || !mobileDebugEnabled()) return;
sampling = true;
// 诊断探针独立短预算:runtime.stats() 卡死只作废本样本(迟到回包同样丢弃),
// 不让 15s 通用超时占住采样节拍,否则恰好在异常链路上拿不到任何样本。
@@ -405,6 +465,7 @@ export function PeerFileTransport() {
void command("stats", [id])
.then((raw) => {
if (settled || ended) return;
+ if (connection?.id === id) connection.path = fileTransferPath(raw);
lastProgress = {
elapsedMs: Date.now() - transferStartedAt,
written: sinks.current.get(id)?.offset ?? null,
@@ -441,7 +502,7 @@ export function PeerFileTransport() {
handle.close();
} catch {}
}
- const result = { ossKey: "", size: file.size, mimeType: file.mimeType };
+ const result = { ossKey: "", size: file.size, mimeType: file.mimeType, version: file.version };
const completed = target;
if (
!recordPeerMedia(result, target.uri, () => {
@@ -494,32 +555,46 @@ export function PeerFileTransport() {
} catch {
/* Swept on next process start. */
}
- if (complete && current()) idle = setTimeout(close, 30_000);
+ if (complete && current()) scheduleIdle();
else {
close();
if (transportCurrent()) void command("close", [id]).catch(() => {});
- if (remote && current())
- void invoke({ action: "close", connection: remote }).catch(
- () => {},
- );
+ // An answer can arrive after background/reset, before connection was
+ // assigned. Release that allocation over the same owner/link only;
+ // cleanup must not be blocked by the cancelled transfer's guards.
+ if (remote && liveView.current === viewKey)
+ void link.invoke(device, FILE_PEER_CHANNEL, [
+ { action: 'close', connection: remote },
+ ]).catch(() => {});
}
}
};
const queueRead = createFileReadQueue();
const unregister = installPeerFileDownload(
- (device, url, signal, readTrace) => {
+ (device, url, signal, readTrace, metadata) => {
const active = captureDevice(device);
return queueRead(
"connection",
- () => {
+ async () => {
if (!active()) throw new Error("FILE_PEER_CANCELLED");
- return transfer(device, url, signal, readTrace);
+ const cache = await fileCache;
+ if (metadata?.skipCache) await cache?.invalidate(device, url).catch(() => undefined);
+ if (metadata) await cache?.prune(metadata.size).catch(() => false);
+ const cached = metadata?.skipCache ? null : await cache?.read(device, url, metadata, () => active() && !signal?.aborted).catch(() => null);
+ if (!active() || signal?.aborted) throw new Error('FILE_PEER_CANCELLED');
+ if (cached) {
+ mobileDebugLog('debug', 'files', 'file cache hit', { trace: readTrace, size: cached.size });
+ return cached;
+ }
+ const result = await transfer(device, url, signal, readTrace);
+ if (result && active() && !signal?.aborted)
+ await cache?.store(device, url, metadata, result).catch(() => undefined);
+ return result;
},
signal,
);
},
);
- const warming = new Set<string>();
// 读整份大文件之前的能力确认:复用已建连接的能力,否则只发一次 caps 查询,不建 WebRTC 连接。
const unregisterUploadProbe = installPeerUploadProbe(async (device, size) => {
const current = captureDevice(device);
@@ -631,7 +706,7 @@ export function PeerFileTransport() {
handle?.close();
} catch {}
busy = false;
- if (current()) idle = setTimeout(close, 30_000);
+ if (current()) scheduleIdle();
}
},
signal,
@@ -645,18 +720,6 @@ export function PeerFileTransport() {
if (!current()) throw new Error("FILE_PEER_CANCELLED");
if (cooldown.current.remaining(device)) return null;
if (connection?.device !== device || !connection.rpc) {
- if (
- (!connection || connection.device !== device) &&
- !warming.has(device)
- ) {
- warming.add(device);
- void queueRead("connection", () => {
- if (!current()) throw new Error("FILE_PEER_CANCELLED");
- return transfer(device, null);
- })
- .catch(() => {})
- .finally(() => warming.delete(device));
- }
return null;
}
const id = connection.id;
@@ -678,7 +741,7 @@ export function PeerFileTransport() {
if (!busy && connection?.id === id) close();
return null;
} finally {
- if (current() && !busy) idle = setTimeout(close, 30_000);
+ if (current() && !busy) scheduleIdle();
}
},
);
@@ -689,6 +752,7 @@ export function PeerFileTransport() {
pendingCommands: pending.current.size,
});
close();
+ peerClosed.current = null;
++epoch.current;
unregister();
unregisterInvoke();
@@ -753,6 +817,10 @@ export function PeerFileTransport() {
setReady(viewKey);
return;
}
+ if (m.type === 'closed' && typeof m.connection === 'string') {
+ peerClosed.current?.(m.connection);
+ return;
+ }
if (m.type === "reply") {
const p = pending.current.get(m.id);
if (!p) return;
@@ -769,13 +837,13 @@ export function PeerFileTransport() {
!sink ||
offset !== sink.offset ||
typeof base64 !== "string" ||
- base64.length > 22000
+ base64.length > Math.ceil(FILE_PEER_WRITE_BATCH_BYTES / 3) * 4
)
throw new Error();
const binary = atob(base64),
bytes = Uint8Array.from(binary, (c) => c.charCodeAt(0));
if (
- bytes.length > 16384 ||
+ bytes.length > FILE_PEER_WRITE_BATCH_BYTES ||
sink.offset + bytes.length > sink.size
)
throw new Error();
diff --git a/apps/mobile/src/session/remoteMediaDiskCache.ts b/apps/mobile/src/session/remoteMediaDiskCache.ts
index c6745cecc1..9e5a2065a1 100644
--- a/apps/mobile/src/session/remoteMediaDiskCache.ts
+++ b/apps/mobile/src/session/remoteMediaDiskCache.ts
@@ -15,12 +15,15 @@
* remoteMediaDiskCacheExpo.ts。
*/
+import { validFileVersion } from '@cindy/device-link';
+
export interface RemoteMediaDiskCacheIO {
/** 确保缓存目录存在(幂等)。 */
ensureDir(): void | Promise<void>;
readIndexText(): Promise<string | null>;
writeIndexText(text: string): void | Promise<void>;
fileExists(name: string): boolean | Promise<boolean>;
+ fileSize?(name: string): number | Promise<number>;
fileUri(name: string): string;
deleteFile(name: string): void | Promise<void>;
/**
@@ -42,6 +45,10 @@ export interface RemoteMediaDiskCacheIO {
export interface RemoteMediaDiskCacheOptions {
/** 可选缓存总量上限(字节),默认不限额。 */
maxBytes?: number;
+ /** Optional pressure-driven cleanup; no time expiry and no new fixed quota. */
+ availableBytes?(): number;
+ reserveBytes?: number;
+ persistAccess?: boolean;
now?(): number;
}
@@ -53,7 +60,10 @@ export interface RemoteMediaDiskCacheHit {
export interface RemoteMediaDiskCache {
/** 命中返回本地 file:// 引用并刷新 LRU 时间;未命中 / 文件丢失返回 null。 */
- lookup(sourceUrl: string): Promise<RemoteMediaDiskCacheHit | null>;
+ lookup(sourceUrl: string, version?: string): Promise<RemoteMediaDiskCacheHit | null>;
+ /** Frees the oldest copies only when the next operation needs disk space. */
+ prune(requiredBytes?: number): Promise<boolean>;
+ remove(sourceUrl: string): Promise<void>;
/**
* 把已取件成功的图片落盘(同 url 并发只下载一次;失败静默,缓存是纯优化)。
* expectedSize(已知对象字节数)超过 maxBytes 时直接跳过——落盘只会立刻被
@@ -64,7 +74,7 @@ export interface RemoteMediaDiskCache {
* 好文件被刻意保留)、落成 0 字节被作废。调用方据此决定能否改用本地文件——
* 只看 promise resolve 会把**已被证伪的旧文件**当成本次结果(PR #1125 review)。
*/
- store(sourceUrl: string, downloadUrl: string, mimeType: string, expectedSize?: number): Promise<boolean>;
+ store(sourceUrl: string, downloadUrl: string, mimeType: string, expectedSize?: number, version?: string): Promise<boolean>;
/**
* 把已在内存里的字节(base64,inline 缩略图回包)落盘,不经网络下载。
* 与 store 共用同键串行化,防止同源并发写撕;IO 不支持 writeFileBase64 时静默跳过。
@@ -81,6 +91,7 @@ interface IndexEntry {
mimeType: string;
size: number;
lastUsedAt: number;
+ version?: string;
}
interface IndexShape {
@@ -101,7 +112,6 @@ export function createRemoteMediaDiskCache(
const downloading = new Map<string, { downloadUrl: string; task: Promise<boolean> }>();
async function init(): Promise<void> {
- if (entries) return;
initPromise ??= (async () => {
await io.ensureDir();
const text = await io.readIndexText().catch(() => null);
@@ -116,7 +126,8 @@ export function createRemoteMediaDiskCache(
await Promise.resolve(io.deleteFile(name)).catch(() => undefined);
}
})();
- await initPromise;
+ try { await initPromise; }
+ catch (error) { entries = null; initPromise = null; throw error; }
}
async function persistIndex(): Promise<void> {
@@ -139,6 +150,7 @@ export function createRemoteMediaDiskCache(
prev: IndexEntry | undefined,
size: number | null,
mimeType: string,
+ version?: string,
): Promise<boolean> {
if (size === null) {
if (!prev || prev.name !== name) {
@@ -157,7 +169,7 @@ export function createRemoteMediaDiskCache(
if (prev && prev.name !== name) {
await Promise.resolve(io.deleteFile(prev.name)).catch(() => undefined);
}
- entries.set(key, { name, mimeType, size, lastUsedAt: now() });
+ entries.set(key, { name, mimeType, size, lastUsedAt: now(), ...(version ? { version } : {}) });
await evictOverBudget();
await persistIndex().catch(() => undefined);
// 配额回收可能把刚写入的条目本身逐出(单对象接近 maxBytes 时);此时盘上已无
@@ -180,43 +192,87 @@ export function createRemoteMediaDiskCache(
}
}
+ async function prune(requiredBytes = 0): Promise<boolean> {
+ await init();
+ const enough = () => !options.availableBytes ||
+ options.availableBytes() >= requiredBytes + (options.reserveBytes ?? 0);
+ if (enough()) return true;
+ const oldest = [...entries!.entries()].sort((a, b) => a[1].lastUsedAt - b[1].lastUsedAt);
+ for (const [key, entry] of oldest) {
+ if (enough()) break;
+ if (downloading.has(key)) continue;
+ try {
+ await io.deleteFile(entry.name);
+ entries!.delete(key);
+ } catch { /* Failed deletions remain accounted for; retry at the next operation. */ }
+ }
+ await persistIndex().catch(() => undefined);
+ return enough();
+ }
+
return {
- async lookup(sourceUrl) {
+ prune,
+ async remove(sourceUrl) {
+ await init();
+ const key = cacheKeyOf(sourceUrl);
+ await downloading.get(key)?.task.catch(() => false);
+ const entry = entries?.get(key);
+ if (!entry) return;
+ entries!.delete(key);
+ await Promise.resolve(io.deleteFile(entry.name)).catch(() => undefined);
+ await persistIndex().catch(() => undefined);
+ },
+ async lookup(sourceUrl, version) {
+ if (version !== undefined && !validFileVersion(version)) return null;
await init();
const key = cacheKeyOf(sourceUrl);
const entry = entries?.get(key);
if (!entry) return null;
+ if (version !== undefined && entry.version !== version) {
+ await Promise.resolve(io.deleteFile(entry.name)).catch(() => undefined);
+ entries?.delete(key);
+ await persistIndex().catch(() => undefined);
+ return null;
+ }
const exists = await Promise.resolve(io.fileExists(entry.name)).catch(() => false);
- if (!exists) {
+ const sizeMatches = !io.fileSize || await Promise.resolve(io.fileSize(entry.name)).catch(() => -1) === entry.size;
+ if (!exists || !sizeMatches) {
// 文件被 OS 清掉 / 手动删除:丢弃条目自愈,当未命中处理。
entries?.delete(key);
return null;
}
entry.lastUsedAt = now();
+ if (options.persistAccess) await persistIndex().catch(() => undefined);
return { uri: io.fileUri(entry.name), mimeType: entry.mimeType, size: entry.size };
},
- async store(sourceUrl, downloadUrl, mimeType, expectedSize) {
+ async store(sourceUrl, downloadUrl, mimeType, expectedSize, version) {
+ if (version !== undefined && !validFileVersion(version)) return false;
await init();
// 单对象就超预算:落盘立刻会被 LRU 逐出,整个下载都是白费,直接跳过。
if (expectedSize !== undefined && expectedSize > maxBytes) return false;
+ if (options.availableBytes && !(await prune(expectedSize ?? 0))) return false;
const key = cacheKeyOf(sourceUrl);
const run = async (): Promise<boolean> => {
- const name = `${key}.${extOfMime(mimeType)}`;
+ // The OS or manual cache cleanup may remove the directory after init.
+ await io.ensureDir();
+ // Versioned bytes have immutable names: a reader copying the previous
+ // version must never race an overwrite of the same physical file.
+ const name = `${key}${version ? `-${version}` : ''}.${extOfMime(mimeType)}`;
const prev = entries?.get(key);
const size = await io.download(downloadUrl, name);
- return commitWrittenFile(key, name, prev, size, mimeType);
+ return commitWrittenFile(key, name, prev, size, mimeType, version);
};
const pending = downloading.get(key);
// 只合并**同一下载地址**的并发 store。forceRefresh 自愈会带全新 presign 地址,
// 若并入旧地址的 pending(常见:已证伪的 stale key),旧下载失败会让新图永远
// 不落盘——退屏清理还会删掉新 OSS 对象,下次进会话被迫重传。不同地址排在
// 旧任务之后串行执行(旧任务成败都不影响新写入)。
- if (pending && pending.downloadUrl === downloadUrl) return pending.task;
+ if (pending && pending.downloadUrl === `${downloadUrl}\n${version ?? ''}`) return pending.task;
const base: Promise<boolean> = pending
? pending.task.catch(() => undefined).then(run)
: run();
- const entry = { downloadUrl, task: base };
+ const entry = { downloadUrl: `${downloadUrl}\n${version ?? ''}`, task: base };
entry.task = base.finally(() => {
if (downloading.get(key) === entry) downloading.delete(key);
});
@@ -229,6 +285,7 @@ export function createRemoteMediaDiskCache(
await init();
const key = cacheKeyOf(sourceUrl);
const run = async (): Promise<boolean> => {
+ await io.ensureDir();
const name = `${key}.${extOfMime(mimeType)}`;
const prev = entries?.get(key);
const size = await Promise.resolve(io.writeFileBase64!(name, base64)).catch(() => null);
@@ -261,9 +318,11 @@ function parseIndex(text: string | null): Record<string, IndexEntry> {
for (const [key, value] of Object.entries(parsed.entries)) {
if (value
&& typeof value.name === 'string'
+ && /^[a-f0-9]{18}(?:-[a-f0-9]{64})?\.[a-z0-9]+$/.test(value.name)
&& typeof value.mimeType === 'string'
- && typeof value.size === 'number'
- && typeof value.lastUsedAt === 'number') {
+ && Number.isSafeInteger(value.size) && value.size >= 0
+ && Number.isFinite(value.lastUsedAt)
+ && (value.version === undefined || validFileVersion(value.version))) {
out[key] = value;
}
}
diff --git a/apps/mobile/src/session/remoteMediaDiskCacheExpo.ts b/apps/mobile/src/session/remoteMediaDiskCacheExpo.ts
index 82c09fcd67..3a1a071638 100644
--- a/apps/mobile/src/session/remoteMediaDiskCacheExpo.ts
+++ b/apps/mobile/src/session/remoteMediaDiskCacheExpo.ts
@@ -175,8 +175,10 @@ export async function withDownloadedRemoteMediaFile<T>(
}
}
-export function createExpoRemoteMediaDiskCacheIO(): RemoteMediaDiskCacheIO {
- const dir = new Directory(Paths.cache, CACHE_DIR_NAME);
+export function createExpoRemoteMediaDiskCacheIO(namespace?: string): RemoteMediaDiskCacheIO {
+ if (namespace && !/^files-[a-f0-9]{64}$/.test(namespace)) throw new Error('INVALID_CACHE_NAMESPACE');
+ const root = new Directory(Paths.cache, CACHE_DIR_NAME);
+ const dir = namespace ? new Directory(root, namespace) : root;
return {
ensureDir() {
dir.create({ intermediates: true, idempotent: true });
@@ -196,6 +198,9 @@ export function createExpoRemoteMediaDiskCacheIO(): RemoteMediaDiskCacheIO {
fileExists(name) {
return new File(dir, name).exists;
},
+ fileSize(name) {
+ return new File(dir, name).size ?? -1;
+ },
fileUri(name) {
return new File(dir, name).uri;
},
diff --git a/docs/dev-rules/media-storage-and-protocols.md b/docs/dev-rules/media-storage-and-protocols.md
index 1ff2e03290..ad6a2eb6ba 100644
--- a/docs/dev-rules/media-storage-and-protocols.md
+++ b/docs/dev-rules/media-storage-and-protocols.md
@@ -73,6 +73,12 @@
不直接删除共享 blob;物理回收由 `recycler.ts` 根据账本统一处理。
- `isCache: true` 只用于可以重新获取或重新生成的缓存。缓存一旦成为聊天历史、作品或其他
不可再生用户内容,必须沿用现有 pin/引用流程转为不可按缓存回收。
+- 远程文件的长期复用(2026-10-16 用户要求)不以短 TTL 清空:媒体经 `ingestMedia` /
+ `integration-cache` 持久入仓,`remote-file` 命名空间按现有缓存预算自动 LRU 回收。
+ 自动清理只接受该命名空间独占且仍为 `isCache` 的字节;扫描和条件删除都检查其他
+ 引用与 pin,不能清理聊天附件或其他集成的共享字节。其他媒体清理维持原手动流程。
+ 普通 HTML 等非媒体仍走 `remote-file-cache`。完整身份、复验与平台清理策略见
+ [`protocol-compatibility.md`](protocol-compatibility.md)「远程文件连接复用与版本缓存」。
- 零引用入仓只适用于已有草稿或生成结果提交链路。新增零引用窗口时,必须证明内容在消息
落库前不会被回收,并用测试覆盖成功、失败、取消和重试。
- 三款官方壁纸改为 OSS/CDN 按需分发(2026-10-15 用户裁决,替代此前全部随包的决定)。
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index 23a66210fa..91939849f5 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -779,6 +779,44 @@ link-accept 双向声明,不改 relay)。Desktop 控制端在本机没有订
## 图片交付与缺失源文件
+### 远程文件连接复用与版本缓存
+
+`device-link:file-peer` 的 `caps` 追加可选 `idleMs`、`sessionBound: true`。新控制端
+仅在 Host 明确声明后,于 `offer` 携带 `sessionBound: true`,双方取消空闲倒计时,
+按远程会话生命周期释放独立文件连接。不主动预热:普通读取只复用已建立的文件通道,
+首次需要传文件时才建立。运行时断开通知宿主回收,下次取件按需重建,不新增应用层心跳。
+Desktop 显式断链、账号变化、共享连接离线,以及 Mobile 退后台、设备切换、断链时释放。
+取消同时覆盖排队与尚未拿到连接 ID 的请求;迟到的协商结果不能重新建立连接或触发 OSS。
+
+旧控制端未发送 `sessionBound` 时,新 Host 仍按 5 分钟空闲关闭;新控制端面对未声明
+该能力的 Host,按 `idleMs` 提前一个命令预算(15 秒)关闭,最长 4 分 45 秒,未声明
+`idleMs` 时仍按 30 秒处理。正在传输的源文件仍保持 60 秒无进展清理,
+不因延长空闲复用而延长。服务端无需改动,不更改旧端必填字段或 Mobile 原生指纹。
+
+`device-link:media:fetch` 的 `prepareOnly` 结果和文件 `open` 结果追加可选 `version`
+(64 位十六进制摘要)。Host 每次先走原授权解析,再从打开的文件句柄取
+dev/ino/size/mtime/ctime,连同解析后的路径生成不透明版本;不把版本当作授权凭据。
+新版控制端只有两次版本一致且传输成功才保留私有缓存副本;读取缓存前仍执行
+prepare 授权与版本查询。缺失/非法版本的旧端不启用此缓存,旧控制端忽略新增字段。
+缓存按稳定账号、目标设备、完整媒体 URL 隔离(含 SSH 与目录约束),跨重启保留,
+不设时间 TTL、16 MiB 单文件门槛或条目数门槛。账号代次用于拒绝迟到结果,不能进入
+持久缓存键。Desktop 图片等媒体复用 `cindy-media` 的 `integration-cache` 索引和
+既有 512 MiB 缓存预算,真实文件探测后流式入仓;超过预算的单份媒体不额外缓存。
+只对 `remote-file` 独占的可再生缓存按 LRU 自动回收,SQL 删除时复验 pin 和其他引用。
+HTML 等普通文件复用 `remote-file-cache` 的 4 GiB 总量上限、LRU 与启动残片清扫;
+同源新版本成功保存后清旧版本,不在媒体目录另存字节。
+
+Mobile 复用 `remote-media` 磁盘缓存,放入 realm/账号 SHA-256 命名空间;无固定容量
+门槛,仅在现有传输空间预留不足时按 LRU 清理(保留 256 MiB,并考虑下载与消费者副本)。
+访问顺序落盘、版本不同删除旧条目;版本进入物理文件名,避免异步复制撞上覆盖写。
+系统清掉目录后,下一次取件自动重建。两端消费者均拿独立副本,清缓存不删正在预览的副本。
+强制刷新只跳过旧副本的读取,成功后仍更新缓存,避免下次普通打开又命中损坏副本。
+已有 OSS 和流式媒体缓存维持原生命周期;此缓存只保存已完成的 peer 整文件下载。
+
+网络帧仍是旧版可读的 16 KiB,不增加 wire 通道。新版接收运行时仅在本地桥接声明
+批量写入时,把已到达帧合为至多 256 KiB 后串行写盘;仍按实际写入块数归还流控额度,
+EOF 必须等全部写入完成。桌面与手机使用同一实现;不改 Mobile 原生指纹。
+
媒体取件沿用既有 `MEDIA_FETCH_FAILED` 错误包;源图片不存在时,Host 在消息中附加
`[MEDIA_SOURCE_MISSING]` 稳定标记,不回传本机路径。新版 Mobile 据此提示重新导入,
旧版继续按通用加载失败处理;新版连接旧 Host 时也保留通用失败回退。不改变 relay、
diff --git a/docs/dev-rules/remote-and-mobile-adaptation.md b/docs/dev-rules/remote-and-mobile-adaptation.md
index bc0e600207..fad1404370 100644
--- a/docs/dev-rules/remote-and-mobile-adaptation.md
+++ b/docs/dev-rules/remote-and-mobile-adaptation.md
@@ -59,6 +59,27 @@ Cindy 的产品形态不止本地桌面单机。同一个功能可能运行在
## 恢复动作先回答故障半径(device-link 共享链路)
+### 文件通道慢速回退
+
+Desktop 与 Mobile 的整文件 peer 下载共用 `fileTransferPolicy.ts`。数字按职责分开:
+网络帧/信用窗口是协议约束;连接空闲与命令/接收超时是资源和等待预算;缓存容量
+沿用已有存储预算,不作为文件有效期或“最佳网络速度”的依据。
+双方协商支持后,文件连接跟随远程会话生命周期,首次传文件时才建立,不用任意空闲
+时长决定关闭;旧端继续按已有空闲预算兼容。手机退后台释放原文件 WebView 和电脑端
+连接,回前台不立即重建。断链取消排队与建连中的请求,防止迟到结果恢复已关闭的会话。
+
+连续一个命令预算(15 秒)没有写入进展(含等待 EOF)时回退。对仍在前进的已知路径,
+至少观察完整 15 秒窗口,只有按实际写入速率估算剩余时间超过既有接收预算(60 秒)
+才回退;直接和 TURN 路径使用相同判断,不再设不同 KB/s 下限或固定剩余字节门槛。
+这是一项有界等待策略,不是 OSS 比当前路径快的测量结论。4 MB、150 KB/s 的中继
+传输不会仅因低于旧阈值而被重传。路径未知只判断停滞;路径变化丢弃旧速度窗口。
+每次取件旁路采样实际路径,统计不阻塞握手或文件首字节;进度检查不依赖 Debug 开关。
+
+故障仅影响该 peer 的文件通道;复用已有按设备冷却(30 秒起、最多 5 分钟)避免
+紧接着的文件重新走同一慢链路,不重连共享 WSS、不影响另一控制端的文件或请求。
+取消、退后台、切账号依然是取消,不触发 OSS;不并行竞速或预先上传用户文件。
+回归包含两台控制端一台停滞、另一台持续写入并完成,以及旧端缺能力字段的兼容。
+
设备互联是 1:N 拓扑:被控端与 relay 之间只有一条连接,同账号的全部控制端共用它。
故障域从小到大分四层——单个请求、单个 peer 的 link、整条 relay 连接、**relay 聚合
背压**(第四层:故障原因不是任何单个请求或 peer,而是本机对 relay 的**聚合出站速率**;
diff --git a/packages/device-link/src/__tests__/filePeer.test.ts b/packages/device-link/src/__tests__/filePeer.test.ts
index eac53d9908..d2915aaebc 100644
--- a/packages/device-link/src/__tests__/filePeer.test.ts
+++ b/packages/device-link/src/__tests__/filePeer.test.ts
@@ -34,6 +34,12 @@ describe("file transfer signaling", () => {
])("rejects malformed requests %#", (value) => {
expect(() => parseFilePeerRequest(value)).toThrow();
});
+ it("enables session-bound lifetime only with explicit boolean opt-in", () => {
+ const offer = { action: "offer", sdp: "v=0" };
+ expect(parseFilePeerRequest({ ...offer, sessionBound: true })).toEqual({ ...offer, sessionBound: true });
+ for (const sessionBound of [undefined, false, 1, "true", null])
+ expect(parseFilePeerRequest({ ...offer, sessionBound })).toEqual(offer);
+ });
it("accepts empty files and rejects unbounded metadata", () => {
expect(
parseFilePeerFile({ ticket: connection, size: 0, mimeType: "text/html" })
diff --git a/packages/device-link/src/__tests__/filePeerBatchWrite.test.ts b/packages/device-link/src/__tests__/filePeerBatchWrite.test.ts
new file mode 100644
index 0000000000..9cb2055387
--- /dev/null
+++ b/packages/device-link/src/__tests__/filePeerBatchWrite.test.ts
@@ -0,0 +1,111 @@
+import { afterEach, expect, it, vi } from "vitest";
+import { createFilePeerRuntime } from "../filePeerRuntime";
+
+class Channel extends EventTarget {
+ readyState = "open";
+ sent: string[] = [];
+ constructor(public label: string) {
+ super();
+ }
+ send(value: string) {
+ this.sent.push(value);
+ }
+ close() {
+ this.readyState = "closed";
+ this.dispatchEvent(new Event("close"));
+ }
+ frame(value: Uint8Array) {
+ this.dispatchEvent(new MessageEvent("message", { data: value.buffer }));
+ }
+}
+let channel: Channel;
+class Peer extends EventTarget {
+ localDescription = { sdp: "v=0" };
+ iceGatheringState = "complete";
+ signalingState = "stable";
+ createDataChannel(label: string) {
+ const result = new Channel(label);
+ if (label === "files-v2") channel = result;
+ return result;
+ }
+ async createOffer() {
+ return { type: "offer", sdp: "v=0" };
+ }
+ async setLocalDescription() {}
+ close() {
+ channel?.close();
+ }
+}
+afterEach(() => vi.unstubAllGlobals());
+it.each([false, true])(
+ "preserves bytes, offsets, credit and EOF with batching=%s",
+ async (batching) => {
+ vi.stubGlobal("RTCPeerConnection", Peer);
+ let unblock!: () => void;
+ const blocked = new Promise<void>((resolve) => {
+ unblock = resolve;
+ });
+ const output: Buffer[] = [];
+ let written = 0;
+ const write = vi.fn(
+ async (_sink: string, offset: number, base64: string) => {
+ if (!output.length) await blocked;
+ expect(offset).toBe(written);
+ const data = Buffer.from(base64, "base64");
+ expect(data.length).toBeLessThanOrEqual(batching ? 256 * 1024 : 16384);
+ output.push(data);
+ written += data.length;
+ },
+ );
+ const runtime = createFilePeerRuntime({
+ read: async () => "",
+ write,
+ ...(batching ? { writeBatch: write } : {}),
+ });
+ await runtime.offer("a", [], true);
+ const receive = runtime.receive("a", "ticket", 64 * 16384, "sink");
+ for (let n = 0; n < 64; n++) channel.frame(new Uint8Array(16384).fill(n));
+ expect(write).toHaveBeenCalledOnce();
+ expect(channel.sent.map((v) => JSON.parse(v))).toEqual([
+ { ticket: "ticket", offset: 0, credit: 64 },
+ ]);
+ unblock();
+ await vi.waitFor(() => expect(written).toBe(64 * 16384));
+ expect(channel.sent.map((v) => JSON.parse(v))).toContainEqual({
+ credit: 1,
+ });
+ channel.frame(new Uint8Array());
+ await receive;
+ expect(Buffer.concat(output)).toEqual(
+ Buffer.concat(
+ Array.from({ length: 64 }, (_, n) => Buffer.alloc(16384, n)),
+ ),
+ );
+ expect(write.mock.calls.length).toBe(batching ? 5 : 64);
+ runtime.dispose();
+ },
+);
+it("rejects a closed receive without writing queued data after an outstanding bridge write", async () => {
+ vi.stubGlobal("RTCPeerConnection", Peer);
+ let unblock!: () => void;
+ const write = vi.fn(
+ () =>
+ new Promise<void>((resolve) => {
+ unblock = resolve;
+ }),
+ );
+ const runtime = createFilePeerRuntime({
+ read: async () => "",
+ write,
+ writeBatch: write,
+ });
+ await runtime.offer("a", [], true);
+ const receive = runtime.receive("a", "ticket", 32768, "sink");
+ const rejected = expect(receive).rejects.toThrow("FILE_PEER_CLOSED");
+ channel.frame(new Uint8Array(16384));
+ channel.frame(new Uint8Array(16384));
+ runtime.close("a");
+ unblock();
+ await rejected;
+ expect(write).toHaveBeenCalledOnce();
+});
diff --git a/packages/device-link/src/__tests__/filePeerLifecycle.test.ts b/packages/device-link/src/__tests__/filePeerLifecycle.test.ts
new file mode 100644
index 0000000000..2865208148
--- /dev/null
+++ b/packages/device-link/src/__tests__/filePeerLifecycle.test.ts
@@ -0,0 +1,52 @@
+import { afterEach, expect, it, vi } from "vitest";
+import { createFilePeerRuntime } from "../filePeerRuntime";
+
+class Peer extends EventTarget {
+ static instances: Peer[] = [];
+ constructor() {
+ super();
+ Peer.instances.push(this);
+ }
+ localDescription = { sdp: "v=0" };
+ iceGatheringState = "complete";
+ connectionState = "connected";
+ onconnectionstatechange = () => {};
+ createDataChannel() {
+ return Object.assign(new EventTarget(), { close() {}, readyState: "open" });
+ }
+ async createOffer() {
+ return { type: "offer", sdp: "v=0" };
+ }
+ async setLocalDescription() {}
+ close() {
+ this.connectionState = "closed";
+ this.onconnectionstatechange();
+ }
+}
+afterEach(() => {
+ vi.unstubAllGlobals();
+ Peer.instances = [];
+});
+it("reports transport closure once, leaves other peers alive and ignores stale events after replacement", async () => {
+ vi.stubGlobal("RTCPeerConnection", Peer);
+ const closed = vi.fn();
+ const runtime = createFilePeerRuntime({
+ read: async () => "",
+ write: async () => {},
+ closed,
+ });
+ await runtime.offer("a", []);
+ await runtime.offer("b", []);
+ const [a, b] = Peer.instances;
+ a.connectionState = "disconnected";
+ a.onconnectionstatechange();
+ expect(closed.mock.calls).toEqual([["a"]]);
+ expect(b.connectionState).toBe("connected");
+ runtime.close("a");
+ expect(closed).toHaveBeenCalledOnce();
+ await runtime.offer("a", []);
+ a.onconnectionstatechange();
+ expect(Peer.instances[2].connectionState).toBe("connected");
+ runtime.dispose();
+ expect(closed.mock.calls).toEqual([["a"], ["b"], ["a"]]);
+});
diff --git a/packages/device-link/src/__tests__/fileTransferPolicy.test.ts b/packages/device-link/src/__tests__/fileTransferPolicy.test.ts
new file mode 100644
index 0000000000..028954b20e
--- /dev/null
+++ b/packages/device-link/src/__tests__/fileTransferPolicy.test.ts
@@ -0,0 +1,67 @@
+import { expect, it } from "vitest";
+import {
+ createFileTransferWatchdog,
+ filePeerReuseMs,
+ fileTransferPath,
+ FILE_PEER_COMMAND_TIMEOUT_MS,
+ FILE_PEER_RECEIVE_TIMEOUT_MS,
+} from "../fileTransferPolicy";
+
+it("uses the advertised lifetime minus a command budget, rejecting invalid capabilities", () => {
+ expect(filePeerReuseMs(undefined, true)).toBeNull();
+ expect(filePeerReuseMs(300_000, 'true')).toBe(285_000);
+ expect(filePeerReuseMs(300_000)).toBe(285_000);
+ expect(filePeerReuseMs(60_000)).toBe(45_000);
+ for (const value of [undefined, NaN, Infinity, -1])
+ expect(filePeerReuseMs(value)).toBe(30_000);
+});
+it("does not abandon a modest relay transfer just because its KB/s is low", () => {
+ let time = 0;
+ const watch = createFileTransferWatchdog(4_000_000, "relay", () => time);
+ for (time = 1000; time <= 25_000; time += 1000)
+ expect(watch(time * 150)).toBeNull();
+ expect(fileTransferPath('{"path":"relay","rttMs":300}')).toBe("relay");
+ expect(fileTransferPath("invalid")).toBe("unknown");
+});
+it("uses remaining completion time on known paths instead of separate arbitrary speed floors", () => {
+ let time = 0;
+ const paths = ["direct", "relay", "unknown"] as const;
+ const watches = paths.map((path) =>
+ createFileTransferWatchdog(20_000_000, path, () => time),
+ );
+ let outcomes: unknown[] = [];
+ for (time = 1000; time <= FILE_PEER_COMMAND_TIMEOUT_MS; time += 1000)
+ outcomes = watches.map((watch) => watch(time * 150));
+ expect(outcomes).toEqual(["slow-direct", "slow-relay", null]);
+});
+it("isolates stalled peers and still detects a missing EOF after all bytes arrived", () => {
+ let time = 0;
+ const stalled = createFileTransferWatchdog(1_000_000, "direct", () => time);
+ const healthy = createFileTransferWatchdog(1_000_000, "relay", () => time);
+ for (time = 1000; time < FILE_PEER_COMMAND_TIMEOUT_MS; time += 1000) {
+ expect(stalled(0)).toBeNull();
+ expect(healthy(Math.min(time * 100, 1_000_000))).toBeNull();
+ }
+ expect(stalled(0)).toBe("stalled");
+ time = 10_000 + FILE_PEER_COMMAND_TIMEOUT_MS;
+ expect(healthy(1_000_000)).toBe("stalled");
+});
+it("discards the old sample when the actual route changes", () => {
+ let time = 0;
+ let path: "direct" | "relay" = "relay";
+ const watch = createFileTransferWatchdog(
+ 100_000_000,
+ () => path,
+ () => time,
+ );
+ time = FILE_PEER_COMMAND_TIMEOUT_MS - 1;
+ expect(watch(1_000_000)).toBeNull();
+ path = "direct";
+ time++;
+ expect(watch(2_000_000)).toBeNull();
+ time += FILE_PEER_COMMAND_TIMEOUT_MS;
+ expect(watch(50_000_000)).toBeNull();
+ expect(FILE_PEER_RECEIVE_TIMEOUT_MS).toBeGreaterThan(
+ FILE_PEER_COMMAND_TIMEOUT_MS,
+ );
+});
diff --git a/packages/device-link/src/fileAccess.ts b/packages/device-link/src/fileAccess.ts
index b304673091..96b3626c9b 100644
--- a/packages/device-link/src/fileAccess.ts
+++ b/packages/device-link/src/fileAccess.ts
@@ -8,6 +8,8 @@ export interface DeviceFileResult {
inlineBase64?: string;
/** Only emitted when the caller explicitly requests preparation. */
transferRequired?: boolean;
+ /** Opaque source identity, emitted only after current authorization and stat. */
+ version?: string;
}
export function assertFileReadActive(signal?: AbortSignal): void {
diff --git a/packages/device-link/src/filePeer.ts b/packages/device-link/src/filePeer.ts
index 100a5fa3ea..09ff69b233 100644
--- a/packages/device-link/src/filePeer.ts
+++ b/packages/device-link/src/filePeer.ts
@@ -4,11 +4,13 @@ export const FILE_PEER_VERSION = 1;
export const FILE_PEER_CHUNK_BYTES = 16 * 1024;
export const FILE_PEER_MAX_BYTES = 2 * 1024 * 1024 * 1024;
export const FILE_PEER_MAX_CONNECTIONS = 4;
-export const FILE_PEER_IDLE_MS = 60_000;
+export const FILE_PEER_IDLE_MS = 5 * 60_000;
+/** Local bridge batch only; wire frames remain 16 KiB for older peers. */
+export const FILE_PEER_WRITE_BATCH_BYTES = 256 * 1024;
export type FilePeerRequest =
| { action: "caps" }
- | { action: "offer"; sdp: string }
+ | { action: "offer"; sdp: string; sessionBound?: boolean }
| { action: "open"; connection: string; url: string }
| { action: "attachment"; connection: string; request: Record<string, unknown> }
| { action: "close"; connection: string };
@@ -17,6 +19,7 @@ export interface FilePeerFile {
ticket: string;
size: number;
mimeType: string;
+ version?: string;
}
export function parseFilePeerRequest(value: unknown): FilePeerRequest {
@@ -30,7 +33,7 @@ export function parseFilePeerRequest(value: unknown): FilePeerRequest {
v.sdp.length > 0 &&
v.sdp.length <= 128 * 1024
)
- return { action: "offer", sdp: v.sdp };
+ return { action: "offer", sdp: v.sdp, ...(v.sessionBound === true ? { sessionBound: true } : {}) };
if (typeof v.connection !== "string" || !/^[a-f0-9-]{36}$/.test(v.connection))
throw new Error("INVALID_FILE_PEER_REQUEST");
if (v.action === "close")
@@ -61,5 +64,6 @@ export function parseFilePeerFile(value: unknown): FilePeerFile {
!/^[\w.+-]+\/[\w.+-]+$/.test(v.mimeType)
)
throw new Error("INVALID_FILE_PEER_FILE");
- return { ticket: v.ticket, size: v.size, mimeType: v.mimeType };
+ return { ticket: v.ticket, size: v.size, mimeType: v.mimeType,
+ ...(typeof v.version === 'string' && /^[a-f0-9]{64}$/.test(v.version) ? { version: v.version } : {}) };
}
diff --git a/packages/device-link/src/filePeerRuntime.ts b/packages/device-link/src/filePeerRuntime.ts
index b032d1a019..4077d27f13 100644
--- a/packages/device-link/src/filePeerRuntime.ts
+++ b/packages/device-link/src/filePeerRuntime.ts
@@ -1,8 +1,12 @@
/// <reference lib="dom" />
export interface FilePeerRuntimeBridge {
+ /** Local lifecycle event, never a wire message. */
+ closed?(connection: string): void;
read(connection: string, ticket: string, offset: number): Promise<string>;
write(sink: string, offset: number, base64: string): Promise<void>;
+ /** Local bridge capability only; coalesces already-arrived frames up to 256 KiB. */
+ writeBatch?(sink: string, offset: number, base64: string): Promise<void>;
/** `body` carries a request's binary payload (see RPC_BODY_MAX_BYTES). */
invoke?(
connection: string,
@@ -271,6 +275,7 @@ export function createFilePeerRuntime(bridge: FilePeerRuntimeBridge) {
peers.delete(id);
p?.dc?.close();
p?.pc.close();
+ if (p) bridge.closed?.(id);
}
function create(id: string, servers: RTCIceServer[]) {
if (peers.has(id) || peers.size >= 4) throw new Error("FILE_PEER_BUSY");
@@ -278,7 +283,7 @@ export function createFilePeerRuntime(bridge: FilePeerRuntimeBridge) {
const p: PeerState = { pc, dc: null, busy: false };
peers.set(id, p);
pc.onconnectionstatechange = () => {
- if (["failed", "closed", "disconnected"].includes(pc.connectionState))
+ if (peers.get(id) === p && ["failed", "closed", "disconnected"].includes(pc.connectionState))
close(id);
};
return p;
@@ -534,7 +539,8 @@ export function createFilePeerRuntime(bridge: FilePeerRuntimeBridge) {
let granted = Math.min(64, blocks);
let ended = false,
settled = false;
- let writes = Promise.resolve();
+ const writeQueue: Uint8Array[] = [];
+ let writing = false;
const progress: ReceiveProgress = {
size,
startedAt: Date.now(),
@@ -564,6 +570,45 @@ export function createFilePeerRuntime(bridge: FilePeerRuntimeBridge) {
function closed() {
done(new Error("FILE_PEER_CLOSED"));
}
+ async function flush() {
+ if (writing || settled) return;
+ writing = true;
+ try {
+ while (writeQueue.length && !settled) {
+ if (writeQueue[0].length === 0) {
+ writeQueue.shift(); queued--; progress.queued = queued; done(); return;
+ }
+ const count = Math.min(bridge.writeBatch ? 16 : 1,
+ writeQueue.findIndex((part) => !part.length) < 0 ? writeQueue.length : writeQueue.length - 1);
+ const parts = writeQueue.splice(0, count);
+ const length = parts.reduce((sum, part) => sum + part.length, 0);
+ const writeStartedAt = Date.now();
+ // Bounded spreads avoid one concatenation per byte and the engine's argument limit.
+ let binary = '';
+ for (const part of parts) {
+ for (let offset = 0; offset < part.length; offset += 8192)
+ binary += String.fromCharCode(...part.subarray(offset, offset + 8192));
+ }
+ await (bridge.writeBatch ?? bridge.write)(sink, written, btoa(binary));
+ if (settled) return;
+ if (peers.get(id) !== p) throw new Error('FILE_PEER_CLOSED');
+ written += length; queued -= count;
+ const writeMs = Date.now() - writeStartedAt;
+ progress.writes++; progress.writeMs += writeMs;
+ progress.writeMaxMs = Math.max(progress.writeMaxMs, writeMs);
+ progress.written = written; progress.queued = queued;
+ clearTimeout(timer);
+ timer = setTimeout(() => done(new Error('FILE_PEER_TIMEOUT')), 60000);
+ replenished += count;
+ if (replenished >= 32 && granted < blocks) {
+ const credit = Math.min(32, blocks - granted);
+ dc!.send(JSON.stringify({ credit }));
+ granted += credit; progress.granted = granted; replenished -= 32;
+ }
+ }
+ } catch (error) { done(error instanceof Error ? error : new Error('FILE_PEER_WRITE')); }
+ finally { writing = false; }
+ }
function message(event: MessageEvent) {
if (
ended ||
@@ -584,46 +629,8 @@ export function createFilePeerRuntime(bridge: FilePeerRuntimeBridge) {
progress.queued = queued;
progress.queuedMax = Math.max(progress.queuedMax, queued);
progress.lastDataAt = Date.now();
- writes = writes
- .then(async () => {
- if (settled) return;
- if (!bytes.length) {
- // The zero-byte EOF block leaves the queue like any other block,
- // so a completed receive reports no pending writes.
- queued--;
- progress.queued = queued;
- done();
- return;
- }
- const writeStartedAt = Date.now();
- let binary = "";
- for (const byte of bytes) binary += String.fromCharCode(byte);
- await bridge.write(sink, written, btoa(binary));
- if (settled) return;
- if (peers.get(id) !== p) throw new Error("FILE_PEER_CLOSED");
- written += bytes.length;
- queued--;
- const writeMs = Date.now() - writeStartedAt;
- progress.writes++;
- progress.writeMs += writeMs;
- progress.writeMaxMs = Math.max(progress.writeMaxMs, writeMs);
- progress.written = written;
- progress.queued = queued;
- clearTimeout(timer);
- timer = setTimeout(
- () => done(new Error("FILE_PEER_TIMEOUT")),
- 60000,
- );
- // Count EOF in the window; never send late credit after it was sent.
- if (++replenished === 32 && granted < blocks) {
- const credit = Math.min(32, blocks - granted);
- dc!.send(JSON.stringify({ credit }));
- granted += credit;
- progress.granted = granted;
- replenished = 0;
- }
- })
- .catch((error) => done(error));
+ writeQueue.push(bytes);
+ void flush();
}
dc.addEventListener("message", message);
dc.addEventListener("close", closed);
diff --git a/packages/device-link/src/filePeerRuntimeSource.ts b/packages/device-link/src/filePeerRuntimeSource.ts
index a710d11742..d2d49c8717 100644
--- a/packages/device-link/src/filePeerRuntimeSource.ts
+++ b/packages/device-link/src/filePeerRuntimeSource.ts
@@ -1,2 +1,2 @@
// Generated by node scripts/file-peer-runtime.mjs. Do not edit.
-export const FILE_PEER_RUNTIME_SOURCE = "\"use strict\";var CindyFilePeerRuntime=(()=>{var k=Object.defineProperty;var $=Object.getOwnPropertyDescriptor;var K=Object.getOwnPropertyNames;var z=Object.prototype.hasOwnProperty;var W=(b,w)=>{for(var T in w)k(b,T,{get:w[T],enumerable:!0})},X=(b,w,T,P)=>{if(w&&typeof w==\"object\"||typeof w==\"function\")for(let S of K(w))!z.call(b,S)&&S!==T&&k(b,S,{get:()=>w[S],enumerable:!(P=$(w,S))||P.enumerable});return b};var V=b=>X(k({},\"__esModule\",{value:!0}),b);var Q={};W(Q,{RPC_BODY_MAX_BYTES:()=>j,createFilePeerRuntime:()=>H});var j=1048576;function G(b){return Number.isSafeInteger(b)&&b>15e3?Math.min(b,60*6e4):15e3}function H(b){let w=new Map,T=16384,P=2147483648,S=new Map;function D(t,d){d.binaryType=\"arraybuffer\";let a=new Map,e=new Map,o,s=15e3,E=0,h=0,l=(g,n,c,i)=>{if(c.length>4*1024*1024||i&&(!i.length||i.length>1048576)||d.readyState!==\"open\")throw new Error(\"FILE_PEER_RPC_SIZE\");for(let r=0;r<Math.max(1,c.length);r+=16384){let m=r+16384>=c.length;d.send(JSON.stringify({key:g,response:n,data:c.slice(r,r+16384),last:m,...m&&i?{body:i.length}:{}}))}if(i)for(let r=0;r<i.length;r+=16384)d.send(i.slice(r,r+16384))},f=(g,n,c)=>{if(!b.invoke||h>=4)throw new Error;h++,b.invoke(t,n,c).then(i=>{w.has(t)&&l(g,!0,i)}).catch(()=>M(t)).finally(()=>{h--})},p=g=>{let n=o?e.get(o):void 0;if(!n?.body||!(g instanceof ArrayBuffer))throw new Error;let c=new Uint8Array(g);if(c.length!==Math.min(16384,n.body.remaining))throw new Error;if(n.body.parts.push(c),n.body.remaining-=c.length,clearTimeout(n.timer),n.body.remaining){n.timer=setTimeout(()=>M(t),s);return}let i=o;o=void 0,e.delete(i);let r=new Uint8Array(n.body.parts.reduce((u,v)=>u+v.length,0)),m=0;for(let u of n.body.parts)r.set(u,m),m+=u.length;f(i.slice(6),n.data,r)},y=()=>{for(let g of a.values())clearTimeout(g.timer),g.reject(new Error(\"FILE_PEER_CLOSED\"));for(let g of e.values())clearTimeout(g.timer);a.clear(),e.clear(),d.close()};d.onclose=y,d.onmessage=({data:g})=>{try{if(o!==void 0)return p(g);if(typeof g!=\"string\"||g.length>1e5)throw new Error;let n=JSON.parse(g);if(typeof n.key!=\"string\"||!/^\\d{1,12}$/.test(n.key)||typeof n.response!=\"boolean\"||typeof n.last!=\"boolean\"||typeof n.data!=\"string\"||n.data.length>16384||n.body!==void 0&&(n.response||!n.last||!Number.isSafeInteger(n.body)||n.body<1||n.body>1048576))throw new Error;if(n.response&&!a.has(n.key))return;let c=`${n.response}:${n.key}`,i=e.get(c);if(!i){if(e.size>=8)throw new Error;i={data:\"\",timer:setTimeout(()=>M(t),s)},e.set(c,i)}if(i.data+=n.data,i.data.length>4*1024*1024)throw new Error;if(!n.last)return;if(n.body!==void 0){clearTimeout(i.timer),i.timer=setTimeout(()=>M(t),s),i.body={remaining:n.body,parts:[]},o=c;return}if(clearTimeout(i.timer),e.delete(c),n.response){let r=a.get(n.key);a.delete(n.key),clearTimeout(r.timer),r.resolve(i.data)}else f(n.key,i.data)}catch{M(t)}},S.set(t,{channel:d,close:y,request(g,n,c){return a.size>=4||d.readyState!==\"open\"?Promise.reject(new Error(\"FILE_PEER_UNAVAILABLE\")):new Promise((i,r)=>{let m=String(++E),u=setTimeout(()=>{a.delete(m),r(new Error(\"FILE_PEER_TIMEOUT\"))},G(n));a.set(m,{resolve:i,reject:r,timer:u});try{l(m,!1,g,c)}catch(v){a.delete(m),clearTimeout(u),r(v)}})}})}function M(t){let d=S.get(t);S.delete(t),d?.close();let a=w.get(t);w.delete(t),a?.dc?.close(),a?.pc.close()}function O(t,d){if(w.has(t)||w.size>=4)throw new Error(\"FILE_PEER_BUSY\");let a=new RTCPeerConnection({iceServers:d}),e={pc:a,dc:null,busy:!1};return w.set(t,e),a.onconnectionstatechange=()=>{[\"failed\",\"closed\",\"disconnected\"].includes(a.connectionState)&&M(t)},e}async function F(t,d){if(await t.setLocalDescription(d),t.iceGatheringState!==\"complete\"&&await new Promise(a=>{let e=setTimeout(o,4e3);function o(){clearTimeout(e),t.removeEventListener(\"icegatheringstatechange\",s),a()}function s(){t.iceGatheringState===\"complete\"&&o()}t.addEventListener(\"icegatheringstatechange\",s),s()}),!t.localDescription?.sdp||t.signalingState===\"closed\")throw new Error(\"FILE_PEER_CLOSED\");return t.localDescription.sdp}function B(t){if(t.length>22e3||!/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(t))throw new Error(\"FILE_PEER_BLOCK\");let d=atob(t);if(d.length>T)throw new Error(\"FILE_PEER_BLOCK\");return Uint8Array.from(d,a=>a.charCodeAt(0))}async function N(t,d,a=!1){let e=O(t,d);e.dc=e.pc.createDataChannel(a?\"files-v2\":\"files-v1\",{ordered:!0}),e.dc.binaryType=\"arraybuffer\",a&&D(t,e.pc.createDataChannel(\"reads-v1\",{ordered:!0}));try{return await F(e.pc,await e.pc.createOffer())}catch(o){throw M(t),o}}async function Z(t,d,a){let e=O(t,d);e.pc.ondatachannel=({channel:o})=>{if(o.label===\"reads-v1\"&&!S.has(t)){D(t,o);return}if(![\"files-v1\",\"files-v2\"].includes(o.label)||e.dc){o.close();return}if(e.dc=o,o.binaryType=\"arraybuffer\",o.label===\"files-v2\"){let s,E=!1,h=async()=>{if(!E){E=!0;try{for(;s&&s.credit>0;){let l=s;l.credit--;let f=Date.now(),p=B(await b.read(t,l.ticket,l.offset));if(w.get(t)!==e||o.readyState!==\"open\")return;if(o.send(p.buffer),l.offset+=p.length,e.send){let y=Date.now()-f;e.send.reads++,e.send.readMs+=y,e.send.readMaxMs=Math.max(e.send.readMaxMs,y),e.send.sent=l.offset,e.send.credit=l.credit}p.length||(s=void 0)}s&&e.send&&e.send.waitingSince===null&&(e.send.waitingSince=Date.now())}catch{M(t)}finally{E=!1}}};o.onmessage=({data:l})=>{try{if(typeof l!=\"string\"||l.length>256)throw new Error;let f=JSON.parse(l);if(!Number.isSafeInteger(f.credit)||f.credit<1||f.credit>64)throw new Error;if(f.ticket!==void 0){if(s||!/^[a-f0-9-]{36}$/.test(f.ticket)||f.offset!==0)throw new Error;s={ticket:f.ticket,offset:0,credit:f.credit},e.send={startedAt:Date.now(),sent:0,credit:f.credit,reads:0,readMs:0,readMaxMs:0,creditWaitMs:0,waitingSince:null}}else{if(!s||s.credit+f.credit>64)throw new Error;s.credit+=f.credit,e.send&&(e.send.credit=s.credit,e.send.waitingSince!==null&&(e.send.creditWaitMs+=Date.now()-e.send.waitingSince,e.send.waitingSince=null))}h()}catch{M(t)}};return}o.onmessage=async({data:s})=>{try{if(w.get(t)!==e||e.busy||typeof s!=\"string\"||s.length>256)throw new Error(\"FILE_PEER_BLOCK\");let E=JSON.parse(s);if(!/^[a-f0-9-]{36}$/.test(E.ticket)||!Number.isSafeInteger(E.offset)||E.offset<0||E.offset>P||E.credit!==16)throw new Error(\"FILE_PEER_BLOCK\");e.busy=!0;let h=E.offset;for(let l=0;l<16;l++){let f=B(await b.read(t,E.ticket,h));if(w.get(t)!==e||o.readyState!==\"open\")return;if(o.send(f.buffer),h+=f.length,!f.length)break}}catch{M(t)}finally{e.busy=!1}}};try{return await e.pc.setRemoteDescription({type:\"offer\",sdp:a}),await F(e.pc,await e.pc.createAnswer())}catch(o){throw M(t),o}}async function Y(t,d){let a=w.get(t);if(!a)throw new Error(\"FILE_PEER_CLOSED\");await a.pc.setRemoteDescription({type:\"answer\",sdp:d}),await Promise.all([a.dc,S.get(t)?.channel].filter(e=>!!e).map(e=>new Promise((o,s)=>{let E=setTimeout(()=>h(new Error(\"FILE_PEER_TIMEOUT\")),8e3);function h(p){clearTimeout(E),e.removeEventListener(\"open\",l),e.removeEventListener(\"close\",f),p?s(p):o()}function l(){h()}function f(){h(new Error(\"FILE_PEER_CLOSED\"))}e.addEventListener(\"open\",l),e.addEventListener(\"close\",f),e.readyState===\"open\"?h():e.readyState===\"closed\"&&f()})))}async function J(t,d,a,e){let o=w.get(t),s=o?.dc;if(!o||!s||s.readyState!==\"open\"||o.busy||!Number.isSafeInteger(a)||a<0||a>P)throw new Error(\"FILE_PEER_UNAVAILABLE\");o.busy=!0;try{if(s.label===\"files-v2\"){await new Promise((h,l)=>{let f=0,p=0,y=0,g=0,n=Math.ceil(a/T)+1,c=Math.min(64,n),i=!1,r=!1,m=Promise.resolve(),u={size:a,startedAt:Date.now(),received:0,written:0,queued:0,queuedMax:0,granted:c,writes:0,writeMs:0,writeMaxMs:0,lastDataAt:0};o.recv=u;let v=setTimeout(()=>R(new Error(\"FILE_PEER_TIMEOUT\")),6e4);function R(L){r||(r=!0,clearTimeout(v),s.removeEventListener(\"message\",x),s.removeEventListener(\"close\",I),L?l(L):h())}function I(){R(new Error(\"FILE_PEER_CLOSED\"))}function x(L){if(i||!(L.data instanceof ArrayBuffer)||++y>64){R(new Error(\"FILE_PEER_BLOCK\"));return}let _=new Uint8Array(L.data);if(_.length!==Math.min(T,a-f)){R(new Error(\"FILE_PEER_SIZE\"));return}f+=_.length,i=_.length===0,u.received=f,u.queued=y,u.queuedMax=Math.max(u.queuedMax,y),u.lastDataAt=Date.now(),m=m.then(async()=>{if(r)return;if(!_.length){y--,u.queued=y,R();return}let A=Date.now(),q=\"\";for(let C of _)q+=String.fromCharCode(C);if(await b.write(e,p,btoa(q)),r)return;if(w.get(t)!==o)throw new Error(\"FILE_PEER_CLOSED\");p+=_.length,y--;let U=Date.now()-A;if(u.writes++,u.writeMs+=U,u.writeMaxMs=Math.max(u.writeMaxMs,U),u.written=p,u.queued=y,clearTimeout(v),v=setTimeout(()=>R(new Error(\"FILE_PEER_TIMEOUT\")),6e4),++g===32&&c<n){let C=Math.min(32,n-c);s.send(JSON.stringify({credit:C})),c+=C,u.granted=c,g=0}}).catch(A=>R(A))}s.addEventListener(\"message\",x),s.addEventListener(\"close\",I);try{s.send(JSON.stringify({ticket:d,offset:0,credit:c}))}catch{I()}});return}let E=0;for(;E<=a;){let h=await new Promise((l,f)=>{let p=[],y=E,g=setTimeout(()=>n(new Error(\"FILE_PEER_TIMEOUT\")),6e4);function n(r){clearTimeout(g),s.removeEventListener(\"message\",i),s.removeEventListener(\"close\",c),r?f(r):l(p)}function c(){n(new Error(\"FILE_PEER_CLOSED\"))}function i(r){if(!(r.data instanceof ArrayBuffer)){n(new Error(\"FILE_PEER_BLOCK\"));return}let m=new Uint8Array(r.data);if(m.length!==Math.min(T,a-y)){n(new Error(\"FILE_PEER_SIZE\"));return}p.push(m),y+=m.length,(!m.length||p.length===16)&&n()}s.addEventListener(\"message\",i),s.addEventListener(\"close\",c);try{s.send(JSON.stringify({ticket:d,offset:E,credit:16}))}catch{c()}});for(let l of h){if(!l.length)return;let f=\"\";for(let p of l)f+=String.fromCharCode(p);if(await b.write(e,E,btoa(f)),w.get(t)!==o)throw new Error(\"FILE_PEER_CLOSED\");E+=l.length}}}catch(E){throw M(t),E}finally{o.busy=!1}}return{async invoke(t,d,a,e){let o=S.get(t);if(!o)throw new Error(\"FILE_PEER_UNAVAILABLE\");if(e===void 0)return o.request(d,a);if(typeof e!=\"string\"||e.length>Math.ceil(1048576/3)*4||!/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(e))throw new Error(\"FILE_PEER_RPC_SIZE\");return o.request(d,a,Uint8Array.from(atob(e),s=>s.charCodeAt(0)))},async stats(t){let d=w.get(t);if(!d)throw new Error(\"FILE_PEER_CLOSED\");let a=await d.pc.getStats(),e=new Map;a.forEach(r=>e.set(r.id,r));let o;a.forEach(r=>{r.type===\"transport\"&&r.selectedCandidatePairId&&(o=e.get(r.selectedCandidatePairId))});let s=o,E=s?.localCandidateId?e.get(s.localCandidateId):void 0,h=s?.remoteCandidateId?e.get(s.remoteCandidateId):void 0,l=(r,m)=>{if(!r)return;let u={};for(let v of m){let R=r[v];typeof R==\"number\"&&Number.isFinite(R)?u[v]=Math.round(R):typeof R==\"string\"&&R.length<=32&&(u[v]=R)}return Object.keys(u).length?u:void 0},f,p,y=(r,m)=>{let u=typeof m==\"string\"&&m.length<=16?m:\"other\";r[u]=(r[u]??0)+1},g={local:{},remote:{},pairs:{},localRelay:{}};a.forEach(r=>{r.type===\"transport\"&&r.selectedCandidatePairId&&(f=r),r.type===\"data-channel\"&&r.label===d.dc?.label&&(p=r),r.type===\"local-candidate\"&&(y(g.local,r.candidateType),r.candidateType===\"relay\"&&y(g.localRelay,r.relayProtocol)),r.type===\"remote-candidate\"&&y(g.remote,r.candidateType),r.type===\"candidate-pair\"&&y(g.pairs,r.state)});let n=Date.now(),c=d.recv,i=d.send;return JSON.stringify({path:s?E?.candidateType===\"relay\"||h?.candidateType===\"relay\"?\"relay\":\"direct\":\"unknown\",protocol:E?.protocol??\"unknown\",rttMs:typeof s?.currentRoundTripTime==\"number\"?Math.round(s.currentRoundTripTime*1e3):null,streaming:d.dc?.label===\"files-v2\",local:l(E,[\"candidateType\",\"protocol\",\"relayProtocol\",\"networkType\"]),remote:l(h,[\"candidateType\",\"protocol\"]),candidates:g,pair:l(s,[\"state\",\"bytesSent\",\"bytesReceived\",\"packetsSent\",\"packetsReceived\",\"packetsDiscardedOnSend\",\"availableOutgoingBitrate\",\"availableIncomingBitrate\",\"requestsSent\",\"responsesReceived\",\"consentRequestsSent\"]),transport:l(f,[\"dtlsState\",\"bytesSent\",\"bytesReceived\",\"packetsSent\",\"packetsReceived\",\"selectedCandidatePairChanges\"]),channel:{...l(p,[\"messagesSent\",\"bytesSent\",\"messagesReceived\",\"bytesReceived\"]),bufferedAmount:d.dc?.bufferedAmount},receive:c&&{size:c.size,elapsedMs:n-c.startedAt,received:c.received,written:c.written,queued:c.queued,queuedMax:c.queuedMax,granted:c.granted,writes:c.writes,writeAvgMs:c.writes?Math.round(c.writeMs/c.writes):null,writeMaxMs:c.writeMaxMs,idleMs:c.lastDataAt?n-c.lastDataAt:null},send:i&&{elapsedMs:n-i.startedAt,sent:i.sent,credit:i.credit,reads:i.reads,readAvgMs:i.reads?Math.round(i.readMs/i.reads):null,readMaxMs:i.readMaxMs,creditWaitMs:i.creditWaitMs+(i.waitingSince===null?0:n-i.waitingSince)}})},offer:N,accept:Z,answer:Y,receive:J,close:M,dispose:()=>{for(let t of w.keys())M(t)}}}return V(Q);})();\n";
+export const FILE_PEER_RUNTIME_SOURCE = "\"use strict\";var CindyFilePeerRuntime=(()=>{var D=Object.defineProperty;var X=Object.getOwnPropertyDescriptor;var V=Object.getOwnPropertyNames;var j=Object.prototype.hasOwnProperty;var G=(p,w)=>{for(var T in w)D(p,T,{get:w[T],enumerable:!0})},Q=(p,w,T,A)=>{if(w&&typeof w==\"object\"||typeof w==\"function\")for(let v of V(w))!j.call(p,v)&&v!==T&&D(p,v,{get:()=>w[v],enumerable:!(A=X(w,v))||A.enumerable});return p};var H=p=>Q(D({},\"__esModule\",{value:!0}),p);var ne={};G(ne,{RPC_BODY_MAX_BYTES:()=>ee,createFilePeerRuntime:()=>re});var ee=1048576;function te(p){return Number.isSafeInteger(p)&&p>15e3?Math.min(p,60*6e4):15e3}function re(p){let w=new Map,T=16384,A=2147483648,v=new Map;function O(t,d){d.binaryType=\"arraybuffer\";let i=new Map,e=new Map,o,s=15e3,E=0,b=0,l=(u,n,c,a)=>{if(c.length>4*1024*1024||a&&(!a.length||a.length>1048576)||d.readyState!==\"open\")throw new Error(\"FILE_PEER_RPC_SIZE\");for(let r=0;r<Math.max(1,c.length);r+=16384){let g=r+16384>=c.length;d.send(JSON.stringify({key:u,response:n,data:c.slice(r,r+16384),last:g,...g&&a?{body:a.length}:{}}))}if(a)for(let r=0;r<a.length;r+=16384)d.send(a.slice(r,r+16384))},f=(u,n,c)=>{if(!p.invoke||b>=4)throw new Error;b++,p.invoke(t,n,c).then(a=>{w.has(t)&&l(u,!0,a)}).catch(()=>R(t)).finally(()=>{b--})},h=u=>{let n=o?e.get(o):void 0;if(!n?.body||!(u instanceof ArrayBuffer))throw new Error;let c=new Uint8Array(u);if(c.length!==Math.min(16384,n.body.remaining))throw new Error;if(n.body.parts.push(c),n.body.remaining-=c.length,clearTimeout(n.timer),n.body.remaining){n.timer=setTimeout(()=>R(t),s);return}let a=o;o=void 0,e.delete(a);let r=new Uint8Array(n.body.parts.reduce((M,m)=>M+m.length,0)),g=0;for(let M of n.body.parts)r.set(M,g),g+=M.length;f(a.slice(6),n.data,r)},y=()=>{for(let u of i.values())clearTimeout(u.timer),u.reject(new Error(\"FILE_PEER_CLOSED\"));for(let u of e.values())clearTimeout(u.timer);i.clear(),e.clear(),d.close()};d.onclose=y,d.onmessage=({data:u})=>{try{if(o!==void 0)return h(u);if(typeof u!=\"string\"||u.length>1e5)throw new Error;let n=JSON.parse(u);if(typeof n.key!=\"string\"||!/^\\d{1,12}$/.test(n.key)||typeof n.response!=\"boolean\"||typeof n.last!=\"boolean\"||typeof n.data!=\"string\"||n.data.length>16384||n.body!==void 0&&(n.response||!n.last||!Number.isSafeInteger(n.body)||n.body<1||n.body>1048576))throw new Error;if(n.response&&!i.has(n.key))return;let c=`${n.response}:${n.key}`,a=e.get(c);if(!a){if(e.size>=8)throw new Error;a={data:\"\",timer:setTimeout(()=>R(t),s)},e.set(c,a)}if(a.data+=n.data,a.data.length>4*1024*1024)throw new Error;if(!n.last)return;if(n.body!==void 0){clearTimeout(a.timer),a.timer=setTimeout(()=>R(t),s),a.body={remaining:n.body,parts:[]},o=c;return}if(clearTimeout(a.timer),e.delete(c),n.response){let r=i.get(n.key);i.delete(n.key),clearTimeout(r.timer),r.resolve(a.data)}else f(n.key,a.data)}catch{R(t)}},v.set(t,{channel:d,close:y,request(u,n,c){return i.size>=4||d.readyState!==\"open\"?Promise.reject(new Error(\"FILE_PEER_UNAVAILABLE\")):new Promise((a,r)=>{let g=String(++E),M=setTimeout(()=>{i.delete(g),r(new Error(\"FILE_PEER_TIMEOUT\"))},te(n));i.set(g,{resolve:a,reject:r,timer:M});try{l(g,!1,u,c)}catch(m){i.delete(g),clearTimeout(M),r(m)}})}})}function R(t){let d=v.get(t);v.delete(t),d?.close();let i=w.get(t);w.delete(t),i?.dc?.close(),i?.pc.close(),i&&p.closed?.(t)}function F(t,d){if(w.has(t)||w.size>=4)throw new Error(\"FILE_PEER_BUSY\");let i=new RTCPeerConnection({iceServers:d}),e={pc:i,dc:null,busy:!1};return w.set(t,e),i.onconnectionstatechange=()=>{w.get(t)===e&&[\"failed\",\"closed\",\"disconnected\"].includes(i.connectionState)&&R(t)},e}async function B(t,d){if(await t.setLocalDescription(d),t.iceGatheringState!==\"complete\"&&await new Promise(i=>{let e=setTimeout(o,4e3);function o(){clearTimeout(e),t.removeEventListener(\"icegatheringstatechange\",s),i()}function s(){t.iceGatheringState===\"complete\"&&o()}t.addEventListener(\"icegatheringstatechange\",s),s()}),!t.localDescription?.sdp||t.signalingState===\"closed\")throw new Error(\"FILE_PEER_CLOSED\");return t.localDescription.sdp}function x(t){if(t.length>22e3||!/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(t))throw new Error(\"FILE_PEER_BLOCK\");let d=atob(t);if(d.length>T)throw new Error(\"FILE_PEER_BLOCK\");return Uint8Array.from(d,i=>i.charCodeAt(0))}async function Z(t,d,i=!1){let e=F(t,d);e.dc=e.pc.createDataChannel(i?\"files-v2\":\"files-v1\",{ordered:!0}),e.dc.binaryType=\"arraybuffer\",i&&O(t,e.pc.createDataChannel(\"reads-v1\",{ordered:!0}));try{return await B(e.pc,await e.pc.createOffer())}catch(o){throw R(t),o}}async function Y(t,d,i){let e=F(t,d);e.pc.ondatachannel=({channel:o})=>{if(o.label===\"reads-v1\"&&!v.has(t)){O(t,o);return}if(![\"files-v1\",\"files-v2\"].includes(o.label)||e.dc){o.close();return}if(e.dc=o,o.binaryType=\"arraybuffer\",o.label===\"files-v2\"){let s,E=!1,b=async()=>{if(!E){E=!0;try{for(;s&&s.credit>0;){let l=s;l.credit--;let f=Date.now(),h=x(await p.read(t,l.ticket,l.offset));if(w.get(t)!==e||o.readyState!==\"open\")return;if(o.send(h.buffer),l.offset+=h.length,e.send){let y=Date.now()-f;e.send.reads++,e.send.readMs+=y,e.send.readMaxMs=Math.max(e.send.readMaxMs,y),e.send.sent=l.offset,e.send.credit=l.credit}h.length||(s=void 0)}s&&e.send&&e.send.waitingSince===null&&(e.send.waitingSince=Date.now())}catch{R(t)}finally{E=!1}}};o.onmessage=({data:l})=>{try{if(typeof l!=\"string\"||l.length>256)throw new Error;let f=JSON.parse(l);if(!Number.isSafeInteger(f.credit)||f.credit<1||f.credit>64)throw new Error;if(f.ticket!==void 0){if(s||!/^[a-f0-9-]{36}$/.test(f.ticket)||f.offset!==0)throw new Error;s={ticket:f.ticket,offset:0,credit:f.credit},e.send={startedAt:Date.now(),sent:0,credit:f.credit,reads:0,readMs:0,readMaxMs:0,creditWaitMs:0,waitingSince:null}}else{if(!s||s.credit+f.credit>64)throw new Error;s.credit+=f.credit,e.send&&(e.send.credit=s.credit,e.send.waitingSince!==null&&(e.send.creditWaitMs+=Date.now()-e.send.waitingSince,e.send.waitingSince=null))}b()}catch{R(t)}};return}o.onmessage=async({data:s})=>{try{if(w.get(t)!==e||e.busy||typeof s!=\"string\"||s.length>256)throw new Error(\"FILE_PEER_BLOCK\");let E=JSON.parse(s);if(!/^[a-f0-9-]{36}$/.test(E.ticket)||!Number.isSafeInteger(E.offset)||E.offset<0||E.offset>A||E.credit!==16)throw new Error(\"FILE_PEER_BLOCK\");e.busy=!0;let b=E.offset;for(let l=0;l<16;l++){let f=x(await p.read(t,E.ticket,b));if(w.get(t)!==e||o.readyState!==\"open\")return;if(o.send(f.buffer),b+=f.length,!f.length)break}}catch{R(t)}finally{e.busy=!1}}};try{return await e.pc.setRemoteDescription({type:\"offer\",sdp:i}),await B(e.pc,await e.pc.createAnswer())}catch(o){throw R(t),o}}async function J(t,d){let i=w.get(t);if(!i)throw new Error(\"FILE_PEER_CLOSED\");await i.pc.setRemoteDescription({type:\"answer\",sdp:d}),await Promise.all([i.dc,v.get(t)?.channel].filter(e=>!!e).map(e=>new Promise((o,s)=>{let E=setTimeout(()=>b(new Error(\"FILE_PEER_TIMEOUT\")),8e3);function b(h){clearTimeout(E),e.removeEventListener(\"open\",l),e.removeEventListener(\"close\",f),h?s(h):o()}function l(){b()}function f(){b(new Error(\"FILE_PEER_CLOSED\"))}e.addEventListener(\"open\",l),e.addEventListener(\"close\",f),e.readyState===\"open\"?b():e.readyState===\"closed\"&&f()})))}async function $(t,d,i,e){let o=w.get(t),s=o?.dc;if(!o||!s||s.readyState!==\"open\"||o.busy||!Number.isSafeInteger(i)||i<0||i>A)throw new Error(\"FILE_PEER_UNAVAILABLE\");o.busy=!0;try{if(s.label===\"files-v2\"){await new Promise((b,l)=>{let f=0,h=0,y=0,u=0,n=Math.ceil(i/T)+1,c=Math.min(64,n),a=!1,r=!1,g=[],M=!1,m={size:i,startedAt:Date.now(),received:0,written:0,queued:0,queuedMax:0,granted:c,writes:0,writeMs:0,writeMaxMs:0,lastDataAt:0};o.recv=m;let _=setTimeout(()=>L(new Error(\"FILE_PEER_TIMEOUT\")),6e4);function L(S){r||(r=!0,clearTimeout(_),s.removeEventListener(\"message\",U),s.removeEventListener(\"close\",k),S?l(S):b())}function k(){L(new Error(\"FILE_PEER_CLOSED\"))}async function K(){if(!(M||r)){M=!0;try{for(;g.length&&!r;){if(g[0].length===0){g.shift(),y--,m.queued=y,L();return}let S=Math.min(p.writeBatch?16:1,g.findIndex(P=>!P.length)<0?g.length:g.length-1),I=g.splice(0,S),W=I.reduce((P,C)=>P+C.length,0),z=Date.now(),q=\"\";for(let P of I)for(let C=0;C<P.length;C+=8192)q+=String.fromCharCode(...P.subarray(C,C+8192));if(await(p.writeBatch??p.write)(e,h,btoa(q)),r)return;if(w.get(t)!==o)throw new Error(\"FILE_PEER_CLOSED\");h+=W,y-=S;let N=Date.now()-z;if(m.writes++,m.writeMs+=N,m.writeMaxMs=Math.max(m.writeMaxMs,N),m.written=h,m.queued=y,clearTimeout(_),_=setTimeout(()=>L(new Error(\"FILE_PEER_TIMEOUT\")),6e4),u+=S,u>=32&&c<n){let P=Math.min(32,n-c);s.send(JSON.stringify({credit:P})),c+=P,m.granted=c,u-=32}}}catch(S){L(S instanceof Error?S:new Error(\"FILE_PEER_WRITE\"))}finally{M=!1}}}function U(S){if(a||!(S.data instanceof ArrayBuffer)||++y>64){L(new Error(\"FILE_PEER_BLOCK\"));return}let I=new Uint8Array(S.data);if(I.length!==Math.min(T,i-f)){L(new Error(\"FILE_PEER_SIZE\"));return}f+=I.length,a=I.length===0,m.received=f,m.queued=y,m.queuedMax=Math.max(m.queuedMax,y),m.lastDataAt=Date.now(),g.push(I),K()}s.addEventListener(\"message\",U),s.addEventListener(\"close\",k);try{s.send(JSON.stringify({ticket:d,offset:0,credit:c}))}catch{k()}});return}let E=0;for(;E<=i;){let b=await new Promise((l,f)=>{let h=[],y=E,u=setTimeout(()=>n(new Error(\"FILE_PEER_TIMEOUT\")),6e4);function n(r){clearTimeout(u),s.removeEventListener(\"message\",a),s.removeEventListener(\"close\",c),r?f(r):l(h)}function c(){n(new Error(\"FILE_PEER_CLOSED\"))}function a(r){if(!(r.data instanceof ArrayBuffer)){n(new Error(\"FILE_PEER_BLOCK\"));return}let g=new Uint8Array(r.data);if(g.length!==Math.min(T,i-y)){n(new Error(\"FILE_PEER_SIZE\"));return}h.push(g),y+=g.length,(!g.length||h.length===16)&&n()}s.addEventListener(\"message\",a),s.addEventListener(\"close\",c);try{s.send(JSON.stringify({ticket:d,offset:E,credit:16}))}catch{c()}});for(let l of b){if(!l.length)return;let f=\"\";for(let h of l)f+=String.fromCharCode(h);if(await p.write(e,E,btoa(f)),w.get(t)!==o)throw new Error(\"FILE_PEER_CLOSED\");E+=l.length}}}catch(E){throw R(t),E}finally{o.busy=!1}}return{async invoke(t,d,i,e){let o=v.get(t);if(!o)throw new Error(\"FILE_PEER_UNAVAILABLE\");if(e===void 0)return o.request(d,i);if(typeof e!=\"string\"||e.length>Math.ceil(1048576/3)*4||!/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(e))throw new Error(\"FILE_PEER_RPC_SIZE\");return o.request(d,i,Uint8Array.from(atob(e),s=>s.charCodeAt(0)))},async stats(t){let d=w.get(t);if(!d)throw new Error(\"FILE_PEER_CLOSED\");let i=await d.pc.getStats(),e=new Map;i.forEach(r=>e.set(r.id,r));let o;i.forEach(r=>{r.type===\"transport\"&&r.selectedCandidatePairId&&(o=e.get(r.selectedCandidatePairId))});let s=o,E=s?.localCandidateId?e.get(s.localCandidateId):void 0,b=s?.remoteCandidateId?e.get(s.remoteCandidateId):void 0,l=(r,g)=>{if(!r)return;let M={};for(let m of g){let _=r[m];typeof _==\"number\"&&Number.isFinite(_)?M[m]=Math.round(_):typeof _==\"string\"&&_.length<=32&&(M[m]=_)}return Object.keys(M).length?M:void 0},f,h,y=(r,g)=>{let M=typeof g==\"string\"&&g.length<=16?g:\"other\";r[M]=(r[M]??0)+1},u={local:{},remote:{},pairs:{},localRelay:{}};i.forEach(r=>{r.type===\"transport\"&&r.selectedCandidatePairId&&(f=r),r.type===\"data-channel\"&&r.label===d.dc?.label&&(h=r),r.type===\"local-candidate\"&&(y(u.local,r.candidateType),r.candidateType===\"relay\"&&y(u.localRelay,r.relayProtocol)),r.type===\"remote-candidate\"&&y(u.remote,r.candidateType),r.type===\"candidate-pair\"&&y(u.pairs,r.state)});let n=Date.now(),c=d.recv,a=d.send;return JSON.stringify({path:s?E?.candidateType===\"relay\"||b?.candidateType===\"relay\"?\"relay\":\"direct\":\"unknown\",protocol:E?.protocol??\"unknown\",rttMs:typeof s?.currentRoundTripTime==\"number\"?Math.round(s.currentRoundTripTime*1e3):null,streaming:d.dc?.label===\"files-v2\",local:l(E,[\"candidateType\",\"protocol\",\"relayProtocol\",\"networkType\"]),remote:l(b,[\"candidateType\",\"protocol\"]),candidates:u,pair:l(s,[\"state\",\"bytesSent\",\"bytesReceived\",\"packetsSent\",\"packetsReceived\",\"packetsDiscardedOnSend\",\"availableOutgoingBitrate\",\"availableIncomingBitrate\",\"requestsSent\",\"responsesReceived\",\"consentRequestsSent\"]),transport:l(f,[\"dtlsState\",\"bytesSent\",\"bytesReceived\",\"packetsSent\",\"packetsReceived\",\"selectedCandidatePairChanges\"]),channel:{...l(h,[\"messagesSent\",\"bytesSent\",\"messagesReceived\",\"bytesReceived\"]),bufferedAmount:d.dc?.bufferedAmount},receive:c&&{size:c.size,elapsedMs:n-c.startedAt,received:c.received,written:c.written,queued:c.queued,queuedMax:c.queuedMax,granted:c.granted,writes:c.writes,writeAvgMs:c.writes?Math.round(c.writeMs/c.writes):null,writeMaxMs:c.writeMaxMs,idleMs:c.lastDataAt?n-c.lastDataAt:null},send:a&&{elapsedMs:n-a.startedAt,sent:a.sent,credit:a.credit,reads:a.reads,readAvgMs:a.reads?Math.round(a.readMs/a.reads):null,readMaxMs:a.readMaxMs,creditWaitMs:a.creditWaitMs+(a.waitingSince===null?0:n-a.waitingSince)}})},offer:Z,accept:Y,answer:J,receive:$,close:R,dispose:()=>{for(let t of w.keys())R(t)}}}return H(ne);})();\n";
diff --git a/packages/device-link/src/fileTransferPolicy.ts b/packages/device-link/src/fileTransferPolicy.ts
new file mode 100644
index 0000000000..41c31575fc
--- /dev/null
+++ b/packages/device-link/src/fileTransferPolicy.ts
@@ -0,0 +1,83 @@
+import { FILE_PEER_IDLE_MS } from "./filePeer";
+
+/** Existing command/receive budgets, now shared by route policy and both adapters.
+ * These are bounded-wait product budgets, not claims about optimal network speed. */
+export const FILE_PEER_COMMAND_TIMEOUT_MS = 15_000;
+export const FILE_PEER_RECEIVE_TIMEOUT_MS = 60_000;
+export const FILE_PEER_PROGRESS_SAMPLE_MS = 1000;
+export type FileTransferPath = "direct" | "relay" | "unknown";
+
+export function fileTransferPath(stats: unknown): FileTransferPath {
+ try {
+ const value = typeof stats === "string" ? JSON.parse(stats) : stats;
+ return value?.path === "relay"
+ ? "relay"
+ : value?.path === "direct"
+ ? "direct"
+ : "unknown";
+ } catch {
+ return "unknown";
+ }
+}
+
+/** Leave one command budget before the host expires a connection; old hosts use
+ * their established 30s controller lifetime. Reject non-finite capability values. */
+export function filePeerReuseMs(advertised: unknown, sessionBound?: unknown): number | null {
+ // Explicit capability negotiation only: old peers must retain their idle budget.
+ if (sessionBound === true) return null;
+ return typeof advertised === "number" &&
+ Number.isFinite(advertised) &&
+ advertised >= FILE_PEER_RECEIVE_TIMEOUT_MS
+ ? Math.min(FILE_PEER_IDLE_MS, advertised) - FILE_PEER_COMMAND_TIMEOUT_MS
+ : FILE_PEER_RECEIVE_TIMEOUT_MS / 2;
+}
+
+/** Do not assume TURN is slower than OSS or invent a KB/s floor. Sample for one
+ * command budget; only abandon a known path when its remaining work is projected
+ * to exceed a full receive budget. No progress uses the shorter command budget.
+ * A path change discards the old sample. Unknown paths only detect stalls.
+ * This bounds a bad attempt; without OSS measurements it cannot promise a faster route. */
+export function createFileTransferWatchdog(
+ size: number,
+ path: FileTransferPath | (() => FileTransferPath),
+ now = Date.now,
+) {
+ let lastBytes = 0,
+ lastProgress = now(),
+ sampleAt = lastProgress,
+ sampleBytes = 0;
+ const getPath = typeof path === "function" ? path : () => path;
+ let sampledPath = getPath();
+ return (written: number): "stalled" | "slow-relay" | "slow-direct" | null => {
+ const time = now();
+ if (written > lastBytes) {
+ lastBytes = written;
+ lastProgress = time;
+ }
+ if (time - lastProgress >= FILE_PEER_COMMAND_TIMEOUT_MS) return "stalled";
+ const currentPath = getPath();
+ if (currentPath !== sampledPath) {
+ sampledPath = currentPath;
+ sampleAt = time;
+ sampleBytes = written;
+ return null;
+ }
+ const elapsed = time - sampleAt;
+ if (elapsed < FILE_PEER_COMMAND_TIMEOUT_MS) return null;
+ const advanced = written - sampleBytes;
+ sampleAt = time;
+ sampleBytes = written;
+ if (advanced <= 0 || currentPath === "unknown") return null;
+ const remainingMs = ((size - written) * elapsed) / advanced;
+ return remainingMs > FILE_PEER_RECEIVE_TIMEOUT_MS
+ ? currentPath === "relay"
+ ? "slow-relay"
+ : "slow-direct"
+ : null;
+ };
+}
+
+/** Validated by the host on every read; absent on older hosts, disabling reuse. */
+export function validFileVersion(value: unknown): value is string {
+ return typeof value === "string" && /^[a-f0-9]{64}$/.test(value);
+}
diff --git a/packages/device-link/src/index.ts b/packages/device-link/src/index.ts
index 888464433d..6ab118ea3e 100644
--- a/packages/device-link/src/index.ts
+++ b/packages/device-link/src/index.ts
@@ -33,6 +33,7 @@ export * from "./peerTransferCooldown.js";
export * from "./peerInvoke.js";
export * from "./peerAttachment.js";
export * from "./fileAccess.js";
+export * from "./fileTransferPolicy.js";
export * from "./filePeerRuntime.js";
export { FILE_PEER_RUNTIME_SOURCE } from "./filePeerRuntimeSource.js";
diff --git a/scripts/file-peer-reuse-benchmark.mjs b/scripts/file-peer-reuse-benchmark.mjs
new file mode 100644
index 0000000000..30debbbac8
--- /dev/null
+++ b/scripts/file-peer-reuse-benchmark.mjs
@@ -0,0 +1,455 @@
+// Opt-in experiment: real production WebRTC runtime, synthetic bytes, loopback only.
+// Usage: node scripts/file-peer-reuse-benchmark.mjs /path/to/chrome
+// Installs the same pinned temporary TURN fixture as peer-transfer-acceptance.mjs.
+import { createRequire } from "node:module";
+import { fork, execFileSync } from "node:child_process";
+import { mkdtemp, writeFile, rm } from "node:fs/promises";
+import { createSocket } from "node:dgram";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { setTimeout as sleep } from "node:timers/promises";
+import { terminateTestProcess } from "./shared/terminate-test-process.mjs";
+
+const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
+const require = createRequire(
+ new URL("../apps/desktop/package.json", import.meta.url),
+);
+const { chromium } = require("playwright-core");
+const { build } = require("esbuild");
+const chrome = process.argv[2];
+const transfersOnly = process.argv.includes("--transfers-only");
+const idleOnly = process.argv.includes("--idle-only");
+const diagnose = process.argv.includes("--diagnose");
+const idleSeconds = Number(
+ process.argv
+ .find((arg) => arg.startsWith("--idle-seconds="))
+ ?.split("=")[1] ?? (diagnose ? 60 : 120),
+);
+if (!Number.isFinite(idleSeconds) || idleSeconds <= 0 || idleSeconds > 3600)
+ throw new Error("idle-seconds must be in (0, 3600]");
+const selectedScenario = process.argv
+ .find((arg) => arg.startsWith("--scenario="))
+ ?.split("=")[1];
+if (!chrome) throw new Error("Pass a Chrome executable");
+const artifacts = await mkdtemp(
+ path.join(tmpdir(), "cindy-file-reuse-results-"),
+);
+const scratch = await mkdtemp(path.join(tmpdir(), "cindy-file-reuse-fixture-"));
+console.log(`Artifacts: ${artifacts}`);
+const report = {
+ startedAt: new Date().toISOString(),
+ transfersOnly,
+ idleOnly,
+ scenarios: [],
+ limitations: [
+ "Two endpoints in one isolated headless Chrome; not MacBook-to-Studio WAN.",
+ "Production files-v2 runtime with in-memory bridges; excludes disk, IPC, authentication, WSS signalling and UI rendering.",
+ "Latency proxy adds delay, not bandwidth limits or packet loss. No production credentials or user files.",
+ "CPU and RSS are aggregate Chrome processes for both endpoints; RSS is not private memory or mobile battery use.",
+ "UDP counters cover both clients to/from TURN, including control packets; exclude IP/UDP headers and TURN relay-port traffic.",
+ ],
+};
+let browser, turn;
+const proxies = new Set();
+const abort = async () => {
+ for (const proxy of proxies) proxy.close();
+ await browser?.close().catch(() => {});
+ if (turn) terminateTestProcess(turn);
+};
+for (const signal of ["SIGINT", "SIGTERM"])
+ process.once(signal, () => {
+ void abort().finally(() => process.exit(signal === "SIGINT" ? 130 : 143));
+ });
+
+// One UDP forwarding socket per client address preserves TURN allocation identity.
+async function proxyTurn(ice, delayMs) {
+ const upstreamPort = Number(/:(\d+)\?/.exec(ice.urls)[1]);
+ const front = createSocket("udp4");
+ const sockets = new Map(),
+ timers = new Set();
+ let bytes = 0,
+ packets = 0,
+ closed = false;
+ const deliver = (fn) => {
+ if (!delayMs) return fn();
+ const timer = setTimeout(() => {
+ timers.delete(timer);
+ if (!closed) fn();
+ }, delayMs);
+ timers.add(timer);
+ };
+ front.on("message", (msg, remote) => {
+ bytes += msg.length;
+ packets++;
+ const key = `${remote.address}:${remote.port}`;
+ let back = sockets.get(key);
+ if (!back) {
+ back = createSocket("udp4");
+ sockets.set(key, back);
+ back.on("message", (reply) => {
+ bytes += reply.length;
+ packets++;
+ deliver(() => front.send(reply, remote.port, remote.address));
+ });
+ back.bind(0, "127.0.0.1");
+ }
+ deliver(() => back.send(msg, upstreamPort, "127.0.0.1"));
+ });
+ await new Promise((resolve) => front.bind(0, "127.0.0.1", resolve));
+ const proxy = {
+ ice: {
+ ...ice,
+ urls: `turn:127.0.0.1:${front.address().port}?transport=udp`,
+ },
+ count: () => ({ bytes, packets }),
+ close() {
+ if (closed) return;
+ closed = true;
+ for (const timer of timers) clearTimeout(timer);
+ front.close();
+ for (const socket of sockets.values()) socket.close();
+ proxies.delete(proxy);
+ },
+ };
+ proxies.add(proxy);
+ return proxy;
+}
+
+try {
+ execFileSync(
+ "npm",
+ [
+ "install",
+ "--prefix",
+ scratch,
+ "--ignore-scripts",
+ "--no-audit",
+ "--no-fund",
+ ],
+ { stdio: "ignore", timeout: 120_000 },
+ );
+ turn = fork(
+ path.join(root, "scripts/peer-transfer-turn-fixture.cjs"),
+ [path.join(scratch, "node_modules/node-turn")],
+ {
+ stdio: ["ignore", "ignore", "ignore", "ipc"],
+ env: { ...process.env, CINDY_PEER_TEST_DIAG: diagnose ? "1" : "0" },
+ },
+ );
+ const ice = await new Promise((resolve, reject) => {
+ const timer = setTimeout(
+ () => reject(new Error("TURN startup timed out")),
+ 10_000,
+ );
+ turn.once("message", (value) => {
+ clearTimeout(timer);
+ resolve(value);
+ });
+ turn.once("error", (error) => {
+ clearTimeout(timer);
+ reject(error);
+ });
+ turn.once("exit", () => {
+ clearTimeout(timer);
+ reject(new Error("TURN exited"));
+ });
+ });
+ turn.on("message", (value) => {
+ if (value?.diagnostic) console.log(JSON.stringify(value));
+ });
+ const bundle = await build({
+ entryPoints: [
+ path.join(root, "packages/device-link/src/filePeerRuntimeSource.ts"),
+ ],
+ bundle: true,
+ write: false,
+ format: "iife",
+ globalName: "PeerRuntimeSource",
+ });
+ browser = await chromium.launch({
+ executablePath: chrome,
+ headless: true,
+ chromiumSandbox: true,
+ args: diagnose
+ ? [
+ "--enable-logging",
+ "--v=1",
+ `--log-file=${path.join(artifacts, "chrome.log")}`,
+ ]
+ : [],
+ });
+ report.browser = browser.version();
+ const browserCdp = await browser.newBrowserCDPSession();
+ async function resources() {
+ const { processInfo } = await browserCdp.send("SystemInfo.getProcessInfo");
+ const rss = execFileSync(
+ "ps",
+ ["-o", "rss=", "-p", processInfo.map((p) => p.id).join(",")],
+ { encoding: "utf8" },
+ )
+ .trim()
+ .split(/\s+/)
+ .reduce((sum, n) => sum + Number(n), 0);
+ return {
+ cpu: Object.fromEntries(processInfo.map((p) => [p.id, p.cpuTime])),
+ rssKiB: rss,
+ };
+ }
+ async function idleSample(page, label, seconds, proxy) {
+ console.log(`Idle sample: ${label}, ${seconds}s`);
+ const before = await resources(),
+ wire = proxy?.count(),
+ start = performance.now();
+ if (label === "connected-idle" && process.argv.includes("--diagnose")) {
+ for (let elapsed = 0; elapsed < seconds; elapsed += 10) {
+ await sleep(Math.min(10, seconds - elapsed) * 1000);
+ console.log(
+ JSON.stringify(
+ await page.evaluate(async () =>
+ Promise.all(
+ window.peerStats.map(async (pc) => {
+ const rows = [];
+ (await pc.getStats()).forEach((r) => {
+ if (r.type === "candidate-pair" && r.nominated)
+ rows.push({
+ requestsSent: r.requestsSent,
+ responsesReceived: r.responsesReceived,
+ requestsReceived: r.requestsReceived,
+ responsesSent: r.responsesSent,
+ consentRequestsSent: r.consentRequestsSent,
+ });
+ });
+ return {
+ ice: pc.iceConnectionState,
+ state: pc.connectionState,
+ rows,
+ };
+ }),
+ ),
+ ),
+ ),
+ );
+ }
+ } else await sleep(seconds * 1000);
+ const after = await resources(),
+ endWire = proxy?.count();
+ const elapsedMs = performance.now() - start;
+ const cpuSeconds = Object.entries(after.cpu).reduce(
+ (sum, [pid, n]) =>
+ sum +
+ (before.cpu[pid] === undefined ? 0 : Math.max(0, n - before.cpu[pid])),
+ 0,
+ );
+ const result = {
+ label,
+ elapsedMs,
+ cpuSeconds,
+ cpuPercentOneCore: (cpuSeconds * 100000) / elapsedMs,
+ rssBeforeKiB: before.rssKiB,
+ rssAfterKiB: after.rssKiB,
+ states: await page.evaluate(() => window.iceEvents),
+ ...(wire
+ ? {
+ udpBytes: endWire.bytes - wire.bytes,
+ udpPackets: endWire.packets - wire.packets,
+ }
+ : {}),
+ };
+ console.log(JSON.stringify(result));
+ return result;
+ }
+ for (const scenario of [
+ { name: "direct-loopback", delay: null },
+ { name: "turn-loopback", delay: 0 },
+ { name: "turn-delayed", delay: 75 },
+ ]) {
+ if (selectedScenario && selectedScenario !== scenario.name) continue;
+ console.log(`Scenario: ${scenario.name}`);
+ const proxy =
+ scenario.delay === null ? null : await proxyTurn(ice, scenario.delay);
+ const page = await browser.newPage();
+ page.setDefaultTimeout(120_000);
+ await page.addScriptTag({ content: bundle.outputFiles[0].text });
+ await page.addScriptTag({
+ content: await page.evaluate(
+ () => PeerRuntimeSource.FILE_PEER_RUNTIME_SOURCE,
+ ),
+ });
+ await page.evaluate(
+ ({ iceServers, relay }) => {
+ window.iceEvents = [];
+ window.peerStats = [];
+ let serial = 0;
+ const Native = RTCPeerConnection;
+ window.RTCPeerConnection = class extends Native {
+ constructor(config) {
+ super(relay ? { ...config, iceTransportPolicy: "relay" } : config);
+ window.peerStats.push(this);
+ const id = ++serial;
+ this.addEventListener("connectionstatechange", () =>
+ window.iceEvents.push({
+ id,
+ time: performance.now(),
+ state: this.connectionState,
+ }),
+ );
+ }
+ };
+ const ticket = "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa";
+ const chunk = Uint8Array.from({ length: 16384 }, (_, i) => i % 251);
+ const encoded = btoa(String.fromCharCode(...chunk));
+ let size = 0,
+ written = 0,
+ first = null;
+ const write = async (_sink, offset, data) => {
+ if (first === null) first = performance.now();
+ if (offset !== written) throw new Error("offset differs");
+ const bytes = atob(data);
+ for (let i = 0; i < bytes.length; i++)
+ if (bytes.charCodeAt(i) !== chunk[(offset + i) % 16384])
+ throw new Error("bytes differ");
+ written += bytes.length;
+ };
+ const host = CindyFilePeerRuntime.createFilePeerRuntime({
+ read: async (_id, t, offset) => {
+ if (t !== ticket) throw new Error("ticket differs");
+ return offset === size ? "" : encoded;
+ },
+ write: async () => {
+ throw new Error("unexpected host write");
+ },
+ invoke: async (_id, payload) => payload,
+ });
+ const client = CindyFilePeerRuntime.createFilePeerRuntime({
+ read: async () => {
+ throw new Error("unexpected client read");
+ },
+ write,
+ writeBatch: write,
+ });
+ let generation = 0,
+ clientId,
+ hostId;
+ window.bench = {
+ async connect() {
+ clientId = `client-${++generation}`;
+ hostId = `host-${generation}`;
+ const start = performance.now();
+ const sdp = await client.offer(clientId, iceServers, true);
+ await client.answer(
+ clientId,
+ await host.accept(hostId, iceServers, sdp),
+ );
+ return performance.now() - start;
+ },
+ async transfer(bytes) {
+ size = bytes;
+ written = 0;
+ first = null;
+ const start = performance.now();
+ await client.receive(clientId, ticket, size, "sink");
+ if (written !== size) throw new Error("size differs");
+ return {
+ firstWriteMs: first - start,
+ transferMs: performance.now() - start,
+ bytes,
+ };
+ },
+ stats: async () => JSON.parse(await client.stats(clientId)),
+ close() {
+ client.close(clientId);
+ host.close(hostId);
+ },
+ };
+ },
+ { iceServers: proxy ? [proxy.ice] : [], relay: !!proxy },
+ );
+ const result = {
+ name: scenario.name,
+ proxyDelayPerDirectionMs: scenario.delay,
+ transfers: [],
+ idle: [],
+ };
+ report.scenarios.push(result);
+ if (!transfersOnly && (idleOnly || scenario.delay === 75))
+ result.idle.push(
+ await idleSample(page, "disconnected-before", diagnose ? 1 : 60, proxy),
+ );
+ // Alternate independent cold/warm pairs; never serve bytes from a file cache.
+ for (const bytes of idleOnly ? [] : [256 * 1024, 4 * 1024 * 1024])
+ for (let i = 0; i < 5; i++) {
+ const setupMs = await page.evaluate(() => bench.connect());
+ const cold = await page.evaluate(
+ (bytes) => bench.transfer(bytes),
+ bytes,
+ );
+ const warm = await page.evaluate(
+ (bytes) => bench.transfer(bytes),
+ bytes,
+ );
+ const stats = await page.evaluate(() => bench.stats());
+ if (stats.path !== (proxy ? "relay" : "direct"))
+ throw new Error("Unexpected ICE path");
+ result.transfers.push({
+ repeat: i,
+ bytes,
+ setupMs,
+ cold: {
+ ...cold,
+ totalMs: setupMs + cold.transferMs,
+ firstWriteIncludingSetupMs: setupMs + cold.firstWriteMs,
+ },
+ warm,
+ rttMs: stats.rttMs,
+ });
+ console.log(
+ JSON.stringify({
+ scenario: scenario.name,
+ ...result.transfers.at(-1),
+ }),
+ );
+ await page.evaluate(() => bench.close());
+ }
+ if (!transfersOnly && (idleOnly || scenario.delay === 75)) {
+ await page.evaluate(() => bench.connect());
+ result.beforeIdle = await page.evaluate(() => bench.stats());
+ await sleep(5000);
+ result.idle.push(
+ await idleSample(page, "connected-idle", idleSeconds, proxy),
+ );
+ result.afterIdle = await page.evaluate(async () => ({
+ transfer: await bench.transfer(262144),
+ stats: await bench.stats(),
+ }));
+ await page.evaluate(() => bench.close());
+ await sleep(5000);
+ result.idle.push(
+ await idleSample(page, "disconnected-after", diagnose ? 1 : 60, proxy),
+ );
+ }
+ await page.close();
+ proxy?.close();
+ await writeFile(
+ path.join(artifacts, "report.json"),
+ JSON.stringify(report, null, 2),
+ );
+ }
+ report.status = "passed";
+} catch (error) {
+ report.status = "failed";
+ report.error = String(error);
+ process.exitCode = 1;
+} finally {
+ await abort();
+ await rm(scratch, { recursive: true, force: true });
+ report.finishedAt = new Date().toISOString();
+ await writeFile(
+ path.join(artifacts, "report.json"),
+ JSON.stringify(report, null, 2),
+ );
+ console.log(
+ `Report: ${path.join(artifacts, "report.json")} (${report.status})`,
+ );
+}
diff --git a/scripts/peer-transfer-turn-fixture.cjs b/scripts/peer-transfer-turn-fixture.cjs
index 22fa809709..436d74772b 100644
--- a/scripts/peer-transfer-turn-fixture.cjs
+++ b/scripts/peer-transfer-turn-fixture.cjs
@@ -13,9 +13,33 @@ probe.bind(0, '127.0.0.1', () => {
authMech: 'long-term', credentials: { [username]: credential },
realm: 'cindy-acceptance.invalid', debugLevel: 'OFF',
});
+ // node-turn 0.0.6 omits integrity on CHANNEL-BIND success. Chromium keeps
+ // retrying the binding and destroys the allocation after ~40s, even while
+ // ICE consent checks succeed. Fix only the isolated test server's response.
+ server.prependListener('channel_bind', (_msg, reply) => reply.addAttribute('message-integrity'));
+ // The pinned fixture's refresh handler uses these historical property names.
+ server.defaultLifetime = server.defaultAllocatetLifetime;
+ server.maxAllocateTimeout = server.maxAllocateLifetime;
server.start();
+ if (process.env.CINDY_PEER_TEST_DIAG === '1') {
+ for (const type of ['allocate', 'refresh', 'channel_bind', 'create_permission'])
+ server.on(type, msg => process.send({ diagnostic: type, time: Date.now(), lifetime: msg.getAttribute('lifetime') }));
+ }
// This pinned test dependency has no public ready event.
for (const socket of server.network.sockets) {
+ // Its listening socket only parses STUN, despite advertising channel binding.
+ // Supply UDP ChannelData forwarding for authenticated, live bindings only.
+ const stun = socket.listeners('message')[0];
+ socket.removeListener('message', stun);
+ socket.on('message', (data, remote) => {
+ if (data.length < 4 || (data[0] & 0xc0) !== 0x40) return stun(data, remote);
+ const allocation = server.allocations[`UDP://${remote.address}:${remote.port}>127.0.0.1:${port}`];
+ const peer = allocation?.channelBindings[data.readUInt16BE(0)];
+ const length = data.readUInt16BE(2);
+ if (!peer || allocation.timeToExpiry <= Date.now() || allocation.permissions[peer.address] <= Date.now()
+ || !allocation.permissions[peer.address] || length > data.length - 4 || data.length - 4 - length > 3) return;
+ allocation.sockets[0].send(data.subarray(4, 4 + length), peer.port, peer.address);
+ });
socket.once('error', () => process.exit(1));
socket.once('listening', () => process.send({
urls: `turn:127.0.0.1:${port}?transport=udp`, username, credential,