@simonyea/holysheep-cli 1.7.34 → 1.7.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.34",
+  "version": "1.7.36",
   "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,63 @@ function waitForPort(checkFn, maxTries, intervalMs) {
   return false
 }
 
+function killBridge(port) {
+  const listeners = openclawTool.getPortListeners(port)
+  let killed = 0
+  for (const item of listeners) {
+    const pid = parseInt(item.pid, 10)
+    if (!pid) continue
+    try {
+      if (isWin) {
+        spawnSync('taskkill', ['/PID', String(pid), '/F'], { stdio: 'ignore', shell: true })
+      } else {
+        process.kill(pid, 'SIGTERM')
+      }
+      killed++
+    } catch {}
+  }
+  return killed
+}
+
+function waitPortFree(port, maxTries, intervalMs) {
+  for (let i = 0; i < maxTries; i++) {
+    if (openclawTool.getPortListeners(port).length === 0) return true
+    const t0 = Date.now()
+    while (Date.now() - t0 < intervalMs) {}
+  }
+  return openclawTool.getPortListeners(port).length === 0
+}
+
+function findChrome() {
+  const { existsSync } = require('fs')
+  if (process.platform === 'darwin') {
+    const p = '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome'
+    return existsSync(p) ? p : null
+  }
+  if (isWin) {
+    const candidates = [
+      process.env.LOCALAPPDATA && `${process.env.LOCALAPPDATA}\\Google\\Chrome\\Application\\chrome.exe`,
+      process.env.PROGRAMFILES && `${process.env.PROGRAMFILES}\\Google\\Chrome\\Application\\chrome.exe`,
+      process.env['PROGRAMFILES(X86)'] && `${process.env['PROGRAMFILES(X86)']}\\Google\\Chrome\\Application\\chrome.exe`,
+    ].filter(Boolean)
+    return candidates.find(existsSync) || null
+  }
+  for (const bin of ['google-chrome', 'chromium-browser', 'chromium']) {
+    try { execSync(`which ${bin}`, { stdio: 'ignore' }); return bin } catch {}
+  }
+  return null
+}
+
 function openBrowser(url) {
+  const chrome = findChrome()
+  if (chrome) {
+    spawn(chrome, ['--disable-gpu', '--disable-gpu-sandbox', url], {
+      detached: true,
+      stdio: 'ignore',
+      shell: false,
+    }).unref()
+    return
+  }
   const cmd = isWin ? 'start' : process.platform === 'darwin' ? 'open' : 'xdg-open'
   try {
     spawn(cmd, [url], { detached: true, stdio: 'ignore', shell: isWin }).unref()
@@ -79,28 +135,32 @@ async function openclaw() {
   const bridgePort = openclawTool.getBridgePort()
   const gatewayPort = openclawTool.getGatewayPort()
 
-  // 确保 Bridge 运行
-  if (checkBridgeHealth(bridgePort)) {
-    console.log(chalk.green(`✓ Bridge 已运行 (端口 ${bridgePort})`))
+  // 先杀掉旧 Bridge，再启动新的
+  const existingListeners = openclawTool.getPortListeners(bridgePort)
+  if (existingListeners.length > 0) {
+    process.stdout.write(chalk.gray(`  正在重启 Bridge (端口 ${bridgePort})... `))
+    killBridge(bridgePort)
+    waitPortFree(bridgePort, 10, 200)
   } else {
     process.stdout.write(chalk.gray(`  正在启动 Bridge (端口 ${bridgePort})... `))
-    const scriptPath = path.join(__dirname, '..', 'index.js')
-    const spawnCmd = isWin ? 'node' : process.execPath
-    const child = spawn(spawnCmd, [scriptPath, 'openclaw-bridge', '--port', String(bridgePort)], {
-      detached: true,
-      stdio: 'ignore',
-      windowsHide: true,
-    })
-    child.unref()
+  }
 
-    const bridgeReady = waitForPort(() => checkBridgeHealth(bridgePort), 10, 1000)
-    if (bridgeReady) {
-      console.log(chalk.green('✓'))
-    } else {
-      console.log(chalk.red('✗'))
-      console.log(chalk.red(`  Bridge 启动失败，请手动运行: hs openclaw-bridge --port ${bridgePort}`))
-      process.exit(1)
-    }
+  const scriptPath = path.join(__dirname, '..', 'index.js')
+  const spawnCmd = isWin ? 'node' : process.execPath
+  const child = spawn(spawnCmd, [scriptPath, 'openclaw-bridge', '--port', String(bridgePort)], {
+    detached: true,
+    stdio: 'ignore',
+    windowsHide: true,
+  })
+  child.unref()
+
+  const bridgeReady = waitForPort(() => checkBridgeHealth(bridgePort), 10, 1000)
+  if (bridgeReady) {
+    console.log(chalk.green('✓'))
+  } else {
+    console.log(chalk.red('✗'))
+    console.log(chalk.red(`  Bridge 启动失败，请手动运行: hs openclaw-bridge --port ${bridgePort}`))
+    process.exit(1)
   }
 
   // 确保 Gateway 运行