@honor-claw/yoyo 1.2.0-beta.6 → 1.2.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@honor-claw/yoyo",
-  "version": "1.2.0-beta.6",
+  "version": "1.2.0-beta.8",
   "description": "OpenClaw Honor Yoyo connection plugin",
   "keywords": [
     "ai",

package/src/apis/claw-cloud.ts

@@ -109,10 +109,11 @@ export class ClawCloudClient {
     params: ExchangeTokenParams,
   ): Promise<TokenResponseV2> {
     // 构建请求头
+    const traceId = uuid();
     const headers: ExchangeTokenHeaders = {
       "Content-Type": "application/json",
       "x-device-id": deviceInfo.deviceId,
-      "x-trace-id": uuid(),
+      "x-trace-id": traceId,
     };
 
     let data: ExchangeTokenRequest = {};
@@ -142,7 +143,7 @@ export class ClawCloudClient {
       return response.data.data;
     }
 
-    throw new Error(`failed to get token: ${response.data?.cnMessage}`);
+    throw new Error(`failed to get token: ${JSON.stringify(response.data)}, traceId: ${traceId}`);
   }
 }
 

package/src/cloud-channel/channel.ts

@@ -32,7 +32,7 @@ export class ClawChannel {
       config: {
         deviceInfo: config.deviceInfo,
         onStatusEvent: this.handleStatusEvent,
-        onReply: (message, logDeviceId) => this.cloudClient.send(message, logDeviceId),
+        onReply: (message) => this.cloudClient.send(message),
       },
     });
 

package/src/cloud-channel/client.ts

@@ -151,7 +151,7 @@ export class ClawCloudSocketClient {
   /**
    * 发送消息
    */
-  send(message: YOYOClawServiceEvent, toDeviceId?: string): boolean {
+  send(message: YOYOClawServiceEvent): boolean {
     if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
       useClawLogger().error("[claw-cloud-socket] cannot send message: connection not open");
       return false;
@@ -165,7 +165,7 @@ export class ClawCloudSocketClient {
     } catch (error) {
       useClawLogger().error(
         `[claw-cloud-socket] failed to send message to cloud session ${message.targetDeviceId},
-         device: ${toDeviceId}: ${error instanceof Error ? error.message : String(error)}`,
+        ${error instanceof Error ? error.message : String(error)}`,
       );
       return false;
     }

package/src/cloud-channel/message-handler.ts

@@ -254,7 +254,7 @@ export class MessageHandler {
       }
     } catch (error) {
       useClawLogger().error(
-        `${LOG_PREFIX} failed to send gateway message to ${hardwareDeviceId}: ${String(error)}, session: ${sourceDeviceId}`,
+        `${LOG_PREFIX} failed to send gateway message to device: ${hardwareDeviceId}, session: ${sourceDeviceId}, ${String(error)}`,
       );
     }
   }
@@ -356,43 +356,40 @@ export class MessageHandler {
     try {
       // 使用当前接收到的socket对应deviceId的来源信息
       const targetDeviceId = sessionInfo.sourceInfo.sourceDeviceId;
-      const gatewayRawData = JSON.parse(data);
-      let cloudData = data;
 
       // 收到NOT_PAIRED错误时，自动获取待配对设备并审批
-      if (!gatewayRawData.ok && gatewayRawData.error?.code === "NOT_PAIRED") {
-        try {
-          await this.handleAutoPair();
-          cloudData = JSON.stringify({
-            ok: true,
-            type: "res",
-            id: gatewayRawData.id,
-            payload: {
-              type: "hello-ok",
-            },
-          });
-          useClawLogger().info(`${LOG_PREFIX} auto pair succeefully`);
-        } catch (error) {
-          useClawLogger().error(`${LOG_PREFIX} auto pair failed: ${String(error)}`);
+      let rawData: Record<string, any>;
+      try {
+        rawData = JSON.parse(data);
+      } catch {
+        useClawLogger().warn(`${LOG_PREFIX} gateway message is not valid JSON`);
+        return;
+      }
+
+      if (!rawData.ok && rawData.error?.code === "NOT_PAIRED") {
+        const requestId = rawData.error?.details?.requestId;
+        if (!requestId) {
+          useClawLogger().warn(`${LOG_PREFIX} NOT_PAIRED without requestId, ignoring...`);
+          return;
+        }
+        const success = await this.handleAutoPair(requestId);
+        if (success) {
+          const bizExtInfo = { id: rawData.id, type: "reconnect-required" };
+          this.sendMessage("deviceControl", targetDeviceId, traceInfo, "", undefined, bizExtInfo);
+          useClawLogger().info(`${LOG_PREFIX} auto pair is completed, requestId: ${requestId}`);
+          return;
         }
       }
 
       useClawLogger().debug?.(
-        `${LOG_PREFIX} trans gateway msg to cloud device: ${targetDeviceId}, ${cloudData.slice(0, 1000)}`,
+        `${LOG_PREFIX} trans gateway msg to cloud, session: ${targetDeviceId}, data: ${data.slice(0, 1000)}`,
       );
 
-      const result = this.sendMessage(
-        "userMessage",
-        targetDeviceId,
-        traceInfo,
-        cloudData,
-        undefined,
-        deviceId,
-      );
+      const result = this.sendMessage("userMessage", targetDeviceId, traceInfo, data);
       if (!result) {
-        // 云socket挂了，这个gateway连接就需要取消掉，最好不要一次性把所有的gateway连接都干掉，让惰性关闭
+        // 云socket挂了，这个gateway连接就需要取消掉，最好不要一次性把所有的gateway连接都干掉，让惰性关闭，以及设备ID的打印放到这里了
         useClawLogger().error(
-          `${LOG_PREFIX} failed to send message, cloud socket closed, from ${targetDeviceId}`,
+          `${LOG_PREFIX} failed to send message, cloud socket closed, session ${targetDeviceId}, device ${deviceId}`,
         );
         this.sessionManager.closeNodeGatewayClient(targetDeviceId);
       }
@@ -401,26 +398,25 @@ export class MessageHandler {
     }
   };
 
-  private async handleAutoPair(): Promise<void> {
+  private async handleAutoPair(requestId: string): Promise<boolean> {
     const adminClient = this.adminClientManager.getClient();
     if (!adminClient) {
       useClawLogger().warn(`${LOG_PREFIX} admin client not available for auto pair`);
-      return;
+      return false;
     }
 
-    useClawLogger().info(`${LOG_PREFIX} NOT_PAIRED detected, fetching pending pair list...`);
-    const pairList = await adminClient.devicePairList();
-    const pendingDevices = pairList.pending ?? [];
-
-    for (const device of pendingDevices) {
-      useClawLogger().info(
-        `${LOG_PREFIX} auto approving device: ${device.deviceId}, requestId: ${device.requestId}`,
+    try {
+      useClawLogger().info(`${LOG_PREFIX} auto pair approve, requestId: ${requestId}`);
+      const res = await adminClient.devicePairApprove(requestId);
+      if (!res.ok) {
+        throw new Error(JSON.stringify(res.error));
+      }
+      return true;
+    } catch (error) {
+      useClawLogger().error(
+        `${LOG_PREFIX} auto pair approve failed, requestId: ${requestId}, error: ${String(error)}`,
       );
-      await adminClient.devicePairApprove(device.requestId);
-    }
-
-    if (pendingDevices.length === 0) {
-      useClawLogger().info(`${LOG_PREFIX} no pending devices found for auto pair`);
+      return false;
     }
   }
 
@@ -502,9 +498,9 @@ export class MessageHandler {
     msgType: YOYOClawServiceEvent["msgType"],
     targetDeviceId: string,
     traceInfo: YOYOClawServiceEvent["traceInfo"],
-    data: string | Record<string, unknown>,
+    data?: string | Record<string, unknown>,
     contexts?: YOYOClawServiceEvent["contexts"],
-    logDeviceId?: string,
+    bizExtInfo?: Record<string, unknown>,
   ): boolean {
     const message: YOYOClawServiceEvent = {
       msgType,
@@ -516,8 +512,9 @@ export class MessageHandler {
       port: this.config.deviceInfo.port,
       data: typeof data === "string" ? data : JSON.stringify(data),
       contexts,
+      bizExtInfo,
     };
-    return this.config.onReply(message, logDeviceId ?? targetDeviceId);
+    return this.config.onReply(message, targetDeviceId);
   }
 
   private validateContext(context?: YOYOClawServiceContext): {

package/src/cloud-channel/types.ts

@@ -27,7 +27,8 @@ export interface YOYOClawServiceEvent {
     | "devicePairMessage"
     | "deviceUnPairMessage"
     | "fetchContexts"
-    | "updateContexts";
+    | "updateContexts"
+    | "deviceControl";
   /**
    * 会话轮次等追加信息，只有配对消息有
    */
@@ -38,6 +39,10 @@ export interface YOYOClawServiceEvent {
    * 上下文信息
    */
   contexts?: YOYOClawServiceContext[];
+  /**
+   * 业务扩展信息
+   */
+  bizExtInfo?: Record<string, any>;
 }
 
 /**

package/src/gateway-client/admin-client.ts

@@ -20,6 +20,7 @@ const ADMIN_CONFIG = {
     "operator.admin",
     "operator.read",
     "operator.write",
+    "operator.talk.secrets",
     "operator.approvals",
     "operator.pairing",
   ],