@simonyea/holysheep-cli 1.7.63 → 1.7.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.63",
+  "version": "1.7.65",
   "description": "Claude Code/Cursor/Cline API relay for China — ¥1=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
   "keywords": [
     "openai-china",

package/src/webui/server.js

@@ -4,6 +4,11 @@
  */
 'use strict'
 
+// 设置 DNS 回退：Cloudflare (1.1.1.1) + 阿里 (223.5.5.5) + 系统默认
+// 解决大陆服务器 DNS 解析 api.holysheep.ai 失败 (EAI_AGAIN) 的问题
+const dns = require('dns')
+dns.setServers([...new Set([...dns.getServers(), '1.1.1.1', '223.5.5.5'])])
+
 const http = require('http')
 const fs = require('fs')
 const path = require('path')
@@ -21,12 +26,26 @@ function maskKey(key) {
   return key.slice(0, 6) + '...' + key.slice(-4)
 }
 
-async function validateApiKey(apiKey) {
+async function fetchWithRetry(url, opts = {}, retries = 3) {
   const fetch = require('node-fetch')
-  const res = await fetch(`${BASE_URL_OPENAI}/models`, {
+  for (let i = 0; i < retries; i++) {
+    try {
+      return await fetch(url, { timeout: 10000, ...opts })
+    } catch (e) {
+      // DNS 暂时失败 (EAI_AGAIN) 或网络抖动，重试
+      if (i < retries - 1 && (e.code === 'EAI_AGAIN' || e.code === 'ETIMEDOUT' || e.code === 'ECONNRESET' || e.type === 'system')) {
+        await new Promise(r => setTimeout(r, 1500 * (i + 1)))
+        continue
+      }
+      throw e
+    }
+  }
+}
+
+async function validateApiKey(apiKey) {
+  const res = await fetchWithRetry(`${BASE_URL_OPENAI}/models`, {
     method: 'GET',
     headers: { Authorization: `Bearer ${apiKey}`, 'Content-Type': 'application/json' },
-    timeout: 10000,
   })
   return res.status === 200
 }
@@ -105,7 +124,7 @@ const UPGRADABLE_TOOLS = [
       : 'curl -fsSL https://claude.ai/install.sh | bash',
   },
   { name: 'Codex CLI', id: 'codex', command: 'codex', versionCmd: 'codex --version', npmPkg: '@openai/codex', installCmd: 'npm install -g @openai/codex@latest' },
-  { name: 'Droid CLI', id: 'droid', command: 'droid', versionCmd: 'droid --version', npmPkg: null, installCmd: 'brew install --cask droid' },
+  { name: 'Droid CLI', id: 'droid', command: 'droid', versionCmd: 'droid --version', npmPkg: null, installCmd: process.platform === 'win32' ? 'winget upgrade --id Droid.Droid' : 'brew install --cask droid' },
   { name: 'OpenCode', id: 'opencode', command: 'opencode', versionCmd: 'opencode --version', npmPkg: 'opencode-ai', installCmd: 'npm install -g opencode-ai@latest' },
   { name: 'OpenClaw', id: 'openclaw', command: 'openclaw', versionCmd: 'openclaw --version', npmPkg: 'openclaw', installCmd: 'npm install -g openclaw@latest --ignore-scripts' },
   { name: 'Gemini CLI', id: 'gemini-cli', command: 'gemini', versionCmd: 'gemini --version', npmPkg: '@google/gemini-cli', installCmd: 'npm install -g @google/gemini-cli@latest' },
@@ -115,14 +134,13 @@ const UPGRADABLE_TOOLS = [
 
 let _latestVersion = null
 let _lastCheckTime = 0
-const UPDATE_CHECK_INTERVAL = 30 * 60 * 1000
+const UPDATE_CHECK_INTERVAL = 5 * 60 * 1000
 
 async function checkLatestVersion() {
   const now = Date.now()
   if (_latestVersion && now - _lastCheckTime < UPDATE_CHECK_INTERVAL) return _latestVersion
   try {
-    const fetch = require('node-fetch')
-    const r = await fetch('https://registry.npmjs.org/@simonyea/holysheep-cli/latest', { timeout: 5000 })
+    const r = await fetchWithRetry('https://registry.npmjs.org/@simonyea/holysheep-cli/latest', {}, 2)
     if (r.ok) {
       const data = await r.json()
       _latestVersion = data.version || null
@@ -188,14 +206,9 @@ async function handleBalance(_req, res) {
   const apiKey = getApiKey()
   if (!apiKey) return json(res, { error: '未登录' }, 401)
   try {
-    const fetch = require('node-fetch')
-    const controller = new AbortController()
-    const timer = setTimeout(() => controller.abort(), 15000)
-    const r = await fetch(`${SHOP_URL}/api/stats/overview`, {
+    const r = await fetchWithRetry(`${SHOP_URL}/api/stats/overview`, {
       headers: { Authorization: `Bearer ${apiKey}` },
-      signal: controller.signal,
     })
-    clearTimeout(timer)
     if (r.status === 401) return json(res, { error: 'API Key 无效或已过期' }, 401)
     if (!r.ok) return json(res, { error: `HTTP ${r.status}` }, r.status)
     const data = await r.json()
@@ -206,7 +219,7 @@ async function handleBalance(_req, res) {
       totalCalls: Number(data.totalCalls || 0),
     })
   } catch (e) {
-    const msg = e.name === 'AbortError' ? '请求超时，请稍后重试' : e.message
+    const msg = e.code === 'EAI_AGAIN' ? 'DNS 解析失败，请检查网络' : e.message
     json(res, { error: msg }, 500)
   }
 }