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

package/skills/yoyo-control/references/usb-shared-network.md

@@ -7,7 +7,6 @@ description: >
 # Usb Shared Network USB共享网络
 
 ## Tool Command
-
 ```bash
 usb-shared-network
 ```
@@ -15,7 +14,6 @@ usb-shared-network
 ## 集成工作流
 
 ### Step 1: 意图解析与参数组装
-
 ```
 ┌─────────────────────────────────────────────────────────────┐
 │  意图识别与参数提取                                          │
@@ -43,18 +41,21 @@ usb-shared-network
 ```
 
 ### Step 2: 执行调用
-
 - 根据操作系统选择对应的命令格式
 - Windows: Cmd 格式（双引号需转义）
 - Linux: Bash 格式（单引号包裹）
 
 ## 参数定义
-
 ```json
 {
   "actionType": {
     "type": "string",
-    "enum": ["设置", "查询", "打开", "关闭"],
+    "enum": [
+      "设置",
+      "查询",
+      "打开",
+      "关闭"
+    ],
     "description": "必填参数，USB 共享网络相关操作的动作类型，用于明确本次指令的主要行为。当涉及调整 USB 共享网络配置时使用设置；当获取当前 USB 共享网络状态时使用查询；当启用 USB 共享网络功能时使用打开；当停用 USB 共享网络功能时使用关闭。"
   },
   "app": {
@@ -65,7 +66,6 @@ usb-shared-network
 ```
 
 ### 参数注意事项
-
 1. 必填参数：`actionType`是必填参数，其取值必须满足枚举值范围，必须是`"设置"`、`"查询"`、`"打开"`、`"关闭"`之一。
 2. 同义词/间接表述映射: "开启/打开/启用"统一识别为`actionType`的`打开`；"停用/禁用/关闭"统一识别为`关闭`；"设置/设定/调整/配置/进入设置页面"统一识别为`设置`；"查看/查询/了解状态"统一识别为`查询`。
 3. 默认值或缺省行为: 未指定`app`时视为对系统全局设置进行操作；`actionType`为必填，无明确语义时需追问用户。
@@ -81,7 +81,6 @@ usb-shared-network
 **工具**: "usb-shared-network"
 
 **JSON 参数**:
-
 ```json
 {
   "actionType": "打开"
@@ -89,13 +88,11 @@ usb-shared-network
 ```
 
 **Windows (Cmd) 执行命令**:
-
 ```bash
 cmd /c 'openclaw nodes invoke --node <ID> --command usb-shared-network --params "{\"actionType\":\"打开\"}"'
 ```
 
 **Linux (Bash) 执行命令**:
-
 ```bash
 openclaw nodes invoke --node <ID> --command usb-shared-network --params '{"actionType":"打开"}'
 ```
@@ -109,7 +106,6 @@ openclaw nodes invoke --node <ID> --command usb-shared-network --params '{"actio
 **工具**: "usb-shared-network"
 
 **JSON 参数**:
-
 ```json
 {
   "actionType": "关闭"
@@ -117,13 +113,11 @@ openclaw nodes invoke --node <ID> --command usb-shared-network --params '{"actio
 ```
 
 **Windows (Cmd) 执行命令**:
-
 ```bash
 cmd /c 'openclaw nodes invoke --node <ID> --command usb-shared-network --params "{\"actionType\":\"关闭\"}"'
 ```
 
 **Linux (Bash) 执行命令**:
-
 ```bash
 openclaw nodes invoke --node <ID> --command usb-shared-network --params '{"actionType":"关闭"}'
 ```
@@ -137,7 +131,6 @@ openclaw nodes invoke --node <ID> --command usb-shared-network --params '{"actio
 **工具**: "usb-shared-network"
 
 **JSON 参数**:
-
 ```json
 {
   "actionType": "设置"
@@ -145,13 +138,11 @@ openclaw nodes invoke --node <ID> --command usb-shared-network --params '{"actio
 ```
 
 **Windows (Cmd) 执行命令**:
-
 ```bash
 cmd /c 'openclaw nodes invoke --node <ID> --command usb-shared-network --params "{\"actionType\":\"设置\"}"'
 ```
 
 **Linux (Bash) 执行命令**:
-
 ```bash
 openclaw nodes invoke --node <ID> --command usb-shared-network --params '{"actionType":"设置"}'
 ```
@@ -165,7 +156,6 @@ openclaw nodes invoke --node <ID> --command usb-shared-network --params '{"actio
 **工具**: "usb-shared-network"
 
 **JSON 参数**:
-
 ```json
 {
   "actionType": "打开"
@@ -173,13 +163,11 @@ openclaw nodes invoke --node <ID> --command usb-shared-network --params '{"actio
 ```
 
 **Windows (Cmd) 执行命令**:
-
 ```bash
 cmd /c 'openclaw nodes invoke --node <ID> --command usb-shared-network --params "{\"actionType\":\"打开\"}"'
 ```
 
 **Linux (Bash) 执行命令**:
-
 ```bash
 openclaw nodes invoke --node <ID> --command usb-shared-network --params '{"actionType":"打开"}'
 ```
@@ -193,7 +181,6 @@ openclaw nodes invoke --node <ID> --command usb-shared-network --params '{"actio
 **工具**: "usb-shared-network"
 
 **JSON 参数**:
-
 ```json
 {
   "actionType": "设置"
@@ -201,13 +188,11 @@ openclaw nodes invoke --node <ID> --command usb-shared-network --params '{"actio
 ```
 
 **Windows (Cmd) 执行命令**:
-
 ```bash
 cmd /c 'openclaw nodes invoke --node <ID> --command usb-shared-network --params "{\"actionType\":\"设置\"}"'
 ```
 
 **Linux (Bash) 执行命令**:
-
 ```bash
 openclaw nodes invoke --node <ID> --command usb-shared-network --params '{"actionType":"设置"}'
-```
+```

package/src/cloud-channel/client.ts

@@ -26,7 +26,6 @@ export class ClawCloudSocketClient {
   private retryTimer: NodeJS.Timeout | null = null;
   private isManualClose = false;
   private isRetryPaused = false; // 重试状态
-  private hasRetried = false;
   // ping/pong 配置
   private pingTimer: NodeJS.Timeout | null = null;
   // 当前连接上下文
@@ -76,7 +75,6 @@ export class ClawCloudSocketClient {
     this.isManualClose = false;
     this.retryCount = 0;
     this.isRetryPaused = false;
-    this.hasRetried = false;
 
     this.startPingTimer();
 
@@ -257,25 +255,7 @@ export class ClawCloudSocketClient {
 
     this.clearRetryTimer();
 
-    // 首次重试立即执行，不等待
-    if (!this.hasRetried) {
-      this.hasRetried = true;
-      useClawLogger().info(`[claw-cloud-socket] first retry, reconnecting immediately`);
-
-      this.options.onStatusEvent?.({
-        type: StatusEventType.CLOUD_SOCKET_RETRY,
-        timestamp: Date.now(),
-        data: {
-          retryCount: this.retryCount,
-          delay: 0,
-        },
-      });
-
-      this.connect(true);
-      return;
-    }
-
-    // 后续重试使用指数退避: 1s → 2s → 4s，封顶4s无限重试
+    // 使用指数退避重试: 1s → 2s → 4s，封顶4s无限重试
     const delay = this.calculateRetryDelay();
     this.retryCount = Math.min(this.retryCount + 1, RETRY_COUNT_CAP);
 
@@ -365,7 +345,6 @@ export class ClawCloudSocketClient {
 
       if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
         this.retryCount = 0;
-        this.hasRetried = false;
         this.connect(true);
       }
     }

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

@@ -8,6 +8,7 @@ import {
   type DeviceSessionInfo,
   type YOYOClawServiceContext,
   type StatusEvent,
+  type RawGatewayMessage,
   StatusEventType,
 } from "./types.js";
 
@@ -358,7 +359,7 @@ export class MessageHandler {
       const targetDeviceId = sessionInfo.sourceInfo.sourceDeviceId;
 
       // 收到NOT_PAIRED错误时，自动获取待配对设备并审批
-      let rawData: Record<string, any>;
+      let rawData: RawGatewayMessage;
       try {
         rawData = JSON.parse(data);
       } catch {
@@ -367,18 +368,16 @@ export class MessageHandler {
       }
 
       if (!rawData.ok && rawData.error?.code === "NOT_PAIRED") {
-        const requestId = rawData.error?.details?.requestId;
+        const requestId = rawData.error?.details?.requestId as string | undefined;
         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;
-        }
+        await this.handleAutoPair(requestId);
+        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?.(
@@ -398,7 +397,7 @@ export class MessageHandler {
     }
   };
 
-  private async handleAutoPair(requestId: string): Promise<boolean> {
+  private async handleAutoPair(requestId: string) {
     const adminClient = this.adminClientManager.getClient();
     if (!adminClient) {
       useClawLogger().warn(`${LOG_PREFIX} admin client not available for auto pair`);
@@ -407,16 +406,11 @@ export class MessageHandler {
 
     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;
+      await adminClient.devicePairApprove(requestId);
     } catch (error) {
       useClawLogger().error(
-        `${LOG_PREFIX} auto pair approve failed, requestId: ${requestId}, error: ${String(error)}`,
+        `${LOG_PREFIX} auto pair approve failed, requestId: ${requestId}, error: ${String(error)}, ignore...`,
       );
-      return false;
     }
   }
 

package/src/cloud-channel/types.ts

@@ -42,7 +42,7 @@ export interface YOYOClawServiceEvent {
   /**
    * 业务扩展信息
    */
-  bizExtInfo?: Record<string, any>;
+  bizExtInfo?: Record<string, unknown>;
 }
 
 /**
@@ -126,3 +126,18 @@ export interface DeviceSessionInfo {
   timestamp: number;
   sourceInfo: ClawSocketSourceInfo;
 }
+
+/**
+ * 通用网关原始消息结构
+ * 用于 JSON.parse 后的数据结构，允许任意扩展字段
+ */
+export interface RawGatewayMessage {
+  ok?: boolean;
+  id?: string;
+  error?: {
+    code?: string;
+    message?: string;
+    details?: Record<string, unknown>;
+  };
+  [key: string]: unknown;
+}

package/src/commands/logout/impl.ts

@@ -25,7 +25,6 @@ export function registerLogoutCommand(api: OpenClawPluginApi, command: Command)
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
         console.error("❌ Logout failed:", errorMessage);
-        throw error;
       }
     });
 

package/src/honor-auth/cloud.ts

@@ -3,41 +3,35 @@ import { isOKResponse } from "../apis/index.js";
 import { getConfigManager } from "../modules/configs/index.js";
 import { getDeviceInfo } from "../modules/device/device-info.js";
 import type { HonorUserInfo } from "../types.js";
-import { wrapError } from "../utils/error.js";
 import { clearToken } from "./token-manager.js";
 
 /**
  * 执行登出流程
  */
 export async function performLogout(): Promise<void> {
-  try {
-    const configManager = getConfigManager();
-    const userConfig = configManager.getUserConfig();
+  const configManager = getConfigManager();
+  const userConfig = configManager.getUserConfig();
 
-    if (!userConfig?.token) {
-      console.log("⚠️  Not logged in");
-      return;
-    }
-
-    // 获取设备信息
-    const deviceInfo = await getDeviceInfo();
+  if (!userConfig?.token) {
+    throw new Error("⚠️ Not logged in");
+  }
 
-    // 调用登出接口
-    const client = createClawCloudClient();
+  // 获取设备信息
+  const deviceInfo = await getDeviceInfo();
 
-    const userInfo: HonorUserInfo = {
-      token: userConfig.token,
-    };
+  // 调用登出接口
+  const client = createClawCloudClient();
 
-    const response = await client.logoutDevice(deviceInfo, userInfo);
+  const userInfo: HonorUserInfo = {
+    token: userConfig.token,
+  };
 
-    if (!isOKResponse(response)) {
-      throw new Error(`Logout failed: ${response.data?.cnMessage || "Unknown error"}`);
-    }
+  const response = await client.logoutDevice(deviceInfo, userInfo);
 
-    // 清除Token
-    await clearToken();
-  } catch (error) {
-    throw wrapError(error, "failed to logout");
+  if (!isOKResponse(response)) {
+    throw new Error(response.data?.cnMessage || "Unknown error");
   }
+
+  // 清除Token
+  await clearToken();
 }

package/src/modules/device/providers/windows.ts

@@ -40,6 +40,31 @@ function getRegistryStringValueAsync(
   });
 }
 
+/**
+ * 异步检查注册表键是否存在
+ * 使用 winreg 的 values() 方法，键不存在时会报错
+ */
+function registryKeyExistsAsync(hive: number, keyPath: string): Promise<boolean> {
+  return new Promise((resolve) => {
+    try {
+      const regKey = new Registry({
+        hive,
+        key: keyPath,
+      });
+
+      regKey.values((err: Error | null) => {
+        if (err) {
+          resolve(false);
+        } else {
+          resolve(true);
+        }
+      });
+    } catch {
+      resolve(false);
+    }
+  });
+}
+
 export class WindowsDeviceInfoProvider implements DeviceInfoProvider {
   private cache: DeviceInfoCache = {
     deviceId: "",
@@ -111,11 +136,17 @@ export class WindowsDeviceInfoProvider implements DeviceInfoProvider {
         systemManufacturer2,
       ];
 
-      const manufacturer = manufacturerSources.find((m) => m && m.trim()) || "";
-      if (manufacturer.toLowerCase().includes("honor")) {
+      const manufacturer = manufacturerSources.find((m) => m && m.toLowerCase().includes("honor"));
+      if (manufacturer) {
         this.cache.deviceBrand = "HONOR";
       } else {
-        this.cache.deviceBrand = "";
+        // 最后兜底：检查 HKLM:\SOFTWARE\HONOR 注册表键是否存在
+        const honorKeyExists = await registryKeyExistsAsync(Registry.HKLM, "\\SOFTWARE\\HONOR");
+        if (honorKeyExists) {
+          this.cache.deviceBrand = "HONOR";
+        } else {
+          this.cache.deviceBrand = "";
+        }
       }
     } catch {
       // 初始化失败，使用默认值