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

package/package.json

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

package/skills/yoyo-control/references/alarm-create.md

@@ -47,6 +47,7 @@ alarm.create
 │  - realRepeatType = 5(指定日期) 时，必须设置 specialTimeMillis   │
 │  - realRepeatType = 9(大小周) 时，必须设置 bigWeek               │
 │  - 校验时间格式是否为 THH:mm:ss                                │
+|  - 指代日期（如：明天、后天）的具体日期推理 → specialTimeMillis（时间戳）|
 └─────────────────────────────────────────────────────────────┘
                               ↓
 ┌─────────────────────────────────────────────────────────────┐
@@ -73,6 +74,7 @@ alarm.create
 | **创建指定日期闹钟**   | 2026年3月20日早上八点的闹钟 | `time`, `realRepeatType: 5`, `specialTimeMillis` | -        |
 | **创建节假日跳过闹钟** | 工作日闹钟，跳过节假日      | `time`, `realRepeatType: 1`, `skipHoliday: true` | -        |
 | **创建大小周闹钟**     | 大小周工作日上午九点的闹钟  | `time`, `realRepeatType: 9`, `bigWeek`           | -        |
+| **创建指代日期闹钟**   | 明天早上九点的闹钟          | `time`, `specialTimeMillis`                      | -        |
 
 ## 参数定义
 
@@ -471,6 +473,41 @@ cmd /c 'openclaw nodes invoke --node <ID> --command alarm.create --params "{\"ti
 openclaw nodes invoke --node <ID> --command alarm.create --params '{"time":"T08:30:00","realRepeatType":10,"daysOfWeek":0,"specialTimeMillis":0,"skipHoliday":false}'
 ```
 
+---
+
+### 示例 12: 创建指代日期闹钟
+
+**用户输入**: "创建明天早上八点的闹钟"
+**处理逻辑**: 
+1. 获取当前的日期，以“2026年4月15日12:09:57”为例，当前日期为 2026-04-15 12:09:57 对应时间戳： 1776226197000
+2. 根据用户输入推理闹钟时间为 2026-04-16 08:00:00，将时间转换为时间戳： 1776297600000
+3. `realRepeatType` 为 5，即为指定日期闹钟
+
+**JSON 参数**:
+
+```json
+{
+  "time": "T08:00:00",
+  "realRepeatType": 5,
+  "daysOfWeek": 0,
+  "specialTimeMillis": 1776297600000,
+  "skipHoliday": false
+}
+```
+
+**Windows (Cmd) 执行命令**:
+
+```bash
+cmd /c 'openclaw nodes invoke --node <ID> --command alarm.create --params "{\"time\":\"T08:00:00\",\"realRepeatType\":5,\"daysOfWeek\":0,\"specialTimeMillis\":1776297600000,\"skipHoliday\":false}"'
+
+```
+
+**Linux (Bash) 执行命令**:
+
+```bash
+openclaw nodes invoke --node <ID> --command alarm.create --params '{"time":"T08:00:00","realRepeatType":5,"daysOfWeek":0,"specialTimeMillis":1776297600000,"skipHoliday":false}'
+```
+
 ## 错误处理
 
 如果工具执行错误（300），可能原因如下：

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`);
@@ -408,12 +407,10 @@ export class MessageHandler {
     try {
       useClawLogger().info(`${LOG_PREFIX} auto pair approve, requestId: ${requestId}`);
       await adminClient.devicePairApprove(requestId);
-      return true;
     } 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/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 {
       // 初始化失败，使用默认值