@honor-claw/yoyo 1.2.1-beta.4 → 1.2.1

package/package.json

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

package/src/cloud-channel/admin-client-manager.ts

@@ -29,9 +29,13 @@ export class AdminClientManager {
       return;
     }
 
-    const token = (getConfigManager().getGatewayAuthConfig()?.token || "") as string;
+    const gatewayAuthConfig = getConfigManager().getGatewayAuthConfig();
+    const token = typeof gatewayAuthConfig?.token === "string" ? gatewayAuthConfig.token : "";
+    const password =
+      typeof gatewayAuthConfig?.password === "string" ? gatewayAuthConfig.password : "";
     this.client = new AdminGatewayClient({
       token,
+      password,
       onAuthenticated: () => {
         useClawLogger().info("[yoyoclaw-channel] admin gateway client authenticated");
         this.ready = true;

package/src/cloud-channel/client.ts

@@ -196,7 +196,7 @@ export class ClawCloudSocketClient {
       useClawLogger().debug?.(
         `[yoyoclaw-channel] received cloud message from session ${message.wsOutputEvent?.sourceDeviceId}, deviceId ${
           message.wsOutputEvent?.sourceDeviceInfo?.deviceId || "nil"
-        }, ${dataText.slice(0, 1000)}`,
+        }, ${dataText.slice(0, 3000)}`,
       );
 
       if (message.code === "YOYO_CLAW_100000") {

package/src/gateway-client/protocol-client.ts

@@ -184,6 +184,7 @@ export class ProtocolGatewayClient extends GatewayClient {
       scopes: this.config.scopes,
       auth: {
         token: this.protocolOpts.token,
+        password: this.protocolOpts.password,
       },
       device,
     };

package/src/gateway-client/types/client.ts

@@ -43,6 +43,7 @@ export interface GatewayClientOptions {
 
 export interface ProtocolClientOptions extends GatewayClientOptions {
   token?: string;
+  password?: string;
   onAuthenticated?: () => void;
   onReconnectFailed?: () => void;
 }

package/src/modules/configs/config-manager.ts

@@ -101,22 +101,15 @@ export class ConfigManager {
         return undefined;
       }
 
-      const result: GatewayAuthConfig = { token: "", password: "" };
-
-      if (authConfig.token) {
-        result.token = authConfig.token;
-      }
-
-      if (authConfig.password) {
-        result.password = authConfig.password;
-      }
+      const token = authConfig.token ?? "";
+      const password = authConfig.password ?? "";
 
       // 如果没有任何认证信息，返回 undefined
-      if (Object.keys(result).length === 0) {
+      if (!token && !password) {
         return undefined;
       }
 
-      return result;
+      return { token, password };
     } catch (error) {
       console.error(`[claw-configs] Failed to read gateway auth config: ${error}`);
       return undefined;

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

@@ -24,6 +24,7 @@ export interface PersistedIdentity {
   publicKeyPem?: string;
   privateKeyPem?: string;
   createdAtMs?: number;
+  gatewayAuthMd5?: string;
   version: IdentityVersion;
 }
 
@@ -130,6 +131,10 @@ export async function updatePersistedIdentity(
     updatedConfig.version = identity.version;
   }
 
+  if ("gatewayAuthMd5" in identity) {
+    updatedConfig.gatewayAuthMd5 = identity.gatewayAuthMd5;
+  }
+
   // 写入配置
   const configPath = getConfigPath();
   await safeWriteFile({

package/src/modules/device/gateway-auth.ts

@@ -0,0 +1,25 @@
+import { md5 } from "../../utils/hash.js";
+import { GatewayAuthConfig } from "../configs/types.js";
+
+function normalizeSecretValue(value: unknown): string {
+  if (typeof value === "string") {
+    return value;
+  }
+  if (value == null) {
+    return "";
+  }
+  return JSON.stringify(value);
+}
+
+export function createGatewayAuthMd5(gatewayAuthConfig: GatewayAuthConfig | undefined): string {
+  return md5(
+    JSON.stringify({
+      token: normalizeSecretValue(gatewayAuthConfig?.token),
+      password: normalizeSecretValue(gatewayAuthConfig?.password),
+    }),
+  );
+}
+
+export function isSameGatewayAuthMd5(persist: string | undefined, right: string): boolean {
+  return (persist ?? "") === right;
+}

package/src/modules/device/identity.ts

@@ -114,6 +114,14 @@ export async function loadOrCreateDeviceIdentity(): Promise<DeviceIdentity> {
   return identity;
 }
 
+/**
+ * 只读取已持久化的 Gateway 认证 MD5
+ */
+export async function loadPersistedGatewayAuthMd5(): Promise<string | undefined> {
+  const persisted = await getPersistedIdentity();
+  return persisted?.gatewayAuthMd5;
+}
+
 /**
  * Sign a payload using device private key
  * @param privateKeyPem - Private key in PEM format

package/src/modules/device/index.ts

@@ -6,3 +6,4 @@ export * from "./types.js";
 export * from "./helpers.js";
 export * from "./auth.js";
 export * from "./credential-builder.js";
+export * from "./gateway-auth.js";

package/src/modules/device/registry.ts

@@ -1,7 +1,11 @@
 import { createClawCloudClient } from "../../apis/claw-cloud.js";
 import { isOKResponse } from "../../apis/index.js";
 import type { DeviceInfo, HonorUserInfo } from "../../types.js";
-import { getConfigManager } from "../configs/index.js";
+import { formatHashForLog } from "../../utils/hash.js";
+import { useClawLogger } from "../../utils/logger.js";
+import { getConfigManager, updatePersistedIdentity } from "../configs/index.js";
+import { createGatewayAuthMd5, isSameGatewayAuthMd5 } from "./gateway-auth.js";
+import { loadPersistedGatewayAuthMd5 } from "./identity.js";
 
 /**
  * 注册设备到 Claw Cloud
@@ -25,3 +29,33 @@ export async function registerDevice(deviceInfo: DeviceInfo, userInfo: HonorUser
     throw new Error(`注册失败：${response.data?.cnMessage}`);
   }
 }
+
+/**
+ * Gateway 认证信息发生变化时重新注册设备
+ */
+export async function registerDeviceIfGatewayAuthChanged(
+  deviceInfo: DeviceInfo,
+  userInfo: HonorUserInfo,
+) {
+  const configManager = getConfigManager();
+  const gatewayAuthConfig = configManager.getGatewayAuthConfig();
+  const gatewayAuthMd5 = createGatewayAuthMd5(gatewayAuthConfig);
+  const persistedGatewayAuthMd5 = await loadPersistedGatewayAuthMd5();
+  const logger = useClawLogger();
+
+  logger.info(
+    `[yoyoclaw-registry] checking gateway auth md5: current=${formatHashForLog(
+      gatewayAuthMd5,
+    )}, persisted=${formatHashForLog(persistedGatewayAuthMd5)}`,
+  );
+
+  if (isSameGatewayAuthMd5(persistedGatewayAuthMd5, gatewayAuthMd5)) {
+    logger.info("[yoyoclaw-registry] gateway auth unchanged, skipping device registration");
+    return;
+  }
+
+  logger.info("[yoyoclaw-registry] gateway auth changed, registering device");
+  await registerDevice(deviceInfo, userInfo);
+  await updatePersistedIdentity({ gatewayAuthMd5 });
+  logger.info("[yoyoclaw-registry] gateway auth md5 persisted after device registration");
+}

package/src/services/connection/impl.ts

@@ -2,7 +2,11 @@ import { OpenClawPluginApi, OpenClawPluginService } from "openclaw/plugin-sdk";
 import { ClawChannel } from "../../cloud-channel/channel.js";
 import { loadToken, clearToken } from "../../honor-auth/token-manager.js";
 import { getConfigManager } from "../../modules/configs/config-manager.js";
-import { getDeviceInfo, registerDevice } from "../../modules/device/index.js";
+import {
+  getDeviceInfo,
+  registerDevice,
+  registerDeviceIfGatewayAuthChanged,
+} from "../../modules/device/index.js";
 import { DeviceInfo, HonorUserInfo } from "../../types.js";
 import { useClawLogger } from "../../utils/logger.js";
 import { StatusTracker, StatusEventType } from "./status-tracker/index.js";
@@ -79,9 +83,13 @@ export const createClawConnectionService = (api: OpenClawPluginApi) =>
  * 创建channel
  */
 async function createChannel(deviceInfo: DeviceInfo, userInfo: HonorUserInfo): Promise<void> {
-  clawConnection.status = "connecting";
   useClawLogger().info(`[yoyoclaw-conn] creating new channel for device: ${deviceInfo.deviceId}`);
 
+  await registerDeviceIfGatewayAuthChanged(deviceInfo, userInfo);
+
+  const previousStatus = clawConnection.status;
+  clawConnection.status = "connecting";
+
   // 通知状态跟踪器：连接状态变更
   if (statusTracker) {
     await statusTracker.handleEvent({
@@ -89,7 +97,7 @@ async function createChannel(deviceInfo: DeviceInfo, userInfo: HonorUserInfo): P
       timestamp: Date.now(),
       data: {
         status: "connecting",
-        previousStatus: clawConnection.status,
+        previousStatus,
       },
     });
   }

package/src/utils/hash.ts

@@ -0,0 +1,9 @@
+import crypto from "node:crypto";
+
+export function md5(value: string): string {
+  return crypto.createHash("md5").update(value).digest("hex");
+}
+
+export function formatHashForLog(value: string | undefined): string {
+  return value ? `${value.slice(0, 8)}...` : "none";
+}