@simonyea/holysheep-cli 1.7.112 → 1.7.114

package/package.json

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

@@ -181,6 +181,7 @@ function createConnectTunnel(proxyUrl, target, headers) {
       method: 'CONNECT',
       path: target,
       headers,
+      timeout: 15000, // CONNECT 握手 15 秒超时
     })
 
     request.once('connect', (response, socket, head) => {
@@ -191,20 +192,49 @@ function createConnectTunnel(proxyUrl, target, headers) {
       if (head?.length) socket.unshift(head)
       resolve(socket)
     })
+    request.once('timeout', () => {
+      request.destroy(new Error('CONNECT tunnel handshake timeout'))
+    })
     request.once('error', reject)
     request.end()
   })
 }
 
 function pipeWithCleanup(a, b) {
-  // TCP keepalive 检测真正的网络断开（不用 stall timer，会误杀 extended thinking）
   for (const sock of [a, b]) {
     if (typeof sock.setKeepAlive === 'function') sock.setKeepAlive(true, 10000)
   }
 
+  // 双阶段超时：
+  // 1. 客户端发了数据，上游 30 秒没回第一个字节 → 断开（node proxy 挂了）
+  // 2. 上游在流数据突然停了 120 秒 → 断开（stream 中断）
+  //    120 秒足够覆盖 extended thinking 的间歇（thinking 期间服务端仍会发心跳）
+  let timer = null
+  let streaming = false
+  const kill = (reason) => {
+    if (timer) clearTimeout(timer)
+    a.destroy(new Error(reason))
+    b.destroy(new Error(reason))
+  }
+  a.on('data', () => {
+    // 客户端发了数据（请求），等上游响应
+    if (!streaming) {
+      if (timer) clearTimeout(timer)
+      timer = setTimeout(() => kill('upstream response timeout'), 30000)
+    }
+  })
+  b.on('data', () => {
+    // 上游回数据了，切换到 stream 模式
+    streaming = true
+    // 每次收到数据重置 120 秒超时
+    if (timer) clearTimeout(timer)
+    timer = setTimeout(() => kill('upstream stream stalled'), 120000)
+  })
+
   a.pipe(b)
   b.pipe(a)
   const close = () => {
+    if (responseTimer) clearTimeout(responseTimer)
     a.destroy()
     b.destroy()
   }