@coclaw/openclaw-coclaw 0.9.1 → 0.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coclaw/openclaw-coclaw",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "type": "module",
   "license": "Apache-2.0",
   "description": "OpenClaw CoClaw channel plugin for remote chat",

package/src/realtime-bridge.js

@@ -98,6 +98,7 @@ export class RealtimeBridge {
 		this.__serverHbMissCount = 0;
 		this.__deviceIdentity = null;
 		this.webrtcPeer = null;
+		this.__webrtcPeerReady = null;
 		this.__fileHandler = null;
 	}
 
@@ -196,6 +197,35 @@ export class RealtimeBridge {
 		this.gatewayPendingRequests.clear();
 	}
 
+	/** 懒加载 WebRtcPeer（promise 锁防并发重复创建） */
+	async __initWebrtcPeer() {
+		const { WebRtcPeer } = await import('./webrtc-peer.js');
+		const { createFileHandler } = await import('./file-manager/handler.js');
+		/* c8 ignore start -- 仅通过 WebRTC 路径触发，集成测试覆盖 */
+		this.__fileHandler = createFileHandler({
+			resolveWorkspace: (agentId) => this.__resolveWorkspace(agentId),
+			logger: this.logger,
+		});
+		this.__fileHandler.scheduleTmpCleanup(() => this.__listAgentWorkspaces());
+		/* c8 ignore stop */
+		this.webrtcPeer = new WebRtcPeer({
+			onSend: (msg) => this.__forwardToServer(msg),
+			onRequest: (dcPayload) => {
+				void this.__handleGatewayRequestFromServer(dcPayload);
+			},
+			/* c8 ignore start -- 仅通过 WebRTC 路径触发，集成测试覆盖 */
+			onFileRpc: (payload, sendFn) => {
+				this.__fileHandler.handleRpcRequest(payload, sendFn)
+					.catch((err) => this.logger.warn?.(`[coclaw/file] rpc error: ${err.message}`));
+			},
+			onFileChannel: (dc) => {
+				this.__fileHandler.handleFileChannel(dc);
+			},
+			/* c8 ignore stop */
+			logger: this.logger,
+		});
+	}
+
 	/* c8 ignore next 7 -- 防御性检查，serverWs 通常在调用时可用 */
 	__forwardToServer(payload) {
 		if (!this.serverWs || this.serverWs.readyState !== 1) {
@@ -681,9 +711,12 @@ export class RealtimeBridge {
 		if (!this.started || this.reconnectTimer) {
 			return;
 		}
-		this.reconnectTimer = setTimeout(async () => {
+		this.reconnectTimer = setTimeout(() => {
 			this.reconnectTimer = null;
-			await this.__connectIfNeeded();
+			this.__connectIfNeeded().catch((err) => {
+				/* c8 ignore next -- 防御性兜底，__connectIfNeeded 内部已有完整错误处理 */
+				this.logger.warn?.(`[coclaw] reconnect failed: ${err?.message}`);
+			});
 		}, RECONNECT_MS);
 		this.reconnectTimer.unref?.();
 	}
@@ -754,33 +787,13 @@ export class RealtimeBridge {
 				}
 				if (payload?.type?.startsWith('rtc:')) {
 					try {
-						if (!this.webrtcPeer) {
-							const { WebRtcPeer } = await import('./webrtc-peer.js');
-							const { createFileHandler } = await import('./file-manager/handler.js');
-							/* c8 ignore start -- 仅通过 WebRTC 路径触发，集成测试覆盖 */
-							this.__fileHandler = createFileHandler({
-								resolveWorkspace: (agentId) => this.__resolveWorkspace(agentId),
-								logger: this.logger,
-							});
-							this.__fileHandler.scheduleTmpCleanup(() => this.__listAgentWorkspaces());
-							/* c8 ignore stop */
-							this.webrtcPeer = new WebRtcPeer({
-								onSend: (msg) => this.__forwardToServer(msg),
-								onRequest: (dcPayload) => {
-									void this.__handleGatewayRequestFromServer(dcPayload);
-								},
-								/* c8 ignore start -- 仅通过 WebRTC 路径触发，集成测试覆盖 */
-								onFileRpc: (payload, sendFn) => {
-									this.__fileHandler.handleRpcRequest(payload, sendFn)
-										.catch((err) => this.logger.warn?.(`[coclaw/file] rpc error: ${err.message}`));
-								},
-								onFileChannel: (dc) => {
-									this.__fileHandler.handleFileChannel(dc);
-								},
-								/* c8 ignore stop */
-								logger: this.logger,
+						if (!this.__webrtcPeerReady) {
+							this.__webrtcPeerReady = this.__initWebrtcPeer().catch((err) => {
+								this.__webrtcPeerReady = null;
+								throw err;
 							});
 						}
+						await this.__webrtcPeerReady;
 						await this.webrtcPeer.handleSignaling(payload);
 					} catch (err) {
 						this.logger.warn?.(`[coclaw/rtc] signaling error (or werift not found): ${err?.message}`);
@@ -816,6 +829,7 @@ export class RealtimeBridge {
 				/* c8 ignore next 3 -- 防御性兜底，werift close 异常时不可崩溃 gateway */
 				catch (e) { this.logger.warn?.(`[coclaw/rtc] closeAll failed: ${e?.message}`); }
 				this.webrtcPeer = null;
+				this.__webrtcPeerReady = null;
 			}
 			if (this.__fileHandler) {
 				this.__fileHandler.cancelCleanup();
@@ -882,6 +896,7 @@ export class RealtimeBridge {
 		if (this.webrtcPeer) {
 			await this.webrtcPeer.closeAll().catch(() => {});
 			this.webrtcPeer = null;
+			this.__webrtcPeerReady = null;
 		}
 		if (this.__fileHandler) {
 			this.__fileHandler.cancelCleanup();