@simonyea/holysheep-cli 1.7.56 → 1.7.58

package/package.json

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

@@ -56,9 +56,9 @@ function readConfig() {
   const file = getConfigFile()
   try {
     if (fs.existsSync(file)) {
-      // 支持 JSONC（带注释的 JSON）
+      // 支持 JSONC（带注释的 JSON）— 只删行首注释，避免误删 URL 中的 //
       const content = fs.readFileSync(file, 'utf8')
-      return JSON.parse(content.replace(/\/\/[^\n]*/g, '').replace(/\/\*[\s\S]*?\*\//g, ''))
+      return JSON.parse(content.replace(/^\s*\/\/[^\n]*/gm, '').replace(/\/\*[\s\S]*?\*\//g, ''))
     }
   } catch {}
   return {}

package/src/webui/configure-worker.js

@@ -0,0 +1,65 @@
+/**
+ * 子进程 worker — 在独立进程中运行 tool.configure()
+ * 避免 spawnSync/busy-wait 阻塞主进程事件循环
+ *
+ * IPC 协议:
+ *   父→子: { toolId, apiKey, baseUrlAnthropic, baseUrlOpenAI, primaryModel, allModelIds }
+ *   子→父: { type: 'progress'|'result'|'error', ... }
+ */
+'use strict'
+
+process.on('message', (msg) => {
+  const TOOLS = require('../tools')
+  const { writeEnvToShell, removeEnvFromShell } = require('../utils/shell')
+
+  const tool = TOOLS.find(t => t.id === msg.toolId)
+  if (!tool) {
+    process.send({ type: 'error', message: '未知工具: ' + msg.toolId })
+    process.exit(1)
+  }
+
+  // 劫持 console.log/warn → IPC 回传进度
+  const stripAnsi = (s) => String(s).replace(/\x1b\[[0-9;]*m/g, '')
+  console.log = (...args) => {
+    const text = stripAnsi(args.join(' ')).trim()
+    if (text) process.send({ type: 'progress', message: text })
+  }
+  console.warn = console.log
+
+  try {
+    const result = tool.configure(
+      msg.apiKey,
+      msg.baseUrlAnthropic,
+      msg.baseUrlOpenAI,
+      msg.primaryModel,
+      msg.allModelIds,
+    )
+
+    // 写入 shell 环境变量（如果工具需要）
+    if (result.envVars && Object.keys(result.envVars).length > 0) {
+      writeEnvToShell(result.envVars)
+      process.send({ type: 'progress', message: '已写入环境变量到 shell 配置' })
+    }
+
+    // 清理冲突环境变量
+    try {
+      removeEnvFromShell(['ANTHROPIC_API_KEY', 'ANTHROPIC_BASE_URL', 'OPENAI_API_KEY', 'OPENAI_BASE_URL'])
+    } catch {}
+
+    process.send({
+      type: 'result',
+      status: result.manual ? 'manual' : result.warning ? 'warning' : 'ok',
+      message: result.manual ? `${tool.name} 需要手动完成配置`
+             : result.warning ? result.warning
+             : `${tool.name} 配置成功`,
+      file: result.file || null,
+      hot: result.hot || false,
+      steps: result.steps || null,
+      dashboardUrl: result.dashboardUrl || null,
+    })
+  } catch (e) {
+    process.send({ type: 'error', message: e.message })
+  }
+
+  process.exit(0)
+})

package/src/webui/index.html

@@ -169,7 +169,7 @@ const I18N = {
     balance: '余额', today: '今日消费', month: '本月消费', calls: '累计调用',
     recharge: '充值', register: '没有账号？去注册',
     apiKeyPlaceholder: '请输入 API Key (cr_xxx)',
-    tools: 'AI 工具', toolsHint: '一键配置使用 HolySheep API',
+    tools: 'AI 工具', toolsHint: '一键配置使用 HolySheep API', upgrade: '升级工具',
     installed: '已安装', notInstalled: '未安装', configured: '已配置', notConfigured: '未配置',
     configure: '一键配置', reconfigure: '重新配置', reset: '重置', install: '安装',
     installManual: '手动安装',
@@ -191,7 +191,7 @@ const I18N = {
     balance: 'Balance', today: 'Today', month: 'This Month', calls: 'Total Calls',
     recharge: 'Recharge', register: 'No account? Register',
     apiKeyPlaceholder: 'Enter API Key (cr_xxx)',
-    tools: 'AI Tools', toolsHint: 'One-click setup for HolySheep API',
+    tools: 'AI Tools', toolsHint: 'One-click setup for HolySheep API', upgrade: 'Upgrade Tools',
     installed: 'Installed', notInstalled: 'Not installed', configured: 'Configured', notConfigured: 'Not configured',
     configure: 'Configure', reconfigure: 'Reconfigure', reset: 'Reset', install: 'Install',
     installManual: 'Manual install',
@@ -265,7 +265,7 @@ async function loadAccount() {
         <div><div class="stat-val">$${fmtNum(b.todayCost)}</div><div class="stat-lbl">${t('today')}</div></div>
         <div><div class="stat-val">$${fmtNum(b.monthCost)}</div><div class="stat-lbl">${t('month')}</div></div>
         <div><div class="stat-val">${b.totalCalls.toLocaleString()}</div><div class="stat-lbl">${t('calls')}</div></div>
-      </div>` : ''}
+      </div>` : `<div style="color:var(--text2);font-size:0.85rem;margin:10px 0">${b.error ? esc(b.error) : t('checking')}</div>`}
       <div class="account-actions">
         <a class="btn btn-primary btn-sm" href="https://holysheep.ai/app/recharge" target="_blank">${t('recharge')} &rarr;</a>
         <button class="btn btn-danger btn-sm" onclick="doLogout()">${t('logout')}</button>
@@ -307,7 +307,10 @@ async function doLogout() {
 // ── Tools section ────────────────────────────────────────────────────────────
 async function loadTools() {
   const el = document.getElementById('tools-section')
-  el.innerHTML = `<div class="section-title"><span>${t('tools')}</span><span class="hint">${t('toolsHint')}</span></div>
+  el.innerHTML = `<div class="section-title">
+      <span>${t('tools')} <span class="hint" style="margin-left:8px">${t('toolsHint')}</span></span>
+      <button class="btn btn-outline btn-sm" onclick="doUpgrade()" ${busy ? 'disabled' : ''}>${t('upgrade')}</button>
+    </div>
     <div class="tool-grid"><span class="loading">${t('checking')}</span></div>`
 
   const tools = await api('tools')
@@ -419,6 +422,29 @@ async function doInstallTool(id, name) {
   loadTools()
 }
 
+async function doUpgrade() {
+  if (busy) return
+  busy = true
+  openConsole(t('upgrade'))
+  document.getElementById('console-section').classList.add('busy')
+
+  await streamSSE('/api/upgrade', {}, (ev) => {
+    if (ev.type === 'tool') {
+      const cls = ev.status === 'ok' ? 'ok' : ev.status === 'error' ? 'err' : ev.status === 'not-installed' ? 'warn' : 'info'
+      const msg = ev.status === 'not-installed' ? `${ev.name}: ${t('notInstalled')}`
+        : ev.status === 'upgrading' ? `${ev.name}: ${t('upgrade')}... (${ev.localVer || '?'})`
+        : ev.status === 'ok' ? `✓ ${ev.name}: ${ev.localVer || '?'} → ${ev.newVer || 'latest'}`
+        : `✗ ${ev.name}: ${t('configFailed')}`
+      appendLog(msg, cls)
+    } else if (ev.type === 'output') { appendLogRaw(ev.text) }
+    else if (ev.type === 'done') { appendLog(`\n✓ ${t('configSuccess')}`, 'ok') }
+  })
+
+  document.getElementById('console-section').classList.remove('busy')
+  busy = false
+  loadTools()
+}
+
 // ── Console ──────────────────────────────────────────────────────────────────
 function openConsole(title) {
   const area = document.getElementById('console-section')

package/src/webui/server.js

@@ -158,10 +158,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 +175,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)
   }
 }
 
@@ -470,43 +474,40 @@ async function handleToolConfigure(req, res) {
 
   sseEmit(res, { type: 'progress', message: `正在配置 ${tool.name}...` })
 
-  // 劫持 console.log/warn，将 tool.configure() 内部的进度消息转发为 SSE 事件
-  const origLog = console.log
-  const origWarn = console.warn
-  console.log = (...args) => {
-    const msg = args.map(a => typeof a === 'string' ? a : String(a)).join(' ')
-    const clean = msg.replace(/\x1b\[[0-9;]*m/g, '').trim()
-    if (clean) sseEmit(res, { type: 'progress', message: clean })
-  }
-  console.warn = console.log
-
-  try {
-    const result = tool.configure(apiKey, BASE_URL_ANTHROPIC, BASE_URL_OPENAI, primaryModel, allModelIds)
+  // 用子进程运行 configure()，避免 spawnSync/busy-wait 阻塞主进程事件循环
+  const { fork } = require('child_process')
+  const child = fork(path.join(__dirname, 'configure-worker.js'), { silent: true })
 
-    if (result.envVars && Object.keys(result.envVars).length > 0) {
-      writeEnvToShell(result.envVars)
-      sseEmit(res, { type: 'progress', message: '已写入环境变量到 shell 配置' })
-    }
+  child.send({ toolId, apiKey, baseUrlAnthropic: BASE_URL_ANTHROPIC, baseUrlOpenAI: BASE_URL_OPENAI, primaryModel, allModelIds })
 
-    try { removeEnvFromShell(['ANTHROPIC_API_KEY', 'ANTHROPIC_BASE_URL', 'OPENAI_API_KEY', 'OPENAI_BASE_URL']) } catch {}
+  let success = false
+  let lastResult = null
 
-    if (result.manual) {
-      sseEmit(res, { type: 'result', status: 'manual', message: `${tool.name} 需要手动完成配置`, steps: result.steps })
-    } else if (result.warning) {
-      sseEmit(res, { type: 'result', status: 'warning', message: result.warning, file: result.file })
-    } else {
-      sseEmit(res, { type: 'result', status: 'ok', message: `${tool.name} 配置成功`, file: result.file, hot: result.hot })
+  child.on('message', (msg) => {
+    if (msg.type === 'progress') {
+      sseEmit(res, msg)
+    } else if (msg.type === 'result') {
+      lastResult = msg
+      sseEmit(res, msg)
+    } else if (msg.type === 'error') {
+      sseEmit(res, msg)
     }
+  })
 
-    sseEmit(res, { type: 'done', success: true, file: result.file, hot: result.hot, dashboardUrl: result.dashboardUrl || null })
-  } catch (e) {
-    sseEmit(res, { type: 'error', message: e.message })
-    sseEmit(res, { type: 'done', success: false })
-  } finally {
-    console.log = origLog
-    console.warn = origWarn
-  }
-  res.end()
+  await new Promise((resolve) => {
+    child.on('exit', (code) => {
+      success = code === 0 && lastResult?.status === 'ok'
+      sseEmit(res, {
+        type: 'done',
+        success,
+        file: lastResult?.file || null,
+        hot: lastResult?.hot || false,
+        dashboardUrl: lastResult?.dashboardUrl || null,
+      })
+      res.end()
+      resolve()
+    })
+  })
 }
 
 // ── Single-tool reset ────────────────────────────────────────────────────────