@honor-claw/yoyo 0.0.1-alpha.1 → 0.0.1-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@honor-claw/yoyo",
-  "version": "0.0.1-alpha.1",
+  "version": "0.0.1-beta.2",
   "type": "module",
   "description": "OpenClaw Honor Yoyo connection plugin",
   "scripts": {
@@ -36,7 +36,6 @@
     "jsonwebtoken": "^9.0.3",
     "nanoid": "^5.1.6",
     "open": "^11.0.0",
-    "registry-js": "^1.16.1",
     "undici": "^7.3.0",
     "uuid": "^13.0.0",
     "ws": "^8.18.0",

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

@@ -2,20 +2,31 @@
  * Windows 设备信息提供者
  */
 import { v4 as uuidv4 } from 'uuid';
-import { enumerateValues, HKEY } from 'registry-js';
 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 values = enumerateValues(HKEY.HKEY_LOCAL_MACHINE, 'HARDWARE\\DESCRIPTION\\System\\BIOS');
-      const modelValue = values.find(v => v.name === 'SystemProductName');
-      const model = String(modelValue?.data || '').trim();
+      const model = this.execPowerShell(
+        "(Get-CimInstance -ClassName Win32_ComputerSystem).Model"
+      );
       return model || 'Windows PC';
     } catch {
       return 'Windows PC';
@@ -36,9 +47,24 @@ export class WindowsDeviceInfoProvider implements DeviceInfoProvider {
    */
   getDeviceId(): string {
     try {
-      const values = enumerateValues(HKEY.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Microsoft\\Cryptography');
-      const machineGuid = values.find(v => v.name === 'MachineGuid');
-      return String(machineGuid?.data || uuidv4());
+      // 优先使用 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();
     }