feat(api, cursor store): enhance error logging and improve user feedback during machine ID reset and account switching operations

Cloxl · Cloxl · commit f354dd5d8f24 · 2025-03-19T17:49:37.000+08:00
diff --git a/src-tauri/src/utils/logger.rs b/src-tauri/src/utils/logger.rs
@@ -60,7 +60,7 @@ pub fn init_logger(config: LogConfig) -> Result<(), String> {
     let env_filter = EnvFilter::try_from_default_env()
         .unwrap_or_else(|_| EnvFilter::new(&log_level));
     
-    // 设置日志格式
+    // 修改日志格式
     if config.json_format {
         // JSON格式
         let json_layer = fmt::layer()
@@ -72,8 +72,8 @@ pub fn init_logger(config: LogConfig) -> Result<(), String> {
             .with(env_filter)
             .with(json_layer);
         
-        // 如果启用控制台输出，添加控制台输出层
         if config.console_output {
+            // 控制台输出可以保留颜色
             let console_layer = fmt::layer()
                 .json()
                 .with_timer(UtcTime::rfc_3339());
@@ -83,25 +83,27 @@ pub fn init_logger(config: LogConfig) -> Result<(), String> {
             subscriber.init();
         }
     } else {
-        // 文本格式（类似loguru）
+        // 文本格式 - 移除颜色相关配置
         let fmt_layer = fmt::layer()
             .with_target(true)
             .with_thread_ids(true)
             .with_level(true)
             .with_timer(UtcTime::rfc_3339())
+            .with_ansi(false)  // 禁用ANSI颜色
             .with_writer(file_appender);
         
         let subscriber = tracing_subscriber::registry()
             .with(env_filter)
             .with(fmt_layer);
         
-        // 如果启用控制台输出，添加控制台输出层
         if config.console_output {
+            // 控制台输出可以保留颜色
             let console_layer = fmt::layer()
                 .with_target(true)
                 .with_thread_ids(true)
                 .with_level(true)
-                .with_timer(UtcTime::rfc_3339());
+                .with_timer(UtcTime::rfc_3339())
+                .with_ansi(true);
             
             subscriber.with(console_layer).init();
         } else {
diff --git a/src/api/index.ts b/src/api/index.ts
@@ -12,6 +12,7 @@ import type {
     Article,
     RegisterResponse
 } from './types'
+import Logger from '../utils/logger'
 
 // 错误处理
 function handleApiResponse<T>(response: ApiResponse<T>): T {
@@ -172,6 +173,7 @@ export async function resetMachineId(params: { forceKill?: boolean, machineId?:
             machineId: params.machineId
         })
     } catch (error) {
+        await Logger.error('重置机器码失败', { file: 'api/index.ts' })
         throw new ApiError(error instanceof Error ? error.message : '重置机器码失败')
     }
 }
@@ -180,11 +182,13 @@ export async function switchAccount(email: string, token: string, forceKill: boo
     try {
         const result = await invoke<boolean>('switch_account', { email, token, forceKill })
         if (result !== true) {
+            await Logger.error(`切换账户失败: ${email}`, { file: 'api/index.ts' })
             throw new Error('切换账户失败')
         }
     } catch (error) {
+        await Logger.error(`切换账户失败: ${email}, ${error}`, { file: 'api/index.ts' })
         const errorMsg = error instanceof Error ? error.message : '切换账户失败'
-        if (errorMsg.includes('Cursor进程正在运行, 请先关闭Cursor')) {
+        if (errorMsg.includes('Cursor进程正在运行')) {
             throw new Error('请先关闭 Cursor 或选择强制终止进程')
         }
         throw error
@@ -195,6 +199,7 @@ export async function getMachineIds(): Promise<MachineInfo> {
     try {
         return await invoke<MachineInfo>('get_machine_ids')
     } catch (error) {
+        await Logger.error('获取机器码失败', { file: 'api/index.ts' })
         throw new ApiError(error instanceof Error ? error.message : '获取机器码失败')
     }
 }
@@ -203,6 +208,7 @@ export async function checkCursorRunning(): Promise<boolean> {
     try {
         return await invoke<boolean>('check_cursor_running')
     } catch (error) {
+        await Logger.error('检查Cursor状态失败', { file: 'api/index.ts' })
         throw new ApiError(error instanceof Error ? error.message : '检查Cursor状态失败')
     }
 }
@@ -231,7 +237,7 @@ export async function applyHook(forceKill: boolean = false): Promise<void> {
         await invoke<void>('hook_main_js', { forceKill })
     } catch (error) {
         const errorMsg = error instanceof Error ? error.message : String(error)
-        console.error('应用hook错误:', errorMsg)
+        await Logger.error(`应用hook失败: ${errorMsg}`, { file: 'api/index.ts' })
         
         if (errorMsg.includes('Cursor进程正在运行')) {
             throw new Error('请先关闭 Cursor 或选择强制终止进程')
@@ -255,7 +261,7 @@ export async function restoreHook(forceKill: boolean = false): Promise<void> {
         await invoke<void>('restore_hook', { forceKill })
     } catch (error) {
         const errorMsg = error instanceof Error ? error.message : String(error)
-        console.error('恢复hook错误:', errorMsg)
+        await Logger.error(`恢复hook失败: ${errorMsg}`, { file: 'api/index.ts' })
         
         if (errorMsg.includes('Cursor进程正在运行')) {
             throw new Error('请先关闭 Cursor 或选择强制终止进程')
diff --git a/src/locales/messages.ts b/src/locales/messages.ts
@@ -160,7 +160,7 @@ export const messages = {
       copyFailed: '复制失败',
       forceClose: '我已保存, 强制关闭',
       cursorRunning: 'Cursor 正在运行',
-      cursorRunningMessage: '检测到 Cursor 正在运行, 请保存尚未更改的项目再继续操作!',
+      cursorRunningMessage: '检测到 Cursor 正在运行, 请保存尚未更改的项目再继续操作! 不保存会导致Cursor报错! 报错了请别联系客服!',
       closingCursor: '正在关闭 Cursor...',
       forgotPassword: '忘记密码？',
       unknown: '未知',
diff --git a/src/stores/cursor.ts b/src/stores/cursor.ts
@@ -19,6 +19,7 @@ import type { UsageInfo, MachineInfo } from '@/api/types'
 import type { HistoryAccount } from '@/types/history'
 import { useHistoryStore } from './history'
 import { open } from '@tauri-apps/plugin-dialog'
+import Logger from '../utils/logger'
 
 export const useCursorStore = defineStore('cursor', () => {
   // 状态
@@ -148,20 +149,21 @@ export const useCursorStore = defineStore('cursor', () => {
   /**
    * 重置机器码
    */
-  async function resetMachine(params: { forceKill?: boolean, machineId?: string } = {}) {
+  async function resetMachine({ forceKill = false, machineId }: { forceKill?: boolean; machineId?: string } = {}) {
     try {
       machineCodeLoading.value = true
-      isLoading.value = true
+      await Logger.info('开始重置机器码')
       
       // 检查 Cursor 是否在运行
-      if (!params.forceKill) {
+      if (!forceKill) {
         const isRunning = await checkCursorRunning()
         if (isRunning) {
           throw new Error('Cursor进程正在运行, 请先关闭Cursor')
         }
       }
       
-      await resetMachineId(params)
+      await resetMachineId({ forceKill, machineId })
+      await Logger.info('机器码重置成功')
       
       // 添加历史记录
       await saveHistoryRecord({
@@ -177,7 +179,7 @@ export const useCursorStore = defineStore('cursor', () => {
       await fetchCursorUsage()
       return true
     } catch (error) {
-      console.error('重置机器码失败:', error)
+      await Logger.error(`重置机器码失败: ${error}`)
       throw error
     } finally {
       isLoading.value = false
@@ -191,7 +193,7 @@ export const useCursorStore = defineStore('cursor', () => {
   async function switchCursorAccount(email?: string, token?: string, forceKill: boolean = false) {
     try {
       accountSwitchLoading.value = true
-      isLoading.value = true
+      await Logger.info('开始切换账户操作')
       
       // 检查 Cursor 是否在运行
       if (!forceKill) {
@@ -203,15 +205,27 @@ export const useCursorStore = defineStore('cursor', () => {
       
       // 如果未提供邮箱和token，则自动获取
       if (!email || !token) {
-        const accountInfo = await getAccount(undefined, '1')
-        if (!accountInfo.account_info.account || !accountInfo.account_info.token) {
-          throw new Error('无法获取账户信息')
+        try {
+          const accountInfo = await getAccount(undefined, '1')
+          if (!accountInfo.account_info.account || !accountInfo.account_info.token) {
+            await Logger.error('获取账户信息失败，无法进行切换')
+            throw new Error('获取账户信息失败')
+          }
+          email = accountInfo.account_info.account
+          token = accountInfo.account_info.token
+        } catch (error) {
+          await Logger.error('获取新账户失败')
+          throw error
         }
-        email = accountInfo.account_info.account
-        token = accountInfo.account_info.token
       }
       
-      await switchAccount(email, token, forceKill)
+      try {
+        await switchAccount(email, token, forceKill)
+        await Logger.info(`账户切换成功: ${email}`)
+      } catch (error) {
+        await Logger.error(`账户切换失败: ${error}`)
+        throw error
+      }
       
       // 添加历史记录
       await saveHistoryRecord({
@@ -227,7 +241,6 @@ export const useCursorStore = defineStore('cursor', () => {
       await fetchCursorUsage()
       return true
     } catch (error) {
-      console.error('切换账户失败:', error)
       throw error
     } finally {
       isLoading.value = false
@@ -241,7 +254,7 @@ export const useCursorStore = defineStore('cursor', () => {
   async function quickChange(email?: string, token?: string, forceKill: boolean = false) {
     try {
       quickChangeLoading.value = true
-      isLoading.value = true
+      await Logger.info('开始一键换号操作')
       
       // 检查 Cursor 是否在运行
       if (!forceKill) {
@@ -251,27 +264,22 @@ export const useCursorStore = defineStore('cursor', () => {
         }
       }
       
-      // 如果未提供邮箱和token，则自动获取
-      if (!email || !token) {
-        const accountInfo = await getAccount(undefined, '1')
-        if (!accountInfo.account_info.account || !accountInfo.account_info.token) {
-          throw new Error('无法获取账户信息')
-        }
-        email = accountInfo.account_info.account
-        token = accountInfo.account_info.token
-      }
-      
       // 先重置机器码
       try {
-        await resetMachineId({ forceKill })
+        await resetMachine({ forceKill })
       } catch (error) {
-        console.error('重置机器码失败:', error)
-        // 确保在机器码重置失败时立即终止，不执行账户切换
-        throw new Error(`重置机器码失败，已终止账户切换操作: ${error instanceof Error ? error.message : String(error)}`)
+        await Logger.error('一键换号时重置机器码失败')
+        throw error
       }
       
-      // 只有在机器码重置成功后才执行账户切换
-      await switchAccount(email, token, forceKill)
+      // 再切换账户
+      try {
+        await switchCursorAccount(email, token, forceKill)
+        await Logger.info('一键换号完成')
+      } catch (error) {
+        await Logger.error('一键换号时切换账户失败')
+        throw error
+      }
       
       // 添加历史记录
       await saveHistoryRecord({
@@ -288,7 +296,6 @@ export const useCursorStore = defineStore('cursor', () => {
       
       return true
     } catch (error) {
-      console.error('一键更换失败:', error)
       throw error
     } finally {
       isLoading.value = false
@@ -330,6 +337,7 @@ export const useCursorStore = defineStore('cursor', () => {
    */
   async function applyHookToClient(forceKill: boolean = false) {
     try {
+      await Logger.info('开始注入Hook')
       operationLoading.value = true
       isLoading.value = true
       
@@ -342,9 +350,11 @@ export const useCursorStore = defineStore('cursor', () => {
       // 触发检查以确保状态已更新
       await checkHook()
       
+      await Logger.info('Hook注入成功')
       return true
     } catch (error) {
-      console.error('应用 Hook 失败:', error)
+      await Logger.error(`Hook注入失败: ${error}`)
+      hookStatus.value = false
       throw error
     } finally {
       isLoading.value = false
@@ -357,6 +367,7 @@ export const useCursorStore = defineStore('cursor', () => {
    */
   async function restoreHookFromClient(forceKill: boolean = false) {
     try {
+      await Logger.info('开始恢复Hook')
       operationLoading.value = true
       isLoading.value = true
       
@@ -369,9 +380,10 @@ export const useCursorStore = defineStore('cursor', () => {
       // 触发检查以确保状态已更新
       await checkHook()
       
+      await Logger.info('Hook恢复成功')
       return true
     } catch (error) {
-      console.error('恢复 Hook 失败:', error)
+      await Logger.error(`Hook恢复失败: ${error}`)
       throw error
     } finally {
       isLoading.value = false
diff --git a/src/utils/logger.ts b/src/utils/logger.ts
@@ -7,6 +7,11 @@ interface ErrorInfo {
   stack?: string
 }
 
+interface LogOptions {
+  file?: string
+  line?: number
+}
+
 class Logger {
   private static formatError(error: Error | string): ErrorInfo {
     if (error instanceof Error) {
@@ -33,13 +38,13 @@ class Logger {
     }
   }
 
-  static async error(error: Error | string) {
+  static async error(error: Error | string, options?: LogOptions) {
     const errorInfo = this.formatError(error)
     try {
       await invoke('log_error', {
         message: errorInfo.message,
-        file: errorInfo.file,
-        line: errorInfo.line
+        file: options?.file || errorInfo.file,
+        line: options?.line || errorInfo.line
       })
       
       // 如果有堆栈信息，额外记录
@@ -53,9 +58,13 @@ class Logger {
     }
   }
 
-  static async warn(message: string, file?: string, line?: number) {
+  static async warn(message: string, options?: LogOptions) {
     try {
-      await invoke('log_warn', { message, file, line })
+      await invoke('log_warn', { 
+        message, 
+        file: options?.file,
+        line: options?.line 
+      })
     } catch (e) {
       console.error('Failed to log warning:', e)
     }
