@jingyi0605/codingns4dsh 0.2.0-beta.1 → 0.2.0-beta.2

package/data/build/dist/transport/webrtc-client.js

@@ -12,8 +12,11 @@ export async function connectWebRtcClient(options) {
     // 真实 WebSocket 暴露 readyState；测试注入的最小 socket 可能没有该字段。
     // 生产路径严格等待 registered，旧的纯协议 fake 仍可直接进入 offer 流程。
     if ('readyState' in signaling) {
-        await waitForSignalingRegistered(signaling, options.timeoutMs ?? 15_000, cleanupListeners);
-        await waitForPeerReady(signaling, options.timeoutMs ?? 15_000, cleanupListeners);
+        // 原来分成两次 await（先 registered 再 peer-ready）。Relay 会把 registered 和
+        // peer-ready 连续发出，如果两条消息落在同一个事件循环轮次里，第二个 await 的
+        // 监听还没挂上，peer-ready 就被丢掉，只能干等 15s 超时重连。
+        // 这里用单个监听同时记录两个状态，消除丢事件窗口，也少一次订阅往返。
+        await waitForSignalingReady(signaling, options.timeoutMs ?? 15_000, cleanupListeners);
     }
     const heartbeat = options.heartbeatIntervalMs === 0 ? null : setInterval(() => {
         try {
@@ -74,6 +77,29 @@ export async function connectWebRtcClient(options) {
         signaling.close(1000, 'client closed');
     };
     try {
+        // 候选可能在 answer 之后才到（Host 现在先发 answer 再收集），因此候选监听必须
+        // 覆盖整条连接生命周期，不能挂在 waitForAnswer 上（它在 answer 到达时就退订了）。
+        const remoteCandidates = createRemoteCandidateQueue(peerConnection, debug);
+        const onCandidateMessage = (event) => {
+            const raw = event.data;
+            if (typeof raw !== 'string')
+                return;
+            let message;
+            try {
+                message = JSON.parse(raw);
+            }
+            catch {
+                return;
+            }
+            if (message.type !== 'candidate')
+                return;
+            remoteCandidates.push({ candidate: message.candidate, sdpMid: message.mid });
+        };
+        signaling.addEventListener('message', onCandidateMessage);
+        cleanupListeners.push(() => {
+            signaling.removeEventListener('message', onCandidateMessage);
+            remoteCandidates.dispose();
+        });
         const answerPromise = waitForAnswer(signaling, options.timeoutMs ?? 15_000, cleanupListeners);
         peerConnection.onicecandidate = (event) => {
             if (!event.candidate)
@@ -91,8 +117,8 @@ export async function connectWebRtcClient(options) {
         const answer = await answerPromise;
         assertDtlsFingerprint(ticket.hostDtlsFingerprint, answer.sdp);
         await peerConnection.setRemoteDescription({ type: 'answer', sdp: answer.sdp });
-        for (const candidate of answer.candidates)
-            await peerConnection.addIceCandidate(candidate);
+        // answer 之前到达的候选在队列里等 remote description，这里放行。
+        remoteCandidates.flush();
         await waitForOpen(channel, options.timeoutMs ?? 15_000, cleanupListeners);
         await carrier.send(encodeFrame({ type: 'hello', clientContext: null, protocolVersion: '1' }));
         debug.log('webrtc.connected', { channelLabel: TUNNEL_DATA_CHANNEL_LABEL });
@@ -113,6 +139,68 @@ export function createSignalingUrl(baseUrl, ticket) {
     url.searchParams.set('ticket', ticket);
     return url.toString();
 }
+/**
+ * 合并等待 registered + peer-ready。
+ *
+ * 两者由 Relay 连续下发，用两个独立 Promise 顺序等待时存在丢事件窗口：
+ * 若两条消息在同一个事件循环轮次到达，后一个监听尚未注册，消息被丢弃，
+ * 调用方只能等到超时才重连。这里用单个监听同时记录两个状态，谁先到都不会丢。
+ */
+export function waitForSignalingReady(socket, timeoutMs, cleanup = []) {
+    return new Promise((resolve, reject) => {
+        let registered = false;
+        let peerReady = false;
+        let settled = false;
+        const timer = setTimeout(() => { remove(); reject(new Error('等待 Relay registered 超时')); }, timeoutMs);
+        const finish = () => {
+            if (settled || !registered || !peerReady)
+                return;
+            settled = true;
+            clearTimeout(timer);
+            remove();
+            resolve();
+        };
+        const onMessage = (event) => {
+            const raw = event.data;
+            if (typeof raw !== 'string')
+                return;
+            try {
+                const message = JSON.parse(raw);
+                if (message.type === 'error') {
+                    settled = true;
+                    clearTimeout(timer);
+                    remove();
+                    const code = message.errorCode?.trim() || 'RELAY_ERROR';
+                    const detail = message.detail?.trim();
+                    reject(new Error(detail ? `Relay ${code}: ${detail}` : `Relay ${code}`));
+                    return;
+                }
+                if (message.type === 'registered') {
+                    registered = true;
+                    finish();
+                    return;
+                }
+                if (message.type === 'peer-ready') {
+                    peerReady = true;
+                    finish();
+                }
+            }
+            catch { /* 忽略非 JSON 信令 */ }
+        };
+        const onClose = () => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timer);
+            remove();
+            reject(new Error(registered ? '信令连接在 peer-ready 前关闭' : '信令连接在 registered 前关闭'));
+        };
+        const remove = () => { socket.removeEventListener('message', onMessage); socket.removeEventListener('close', onClose); };
+        socket.addEventListener('message', onMessage);
+        socket.addEventListener('close', onClose);
+        cleanup.push(remove);
+    });
+}
 export function waitForSignalingRegistered(socket, timeoutMs, cleanup = []) {
     return new Promise((resolve, reject) => {
         const timer = setTimeout(() => { remove(); reject(new Error('等待 Relay registered 超时')); }, timeoutMs);
@@ -185,10 +273,51 @@ export function assertDtlsFingerprint(expected, sdp) {
         throw new Error('Host DTLS fingerprint 校验失败');
     }
 }
+function createRemoteCandidateQueue(peerConnection, debug) {
+    const buffered = [];
+    let remoteDescriptionReady = false;
+    let chain = Promise.resolve();
+    let disposed = false;
+    let received = 0;
+    let applied = 0;
+    const apply = (candidate) => {
+        chain = chain
+            .then(() => peerConnection.addIceCandidate(candidate).then(() => { applied += 1; }))
+            .catch((error) => {
+            debug.log('webrtc.candidate.failed', {
+                candidateCount: received,
+                code: error instanceof Error ? error.message : String(error),
+            });
+        });
+    };
+    return {
+        push(candidate) {
+            if (disposed)
+                return;
+            received += 1;
+            if (!remoteDescriptionReady) {
+                buffered.push(candidate);
+                return;
+            }
+            apply(candidate);
+        },
+        flush() {
+            if (disposed)
+                return;
+            remoteDescriptionReady = true;
+            for (const candidate of buffered.splice(0))
+                apply(candidate);
+            debug.log('webrtc.candidate.flushed', { candidateCount: received });
+        },
+        dispose() {
+            disposed = true;
+            debug.log('webrtc.candidate.summary', { candidateCount: received, applied: applied });
+        },
+    };
+}
 function waitForAnswer(socket, timeoutMs, cleanup) {
     return new Promise((resolve, reject) => {
         const timer = setTimeout(() => reject(new Error('等待 Host answer 超时')), timeoutMs);
-        const candidates = [];
         const onMessage = (event) => {
             const raw = event.data;
             if (typeof raw !== 'string')
@@ -203,10 +332,7 @@ function waitForAnswer(socket, timeoutMs, cleanup) {
             if (message.type === 'answer') {
                 clearTimeout(timer);
                 remove();
-                resolve({ sdp: message.sdp, candidates });
-            }
-            else if (message.type === 'candidate') {
-                candidates.push({ candidate: message.candidate, sdpMid: message.mid });
+                resolve({ sdp: message.sdp });
             }
             else if (message.type === 'error') {
                 clearTimeout(timer);

package/data/build/dist/transport/webrtc-client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webrtc-client.js","sourceRoot":"","sources":["../../../../src/transport/webrtc-client.ts"],"names":[],"mappings":"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"}

package/data/build/dist/transport/webrtc-host.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webrtc-host.d.ts","sourceRoot":"","sources":["../../../../src/transport/webrtc-host.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,2BAA2B,EAC3B,4BAA4B,EAC7B,MAAM,kCAAkC,CAAA;AACzC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAA;AAC7E,OAAO,EAAqF,KAAK,eAAe,EAAE,KAAK,eAAe,EAAE,MAAM,cAAc,CAAA;AAC5J,OAAO,EAGL,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACzB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAiC,KAAK,uBAAuB,EAAE,MAAM,YAAY,CAAA;AAExF,mEAAmE;AACnE,MAAM,WAAW,sBAAuB,SAAQ,IAAI,CAAC,kBAAkB,EAAE,mBAAmB,GAAG,aAAa,CAAC;IAC3G,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;IACjC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IACpC,YAAY,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,QAAQ,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACzD,aAAa,EAAE,CAAC,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,eAAe,CAAA;KAAE,KAAK,IAAI,CAAC,GAAG,IAAI,CAAA;CACtE;AAED,MAAM,WAAW,0BAA0B;IACzC,SAAS,EAAE,MAAM,CAAA;IACjB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B;AAED,MAAM,WAAW,yBAAyB;IACxC,eAAe,EAAE,4BAA4B,CAAA;IAC7C,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,GAAG,mBAAmB,CAAA;IACvF,qBAAqB,CAAC,OAAO,EAAE;QAC7B,UAAU,EAAE,cAAc,EAAE,CAAA;QAC5B,kBAAkB,EAAE,KAAK,GAAG,OAAO,CAAA;KACpC,GAAG,sBAAsB,CAAA;IAC1B,iDAAiD;IACjD,yBAAyB,CAAC,EAAE,MAAM,CAAA;IAClC,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,YAAY,CAAC,EAAE,CAAC,UAAU,EAAE,iBAAiB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACtE,eAAe,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC7D,KAAK,CAAC,EAAE,uBAAuB,CAAA;CAChC;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,cAAc,EAAE,sBAAsB,CAAA;IAC/C,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI,CAAA;IACxC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACvB;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,SAAS,EAAE,mBAAmB,CAAA;IACvC,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;IACzD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACvB;AAED;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,0BAA0B,GAAG,2BAA2B,CAmB/G;AAED,sCAAsC;AACtC,wBAAgB,0BAA0B,CACxC,aAAa,EAAE,IAAI,CAAC,wBAAwB,EAAE,uBAAuB,CAAC,EACtE,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,0BAA0B,GAChC,OAAO,CAAC,4BAA4B,CAAC,CAGvC;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAmGtG"}

package/data/build/dist/transport/webrtc-host.js

@@ -215,10 +215,14 @@ class HostSessionImpl {
         for (const candidate of pendingCandidates)
             await this.peerConnection.addIceCandidate(candidate);
         const answer = await this.peerConnection.createAnswer();
-        await this.peerConnection.setLocalDescription(answer);
+        // 先发 answer 再 setLocalDescription：werift 的 setLocalDescription 内部会 await
+        // gatherCandidates()，STUN/TURN 不可达时要等满 5s 才返回。answer SDP 由 createAnswer
+        // 生成，已带 ice-ufrag/ice-pwd 与 DTLS fingerprint，候选靠 trickle 后续补发，
+        // 因此这里无需等收集完成。
         if (!this.closed) {
             this.signaling.send(JSON.stringify({ type: 'answer', sdp: answer.sdp ?? '', sessionId: this.sessionId }));
         }
+        await this.peerConnection.setLocalDescription(answer);
     }
     async close() {
         if (this.closed)

package/data/build/dist/transport/webrtc-host.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webrtc-host.js","sourceRoot":"","sources":["../../../../src/transport/webrtc-host.ts"],"names":[],"mappings":"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"}

package/data/build/dist/typert.host.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"typert.host.d.ts","sourceRoot":"","sources":["../../../src/typert.host.ts"],"names":[],"mappings":"AAmIA,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;CAgFT,CAAA"}

package/data/build/dist/typert.host.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"typert.host.js","sourceRoot":"","sources":["../../../src/typert.host.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,EAAE,CAAA;AAClC,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,EAAE,CAAA;AACnC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,EAAE,CAAA;AACrC,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IACpC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC5B,CAAC,CAAA;AACF,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IAClC,EAAE,EAAE,gBAAgB,CAAC,QAAQ,EAAE;IAC/B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,KAAK,EAAE,WAAW,CAAC,QAAQ,EAAE;IAC7B,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC3F,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC3D,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IACvC,YAAY,EAAE,kBAAkB,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;CACvD,CAAC,CAAA;AACF,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IACjC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1B,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAC7C,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACpC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAClC,CAAC,CAAA;AACF,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC;IACnC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAC3C,EAAE,EAAE,gBAAgB,CAAC,QAAQ,EAAE;IAC/B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC5B,CAAC,CAAA;AACF,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC;IAClC,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE;QACtC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC/B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC7B,IAAI,EAAE,kBAAkB,CAAC,QAAQ,EAAE;KACpC,CAAC;IACF,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE;QACpC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC/B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KAC5B,CAAC;IACF,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE;QACnC,IAAI,EAAE,kBAAkB,CAAC,QAAQ,EAAE;KACpC,CAAC;CACH,CAAC,CAAA;AAkBF,SAAS,KAAK,CAAC,UAAkB,EAAE,MAAiB;IAClD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,EAAE,CAAA;AACrE,CAAC;AAED,SAAS,IAAI,CAAC,IAAY,EAAE,IAAY,EAAE,UAAkB,EAAE,MAAiB;IAC7E,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE,CAAA;AACzE,CAAC;AAED,SAAS,KAAK;IACZ,OAAO;QACL,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,OAAO;QACf,KAAK,EAAE,KAAK,CAAC,0CAA0C,EAAE,eAAe,CAAC;KAC1E,CAAA;AACH,CAAC;AAED,SAAS,UAAU,CACjB,MAAc,EACd,UAA0C,EAC1C,MAAmB,EACnB,UAAyG,EAAE;IAE3G,OAAO;QACL,EAAE,EAAE,yBAAyB,MAAM,EAAE;QACrC,OAAO,EAAE,oBAAoB;QAC7B,0DAA0D;QAC1D,uDAAuD;QACvD,SAAS,EAAE,kBAAkB;QAC7B,MAAM;QACN,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtD,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC9B,GAAG,CAAC,OAAO,CAAC,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzF,UAAU;QACV,GAAG,CAAC,OAAO,CAAC,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClF,MAAM;KACP,CAAA;AACH,CAAC;AAED,MAAM,UAAU,GAAG,CAAC,MAAc,EAAe,EAAE,CAAC,KAAK,CAAC,yBAAyB,MAAM,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;AAC7G,MAAM,WAAW,GAAG,GAAwB,EAAE,CAAC,IAAI,CACjD,IAAI,EACJ,IAAI,EACJ,mCAAmC,EACnC,gBAAgB,CACjB,CAAA;AACD,MAAM,mBAAmB,GAAG,GAAwB,EAAE,CAAC,IAAI,CACzD,cAAc,EACd,cAAc,EACd,0CAA0C,EAC1C,kBAAkB,CACnB,CAAA;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,gEAAgE;IAChE,OAAO,EAAE,0BAA0B;IACnC,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,EAAE;IACX,WAAW,EAAE;QACX,UAAU,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;QACzF,UAAU,CAAC,QAAQ,EAAE;YACnB,KAAK,EAAE;YACP,IAAI,CACF,SAAS,EACT,SAAS,EACT,mDAAmD,EACnD,mBAAmB,CACpB;SACF,EAAE,KAAK,CAAC,6CAA6C,EAAE,kBAAkB,CAAC,EAAE;YAC3E,WAAW,EAAE,IAAI;YACjB,WAAW,EAAE,IAAI;SAClB,CAAC;QACF,UAAU,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,CACxC,iDAAiD,EACjD,iBAAiB,CAClB,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;QAC5C,UAAU,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,mBAAmB,EAAE,CAAC,EAAE,KAAK,CACzE,2CAA2C,EAC3C,mBAAmB,CACpB,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QAC1D,UAAU,CAAC,MAAM,EAAE,CAAC,IAAI,CACtB,WAAW,EACX,WAAW,EACX,0CAA0C,EAC1C,eAAe,CAChB,CAAC,EAAE,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC;QAC5E,UAAU,CAAC,QAAQ,EAAE;YACnB,KAAK,EAAE;YACP,WAAW,EAAE;YACb,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,oCAAoC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;SACzE,EAAE,UAAU,CAAC,QAAQ,CAAC,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;QAC/C,UAAU,CAAC,QAAQ,EAAE;YACnB,KAAK,EAAE;YACP,WAAW,EAAE;YACb,mBAAmB,EAAE;YACrB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,mCAAmC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;YACrE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,mCAAmC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;SACtE,EAAE,UAAU,CAAC,QAAQ,CAAC,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;QAC/C,UAAU,CAAC,QAAQ,EAAE;YACnB,IAAI,CAAC,WAAW,EAAE,WAAW,EAAE,0CAA0C,EAAE,eAAe,CAAC;YAC3F,WAAW,EAAE;SACd,EAAE,KAAK,CACN,oDAAoD,EACpD,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CACrD,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACvC,UAAU,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,CACnC,qCAAqC,EACrC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CACrB,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;QAC5C,UAAU,CAAC,OAAO,EAAE;YAClB,KAAK,EAAE;YACP,WAAW,EAAE;YACb,mBAAmB,EAAE;YACrB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,kCAAkC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;SACrE,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;KAC/C;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,CAAC;gBACT,WAAW,EAAE,8CAA8C;gBAC3D,OAAO,EAAE,4BAA4B;gBACrC,IAAI,EAAE,EAAE;gBACR,KAAK,EAAE,qDAAqD;gBAC5D,GAAG,EAAE,oBAAoB;gBACzB,UAAU,EAAE,4BAA4B;gBACxC,OAAO,EAAE;oBACP,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;oBACnD,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO;iBAC/C,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,IAAI,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;gBACtE,KAAK,EAAE,EAAE;aACV,CAAC;QACF,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;KACZ;CACO,CAAA"}

package/data/build/dist/typert.remote-client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"typert.remote-client.d.ts","sourceRoot":"","sources":["../../../src/typert.remote-client.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAA;AAGhF,eAAO,MAAM,aAAa,EAAE,wBAG3B,CAAA;AAED,eAAe,aAAa,CAAA"}

package/data/build/dist/typert.remote-client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"typert.remote-client.js","sourceRoot":"","sources":["../../../src/typert.remote-client.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAEzC,MAAM,CAAC,MAAM,aAAa,GAA6B;IACrD,OAAO,EAAE,MAAM,CAAC,OAAO;IACvB,WAAW,EAAE,MAAM,CAAC,WAAiE;CACtF,CAAA;AAED,eAAe,aAAa,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jingyi0605/codingns4dsh",
-  "version": "0.2.0-beta.1",
+  "version": "0.2.0-beta.2",
   "description": "Codingns4DSH 插件骨架与连接契约",
   "repository": {
     "type": "git",
@@ -54,11 +54,12 @@
     "./package.json": "./package.json"
   },
   "engines": {
-    "dsh": ">=0.2.0-rc.1 <=0.2.0-rc.1",
+    "dsh": ">=0.2.0-rc.2 <=0.2.0-rc.2",
     "node": ">=22.19.0"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh": ">=0.2.0-rc.1 <=0.2.0-rc.1"
+    "@deepseek-ai/cordis": "~4.0.4",
+    "@deepseek-ai/dsh": ">=0.2.0-rc.2 <=0.2.0-rc.2"
   },
   "dsh": {
     "manifestVersion": 1,
@@ -71,6 +72,7 @@
         "@deepseek-ai/dsh-client-locale",
         "@deepseek-ai/dsh-client-connection",
         "@deepseek-ai/dsh-client-ui-conversation",
+        "@deepseek-ai/dsh-client-ui-tool",
         "@deepseek-ai/dsh-client-ui-layout",
         "@deepseek-ai/dsh-client-ui-sidebar",
         "@deepseek-ai/dsh-client-ui-settings",
@@ -85,7 +87,9 @@
     }
   },
   "scripts": {
-    "preinstall": "node scripts/check-dsh-install.mjs",
+    "check:dsh-install": "node scripts/check-dsh-install.mjs",
+    "check:dsh-rc2-matrix": "node scripts/check-dsh-rc2-matrix.mjs",
+    "replay:dsh-install": "node scripts/replay-dsh-install.mjs",
     "version:check": "node scripts/check-version-sync.mjs",
     "capability:check": "node scripts/check-capability-retirement.mjs",
     "capability:report": "node scripts/generate-capability-report.mjs",
@@ -109,6 +113,8 @@
   "files": [
     "data/build/dist/**/*.js",
     "data/build/dist/**/*.d.ts",
+    "data/build/dist/**/*.js.map",
+    "data/build/dist/**/*.d.ts.map",
     "assets/provider-icons/**",
     "dsh.bundle.patch",
     "profile/**",
@@ -119,21 +125,28 @@
   ],
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.4",
-    "@deepseek-ai/dsh-api-remotes": "0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-connection": "0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-locale": "0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-layout": "0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-renderer": "0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-settings": "0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-slots": "0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-session": "0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-sidebar-right": "0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-theme": "0.2.0-rc.1",
-    "@deepseek-ai/dsh-settings": "0.2.0-rc.1",
-    "@deepseek-ai/dsh-typert-protocol": "0.2.0-rc.1",
-    "@deepseek-ai/schemastery": "^3.18.4",
+    "@deepseek-ai/cordis-plugin-include": "~1.0.9",
+    "@deepseek-ai/cordis-plugin-group": "~1.0.4",
+    "@deepseek-ai/dsh-api-remotes": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-app-boot": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-connection": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-locale": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-tool": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-layout": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-renderer": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-slots": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-session": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-sidebar-right": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-theme": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-invariants": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-home-paths": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-launch-environment": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-scope": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-settings": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-system-prompt": "0.2.0-rc.2",
     "@types/react": "~18.3.1",
     "@types/ws": "^8.18.1",
     "react": "^18.2.0",
@@ -141,6 +154,8 @@
     "typescript": "^5.9.2"
   },
   "dependencies": {
+    "@deepseek-ai/dsh-typert-protocol": "0.2.0-rc.2",
+    "@deepseek-ai/schemastery": "^3.18.4",
     "@codemirror/lang-css": "^6.3.1",
     "@codemirror/lang-html": "^6.4.12",
     "@codemirror/lang-javascript": "^6.2.5",

package/profile/README.md

@@ -1,6 +1,6 @@
 # Codingns4DSH Profile
 
-这是独立的 Codingns4DSH Profile，插件版本为 `0.2.0-beta.1`，兼容 DSH `>=0.2.0-rc.1 <=0.2.0-rc.1`，当前测试版本为 `0.2.0-rc.1`。
+这是独立的 Codingns4DSH Profile，插件版本为 `0.2.0-beta.2`，仅兼容并验证 DSH `0.2.0-rc.2`。
 
 Profile 只选择 `codingns4dsh` Bundle。`cordis.patch.yml` 保持 `[]`，因为启动期
 Transport 必须由外部 pre-Cordis 启动胶水在 DSH Client/Cordis 创建前登记，不能由
@@ -9,7 +9,7 @@ Transport 必须由外部 pre-Cordis 启动胶水在 DSH Client/Cordis 创建前
 发布后，在 DSH 的 Profile 中安装精确版本的插件 Bundle：
 
 ```bash
-dsh plugin --profile codingns4dsh add @jingyi0605/codingns4dsh@0.2.0-beta.1
+dsh plugin --profile codingns4dsh add @jingyi0605/codingns4dsh@0.2.0-beta.2
 ```
 
 Profile 安装完成后，使用 DSH 官方启动器启动：
@@ -18,9 +18,22 @@ Profile 安装完成后，使用 DSH 官方启动器启动：
 dsh --profile codingns4dsh --dump-config
 ```
 
-Profile 和插件安装前都会读取当前 `dsh --version`；版本不在 Profile 的 `engines.dsh`
-范围内时，安装直接失败。启动时 Host、Client 和 Bootstrap 还会再次校验实际 DSH 版本，
-不兼容版本不会启用插件。
+Profile 安装前会读取当前 DSH 运行时版本；版本不在 Profile 的 `engines.dsh` 范围内时，
+安装直接失败。探测顺序与「能否阻断」的对应关系如下：
+
+| 优先级 | 来源 | 是否阻断 |
+| --- | --- | --- |
+| 1 | `DSH_RUNTIME_VERSION` / `DSH_VERSION`（宿主注入） | 是 |
+| 2 | Desktop Runtime 根（`app.asar` 内真实加载的 `@deepseek-ai/dsh`） | 是 |
+| 3 | Profile 目录内可解析到的 `@deepseek-ai/dsh` | 是 |
+| 4 | `PATH` 上的 `dsh --version` | 否，只告警 |
+
+第 4 项不阻断是刻意的：桌面宿主经 `scrubbedParentEnv()` 派生 pnpm 子进程时会剥离全部
+`DSH_*` 变量，命令行启动脚本也可能用绝对路径调用 0.2.x 启动器、同时把旧版 `dsh` 留在
+`PATH` 上。`PATH` 上的 `dsh` 只能证明机器上装了某个 DSH，不能证明它就是本次安装所使用的
+运行时，因此它只用于提示；否则会把正常安装误判为不兼容。
+
+启动时 Host、Client 和 Bootstrap 还会再次校验实际 DSH 版本，不兼容版本不会启用插件。
 
 真实 Transport 工厂完成后，桌面壳或页面应先调用 `codingns4dsh/bootstrap` 的
 `bootWithPreCordisTransport()`，再启动 DSH Client。DSH 升级后必须先发布匹配的新

package/profile/package.json

@@ -1,17 +1,17 @@
 {
   "name": "codingns4dsh-profile",
-  "version": "0.2.0-beta.1",
+  "version": "0.2.0-beta.2",
   "license": "GPL-3.0-or-later",
   "private": true,
   "type": "module",
   "engines": {
-    "dsh": ">=0.2.0-rc.1 <=0.2.0-rc.1"
+    "dsh": ">=0.2.0-rc.2 <=0.2.0-rc.2"
   },
   "scripts": {
     "preinstall": "node scripts/check-dsh-install.mjs"
   },
   "dependencies": {
-    "@jingyi0605/codingns4dsh": "0.2.0-beta.1"
+    "@jingyi0605/codingns4dsh": "0.2.0-beta.2"
   },
   "dsh": {
     "profile": {

package/profile/scripts/check-dsh-install.mjs

@@ -1,22 +1,107 @@
 import { readFile } from 'node:fs/promises'
+import { readFileSync } from 'node:fs'
+import { createRequire } from 'node:module'
 import { spawnSync } from 'node:child_process'
+import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
-import { join } from 'node:path'
 
 const VERSION_PATTERN = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/u
 const profileRoot = fileURLToPath(new URL('../', import.meta.url))
 const manifest = JSON.parse(await readFile(join(profileRoot, 'package.json'), 'utf8'))
-const actualVersion = readVersionFromCommand()
+const compatibility = manifest.engines?.dsh
+const detected = detectRuntimeDshVersion()
 
-if (actualVersion === undefined) {
-  throw new Error('DSH Profile 安装失败：无法读取当前 DSH 版本，拒绝继续安装插件')
+// PATH 上的 `dsh` 只能证明机器上装了某个 DSH，不能证明它就是本次安装所使用的
+// 运行时：桌面宿主经 scrubbedParentEnv() 派生子进程时会剥离全部 DSH_* 变量，
+// 此时 PATH 里可能仍指向另一个（更旧的）dsh。把这种来源当成硬门禁会把正常安装
+// 误判为不兼容，因此它只用于提示。
+if (detected === undefined) {
+  console.warn('DSH Profile 安装检查：未检测到当前 DSH 运行时，跳过安装期版本检查；运行期仍会再次校验')
+  process.exit(0)
 }
 
-if (!isCompatible(actualVersion, manifest.engines?.dsh)) {
-  throw new Error(`DSH Profile 安装失败：当前 DSH ${actualVersion} 不在 Profile 支持范围 ${String(manifest.engines?.dsh)} 内`)
+if (detected.source === 'path') {
+  const verdict = isCompatible(detected.version, compatibility) ? '在' : '不在'
+  console.warn(
+    `DSH Profile 安装检查：PATH 上的 dsh ${detected.version} ${verdict} Profile 支持范围 ${String(compatibility)} 内，` +
+      '但它未必是本次安装所使用的运行时，已跳过阻断',
+  )
+  process.exit(0)
 }
 
-console.log(`DSH Profile 安装期版本检查通过：DSH ${actualVersion}`)
+if (!isCompatible(detected.version, compatibility)) {
+  throw new Error(
+    `DSH Profile 安装失败：当前 DSH ${detected.version} 不在 Profile 支持范围 ${String(compatibility)} 内` +
+      `（版本来源：${detected.source}）`,
+  )
+}
+
+console.log(
+  `DSH Profile 安装期版本检查通过：DSH ${detected.version}（来源 ${detected.source}），兼容范围 ${compatibility}`,
+)
+
+/**
+ * 读取当前 DSH 运行时版本，并标注来源。
+ *
+ * 优先级：宿主显式注入的版本 → Desktop Runtime 根（app.asar 内真实加载的包）
+ * → 从 Profile 目录可解析到的 @deepseek-ai/dsh → PATH 上的 dsh。
+ * 前三种来源能归属到本次安装真正使用的运行时，只有它们参与硬门禁。
+ *
+ * @returns {{ version: string, source: 'env' | 'runtime' | 'module' | 'path' } | undefined}
+ */
+function detectRuntimeDshVersion() {
+  const injected = [process.env.DSH_RUNTIME_VERSION, process.env.DSH_VERSION].find(isVersion)
+  if (injected !== undefined) return { version: injected, source: 'env' }
+
+  const fromRuntime = readVersionFromRuntimeRoots()
+  if (fromRuntime !== undefined) return { version: fromRuntime, source: 'runtime' }
+
+  const fromModule = readVersionFromModule()
+  if (fromModule !== undefined) return { version: fromModule, source: 'module' }
+
+  const fromPath = readVersionFromCommand()
+  if (fromPath !== undefined) return { version: fromPath, source: 'path' }
+
+  return undefined
+}
+
+/** Electron 把 Resources 根暴露为 process.resourcesPath；纯 Node 下不存在。 */
+function readVersionFromRuntimeRoots() {
+  const resourcesRoot = process.resourcesPath
+  if (typeof resourcesRoot !== 'string' || resourcesRoot.trim() === '') return undefined
+  const runtimeRoots = [
+    join(resourcesRoot, 'app.asar', 'dsh'),
+    join(resourcesRoot, 'app.asar.unpacked', 'dsh'),
+    join(resourcesRoot, 'dsh'),
+  ]
+  for (const runtimeRoot of runtimeRoots) {
+    const version = readDshManifestVersion(
+      join(runtimeRoot, 'node_modules', '@deepseek-ai', 'dsh', 'package.json'),
+    )
+    if (version !== undefined) return version
+  }
+  return undefined
+}
+
+/** Profile 目录里若已装过 DSH，可直接解析其包清单。 */
+function readVersionFromModule() {
+  try {
+    const require = createRequire(join(profileRoot, 'package.json'))
+    return readDshManifestVersion(require.resolve('@deepseek-ai/dsh/package.json'))
+  } catch {
+    return undefined
+  }
+}
+
+function readDshManifestVersion(manifestPath) {
+  try {
+    const parsed = JSON.parse(readFileSync(manifestPath, 'utf8'))
+    if (parsed.name === '@deepseek-ai/dsh' && isVersion(parsed.version)) return parsed.version
+  } catch {
+    // 该路径没有 DSH 包时继续尝试下一个来源。
+  }
+  return undefined
+}
 
 function readVersionFromCommand() {
   try {
@@ -32,13 +117,19 @@ function readVersionFromCommand() {
   }
 }
 
+function isVersion(value) {
+  return typeof value === 'string' && VERSION_PATTERN.test(value)
+}
+
 function isCompatible(actual, range) {
-  const match = typeof range === 'string' ? /^>=([^ ]+) <=([^ ]+)$/u.exec(range) : undefined
+  const match = typeof range === 'string' ? /^>=([^ ]+)(?: <=([^ ]+))?$/u.exec(range) : undefined
   if (!match) return false
   const actualVersion = parseVersion(actual)
   const minimum = parseVersion(match[1])
+  if (!actualVersion || !minimum) return false
+  if (match[2] === undefined) return compareVersions(actualVersion, minimum) >= 0
   const maximum = parseVersion(match[2])
-  if (!actualVersion || !minimum || !maximum) return false
+  if (!maximum) return false
   return compareVersions(actualVersion, minimum) >= 0 && compareVersions(actualVersion, maximum) <= 0
 }
 

package/profile/version.json

@@ -1,5 +1,5 @@
 {
-  "pluginVersion": "0.2.0-beta.1",
-  "dshCompatibility": ">=0.2.0-rc.1 <=0.2.0-rc.1",
-  "dshTestedVersion": "0.2.0-rc.1"
+  "pluginVersion": "0.2.0-beta.2",
+  "dshCompatibility": ">=0.2.0-rc.2 <=0.2.0-rc.2",
+  "dshTestedVersion": "0.2.0-rc.2"
 }