@simonyea/holysheep-cli 1.7.57 → 1.7.59

package/package.json

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

@@ -199,6 +199,21 @@ function waitForBridge(port) {
   return false
 }
 
+function stopBridge() {
+  // 杀掉所有已有的 bridge 进程，避免重新配置时端口冲突
+  try {
+    if (isWin) {
+      execSync('taskkill /F /FI "WINDOWTITLE eq openclaw-bridge*" 2>nul', { shell: true, stdio: 'ignore' })
+      // 按命令行匹配
+      const out = execSync('wmic process where "commandline like \'%openclaw-bridge%\'" get processid', { shell: true, stdio: 'pipe', encoding: 'utf8' })
+      const pids = out.match(/\d+/g)
+      if (pids) pids.forEach(pid => { try { execSync(`taskkill /F /PID ${pid}`, { stdio: 'ignore' }) } catch {} })
+    } else {
+      execSync("pkill -f 'openclaw-bridge' 2>/dev/null || true", { shell: true, stdio: 'ignore' })
+    }
+  } catch {}
+}
+
 function startBridge(port) {
   if (waitForBridge(port)) return true
 
@@ -611,6 +626,14 @@ module.exports = {
     this._lastRuntimeCommand = runtime.command
     this._lastRuntimeVia = runtime.via
 
+    // 重新配置前先停掉旧的 Bridge 和 Gateway，释放端口
+    console.log(chalk.gray('  → 停止旧的 Bridge 和 Gateway...'))
+    stopBridge()
+    runOpenClaw(['gateway', 'stop'], { preferNpx: runtime.via === 'npx' })
+    // 等端口释放
+    const t0 = Date.now()
+    while (Date.now() - t0 < 1000) {}
+
     if (runtime.via === 'npx' && removeBrokenLaunchAgent()) {
       console.log(chalk.gray('  → 已清理旧的 OpenClaw 守护进程配置（失效的 npx 缓存路径）'))
     }
@@ -654,8 +677,6 @@ module.exports = {
     }
     const bridgeBaseUrl = getBridgeBaseUrl(bridgePort)
 
-    runOpenClaw(['gateway', 'stop'], { preferNpx: runtime.via === 'npx' })
-
     if (gatewayPort !== DEFAULT_GATEWAY_PORT) {
       console.log(chalk.yellow(`  ⚠️  端口 ${DEFAULT_GATEWAY_PORT} 已占用，自动切换到 ${gatewayPort}`))
       const listeners = listPortListeners(DEFAULT_GATEWAY_PORT)

package/src/webui/server.js

@@ -107,16 +107,43 @@ const UPGRADABLE_TOOLS = [
   { name: 'Gemini CLI', id: 'gemini-cli', command: 'gemini', versionCmd: 'gemini --version', npmPkg: '@google/gemini-cli', installCmd: 'npm install -g @google/gemini-cli@latest' },
 ]
 
+// ── Update check (cached, refreshes every 30min) ────────────────────────────
+
+let _latestVersion = null
+let _lastCheckTime = 0
+const UPDATE_CHECK_INTERVAL = 30 * 60 * 1000
+
+async function checkLatestVersion() {
+  const now = Date.now()
+  if (_latestVersion && now - _lastCheckTime < UPDATE_CHECK_INTERVAL) return _latestVersion
+  try {
+    const fetch = require('node-fetch')
+    const r = await fetch('https://registry.npmjs.org/@simonyea/holysheep-cli/latest', { timeout: 5000 })
+    if (r.ok) {
+      const data = await r.json()
+      _latestVersion = data.version || null
+      _lastCheckTime = now
+    }
+  } catch {}
+  return _latestVersion
+}
+
+// 启动时立即检查一次
+checkLatestVersion()
+
 // ── API Handlers ─────────────────────────────────────────────────────────────
 
 async function handleStatus(_req, res) {
   const apiKey = getApiKey()
   const config = loadConfig()
+  const latest = await checkLatestVersion()
   json(res, {
     loggedIn: !!apiKey,
     apiKey: apiKey ? maskKey(apiKey) : null,
     savedAt: config.savedAt || null,
     version: pkg.version,
+    latestVersion: latest || null,
+    updateAvailable: latest && latest !== pkg.version ? latest : null,
   })
 }
 
@@ -158,10 +185,13 @@ async function handleBalance(_req, res) {
   if (!apiKey) return json(res, { error: '未登录' }, 401)
   try {
     const fetch = require('node-fetch')
+    const controller = new AbortController()
+    const timer = setTimeout(() => controller.abort(), 15000)
     const r = await fetch(`${SHOP_URL}/api/stats/overview`, {
       headers: { Authorization: `Bearer ${apiKey}` },
-      timeout: 8000,
+      signal: controller.signal,
     })
+    clearTimeout(timer)
     if (r.status === 401) return json(res, { error: 'API Key 无效或已过期' }, 401)
     if (!r.ok) return json(res, { error: `HTTP ${r.status}` }, r.status)
     const data = await r.json()
@@ -172,7 +202,8 @@ async function handleBalance(_req, res) {
       totalCalls: Number(data.totalCalls || 0),
     })
   } catch (e) {
-    json(res, { error: e.message }, 500)
+    const msg = e.name === 'AbortError' ? '请求超时，请稍后重试' : e.message
+    json(res, { error: msg }, 500)
   }
 }