@simonyea/holysheep-cli 1.7.113 → 1.7.115

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.113",
+  "version": "1.7.115",
   "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/setup.js

@@ -82,7 +82,7 @@ const AUTO_INSTALL = {
   'codex':       { cmd: 'npm install -g @openai/codex',             mgr: 'npm' },
   'gemini-cli':  { cmd: 'npm install -g @google/gemini-cli',        mgr: 'npm' },
   'opencode':    { cmd: 'npm install -g opencode-ai',               mgr: 'npm' },
-  'openclaw':    { cmd: 'npm install -g openclaw@latest --ignore-scripts', mgr: 'npm' },
+  'openclaw':    { cmd: 'npm install -g openclaw@latest', mgr: 'npm' },
   'aider':       { cmd: 'pip install aider-chat',                   mgr: 'pip' },
 }
 

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

@@ -205,27 +205,30 @@ function pipeWithCleanup(a, b) {
     if (typeof sock.setKeepAlive === 'function') sock.setKeepAlive(true, 10000)
   }
 
-  // 单向响应超时：a 发了数据给 b，但 b 那边 30 秒没回任何数据 → 断开
-  // 解决 node proxy 进程挂了但 TCP 还 ESTABLISHED 的问题
-  // 不影响 extended thinking：thinking 时 a（客户端）没发新数据，不触发计时
-  let responseTimer = null
-  let bHasResponded = false
+  // 双阶段超时：
+  // 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 (!bHasResponded) {
-      if (responseTimer) clearTimeout(responseTimer)
-      responseTimer = setTimeout(() => {
-        if (!bHasResponded) {
-          a.destroy(new Error('upstream response timeout'))
-          b.destroy(new Error('upstream response timeout'))
-        }
-      }, 30000)
+    // 客户端发了数据（请求），等上游响应
+    if (!streaming) {
+      if (timer) clearTimeout(timer)
+      timer = setTimeout(() => kill('upstream response timeout'), 30000)
     }
   })
   b.on('data', () => {
-    // 上游回数据了，清掉超时
-    bHasResponded = true
-    if (responseTimer) { clearTimeout(responseTimer); responseTimer = null }
+    // 上游回数据了，切换到 stream 模式
+    streaming = true
+    // 每次收到数据重置 120 秒超时
+    if (timer) clearTimeout(timer)
+    timer = setTimeout(() => kill('upstream stream stalled'), 120000)
   })
 
   a.pipe(b)

package/src/webui/server.js

@@ -120,7 +120,7 @@ const AUTO_INSTALL = {
   'codex':       { cmd: 'npm install -g @openai/codex' },
   'gemini-cli':  { cmd: 'npm install -g @google/gemini-cli' },
   'opencode':    { cmd: 'npm install -g opencode-ai' },
-  'openclaw':    { cmd: 'npm install -g openclaw@latest --ignore-scripts' },
+  'openclaw':    { cmd: 'npm install -g openclaw@latest' },
   'aider':       { cmd: 'pip install aider-chat' },
 }
 
@@ -138,7 +138,7 @@ const UPGRADABLE_TOOLS = [
   { name: 'Codex CLI', id: 'codex', command: 'codex', versionCmd: 'codex --version', npmPkg: '@openai/codex', installCmd: 'npm install -g @openai/codex@latest' },
   { name: 'Droid CLI', id: 'droid', command: 'droid', versionCmd: 'droid --version', npmPkg: null, installCmd: process.platform === 'win32' ? 'winget upgrade --id Droid.Droid' : 'brew install --cask droid' },
   { name: 'OpenCode', id: 'opencode', command: 'opencode', versionCmd: 'opencode --version', npmPkg: 'opencode-ai', installCmd: 'npm install -g opencode-ai@latest' },
-  { name: 'OpenClaw', id: 'openclaw', command: 'openclaw', versionCmd: 'openclaw --version', npmPkg: 'openclaw', installCmd: 'npm install -g openclaw@latest --ignore-scripts' },
+  { name: 'OpenClaw', id: 'openclaw', command: 'openclaw', versionCmd: 'openclaw --version', npmPkg: 'openclaw', installCmd: 'npm install -g openclaw@latest' },
   { name: 'Gemini CLI', id: 'gemini-cli', command: 'gemini', versionCmd: 'gemini --version', npmPkg: '@google/gemini-cli', installCmd: 'npm install -g @google/gemini-cli@latest' },
 ]
 
@@ -502,6 +502,12 @@ async function handleUpgrade(_req, res) {
       newVer = m ? m[1] : null
     } catch {}
 
+    // OpenClaw 升级后自动重启网关
+    if (ok && tool.id === 'openclaw' && commandExists('openclaw')) {
+      try { execSync('openclaw daemon stop', { stdio: 'ignore', timeout: 10000 }) } catch {}
+      try { execSync('openclaw daemon start', { stdio: 'ignore', timeout: 30000 }) } catch {}
+    }
+
     sseEmit(res, { type: 'tool', name: tool.name, status: ok ? 'ok' : 'error', localVer, newVer })
   }
 
@@ -653,6 +659,19 @@ async function handleToolUpgrade(req, res) {
 
   if (ok) {
     sseEmit(res, { type: 'progress', message: `✓ ${entry.name} 升级成功: ${localVer || '?'} → ${newVer || 'latest'}` })
+    // OpenClaw 升级后自动重启网关，否则运行中的进程还是旧版本
+    if (entry.id === 'openclaw' && commandExists('openclaw')) {
+      sseEmit(res, { type: 'progress', message: '正在重启 OpenClaw 网关...' })
+      try {
+        execSync('openclaw daemon stop', { stdio: 'ignore', timeout: 10000 })
+      } catch {}
+      try {
+        execSync('openclaw daemon start', { stdio: 'ignore', timeout: 30000 })
+        sseEmit(res, { type: 'progress', message: '✓ OpenClaw 网关已重启' })
+      } catch {
+        sseEmit(res, { type: 'progress', message: '⚠️ 网关重启失败，请手动运行: openclaw daemon start' })
+      }
+    }
   } else {
     sseEmit(res, { type: 'progress', message: `✗ ${entry.name} 升级失败` })
   }