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。

chore(device-link): 远程文件直传加每秒网络与进度诊断日志 (#5284)

Lizic714f290f4f2
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 08939177d1..2c47b6f18d 100644
--- a/apps/desktop/src/main/device-link/__tests__/filePeer.test.ts
+++ b/apps/desktop/src/main/device-link/__tests__/filePeer.test.ts
@@ -10,6 +10,7 @@ const mock = vi.hoisted(() => ({
iceConfig: vi.fn(async () => []),
ready: vi.fn(async () => {}),
replyDelay: 0,
+ sent: [] as string[],
commandReply: vi.fn((_action: string) => 'v=0'),
now: undefined as number | undefined,
receiving: undefined as undefined | { sink: string; reply: () => void },
@@ -46,6 +47,7 @@ vi.mock('../../remote-desktop/captureWindow', () => ({
isDestroyed: () => false,
send: (_channel: string, id: string, c: { action: string; sink?: string }) => {
if (c.action !== 'close') {
+ mock.sent.push(c.action);
const reply = () =>
mock.handlers.get('file-peer:host:reply')!({}, id, true, mock.commandReply(c.action));
if (c.action === 'receive') {
@@ -229,6 +231,7 @@ describe('authorized file peer source', () => {
mock.current = true;
mock.receiving = undefined;
mock.now = undefined;
+ mock.sent.length = 0;
mock.iceConfig.mockReset().mockResolvedValue([]);
mock.ready.mockReset().mockResolvedValue();
mock.replyDelay = 0;
@@ -455,4 +458,96 @@ describe('authorized file peer source', () => {
vi.useRealTimers();
}
});
+ it('samples send progress without renewing the idle deadline and stops with the connection', async () => {
+ vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout', 'setInterval', 'clearInterval'] });
+ try {
+ const { connection } = await connect();
+ const { ticket } = await open(connection);
+ mock.commandReply.mockClear();
+ await vi.advanceTimersByTimeAsync(3_000);
+ const samples = () => mock.commandReply.mock.calls.filter(([action]) => action === 'stats');
+ expect(samples().length).toBeGreaterThanOrEqual(3);
+ await vi.advanceTimersByTimeAsync(58_000);
+ await expect(read(connection, ticket, 0)).rejects.toThrow('FILE_PEER_BLOCK');
+ mock.commandReply.mockClear();
+ await vi.advanceTimersByTimeAsync(5_000);
+ expect(samples()).toHaveLength(0);
+ } finally {
+ vi.useRealTimers();
+ }
+ });
+ it('keeps a transfer usable when a diagnostics stats probe stalls', async () => {
+ vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout', 'setInterval', 'clearInterval'] });
+ try {
+ const { connection } = await connect();
+ mock.replyDelay = 20_000;
+ const { ticket } = await open(connection);
+ await vi.advanceTimersByTimeAsync(6_000);
+ expect(await read(connection, ticket, 0)).toBe(Buffer.from('hello').toString('base64'));
+ expect(await read(connection, ticket, 5)).toBe('');
+ expect((await open(connection)).ticket).toEqual(expect.any(String));
+ } finally {
+ vi.useRealTimers();
+ }
+ });
+ it('keeps sampling after a failed stats probe while the transfer runs', async () => {
+ vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout', 'setInterval', 'clearInterval'] });
+ try {
+ const { connection } = await connect();
+ // Every stats reply stalls past the 5s probe budget: each sample times out.
+ mock.replyDelay = 20_000;
+ const { ticket } = await open(connection);
+ await vi.advanceTimersByTimeAsync(30_000);
+ // A transient stats failure skips one sample instead of silencing the rest
+ // of the transfer: probes keep flowing (old code sent exactly two).
+ expect(mock.sent.filter((action) => action === 'stats').length).toBeGreaterThanOrEqual(5);
+ expect(await read(connection, ticket, 0)).toBe(Buffer.from('hello').toString('base64'));
+ } finally {
+ vi.useRealTimers();
+ }
+ });
+ it('does not let transfer chunks stretch a stalled stats probe past its budget', async () => {
+ vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout', 'setInterval', 'clearInterval'] });
+ try {
+ await truncate(file, 100_000);
+ mock.resolve.mockResolvedValue({ absPath: file, mimeType: 'text/plain', maxBytes: 100_000 });
+ const { connection } = await connect();
+ mock.replyDelay = 20_000;
+ const { ticket, size } = await open(connection);
+ expect(size).toBe(100_000);
+ // Chunks keep arriving well within 5s; a shared timer would let them refresh
+ // the stalled probe forever and skip every later sample.
+ for (let offset = 0; ; offset += 16_384) {
+ await vi.advanceTimersByTimeAsync(3_000);
+ const base64 = await read(connection, ticket, Math.min(offset, size));
+ if (!base64) break;
+ }
+ expect(mock.sent.filter((action) => action === 'stats').length).toBeGreaterThanOrEqual(4);
+ } finally {
+ vi.useRealTimers();
+ }
+ });
+ it('attributes channel drain to one file at a time', async () => {
+ vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout', 'setInterval', 'clearInterval'] });
+ try {
+ mock.commandReply.mockImplementation((action) =>
+ action === 'stats' ? JSON.stringify({ channel: { bufferedAmount: 5 } }) : 'v=0',
+ );
+ const { connection } = await connect();
+ const first = await open(connection);
+ await vi.advanceTimersByTimeAsync(1_000);
+ expect(await read(connection, first.ticket, 0)).toBe(Buffer.from('hello').toString('base64'));
+ expect(await read(connection, first.ticket, 5)).toBe('');
+ // The first file is still draining (bufferedAmount stays above zero) when the
+ // next transfer starts and owns the channel buffer.
+ await vi.advanceTimersByTimeAsync(1_000);
+ await open(connection);
+ mock.sent.length = 0;
+ await vi.advanceTimersByTimeAsync(3_000);
+ // Only the new file samples now; a superseded drain monitor would double the rate.
+ expect(mock.sent.filter((action) => action === 'stats').length).toBeLessThanOrEqual(4);
+ } finally {
+ vi.useRealTimers();
+ }
+ });
});
diff --git a/apps/desktop/src/main/device-link/filePeer.ts b/apps/desktop/src/main/device-link/filePeer.ts
index ef885b2e28..6075a1b092 100644
--- a/apps/desktop/src/main/device-link/filePeer.ts
+++ b/apps/desktop/src/main/device-link/filePeer.ts
@@ -89,10 +89,132 @@ const replies = new Map<
resolve(value?: string): void;
reject(error: Error): void;
timer: ReturnType<typeof setTimeout>;
+ /** Diagnostics probe: transfer progress must never refresh its timeout. */
+ probe?: boolean;
}
>();
const host = new DesktopCaptureWindow(() => stopFilePeers(), 'files');
let starting: Promise<void> | null = null;
+/** Transfers slower than one sample interval log runtime stats once per interval. */
+const PROGRESS_SAMPLE_MS = 1_000;
+/** After EOF, keep sampling until the data channel buffer drains, at most this long. */
+const DRAIN_SAMPLE_MS = 30_000;
+const monitors = new Map<string, { connection: string; stop(): void }>();
+
+/**
+ * Diagnostics-only stats probe. Unlike command(), it neither renews the idle timer nor
+ * stops the connection on timeout, and its pending entry is marked `probe` so transfer
+ * chunks cannot stretch the 5s budget. Sampling can neither keep alive nor break a
+ * transfer.
+ */
+function probeStats(connection: string): Promise<string | null> {
+ if (!connections.has(connection) || !host.contents || host.contents.isDestroyed())
+ return Promise.resolve(null);
+ return new Promise((resolve) => {
+ const id = randomUUID();
+ const timer = setTimeout(() => {
+ replies.delete(id);
+ resolve(null);
+ }, 5_000);
+ timer.unref();
+ replies.set(id, {
+ connection,
+ resolve: (value) => resolve(value ?? null),
+ reject: () => resolve(null),
+ timer,
+ probe: true,
+ });
+ try {
+ host.contents!.send(FILE_PEER_LOCAL.COMMAND, id, { action: 'stats', connection });
+ } catch {
+ replies.delete(id);
+ clearTimeout(timer);
+ resolve(null);
+ }
+ });
+}
+function bufferedAmountOf(stats: string | null): number | null {
+ try {
+ const value = stats ? JSON.parse(stats)?.channel?.bufferedAmount : undefined;
+ return typeof value === 'number' ? value : null;
+ } catch {
+ return null;
+ }
+}
+function startMonitor(key: string, connection: string, sample: () => Promise<boolean>) {
+ monitors.get(key)?.stop();
+ let busy = false;
+ const timer = setInterval(() => {
+ if (busy) return;
+ busy = true;
+ void sample()
+ .then((keep) => {
+ if (!keep) stop();
+ }, stop)
+ .finally(() => {
+ busy = false;
+ });
+ }, PROGRESS_SAMPLE_MS);
+ timer.unref();
+ const stop = () => {
+ clearInterval(timer);
+ if (monitors.get(key)?.stop === stop) monitors.delete(key);
+ };
+ monitors.set(key, { connection, stop });
+ return stop;
+}
+/** Host → controller send: progress while reading, then SCTP buffer drain after EOF. */
+function monitorSend(ticket: string, s: Source) {
+ const tag = `conn=${short(s.connection)}`;
+ // Only one file drains a connection at a time: bufferedAmount covers the whole
+ // channel, so a previous file's monitor cannot attribute the next transfer's
+ // buffered bytes once its send starts.
+ for (const [key, monitor] of [...monitors])
+ if (key.startsWith('send:') && monitor.connection === s.connection) {
+ log.debug(`send drain superseded ${tag} ticket=${short(ticket)}`);
+ monitor.stop();
+ }
+ void probeStats(s.connection).then((stats) =>
+ log.debug(`send start ${tag} size=${s.size} stats=${stats ?? 'unavailable'}`),
+ );
+ let eofAt: number | undefined;
+ startMonitor(`send:${ticket}`, s.connection, async () => {
+ if (sources.get(ticket) !== s) {
+ // Closed before EOF: stopConnection already logged the unfinished byte count.
+ if (s.offset < s.size || !connections.has(s.connection)) return false;
+ eofAt ??= Date.now();
+ }
+ const stats = await probeStats(s.connection);
+ const now = Date.now();
+ if (!stats) {
+ // One failed probe skips its sample only; monitoring continues while the
+ // transfer (or the bounded drain phase) is still active.
+ if (eofAt !== undefined && now - eofAt >= DRAIN_SAMPLE_MS) {
+ log.debug(`send drain unobserved ${tag} buffered=unknown afterEofMs=${now - eofAt}`);
+ return false;
+ }
+ return true;
+ }
+ log.debug(
+ `send progress ${tag} sent=${s.offset}/${s.size}B elapsedMs=${now - s.openedAt}` +
+ (eofAt === undefined ? '' : ` afterEofMs=${now - eofAt}`) +
+ ` stats=${stats}`,
+ );
+ if (eofAt === undefined) return true;
+ const buffered = bufferedAmountOf(stats);
+ if (buffered === 0) {
+ log.debug(`send drained ${tag} ms=${now - s.openedAt} afterEofMs=${now - eofAt}`);
+ return false;
+ }
+ if (buffered === null || now - eofAt >= DRAIN_SAMPLE_MS) {
+ log.debug(
+ `send drain unobserved ${tag} buffered=${buffered ?? 'unknown'} afterEofMs=${now - eofAt}`,
+ );
+ return false;
+ }
+ return true;
+ });
+}
function touch(id: string) {
const c = connections.get(id);
@@ -143,6 +265,7 @@ function stopConnection(id: string, reason: string) {
);
else log.debug(`closed ${detail}`);
clearTimeout(c.timer);
+ for (const monitor of [...monitors.values()]) if (monitor.connection === id) monitor.stop();
const out = outgoing.get(c.peer);
if (out?.id === id) {
outgoing.delete(c.peer);
@@ -343,7 +466,7 @@ async function handleFilePeerRequest(
} as Record<string, string>
)[ext] ??
'application/octet-stream';
- sources.set(ticket, {
+ const source: Source = {
connection: r.connection,
file,
size: stat.size,
@@ -351,7 +474,9 @@ async function handleFilePeerRequest(
offset: 0,
busy: false,
openedAt: Date.now(),
- });
+ };
+ sources.set(ticket, source);
+ monitorSend(ticket, source);
return { ticket, size: stat.size, mimeType };
} catch (error) {
await file.close();
@@ -429,9 +554,11 @@ export function registerFilePeerIpc() {
touch(connection);
if (sources.get(ticket) !== s) throw new Error('FILE_PEER_CLOSED');
s.offset += bytes.length;
- // Receive deadlines measure stalled disk/network progress, not total file duration.
+ // Receive deadlines measure stalled disk/network progress, not total file
+ // duration. Diagnostic probes keep their own 5s budget instead: chunk
+ // refreshes must not stretch a stalled getStats() past its timeout.
for (const pending of replies.values())
- if (pending.connection === s.connection) pending.timer.refresh();
+ if (pending.connection === s.connection && !pending.probe) pending.timer.refresh();
if (!bytes.length) {
sources.delete(ticket);
await s.file.close();
@@ -476,9 +603,9 @@ export function registerFilePeerIpc() {
if (written.bytesWritten !== bytes.length || sinks.get(id) !== s)
throw new Error('FILE_PEER_CLOSED');
s.offset += bytes.length;
- // Receive deadlines measure stalled disk/network progress, not total file duration.
+ // Same as READ: transfer progress never refreshes diagnostic probe timers.
for (const pending of replies.values())
- if (pending.connection === s.connection) pending.timer.refresh();
+ if (pending.connection === s.connection && !pending.probe) pending.timer.refresh();
} finally {
s.busy = false;
}
@@ -575,7 +702,7 @@ async function receivePeerFile(
out.remote = remote;
await command({ action: 'answer', connection: id, sdp: r.sdp });
log.debug(
- `connected peer=${short(peer)} setupMs=${Date.now() - startedAt} stats=${await command({ action: 'stats', connection: id })}`,
+ `connected peer=${short(peer)} setupMs=${Date.now() - startedAt} stats=${(await probeStats(id)) ?? 'unavailable'}`,
);
}
step = 'open';
@@ -600,6 +727,16 @@ async function receivePeerFile(
sinks.set(sink, { connection: id, file: handle, offset: 0, size: file.size, busy: false });
step = 'receive';
const transferStartedAt = Date.now();
+ 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);
+ log.debug(
+ `receive progress peer=${short(peer)} conn=${short(id)} written=${sinks.get(sink)?.offset ?? '?'}/${file.size}B elapsedMs=${Date.now() - transferStartedAt} stats=${stats}`,
+ );
+ return sinks.has(sink);
+ });
try {
await command({
action: 'receive',
@@ -615,6 +752,7 @@ async function receivePeerFile(
)
throw new Error('FILE_PEER_SIZE');
} finally {
+ stopProgress();
sinks.delete(sink);
await handle.close().catch(() => {});
}
diff --git a/apps/mobile/app/files/preview/[sessionId].tsx b/apps/mobile/app/files/preview/[sessionId].tsx
index 20e05bf8ea..b227e2d20f 100644
--- a/apps/mobile/app/files/preview/[sessionId].tsx
+++ b/apps/mobile/app/files/preview/[sessionId].tsx
@@ -453,11 +453,34 @@ export default function RemoteFilePreviewScreen() {
(relPath: string): Promise<FileBrowserReadFileResult> =>
withTransientRemoteRetry(async () => {
await openLink(deviceId);
- if (singleAbsPath) {
- const res = await maker.fs.readTextFilePreview(singleAbsPath);
- return adaptTextFilePreviewResult(singleAbsPath, res);
+ const startedAt = Date.now();
+ const channel = singleAbsPath ? 'text-preview' : 'read-file';
+ try {
+ const res = singleAbsPath
+ ? adaptTextFilePreviewResult(singleAbsPath, await maker.fs.readTextFilePreview(singleAbsPath))
+ : await maker.fileBrowser.readFile(workdir, relPath, { acceptGzip: true });
+ // Whole-text reads share the relay with rendered-HTML resource requests; size only.
+ // gzip 回包是压缩数据的 base64,与纯文本字符数分字段记录,避免两种口径混用。
+ mobileDebugLog('debug', 'files', 'preview text read', {
+ channel,
+ ms: Date.now() - startedAt,
+ ...(res.ok
+ ? res.data.contentEncoding === 'gzip'
+ ? { gzip: true, base64Chars: res.data.content.length }
+ : { chars: res.data.content.length }
+ : { code: res.code }),
+ });
+ return res;
+ } catch (error) {
+ // 慢失败同样留痕:抛错触发重试时恰好漏掉最慢的样本。
+ // 走 errorText() 脱敏:错误串可能携带路径或签名 URL,不得进入 files 日志。
+ mobileDebugLog('debug', 'files', 'preview text read failed', {
+ channel,
+ ms: Date.now() - startedAt,
+ error: errorText(error),
+ });
+ throw error;
}
- return maker.fileBrowser.readFile(workdir, relPath, { acceptGzip: true });
}),
[deviceId, maker, openLink, singleAbsPath, workdir],
);
diff --git a/apps/mobile/src/device-link/peerFileTransport.tsx b/apps/mobile/src/device-link/peerFileTransport.tsx
index 616f73be53..5dcdac0d2b 100644
--- a/apps/mobile/src/device-link/peerFileTransport.tsx
+++ b/apps/mobile/src/device-link/peerFileTransport.tsx
@@ -22,7 +22,7 @@ import {
} from "@cindy/device-link";
import { useAuth } from "@/auth/AuthContext";
import { errorText, nextFileTrace } from "@/debug/fileDiagnostics";
-import { mobileDebugLog } from "@/debug/mobileDebugLog";
+import { mobileDebugEnabled, mobileDebugLog } from "@/debug/mobileDebugLog";
import { useDeviceLink } from "./DeviceLinkContext";
import {
DEVICE_LINK_API_BASE_URL,
@@ -42,6 +42,21 @@ 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;
+/**
+ * Diagnostics probe budget, independent of the generic 15s command timeout: a stalled
+ * runtime.stats() voids one sample only and never blocks later sampling ticks.
+ */
+const PROBE_BUDGET_MS = 5000;
+/** Runtime stats are counters and candidate kinds only; unparsable replies stay out of logs. */
+function parseTransportStats(raw: unknown): unknown {
+ try {
+ return typeof raw === "string" ? JSON.parse(raw) : null;
+ } catch {
+ return null;
+ }
+}
const html = `<!doctype html><meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'unsafe-inline'; connect-src 'none';"><script>
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}));});}
@@ -230,6 +245,8 @@ export function PeerFileTransport() {
const startedAt = Date.now();
let step = "link";
let received = 0;
+ // Latest in-flight sample, attached to the outcome log of slow transfers.
+ let lastProgress: Record<string, unknown> | undefined;
// Distinguishes a transport/view reset (no upload fallback) from ordinary failures.
const cancelReason = () =>
signal?.aborted
@@ -332,7 +349,10 @@ export function PeerFileTransport() {
mobileDebugLog("debug", "files", "direct transfer connected", {
trace,
ms: Date.now() - startedAt,
- transport: await command("stats", [id]),
+ // Diagnostics must not turn a connected transfer into a fallback.
+ transport: parseTransportStats(
+ await command("stats", [id]).catch(() => null),
+ ),
});
}
if (url === null) {
@@ -365,6 +385,45 @@ export function PeerFileTransport() {
target.create();
const handle = target.open();
sinks.current.set(id, { handle, size: file.size, offset: 0 });
+ // Network arrival (runtime/WebRTC counters) vs. disk writes, once per interval.
+ // Only while Debug recording is on: otherwise nothing would consume the sample.
+ let sampling = false;
+ // 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 sampler = setInterval(() => {
+ if (sampling || ended || !current() || !mobileDebugEnabled()) return;
+ sampling = true;
+ // 诊断探针独立短预算:runtime.stats() 卡死只作废本样本(迟到回包同样丢弃),
+ // 不让 15s 通用超时占住采样节拍,否则恰好在异常链路上拿不到任何样本。
+ let settled = false;
+ const budget = setTimeout(() => {
+ if (settled) return;
+ settled = true;
+ sampling = false;
+ }, PROBE_BUDGET_MS);
+ void command("stats", [id])
+ .then((raw) => {
+ if (settled || ended) return;
+ lastProgress = {
+ elapsedMs: Date.now() - transferStartedAt,
+ written: sinks.current.get(id)?.offset ?? null,
+ size: file.size,
+ stats: parseTransportStats(raw),
+ };
+ mobileDebugLog("debug", "files", "direct transfer progress", {
+ trace,
+ ...lastProgress,
+ });
+ })
+ .catch(() => {})
+ .finally(() => {
+ if (settled) return;
+ settled = true;
+ clearTimeout(budget);
+ sampling = false;
+ });
+ }, PROGRESS_SAMPLE_MS);
try {
await command("receive", [id, file.ticket, file.size, id]);
if (
@@ -374,6 +433,8 @@ export function PeerFileTransport() {
)
throw new Error("FILE_PEER_SIZE");
} finally {
+ ended = true;
+ clearInterval(sampler);
received = sinks.current.get(id)?.offset ?? received;
sinks.current.delete(id);
try {
@@ -406,6 +467,7 @@ export function PeerFileTransport() {
bytesPerSecond: Math.round(
(file.size * 1000) / Math.max(1, Date.now() - transferStartedAt),
),
+ lastProgress,
});
return result;
} catch (error) {
@@ -418,6 +480,7 @@ export function PeerFileTransport() {
error: errorText(error),
// Non-null means the read is rejected instead of falling back to upload.
cancelled,
+ lastProgress,
});
if (!current() || signal?.aborted)
throw new Error("FILE_PEER_CANCELLED");
diff --git a/docs/dev-rules/remote-desktop-connectivity.md b/docs/dev-rules/remote-desktop-connectivity.md
index d9389b4138..419f3fc9d0 100644
--- a/docs/dev-rules/remote-desktop-connectivity.md
+++ b/docs/dev-rules/remote-desktop-connectivity.md
@@ -331,6 +331,26 @@ of starting OSS. Cooldown has no background polling and does not stop another
device's connection. Local diagnostics record selected direct/relay path, transport
protocol, RTT, setup time, bytes, transfer time, throughput and fallback stage;
candidate addresses, paths and payloads are not added to these metrics.
+The ICE configuration diagnostic counts TURN URLs by client transport (UDP, TCP, TLS)
+without hosts or credentials.
+Transfers that outlast one second also sample the runtime `stats` once per second on
+both ends (Desktop main log `device-link:filePeer`, Mobile opt-in Debug log): candidate
+kinds and relay protocol, gathered candidate / relay-transport / pair-state counts,
+selected-pair/transport byte and packet counters, bitrate
+estimates, data-channel `bufferedAmount`, and application progress — receiver
+arrived/written bytes, bridge write latency and idle time; sender reads and time spent
+waiting for credit. After EOF the sender keeps sampling until the channel buffer drains
+(at most 30 seconds). Comparing the two ends separates slow network delivery, relay
+loss and receiver-side write stalls. Sampling uses a separate probe that neither renews
+the idle deadline nor closes the connection when it times out
+([filePeer.ts](../../apps/desktop/src/main/device-link/filePeer.ts), tests in
+[filePeer.test.ts](../../apps/desktop/src/main/device-link/__tests__/filePeer.test.ts)).
+A probe that times out only skips its sample — monitoring continues while the transfer
+runs — and transfer chunks never refresh its five-second budget. Even without samples
+the drain phase stays bounded at 30 seconds, and a new transfer on the connection
+supersedes the previous file's drain accounting because `bufferedAmount` covers the
+whole channel.
+Engines expose different stats subsets; missing metrics are omitted, not reported as 0.
Optional `caps.attachments` enables controller-to-host byte staging for Desktop and
Mobile, complementing the existing host-to-controller download path. Staging failure
diff --git a/packages/device-link/src/__tests__/remoteDesktopIceConfig.test.ts b/packages/device-link/src/__tests__/remoteDesktopIceConfig.test.ts
index dda5df1689..a02badb2ed 100644
--- a/packages/device-link/src/__tests__/remoteDesktopIceConfig.test.ts
+++ b/packages/device-link/src/__tests__/remoteDesktopIceConfig.test.ts
@@ -61,6 +61,9 @@ it("reports only safe result categories and counts without altering returned con
elapsedMs: expect.any(Number),
serverCount: 2,
turnUrlCount: 2,
+ turnUdpUrlCount: 1,
+ turnTcpUrlCount: 0,
+ turnTlsUrlCount: 1,
});
for (const [fetch, outcome] of [
[async () => ({ iceServers: [], expiresAt: null }), "empty"],
@@ -78,6 +81,9 @@ it("reports only safe result categories and counts without altering returned con
expect(diagnostic.mock.lastCall?.[0]).toMatchObject({
outcome,
turnUrlCount: 0,
+ turnUdpUrlCount: 0,
+ turnTcpUrlCount: 0,
+ turnTlsUrlCount: 0,
});
}
expect(diagnostic.mock.lastCall?.[0].status).toBe(503);
diff --git a/packages/device-link/src/filePeerRuntime.ts b/packages/device-link/src/filePeerRuntime.ts
index db3fee4b4b..a43ea4127e 100644
--- a/packages/device-link/src/filePeerRuntime.ts
+++ b/packages/device-link/src/filePeerRuntime.ts
@@ -6,6 +6,39 @@ export interface FilePeerRuntimeBridge {
invoke?(connection: string, payload: string): Promise<string>;
}
+/** Diagnostics only: application-level progress of the latest receive on a peer. */
+interface ReceiveProgress {
+ size: number;
+ startedAt: number;
+ received: number;
+ written: number;
+ queued: number;
+ queuedMax: number;
+ granted: number;
+ writes: number;
+ writeMs: number;
+ writeMaxMs: number;
+ lastDataAt: number;
+}
+/** Diagnostics only: application-level progress of the latest files-v2 send on a peer. */
+interface SendProgress {
+ startedAt: number;
+ sent: number;
+ credit: number;
+ reads: number;
+ readMs: number;
+ readMaxMs: number;
+ creditWaitMs: number;
+ waitingSince: number | null;
+}
+interface PeerState {
+ pc: RTCPeerConnection;
+ dc: RTCDataChannel | null;
+ busy: boolean;
+ recv?: ReceiveProgress;
+ send?: SendProgress;
+}
+
/**
* Trusted browser transport, also serialized into Mobile's isolated transport WebView.
* Keep the factory self-contained: no credentials, paths, imports or user HTML enter it.
@@ -20,10 +53,7 @@ function rpcTimeoutMs(value: unknown): number {
}
export function createFilePeerRuntime(bridge: FilePeerRuntimeBridge) {
- const peers = new Map<
- string,
- { pc: RTCPeerConnection; dc: RTCDataChannel | null; busy: boolean }
- >();
+ const peers = new Map<string, PeerState>();
const chunkBytes = 16384;
const maxBytes = 2147483648;
const rpcPeers = new Map<
@@ -160,7 +190,7 @@ export function createFilePeerRuntime(bridge: FilePeerRuntimeBridge) {
function create(id: string, servers: RTCIceServer[]) {
if (peers.has(id) || peers.size >= 4) throw new Error("FILE_PEER_BUSY");
const pc = new RTCPeerConnection({ iceServers: servers });
- const p = { pc, dc: null as RTCDataChannel | null, busy: false };
+ const p: PeerState = { pc, dc: null, busy: false };
peers.set(id, p);
pc.onconnectionstatechange = () => {
if (["failed", "closed", "disconnected"].includes(pc.connectionState))
@@ -243,14 +273,26 @@ export function createFilePeerRuntime(bridge: FilePeerRuntimeBridge) {
while (source && source.credit > 0) {
const current = source;
current.credit--;
+ const readStartedAt = Date.now();
const bytes = decode(
await bridge.read(id, current.ticket, current.offset),
);
if (peers.get(id) !== p || channel.readyState !== "open") return;
channel.send(bytes.buffer);
current.offset += bytes.length;
+ if (p.send) {
+ const ms = Date.now() - readStartedAt;
+ p.send.reads++;
+ p.send.readMs += ms;
+ p.send.readMaxMs = Math.max(p.send.readMaxMs, ms);
+ p.send.sent = current.offset;
+ p.send.credit = current.credit;
+ }
if (!bytes.length) source = undefined;
}
+ // Out of credit before EOF: the receiver has not confirmed enough writes yet.
+ if (source && p.send && p.send.waitingSince === null)
+ p.send.waitingSince = Date.now();
} catch {
close(id);
} finally {
@@ -272,9 +314,26 @@ export function createFilePeerRuntime(bridge: FilePeerRuntimeBridge) {
if (source || !/^[a-f0-9-]{36}$/.test(r.ticket) || r.offset !== 0)
throw new Error();
source = { ticket: r.ticket, offset: 0, credit: r.credit };
+ p.send = {
+ startedAt: Date.now(),
+ sent: 0,
+ credit: r.credit,
+ reads: 0,
+ readMs: 0,
+ readMaxMs: 0,
+ creditWaitMs: 0,
+ waitingSince: null,
+ };
} else {
if (!source || source.credit + r.credit > 64) throw new Error();
source.credit += r.credit;
+ if (p.send) {
+ p.send.credit = source.credit;
+ if (p.send.waitingSince !== null) {
+ p.send.creditWaitMs += Date.now() - p.send.waitingSince;
+ p.send.waitingSince = null;
+ }
+ }
}
void pump();
} catch {
@@ -391,6 +450,20 @@ export function createFilePeerRuntime(bridge: FilePeerRuntimeBridge) {
let ended = false,
settled = false;
let writes = Promise.resolve();
+ const progress: ReceiveProgress = {
+ size,
+ startedAt: Date.now(),
+ received: 0,
+ written: 0,
+ queued: 0,
+ queuedMax: 0,
+ granted,
+ writes: 0,
+ writeMs: 0,
+ writeMaxMs: 0,
+ lastDataAt: 0,
+ };
+ p.recv = progress;
let timer = setTimeout(
() => done(new Error("FILE_PEER_TIMEOUT")),
60000,
@@ -422,13 +495,22 @@ export function createFilePeerRuntime(bridge: FilePeerRuntimeBridge) {
}
received += bytes.length;
ended = bytes.length === 0;
+ progress.received = received;
+ 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));
@@ -436,6 +518,12 @@ export function createFilePeerRuntime(bridge: FilePeerRuntimeBridge) {
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")),
@@ -446,6 +534,7 @@ export function createFilePeerRuntime(bridge: FilePeerRuntimeBridge) {
const credit = Math.min(32, blocks - granted);
dc!.send(JSON.stringify({ credit }));
granted += credit;
+ progress.granted = granted;
replenished = 0;
}
})
@@ -549,6 +638,57 @@ export function createFilePeerRuntime(bridge: FilePeerRuntimeBridge) {
const remote = selected?.remoteCandidateId
? entries.get(selected.remoteCandidateId)
: undefined;
+ // Diagnostics beyond the original four fields: counters, candidate kinds and
+ // application progress only. Addresses, ports, URLs and payloads never leave here.
+ // Engines expose different subsets; absent metrics are omitted, never reported as 0.
+ const pick = (
+ source: Record<string, unknown> | undefined,
+ keys: string[],
+ ) => {
+ if (!source) return undefined;
+ const out: Record<string, number | string> = {};
+ for (const key of keys) {
+ const value = source[key];
+ if (typeof value === "number" && Number.isFinite(value))
+ out[key] = Math.round(value);
+ else if (typeof value === "string" && value.length <= 32)
+ out[key] = value;
+ }
+ return Object.keys(out).length ? out : undefined;
+ };
+ let transport: Record<string, unknown> | undefined;
+ let channel: Record<string, unknown> | undefined;
+ // Gathered candidate kinds and pair states explain why ICE settled on relay.
+ const count = (bucket: Record<string, number>, key: unknown) => {
+ const name =
+ typeof key === "string" && key.length <= 16 ? key : "other";
+ bucket[name] = (bucket[name] ?? 0) + 1;
+ };
+ const candidates = {
+ local: {} as Record<string, number>,
+ remote: {} as Record<string, number>,
+ pairs: {} as Record<string, number>,
+ // Client→TURN transport of each gathered relay candidate (udp / tcp / tls).
+ localRelay: {} as Record<string, number>,
+ };
+ report.forEach((entry) => {
+ if (entry.type === "transport" && entry.selectedCandidatePairId)
+ transport = entry;
+ if (entry.type === "data-channel" && entry.label === p.dc?.label)
+ channel = entry;
+ if (entry.type === "local-candidate") {
+ count(candidates.local, entry.candidateType);
+ if (entry.candidateType === "relay")
+ count(candidates.localRelay, entry.relayProtocol);
+ }
+ if (entry.type === "remote-candidate")
+ count(candidates.remote, entry.candidateType);
+ if (entry.type === "candidate-pair")
+ count(candidates.pairs, entry.state);
+ });
+ const now = Date.now();
+ const recv = p.recv;
+ const send = p.send;
return JSON.stringify({
path: !selected
? "unknown"
@@ -562,6 +702,70 @@ export function createFilePeerRuntime(bridge: FilePeerRuntimeBridge) {
? Math.round(selected.currentRoundTripTime * 1000)
: null,
streaming: p.dc?.label === "files-v2",
+ local: pick(local, [
+ "candidateType",
+ "protocol",
+ "relayProtocol",
+ "networkType",
+ ]),
+ remote: pick(remote, ["candidateType", "protocol"]),
+ candidates,
+ pair: pick(selected as Record<string, unknown> | undefined, [
+ "state",
+ "bytesSent",
+ "bytesReceived",
+ "packetsSent",
+ "packetsReceived",
+ "packetsDiscardedOnSend",
+ "availableOutgoingBitrate",
+ "availableIncomingBitrate",
+ "requestsSent",
+ "responsesReceived",
+ "consentRequestsSent",
+ ]),
+ transport: pick(transport, [
+ "dtlsState",
+ "bytesSent",
+ "bytesReceived",
+ "packetsSent",
+ "packetsReceived",
+ "selectedCandidatePairChanges",
+ ]),
+ channel: {
+ ...pick(channel, [
+ "messagesSent",
+ "bytesSent",
+ "messagesReceived",
+ "bytesReceived",
+ ]),
+ bufferedAmount: p.dc?.bufferedAmount,
+ },
+ receive: recv && {
+ size: recv.size,
+ elapsedMs: now - recv.startedAt,
+ received: recv.received,
+ written: recv.written,
+ queued: recv.queued,
+ queuedMax: recv.queuedMax,
+ granted: recv.granted,
+ writes: recv.writes,
+ writeAvgMs: recv.writes
+ ? Math.round(recv.writeMs / recv.writes)
+ : null,
+ writeMaxMs: recv.writeMaxMs,
+ idleMs: recv.lastDataAt ? now - recv.lastDataAt : null,
+ },
+ send: send && {
+ elapsedMs: now - send.startedAt,
+ sent: send.sent,
+ credit: send.credit,
+ reads: send.reads,
+ readAvgMs: send.reads ? Math.round(send.readMs / send.reads) : null,
+ readMaxMs: send.readMaxMs,
+ creditWaitMs:
+ send.creditWaitMs +
+ (send.waitingSince === null ? 0 : now - send.waitingSince),
+ },
});
},
offer,
diff --git a/packages/device-link/src/filePeerRuntimeSource.ts b/packages/device-link/src/filePeerRuntimeSource.ts
index ff0370487e..d8f514636f 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 K=Object.getOwnPropertyDescriptor;var Z=Object.getOwnPropertyNames;var $=Object.prototype.hasOwnProperty;var V=(u,f)=>{for(var L in f)k(u,L,{get:f[L],enumerable:!0})},x=(u,f,L,C)=>{if(f&&typeof f==\"object\"||typeof f==\"function\")for(let m of Z(f))!$.call(u,m)&&m!==L&&k(u,m,{get:()=>f[m],enumerable:!(C=K(f,m))||C.enumerable});return u};var G=u=>x(k({},\"__esModule\",{value:!0}),u);var z={};V(z,{createFilePeerRuntime:()=>Y});function j(u){return Number.isSafeInteger(u)&&u>15e3?Math.min(u,60*6e4):15e3}function Y(u){let f=new Map,L=16384,C=2147483648,m=new Map;function O(e,a){let o=new Map,t=new Map,i=0,n=0,c=(s,r,E)=>{if(E.length>4*1024*1024||a.readyState!==\"open\")throw new Error(\"FILE_PEER_RPC_SIZE\");for(let l=0;l<Math.max(1,E.length);l+=16384)a.send(JSON.stringify({key:s,response:r,data:E.slice(l,l+16384),last:l+16384>=E.length}))},d=()=>{for(let s of o.values())clearTimeout(s.timer),s.reject(new Error(\"FILE_PEER_CLOSED\"));for(let s of t.values())clearTimeout(s.timer);o.clear(),t.clear(),a.close()};a.onclose=d,a.onmessage=({data:s})=>{try{if(typeof s!=\"string\"||s.length>1e5)throw new Error;let r=JSON.parse(s);if(typeof r.key!=\"string\"||!/^\\d{1,12}$/.test(r.key)||typeof r.response!=\"boolean\"||typeof r.last!=\"boolean\"||typeof r.data!=\"string\"||r.data.length>16384)throw new Error;if(r.response&&!o.has(r.key))return;let E=`${r.response}:${r.key}`,l=t.get(E);if(!l){if(t.size>=8)throw new Error;l={data:\"\",timer:setTimeout(()=>w(e),15e3)},t.set(E,l)}if(l.data+=r.data,l.data.length>4*1024*1024)throw new Error;if(!r.last)return;if(clearTimeout(l.timer),t.delete(E),r.response){let g=o.get(r.key);o.delete(r.key),clearTimeout(g.timer),g.resolve(l.data)}else{if(!u.invoke||n>=4)throw new Error;n++,u.invoke(e,l.data).then(g=>{f.has(e)&&c(r.key,!0,g)}).catch(()=>w(e)).finally(()=>{n--})}}catch{w(e)}},m.set(e,{channel:a,close:d,request(s,r){return o.size>=4||a.readyState!==\"open\"?Promise.reject(new Error(\"FILE_PEER_UNAVAILABLE\")):new Promise((E,l)=>{let g=String(++i),h=setTimeout(()=>{o.delete(g),l(new Error(\"FILE_PEER_TIMEOUT\"))},j(r));o.set(g,{resolve:E,reject:l,timer:h});try{c(g,!1,s)}catch(y){o.delete(g),clearTimeout(h),l(y)}})}})}function w(e){let a=m.get(e);m.delete(e),a?.close();let o=f.get(e);f.delete(e),o?.dc?.close(),o?.pc.close()}function M(e,a){if(f.has(e)||f.size>=4)throw new Error(\"FILE_PEER_BUSY\");let o=new RTCPeerConnection({iceServers:a}),t={pc:o,dc:null,busy:!1};return f.set(e,t),o.onconnectionstatechange=()=>{[\"failed\",\"closed\",\"disconnected\"].includes(o.connectionState)&&w(e)},t}async function D(e,a){if(await e.setLocalDescription(a),e.iceGatheringState!==\"complete\"&&await new Promise(o=>{let t=setTimeout(i,4e3);function i(){clearTimeout(t),e.removeEventListener(\"icegatheringstatechange\",n),o()}function n(){e.iceGatheringState===\"complete\"&&i()}e.addEventListener(\"icegatheringstatechange\",n),n()}),!e.localDescription?.sdp||e.signalingState===\"closed\")throw new Error(\"FILE_PEER_CLOSED\");return e.localDescription.sdp}function A(e){if(e.length>22e3||!/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(e))throw new Error(\"FILE_PEER_BLOCK\");let a=atob(e);if(a.length>L)throw new Error(\"FILE_PEER_BLOCK\");return Uint8Array.from(a,o=>o.charCodeAt(0))}async function N(e,a,o=!1){let t=M(e,a);t.dc=t.pc.createDataChannel(o?\"files-v2\":\"files-v1\",{ordered:!0}),t.dc.binaryType=\"arraybuffer\",o&&O(e,t.pc.createDataChannel(\"reads-v1\",{ordered:!0}));try{return await D(t.pc,await t.pc.createOffer())}catch(i){throw w(e),i}}async function U(e,a,o){let t=M(e,a);t.pc.ondatachannel=({channel:i})=>{if(i.label===\"reads-v1\"&&!m.has(e)){O(e,i);return}if(![\"files-v1\",\"files-v2\"].includes(i.label)||t.dc){i.close();return}if(t.dc=i,i.binaryType=\"arraybuffer\",i.label===\"files-v2\"){let n,c=!1,d=async()=>{if(!c){c=!0;try{for(;n&&n.credit>0;){let s=n;s.credit--;let r=A(await u.read(e,s.ticket,s.offset));if(f.get(e)!==t||i.readyState!==\"open\")return;i.send(r.buffer),s.offset+=r.length,r.length||(n=void 0)}}catch{w(e)}finally{c=!1}}};i.onmessage=({data:s})=>{try{if(typeof s!=\"string\"||s.length>256)throw new Error;let r=JSON.parse(s);if(!Number.isSafeInteger(r.credit)||r.credit<1||r.credit>64)throw new Error;if(r.ticket!==void 0){if(n||!/^[a-f0-9-]{36}$/.test(r.ticket)||r.offset!==0)throw new Error;n={ticket:r.ticket,offset:0,credit:r.credit}}else{if(!n||n.credit+r.credit>64)throw new Error;n.credit+=r.credit}d()}catch{w(e)}};return}i.onmessage=async({data:n})=>{try{if(f.get(e)!==t||t.busy||typeof n!=\"string\"||n.length>256)throw new Error(\"FILE_PEER_BLOCK\");let c=JSON.parse(n);if(!/^[a-f0-9-]{36}$/.test(c.ticket)||!Number.isSafeInteger(c.offset)||c.offset<0||c.offset>C||c.credit!==16)throw new Error(\"FILE_PEER_BLOCK\");t.busy=!0;let d=c.offset;for(let s=0;s<16;s++){let r=A(await u.read(e,c.ticket,d));if(f.get(e)!==t||i.readyState!==\"open\")return;if(i.send(r.buffer),d+=r.length,!r.length)break}}catch{w(e)}finally{t.busy=!1}}};try{return await t.pc.setRemoteDescription({type:\"offer\",sdp:o}),await D(t.pc,await t.pc.createAnswer())}catch(i){throw w(e),i}}async function J(e,a){let o=f.get(e);if(!o)throw new Error(\"FILE_PEER_CLOSED\");await o.pc.setRemoteDescription({type:\"answer\",sdp:a}),await Promise.all([o.dc,m.get(e)?.channel].filter(t=>!!t).map(t=>new Promise((i,n)=>{let c=setTimeout(()=>d(new Error(\"FILE_PEER_TIMEOUT\")),8e3);function d(E){clearTimeout(c),t.removeEventListener(\"open\",s),t.removeEventListener(\"close\",r),E?n(E):i()}function s(){d()}function r(){d(new Error(\"FILE_PEER_CLOSED\"))}t.addEventListener(\"open\",s),t.addEventListener(\"close\",r),t.readyState===\"open\"?d():t.readyState===\"closed\"&&r()})))}async function q(e,a,o,t){let i=f.get(e),n=i?.dc;if(!i||!n||n.readyState!==\"open\"||i.busy||!Number.isSafeInteger(o)||o<0||o>C)throw new Error(\"FILE_PEER_UNAVAILABLE\");i.busy=!0;try{if(n.label===\"files-v2\"){await new Promise((d,s)=>{let r=0,E=0,l=0,g=0,h=Math.ceil(o/L)+1,y=Math.min(64,h),I=!1,p=!1,T=Promise.resolve(),S=setTimeout(()=>_(new Error(\"FILE_PEER_TIMEOUT\")),6e4);function _(v){p||(p=!0,clearTimeout(S),n.removeEventListener(\"message\",B),n.removeEventListener(\"close\",F),v?s(v):d())}function F(){_(new Error(\"FILE_PEER_CLOSED\"))}function B(v){if(I||!(v.data instanceof ArrayBuffer)||++l>64){_(new Error(\"FILE_PEER_BLOCK\"));return}let R=new Uint8Array(v.data);if(R.length!==Math.min(L,o-r)){_(new Error(\"FILE_PEER_SIZE\"));return}r+=R.length,I=R.length===0,T=T.then(async()=>{if(p)return;if(!R.length){_();return}let b=\"\";for(let P of R)b+=String.fromCharCode(P);if(await u.write(t,E,btoa(b)),!p){if(f.get(e)!==i)throw new Error(\"FILE_PEER_CLOSED\");if(E+=R.length,l--,clearTimeout(S),S=setTimeout(()=>_(new Error(\"FILE_PEER_TIMEOUT\")),6e4),++g===32&&y<h){let P=Math.min(32,h-y);n.send(JSON.stringify({credit:P})),y+=P,g=0}}}).catch(b=>_(b))}n.addEventListener(\"message\",B),n.addEventListener(\"close\",F);try{n.send(JSON.stringify({ticket:a,offset:0,credit:y}))}catch{F()}});return}let c=0;for(;c<=o;){let d=await new Promise((s,r)=>{let E=[],l=c,g=setTimeout(()=>h(new Error(\"FILE_PEER_TIMEOUT\")),6e4);function h(p){clearTimeout(g),n.removeEventListener(\"message\",I),n.removeEventListener(\"close\",y),p?r(p):s(E)}function y(){h(new Error(\"FILE_PEER_CLOSED\"))}function I(p){if(!(p.data instanceof ArrayBuffer)){h(new Error(\"FILE_PEER_BLOCK\"));return}let T=new Uint8Array(p.data);if(T.length!==Math.min(L,o-l)){h(new Error(\"FILE_PEER_SIZE\"));return}E.push(T),l+=T.length,(!T.length||E.length===16)&&h()}n.addEventListener(\"message\",I),n.addEventListener(\"close\",y);try{n.send(JSON.stringify({ticket:a,offset:c,credit:16}))}catch{y()}});for(let s of d){if(!s.length)return;let r=\"\";for(let E of s)r+=String.fromCharCode(E);if(await u.write(t,c,btoa(r)),f.get(e)!==i)throw new Error(\"FILE_PEER_CLOSED\");c+=s.length}}}catch(c){throw w(e),c}finally{i.busy=!1}}return{async invoke(e,a,o){let t=m.get(e);if(!t)throw new Error(\"FILE_PEER_UNAVAILABLE\");return t.request(a,o)},async stats(e){let a=f.get(e);if(!a)throw new Error(\"FILE_PEER_CLOSED\");let o=await a.pc.getStats(),t=new Map;o.forEach(s=>t.set(s.id,s));let i;o.forEach(s=>{s.type===\"transport\"&&s.selectedCandidatePairId&&(i=t.get(s.selectedCandidatePairId))});let n=i,c=n?.localCandidateId?t.get(n.localCandidateId):void 0,d=n?.remoteCandidateId?t.get(n.remoteCandidateId):void 0;return JSON.stringify({path:n?c?.candidateType===\"relay\"||d?.candidateType===\"relay\"?\"relay\":\"direct\":\"unknown\",protocol:c?.protocol??\"unknown\",rttMs:typeof n?.currentRoundTripTime==\"number\"?Math.round(n.currentRoundTripTime*1e3):null,streaming:a.dc?.label===\"files-v2\"})},offer:N,accept:U,answer:J,receive:q,close:w,dispose:()=>{for(let e of f.keys())w(e)}}}return G(z);})();\n";
+export const FILE_PEER_RUNTIME_SOURCE = "\"use strict\";var CindyFilePeerRuntime=(()=>{var A=Object.defineProperty;var $=Object.getOwnPropertyDescriptor;var W=Object.getOwnPropertyNames;var V=Object.prototype.hasOwnProperty;var j=(p,g)=>{for(var S in g)A(p,S,{get:g[S],enumerable:!0})},z=(p,g,S,P)=>{if(g&&typeof g==\"object\"||typeof g==\"function\")for(let v of W(g))!V.call(p,v)&&v!==S&&A(p,v,{get:()=>g[v],enumerable:!(P=$(g,v))||P.enumerable});return p};var G=p=>z(A({},\"__esModule\",{value:!0}),p);var Q={};j(Q,{createFilePeerRuntime:()=>H});function Y(p){return Number.isSafeInteger(p)&&p>15e3?Math.min(p,60*6e4):15e3}function H(p){let g=new Map,S=16384,P=2147483648,v=new Map;function D(t,d){let s=new Map,e=new Map,c=0,n=0,f=(i,r,l)=>{if(l.length>4*1024*1024||d.readyState!==\"open\")throw new Error(\"FILE_PEER_RPC_SIZE\");for(let o=0;o<Math.max(1,l.length);o+=16384)d.send(JSON.stringify({key:i,response:r,data:l.slice(o,o+16384),last:o+16384>=l.length}))},m=()=>{for(let i of s.values())clearTimeout(i.timer),i.reject(new Error(\"FILE_PEER_CLOSED\"));for(let i of e.values())clearTimeout(i.timer);s.clear(),e.clear(),d.close()};d.onclose=m,d.onmessage=({data:i})=>{try{if(typeof i!=\"string\"||i.length>1e5)throw new Error;let r=JSON.parse(i);if(typeof r.key!=\"string\"||!/^\\d{1,12}$/.test(r.key)||typeof r.response!=\"boolean\"||typeof r.last!=\"boolean\"||typeof r.data!=\"string\"||r.data.length>16384)throw new Error;if(r.response&&!s.has(r.key))return;let l=`${r.response}:${r.key}`,o=e.get(l);if(!o){if(e.size>=8)throw new Error;o={data:\"\",timer:setTimeout(()=>R(t),15e3)},e.set(l,o)}if(o.data+=r.data,o.data.length>4*1024*1024)throw new Error;if(!r.last)return;if(clearTimeout(o.timer),e.delete(l),r.response){let w=s.get(r.key);s.delete(r.key),clearTimeout(w.timer),w.resolve(o.data)}else{if(!p.invoke||n>=4)throw new Error;n++,p.invoke(t,o.data).then(w=>{g.has(t)&&f(r.key,!0,w)}).catch(()=>R(t)).finally(()=>{n--})}}catch{R(t)}},v.set(t,{channel:d,close:m,request(i,r){return s.size>=4||d.readyState!==\"open\"?Promise.reject(new Error(\"FILE_PEER_UNAVAILABLE\")):new Promise((l,o)=>{let w=String(++c),y=setTimeout(()=>{s.delete(w),o(new Error(\"FILE_PEER_TIMEOUT\"))},Y(r));s.set(w,{resolve:l,reject:o,timer:y});try{f(w,!1,i)}catch(u){s.delete(w),clearTimeout(y),o(u)}})}})}function R(t){let d=v.get(t);v.delete(t),d?.close();let s=g.get(t);g.delete(t),s?.dc?.close(),s?.pc.close()}function O(t,d){if(g.has(t)||g.size>=4)throw new Error(\"FILE_PEER_BUSY\");let s=new RTCPeerConnection({iceServers:d}),e={pc:s,dc:null,busy:!1};return g.set(t,e),s.onconnectionstatechange=()=>{[\"failed\",\"closed\",\"disconnected\"].includes(s.connectionState)&&R(t)},e}async function F(t,d){if(await t.setLocalDescription(d),t.iceGatheringState!==\"complete\"&&await new Promise(s=>{let e=setTimeout(c,4e3);function c(){clearTimeout(e),t.removeEventListener(\"icegatheringstatechange\",n),s()}function n(){t.iceGatheringState===\"complete\"&&c()}t.addEventListener(\"icegatheringstatechange\",n),n()}),!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>S)throw new Error(\"FILE_PEER_BLOCK\");return Uint8Array.from(d,s=>s.charCodeAt(0))}async function U(t,d,s=!1){let e=O(t,d);e.dc=e.pc.createDataChannel(s?\"files-v2\":\"files-v1\",{ordered:!0}),e.dc.binaryType=\"arraybuffer\",s&&D(t,e.pc.createDataChannel(\"reads-v1\",{ordered:!0}));try{return await F(e.pc,await e.pc.createOffer())}catch(c){throw R(t),c}}async function J(t,d,s){let e=O(t,d);e.pc.ondatachannel=({channel:c})=>{if(c.label===\"reads-v1\"&&!v.has(t)){D(t,c);return}if(![\"files-v1\",\"files-v2\"].includes(c.label)||e.dc){c.close();return}if(e.dc=c,c.binaryType=\"arraybuffer\",c.label===\"files-v2\"){let n,f=!1,m=async()=>{if(!f){f=!0;try{for(;n&&n.credit>0;){let i=n;i.credit--;let r=Date.now(),l=x(await p.read(t,i.ticket,i.offset));if(g.get(t)!==e||c.readyState!==\"open\")return;if(c.send(l.buffer),i.offset+=l.length,e.send){let o=Date.now()-r;e.send.reads++,e.send.readMs+=o,e.send.readMaxMs=Math.max(e.send.readMaxMs,o),e.send.sent=i.offset,e.send.credit=i.credit}l.length||(n=void 0)}n&&e.send&&e.send.waitingSince===null&&(e.send.waitingSince=Date.now())}catch{R(t)}finally{f=!1}}};c.onmessage=({data:i})=>{try{if(typeof i!=\"string\"||i.length>256)throw new Error;let r=JSON.parse(i);if(!Number.isSafeInteger(r.credit)||r.credit<1||r.credit>64)throw new Error;if(r.ticket!==void 0){if(n||!/^[a-f0-9-]{36}$/.test(r.ticket)||r.offset!==0)throw new Error;n={ticket:r.ticket,offset:0,credit:r.credit},e.send={startedAt:Date.now(),sent:0,credit:r.credit,reads:0,readMs:0,readMaxMs:0,creditWaitMs:0,waitingSince:null}}else{if(!n||n.credit+r.credit>64)throw new Error;n.credit+=r.credit,e.send&&(e.send.credit=n.credit,e.send.waitingSince!==null&&(e.send.creditWaitMs+=Date.now()-e.send.waitingSince,e.send.waitingSince=null))}m()}catch{R(t)}};return}c.onmessage=async({data:n})=>{try{if(g.get(t)!==e||e.busy||typeof n!=\"string\"||n.length>256)throw new Error(\"FILE_PEER_BLOCK\");let f=JSON.parse(n);if(!/^[a-f0-9-]{36}$/.test(f.ticket)||!Number.isSafeInteger(f.offset)||f.offset<0||f.offset>P||f.credit!==16)throw new Error(\"FILE_PEER_BLOCK\");e.busy=!0;let m=f.offset;for(let i=0;i<16;i++){let r=x(await p.read(t,f.ticket,m));if(g.get(t)!==e||c.readyState!==\"open\")return;if(c.send(r.buffer),m+=r.length,!r.length)break}}catch{R(t)}finally{e.busy=!1}}};try{return await e.pc.setRemoteDescription({type:\"offer\",sdp:s}),await F(e.pc,await e.pc.createAnswer())}catch(c){throw R(t),c}}async function K(t,d){let s=g.get(t);if(!s)throw new Error(\"FILE_PEER_CLOSED\");await s.pc.setRemoteDescription({type:\"answer\",sdp:d}),await Promise.all([s.dc,v.get(t)?.channel].filter(e=>!!e).map(e=>new Promise((c,n)=>{let f=setTimeout(()=>m(new Error(\"FILE_PEER_TIMEOUT\")),8e3);function m(l){clearTimeout(f),e.removeEventListener(\"open\",i),e.removeEventListener(\"close\",r),l?n(l):c()}function i(){m()}function r(){m(new Error(\"FILE_PEER_CLOSED\"))}e.addEventListener(\"open\",i),e.addEventListener(\"close\",r),e.readyState===\"open\"?m():e.readyState===\"closed\"&&r()})))}async function Z(t,d,s,e){let c=g.get(t),n=c?.dc;if(!c||!n||n.readyState!==\"open\"||c.busy||!Number.isSafeInteger(s)||s<0||s>P)throw new Error(\"FILE_PEER_UNAVAILABLE\");c.busy=!0;try{if(n.label===\"files-v2\"){await new Promise((m,i)=>{let r=0,l=0,o=0,w=0,y=Math.ceil(s/S)+1,u=Math.min(64,y),h=!1,a=!1,M=Promise.resolve(),E={size:s,startedAt:Date.now(),received:0,written:0,queued:0,queuedMax:0,granted:u,writes:0,writeMs:0,writeMaxMs:0,lastDataAt:0};c.recv=E;let L=setTimeout(()=>b(new Error(\"FILE_PEER_TIMEOUT\")),6e4);function b(I){a||(a=!0,clearTimeout(L),n.removeEventListener(\"message\",q),n.removeEventListener(\"close\",C),I?i(I):m())}function C(){b(new Error(\"FILE_PEER_CLOSED\"))}function q(I){if(h||!(I.data instanceof ArrayBuffer)||++o>64){b(new Error(\"FILE_PEER_BLOCK\"));return}let T=new Uint8Array(I.data);if(T.length!==Math.min(S,s-r)){b(new Error(\"FILE_PEER_SIZE\"));return}r+=T.length,h=T.length===0,E.received=r,E.queued=o,E.queuedMax=Math.max(E.queuedMax,o),E.lastDataAt=Date.now(),M=M.then(async()=>{if(a)return;if(!T.length){o--,E.queued=o,b();return}let k=Date.now(),B=\"\";for(let _ of T)B+=String.fromCharCode(_);if(await p.write(e,l,btoa(B)),a)return;if(g.get(t)!==c)throw new Error(\"FILE_PEER_CLOSED\");l+=T.length,o--;let N=Date.now()-k;if(E.writes++,E.writeMs+=N,E.writeMaxMs=Math.max(E.writeMaxMs,N),E.written=l,E.queued=o,clearTimeout(L),L=setTimeout(()=>b(new Error(\"FILE_PEER_TIMEOUT\")),6e4),++w===32&&u<y){let _=Math.min(32,y-u);n.send(JSON.stringify({credit:_})),u+=_,E.granted=u,w=0}}).catch(k=>b(k))}n.addEventListener(\"message\",q),n.addEventListener(\"close\",C);try{n.send(JSON.stringify({ticket:d,offset:0,credit:u}))}catch{C()}});return}let f=0;for(;f<=s;){let m=await new Promise((i,r)=>{let l=[],o=f,w=setTimeout(()=>y(new Error(\"FILE_PEER_TIMEOUT\")),6e4);function y(a){clearTimeout(w),n.removeEventListener(\"message\",h),n.removeEventListener(\"close\",u),a?r(a):i(l)}function u(){y(new Error(\"FILE_PEER_CLOSED\"))}function h(a){if(!(a.data instanceof ArrayBuffer)){y(new Error(\"FILE_PEER_BLOCK\"));return}let M=new Uint8Array(a.data);if(M.length!==Math.min(S,s-o)){y(new Error(\"FILE_PEER_SIZE\"));return}l.push(M),o+=M.length,(!M.length||l.length===16)&&y()}n.addEventListener(\"message\",h),n.addEventListener(\"close\",u);try{n.send(JSON.stringify({ticket:d,offset:f,credit:16}))}catch{u()}});for(let i of m){if(!i.length)return;let r=\"\";for(let l of i)r+=String.fromCharCode(l);if(await p.write(e,f,btoa(r)),g.get(t)!==c)throw new Error(\"FILE_PEER_CLOSED\");f+=i.length}}}catch(f){throw R(t),f}finally{c.busy=!1}}return{async invoke(t,d,s){let e=v.get(t);if(!e)throw new Error(\"FILE_PEER_UNAVAILABLE\");return e.request(d,s)},async stats(t){let d=g.get(t);if(!d)throw new Error(\"FILE_PEER_CLOSED\");let s=await d.pc.getStats(),e=new Map;s.forEach(a=>e.set(a.id,a));let c;s.forEach(a=>{a.type===\"transport\"&&a.selectedCandidatePairId&&(c=e.get(a.selectedCandidatePairId))});let n=c,f=n?.localCandidateId?e.get(n.localCandidateId):void 0,m=n?.remoteCandidateId?e.get(n.remoteCandidateId):void 0,i=(a,M)=>{if(!a)return;let E={};for(let L of M){let b=a[L];typeof b==\"number\"&&Number.isFinite(b)?E[L]=Math.round(b):typeof b==\"string\"&&b.length<=32&&(E[L]=b)}return Object.keys(E).length?E:void 0},r,l,o=(a,M)=>{let E=typeof M==\"string\"&&M.length<=16?M:\"other\";a[E]=(a[E]??0)+1},w={local:{},remote:{},pairs:{},localRelay:{}};s.forEach(a=>{a.type===\"transport\"&&a.selectedCandidatePairId&&(r=a),a.type===\"data-channel\"&&a.label===d.dc?.label&&(l=a),a.type===\"local-candidate\"&&(o(w.local,a.candidateType),a.candidateType===\"relay\"&&o(w.localRelay,a.relayProtocol)),a.type===\"remote-candidate\"&&o(w.remote,a.candidateType),a.type===\"candidate-pair\"&&o(w.pairs,a.state)});let y=Date.now(),u=d.recv,h=d.send;return JSON.stringify({path:n?f?.candidateType===\"relay\"||m?.candidateType===\"relay\"?\"relay\":\"direct\":\"unknown\",protocol:f?.protocol??\"unknown\",rttMs:typeof n?.currentRoundTripTime==\"number\"?Math.round(n.currentRoundTripTime*1e3):null,streaming:d.dc?.label===\"files-v2\",local:i(f,[\"candidateType\",\"protocol\",\"relayProtocol\",\"networkType\"]),remote:i(m,[\"candidateType\",\"protocol\"]),candidates:w,pair:i(n,[\"state\",\"bytesSent\",\"bytesReceived\",\"packetsSent\",\"packetsReceived\",\"packetsDiscardedOnSend\",\"availableOutgoingBitrate\",\"availableIncomingBitrate\",\"requestsSent\",\"responsesReceived\",\"consentRequestsSent\"]),transport:i(r,[\"dtlsState\",\"bytesSent\",\"bytesReceived\",\"packetsSent\",\"packetsReceived\",\"selectedCandidatePairChanges\"]),channel:{...i(l,[\"messagesSent\",\"bytesSent\",\"messagesReceived\",\"bytesReceived\"]),bufferedAmount:d.dc?.bufferedAmount},receive:u&&{size:u.size,elapsedMs:y-u.startedAt,received:u.received,written:u.written,queued:u.queued,queuedMax:u.queuedMax,granted:u.granted,writes:u.writes,writeAvgMs:u.writes?Math.round(u.writeMs/u.writes):null,writeMaxMs:u.writeMaxMs,idleMs:u.lastDataAt?y-u.lastDataAt:null},send:h&&{elapsedMs:y-h.startedAt,sent:h.sent,credit:h.credit,reads:h.reads,readAvgMs:h.reads?Math.round(h.readMs/h.reads):null,readMaxMs:h.readMaxMs,creditWaitMs:h.creditWaitMs+(h.waitingSince===null?0:y-h.waitingSince)}})},offer:U,accept:J,answer:K,receive:Z,close:R,dispose:()=>{for(let t of g.keys())R(t)}}}return G(Q);})();\n";
diff --git a/packages/device-link/src/remoteDesktopIceConfig.ts b/packages/device-link/src/remoteDesktopIceConfig.ts
index 5229215b49..4910a3ced9 100644
--- a/packages/device-link/src/remoteDesktopIceConfig.ts
+++ b/packages/device-link/src/remoteDesktopIceConfig.ts
@@ -17,6 +17,10 @@ export interface DesktopIceConfigDiagnostic {
elapsedMs: number;
serverCount: number;
turnUrlCount: number;
+ /** TURN URLs by client→relay transport: UDP (default), TCP, TLS (`turns:`). */
+ turnUdpUrlCount: number;
+ turnTcpUrlCount: number;
+ turnTlsUrlCount: number;
status?: number;
}
@@ -132,13 +136,22 @@ export async function resolveDesktopIceServers(
urls: [server.urls],
}));
try {
+ const turnUrls = servers
+ .flatMap((server) => server.urls)
+ .filter((url) => /^turns?:/.test(url));
diagnostic?.({
outcome,
elapsedMs: Math.max(0, Math.round(performance.now() - started)),
serverCount: servers.length,
- turnUrlCount: servers
- .flatMap((server) => server.urls)
- .filter((url) => /^turns?:/.test(url)).length,
+ turnUrlCount: turnUrls.length,
+ turnUdpUrlCount: turnUrls.filter(
+ (url) => url.startsWith("turn:") && !url.endsWith("?transport=tcp"),
+ ).length,
+ turnTcpUrlCount: turnUrls.filter(
+ (url) => url.startsWith("turn:") && url.endsWith("?transport=tcp"),
+ ).length,
+ turnTlsUrlCount: turnUrls.filter((url) => url.startsWith("turns:"))
+ .length,
...(status === undefined ? {} : { status }),
});
} catch {
diff --git a/scripts/file-peer-smoke.mjs b/scripts/file-peer-smoke.mjs
index 67f4f41724..6413fcd63f 100644
--- a/scripts/file-peer-smoke.mjs
+++ b/scripts/file-peer-smoke.mjs
@@ -131,6 +131,34 @@ try {
const ms = Math.max(1, Math.round(performance.now() - start));
transfers.push({ size, ms, bytesPerSecond: Math.round(size * 1000 / ms) });
}
+ let diagnostics = null;
+ if (streaming) {
+ // Progress diagnostics describe the last transfer and carry no addresses or URLs.
+ const last = sizes[sizes.length - 1];
+ const rawReceiver = await client.stats("client");
+ const rawSender = await host.stats("host");
+ if (/"(?:address|ip|port|url|relatedAddress|relatedPort|foundation|usernameFragment)"/.test(rawReceiver + rawSender))
+ throw new Error("stats expose candidate addresses");
+ const receiver = JSON.parse(rawReceiver);
+ const sender = JSON.parse(rawSender);
+ const r = receiver.receive, s = sender.send;
+ if (!r || r.size !== last || r.received !== last || r.written !== last ||
+ r.writes !== Math.ceil(last / 16384) || r.queued !== 0 || !(r.queuedMax >= 1))
+ throw new Error("receive progress differs");
+ if (!s || s.sent !== last || s.reads !== Math.ceil(last / 16384) + 1 || !(s.creditWaitMs >= 0))
+ throw new Error("send progress differs");
+ if (!(receiver.pair?.bytesReceived >= last) || typeof receiver.channel?.bufferedAmount !== "number")
+ throw new Error("transport counters missing");
+ if (receiver.local?.candidateType === undefined || receiver.path !== expectedPath ||
+ !(receiver.candidates?.local?.[receiver.local.candidateType] >= 1) ||
+ !(receiver.candidates?.pairs?.succeeded >= 1) ||
+ typeof receiver.candidates?.localRelay !== "object")
+ throw new Error("candidate kind missing");
+ diagnostics = {
+ receive: r, send: s, pair: receiver.pair, local: receiver.local,
+ candidates: receiver.candidates,
+ };
+ }
sourceSize = 10;
sourceOffset = 0;
outputSize = 0;
@@ -150,6 +178,7 @@ try {
setupMs,
stats,
transfers,
+ diagnostics,
};
} finally {
host.dispose();