@simonyea/holysheep-cli 1.7.65 → 1.7.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.65",
+  "version": "1.7.67",
   "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

@@ -26,15 +26,20 @@ function maskKey(key) {
   return key.slice(0, 6) + '...' + key.slice(-4)
 }
 
-async function fetchWithRetry(url, opts = {}, retries = 3) {
+async function fetchWithRetry(url, opts = {}, retries = 3, timeoutMs = 20000) {
   const fetch = require('node-fetch')
   for (let i = 0; i < retries; i++) {
+    const controller = new AbortController()
+    const timer = setTimeout(() => controller.abort(), timeoutMs)
     try {
-      return await fetch(url, { timeout: 10000, ...opts })
+      const res = await fetch(url, { ...opts, signal: controller.signal })
+      clearTimeout(timer)
+      return res
     } 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)))
+      clearTimeout(timer)
+      const retryable = e.code === 'EAI_AGAIN' || e.code === 'ETIMEDOUT' || e.code === 'ECONNRESET' || e.code === 'ECONNREFUSED' || e.type === 'system' || e.name === 'AbortError'
+      if (i < retries - 1 && retryable) {
+        await new Promise(r => setTimeout(r, 2000 * (i + 1)))
         continue
       }
       throw e
@@ -698,6 +703,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')