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

package/index.ts

@@ -1,25 +1,25 @@
-import { type OpenClawPluginApi } from "openclaw/plugin-sdk";
-import { setYoyoRuntime } from "./src/runtime.js";
-import { registerCommands } from "./src/commands/index.js";
-import { YoyoPluginConfigSchema } from "./src/schemas.js";
-import { createClawConnectionService } from "./src/services/connection/index.js";
-import { setClawLogger } from "./src/utils/logger.js";
-
-const plugin = {
-  id: "yoyo",
-  name: "YOYOClaw",
-  description: "OpenClaw Honor Yoyo connection plugin",
-  configSchema: YoyoPluginConfigSchema,
-  register(api: OpenClawPluginApi) {
-    setYoyoRuntime(api.runtime);
-    setClawLogger(api.logger);
-
-    // 利用服务来管理核心连接任务进行~
-    api.registerService(createClawConnectionService(api));
-
-    // 注册所有的命令行
-    registerCommands(api);
-  },
-};
-
-export default plugin;
+import { type OpenClawPluginApi } from "openclaw/plugin-sdk";
+import { registerCommands } from "./src/commands/index.js";
+import { setYoyoRuntime } from "./src/runtime.js";
+import { YoyoPluginConfigSchema } from "./src/schemas.js";
+import { createClawConnectionService } from "./src/services/connection/index.js";
+import { setClawLogger } from "./src/utils/logger.js";
+
+const plugin = {
+  id: "yoyo",
+  name: "YOYOClaw",
+  description: "OpenClaw Honor Yoyo connection plugin",
+  configSchema: YoyoPluginConfigSchema,
+  register(api: OpenClawPluginApi) {
+    setYoyoRuntime(api.runtime);
+    setClawLogger(api.logger);
+
+    // 利用服务来管理核心连接任务进行~
+    api.registerService(createClawConnectionService(api));
+
+    // 注册所有的命令行
+    registerCommands(api);
+  },
+};
+
+export default plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@honor-claw/yoyo",
-  "version": "1.1.3",
+  "version": "1.1.4-beta.1",
   "description": "OpenClaw Honor Yoyo connection plugin",
   "keywords": [
     "ai",
@@ -23,12 +23,12 @@
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
-    "test:unit": "vitest run",
-    "test:unit:watch": "vitest",
-    "test:coverage": "vitest run --coverage",
     "ci:check": "npx tsc --noEmit && npm run test:coverage",
     "publish:beta": "node scripts/publish.js",
-    "publish:latest": "node scripts/publish.js --release"
+    "publish:latest": "node scripts/publish.js --release",
+    "test:coverage": "vitest run --coverage",
+    "test:unit": "vitest run",
+    "test:unit:watch": "vitest"
   },
   "dependencies": {
     "http-proxy-agent": "^8.0.0",

package/src/apis/claw-cloud.ts

@@ -1,124 +1,124 @@
-/**
- * Claw Cloud API 接口封装
- */
-import type { DeviceInfo, HonorUserInfo } from "../types.js";
-import type { GatewayAuthConfig } from "../modules/claw-configs/types.js";
-import { uuid } from "../utils/id.js";
-import { generateAuthorization } from "../utils/jwt.js";
-import {
-  HttpClient,
-  type HttpResponse,
-  type HttpClientOptions,
-} from "./http-client.js";
-import type {
-  DeviceRegistryHeaders,
-  DeviceRegistryRequest,
-  DeviceRegistryResponse,
-  UserLogoutHeaders,
-  UserLogoutRequest,
-  UserLogoutResponse,
-} from "./types.js";
-
-/**
- * Claw Cloud API 客户端
- */
-export class ClawCloudClient {
-  private httpClient: HttpClient;
-
-  constructor(baseUrl: string, options?: HttpClientOptions) {
-    this.httpClient = new HttpClient(baseUrl, options);
-  }
-
-  /**
-   * 设备注册
-   * @param deviceInfo 设备信息
-   * @param userInfo 用户信息
-   * @param gatewayAuthConfig Gateway 认证配置（可选）
-   * @returns 注册响应
-   */
-  async registerDevice(
-    deviceInfo: DeviceInfo,
-    userInfo: HonorUserInfo,
-    gatewayAuthConfig?: GatewayAuthConfig
-  ): Promise<HttpResponse<DeviceRegistryResponse>> {
-    // 构造请求头
-    const headers: DeviceRegistryHeaders = {
-      "x-trace-id": uuid(),
-    };
-
-    if (userInfo.userId) {
-      headers['x-agw-userId'] = userInfo.userId;
-      headers['authorization'] = generateAuthorization(userInfo.userId);
-      headers['x-udid'] = deviceInfo.deviceId;
-    } else if (userInfo.token) {
-      headers['x-jwt-token'] = userInfo.token;
-      headers['x-device-id'] = deviceInfo.deviceId;
-    }
-
-    const requestBody: DeviceRegistryRequest = {
-      businessTag: "YOYO_CLAW",
-      role: "yoyoclaw",
-      deviceInfo: {
-        ...deviceInfo,
-        manufacture: "unknown",
-        brand: deviceInfo.brand || "unknown",
-        bizExtInfo: gatewayAuthConfig,
-      } as any,
-    };
-
-    return this.httpClient.post<DeviceRegistryResponse>("/v1/device/registry", {
-      headers: headers as unknown as Record<string, string>,
-      body: requestBody,
-    });
-  }
-
-  /**
-   * 用户登出
-   * @param deviceInfo 设备信息
-   * @param userInfo 用户信息
-   * @returns 登出响应
-   */
-  async logoutDevice(
-    deviceInfo: DeviceInfo,
-    userInfo: HonorUserInfo
-  ): Promise<HttpResponse<UserLogoutResponse>> {
-    // 构造请求头
-    const headers: UserLogoutHeaders = {
-      "x-trace-id": uuid(),
-    };
-
-    // 如果有 userId，添加 x-agw-userId
-    if (userInfo.userId) {
-      headers["x-agw-userId"] = userInfo.userId;
-      headers["x-udid"] = deviceInfo.deviceId;
-      headers["authorization"] = generateAuthorization(userInfo.userId);
-    } else if (userInfo.token) {
-      headers["x-jwt-token"] = userInfo.token;
-      headers["x-device-id"] = deviceInfo.deviceId;
-    }
-
-    const requestBody: UserLogoutRequest = {
-      businessTag: "YOYO_CLAW",
-      deviceInfo: {
-        ...deviceInfo,
-        manufacture: "unknown",
-        brand: "unknown",
-      } as any,
-    };
-
-    return this.httpClient.post<UserLogoutResponse>("/v1/user/logout", {
-      headers: headers as unknown as Record<string, string>,
-      body: requestBody,
-    });
-  }
-}
-
-/**
- * 创建 Claw Cloud 客户端实例
- */
-export function createClawCloudClient(
-  baseUrl: string,
-  options?: HttpClientOptions
-): ClawCloudClient {
-  return new ClawCloudClient(baseUrl, options);
-}
+/**
+ * Claw Cloud API 接口封装
+ */
+import type { DeviceInfo, HonorUserInfo } from "../types.js";
+import type { GatewayAuthConfig } from "../modules/claw-configs/types.js";
+import { uuid } from "../utils/id.js";
+import { generateAuthorization } from "../utils/jwt.js";
+import {
+  HttpClient,
+  type HttpResponse,
+  type HttpClientOptions,
+} from "./http-client.js";
+import type {
+  DeviceRegistryHeaders,
+  DeviceRegistryRequest,
+  DeviceRegistryResponse,
+  UserLogoutHeaders,
+  UserLogoutRequest,
+  UserLogoutResponse,
+} from "./types.js";
+
+/**
+ * Claw Cloud API 客户端
+ */
+export class ClawCloudClient {
+  private httpClient: HttpClient;
+
+  constructor(baseUrl: string, options?: HttpClientOptions) {
+    this.httpClient = new HttpClient(baseUrl, options);
+  }
+
+  /**
+   * 设备注册
+   * @param deviceInfo 设备信息
+   * @param userInfo 用户信息
+   * @param gatewayAuthConfig Gateway 认证配置（可选）
+   * @returns 注册响应
+   */
+  async registerDevice(
+    deviceInfo: DeviceInfo,
+    userInfo: HonorUserInfo,
+    gatewayAuthConfig?: GatewayAuthConfig
+  ): Promise<HttpResponse<DeviceRegistryResponse>> {
+    // 构造请求头
+    const headers: DeviceRegistryHeaders = {
+      "x-trace-id": uuid(),
+    };
+
+    if (userInfo.userId) {
+      headers['x-agw-userId'] = userInfo.userId;
+      headers['authorization'] = generateAuthorization(userInfo.userId);
+      headers['x-udid'] = deviceInfo.deviceId;
+    } else if (userInfo.token) {
+      headers['x-jwt-token'] = userInfo.token;
+      headers['x-device-id'] = deviceInfo.deviceId;
+    }
+
+    const requestBody: DeviceRegistryRequest = {
+      businessTag: "YOYO_CLAW",
+      role: "yoyoclaw",
+      deviceInfo: {
+        ...deviceInfo,
+        manufacture: "unknown",
+        brand: deviceInfo.brand || "unknown",
+        bizExtInfo: gatewayAuthConfig,
+      },
+    };
+
+    return this.httpClient.post<DeviceRegistryResponse>("/v1/device/registry", {
+      headers: headers as unknown as Record<string, string>,
+      body: requestBody,
+    });
+  }
+
+  /**
+   * 用户登出
+   * @param deviceInfo 设备信息
+   * @param userInfo 用户信息
+   * @returns 登出响应
+   */
+  async logoutDevice(
+    deviceInfo: DeviceInfo,
+    userInfo: HonorUserInfo
+  ): Promise<HttpResponse<UserLogoutResponse>> {
+    // 构造请求头
+    const headers: UserLogoutHeaders = {
+      "x-trace-id": uuid(),
+    };
+
+    // 如果有 userId，添加 x-agw-userId
+    if (userInfo.userId) {
+      headers["x-agw-userId"] = userInfo.userId;
+      headers["x-udid"] = deviceInfo.deviceId;
+      headers["authorization"] = generateAuthorization(userInfo.userId);
+    } else if (userInfo.token) {
+      headers["x-jwt-token"] = userInfo.token;
+      headers["x-device-id"] = deviceInfo.deviceId;
+    }
+
+    const requestBody: UserLogoutRequest = {
+      businessTag: "YOYO_CLAW",
+      deviceInfo: {
+        ...deviceInfo,
+        manufacture: "unknown",
+        brand: "unknown",
+      },
+    };
+
+    return this.httpClient.post<UserLogoutResponse>("/v1/user/logout", {
+      headers: headers as unknown as Record<string, string>,
+      body: requestBody,
+    });
+  }
+}
+
+/**
+ * 创建 Claw Cloud 客户端实例
+ */
+export function createClawCloudClient(
+  baseUrl: string,
+  options?: HttpClientOptions
+): ClawCloudClient {
+  return new ClawCloudClient(baseUrl, options);
+}

package/src/apis/helpers.ts

@@ -1,10 +1,10 @@
-import type { HttpResponse } from './http-client.js';
-import type { HttpApiWrapper } from './types.js';
-
-export function isOKResponse<T>(response: HttpResponse<HttpApiWrapper<T>>) {
-  if (response.status >= 200 && response.status < 300 && response.data.code === '1') {
-    return true;
-  }
-
-  return false;
-}
+import type { HttpResponse } from './http-client.js';
+import type { HttpApiWrapper } from './types.js';
+
+export function isOKResponse<T>(response: HttpResponse<HttpApiWrapper<T>>) {
+  if (response.status >= 200 && response.status < 300 && response.data.code === '1') {
+    return true;
+  }
+
+  return false;
+}

package/src/apis/honor-auth.ts

@@ -1,158 +1,158 @@
-/**
- * 荣耀OAuth2认证客户端
- * 提供授权URL构建、Token获取等API能力
- */
-
-import { createHash, randomBytes } from 'crypto';
-import { HttpClient, type HttpClientOptions } from './http-client.js';
-import type { TokenResponse, HonorAuthConfig } from '../honor-auth/types.js';
-import { uuid } from '../utils/id.js';
-import { isOKResponse } from './helpers.js';
-import type { HttpApiWrapper } from './types.js';
-import { takeApiHost } from '../modules/claw-configs/hosts.js';
-
-/**
- * PKCE参数
- */
-export interface PKCEParams {
-  codeVerifier: string;
-  codeChallenge: string;
-}
-
-/**
- * 荣耀认证客户端
- */
-export class HonorAuthClient {
-  private httpClient: HttpClient;
-  private config: HonorAuthConfig;
-
-  constructor(config: HonorAuthConfig) {
-    this.config = config;
-    // 从 HonorAuthConfig 中提取 HttpClientOptions
-    const httpClientOptions: HttpClientOptions = {
-      proxy: config.proxy,
-    };
-    this.httpClient = new HttpClient(config.authHost, httpClientOptions);
-  }
-
-  /**
-   * 生成随机字符串
-   */
-  private generateRandomString(length: number): string {
-    const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-    const bytes = randomBytes(length);
-    let result = '';
-    for (let i = 0; i < length; i++) {
-      result += chars[bytes[i] % chars.length];
-    }
-    return result;
-  }
-
-  /**
-   * 生成PKCE code_verifier
-   */
-  generateCodeVerifier(length: number = 128): string {
-    const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~';
-    const bytes = randomBytes(length);
-    let result = '';
-    for (let i = 0; i < length; i++) {
-      result += chars[bytes[i] % chars.length];
-    }
-    return result;
-  }
-
-  /**
-   * 生成PKCE code_challenge
-   */
-  generateCodeChallenge(verifier: string): string {
-    const hash = createHash('sha256').update(verifier).digest();
-    return hash.toString('base64').replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
-  }
-
-  /**
-   * 生成PKCE参数
-   */
-  generatePKCEParams(): PKCEParams {
-    const codeVerifier = this.generateCodeVerifier();
-    const codeChallenge = this.generateCodeChallenge(codeVerifier);
-    return { codeVerifier, codeChallenge };
-  }
-
-  /**
-   * 构建授权URL
-   */
-  buildAuthUrl(pkceParams: PKCEParams): string {
-    const params = new URLSearchParams({
-      client_id: this.config.clientId,
-      redirect_uri: this.config.redirectUri,
-      scope: this.config.scope,
-      response_type: 'code',
-      access_type: 'offline',
-      state: this.generateRandomString(16),
-      reqClientType: this.config.reqClientType,
-      loginChannel: this.config.loginChannel,
-      code_challenge: pkceParams.codeChallenge,
-      code_challenge_method: 'S256',
-    });
-
-    return `${this.config.authHost}/oauth2/v3/authorize?${params.toString()}`;
-  }
-
-  /**
-   * 使用授权码换取Token
-   */
-  async exchangeToken(code: string) {
-    const hosts = takeApiHost();
-    const tokenUrl = `https://${hosts.ics}/honorboard/auth/v1/oauth/jwtToken`;
-
-    const data = {
-      clientId: this.config.clientId,
-      code,
-      redirectUri: this.config.redirectUri,
-    };
-
-    try {
-      // 构建请求头，包含灰度标签（如果有）
-      const headers: Record<string, string> = {
-        'Content-Type': 'application/json',
-        'x-origin-udid': this.config.clientId,
-        'x-app-pkg': 'com.hihonor.pc.openclaw',
-        'x-request-nonce': uuid(),
-        'x-timestamp': String(Date.now()),
-      };
-
-      // 添加灰度标签
-      if (hosts.grayTag) {
-        headers['x-gray'] = hosts.grayTag;
-      }
-
-      const response = await this.httpClient.post<HttpApiWrapper<TokenResponse>>(tokenUrl, {
-        body: data,
-        headers,
-        timeout: 15000,
-      });
-
-      if (isOKResponse(response)) {
-        return response.data.data;
-      }
-
-      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)}`);
-    }
-  }
-
-  /**
-   * 获取配置
-   */
-  getConfig(): HonorAuthConfig {
-    return { ...this.config };
-  }
-}
-
-/**
- * 创建荣耀认证客户端
- */
-export function createHonorAuthClient(config: HonorAuthConfig): HonorAuthClient {
-  return new HonorAuthClient(config);
-}
+/**
+ * 荣耀OAuth2认证客户端
+ * 提供授权URL构建、Token获取等API能力
+ */
+
+import { createHash, randomBytes } from 'crypto';
+import { HttpClient, type HttpClientOptions } from './http-client.js';
+import type { TokenResponse, HonorAuthConfig } from '../honor-auth/types.js';
+import { uuid } from '../utils/id.js';
+import { isOKResponse } from './helpers.js';
+import type { HttpApiWrapper } from './types.js';
+import { takeApiHost } from '../modules/claw-configs/hosts.js';
+
+/**
+ * PKCE参数
+ */
+export interface PKCEParams {
+  codeVerifier: string;
+  codeChallenge: string;
+}
+
+/**
+ * 荣耀认证客户端
+ */
+export class HonorAuthClient {
+  private httpClient: HttpClient;
+  private config: HonorAuthConfig;
+
+  constructor(config: HonorAuthConfig) {
+    this.config = config;
+    // 从 HonorAuthConfig 中提取 HttpClientOptions
+    const httpClientOptions: HttpClientOptions = {
+      proxy: config.proxy,
+    };
+    this.httpClient = new HttpClient(config.authHost, httpClientOptions);
+  }
+
+  /**
+   * 生成随机字符串
+   */
+  private generateRandomString(length: number): string {
+    const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    const bytes = randomBytes(length);
+    let result = '';
+    for (let i = 0; i < length; i++) {
+      result += chars[bytes[i] % chars.length];
+    }
+    return result;
+  }
+
+  /**
+   * 生成PKCE code_verifier
+   */
+  generateCodeVerifier(length: number = 128): string {
+    const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~';
+    const bytes = randomBytes(length);
+    let result = '';
+    for (let i = 0; i < length; i++) {
+      result += chars[bytes[i] % chars.length];
+    }
+    return result;
+  }
+
+  /**
+   * 生成PKCE code_challenge
+   */
+  generateCodeChallenge(verifier: string): string {
+    const hash = createHash('sha256').update(verifier).digest();
+    return hash.toString('base64').replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
+  }
+
+  /**
+   * 生成PKCE参数
+   */
+  generatePKCEParams(): PKCEParams {
+    const codeVerifier = this.generateCodeVerifier();
+    const codeChallenge = this.generateCodeChallenge(codeVerifier);
+    return { codeVerifier, codeChallenge };
+  }
+
+  /**
+   * 构建授权URL
+   */
+  buildAuthUrl(pkceParams: PKCEParams): string {
+    const params = new URLSearchParams({
+      client_id: this.config.clientId,
+      redirect_uri: this.config.redirectUri,
+      scope: this.config.scope,
+      response_type: 'code',
+      access_type: 'offline',
+      state: this.generateRandomString(16),
+      reqClientType: this.config.reqClientType,
+      loginChannel: this.config.loginChannel,
+      code_challenge: pkceParams.codeChallenge,
+      code_challenge_method: 'S256',
+    });
+
+    return `${this.config.authHost}/oauth2/v3/authorize?${params.toString()}`;
+  }
+
+  /**
+   * 使用授权码换取Token
+   */
+  async exchangeToken(code: string) {
+    const hosts = takeApiHost();
+    const tokenUrl = `https://${hosts.ics}/honorboard/auth/v1/oauth/jwtToken`;
+
+    const data = {
+      clientId: this.config.clientId,
+      code,
+      redirectUri: this.config.redirectUri,
+    };
+
+    try {
+      // 构建请求头，包含灰度标签（如果有）
+      const headers: Record<string, string> = {
+        'Content-Type': 'application/json',
+        'x-origin-udid': this.config.clientId,
+        'x-app-pkg': 'com.hihonor.pc.openclaw',
+        'x-request-nonce': uuid(),
+        'x-timestamp': String(Date.now()),
+      };
+
+      // 添加灰度标签
+      if (hosts.grayTag) {
+        headers['x-gray'] = hosts.grayTag;
+      }
+
+      const response = await this.httpClient.post<HttpApiWrapper<TokenResponse>>(tokenUrl, {
+        body: data,
+        headers,
+        timeout: 15000,
+      });
+
+      if (isOKResponse(response)) {
+        return response.data.data;
+      }
+
+      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)}`);
+    }
+  }
+
+  /**
+   * 获取配置
+   */
+  getConfig(): HonorAuthConfig {
+    return { ...this.config };
+  }
+}
+
+/**
+ * 创建荣耀认证客户端
+ */
+export function createHonorAuthClient(config: HonorAuthConfig): HonorAuthClient {
+  return new HonorAuthClient(config);
+}