@simonyea/holysheep-cli 1.7.70 → 1.7.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.70",
+  "version": "1.7.72",
   "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/commands/claude.js

@@ -60,6 +60,13 @@ async function runClaude(args = []) {
 
   ensureClaudeProxyConfig(apiKey)
 
+  // 修复 settings.json 中残留的旧 proxy URL（之前版本的 applyRuntimeSettingsOverride 遗留）
+  const settings = claudeCodeTool.readSettings()
+  if (settings.env?.ANTHROPIC_BASE_URL?.startsWith('http://127.0.0.1:')) {
+    settings.env.ANTHROPIC_BASE_URL = BASE_URL_ANTHROPIC
+    claudeCodeTool.writeSettings(settings)
+  }
+
   const { server, port, sessionId } = await startProcessProxy({})
   const proxyUrl = getLocalProxyUrl(port)
   const runtime = typeof claudeCodeTool.detectClaudeRuntime === 'function'

package/src/tools/claude-process-proxy.js

@@ -209,18 +209,26 @@ function createProcessProxyServer({ sessionId, configPath = CONFIG_PATH }) {
 
     try {
       await doForward(getCachedLease(sessionId))
-    } catch {
-      if (clientRes.headersSent) return // 响应已开始流式传输，不能重试
-      try {
-        const config = readConfig(configPath)
-        leaseCache.delete(sessionId)
-        const freshLease = await fetchFreshLease(config, sessionId)
-        await doForward(freshLease)
-      } catch (retryError) {
-        if (!clientRes.headersSent) {
-          clientRes.writeHead(502, { 'content-type': 'text/plain; charset=utf-8' })
-          clientRes.end(retryError.message || 'Proxy error')
+    } catch (err) {
+      if (clientRes.headersSent) return
+      // 只在没有 lease 缓存时重试（首次连接或 lease 过期）
+      // 网络超时/连接错误不重试 — 让 Claude Code 自己处理重试，避免重复 API 请求
+      const noLease = !leaseCache.has(sessionId) || (err && err.message && err.message.includes('No session lease'))
+      if (noLease) {
+        try {
+          const config = readConfig(configPath)
+          leaseCache.delete(sessionId)
+          const freshLease = await fetchFreshLease(config, sessionId)
+          await doForward(freshLease)
+        } catch (retryError) {
+          if (!clientRes.headersSent) {
+            clientRes.writeHead(502, { 'content-type': 'text/plain; charset=utf-8' })
+            clientRes.end(retryError.message || 'Proxy error')
+          }
         }
+      } else {
+        clientRes.writeHead(502, { 'content-type': 'text/plain; charset=utf-8' })
+        clientRes.end(err?.message || 'Proxy error')
       }
     }
   })
@@ -247,15 +255,20 @@ function createProcessProxyServer({ sessionId, configPath = CONFIG_PATH }) {
 
     try {
       await doConnect(getCachedLease(sessionId))
-    } catch {
-      // lease 失效，拿新 lease 重试一次
-      try {
-        const config = readConfig(configPath)
-        leaseCache.delete(sessionId)
-        const freshLease = await fetchFreshLease(config, sessionId)
-        await doConnect(freshLease)
-      } catch (retryError) {
-        clientSocket.write(`HTTP/1.1 502 Bad Gateway\r\ncontent-type: text/plain; charset=utf-8\r\n\r\n${retryError.message}`)
+    } catch (err) {
+      const noLease = !leaseCache.has(sessionId) || (err && err.message && err.message.includes('No session lease'))
+      if (noLease) {
+        try {
+          const config = readConfig(configPath)
+          leaseCache.delete(sessionId)
+          const freshLease = await fetchFreshLease(config, sessionId)
+          await doConnect(freshLease)
+        } catch (retryError) {
+          clientSocket.write(`HTTP/1.1 502 Bad Gateway\r\ncontent-type: text/plain; charset=utf-8\r\n\r\n${retryError.message}`)
+          clientSocket.destroy()
+        }
+      } else {
+        clientSocket.write(`HTTP/1.1 502 Bad Gateway\r\ncontent-type: text/plain; charset=utf-8\r\n\r\n${err?.message || 'Proxy error'}`)
         clientSocket.destroy()
       }
     }