@simonyea/holysheep-cli 1.7.53 → 1.7.55

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.53",
-  "description": "Claude Code/Cursor/Cline API relay for China \u2014 \u00a51=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
+  "version": "1.7.55",
+  "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",
     "claude-china",

package/src/commands/webui.js

@@ -0,0 +1,42 @@
+/**
+ * hs webui — 启动 WebUI 本地管理面板
+ */
+'use strict'
+
+const chalk = require('chalk')
+const { execSync } = require('child_process')
+
+async function webui(opts) {
+  const port = Number(opts.port) || 9876
+  const { startServer } = require('../webui/server')
+
+  console.log()
+  console.log(chalk.bold('🌐  HolySheep WebUI'))
+  console.log(chalk.gray('━'.repeat(50)))
+  console.log()
+
+  try {
+    const server = await startServer(port)
+    const url = `http://127.0.0.1:${port}`
+    console.log(chalk.green(`✓ WebUI 已启动: ${chalk.cyan.bold(url)}`))
+    console.log(chalk.gray('  按 Ctrl+C 停止'))
+    console.log()
+
+    if (opts.open !== false) {
+      try {
+        const platform = process.platform
+        if (platform === 'darwin') execSync(`open "${url}"`)
+        else if (platform === 'win32') execSync(`start "" "${url}"`)
+        else execSync(`xdg-open "${url}"`)
+      } catch {}
+    }
+
+    // Keep alive
+    await new Promise(() => {})
+  } catch (err) {
+    console.log(chalk.red(`✗ 启动失败: ${err.message}`))
+    process.exit(1)
+  }
+}
+
+module.exports = webui

package/src/index.js

@@ -170,6 +170,18 @@ program
     })
   })
 
+// ── webui ──────────────────────────────────────────────────────────────────
+program
+  .command('web')
+  .alias('webui')
+  .description('启动 WebUI 本地管理面板')
+  .option('-p, --port <port>', '指定端口', '9876')
+  .option('--no-open', '不自动打开浏览器')
+  .action(async (opts) => {
+    printBanner()
+    await require('./commands/webui')(opts)
+  })
+
 // ── claude ──────────────────────────────────────────────────────────────────
 program
   .command('claude [args...]')

package/src/tools/claude-process-proxy.js

@@ -113,6 +113,30 @@ function deriveNodeProxyUrl(lease) {
   return upstream.toString().replace(/\/+$/, '')
 }
 
+function forwardViaNodeProxy({ nodeProxyUrl, targetUrl, clientReq, clientRes, extraHeaders = {} }) {
+  const upstream = new URL(nodeProxyUrl)
+  return new Promise((resolve, reject) => {
+    const forwardReq = http.request({
+      host: upstream.hostname,
+      port: Number(upstream.port || 80),
+      method: clientReq.method,
+      path: targetUrl.toString(),
+      headers: {
+        ...clientReq.headers,
+        ...extraHeaders,
+        host: targetUrl.host,
+        connection: 'close',
+      },
+    }, (forwardRes) => {
+      clientRes.writeHead(forwardRes.statusCode || 502, forwardRes.headers)
+      forwardRes.pipe(clientRes)
+      resolve()
+    })
+    forwardReq.once('error', reject)
+    clientReq.pipe(forwardReq)
+  })
+}
+
 function createConnectTunnel(proxyUrl, target, headers) {
   return new Promise((resolve, reject) => {
     const upstream = new URL(proxyUrl)
@@ -156,59 +180,30 @@ function createProcessProxyServer({ sessionId, configPath = CONFIG_PATH }) {
 
     const doForward = async (lease) => {
       const config = readConfig(configPath)
+      const nodeProxyUrl = deriveNodeProxyUrl(lease)
 
       if (isDirect) {
         const crsBase = config.baseUrlAnthropic || 'https://api.holysheep.ai'
         const target = new URL(clientReq.url, crsBase)
-        const fwdHeaders = {
-          ...clientReq.headers,
-          ...buildAuthHeaders(config, lease),
-          'x-hs-node-proxied': '1',
-          host: target.host,
-        }
-        const transport = target.protocol === 'https:' ? https : http
-        return new Promise((resolve, reject) => {
-          const fwd = transport.request({
-            hostname: target.hostname,
-            port: Number(target.port || (target.protocol === 'https:' ? 443 : 80)),
-            method: clientReq.method,
-            path: target.pathname + target.search,
-            headers: fwdHeaders,
-          }, (res) => {
-            if (res.statusCode === 401 || res.statusCode === 403) {
-              res.resume()
-              return reject(new Error(`Auth error ${res.statusCode}`))
-            }
-            clientRes.writeHead(res.statusCode || 502, res.headers)
-            res.pipe(clientRes)
-            resolve()
-          })
-          fwd.once('error', reject)
-          clientReq.pipe(fwd)
+        return forwardViaNodeProxy({
+          nodeProxyUrl,
+          targetUrl: target,
+          clientReq,
+          clientRes,
+          extraHeaders: buildAuthHeaders(config, lease),
         })
       }
 
-      const nodeProxyUrl = deriveNodeProxyUrl(lease)
       const headers = {
         ...buildAuthHeaders(config, lease),
-        'x-hs-node-proxied': '1',
         host: new URL(clientReq.url).host,
       }
-      const upstream = new URL(nodeProxyUrl)
-      return new Promise((resolve, reject) => {
-        const forwardReq = http.request({
-          host: upstream.hostname,
-          port: Number(upstream.port || 80),
-          method: clientReq.method,
-          path: clientReq.url,
-          headers: { ...clientReq.headers, ...headers, connection: 'close' },
-        }, (forwardRes) => {
-          clientRes.writeHead(forwardRes.statusCode || 502, forwardRes.headers)
-          forwardRes.pipe(clientRes)
-          resolve()
-        })
-        forwardReq.once('error', reject)
-        clientReq.pipe(forwardReq)
+      return forwardViaNodeProxy({
+        nodeProxyUrl,
+        targetUrl: new URL(clientReq.url),
+        clientReq,
+        clientRes,
+        extraHeaders: headers,
       })
     }
 

package/src/tools/codex.js

@@ -12,11 +12,11 @@
  *   [model_providers.holysheep]
  *   name = "HolySheep"
  *   base_url = "https://api.holysheep.ai/v1"
- *   env_key = "OPENAI_API_KEY"
+ *   api_key = "cr_xxx"
  *   wire_api = "responses"
  *
  * 注意：旧的 config.json 会被 Rust Codex 忽略！
- * 注意：Rust Codex 当前读取 env_key，不读取自定义 api_key 字段。
+ * 注意：api_key 直接写入配置文件，不再写入 shell 环境变量。
  */
 const fs   = require('fs')
 const path = require('path')
@@ -89,8 +89,7 @@ function isConfiguredInToml() {
   const content = readTomlConfig()
   return content.includes('model_provider = "holysheep"') &&
          content.includes('base_url') &&
-         content.includes('holysheep.ai') &&
-         content.includes('env_key = "OPENAI_API_KEY"')
+         content.includes('holysheep.ai')
 }
 
 /**
@@ -113,7 +112,7 @@ function writeTomlConfig(apiKey, baseUrlOpenAI, model) {
     `[model_providers.holysheep]`,
     `name = "HolySheep"`,
     `base_url = "${baseUrlOpenAI}"`,
-    `env_key = "OPENAI_API_KEY"`,
+    `api_key = "${apiKey}"`,
     `wire_api = "responses"`,
     '',
   ].join('\n')
@@ -138,13 +137,13 @@ function writeJsonConfigIfNeeded(apiKey, baseUrlOpenAI, model) {
     jsonConfig.model_providers.holysheep = {
       name: 'HolySheep',
       base_url: baseUrlOpenAI,
-      env_key: 'OPENAI_API_KEY',
+      api_key: apiKey,
       wire_api: 'responses',
     }
     jsonConfig.providers.holysheep = {
       name: 'HolySheep',
       baseURL: baseUrlOpenAI,
-      envKey: 'OPENAI_API_KEY',
+      apiKey: apiKey,
     }
     fs.writeFileSync(CONFIG_FILE_JSON, JSON.stringify(jsonConfig, null, 2), 'utf8')
   } catch {}
@@ -171,7 +170,6 @@ module.exports = {
     return {
       file: CONFIG_FILE,
       hot:  false,
-      envVars: { OPENAI_API_KEY: apiKey },
     }
   },
   reset() {