@simonyea/holysheep-cli 1.7.117 → 1.7.119

package/package.json

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

@@ -503,12 +503,35 @@ async function handleUpgrade(_req, res) {
       newVer = m ? m[1] : null
     } catch {}
 
-    // OpenClaw 升级后自动重启 Bridge + Gateway
+    // OpenClaw 升级后：Gateway → 等端口就绪 → 更新 PID → Bridge
     if (ok && tool.id === 'openclaw') {
       try { execSync('openclaw daemon stop', { stdio: 'ignore', timeout: 10000 }) } catch {}
+      try { execSync('openclaw daemon start', { stdio: 'ignore', timeout: 30000 }) } catch {}
       const openclawTool = TOOLS.find(t => t.id === 'openclaw')
+      const gPort = openclawTool?.getGatewayPort?.() || 18789
+      let gPid = null
+      for (let i = 0; i < 10 && !gPid; i++) {
+        await new Promise(r => setTimeout(r, 1500))
+        try {
+          if (process.platform === 'win32') {
+            const o = execSync(`powershell -NonInteractive -Command "(Get-NetTCPConnection -LocalPort ${gPort} -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:${gPort} -sTCP:LISTEN -t 2>/dev/null | head -1`, { stdio: 'pipe', timeout: 5000 }).toString().trim()
+            gPid = Number(o) || null
+          }
+        } 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')
+        }
+      } catch {}
       try { openclawTool?.ensureBridgeRunning?.() } catch {}
-      try { execSync('openclaw daemon start', { stdio: 'ignore', timeout: 30000 }) } catch {}
     }
 
     sseEmit(res, { type: 'tool', name: tool.name, status: ok ? 'ok' : 'error', localVer, newVer })
@@ -662,11 +685,42 @@ async function handleToolUpgrade(req, res) {
 
   if (ok) {
     sseEmit(res, { type: 'progress', message: `✓ ${entry.name} 升级成功: ${localVer || '?'} → ${newVer || 'latest'}` })
-    // OpenClaw 升级后自动重启 Bridge + Gateway
+    // OpenClaw 升级后：先停 → 启动 Gateway（拿 PID）→ 更新 bridge config → 启动 Bridge
     if (entry.id === 'openclaw') {
       const openclawTool = TOOLS.find(t => t.id === '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 Gateway 已启动' })
+      } catch {
+        sseEmit(res, { type: 'progress', message: '⚠️ Gateway 启动失败' })
+      }
+      // 等 Gateway 端口就绪，获取 PID 写入 bridge config
+      const gPort = openclawTool?.getGatewayPort?.() || 18789
+      let gPid = null
+      for (let i = 0; i < 10 && !gPid; i++) {
+        await new Promise(r => setTimeout(r, 1500))
+        try {
+          if (process.platform === 'win32') {
+            const o = execSync(`powershell -NonInteractive -Command "(Get-NetTCPConnection -LocalPort ${gPort} -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:${gPort} -sTCP:LISTEN -t 2>/dev/null | head -1`, { stdio: 'pipe', timeout: 5000 }).toString().trim()
+            gPid = Number(o) || null
+          }
+        } 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 {}
+      }
+      // 启动 Bridge
       if (openclawTool?.ensureBridgeRunning) {
         try {
           openclawTool.ensureBridgeRunning()
@@ -675,12 +729,6 @@ async function handleToolUpgrade(req, res) {
           sseEmit(res, { type: 'progress', message: '⚠️ Bridge 启动失败' })
         }
       }
-      try {
-        execSync('openclaw daemon start', { stdio: 'ignore', timeout: 30000 })
-        sseEmit(res, { type: 'progress', message: '✓ OpenClaw Gateway 已重启' })
-      } catch {
-        sseEmit(res, { type: 'progress', message: '⚠️ Gateway 重启失败，请手动运行: openclaw daemon start' })
-      }
     }
   } else {
     sseEmit(res, { type: 'progress', message: `✗ ${entry.name} 升级失败` })
@@ -793,17 +841,55 @@ async function handleToolRollback(req, res) {
 
   if (ok) {
     sseEmit(res, { type: 'progress', message: `✓ ${entry.name} 已回退: ${localVer || '?'} → ${newVer || targetVer}` })
-    // OpenClaw: 重启 Bridge + Gateway
+    // OpenClaw: 先启动 Gateway（拿 PID），更新 bridge config，再启动 Bridge
     if (entry.id === 'openclaw') {
-      const openclawTool = TOOLS.find(t => t.id === 'openclaw')
       sseEmit(res, { type: 'progress', message: '正在重启 OpenClaw...' })
-      if (openclawTool?.ensureBridgeRunning) {
-        try { openclawTool.ensureBridgeRunning() } catch {}
-      }
+      // 1. 启动 Gateway
       try {
         execSync('openclaw daemon start', { stdio: 'ignore', timeout: 30000 })
-        sseEmit(res, { type: 'progress', message: '✓ OpenClaw 已重启' })
-      } catch {}
+        sseEmit(res, { type: 'progress', message: '✓ OpenClaw Gateway 已启动' })
+      } catch {
+        sseEmit(res, { type: 'progress', message: '⚠️ Gateway 启动失败' })
+      }
+      // 2. 等 Gateway 端口就绪，获取 PID 写入 bridge config
+      const openclawTool = TOOLS.find(t => t.id === 'openclaw')
+      const gatewayPort = openclawTool?.getGatewayPort?.() || 18789
+      let gatewayPid = null
+      for (let attempt = 0; attempt < 10 && !gatewayPid; attempt++) {
+        await new Promise(r => setTimeout(r, 1500))
+        try {
+          if (process.platform === 'win32') {
+            const out = execSync(`powershell -NonInteractive -Command "(Get-NetTCPConnection -LocalPort ${gatewayPort} -State Listen -ErrorAction SilentlyContinue).OwningProcess"`, { stdio: 'pipe', timeout: 5000 }).toString().trim()
+            gatewayPid = Number(out.split(/\r?\n/)[0]) || null
+          } else {
+            const out = execSync(`lsof -iTCP:${gatewayPort} -sTCP:LISTEN -t 2>/dev/null | head -1`, { stdio: 'pipe', timeout: 5000 }).toString().trim()
+            gatewayPid = Number(out) || null
+          }
+        } 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 可能无��启动' })
+      }
+      // 3. 启动 Bridge
+      if (openclawTool?.ensureBridgeRunning) {
+        try {
+          const bridgeOk = openclawTool.ensureBridgeRunning()
+          sseEmit(res, { type: 'progress', message: bridgeOk ? '✓ HolySheep Bridge 已启动' : '⚠️ Bridge 未就绪' })
+        } catch (e) {
+          sseEmit(res, { type: 'progress', message: `⚠️ Bridge 启动失败: ${e.message}` })
+        }
+      }
     }
   } else {
     sseEmit(res, { type: 'progress', message: `✗ 回退失败，请手动运行: ${installCmd}` })