@simonyea/holysheep-cli 2.1.38 → 2.1.41

package/src/commands/openclaw.js

@@ -1,258 +0,0 @@
-'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 killPortListeners(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
-}
-
-// 在 kill gateway 之前调用：禁用 watchdog，bridge 不会因 gateway 短暂下线而自杀
-function disableWatchdog() {
-  const { BRIDGE_CONFIG_FILE } = require('../tools/openclaw-bridge')
-  const fs = require('fs')
-  try {
-    const raw = JSON.parse(fs.readFileSync(BRIDGE_CONFIG_FILE, 'utf8'))
-    if (!raw.watchdog) raw.watchdog = {}
-    raw.watchdog.enabled = false
-    raw.gatewayPid = null  // 清旧 PID，防止 PID 检查误判
-    fs.writeFileSync(BRIDGE_CONFIG_FILE, JSON.stringify(raw, null, 2), 'utf8')
-  } catch (e) {
-    console.log(chalk.yellow(`  ⚠ 无法更新 Bridge 配置: ${e.message}`))
-  }
-}
-
-// 在 gateway 确认就绪后调用：重新启用 watchdog，写入真实 gatewayStartedAt
-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.gatewayPid = null
-    raw.gatewayPort = gatewayPort
-    raw.gatewayLaunchMode = 'direct-process'
-    if (!raw.watchdog) raw.watchdog = {}
-    raw.watchdog.startupGraceMs = 30000
-    raw.watchdog.enabled = true  // gateway 已就绪，安全地重新启用 watchdog
-    fs.writeFileSync(BRIDGE_CONFIG_FILE, JSON.stringify(raw, null, 2), 'utf8')
-  } catch {}
-}
-
-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()
-  } 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()
-
-  // 先禁用 watchdog，防止后续 kill gateway 期间 bridge 误判自杀
-  disableWatchdog()
-
-  // Bridge：只确保运行，不重启
-  if (checkBridgeHealth(bridgePort)) {
-    console.log(chalk.green(`✓ Bridge 已运行 (端口 ${bridgePort})`))
-  } 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：kill 旧的，直接 spawn 新的（明确 --port，避免 service 配置不一致）
-  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 gatewayArgs = preferNpx
-    ? ['openclaw', 'gateway', '--port', String(gatewayPort)]
-    : ['gateway', '--port', String(gatewayPort)]
-  const gatewayCmd = preferNpx ? 'npx' : 'openclaw'
-  const gatewayChild = spawn(gatewayCmd, gatewayArgs, {
-    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'))
-  }
-
-  // Gateway 就绪后重新启用 watchdog，写入真实 gatewayStartedAt
-  refreshGatewayStartedAt(gatewayPort)
-
-  // 获取 Dashboard URL
-  const fallbackUrl = `http://127.0.0.1:${gatewayPort}/`
-  let dashUrl = fallbackUrl
-  try {
-    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/commands/reset.js

@@ -1,53 +0,0 @@
-/**
- * hs reset — 清除所有工具的 HolySheep 配置，恢复默认
- */
-const inquirer = require('inquirer')
-const chalk    = require('chalk')
-const ora      = require('ora')
-const { removeEnvFromShell } = require('../utils/shell')
-const { saveConfig } = require('../utils/config')
-const TOOLS = require('../tools')
-
-async function reset(options) {
-  console.log()
-  if (!options.yes) {
-    const { confirm } = await inquirer.prompt([{
-      type: 'confirm',
-      name: 'confirm',
-      message: chalk.yellow('将清除所有工具的 HolySheep 配置和环境变量，继续？'),
-      default: false,
-    }])
-    if (!confirm) { console.log('已取消\n'); return }
-  }
-
-  console.log()
-  for (const tool of TOOLS) {
-    if (!tool.checkInstalled() && !tool.isConfigured?.()) continue
-    const spinner = ora(`清除 ${tool.name}...`).start()
-    try {
-      tool.reset()
-      spinner.succeed(`${tool.name} 已清除`)
-    } catch (e) {
-      spinner.fail(`${tool.name}: ${e.message}`)
-    }
-  }
-
-  // 清除 shell 环境变量
-  const spinner = ora('清除 shell 环境变量...').start()
-  try {
-    const cleaned = removeEnvFromShell()
-    if (cleaned.length) spinner.succeed(`已清除: ${cleaned.join(', ')}`)
-    else spinner.info('无 shell 环境变量需要清除')
-  } catch (e) {
-    spinner.fail(e.message)
-  }
-
-  // 清除本地保存的 API Key
-  saveConfig({ apiKey: '' })
-
-  console.log()
-  console.log(chalk.green('✅ 清除完成，所有工具已恢复默认配置'))
-  console.log(chalk.gray('重新配置: hs setup\n'))
-}
-
-module.exports = reset