@honor-claw/yoyo 0.0.1-beta.2 → 0.0.1-beta.21

package/src/honor-auth/browser.ts

@@ -1,5 +1,6 @@
 import { createHonorAuthClient } from '../apis/honor-auth.js';
 import type { DeviceInfo, HonorUserInfo } from '../types.js';
+import { useClawLogger } from '../utils/logger.js';
 import { startCallbackServer } from './callback-server.js';
 import { getConfig } from './config.js';
 import { saveToken } from './token-manager.js';
@@ -9,23 +10,20 @@ import open from 'open';
 /**
  * 执行OAuth2授权流程（自动打开浏览器）
  */
-export async function performOAuth2AuthWithBrowser(deviceInfo: DeviceInfo, configOverrides?: Partial<HonorAuthConfig>) {
+export async function performOAuth2AuthWithBrowser(_: DeviceInfo, configOverrides?: Partial<HonorAuthConfig>) {
   const config = getConfig(configOverrides);
-
-  console.log('🔐 开始荣耀OAuth2认证流程（自动打开浏览器）...');
-  console.log(`📱 设备信息: ${deviceInfo.deviceName} (${deviceInfo.deviceModel})`);
-  console.log(`🆔 设备ID: ${deviceInfo.deviceId}`);
+  const logger = useClawLogger();
+  
+  logger.debug('Starting Honor login flow...');
 
   // 创建认证客户端
   const authClient = createHonorAuthClient(config);
 
   // 生成PKCE参数
   const pkceParams = authClient.generatePKCEParams();
-  console.log('🔑 PKCE参数已生成');
 
   // 构建授权URL
   const authUrl = authClient.buildAuthUrl(pkceParams);
-  console.log(`🔗 授权URL: ${authUrl}`);
 
   // 启动本地回调服务器
   let receivedCode: string | null = null;
@@ -36,36 +34,35 @@ export async function performOAuth2AuthWithBrowser(deviceInfo: DeviceInfo, confi
       receivedCode = code;
     },
     onError: error => {
-      console.error('❌ 回调服务器错误:', error);
+      console.error('callback server error:', error);
     },
   });
 
   // 打开浏览器
-  console.log('🌐 正在打开浏览器...');
+  console.log('🌐 open browser...');
   try {
     await open(authUrl);
   } catch (error) {
-    console.warn('⚠️  自动打开浏览器失败，请手动访问授权URL');
+    throw new Error('failed to open browser, check your permissions');
   }
 
   // 等待回调
   try {
     await serverPromise;
   } catch (error) {
-    throw new Error(`等待授权超时: ${error instanceof Error ? error.message : String(error)}`);
+    throw new Error(`authorization timeout: ${error instanceof Error ? error.message : String(error)}`);
   }
 
   if (!receivedCode) {
-    throw new Error('未收到授权码');
+    throw new Error('no auth code');
   }
 
   // 使用授权码换取Token
-  console.log('🔄 正在换取Token...');
   try {
     const tokenInfo = await authClient.exchangeToken(receivedCode);
 
     if (!tokenInfo.token || !tokenInfo.userInfo?.userId) {
-      throw new Error('获取用户信息失败，未返回用户ID');
+      throw new Error('failed to get user info');
     }
 
     // 保存Token
@@ -77,6 +74,6 @@ export async function performOAuth2AuthWithBrowser(deviceInfo: DeviceInfo, confi
       userName: tokenInfo.userInfo.displayName,
     } as HonorUserInfo;
   } catch (error) {
-    throw new Error(`换取Token失败: ${error instanceof Error ? error.message : String(error)}`);
+    throw new Error(`get token failed: ${error instanceof Error ? error.message : String(error)}`);
   }
 }

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

@@ -37,7 +37,6 @@ export function startCallbackServer(options: CallbackServerOptions): Promise<voi
 
         if (code && !hasReceivedCode) {
           hasReceivedCode = true;
-          console.log('✅ 成功获取授权码 code');
 
           // 返回成功响应
           res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
@@ -64,7 +63,7 @@ export function startCallbackServer(options: CallbackServerOptions): Promise<voi
           res.end('<h1>授权成功！可以关闭此窗口</h1>');
         }
       } catch (error) {
-        console.error('❌ 处理回调请求失败:', error);
+        console.error('authorize callback error:', error);
         res.writeHead(500, { 'Content-Type': 'text/html; charset=utf-8' });
         res.end('<h1>服务器错误</h1>');
       }
@@ -82,15 +81,13 @@ export function startCallbackServer(options: CallbackServerOptions): Promise<voi
       }
     });
 
-    server.listen(port, () => {
-      console.log(`📡 本地回调服务器已启动，监听端口: ${port}`);
-      
+    server.listen(port, () => {      
       // 设置超时
       timeoutId = setTimeout(() => {
         if (!serverClosed) {
           serverClosed = true;
           server.close();
-          const error = new Error('等待授权超时');
+          const error = new Error('authorize timeout');
           onError?.(error);
           if (!promiseResolved) {
             promiseResolved = true;

package/src/honor-auth/cloud.ts

@@ -1,30 +1,35 @@
 import { createHonorAuthClient } from '../apis/honor-auth.js';
+import { createClawCloudClient } from '../apis/claw-cloud.js';
+import { isOKResponse } from '../apis/index.js';
 import type { DeviceInfo, HonorUserInfo } from '../types.js';
+import { getConfigManager, takeApiHost } from '../modules/claw-configs/index.js';
+import { getDeviceInfo } from '../modules/device/device-info.js';
 import { startCallbackServer } from './callback-server.js';
 import { getConfig } from './config.js';
-import { saveToken } from './token-manager.js';
+import { saveToken, clearToken } from './token-manager.js';
 import type { HonorAuthConfig } from './types.js';
+import { useClawLogger } from '../utils/logger.js';
 
 /**
  * 执行云侧OAuth2授权流程
  */
 export async function performOAuth2Auth(deviceInfo: DeviceInfo, configOverrides?: Partial<HonorAuthConfig>) {
   const config = getConfig(configOverrides);
+  const logger = useClawLogger();
 
-  console.log('🔐 开始荣耀OAuth2认证流程...');
-  console.log(`📱 设备信息: ${deviceInfo.deviceName} (${deviceInfo.deviceModel})`);
-  console.log(`🆔 设备ID: ${deviceInfo.deviceId}`);
+  logger.debug('Starting Honor OAuth2 authentication flow...');
+  logger.debug(`Device info: ${deviceInfo.deviceName} (${deviceInfo.deviceModel})`);
+  logger.debug(`Device ID: ${deviceInfo.deviceId}`);
 
   // 创建认证客户端
   const authClient = createHonorAuthClient(config);
 
   // 生成PKCE参数
   const pkceParams = authClient.generatePKCEParams();
-  console.log('🔑 PKCE参数已生成');
+  logger.debug('PKCE parameters generated');
 
   // 构建授权URL
   const authUrl = authClient.buildAuthUrl(pkceParams);
-  console.log(`🔗 授权URL: ${authUrl}`);
 
   // 启动本地回调服务器
   let receivedCode: string | null = null;
@@ -36,24 +41,23 @@ export async function performOAuth2Auth(deviceInfo: DeviceInfo, configOverrides?
         receivedCode = code;
       },
       onError: error => {
-        console.error('❌ 回调服务器错误:', error);
+        logger.error(`Callback server error: ${error.message}`);
       },
     });
   } catch (error) {
-    throw new Error(`回调服务器启动失败: ${error instanceof Error ? error.message : String(error)}`);
+    throw new Error(`Failed to start callback server: ${error instanceof Error ? error.message : String(error)}`);
   }
 
   if (!receivedCode) {
-    throw new Error('未收到授权码');
+    throw new Error('No authorization code received');
   }
 
   // 使用授权码换取Token
-  console.log('🔄 正在换取Token...');
   try {
     const tokenInfo = await authClient.exchangeToken(receivedCode);
 
     if (!tokenInfo.token || !tokenInfo.userInfo?.userId) {
-      throw new Error('获取用户信息失败，未返回用户ID');
+      throw new Error('Failed to get user info, no user ID returned');
     }
 
     // 保存Token
@@ -65,6 +69,55 @@ export async function performOAuth2Auth(deviceInfo: DeviceInfo, configOverrides?
       userName: tokenInfo.userInfo.displayName,
     } as HonorUserInfo;
   } catch (error) {
-    throw new Error(`换取Token失败: ${error instanceof Error ? error.message : String(error)}`);
+    throw new Error(`Failed to exchange token: ${error instanceof Error ? error.message : String(error)}`);
+  }
+}
+
+/**
+ * 执行登出流程
+ */
+export async function performLogout(): Promise<void> {
+  try {
+    const configManager = getConfigManager();
+    const userConfig = configManager.getUserConfig();
+
+    if (!userConfig || !userConfig.userId) {
+      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}`);
   }
 }

package/src/honor-auth/config.ts

@@ -2,34 +2,42 @@
  * 荣耀认证配置管理
  */
 
-import type { HonorAuthConfig } from './types.js';
+import type { HonorAuthConfig } from "./types.js";
+import { getYoyoEnv } from "../runtime.js";
 
 /**
  * 默认配置
  */
-const DEFAULT_CONFIG: HonorAuthConfig = {
-  authHost: 'https://hnoauth-login-test-drcn.cloud.honor.com',
-  clientId: '221641491',
-  redirectUri: 'http://127.0.0.1:8081/deepLink',
+const TEST_ENV_CONFIG: HonorAuthConfig = {
+  authHost: "https://hnoauth-login-test-drcn.cloud.honor.com",
+  clientId: "221641491",
+  redirectUri: "http://127.0.0.1:8081/deepLink",
   localPort: 8081,
-  scope: 'openid profile',
-  reqClientType: '110',
-  loginChannel: '99011000',
+  scope: "openid profile",
+  reqClientType: "110",
+  loginChannel: "99011000",
+};
+const PRD_ENV_CONFIG: HonorAuthConfig = {
+  authHost: "https://hnoauth-login-drcn.cloud.honor.com",
+  clientId: "221000597",
+  redirectUri: "http://127.0.0.1:8081/deepLink",
+  localPort: 8081,
+  scope: "openid profile",
+  reqClientType: "110",
+  loginChannel: "99011000",
 };
 
 /**
  * 获取配置（支持自定义覆盖）
+ * 根据当前运行环境自动选择对应的配置
  */
-export function getConfig(overrides?: Partial<HonorAuthConfig>): HonorAuthConfig {
+export function getConfig(
+  overrides?: Partial<HonorAuthConfig>
+): HonorAuthConfig {
+  const env = getYoyoEnv();
+  const baseConfig = env === 'production' ? PRD_ENV_CONFIG : TEST_ENV_CONFIG;
   return {
-    ...DEFAULT_CONFIG,
+    ...baseConfig,
     ...overrides,
   };
 }
-
-/**
- * 获取默认配置
- */
-export function getDefaultConfig(): HonorAuthConfig {
-  return { ...DEFAULT_CONFIG };
-}

package/src/honor-auth/index.ts

@@ -1,2 +1,3 @@
 export * from './browser.js';
 export * from './cloud.js';
+export * from './token-manager.js';

package/src/honor-auth/token-manager.ts

@@ -2,18 +2,21 @@
  * Token管理器 - 负责token的读写缓存
  */
 
-import type { TokenResponse } from './types.js';
-import type { HonorUserInfo } from '../types.js';
-import { getConfigManager } from '../modules/claw-configs/index.js';
-import { useClawLogger } from '../utils/logger.js';
+import type { TokenResponse } from "./types.js";
+import type { HonorUserInfo } from "../types.js";
+import { getConfigManager } from "../modules/claw-configs/index.js";
+import { useClawLogger } from "../utils/logger.js";
 
 /**
  * 保存Token到openclaw配置文件
  */
-export async function saveToken(token: TokenResponse, saveToFile: boolean = true): Promise<void> {
+export async function saveToken(
+  token: TokenResponse,
+  saveToFile: boolean = true
+): Promise<void> {
   try {
     if (!saveToFile) {
-      console.log('💾 Token已获取（未保存到文件）');
+      console.log("💾 Token已获取（未保存到文件）");
       return;
     }
 
@@ -29,10 +32,10 @@ export async function saveToken(token: TokenResponse, saveToFile: boolean = true
       userId: token.userInfo?.userId,
       userName: token.userInfo?.displayName,
     });
-
-    console.log('💾 Token已保存到openclaw配置文件');
   } catch (error) {
-    throw new Error(`保存Token失败: ${error instanceof Error ? error.message : String(error)}`);
+    throw new Error(
+      `保存Token失败: ${error instanceof Error ? error.message : String(error)}`
+    );
   }
 }
 
@@ -50,19 +53,24 @@ export async function loadToken(): Promise<HonorUserInfo | null> {
     }
 
     // 检查是否过期
-    if (userConfig.expired && userConfig.expired < Math.floor(Date.now() / 1000)) {
+    if (
+      userConfig.expired &&
+      userConfig.expired < Math.floor(Date.now() / 1000)
+    ) {
       // Token已过期，从配置中移除
       await configManager.clearUserConfig();
       return null;
     }
 
     return {
-      userId: userConfig.userId || '',
+      userId: userConfig.userId || "",
       token: userConfig.token,
       userName: userConfig.userName,
     };
   } catch (error) {
-    throw new Error(`加载Token失败: ${error instanceof Error ? error.message : String(error)}`);
+    throw new Error(
+      `加载Token失败: ${error instanceof Error ? error.message : String(error)}`
+    );
   }
 }
 
@@ -73,8 +81,10 @@ export async function clearToken(): Promise<void> {
   try {
     const configManager = getConfigManager();
     await configManager.clearUserConfig();
-    useClawLogger().info('[yoyoclaw-auth] token cleared');
+    useClawLogger().info("[yoyoclaw-auth] token cleared");
   } catch (error) {
-    throw new Error(`清除Token失败: ${error instanceof Error ? error.message : String(error)}`);
+    throw new Error(
+      `清除Token失败: ${error instanceof Error ? error.message : String(error)}`
+    );
   }
 }