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

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

@@ -1,57 +1,57 @@
-/**
- * Device identity information
- */
-export type DeviceIdentity = {
-  deviceId: string;
-  publicKeyPem: string;
-  privateKeyPem: string;
-};
-
-/**
- * Device authentication payload parameters
- */
-export type DeviceAuthPayloadParams = {
-  deviceId: string;
-  clientId: string;
-  clientMode: string;
-  role: string;
-  scopes: string[];
-  signedAtMs: number;
-  token?: string | null;
-  nonce: string;
-};
-
-/**
- * Device authentication payload V3 parameters (with platform/device family)
- */
-export type DeviceAuthPayloadV3Params = DeviceAuthPayloadParams & {
-  platform?: string | null;
-  deviceFamily?: string | null;
-};
-
-/**
- * Device information for gateway connection
- */
-export type DeviceInfo = {
-  id: string;
-  publicKey: string;
-  signature: string;
-  signedAt: number;
-  nonce: string;
-};
-
-/**
- * Device builder options
- */
-export type DeviceBuilderOptions = {
-  deviceIdentity?: DeviceIdentity;
-  clientName?: string;
-  clientMode?: string;
-  role?: string;
-  scopes?: string[];
-  platform?: string;
-  deviceFamily?: string;
-  authToken?: string | null;
-  nonce: string;
-  signedAtMs?: number;
-};
+/**
+ * Device identity information
+ */
+export type DeviceIdentity = {
+  deviceId: string;
+  publicKeyPem: string;
+  privateKeyPem: string;
+};
+
+/**
+ * Device authentication payload parameters
+ */
+export type DeviceAuthPayloadParams = {
+  deviceId: string;
+  clientId: string;
+  clientMode: string;
+  role: string;
+  scopes: string[];
+  signedAtMs: number;
+  token?: string | null;
+  nonce: string;
+};
+
+/**
+ * Device authentication payload V3 parameters (with platform/device family)
+ */
+export type DeviceAuthPayloadV3Params = DeviceAuthPayloadParams & {
+  platform?: string | null;
+  deviceFamily?: string | null;
+};
+
+/**
+ * Device information for gateway connection
+ */
+export type DeviceInfo = {
+  id: string;
+  publicKey: string;
+  signature: string;
+  signedAt: number;
+  nonce: string;
+};
+
+/**
+ * Device builder options
+ */
+export type DeviceBuilderOptions = {
+  deviceIdentity?: DeviceIdentity;
+  clientName?: string;
+  clientMode?: string;
+  role?: string;
+  scopes?: string[];
+  platform?: string;
+  deviceFamily?: string;
+  authToken?: string | null;
+  nonce: string;
+  signedAtMs?: number;
+};

package/src/gateway-client/index.ts

@@ -1,5 +1,5 @@
-export * from "./client.js";
-export * from "./protocol-client.js";
-export * from "./protocol/index.js";
-export * from "./node-gateway-client.js";
-export * from './admin-gateway-client.js'
+export * from "./client.js";
+export * from "./protocol-client.js";
+export * from "./protocol/index.js";
+export * from "./node-gateway-client.js";
+export * from './admin-gateway-client.js'

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

@@ -1,4 +1,12 @@
 import { randomUUID } from "node:crypto";
+import { useClawLogger } from "../utils/logger.js";
+import { GatewayClient } from "./client.js";
+import {
+  loadOrCreateDeviceIdentity,
+  signDevicePayload,
+  publicKeyRawBase64UrlFromPem,
+  buildDeviceAuthPayloadV3,
+} from "./device/index.js";
 import {
   type ConnectParams,
   type EventFrame,
@@ -9,11 +17,13 @@ import {
   ErrorCodes,
   PROTOCOL_VERSION,
 } from "./protocol/index.js";
-import { GatewayClient } from "./client.js";
 import { type ProtocolClientOptions } from "./protocol/index.js";
-import { type GatewayClientId, type GatewayClientMode, GATEWAY_CLIENT_IDS, GATEWAY_CLIENT_MODES } from "./protocol/index.js";
-import { useClawLogger } from "../utils/logger.js";
-import { loadOrCreateDeviceIdentity, signDevicePayload, publicKeyRawBase64UrlFromPem, buildDeviceAuthPayloadV3 } from "./device/index.js";
+import {
+  type GatewayClientId,
+  type GatewayClientMode,
+  GATEWAY_CLIENT_IDS,
+  GATEWAY_CLIENT_MODES,
+} from "./protocol/index.js";
 
 type PendingRequest = {
   resolve: (value: unknown) => void;
@@ -134,12 +144,14 @@ export class ProtocolGatewayClient extends GatewayClient {
       pending.resolve(response.payload);
     } else {
       const error = response.error || { code: ErrorCodes.UNKNOWN, message: "Unknown error" };
-      pending.reject(new WebSocketClientError(
-        this.toErrorCode(error.code),
-        error.message,
-        error.details,
-        error.retryable
-      ));
+      pending.reject(
+        new WebSocketClientError(
+          this.toErrorCode(error.code),
+          error.message,
+          error.details,
+          error.retryable,
+        ),
+      );
     }
   }
 
@@ -194,19 +206,21 @@ export class ProtocolGatewayClient extends GatewayClient {
       device,
     };
 
-    this.sendRequest("connect", params).then((payload) => {
-      this.helloOk = payload as HelloOk;
-      this.connected = true;
-      this.authenticated = true;
-      this.protocolOpts.onAuthenticated?.();
-    }).catch((error) => {
-      this.authenticated = false;
-      if (error instanceof WebSocketClientError) {
-        this.protocolOpts.onClose?.(`auth failed: [${error.code}] ${error.message}`);
-      } else {
-        this.protocolOpts.onClose?.(`auth failed: ${error.message}`);
-      }
-    });
+    this.sendRequest("connect", params)
+      .then((payload) => {
+        this.helloOk = payload as HelloOk;
+        this.connected = true;
+        this.authenticated = true;
+        this.protocolOpts.onAuthenticated?.();
+      })
+      .catch((error) => {
+        this.authenticated = false;
+        if (error instanceof WebSocketClientError) {
+          this.protocolOpts.onClose?.(`auth failed: [${error.code}] ${error.message}`);
+        } else {
+          this.protocolOpts.onClose?.(`auth failed: ${error.message}`);
+        }
+      });
   }
 
   protected async sendRequest(method: string, params?: unknown): Promise<unknown> {
@@ -221,10 +235,12 @@ export class ProtocolGatewayClient extends GatewayClient {
         this.send(JSON.stringify(frame));
       } catch (error) {
         this.pendingRequests.delete(id);
-        reject(new WebSocketClientError(
-          ErrorCodes.CONNECTION_FAILED,
-          `WebSocket is not connected, ${JSON.stringify(error)}`
-        ));
+        reject(
+          new WebSocketClientError(
+            ErrorCodes.CONNECTION_FAILED,
+            `WebSocket is not connected, ${JSON.stringify(error)}`,
+          ),
+        );
         return;
       }
 
@@ -232,12 +248,11 @@ export class ProtocolGatewayClient extends GatewayClient {
         if (this.pendingRequests.has(id)) {
           this.pendingRequests.delete(id);
           const t = this.pendingTimers.get(id);
-          if (t) clearTimeout(t);
+          if (t) {
+            clearTimeout(t);
+          }
           this.pendingTimers.delete(id);
-          reject(new WebSocketClientError(
-            ErrorCodes.TIMEOUT,
-            `Request timeout: ${method}`
-          ));
+          reject(new WebSocketClientError(ErrorCodes.TIMEOUT, `Request timeout: ${method}`));
         }
       }, DEFAULT_REQUEST_TIMEOUT_MS);
       this.pendingTimers.set(id, timer);
@@ -306,7 +321,7 @@ export class ProtocolGatewayClient extends GatewayClient {
 
     if (this.reconnectAttempts >= MAX_RECONNECT_ATTEMPTS) {
       useClawLogger().error(
-        `[protocol-gateway] max reconnect attempts (${MAX_RECONNECT_ATTEMPTS}) reached, giving up`
+        `[protocol-gateway] max reconnect attempts (${MAX_RECONNECT_ATTEMPTS}) reached, giving up`,
       );
       this.protocolOpts.onReconnectFailed?.();
       return;
@@ -315,7 +330,7 @@ export class ProtocolGatewayClient extends GatewayClient {
     this.reconnectAttempts++;
     this.isReconnecting = true;
     useClawLogger().info(
-      `[protocol-gateway] attempting to reconnect (attempt ${this.reconnectAttempts}/${MAX_RECONNECT_ATTEMPTS})`
+      `[protocol-gateway] attempting to reconnect (attempt ${this.reconnectAttempts}/${MAX_RECONNECT_ATTEMPTS})`,
     );
 
     this.reconnectTimer = setTimeout(() => {

package/src/honor-auth/browser.ts

@@ -14,7 +14,7 @@ export async function performOAuth2AuthWithBrowser(_: DeviceInfo, configOverride
   const config = getConfig(configOverrides);
   const logger = useClawLogger();
   
-  logger.debug('Starting Honor login flow...');
+  logger.debug?.('Starting Honor login flow...');
 
   // 创建认证客户端
   const authClient = createHonorAuthClient(config);
@@ -61,7 +61,7 @@ export async function performOAuth2AuthWithBrowser(_: DeviceInfo, configOverride
   try {
     const tokenInfo = await authClient.exchangeToken(receivedCode);
 
-    if (!tokenInfo.token || !tokenInfo.userInfo?.userId) {
+    if (!tokenInfo?.token || !tokenInfo.userInfo?.userId) {
       throw new Error('failed to get user info');
     }
 

package/src/honor-auth/callback-server.ts

@@ -1,109 +1,109 @@
-/**
- * 本地HTTP回调服务器 - 接收OAuth2授权回调
- */
-
-import { createServer, type IncomingMessage, type ServerResponse } from 'http';
-import { URL } from 'url';
-
-/**
- * 回调服务器选项
- */
-export interface CallbackServerOptions {
-  /** 监听端口 */
-  port: number;
-  /** 超时时间（毫秒） */
-  timeout?: number;
-  /** 授权码回调处理 */
-  onCodeReceived: (code: string) => void;
-  /** 错误回调 */
-  onError?: (error: Error) => void;
-}
-
-/**
- * 启动本地回调服务器
- */
-export function startCallbackServer(options: CallbackServerOptions): Promise<void> {
-  return new Promise((resolve, reject) => {
-    const { port, timeout = 600000, onCodeReceived, onError } = options;
-    let timeoutId: NodeJS.Timeout | null = null;
-    let serverClosed = false;
-    let hasReceivedCode = false;
-    let promiseResolved = false;
-
-    const server = createServer((req: IncomingMessage, res: ServerResponse) => {
-      try {
-        const url = new URL(req.url || '', `http://localhost:${port}`);
-        const code = url.searchParams.get('code') || '';
-
-        if (code && !hasReceivedCode) {
-          hasReceivedCode = true;
-
-          // 返回成功响应
-          res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
-          res.end('<h1>授权成功！可以关闭此窗口</h1>');
-
-          // 延迟关闭服务器，确保响应已发送
-          setTimeout(() => {
-            if (!serverClosed) {
-              serverClosed = true;
-              if (timeoutId) clearTimeout(timeoutId);
-              server.close();
-            }
-          }, 100);
-
-          // 调用回调
-          onCodeReceived(code);
-        } else if (!hasReceivedCode) {
-          // 返回错误响应
-          res.writeHead(400, { 'Content-Type': 'text/html; charset=utf-8' });
-          res.end('<h1>授权失败：未获取到授权码</h1>');
-        } else {
-          // 重复请求，返回成功响应但不处理
-          res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
-          res.end('<h1>授权成功！可以关闭此窗口</h1>');
-        }
-      } catch (error) {
-        console.error('authorize callback error:', error);
-        res.writeHead(500, { 'Content-Type': 'text/html; charset=utf-8' });
-        res.end('<h1>服务器错误</h1>');
-      }
-    });
-
-    server.on('error', (error) => {
-      if (!serverClosed) {
-        serverClosed = true;
-        if (timeoutId) clearTimeout(timeoutId);
-        onError?.(error);
-        if (!promiseResolved) {
-          promiseResolved = true;
-          reject(error);
-        }
-      }
-    });
-
-    server.listen(port, () => {      
-      // 设置超时
-      timeoutId = setTimeout(() => {
-        if (!serverClosed) {
-          serverClosed = true;
-          server.close();
-          const error = new Error('authorize timeout');
-          onError?.(error);
-          if (!promiseResolved) {
-            promiseResolved = true;
-            reject(error);
-          }
-        }
-      }, timeout);
-    });
-
-    // 服务器关闭时解析Promise
-    server.on('close', () => {
-      if (timeoutId) clearTimeout(timeoutId);
-      if (!promiseResolved) {
-        promiseResolved = true;
-        resolve();
-      }
-    });
-  });
-}
+/**
+ * 本地HTTP回调服务器 - 接收OAuth2授权回调
+ */
+
+import { createServer, type IncomingMessage, type ServerResponse } from 'http';
+import { URL } from 'url';
+
+/**
+ * 回调服务器选项
+ */
+export interface CallbackServerOptions {
+  /** 监听端口 */
+  port: number;
+  /** 超时时间（毫秒） */
+  timeout?: number;
+  /** 授权码回调处理 */
+  onCodeReceived: (code: string) => void;
+  /** 错误回调 */
+  onError?: (error: Error) => void;
+}
+
+/**
+ * 启动本地回调服务器
+ */
+export function startCallbackServer(options: CallbackServerOptions): Promise<void> {
+  return new Promise((resolve, reject) => {
+    const { port, timeout = 600000, onCodeReceived, onError } = options;
+    let timeoutId: NodeJS.Timeout | null = null;
+    let serverClosed = false;
+    let hasReceivedCode = false;
+    let promiseResolved = false;
+
+    const server = createServer((req: IncomingMessage, res: ServerResponse) => {
+      try {
+        const url = new URL(req.url || '', `http://localhost:${port}`);
+        const code = url.searchParams.get('code') || '';
+
+        if (code && !hasReceivedCode) {
+          hasReceivedCode = true;
+
+          // 返回成功响应
+          res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+          res.end('<h1>授权成功！可以关闭此窗口</h1>');
+
+          // 延迟关闭服务器，确保响应已发送
+          setTimeout(() => {
+            if (!serverClosed) {
+              serverClosed = true;
+              if (timeoutId) clearTimeout(timeoutId);
+              server.close();
+            }
+          }, 100);
+
+          // 调用回调
+          onCodeReceived(code);
+        } else if (!hasReceivedCode) {
+          // 返回错误响应
+          res.writeHead(400, { 'Content-Type': 'text/html; charset=utf-8' });
+          res.end('<h1>授权失败：未获取到授权码</h1>');
+        } else {
+          // 重复请求，返回成功响应但不处理
+          res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+          res.end('<h1>授权成功！可以关闭此窗口</h1>');
+        }
+      } catch (error) {
+        console.error('authorize callback error:', error);
+        res.writeHead(500, { 'Content-Type': 'text/html; charset=utf-8' });
+        res.end('<h1>服务器错误</h1>');
+      }
+    });
+
+    server.on('error', (error) => {
+      if (!serverClosed) {
+        serverClosed = true;
+        if (timeoutId) clearTimeout(timeoutId);
+        onError?.(error);
+        if (!promiseResolved) {
+          promiseResolved = true;
+          reject(error);
+        }
+      }
+    });
+
+    server.listen(port, () => {      
+      // 设置超时
+      timeoutId = setTimeout(() => {
+        if (!serverClosed) {
+          serverClosed = true;
+          server.close();
+          const error = new Error('authorize timeout');
+          onError?.(error);
+          if (!promiseResolved) {
+            promiseResolved = true;
+            reject(error);
+          }
+        }
+      }, timeout);
+    });
+
+    // 服务器关闭时解析Promise
+    server.on('close', () => {
+      if (timeoutId) clearTimeout(timeoutId);
+      if (!promiseResolved) {
+        promiseResolved = true;
+        resolve();
+      }
+    });
+  });
+}

package/src/honor-auth/cloud.ts

@@ -1,57 +1,57 @@
-
-import { createClawCloudClient } from '../apis/claw-cloud.js';
-import { isOKResponse } from '../apis/index.js';
-import type { HonorUserInfo } from '../types.js';
-import { getConfigManager, takeApiHost } from '../modules/claw-configs/index.js';
-import { getDeviceInfo } from '../modules/device/device-info.js';
-import { clearToken } from './token-manager.js';
-
-
-/**
- * 执行登出流程
- */
-export async function performLogout(): Promise<void> {
-  try {
-    const configManager = getConfigManager();
-    const userConfig = configManager.getUserConfig();
-
-    if (!userConfig || !userConfig.token) {
-      console.log('⚠️  Not logged in');
-      return;
-    }
-
-    // 获取设备信息
-    const deviceInfo = getDeviceInfo();
-
-    // 调用登出接口
-    const hosts = takeApiHost();
-    const baseUrl = `https://${hosts.clawCloud}/aicloud/yoyo-claw-service`;
-
-    // 如果有灰度标签，设置默认headers
-    const options = hosts.grayTag ? {
-      defaultHeaders: {
-        'x-gray': hosts.grayTag
-      }
-    } : undefined;
-
-    const client = createClawCloudClient(baseUrl, options);
-
-    const userInfo: HonorUserInfo = {
-      userId: userConfig.userId,
-      token: userConfig.token,
-      userName: userConfig.userName,
-    };
-
-    const response = await client.logoutDevice(deviceInfo, userInfo);
-
-    if (!isOKResponse(response)) {
-      throw new Error(`Logout failed: ${response.data?.cnMessage || 'Unknown error'}`);
-    }
-
-    // 清除Token
-    await clearToken();
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    throw new Error(`failed to logout: ${errorMessage}`);
-  }
-}
+
+import { createClawCloudClient } from '../apis/claw-cloud.js';
+import { isOKResponse } from '../apis/index.js';
+import type { HonorUserInfo } from '../types.js';
+import { getConfigManager, takeApiHost } from '../modules/claw-configs/index.js';
+import { getDeviceInfo } from '../modules/device/device-info.js';
+import { clearToken } from './token-manager.js';
+
+
+/**
+ * 执行登出流程
+ */
+export async function performLogout(): Promise<void> {
+  try {
+    const configManager = getConfigManager();
+    const userConfig = configManager.getUserConfig();
+
+    if (!userConfig || !userConfig.token) {
+      console.log('⚠️  Not logged in');
+      return;
+    }
+
+    // 获取设备信息
+    const deviceInfo = getDeviceInfo();
+
+    // 调用登出接口
+    const hosts = takeApiHost();
+    const baseUrl = `https://${hosts.clawCloud}/aicloud/yoyo-claw-service`;
+
+    // 如果有灰度标签，设置默认headers
+    const options = hosts.grayTag ? {
+      defaultHeaders: {
+        'x-gray': hosts.grayTag
+      }
+    } : undefined;
+
+    const client = createClawCloudClient(baseUrl, options);
+
+    const userInfo: HonorUserInfo = {
+      userId: userConfig.userId,
+      token: userConfig.token,
+      userName: userConfig.userName,
+    };
+
+    const response = await client.logoutDevice(deviceInfo, userInfo);
+
+    if (!isOKResponse(response)) {
+      throw new Error(`Logout failed: ${response.data?.cnMessage || 'Unknown error'}`);
+    }
+
+    // 清除Token
+    await clearToken();
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    throw new Error(`failed to logout: ${errorMessage}`);
+  }
+}