@simonyea/holysheep-cli 1.7.37 → 1.7.39

package/package.json

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

@@ -45,7 +45,7 @@ function waitForPort(checkFn, maxTries, intervalMs) {
   return false
 }
 
-function killBridge(port) {
+function killPortListeners(port) {
   const listeners = openclawTool.getPortListeners(port)
   let killed = 0
   for (const item of listeners) {
@@ -63,6 +63,36 @@ function killBridge(port) {
   return killed
 }
 
+// 在 bridge 启动前调用：清空 gatewayStartedAt，让 watchdog 以 bridgeStartedAt（进程刚启动）
+// 为基准，并把宽限期延长到 60s，确保 gateway 有足够时间启动。
+function prepareForRestart(gatewayPort) {
+  const { BRIDGE_CONFIG_FILE } = require('../tools/openclaw-bridge')
+  const fs = require('fs')
+  try {
+    const raw = JSON.parse(fs.readFileSync(BRIDGE_CONFIG_FILE, 'utf8'))
+    raw.gatewayStartedAt = null   // watchdog fallback 到 bridgeStartedAt（始终是刚启动的时间）
+    raw.gatewayPort = gatewayPort
+    if (!raw.watchdog) raw.watchdog = {}
+    raw.watchdog.startupGraceMs = 60000  // 给 bridge+gateway 全套重启留出 60s
+    fs.writeFileSync(BRIDGE_CONFIG_FILE, JSON.stringify(raw, null, 2), 'utf8')
+  } catch {}
+}
+
+// 在 gateway 确认就绪后调用：写入真实 gatewayStartedAt，恢复正常 30s 宽限期。
+function refreshGatewayStartedAt(gatewayPort) {
+  const { BRIDGE_CONFIG_FILE } = require('../tools/openclaw-bridge')
+  const fs = require('fs')
+  try {
+    const raw = JSON.parse(fs.readFileSync(BRIDGE_CONFIG_FILE, 'utf8'))
+    raw.gatewayStartedAt = new Date().toISOString()
+    raw.gatewayPort = gatewayPort
+    raw.gatewayPid = null
+    raw.gatewayLaunchMode = 'direct-process'
+    if (raw.watchdog) raw.watchdog.startupGraceMs = 30000
+    fs.writeFileSync(BRIDGE_CONFIG_FILE, JSON.stringify(raw, null, 2), 'utf8')
+  } catch {}
+}
+
 function waitPortFree(port, maxTries, intervalMs) {
   for (let i = 0; i < maxTries; i++) {
     if (openclawTool.getPortListeners(port).length === 0) return true
@@ -135,11 +165,15 @@ async function openclaw() {
   const bridgePort = openclawTool.getBridgePort()
   const gatewayPort = openclawTool.getGatewayPort()
 
+  // 在所有 spawn 之前写好 config：清空 gatewayStartedAt + 延长宽限期到 60s
+  // 这样新 bridge 的 watchdog 第一次 tick 读到的就是新鲜的基准时间，不会立即过期
+  prepareForRestart(gatewayPort)
+
   // 先杀掉旧 Bridge，再启动新的
-  const existingListeners = openclawTool.getPortListeners(bridgePort)
-  if (existingListeners.length > 0) {
+  const existingBridgeListeners = openclawTool.getPortListeners(bridgePort)
+  if (existingBridgeListeners.length > 0) {
     process.stdout.write(chalk.gray(`  正在重启 Bridge (端口 ${bridgePort})... `))
-    killBridge(bridgePort)
+    killPortListeners(bridgePort)
     waitPortFree(bridgePort, 10, 200)
   } else {
     process.stdout.write(chalk.gray(`  正在启动 Bridge (端口 ${bridgePort})... `))
@@ -163,44 +197,50 @@ async function openclaw() {
     process.exit(1)
   }
 
-  // 确保 Gateway 运行
-  if (checkGatewayHealth(gatewayPort)) {
-    console.log(chalk.green(`✓ Gateway 已运行 (端口 ${gatewayPort})`))
+  // 先杀掉旧 Gateway，再启动新的（避免端口残留导致新进程无法绑定）
+  const existingGatewayListeners = openclawTool.getPortListeners(gatewayPort)
+  if (existingGatewayListeners.length > 0) {
+    process.stdout.write(chalk.gray(`  正在重启 Gateway (端口 ${gatewayPort})... `))
+    killPortListeners(gatewayPort)
+    waitPortFree(gatewayPort, 10, 200)
   } else {
     process.stdout.write(chalk.gray(`  正在启动 Gateway (端口 ${gatewayPort})... `))
+  }
 
-    const preferNpx = runtime.via === 'npx'
-    const gatewayStartArgs = preferNpx ? ['openclaw', 'gateway', 'start'] : ['gateway', 'start']
-    const gatewayStartCmd = preferNpx ? 'npx' : 'openclaw'
-    const serviceResult = spawnSync(gatewayStartCmd, gatewayStartArgs, {
+  const preferNpx = runtime.via === 'npx'
+  const gatewayStartArgs = preferNpx ? ['openclaw', 'gateway', 'start'] : ['gateway', 'start']
+  const gatewayStartCmd = preferNpx ? 'npx' : 'openclaw'
+  const serviceResult = spawnSync(gatewayStartCmd, gatewayStartArgs, {
+    stdio: 'ignore',
+    timeout: 10000,
+    shell: isWin,
+  })
+
+  if (serviceResult.status !== 0) {
+    const directArgs = preferNpx
+      ? ['openclaw', 'gateway', '--port', String(gatewayPort)]
+      : ['gateway', '--port', String(gatewayPort)]
+    const directCmd = preferNpx ? 'npx' : 'openclaw'
+    const gatewayChild = spawn(directCmd, directArgs, {
+      detached: true,
       stdio: 'ignore',
-      timeout: 10000,
       shell: isWin,
+      windowsHide: true,
     })
+    gatewayChild.unref()
+  }
 
-    if (serviceResult.status !== 0) {
-      const directArgs = preferNpx
-        ? ['openclaw', 'gateway', '--port', String(gatewayPort)]
-        : ['gateway', '--port', String(gatewayPort)]
-      const directCmd = preferNpx ? 'npx' : 'openclaw'
-      const gatewayChild = spawn(directCmd, directArgs, {
-        detached: true,
-        stdio: 'ignore',
-        shell: isWin,
-        windowsHide: true,
-      })
-      gatewayChild.unref()
-    }
-
-    const gatewayReady = waitForPort(() => checkGatewayHealth(gatewayPort), 12, 1500)
-    if (gatewayReady) {
-      console.log(chalk.green('✓'))
-    } else {
-      console.log(chalk.yellow('⚠'))
-      console.log(chalk.yellow('  Gateway 未就绪，仍将尝试打开 Dashboard'))
-    }
+  const gatewayReady = waitForPort(() => checkGatewayHealth(gatewayPort), 12, 1500)
+  if (gatewayReady) {
+    console.log(chalk.green('✓'))
+  } else {
+    console.log(chalk.yellow('⚠'))
+    console.log(chalk.yellow('  Gateway 未就绪，仍将尝试打开 Dashboard'))
   }
 
+  // 刷新 bridge config 中的 gatewayStartedAt，让 watchdog 宽限期从现在起算
+  refreshGatewayStartedAt(gatewayPort)
+
   // 获取 Dashboard URL
   const fallbackUrl = `http://127.0.0.1:${gatewayPort}/`
   let dashUrl = fallbackUrl