fix: bugs

Author: shixian

README.md

@@ -41,8 +41,10 @@ ccapi -v
 初次使用需要设置 Claude Code 的 settings.json 文件路径和自定义API配置文件路径：
 
 ```bash
-例如:
-# 同时设置两个路径
+# windows 默认settings.json路径在 C:\Users\Administrator\.claude\settings.json
+# mac 默认settings.json路径在 ~/.claude/settings.json
+
+# 示例: mac同时设置两个路径
 ccapi set --settings ~/.claude/settings.json --api /Users/4xian/Desktop/api.json5
 
 # 分别设置
@@ -300,8 +302,8 @@ ccapi test -c openrouter
 
 **测试方式说明：**
 
-- **默认方式**：使用接口模拟方式，直接模拟Claude CLI请求头，速度快
-- **CLI方式**（`-c` 选项）：使用真实的Claude Code CLI环境，准确度最高，但速度较慢（40-50秒）
+- **默认方式**：使用接口模拟方式，直接模拟Claude CLI请求，速度快，准确性较高(部分厂商只允许在cli中调用，这种时候你可忽略结果，默认为成功)
+- **CLI方式**（`-c` 选项）：使用真实的Claude Code CLI环境，准确度最高，可能会出现调用各种mcp服务情况，速度较慢（1分钟左右）
 
 **配置说明：**
 
@@ -318,7 +320,6 @@ ccapi test -c openrouter
     "testResponse": false
   }
   ```
-
 - 对于数组格式的URL，会测试所有URL地址，数组配置的URL内部不会按延迟排序，保持原有的URL顺序
 - 配置按最佳延迟排序，延迟最低的配置排在前面
 - 显示每个配置的最优路线（最快的URL地址）

README_EN.md

@@ -42,7 +42,10 @@ First-time use requires setting the path to Claude Code's settings.json file and
 
 ```bash
 Examples:
-# Set both paths simultaneously
+# windows default path: C:\Users\Administrator\.claude\settings.json
+# mac default path:  ~/.claude/settings.json
+
+# mac: Set both paths simultaneously
 ccapi set --settings ~/.claude/settings.json --api /Users/4xian/Desktop/api.json5
 
 # Set them separately
@@ -322,7 +325,6 @@ ccapi test openrouter -t 2    # Use 2nd Token
     "testResponse": false
   }
   ```
-
 - For array format URLs, all URL addresses will be tested, array configuration URLs will not be sorted by latency internally, maintaining original URL order
 - Configurations sorted by best latency, lowest latency configurations appear first
 - Shows optimal route (fastest URL address) for each configuration

dist/index.js

@@ -23,7 +23,9 @@ async function setCommand(options) {
           const statusIcon = settingsExists ? chalk.green('✓') : chalk.red('✗')
           console.log(`  settings.json: ${statusIcon} ${chalk.cyan(currentSettingsPath)}`)
           if (!settingsExists) {
-            console.log(`    ${chalk.yellow(await t('prompts.WARNING') + ': ' + await t('prompts.FILE_NOT_EXISTS'))}`)
+            console.log(
+              `    ${chalk.yellow((await t('prompts.WARNING')) + ': ' + (await t('prompts.FILE_NOT_EXISTS')))}`
+            )
           }
         } else {
           console.log(`  settings.json: ${chalk.yellow(await t('prompts.NOT_SET'))}`)
@@ -34,7 +36,9 @@ async function setCommand(options) {
           const statusIcon = apiExists ? chalk.green('✓') : chalk.red('✗')
           console.log(`  api: ${statusIcon} ${chalk.cyan(currentApiPath)}`)
           if (!apiExists) {
-            console.log(`    ${chalk.yellow(await t('prompts.WARNING') + ': ' + await t('prompts.FILE_NOT_EXISTS'))}`)
+            console.log(
+              `    ${chalk.yellow((await t('prompts.WARNING')) + ': ' + (await t('prompts.FILE_NOT_EXISTS')))}`
+            )
           }
         } else {
           console.log(`  api: ${chalk.yellow(await t('prompts.NOT_SET'))}`)
@@ -45,15 +49,16 @@ async function setCommand(options) {
         console.log(`  ${chalk.cyan('ccapi set --settings <path>')} - ${await t('prompts.SET_SETTINGS_HELP')}`)
         console.log(`  ${chalk.cyan('ccapi set --api <path>')} - ${await t('prompts.SET_API_HELP')}`)
       } catch (error) {
-        console.error(chalk.red(await t('errors.READ_CONFIG_FAILED') + ':'), error.message)
+        console.error(chalk.red((await t('errors.READ_CONFIG_FAILED')) + ':'), error.message)
       }
       return
     }
 
     // 验证命令参数
-    const validation = validateSetCommand(options)
+    const validation = await validateSetCommand(options)
+
     if (!validation.valid) {
-      console.error(chalk.red(await t('errors.PARAM_ERROR') + ':'), validation.error)
+      console.error(chalk.red((await t('errors.PARAM_ERROR')) + ':'), validation.error)
       return
     }
 
@@ -63,7 +68,10 @@ async function setCommand(options) {
     if (settings) {
       // 检查文件是否存在
       if (!(await fileExists(settings))) {
-        console.warn(chalk.yellow(await t('prompts.WARNING') + ':'), await t('setPaths.SETTINGS_FILE_NOT_EXIST', settings))
+        console.warn(
+          chalk.yellow((await t('prompts.WARNING')) + ':'),
+          await t('setPaths.SETTINGS_FILE_NOT_EXIST', settings)
+        )
         console.log(await t('prompts.PATH_SAVED_ENSURE_EXISTS'))
       }
 
@@ -75,7 +83,7 @@ async function setCommand(options) {
     if (api) {
       // 检查文件是否存在
       if (!(await fileExists(api))) {
-        console.warn(chalk.yellow(await t('prompts.WARNING') + ':'), await t('setPaths.API_FILE_NOT_EXIST', api))
+        console.warn(chalk.yellow((await t('prompts.WARNING')) + ':'), await t('setPaths.API_FILE_NOT_EXIST', api))
         console.log(await t('prompts.PATH_SAVED_ENSURE_EXISTS'))
       }
 
@@ -87,7 +95,7 @@ async function setCommand(options) {
     console.log(chalk.blue(await t('success.CONFIG_SAVED')))
     results.forEach((result) => console.log(`  ${result}`))
   } catch (error) {
-    console.error(chalk.red(await t('errors.SET_FAILED') + ':'), error.message)
+    console.error(chalk.red((await t('errors.SET_FAILED')) + ':'), error.message)
     process.exit(1)
   }
 }

src/commands/set.js

@@ -196,7 +196,6 @@ async function testApiLatencyWithCurl(url, key, token, model = 'claude-3-5-haiku
 
   // 执行单次测试的内部函数
   async function performSingleTest(testModel, attempt = 1) {
-
     try {
       const requestBody = {
         model: testModel,
@@ -236,7 +235,7 @@ async function testApiLatencyWithCurl(url, key, token, model = 'claude-3-5-haiku
         '-H',
         `x-api-key: ${key || token}`,
         '-H',
-        `Authorization: Bearer ${token || key}`,
+        `Authorization: Bearer ${key || token}`,
         '-H',
         'x-app: cli',
         '-H',
@@ -280,8 +279,6 @@ async function testApiLatencyWithCurl(url, key, token, model = 'claude-3-5-haiku
       let httpHeaders = ''
       let responseBody = ''
 
-      // console.log('response', fullResponse);
-      
       if (headerBodySplit.length < 2) {
         const lineSplit = fullResponse.split('\n\n')
         if (lineSplit.length < 2) {
@@ -294,12 +291,14 @@ async function testApiLatencyWithCurl(url, key, token, model = 'claude-3-5-haiku
         responseBody = headerBodySplit.slice(1).join('\r\n\r\n')
       }
 
+      // console.log('httpHeaders', httpHeaders)
+      // console.log('responseBody', responseBody)
+
       // 检查HTTP状态码
       const statusMatch = httpHeaders.match(/HTTP\/[12](?:\.\d)?\s+(\d{3})\s*(.*)/)
       const statusCode = statusMatch ? parseInt(statusMatch[1]) : 0
       const statusText = statusMatch ? statusMatch[2].trim() : 'Unknown'
 
-      // 如果状态码不是2xx，则认为是错误
       if (statusCode < 200 || statusCode >= 300) {
         let errorMessage = `HTTP ${statusCode} ${statusText}`
 
@@ -310,7 +309,6 @@ async function testApiLatencyWithCurl(url, key, token, model = 'claude-3-5-haiku
             errorMessage = errorJson.error.message
           }
         } catch (e) {
-          // 如果不是JSON，检查是否包含中文错误信息
           const cleanBody = responseBody.replace(/<[^>]*>/g, '').trim()
           if (cleanBody && cleanBody.length < 200) {
             errorMessage = cleanBody
@@ -325,14 +323,24 @@ async function testApiLatencyWithCurl(url, key, token, model = 'claude-3-5-haiku
 
       if (!isEventStream) {
         // 非SSE响应，尝试解析为JSON
-        const jsonResponse = JSON.parse(responseBody.trim())
+        try {
+          const jsonResponse = JSON.parse(responseBody.trim())
 
-        if (jsonResponse.error) {
-          throw new Error(jsonResponse.error.message || 'API Error')
-        }
-        // 如果是成功的JSON响应，提取内容
-        if (jsonResponse.content && Array.isArray(jsonResponse.content)) {
-          responseText = jsonResponse.content.map((c) => c.text).join('')
+          if (jsonResponse.error) {
+            throw new Error(jsonResponse.error.message || 'API Error')
+          }
+          // 如果是成功的JSON响应，提取内容
+          if (jsonResponse.content && Array.isArray(jsonResponse.content)) {
+            responseText = jsonResponse.content.map((c) => c.text).join('')
+          }
+        } catch (parseError) {
+          const errorIndex = responseBody.indexOf('error')
+          if (errorIndex !== -1) {
+            const errorPart = responseBody.substring(errorIndex).replace(/\n/g, '').trim()
+            throw new Error(errorPart)
+          } else {
+            throw new Error(responseBody.replace(/\n/g, '').trim() || 'Invalid response format')
+          }
         }
       } else {
         // SSE响应处理
@@ -386,19 +394,21 @@ async function testApiLatencyWithCurl(url, key, token, model = 'claude-3-5-haiku
       return {
         success: true,
         latency: testLatency,
-        response: responseText.length > maxText ? responseText.slice(0, maxText) + '...' : responseText.trim(),
+        response:
+          responseText.length > maxText
+            ? responseText.slice(0, maxText) + '...'
+            : responseText.replace(/\n/g, '').trim(),
         error: null,
         model: testModel,
         attempt
       }
-
     } catch (error) {
-      console.log(`Attempt ${attempt} failed:`, error.message)
+      // console.log(`Attempt ${attempt} failed:`, error.message)
 
       return {
         success: false,
         latency: 'error',
-        error: error.message,
+        error: error.message.replace(/\n/g, '').trim(),
         response: null,
         model: testModel,
         attempt
@@ -429,7 +439,6 @@ async function testApiLatencyWithCurl(url, key, token, model = 'claude-3-5-haiku
     return {
       ...result
     }
-
   } catch (error) {
     let message = await t('test.REQUEST_FAILED')
 
@@ -490,7 +499,7 @@ async function testApiLatency(url, key, token, model = 'claude-3-5-haiku-2024102
       mcpConfigPath
     ]
 
-    const timeout = configData.testTimeout || 60000
+    const timeout = configData.testTimeout || 100000
     const spawnOptions = {
       cwd: tempWorkDir,
       stdio: ['pipe', 'pipe', 'pipe']