@simonyea/holysheep-cli 1.7.64 → 1.7.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.64",
+  "version": "1.7.66",
   "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/index.html

@@ -479,16 +479,26 @@ async function doUpgradeTool(id, name) {
   openConsole(`${t('upgradeOne')}: ${name}`)
   document.getElementById('console-section').classList.add('busy')
 
+  let upgraded = false
   await streamSSE('/api/tool/upgrade', { toolId: id }, (ev) => {
     if (ev.type === 'progress') appendLog(ev.message, 'info')
     else if (ev.type === 'output') appendLogRaw(ev.text)
     else if (ev.type === 'done') {
+      upgraded = ev.success
       appendLog(ev.success ? `\n✓ ${t('configSuccess')}` : `\n✗ ${t('configFailed')}`, ev.success ? 'ok' : 'err')
     }
   })
 
   document.getElementById('console-section').classList.remove('busy')
   busy = false
+
+  if (upgraded && id === 'holysheep') {
+    appendLog(`\n${lang === 'zh' ? '⚠ HolySheep CLI 已升级，需要重启 WebUI 服务。正在重启...' : '⚠ HolySheep CLI upgraded. Restarting WebUI...'}`, 'warn')
+    // 调用后端重启，3 秒后刷新页面
+    try { await fetch('/api/restart', { method: 'POST' }) } catch {}
+    setTimeout(() => location.reload(), 4000)
+    return
+  }
   loadTools()
 }
 

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
 }
@@ -121,8 +140,7 @@ 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)
   }
 }
@@ -685,6 +698,17 @@ async function handleRequest(req, res) {
     if (route === '/api/tool/upgrade'   && req.method === 'POST') return await handleToolUpgrade(req, res)
     if (route === '/api/env'       && req.method === 'GET')  return handleEnv(req, res)
     if (route === '/api/env/clean' && req.method === 'POST') return handleEnvClean(req, res)
+    if (route === '/api/restart' && req.method === 'POST') {
+      json(res, { ok: true })
+      // 升级后用新版 hs web 重启自身
+      const port = req.headers.host?.split(':')[1] || '9876'
+      setTimeout(() => {
+        const child = spawn(process.execPath, [path.join(__dirname, '..', 'index.js'), 'web', '--port', port, '--no-open'], { detached: true, stdio: 'ignore' })
+        child.unref()
+        process.exit(0)
+      }, 500)
+      return
+    }
 
     res.writeHead(404)
     res.end('Not Found')