@honor-claw/yoyo 1.1.2 → 1.1.4-beta.1

package/src/modules/claw-configs/types.ts

@@ -1,34 +1,34 @@
-/**
- * Claw 配置类型定义
- */
-
-import type { OpenClawConfig } from 'openclaw/plugin-sdk';
-
-/**
- * Gateway 认证配置
- */
-export type GatewayAuthConfig = Pick<OpenClawConfig['gateway']['auth'], 'token' | 'password'>;
-
-/**
- * 用户配置信息
- */
-export interface UserConfig {
-  token?: string;
-  expired?: number;
-  userId?: string;
-  userName?: string;
-}
-
-/**
- * YoyoClaw 插件配置
- */
-export interface YoyoClawPluginConfig {
-  enabled?: boolean;
-  config?: {
-    user?: UserConfig;
-    /** 运行环境：test 或 production */
-    env?: 'dev' | 'test' | 'production';
-    /** 灰度标签 */
-    gray?: string;
-  };
-}
+/**
+ * Claw 配置类型定义
+ */
+
+import type { OpenClawConfig } from 'openclaw/plugin-sdk';
+
+/**
+ * Gateway 认证配置
+ */
+export type GatewayAuthConfig = Pick<NonNullable<NonNullable<OpenClawConfig['gateway']>['auth']>, 'token' | 'password'>;
+
+/**
+ * 用户配置信息
+ */
+export interface UserConfig {
+  token?: string;
+  expired?: number;
+  userId?: string;
+  userName?: string;
+}
+
+/**
+ * YoyoClaw 插件配置
+ */
+export interface YoyoClawPluginConfig {
+  enabled?: boolean;
+  config?: {
+    user?: UserConfig;
+    /** 运行环境：test 或 production */
+    env?: 'dev' | 'test' | 'production';
+    /** 灰度标签 */
+    gray?: string;
+  };
+}

package/src/modules/device/device-info.ts

@@ -77,6 +77,6 @@ export function getDeviceInfo(): DeviceInfo {
     port: configManager.getGatewayPort(),
   };
 
-  useClawLogger().info(`[yoyoclaw-device] device info: ${JSON.stringify(deviceInfo)}`);
+  useClawLogger().debug?.(`[yoyoclaw-device] device info: ${JSON.stringify(deviceInfo)}`);
   return deviceInfo;
 }

package/src/modules/device/index.ts

@@ -1,3 +1,3 @@
-export * from './registry.js';
-export * from './device-info.js';
-export * from './providers/base.js';
+export * from './registry.js';
+export * from './device-info.js';
+export * from './providers/base.js';

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

@@ -1,32 +1,32 @@
-import type { DeviceType } from "../../../types.js";
-
-
-/**
- * 设备信息提供者基础接口
- */
-export interface DeviceInfoProvider {
-  /**
-   * 获取设备唯一ID
-   */
-  getDeviceId(): string;
-
-  /**
-   * 获取设备名称
-   */
-  getDeviceName(): string;
-
-  /**
-   * 获取设备型号
-   */
-  getDeviceModel(): string;
-
-  /**
-   * 获取设备类型
-   */
-  getDeviceType(): DeviceType;
-  
-  /**
-   * 获取设备品牌
-   */
-  getDeviceBrand(): string;
-}
+import type { DeviceType } from "../../../types.js";
+
+
+/**
+ * 设备信息提供者基础接口
+ */
+export interface DeviceInfoProvider {
+  /**
+   * 获取设备唯一ID
+   */
+  getDeviceId(): string;
+
+  /**
+   * 获取设备名称
+   */
+  getDeviceName(): string;
+
+  /**
+   * 获取设备型号
+   */
+  getDeviceModel(): string;
+
+  /**
+   * 获取设备类型
+   */
+  getDeviceType(): DeviceType;
+  
+  /**
+   * 获取设备品牌
+   */
+  getDeviceBrand(): string;
+}

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

@@ -1,107 +1,107 @@
-/**
- * Pad 设备信息提供者
- */
-import { execSync } from 'child_process';
-import { createHash } from 'crypto';
-import type { DeviceInfoProvider } from './base.js';
-import type { DeviceType } from '../../../types.js';
-
-export class PadDevice implements DeviceInfoProvider {
-  /**
-   * 通过 /system/bin/getprop 获取 Android 系统属性
-   */
-  private getAndroidProp(prop: string): string {
-    try {
-      const result = execSync(`/system/bin/getprop ${prop}`, {
-        encoding: 'utf-8',
-        timeout: 5000,
-      });
-      const value = result.trim();
-      return value || '';
-    } catch {
-      return '';
-    }
-  }
-
-  /**
-   * 获取 Android ID
-   */
-  private getAndroidId(): string {
-    try {
-      const result = execSync('/system/bin/settings get secure android_id', {
-        encoding: 'utf-8',
-        timeout: 5000,
-      });
-      const value = result.trim();
-      return value && value !== 'null' ? value : '';
-    } catch {
-      return '';
-    }
-  }
-
-  /**
-   * 获取 Android 设备唯一ID (SHA256 哈希)
-   */
-  private getAndroidDeviceId(): string {
-    const androidId = this.getAndroidId();
-    const brand = this.getAndroidProp('ro.product.brand');
-    const model = this.getAndroidProp('ro.product.model');
-    const device = this.getAndroidProp('ro.product.device');
-
-    const raw = `${androidId}_${brand}_${model}_${device}`;
-    return createHash('sha256').update(raw, 'utf-8').digest('hex');
-  }
-
-  /**
-   * 获取 Android 设备型号
-   */
-  private getAndroidDeviceModel(): string {
-    const model = this.getAndroidProp('ro.product.model');
-    return model || 'Android Device';
-  }
-
-  /**
-   * 获取 Android 设备名称
-   */
-  private getAndroidDeviceName(): string {
-    return this.getAndroidDeviceModel();
-  }
-
-  /**
-   * 获取设备唯一ID
-   */
-  getDeviceId(): string {
-    const deviceId = this.getAndroidDeviceId();
-    return deviceId || 'invalid';
-  }
-
-  /**
-   * 获取设备名称
-   */
-  getDeviceName(): string {
-    return this.getAndroidDeviceName();
-  }
-
-  /**
-   * 获取设备型号
-   */
-  getDeviceModel(): string {
-    return this.getAndroidDeviceModel();
-  }
-
-  /**
-   * 获取设备类型
-   */
-  getDeviceType(): DeviceType {
-    return 'pad';
-  }
-
-  /**
-   * 获取设备品牌
-   */
-  getDeviceBrand(): string {
-    const brand = this.getAndroidProp('ro.product.brand');
-
-    return brand.toLowerCase() === 'honor' ? 'HONOR' : '';
-  }
-}
+/**
+ * Pad 设备信息提供者
+ */
+import { execSync } from 'child_process';
+import { createHash } from 'crypto';
+import type { DeviceInfoProvider } from './base.js';
+import type { DeviceType } from '../../../types.js';
+
+export class PadDevice implements DeviceInfoProvider {
+  /**
+   * 通过 /system/bin/getprop 获取 Android 系统属性
+   */
+  private getAndroidProp(prop: string): string {
+    try {
+      const result = execSync(`/system/bin/getprop ${prop}`, {
+        encoding: 'utf-8',
+        timeout: 5000,
+      });
+      const value = result.trim();
+      return value || '';
+    } catch {
+      return '';
+    }
+  }
+
+  /**
+   * 获取 Android ID
+   */
+  private getAndroidId(): string {
+    try {
+      const result = execSync('/system/bin/settings get secure android_id', {
+        encoding: 'utf-8',
+        timeout: 5000,
+      });
+      const value = result.trim();
+      return value && value !== 'null' ? value : '';
+    } catch {
+      return '';
+    }
+  }
+
+  /**
+   * 获取 Android 设备唯一ID (SHA256 哈希)
+   */
+  private getAndroidDeviceId(): string {
+    const androidId = this.getAndroidId();
+    const brand = this.getAndroidProp('ro.product.brand');
+    const model = this.getAndroidProp('ro.product.model');
+    const device = this.getAndroidProp('ro.product.device');
+
+    const raw = `${androidId}_${brand}_${model}_${device}`;
+    return createHash('sha256').update(raw, 'utf-8').digest('hex');
+  }
+
+  /**
+   * 获取 Android 设备型号
+   */
+  private getAndroidDeviceModel(): string {
+    const model = this.getAndroidProp('ro.product.model');
+    return model || 'Android Device';
+  }
+
+  /**
+   * 获取 Android 设备名称
+   */
+  private getAndroidDeviceName(): string {
+    return this.getAndroidDeviceModel();
+  }
+
+  /**
+   * 获取设备唯一ID
+   */
+  getDeviceId(): string {
+    const deviceId = this.getAndroidDeviceId();
+    return deviceId || 'invalid';
+  }
+
+  /**
+   * 获取设备名称
+   */
+  getDeviceName(): string {
+    return this.getAndroidDeviceName();
+  }
+
+  /**
+   * 获取设备型号
+   */
+  getDeviceModel(): string {
+    return this.getAndroidDeviceModel();
+  }
+
+  /**
+   * 获取设备类型
+   */
+  getDeviceType(): DeviceType {
+    return 'pad';
+  }
+
+  /**
+   * 获取设备品牌
+   */
+  getDeviceBrand(): string {
+    const brand = this.getAndroidProp('ro.product.brand');
+
+    return brand.toLowerCase() === 'honor' ? 'HONOR' : '';
+  }
+}

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

@@ -1,130 +1,130 @@
-/**
- * Windows 设备信息提供者
- */
-import { v4 as uuidv4 } from 'uuid';
-import os from 'os';
-import { execSync } from 'child_process';
-import type { DeviceInfoProvider } from './base.js';
-import type { DeviceType } from '../../../types.js';
-
-export class WindowsDeviceInfoProvider implements DeviceInfoProvider {
-  /**
-   * 执行 PowerShell 命令并获取输出
-   */
-  private execPowerShell(command: string): string {
-    try {
-      return execSync(`powershell -Command "${command}"`, { encoding: 'utf-8' }).trim();
-    } catch {
-      return '';
-    }
-  }
-
-  /**
-   * 获取 Windows 设备型号
-   */
-  private getWindowsDeviceModel(): string {
-    try {
-      const model = this.execPowerShell(
-        "(Get-CimInstance -ClassName Win32_ComputerSystem).Model"
-      );
-      return model || 'Windows PC';
-    } catch {
-      return 'Windows PC';
-    }
-  }
-
-  /**
-   * 获取 Windows 设备名称
-   */
-  private getWindowsDeviceName(): string {
-    const hostname = os.hostname();
-    const model = this.getWindowsDeviceModel();
-    return `${hostname} (${model})`;
-  }
-
-  /**
-   * 获取设备唯一ID
-   */
-  getDeviceId(): string {
-    try {
-      // 优先使用 MachineGuid
-      const machineGuid = this.execPowerShell(
-        '(Get-ItemProperty "HKLM:\\SOFTWARE\\Microsoft\\Cryptography").MachineGuid'
-      );
-      if (machineGuid) {
-        return machineGuid;
-      }
-
-      // 备用方案：使用主板序列号
-      const serial = this.execPowerShell(
-        '(Get-CimInstance -ClassName Win32_BIOS).SerialNumber'
-      );
-      if (serial) {
-        return serial;
-      }
-
-      // 最后备用方案：使用 UUID
-      return uuidv4();
-    } catch {
-      return uuidv4();
-    }
-  }
-
-  /**
-   * 获取设备名称
-   */
-  getDeviceName(): string {
-    return this.getWindowsDeviceName();
-  }
-
-  /**
-   * 获取设备型号
-   */
-  getDeviceModel(): string {
-    return this.getWindowsDeviceModel();
-  }
-
-  /**
-   * 获取设备品牌
-   */
-  getDeviceBrand(): string {
-    try {
-      // 方法1：检查注册表（快速但可能不准确）
-      const honorRegistry = this.execPowerShell(
-        'Get-ItemProperty "HKLM:\\SOFTWARE\\HONOR" -ErrorAction SilentlyContinue'
-      );
-      if (honorRegistry.length > 0) {
-        return 'HONOR';
-      }
-
-      // 方法2：通过计算机系统制造商判断（更可靠）
-      const manufacturer = this.execPowerShell(
-        "(Get-CimInstance -ClassName Win32_ComputerSystem).Manufacturer"
-      );
-      console.log(manufacturer)
-      if (manufacturer && manufacturer.toLowerCase().includes('honor')) {
-        return 'HONOR';
-      }
-
-      // 方法3：通过BIOS信息判断（最可靠）
-      const biosManufacturer = this.execPowerShell(
-        "(Get-CimInstance -ClassName Win32_BIOS).Manufacturer"
-      );
-      console.log(biosManufacturer)
-      if (biosManufacturer && biosManufacturer.toLowerCase().includes('honor')) {
-        return 'HONOR';
-      }
-
-      return '';
-    } catch {
-      return '';
-    }
-  }
-
-  /**
-   * 获取设备类型
-   */
-  getDeviceType(): DeviceType {
-    return 'pc';
-  }
-}
+/**
+ * Windows 设备信息提供者
+ */
+import { v4 as uuidv4 } from 'uuid';
+import os from 'os';
+import { execSync } from 'child_process';
+import type { DeviceInfoProvider } from './base.js';
+import type { DeviceType } from '../../../types.js';
+
+export class WindowsDeviceInfoProvider implements DeviceInfoProvider {
+  /**
+   * 执行 PowerShell 命令并获取输出
+   */
+  private execPowerShell(command: string): string {
+    try {
+      return execSync(`powershell -Command "${command}"`, { encoding: 'utf-8' }).trim();
+    } catch {
+      return '';
+    }
+  }
+
+  /**
+   * 获取 Windows 设备型号
+   */
+  private getWindowsDeviceModel(): string {
+    try {
+      const model = this.execPowerShell(
+        "(Get-CimInstance -ClassName Win32_ComputerSystem).Model"
+      );
+      return model || 'Windows PC';
+    } catch {
+      return 'Windows PC';
+    }
+  }
+
+  /**
+   * 获取 Windows 设备名称
+   */
+  private getWindowsDeviceName(): string {
+    const hostname = os.hostname();
+    const model = this.getWindowsDeviceModel();
+    return `${hostname} (${model})`;
+  }
+
+  /**
+   * 获取设备唯一ID
+   */
+  getDeviceId(): string {
+    try {
+      // 优先使用 MachineGuid
+      const machineGuid = this.execPowerShell(
+        '(Get-ItemProperty "HKLM:\\SOFTWARE\\Microsoft\\Cryptography").MachineGuid'
+      );
+      if (machineGuid) {
+        return machineGuid;
+      }
+
+      // 备用方案：使用主板序列号
+      const serial = this.execPowerShell(
+        '(Get-CimInstance -ClassName Win32_BIOS).SerialNumber'
+      );
+      if (serial) {
+        return serial;
+      }
+
+      // 最后备用方案：使用 UUID
+      return uuidv4();
+    } catch {
+      return uuidv4();
+    }
+  }
+
+  /**
+   * 获取设备名称
+   */
+  getDeviceName(): string {
+    return this.getWindowsDeviceName();
+  }
+
+  /**
+   * 获取设备型号
+   */
+  getDeviceModel(): string {
+    return this.getWindowsDeviceModel();
+  }
+
+  /**
+   * 获取设备品牌
+   */
+  getDeviceBrand(): string {
+    try {
+      // 方法1：检查注册表（快速但可能不准确）
+      const honorRegistry = this.execPowerShell(
+        'Get-ItemProperty "HKLM:\\SOFTWARE\\HONOR" -ErrorAction SilentlyContinue'
+      );
+      if (honorRegistry.length > 0) {
+        return 'HONOR';
+      }
+
+      // 方法2：通过计算机系统制造商判断（更可靠）
+      const manufacturer = this.execPowerShell(
+        "(Get-CimInstance -ClassName Win32_ComputerSystem).Manufacturer"
+      );
+      console.log(manufacturer)
+      if (manufacturer && manufacturer.toLowerCase().includes('honor')) {
+        return 'HONOR';
+      }
+
+      // 方法3：通过BIOS信息判断（最可靠）
+      const biosManufacturer = this.execPowerShell(
+        "(Get-CimInstance -ClassName Win32_BIOS).Manufacturer"
+      );
+      console.log(biosManufacturer)
+      if (biosManufacturer && biosManufacturer.toLowerCase().includes('honor')) {
+        return 'HONOR';
+      }
+
+      return '';
+    } catch {
+      return '';
+    }
+  }
+
+  /**
+   * 获取设备类型
+   */
+  getDeviceType(): DeviceType {
+    return 'pc';
+  }
+}