@simonyea/holysheep-cli 1.7.125 → 1.7.127

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.125",
+  "version": "1.7.127",
   "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/tools/claude-process-proxy.js

@@ -46,6 +46,7 @@ function getControlPlaneUrl(config) {
 }
 
 const leaseCache = new Map()
+const MAX_PROXY_RETRIES = 3
 
 function isRetryableNodeLeaseError(err) {
   const message = String(err?.message || '')
@@ -277,29 +278,29 @@ function createProcessProxyServer({ sessionId, configPath = CONFIG_PATH }) {
       })
     }
 
-    try {
-      await doForward(getCachedLease(sessionId))
-    } catch (err) {
-      if (clientRes.headersSent) return
-      const shouldRefreshLease =
-        !leaseCache.has(sessionId) || (err && isRetryableNodeLeaseError(err))
-      if (shouldRefreshLease) {
-        try {
+    let lastError = null
+    for (let attempt = 0; attempt <= MAX_PROXY_RETRIES; attempt++) {
+      try {
+        if (attempt === 0) {
+          await doForward(getCachedLease(sessionId))
+        } else {
           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')
+        lastError = null
+        break
+      } catch (err) {
+        lastError = err
+        if (clientRes.headersSent) return
+        if (!isRetryableNodeLeaseError(err) && attempt > 0) break
       }
     }
+    if (lastError && !clientRes.headersSent) {
+      clientRes.writeHead(502, { 'content-type': 'text/plain; charset=utf-8' })
+      clientRes.end(lastError.message || 'Proxy error')
+    }
   })
 
   // Hosts that must NOT be tunneled directly — they must go through CRS via
@@ -333,26 +334,28 @@ function createProcessProxyServer({ sessionId, configPath = CONFIG_PATH }) {
       pipeWithCleanup(clientSocket, upstreamSocket)
     }
 
-    try {
-      await doConnect(getCachedLease(sessionId))
-    } catch (err) {
-      const shouldRefreshLease =
-        !leaseCache.has(sessionId) || (err && isRetryableNodeLeaseError(err))
-      if (shouldRefreshLease) {
-        try {
+    let lastError = null
+    for (let attempt = 0; attempt <= MAX_PROXY_RETRIES; attempt++) {
+      try {
+        if (attempt === 0) {
+          await doConnect(getCachedLease(sessionId))
+        } else {
           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()
+        lastError = null
+        break
+      } catch (err) {
+        lastError = err
+        if (!isRetryableNodeLeaseError(err) && attempt > 0) break
       }
     }
+    if (lastError) {
+      clientSocket.write(`HTTP/1.1 502 Bad Gateway\r\ncontent-type: text/plain; charset=utf-8\r\n\r\n${lastError.message || 'Proxy error'}`)
+      clientSocket.destroy()
+    }
   })
 
   return server

package/src/tools/codex.js

@@ -162,18 +162,8 @@ function writeJsonConfigIfNeeded(apiKey, baseUrlOpenAI, model) {
  * Codex RS bug: auth_mode=chatgpt 时 OAuth token 会覆盖自定义 provider 的 api_key
  */
 function neutralizeAuthJson() {
-  try {
-    if (!fs.existsSync(AUTH_FILE)) return
-
-    const auth = JSON.parse(fs.readFileSync(AUTH_FILE, 'utf8'))
-
-    // 清除所有可能干扰 holysheep provider 的认证信息
-    auth.auth_mode = 'apikey'
-    auth.OPENAI_API_KEY = null
-    delete auth.tokens
-
-    fs.writeFileSync(AUTH_FILE, JSON.stringify(auth, null, 2), 'utf8')
-  } catch {}
+  // 直接删除 auth.json，避免干扰 config.toml 的 http_headers 认证
+  try { fs.unlinkSync(AUTH_FILE) } catch {}
 }
 
 module.exports = {