@simonyea/holysheep-cli 1.7.33 → 1.7.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.33",
+  "version": "1.7.35",
   "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

@@ -0,0 +1,203 @@
+'use strict'
+
+const { execSync, spawn, spawnSync } = require('child_process')
+const path = require('path')
+const chalk = require('chalk')
+const openclawTool = require('../tools/openclaw')
+const { readBridgeConfig } = require('../tools/openclaw-bridge')
+
+const isWin = process.platform === 'win32'
+
+function checkBridgeHealth(port) {
+  try {
+    execSync(
+      isWin
+        ? `powershell -NonInteractive -Command "try{(Invoke-WebRequest -Uri http://127.0.0.1:${port}/health -TimeoutSec 1 -UseBasicParsing).StatusCode}catch{exit 1}"`
+        : `curl -sf http://127.0.0.1:${port}/health -o /dev/null --max-time 1`,
+      { stdio: 'ignore', timeout: 3000 }
+    )
+    return true
+  } catch {
+    return false
+  }
+}
+
+function checkGatewayHealth(port) {
+  try {
+    execSync(
+      isWin
+        ? `powershell -NonInteractive -Command "try{(Invoke-WebRequest -Uri http://127.0.0.1:${port}/ -TimeoutSec 1 -UseBasicParsing).StatusCode}catch{exit 1}"`
+        : `curl -sf http://127.0.0.1:${port}/ -o /dev/null --max-time 1`,
+      { stdio: 'ignore', timeout: 3000 }
+    )
+    return true
+  } catch {
+    return false
+  }
+}
+
+function waitForPort(checkFn, maxTries, intervalMs) {
+  for (let i = 0; i < maxTries; i++) {
+    if (checkFn()) return true
+    const t0 = Date.now()
+    while (Date.now() - t0 < 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 openBrowser(url) {
+  const cmd = isWin ? 'start' : process.platform === 'darwin' ? 'open' : 'xdg-open'
+  try {
+    spawn(cmd, [url], { detached: true, stdio: 'ignore', shell: isWin }).unref()
+  } catch {}
+}
+
+async function openclaw() {
+  console.log()
+
+  const runtime = openclawTool.detectRuntime()
+  if (!runtime.available) {
+    console.log(chalk.red('✗ 未检测到 OpenClaw'))
+    console.log(chalk.gray(`  安装命令: ${openclawTool.installCmd}`))
+    console.log(chalk.gray('  安装后运行 hs setup 完成配置'))
+    process.exit(1)
+  }
+
+  if (!openclawTool.isConfigured()) {
+    console.log(chalk.yellow('⚠  OpenClaw 尚未配置 HolySheep，请先运行 hs setup'))
+    process.exit(1)
+  }
+
+  let bridgeConfig
+  try {
+    bridgeConfig = readBridgeConfig()
+  } catch {
+    console.log(chalk.yellow('⚠  未找到 Bridge 配置，请先运行 hs setup'))
+    process.exit(1)
+  }
+
+  const bridgePort = openclawTool.getBridgePort()
+  const gatewayPort = openclawTool.getGatewayPort()
+
+  // 先杀掉旧 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)
+  }
+
+  // 确保 Gateway 运行
+  if (checkGatewayHealth(gatewayPort)) {
+    console.log(chalk.green(`✓ Gateway 已运行 (端口 ${gatewayPort})`))
+  } 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, {
+      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',
+        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'))
+    }
+  }
+
+  // 获取 Dashboard URL
+  const fallbackUrl = `http://127.0.0.1:${gatewayPort}/`
+  let dashUrl = fallbackUrl
+  try {
+    const preferNpx = runtime.via === 'npx'
+    const dashArgs = preferNpx ? ['openclaw', 'dashboard', '--no-open'] : ['dashboard', '--no-open']
+    const dashCmd = preferNpx ? 'npx' : 'openclaw'
+    const result = spawnSync(dashCmd, dashArgs, {
+      timeout: preferNpx ? 60000 : 20000,
+      shell: isWin,
+      encoding: 'utf8',
+      stdio: 'pipe',
+    })
+    if (result.status === 0) {
+      const output = String(result.stdout || '')
+      const match = output.match(/Dashboard URL:\s*(\S+)/) || output.match(/(https?:\/\/\S+)/)
+      if (match) dashUrl = match[1]
+    }
+  } catch {}
+
+  console.log()
+  console.log(chalk.cyan.bold(`🌐 正在打开 OpenClaw Dashboard: ${dashUrl}`))
+  openBrowser(dashUrl)
+  console.log(chalk.gray(`   Bridge: http://127.0.0.1:${bridgePort}/v1`))
+  console.log(chalk.gray(`   Gateway: http://127.0.0.1:${gatewayPort}/`))
+  console.log()
+}
+
+module.exports = openclaw

package/src/index.js

@@ -149,6 +149,14 @@ program
     })
   })
 
+// ── openclaw ─────────────────────────────────────────────────────────────────
+program
+  .command('openclaw')
+  .description('启动 HolySheep 桥接版 OpenClaw（自动启动 Bridge + Gateway 并打开 Dashboard）')
+  .action(async () => {
+    await require('./commands/openclaw')()
+  })
+
 // ── openclaw-bridge ──────────────────────────────────────────────────────────
 program
   .command('openclaw-bridge')