@honor-claw/yoyo 1.1.4-beta.2 → 1.1.4-beta.3

package/package.json

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

package/src/apis/honor-auth.ts

@@ -10,6 +10,7 @@ import { uuid } from "../utils/id.js";
 import { isOKResponse } from "./helpers.js";
 import { HttpClient, type HttpClientOptions } from "./http-client.js";
 import type { HttpApiWrapper } from "./types.js";
+import { wrapError } from "../utils/error.js";
 
 /**
  * PKCE参数
@@ -138,9 +139,7 @@ export class HonorAuthClient {
 
       throw new Error(`failed to get token: ${response.data?.cnMessage}`);
     } catch (error) {
-      throw new Error(
-        `failed to get token: ${error instanceof Error ? error.message : String(error)}`,
-      );
+      throw wrapError(error, "failed to get token");
     }
   }
 

package/src/honor-auth/browser.ts

@@ -2,6 +2,7 @@ import open from "open";
 import { createHonorAuthClient } from "../apis/honor-auth.js";
 import type { DeviceInfo, HonorUserInfo } from "../types.js";
 import { useClawLogger } from "../utils/logger.js";
+import { wrapError } from "../utils/error.js";
 import { startCallbackServer } from "./callback-server.js";
 import { getConfig } from "./config.js";
 import { saveToken } from "./token-manager.js";
@@ -46,16 +47,14 @@ export async function performOAuth2AuthWithBrowser(
   try {
     await open(authUrl);
   } catch (error) {
-    throw new Error("failed to open browser, check your permissions");
+    throw wrapError(error, "failed to open browser, check your permissions");
   }
 
   // 等待回调
   try {
     await serverPromise;
   } catch (error) {
-    throw new Error(
-      `authorization timeout: ${error instanceof Error ? error.message : String(error)}`,
-    );
+    throw wrapError(error, "authorization timeout");
   }
 
   if (!receivedCode) {
@@ -79,6 +78,6 @@ export async function performOAuth2AuthWithBrowser(
       userName: tokenInfo.userInfo.displayName,
     } as HonorUserInfo;
   } catch (error) {
-    throw new Error(`get token failed: ${error instanceof Error ? error.message : String(error)}`);
+    throw wrapError(error, "get token failed");
   }
 }

package/src/modules/claw-configs/identity-persist.ts

@@ -1,6 +1,7 @@
 import path from "node:path";
-import { safeReadFile, safeWriteFile, SafeFsError } from "../../utils/fs-safe.js";
+import { safeReadFile, safeWriteFile } from "../../utils/fs-safe.js";
 import { resolveEffectiveHomeDir } from "../../utils/home-dir.js";
+import { useClawLogger } from "../../utils/logger.js";
 
 /**
  * Identity 配置版本枚举
@@ -43,12 +44,7 @@ function getConfigPath(): string {
 /**
  * 内部方法：读取配置
  */
-async function loadConfig(): Promise<PersistedIdentity> {
-  const homeDir = resolveEffectiveHomeDir();
-  if (!homeDir) {
-    throw new SafeFsError("not-found", "failed to find home dir");
-  }
-
+async function loadConfig(homeDir: string): Promise<PersistedIdentity | null> {
   const configPath = getConfigPath();
 
   try {
@@ -70,13 +66,8 @@ async function loadConfig(): Promise<PersistedIdentity> {
       ...parsed,
     };
   } catch (error) {
-    if (error instanceof SafeFsError && error.code === "not-found") {
-      return createDefaultConfig();
-    }
-    if (error instanceof SyntaxError) {
-      return createDefaultConfig();
-    }
-    throw error;
+    useClawLogger().warn(`[yoyo-identity] failed to read identity: ${error.message}`);
+    return null;
   }
 }
 
@@ -85,7 +76,13 @@ async function loadConfig(): Promise<PersistedIdentity> {
  * @returns 如果存在则返回 Identity，否则返回 null
  */
 export async function getPersistedIdentity(): Promise<PersistedIdentity | null> {
-  const config = await loadConfig();
+  const homeDir = resolveEffectiveHomeDir();
+  if (!homeDir) {
+    useClawLogger().warn("[yoyo-identity] failed to find home dir");
+    return null;
+  }
+
+  const config = await loadConfig(homeDir);
 
   if (config) {
     return config;
@@ -101,19 +98,21 @@ export async function getPersistedIdentity(): Promise<PersistedIdentity | null>
  * @throws SafeFsError 当写入失败时
  */
 export async function updatePersistedIdentity(
-  identity: Partial<PersistedIdentity>
-): Promise<PersistedIdentity> {
+  identity: Partial<PersistedIdentity>,
+): Promise<PersistedIdentity | null> {
   const homeDir = resolveEffectiveHomeDir();
   if (!homeDir) {
-    throw new SafeFsError("not-found", "failed to find home dir");
+    useClawLogger().warn("[yoyo-identity] failed to find home dir");
+    return null;
   }
 
   // 读取现有配置
-  const existingConfig = await loadConfig();
+  const existingConfig = await loadConfig(homeDir);
 
   // 合并配置
   const updatedConfig: PersistedIdentity = {
     ...existingConfig,
+    version: existingConfig?.version || IdentityVersion.LEGACY,
   };
 
   if (identity.legacyDeviceId) {
@@ -162,25 +161,22 @@ function createDefaultConfig(): PersistedIdentity {
 export async function upgradeIdentityToV2(): Promise<PersistedIdentity | null> {
   const homeDir = resolveEffectiveHomeDir();
   if (!homeDir) {
-    throw new SafeFsError("not-found", "failed to find home dir");
+    useClawLogger().warn("[yoyo-identity] failed to find home dir");
+    return null;
   }
 
   // 读取现有配置
-  const existingConfig = await loadConfig();
+  const existingConfig = await loadConfig(homeDir);
 
-  // 如果已经是 v2，不需要处理
-  if (existingConfig.version === IdentityVersion.NEW) {
+  // 如果已经有配置了，不做处理，这里老版本不删除这个问题就不走缓存咧
+  if (existingConfig) {
+    useClawLogger().warn("[yoyo-identity] identity exist, upgrade ignored");
     return null;
   }
 
   // 升级到 v2，移除 legacyDeviceId
   const upgradedConfig: PersistedIdentity = {
     version: IdentityVersion.NEW,
-    deviceId: existingConfig.deviceId,
-    publicKeyPem: existingConfig.publicKeyPem,
-    privateKeyPem: existingConfig.privateKeyPem,
-    createdAtMs: existingConfig.createdAtMs,
-    // 故意不复制 legacyDeviceId，实现移除
   };
 
   // 写入升级后的配置
@@ -194,4 +190,4 @@ export async function upgradeIdentityToV2(): Promise<PersistedIdentity | null> {
   });
 
   return upgradedConfig;
-}
+}

package/src/modules/device/identity.ts

@@ -55,7 +55,7 @@ function fingerprintPublicKey(publicKeyPem: string): string {
 /**
  * Generate a new device identity with ED25519 key pair
  */
-function generateIdentity(identity: PersistedIdentity): DeviceIdentity {
+function generateIdentity(identity: PersistedIdentity | null): DeviceIdentity {
   const { publicKey, privateKey } = crypto.generateKeyPairSync("ed25519");
   const publicKeyPem = publicKey.export({ type: "spki", format: "pem" }).toString();
   const privateKeyPem = privateKey.export({ type: "pkcs8", format: "pem" }).toString();
@@ -68,7 +68,7 @@ function generateIdentity(identity: PersistedIdentity): DeviceIdentity {
     createdAtMs: Date.now(),
   } as DeviceIdentity;
 
-  if (identity.version === IdentityVersion.LEGACY) {
+  if (!identity || identity.version === IdentityVersion.LEGACY) {
     // 补充legacyDeviceId
     const provider = getDeviceInfoProvider();
     fullIdentity.legacyDeviceId = provider.getDeviceId();
@@ -87,6 +87,7 @@ export async function loadOrCreateDeviceIdentity(): Promise<DeviceIdentity> {
   const persisted = await getPersistedIdentity();
 
   if (
+    persisted &&
     persisted.deviceId &&
     persisted.publicKeyPem &&
     persisted.privateKeyPem &&

package/src/utils/error.ts

@@ -0,0 +1,13 @@
+/**
+ * 将错误封装为带有上下文信息的 Error
+ * @param error 原始错误
+ * @param context 错误上下文描述
+ * @returns 封装后的 Error 对象
+ */
+export function wrapError(error: unknown, context: string): Error {
+  const message = error instanceof Error ? error.message : String(error);
+  
+  return new Error(`${context}: ${message}`, {
+    cause: error,
+  });
+}