@coclaw/openclaw-coclaw 0.14.1 → 0.16.0

package/index.js

@@ -359,7 +359,7 @@ const plugin = {
 				await writeName(nameToSave);
 				const hostName = getHostName();
 				respond(true, { name: nameToSave, hostName });
-				// 异步广播变更事件到 server 和其他 UI 实例
+				// 仅广播本次 patch 涉及的字段；server 端按 patch 语义仅更新 payload 中出现的列
 				broadcastPluginEvent('coclaw.info.updated', { name: nameToSave, hostName });
 			}
 			catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coclaw/openclaw-coclaw",
-  "version": "0.14.1",
+  "version": "0.16.0",
   "type": "module",
   "license": "Apache-2.0",
   "description": "OpenClaw CoClaw channel plugin for remote chat",
@@ -60,7 +60,7 @@
   },
   "dependencies": {
     "node-datachannel": "0.32.2",
-    "@coclaw/pion-node": "^0.1.2",
+    "@coclaw/pion-node": "^0.1.3",
     "werift": "^0.19.0",
     "ws": "^8.19.0"
   },

package/src/auto-upgrade/updater-check.js

@@ -2,7 +2,7 @@
  * updater-check.js — 版本检查
  *
  * 通过 `npm view` 查询 registry 最新版本，与本地 package.json 对比。
- * 选择 npm view 而非直接 fetch registry API，是因为它自动继承用户完整的
+ * 选择 npm view 而非自己打 registry HTTP 接口，是因为它自动继承用户完整的
  * npm 环境配置（registry 镜像、proxy、scoped registry、auth token 等），
  * 避免自行解析多层 .npmrc 的复杂性。每小时一次的频率下进程启动开销可忽略。
  */

package/src/realtime-bridge.js

@@ -430,17 +430,46 @@ export class RealtimeBridge {
 		}
 	}
 
-	/** 推送实例名到 server 和已连接的 UI */
-	async __pushInstanceName() {
+	/** 推送实例信息（name/hostName/pluginVersion/agentModels）到 server 和已连接的 UI */
+	async __pushInstanceInfo() {
 		try {
 			const settings = await readSettings();
 			const name = settings.name ?? null;
 			const hostName = getHostName();
-			broadcastPluginEvent('coclaw.info.updated', { name, hostName });
+			const pluginVersion = await getPluginVersion();
+			const agentModels = await this.__collectAgentModels();
+			broadcastPluginEvent('coclaw.info.updated', {
+				name,
+				hostName,
+				pluginVersion,
+				agentModels,
+			});
 		}
 		catch (err) {
 			/* c8 ignore next 2 -- 防御性兜底 */
-			this.logger.warn?.(`[coclaw] pushInstanceName failed: ${String(err?.message ?? err)}`);
+			this.logger.warn?.(`[coclaw] pushInstanceInfo failed: ${String(err?.message ?? err)}`);
+		}
+	}
+
+	/**
+	 * 采集 agent × 有效主模型列表，用于 coclaw.info.updated 上报
+	 * @returns {Promise<Array<{id: string, name: string, model: string|null}>|null>} 采集失败返回 null
+	 */
+	async __collectAgentModels() {
+		try {
+			const result = await this.__gatewayRpc('agents.list', {}, { timeoutMs: 3000 });
+			if (result?.ok !== true) return null;
+			const agents = result?.response?.payload?.agents;
+			if (!Array.isArray(agents)) return null;
+			return agents.map((a) => ({
+				id: a?.id,
+				name: a?.name ?? a?.id,
+				model: a?.model?.primary ?? null,
+			}));
+		}
+		catch {
+			// 防御性兜底：__gatewayRpc 正常会以 { ok:false } 返回，此分支覆盖调用栈意外抛错
+			return null;
 		}
 	}
 
@@ -601,7 +630,7 @@ export class RealtimeBridge {
 					this.__logDebug(`gateway connect ok <- id=${payload.id}`);
 					this.gatewayConnectReqId = null;
 					this.__ensureSessionsPromise = this.__ensureAllAgentSessions();
-					this.__pushInstanceName();
+					this.__pushInstanceInfo();
 				}
 				else {
 					this.gatewayReady = false;

package/src/webrtc/webrtc-peer.js

@@ -110,6 +110,27 @@ export class WebRtcPeer {
 		}
 	}
 
+	/**
+	 * 向指定 connId 的 rpc DC 单播一个 JSON 帧（不走 server 中转）。
+	 * 若 session/DC 未就绪返回 false，由调用方决定是否重试。
+	 * @param {string} connId
+	 * @param {object} payload - 完整的 JSON 帧（通常是 { type: 'event', event, payload }）
+	 * @returns {boolean} true=已入队发送，false=未能发送（session 不存在 / DC 未 open）
+	 */
+	sendTo(connId, payload) {
+		const session = this.__sessions.get(connId);
+		if (!session) return false;
+		const q = session.rpcSendQueue;
+		if (!q || session.rpcChannel?.readyState !== 'open') return false;
+		try {
+			q.send(JSON.stringify(payload));
+			return true;
+		} catch (err) {
+			this.__logDebug(`[${connId}] sendTo failed: ${err.message}`);
+			return false;
+		}
+	}
+
 	async __handleOffer(msg) {
 		const connId = msg.fromConnId;
 		const isIceRestart = !!msg.payload?.iceRestart;
@@ -307,6 +328,9 @@ export class WebRtcPeer {
 				if (pair) {
 					this.__logNominatedPair(connId, pair);
 				}
+				// ICE restart 或初次选中都会触发；让出一次 CPU 后再单播 transport 信息。
+				// 签名去重保证 pair 不变时不会重复发送。
+				queueMicrotask(() => this.__sendPeerTransport(connId));
 			};
 		}
 
@@ -424,6 +448,12 @@ export class WebRtcPeer {
 		dc.onopen = () => {
 			this.__remoteLog(`dc.open conn=${connId} label=${dc.label}`);
 			this.logger.info?.(`${this.__rtcTag} [${connId}] DataChannel "${dc.label}" opened`);
+			// rpc DC 建立后，把本端 transport 信息单播给 UI。
+			// queueMicrotask 让出一次 CPU：确保 pion 侧 selectedCandidatePair setter 已 assign，
+			// 同时避免在 onopen 同步栈里触发可能的重入。
+			if (dc.label === 'rpc') {
+				queueMicrotask(() => this.__sendPeerTransport(connId));
+			}
 		};
 		dc.onclose = () => {
 			this.__remoteLog(`dc.closed conn=${connId} label=${dc.label}`);
@@ -481,12 +511,51 @@ export class WebRtcPeer {
 	}
 
 	__logNominatedPair(connId, pair) {
-		const localInfo = `${pair.local?.type ?? '?'} ${pair.local?.address ?? pair.local?.host ?? '?'}:${pair.local?.port ?? '?'}`;
-		const remoteInfo = `${pair.remote?.type ?? '?'} ${pair.remote?.address ?? pair.remote?.host ?? '?'}:${pair.remote?.port ?? '?'}`;
+		const l = pair.local, r = pair.remote;
+		const lProto = (l?.protocol ?? '?').toLowerCase();
+		const rProto = (r?.protocol ?? '?').toLowerCase();
+		const lRelay = l?.relayProtocol ? `(${String(l.relayProtocol).toLowerCase()})` : '';
+		const localInfo = `${l?.type ?? '?'}/${lProto}${lRelay} ${l?.address ?? l?.host ?? '?'}:${l?.port ?? '?'}`;
+		const remoteInfo = `${r?.type ?? '?'}/${rProto} ${r?.address ?? r?.host ?? '?'}:${r?.port ?? '?'}`;
 		this.__remoteLog(`rtc.ice-nominated conn=${connId} local=${localInfo} remote=${remoteInfo}`);
 		this.logger.info?.(`${this.__rtcTag} [${connId}] ICE nominated: local=${localInfo} remote=${remoteInfo}`);
 	}
 
+	/**
+	 * 把当前 session 本端 candidate 的 transport 信息（type/protocol/relayProtocol）
+	 * 通过 coclaw.rtc.peerTransport 事件单播给对应 UI。已内置签名去重，
+	 * 同一签名不会重复发送；发送失败（DC 未 open）时回滚签名允许后续重试。
+	 *
+	 * @param {string} connId
+	 */
+	__sendPeerTransport(connId) {
+		const session = this.__sessions.get(connId);
+		if (!session) return;
+		const local = session.pc?.selectedCandidatePair?.local;
+		if (!local) return; // nominated pair 尚未产生
+		const payload = {
+			candidateType: local.type ?? 'unknown',
+			protocol: String(local.protocol ?? 'udp').toLowerCase(),
+			relayProtocol: local.relayProtocol
+				? String(local.relayProtocol).toLowerCase()
+				: null,
+		};
+		const sig = `${payload.candidateType}|${payload.protocol}|${payload.relayProtocol ?? ''}`;
+		if (session.__lastPeerTransportSig === sig) return;
+		session.__lastPeerTransportSig = sig;
+		const ok = this.sendTo(connId, {
+			type: 'event',
+			event: 'coclaw.rtc.peerTransport',
+			payload,
+		});
+		if (!ok) {
+			// DC 尚未 open，回滚签名以便 dc.onopen 再次触发时重发
+			session.__lastPeerTransportSig = null;
+			return;
+		}
+		this.__remoteLog(`rtc.peer-transport conn=${connId} type=${payload.candidateType} proto=${payload.protocol} relay=${payload.relayProtocol ?? '-'}`);
+	}
+
 	__remoteLog(msg) {
 		remoteLog(this.__impl ? `${msg} rtc=${this.__impl}` : msg);
 	}