@simonyea/holysheep-cli 1.7.66 → 1.7.67

package/package.json

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