Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(device-link): report RTC drain and avoid stale bridge backpressure

Liziceb4e7ca1bbd
diff --git a/packages/device-link/src/__tests__/directRuntimeBridge.test.ts b/packages/device-link/src/__tests__/directRuntimeBridge.test.ts
index d0eab10bbb..fad08197b0 100644
--- a/packages/device-link/src/__tests__/directRuntimeBridge.test.ts
+++ b/packages/device-link/src/__tests__/directRuntimeBridge.test.ts
@@ -1,11 +1,13 @@
import { afterEach, expect, it, vi } from 'vitest';
import { createDirectRuntimeBridge, type DirectRuntimeCommand } from '../directRuntimeBridge.js';
import { DirectLinkNegotiator, parseDirectSignal, type DirectRuntimeEvents } from '../directNegotiation.js';
+import { createDirectRuntimeHost } from '../directRuntimeBridge.js';
+import { createDirectRtcRuntime } from '../directRtcRuntime.js';
// Production bridge/negotiator lifetimes absent from #6825: native queue pressure,
// stale callbacks, pending handshake cancellation and authenticated stream binding.
// Unit tier: in-memory native messages, fake time, no sockets or platform processes.
-afterEach(() => vi.useRealTimers());
+afterEach(() => { vi.useRealTimers(); vi.unstubAllGlobals(); });
const observers = () => ({ open: vi.fn(), message: vi.fn(), drained: vi.fn(), closed: vi.fn() });
it('counts UTF-8 bytes still crossing the native bridge and ignores stale buffer acknowledgements', async () => {
@@ -83,3 +85,52 @@ it('binds incoming negotiation to both current transport streams', async () => {
expect(parseDirectSignal({ action: 'offer', id: 'valid', stream: 'a', targetStream: 'b' })).toBeNull();
controller.clear();
});
+
+it.each(['small-then-large', 'progress-under-pressure'])('reports native RTC drain through the real bridge (%s)', async mode => {
+ vi.useFakeTimers();
+ // A real DataChannel only fires bufferedamountlow when it crosses its threshold.
+ // Model that contract rather than unconditionally notifying on drain.
+ class Channel {
+ label = 'device-link-v1'; ordered = true; maxRetransmits = null; maxPacketLifeTime = null;
+ readyState = 'open'; bufferedAmount = 0; bufferedAmountLowThreshold = 0;
+ onopen?: () => void; onclose?: () => void; onbufferedamountlow?: () => void;
+ send(bytes: ArrayBuffer) { this.bufferedAmount += bytes.byteLength; }
+ drain(amount = 0) {
+ const previous = this.bufferedAmount; this.bufferedAmount = amount;
+ if (previous > this.bufferedAmountLowThreshold && amount <= this.bufferedAmountLowThreshold) this.onbufferedamountlow?.();
+ }
+ close() { this.readyState = 'closed'; this.onclose?.(); }
+ }
+ const channel = new Channel();
+ vi.stubGlobal('RTCPeerConnection', class {
+ iceGatheringState = 'complete'; localDescription?: unknown;
+ createDataChannel() { return channel; }
+ async createOffer() { return { type: 'offer', sdp: 'fixture' }; }
+ async setLocalDescription(value: unknown) { this.localDescription = value; }
+ close() {}
+ });
+ const bridge = createDirectRuntimeBridge(), events = observers();
+ const host = createDirectRuntimeHost(createDirectRtcRuntime(), e => bridge.receive(e));
+ const detach = bridge.attach(c => { void host.command(c); });
+ const session = bridge.runtime.create('one', events);
+ try {
+ await session.offer(); channel.onopen?.();
+ if (mode === 'small-then-large') {
+ session.send('small');
+ expect(session.bufferedAmount).toBeGreaterThan(0);
+ channel.drain(); await Promise.resolve();
+ expect(session.bufferedAmount).toBe(0);
+ session.send('😀'.repeat(300_000));
+ expect(session.bufferedAmount).toBeGreaterThan(1024 * 1024);
+ channel.drain(); await Promise.resolve();
+ expect(session.bufferedAmount).toBe(0);
+ } else {
+ session.send('x'.repeat(1_200_000));
+ channel.drain(700_000);
+ await vi.advanceTimersByTimeAsync(100);
+ expect(session.bufferedAmount).toBe(700_000);
+ channel.drain(); await Promise.resolve();
+ expect(session.bufferedAmount).toBe(0);
+ }
+ } finally { detach(); host.dispose(); }
+});
diff --git a/packages/device-link/src/directRtcRuntime.ts b/packages/device-link/src/directRtcRuntime.ts
index a2cc979248..883392e7f0 100644
--- a/packages/device-link/src/directRtcRuntime.ts
+++ b/packages/device-link/src/directRtcRuntime.ts
@@ -13,27 +13,47 @@ export function createDirectRtcRuntime(): DirectRuntime {
let receiveBytes = 0;
let parts: Uint8Array[] = [];
let receiveTimer: ReturnType<typeof setTimeout> | undefined;
+ let bufferTimer: ReturnType<typeof setTimeout> | undefined;
const encoder = new TextEncoder();
const decoder = new TextDecoder('utf-8', { fatal: true });
const close = () => {
if (closed) return;
closed = true;
clearTimeout(receiveTimer);
+ clearTimeout(bufferTimer);
parts = [];
dc?.close();
pc.close();
events.closed();
};
+ const scheduleBufferReport = () => {
+ if (!closed && dc && dc.bufferedAmount > 0 && !bufferTimer) {
+ bufferTimer = setTimeout(() => {
+ bufferTimer = undefined;
+ reportBuffer();
+ }, 100);
+ }
+ };
+ const reportBuffer = () => {
+ if (closed) return;
+ events.drained();
+ scheduleBufferReport();
+ };
const bind = (channel: RTCDataChannel) => {
if (closed || dc || channel.label !== 'device-link-v1' || !channel.ordered
|| channel.maxRetransmits !== null || channel.maxPacketLifeTime !== null) { channel.close(); return; }
dc = channel;
dc.binaryType = 'arraybuffer';
- dc.bufferedAmountLowThreshold = 128 * 1024;
+ // Always report the final zero, including messages smaller than a low-water mark.
+ dc.bufferedAmountLowThreshold = 0;
dc.onopen = () => { if (!closed) events.open(); };
dc.onclose = close;
dc.onerror = close;
- dc.onbufferedamountlow = () => { if (!closed) events.drained(); };
+ dc.onbufferedamountlow = () => {
+ clearTimeout(bufferTimer);
+ bufferTimer = undefined;
+ reportBuffer();
+ };
dc.onmessage = ({ data }) => {
try {
if (closed || !(data instanceof ArrayBuffer) || data.byteLength < 2 || data.byteLength > 16 * 1024) throw new Error();
@@ -91,7 +111,9 @@ export function createDirectRtcRuntime(): DirectRuntime {
frame.set(bytes.subarray(offset, end), 1);
dc.send(frame.buffer);
}
- events.drained();
+ // Report ongoing drain while busy, then stop at zero. Never notify synchronously
+ // from send(): native bridges and the reliable sender must commit their sequence first.
+ scheduleBufferReport();
} catch (error) { close(); throw error; }
},
get bufferedAmount() { return dc?.bufferedAmount ?? 0; },
diff --git a/packages/device-link/src/directRuntimeSource.ts b/packages/device-link/src/directRuntimeSource.ts
index 20586aca0c..4be484c3ff 100644
--- a/packages/device-link/src/directRuntimeSource.ts
+++ b/packages/device-link/src/directRuntimeSource.ts
@@ -1,2 +1,2 @@
// Generated by node scripts/direct-link-runtime.mjs. Do not edit.
-export const DIRECT_LINK_RUNTIME_SOURCE = "\"use strict\";var CindyDirectLink=(()=>{var h=Object.defineProperty;var P=Object.getOwnPropertyDescriptor;var v=Object.getOwnPropertyNames;var b=Object.prototype.hasOwnProperty;var k=(i,r)=>{for(var t in r)h(i,t,{get:r[t],enumerable:!0})},N=(i,r,t,n)=>{if(r&&typeof r==\"object\"||typeof r==\"function\")for(let e of v(r))!b.call(i,e)&&e!==t&&h(i,e,{get:()=>r[e],enumerable:!(n=P(r,e))||n.enumerable});return i};var D=i=>N(h({},\"__esModule\",{value:!0}),i);var V={};k(V,{create:()=>Y});var m=2*1024*1024,G=4*1024*1024;var ve=128*1024;var be=4*1024*1024,ke=16*1024*1024;var Ne=16*1024*1024,De=8*1024*1024;var xe=5*6e4;function S(i){let r=0;for(let t=0;t<i.length;t+=1){let n=i.codePointAt(t);n>65535&&(t+=1),r+=n<=127?1:n<=2047?2:n<=65535?3:4}return r}function R(i,r){let t=new Map,n=e=>{let o=t.get(e);t.delete(e),o?.session.close()};return{async command(e){if(!(!e||typeof e.connection!=\"string\"||!/^[a-zA-Z0-9-]{1,64}$/.test(e.connection)||typeof e.id!=\"string\"))try{let o=t.get(e.connection);if(e.action===\"offer\"||e.action===\"accept\"){if(o||t.size>=16)throw new Error;o={session:i.create(e.connection,{open:()=>r({type:\"open\",connection:e.connection}),message:p=>r({type:\"message\",connection:e.connection,text:p}),drained:()=>{let p=t.get(e.connection);p&&r({type:\"buffer\",connection:e.connection,sequence:p.sequence,buffered:p.session.bufferedAmount})},closed:()=>{t.has(e.connection)&&(t.delete(e.connection),r({type:\"closed\",connection:e.connection}))}}),sequence:0},t.set(e.connection,o)}if(e.action===\"close\"){n(e.connection);return}if(!o)throw new Error;let d;if(e.action===\"offer\")d=await o.session.offer();else if(e.action===\"accept\"||e.action===\"answer\"){if(typeof e.sdp!=\"string\"||!e.sdp||e.sdp.length>131072)throw new Error;e.action===\"accept\"?d=await o.session.accept(e.sdp):await o.session.answer(e.sdp)}else if(e.action===\"send\"){if(typeof e.text!=\"string\"||S(e.text)>m||e.sequence!==o.sequence+1)throw new Error;o.session.send(e.text),o.sequence=e.sequence,r({type:\"buffer\",connection:e.connection,sequence:o.sequence,buffered:o.session.bufferedAmount});return}else throw new Error;r({type:\"reply\",id:e.id,ok:!0,...d?{value:d}:{}})}catch{r({type:\"reply\",id:e.id,ok:!1}),n(e.connection),r({type:\"closed\",connection:e.connection})}},dispose(){for(let e of t.keys())n(e)}}}function I(){return{create(i,r){let t=new RTCPeerConnection({iceServers:[]}),n,e=!1,o=0,d=[],g,p=new TextEncoder,A=new TextDecoder(\"utf-8\",{fatal:!0}),f=()=>{e||(e=!0,clearTimeout(g),d=[],n?.close(),t.close(),r.closed())},E=s=>{if(e||n||s.label!==\"device-link-v1\"||!s.ordered||s.maxRetransmits!==null||s.maxPacketLifeTime!==null){s.close();return}n=s,n.binaryType=\"arraybuffer\",n.bufferedAmountLowThreshold=128*1024,n.onopen=()=>{e||r.open()},n.onclose=f,n.onerror=f,n.onbufferedamountlow=()=>{e||r.drained()},n.onmessage=({data:c})=>{try{if(e||!(c instanceof ArrayBuffer)||c.byteLength<2||c.byteLength>16*1024)throw new Error;let a=new Uint8Array(c);if(a[0]!==0&&a[0]!==1)throw new Error;if(o+=a.length-1,o>m||d.length>=256)throw new Error;if(d.push(a.subarray(1)),clearTimeout(g),a[0]===0){g=setTimeout(f,1e4);return}let u=new Uint8Array(o),l=0;for(let y of d)u.set(y,l),l+=y.length;d=[],o=0,r.message(A.decode(u))}catch{f()}}};t.ondatachannel=({channel:s})=>E(s),t.onconnectionstatechange=()=>{[\"failed\",\"closed\",\"disconnected\"].includes(t.connectionState)&&f()};let T=async s=>{if(await t.setLocalDescription(s),t.iceGatheringState!==\"complete\"&&!e&&await new Promise(c=>{let a=setTimeout(u,3e3);function u(){clearTimeout(a),t.removeEventListener(\"icegatheringstatechange\",l),c()}function l(){(t.iceGatheringState===\"complete\"||e)&&u()}t.addEventListener(\"icegatheringstatechange\",l),l()}),e||!t.localDescription?.sdp)throw new Error(\"DIRECT_CHANNEL_CLOSED\");return t.localDescription.sdp};return{async offer(){return E(t.createDataChannel(\"device-link-v1\",{ordered:!0})),T(await t.createOffer())},async accept(s){return await t.setRemoteDescription({type:\"offer\",sdp:s}),T(await t.createAnswer())},async answer(s){await t.setRemoteDescription({type:\"answer\",sdp:s})},send(s){if(e||n?.readyState!==\"open\")throw new Error(\"DIRECT_CHANNEL_CLOSED\");let c=p.encode(s);if(!c.length||c.length>m||n.bufferedAmount>3*m)throw new Error(\"DIRECT_CHANNEL_BACKPRESSURE\");try{for(let a=0;a<c.length;a+=16*1024-1){let u=Math.min(c.length,a+16384-1),l=new Uint8Array(u-a+1);l[0]=u===c.length?1:0,l.set(c.subarray(a,u),1),n.send(l.buffer)}r.drained()}catch(a){throw f(),a}},get bufferedAmount(){return n?.bufferedAmount??0},close:f}}}}function Y(i){return R(I(),i)}return D(V);})();\n";
+export const DIRECT_LINK_RUNTIME_SOURCE = "\"use strict\";var CindyDirectLink=(()=>{var h=Object.defineProperty;var k=Object.getOwnPropertyDescriptor;var N=Object.getOwnPropertyNames;var D=Object.prototype.hasOwnProperty;var x=(i,n)=>{for(var t in n)h(i,t,{get:n[t],enumerable:!0})},w=(i,n,t,r)=>{if(n&&typeof n==\"object\"||typeof n==\"function\")for(let e of N(n))!D.call(i,e)&&e!==t&&h(i,e,{get:()=>n[e],enumerable:!(r=k(n,e))||r.enumerable});return i};var L=i=>w(h({},\"__esModule\",{value:!0}),i);var q={};x(q,{create:()=>H});var m=2*1024*1024,U=4*1024*1024;var Ne=128*1024;var De=4*1024*1024,xe=16*1024*1024;var we=16*1024*1024,Le=8*1024*1024;var Ce=5*6e4;function I(i){let n=0;for(let t=0;t<i.length;t+=1){let r=i.codePointAt(t);r>65535&&(t+=1),n+=r<=127?1:r<=2047?2:r<=65535?3:4}return n}function A(i,n){let t=new Map,r=e=>{let o=t.get(e);t.delete(e),o?.session.close()};return{async command(e){if(!(!e||typeof e.connection!=\"string\"||!/^[a-zA-Z0-9-]{1,64}$/.test(e.connection)||typeof e.id!=\"string\"))try{let o=t.get(e.connection);if(e.action===\"offer\"||e.action===\"accept\"){if(o||t.size>=16)throw new Error;o={session:i.create(e.connection,{open:()=>n({type:\"open\",connection:e.connection}),message:d=>n({type:\"message\",connection:e.connection,text:d}),drained:()=>{let d=t.get(e.connection);d&&n({type:\"buffer\",connection:e.connection,sequence:d.sequence,buffered:d.session.bufferedAmount})},closed:()=>{t.has(e.connection)&&(t.delete(e.connection),n({type:\"closed\",connection:e.connection}))}}),sequence:0},t.set(e.connection,o)}if(e.action===\"close\"){r(e.connection);return}if(!o)throw new Error;let l;if(e.action===\"offer\")l=await o.session.offer();else if(e.action===\"accept\"||e.action===\"answer\"){if(typeof e.sdp!=\"string\"||!e.sdp||e.sdp.length>131072)throw new Error;e.action===\"accept\"?l=await o.session.accept(e.sdp):await o.session.answer(e.sdp)}else if(e.action===\"send\"){if(typeof e.text!=\"string\"||I(e.text)>m||e.sequence!==o.sequence+1)throw new Error;o.session.send(e.text),o.sequence=e.sequence,n({type:\"buffer\",connection:e.connection,sequence:o.sequence,buffered:o.session.bufferedAmount});return}else throw new Error;n({type:\"reply\",id:e.id,ok:!0,...l?{value:l}:{}})}catch{n({type:\"reply\",id:e.id,ok:!1}),r(e.connection),n({type:\"closed\",connection:e.connection})}},dispose(){for(let e of t.keys())r(e)}}}function P(){return{create(i,n){let t=new RTCPeerConnection({iceServers:[]}),r,e=!1,o=0,l=[],g,d,v=new TextEncoder,b=new TextDecoder(\"utf-8\",{fatal:!0}),f=()=>{e||(e=!0,clearTimeout(g),clearTimeout(d),l=[],r?.close(),t.close(),n.closed())},E=()=>{!e&&r&&r.bufferedAmount>0&&!d&&(d=setTimeout(()=>{d=void 0,T()},100))},T=()=>{e||(n.drained(),E())},y=s=>{if(e||r||s.label!==\"device-link-v1\"||!s.ordered||s.maxRetransmits!==null||s.maxPacketLifeTime!==null){s.close();return}r=s,r.binaryType=\"arraybuffer\",r.bufferedAmountLowThreshold=0,r.onopen=()=>{e||n.open()},r.onclose=f,r.onerror=f,r.onbufferedamountlow=()=>{clearTimeout(d),d=void 0,T()},r.onmessage=({data:c})=>{try{if(e||!(c instanceof ArrayBuffer)||c.byteLength<2||c.byteLength>16*1024)throw new Error;let a=new Uint8Array(c);if(a[0]!==0&&a[0]!==1)throw new Error;if(o+=a.length-1,o>m||l.length>=256)throw new Error;if(l.push(a.subarray(1)),clearTimeout(g),a[0]===0){g=setTimeout(f,1e4);return}let p=new Uint8Array(o),u=0;for(let S of l)p.set(S,u),u+=S.length;l=[],o=0,n.message(b.decode(p))}catch{f()}}};t.ondatachannel=({channel:s})=>y(s),t.onconnectionstatechange=()=>{[\"failed\",\"closed\",\"disconnected\"].includes(t.connectionState)&&f()};let _=async s=>{if(await t.setLocalDescription(s),t.iceGatheringState!==\"complete\"&&!e&&await new Promise(c=>{let a=setTimeout(p,3e3);function p(){clearTimeout(a),t.removeEventListener(\"icegatheringstatechange\",u),c()}function u(){(t.iceGatheringState===\"complete\"||e)&&p()}t.addEventListener(\"icegatheringstatechange\",u),u()}),e||!t.localDescription?.sdp)throw new Error(\"DIRECT_CHANNEL_CLOSED\");return t.localDescription.sdp};return{async offer(){return y(t.createDataChannel(\"device-link-v1\",{ordered:!0})),_(await t.createOffer())},async accept(s){return await t.setRemoteDescription({type:\"offer\",sdp:s}),_(await t.createAnswer())},async answer(s){await t.setRemoteDescription({type:\"answer\",sdp:s})},send(s){if(e||r?.readyState!==\"open\")throw new Error(\"DIRECT_CHANNEL_CLOSED\");let c=v.encode(s);if(!c.length||c.length>m||r.bufferedAmount>3*m)throw new Error(\"DIRECT_CHANNEL_BACKPRESSURE\");try{for(let a=0;a<c.length;a+=16*1024-1){let p=Math.min(c.length,a+16384-1),u=new Uint8Array(p-a+1);u[0]=p===c.length?1:0,u.set(c.subarray(a,p),1),r.send(u.buffer)}E()}catch(a){throw f(),a}},get bufferedAmount(){return r?.bufferedAmount??0},close:f}}}}function H(i){return A(P(),i)}return L(q);})();\n";
diff --git a/scripts/direct-link-electron-smoke.mjs b/scripts/direct-link-electron-smoke.mjs
index 0174ed464f..0b5246b05f 100644
--- a/scripts/direct-link-electron-smoke.mjs
+++ b/scripts/direct-link-electron-smoke.mjs
@@ -67,11 +67,13 @@ try {
await client.openLink('desktop',{controllerName:'Desktop viewer',protocolVersion:1,appVersion:'1'});
await wait(()=>client.getPeerPath('desktop')==='direct');
console.log('DIRECT_READY');
+ await client.invoke('desktop',{channel:'maker:remote-agent:v1',args:['warmup']});
+ await new Promise(r=>setTimeout(r,150));
const first=await client.invoke('desktop',{channel:'maker:remote-agent:v1',args:['large']});
if(first.result!=='局域网😀'.repeat(80000))throw Error('corrupt result');
console.log('DIRECT_RESULT');
const second=await client.invoke('desktop',{channel:'maker:remote-agent:v1',args:['break']});
- if(second.result!==2)throw Error('duplicated execution');
+ if(second.result!==3)throw Error('duplicated execution');
console.log('ELECTRON_SMOKE_OK');client.stop();app.quit();
}).catch(e=>{console.error(e);client?.stop();app.exit(1);});
` } });
@@ -107,12 +109,12 @@ try {
assert.match(viewer.output(), /DIRECT_READY/); assert.match(viewer.output(), /ELECTRON_SMOKE_OK/);
const relayReplays = physical.filter(e => e.kind === 'invoke').length;
// Closing before its ACK can replay the second request with its original sequence.
- // The fixture's result=2 proves that this copy did not execute the command twice.
+ // The fixture's result=3 proves that this copy did not execute the command twice.
assert.ok(relayReplays <= 1, 'only the interrupted request may replay through relay');
assert.equal(physical.filter(e => e.kind === 'invoke-result').length, 1, 'only the interrupted result should fall back to relay');
host.child.stdin.write('stop\n'); await host.done;
console.log(JSON.stringify({ nativeProcesses: 2, directUtf8Bytes: 1_040_000, relayReplays,
- relayFallbackResults: 1, executions: 2, result: 'passed' }, null, 2));
+ relayFallbackResults: 1, executions: 3, result: 'passed' }, null, 2));
} finally {
for (const child of children) if (child.exitCode === null) child.kill();
for (const socket of server.clients) socket.terminate();
diff --git a/scripts/direct-link-smoke.mjs b/scripts/direct-link-smoke.mjs
index 84ec73e3e9..13c2cb5b6d 100644
--- a/scripts/direct-link-smoke.mjs
+++ b/scripts/direct-link-smoke.mjs
@@ -74,13 +74,15 @@ try {
for (const c of [mobile, other]) await c.openLink('desktop', { controllerName: 'Viewer', protocolVersion: 1, appVersion: '1' });
await wait(() => mobile.getPeerPath('desktop') === 'direct' && other.getPeerPath('desktop') === 'direct');
const before = physical.length;
+ await mobile.invoke('desktop', { channel: 'maker:remote-agent:v1', args: ['warmup'] });
+ await new Promise(resolve => setTimeout(resolve, 150));
const reply = await mobile.invoke('desktop', { channel: 'maker:remote-agent:v1', args: ['large'] });
const relayBusiness = physical.slice(before).filter(e => ['invoke', 'invoke-result'].includes(e.kind));
if (reply.result !== large || relayBusiness.length) throw new Error('LAN transfer used relay or corrupted UTF-8');
breakNext = true;
const fallback = await mobile.invoke('desktop', { channel: 'maker:remote-agent:v1', args: ['poll'] });
const healthy = await other.invoke('desktop', { channel: 'maker:remote-agent:v1', args: ['poll'] });
- if (fallback.result !== 'provider-event' || healthy.result !== 'provider-event' || executions !== 3
+ if (fallback.result !== 'provider-event' || healthy.result !== 'provider-event' || executions !== 4
|| other.getPeerPath('desktop') !== 'direct') throw new Error('fallback duplicated work or disrupted another peer');
return { directUtf8Bytes: new TextEncoder().encode(reply.result).length, relayBusinessFramesDuringDirect: relayBusiness.length,
executions, fallback: fallback.ok, secondController: other.getPeerPath('desktop'),