@simonyea/holysheep-cli 1.7.119 → 1.7.121

package/package.json

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

@@ -31,6 +31,12 @@ async function webui(opts) {
       } catch {}
     }
 
+    // 后台拉起 OpenClaw Bridge + Claude Proxy
+    const { bootstrapBackgroundServices } = require('../webui/server')
+    bootstrapBackgroundServices().then(() => {
+      console.log(chalk.gray('  后台服务已就绪'))
+    }).catch(() => {})
+
     // Keep alive
     await new Promise(() => {})
   } catch (err) {

package/src/webui/server.js

@@ -523,13 +523,11 @@ async function handleUpgrade(_req, res) {
         } catch {}
       }
       try {
-        if (gPid) {
-          const bridgeMod = require('../tools/openclaw-bridge')
-          const bc = bridgeMod.readBridgeConfig()
-          bc.gatewayPid = gPid
-          bc.gatewayStartedAt = new Date().toISOString()
-          fs.writeFileSync(bridgeMod.BRIDGE_CONFIG_FILE, JSON.stringify(bc, null, 2), 'utf8')
-        }
+        const bridgeMod = require('../tools/openclaw-bridge')
+        const bc = bridgeMod.readBridgeConfig()
+        bc.gatewayPid = gPid // null 也写入，清除旧死 PID
+        bc.gatewayStartedAt = new Date().toISOString()
+        fs.writeFileSync(bridgeMod.BRIDGE_CONFIG_FILE, JSON.stringify(bc, null, 2), 'utf8')
       } catch {}
       try { openclawTool?.ensureBridgeRunning?.() } catch {}
     }
@@ -711,15 +709,13 @@ async function handleToolUpgrade(req, res) {
           }
         } catch {}
       }
-      if (gPid) {
-        try {
-          const bridgeMod = require('../tools/openclaw-bridge')
-          const bc = bridgeMod.readBridgeConfig()
-          bc.gatewayPid = gPid
-          bc.gatewayStartedAt = new Date().toISOString()
-          fs.writeFileSync(bridgeMod.BRIDGE_CONFIG_FILE, JSON.stringify(bc, null, 2), 'utf8')
-        } catch {}
-      }
+      try {
+        const bridgeMod = require('../tools/openclaw-bridge')
+        const bc = bridgeMod.readBridgeConfig()
+        bc.gatewayPid = gPid // null 也写入，清除旧死 PID
+        bc.gatewayStartedAt = new Date().toISOString()
+        fs.writeFileSync(bridgeMod.BRIDGE_CONFIG_FILE, JSON.stringify(bc, null, 2), 'utf8')
+      } catch {}
       // 启动 Bridge
       if (openclawTool?.ensureBridgeRunning) {
         try {
@@ -867,20 +863,15 @@ async function handleToolRollback(req, res) {
           }
         } catch {}
       }
-      if (gatewayPid) {
-        try {
-          const bridgeMod = require('../tools/openclaw-bridge')
-          const bc = bridgeMod.readBridgeConfig()
-          bc.gatewayPid = gatewayPid
-          bc.gatewayStartedAt = new Date().toISOString()
-          fs.writeFileSync(bridgeMod.BRIDGE_CONFIG_FILE, JSON.stringify(bc, null, 2), 'utf8')
-          sseEmit(res, { type: 'progress', message: `Gateway PID: ${gatewayPid}` })
-        } catch (e) {
-          sseEmit(res, { type: 'progress', message: `⚠️ 写入 Bridge 配置失败: ${e.message}` })
-        }
-      } else {
-        sseEmit(res, { type: 'progress', message: '⚠️ 未检测到 Gateway PID，Bridge 可能无��启动' })
-      }
+      // PID 检测不到时设为 null（和 hs setup 一致），watchdog 不杀 null PID 的 bridge
+      try {
+        const bridgeMod = require('../tools/openclaw-bridge')
+        const bc = bridgeMod.readBridgeConfig()
+        bc.gatewayPid = gatewayPid // null 也写入，清除旧死 PID
+        bc.gatewayStartedAt = new Date().toISOString()
+        fs.writeFileSync(bridgeMod.BRIDGE_CONFIG_FILE, JSON.stringify(bc, null, 2), 'utf8')
+        sseEmit(res, { type: 'progress', message: gatewayPid ? `Gateway PID: ${gatewayPid}` : 'Gateway PID cleared' })
+      } catch {}
       // 3. 启动 Bridge
       if (openclawTool?.ensureBridgeRunning) {
         try {
@@ -1132,4 +1123,65 @@ function startServer(port) {
   })
 }
 
-module.exports = { startServer }
+// ── 后台服务自动拉起 ─────────────────────────────────────────────────────────
+
+async function bootstrapBackgroundServices() {
+  const { getApiKey } = require('../utils/config')
+  const apiKey = getApiKey()
+  if (!apiKey) return // 未登录，跳过
+
+  // 1. OpenClaw Bridge
+  try {
+    const openclawTool = TOOLS.find(t => t.id === 'openclaw')
+    if (openclawTool?.checkInstalled() && openclawTool?.isConfigured()) {
+      const bridgePort = openclawTool.getBridgePort?.() || 18788
+      // 检查是否已在运行
+      let bridgeAlive = false
+      try {
+        const http = require('http')
+        await new Promise((resolve, reject) => {
+          const req = http.get({ hostname: '127.0.0.1', port: bridgePort, path: '/health', family: 4 }, resolve)
+          req.setTimeout(2000, () => { req.destroy(); reject() })
+          req.on('error', reject)
+        })
+        bridgeAlive = true
+      } catch {}
+
+      if (!bridgeAlive) {
+        // 更新 bridge config 里的 gateway PID，防止 watchdog 误杀
+        // 关键：检测不到 PID 时设为 null（和 hs setup 一致），watchdog 不会杀 null PID 的 bridge
+        const gatewayPort = openclawTool.getGatewayPort?.() || 18789
+        const bridgeMod = require('../tools/openclaw-bridge')
+        const bc = bridgeMod.readBridgeConfig()
+        let gPid = null
+        try {
+          if (process.platform === 'win32') {
+            const o = execSync(`powershell -NonInteractive -Command "(Get-NetTCPConnection -LocalPort ${gatewayPort} -State Listen -ErrorAction SilentlyContinue).OwningProcess"`, { stdio: 'pipe', timeout: 5000 }).toString().trim()
+            gPid = Number(o.split(/\r?\n/)[0]) || null
+          } else {
+            const o = execSync(`lsof -iTCP:${gatewayPort} -sTCP:LISTEN -t 2>/dev/null | head -1`, { stdio: 'pipe', timeout: 5000 }).toString().trim()
+            gPid = Number(o) || null
+          }
+        } catch {}
+        // 无论是否检测到，都写入（null 或真实 PID），清除旧的死 PID
+        bc.gatewayPid = gPid
+        bc.gatewayStartedAt = new Date().toISOString()
+        try { fs.writeFileSync(bridgeMod.BRIDGE_CONFIG_FILE, JSON.stringify(bc, null, 2), 'utf8') } catch {}
+        openclawTool.ensureBridgeRunning?.(bridgePort)
+      }
+    }
+  } catch {}
+
+  // 2. Claude Proxy
+  try {
+    const claudeTool = TOOLS.find(t => t.id === 'claude-code')
+    if (claudeTool?.checkInstalled() && claudeTool?.isConfigured()) {
+      if (!isClaudeProxyRunning().running) {
+        const claudeProxy = require('../commands/claude-proxy')
+        await claudeProxy(['--daemon'])
+      }
+    }
+  } catch {}
+}
+
+module.exports = { startServer, bootstrapBackgroundServices }