@simonyea/holysheep-cli 1.7.74 → 1.7.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.74",
+  "version": "1.7.76",
   "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/claude-process-proxy.js

@@ -113,27 +113,48 @@ function deriveNodeProxyUrl(lease) {
   return upstream.toString().replace(/\/+$/, '')
 }
 
+// 去掉模型 ID 中的 [1m] 后缀 — CRS 用标准模型 ID 做多账号调度
+function stripModelSuffix(body) {
+  if (!body || !body.includes('"model"')) return body
+  return body.replace(/("model"\s*:\s*"claude-(?:sonnet|opus)-[\w.-]+)\[1m\](")/g, '$1$2')
+}
+
 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: {
+    // 读取完整 body 以便修改 model 字段
+    const chunks = []
+    clientReq.on('data', chunk => chunks.push(chunk))
+    clientReq.on('end', () => {
+      let body = Buffer.concat(chunks)
+      const isJson = (clientReq.headers['content-type'] || '').includes('json')
+      if (isJson) {
+        body = Buffer.from(stripModelSuffix(body.toString('utf8')))
+      }
+
+      const headers = {
         ...clientReq.headers,
         ...extraHeaders,
         host: targetUrl.host,
+        'content-length': body.length,
         connection: 'close',
-      },
-    }, (forwardRes) => {
-      clientRes.writeHead(forwardRes.statusCode || 502, forwardRes.headers)
-      forwardRes.pipe(clientRes)
-      resolve()
+      }
+
+      const forwardReq = http.request({
+        host: upstream.hostname,
+        port: Number(upstream.port || 80),
+        method: clientReq.method,
+        path: targetUrl.toString(),
+        headers,
+      }, (forwardRes) => {
+        clientRes.writeHead(forwardRes.statusCode || 502, forwardRes.headers)
+        forwardRes.pipe(clientRes)
+        resolve()
+      })
+      forwardReq.once('error', reject)
+      forwardReq.end(body)
     })
-    forwardReq.once('error', reject)
-    clientReq.pipe(forwardReq)
+    clientReq.on('error', reject)
   })
 }
 

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

@@ -25,9 +25,14 @@ try {
 const PROXY_HOST = parsed.hostname
 const PROXY_PORT = Number(parsed.port) || 80
 const SKIP = new Set(['127.0.0.1', '::1', 'localhost', '0.0.0.0', PROXY_HOST])
+// 阻断直连 Anthropic — 强制 Claude Code 走 ANTHROPIC_BASE_URL (HTTP 路径 → proxy → CRS)
+// CONNECT 隧道因 TLS SNI 不匹配无法改写目标，只能阻断
+const BLOCK = new Set(['api.anthropic.com'])
 
 function shouldProxy(host, port) {
-  return !!(port && host && !SKIP.has(host))
+  if (!port || !host || SKIP.has(host)) return false
+  if (BLOCK.has(host)) return 'block'
+  return true
 }
 
 // api.anthropic.com → api.holysheep.ai，让 CONNECT 隧道也走 CRS 多账号调度
@@ -82,7 +87,14 @@ net.Socket.prototype.connect = function(options) {
   const host = isObj ? String(options.host || options.hostname || '') : String(options || '')
   const port = isObj ? Number(options.port || 0) : Number(arguments[1] || 0)
 
-  if (!shouldProxy(host, port)) return _origSocketConnect.apply(this, arguments)
+  const action = shouldProxy(host, port)
+  if (!action) return _origSocketConnect.apply(this, arguments)
+  if (action === 'block') {
+    // 阻断直连 Anthropic，触发连接失败，Claude Code 会回退到 ANTHROPIC_BASE_URL
+    const sock = this
+    process.nextTick(() => sock.destroy(new Error(`ECONNREFUSED: blocked direct connection to ${host}`)))
+    return sock
+  }
 
   const sock = this
   const proxyOpts = isObj
@@ -102,7 +114,13 @@ function proxied(options, cb) {
   const host = isObj ? String(options.host || options.hostname || 'localhost') : String(options || 'localhost')
   const port = isObj ? Number(options.port || 0) : Number(arguments[1] || 0)
 
-  if (!shouldProxy(host, port)) return _origCreate.apply(this, arguments)
+  const action = shouldProxy(host, port)
+  if (!action) return _origCreate.apply(this, arguments)
+  if (action === 'block') {
+    const sock = new net.Socket()
+    process.nextTick(() => sock.destroy(new Error(`ECONNREFUSED: blocked direct connection to ${host}`)))
+    return sock
+  }
 
   const sock = _origCreate({ host: PROXY_HOST, port: PROXY_PORT })
   if (typeof cb === 'function') sock.once('connect', cb)