@simonyea/holysheep-cli 1.7.42 → 1.7.44

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.42",
-  "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.",
+  "version": "1.7.44",
+  "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.",
   "keywords": [
     "openai-china",
     "claude-china",

package/src/commands/claude.js

@@ -44,16 +44,16 @@ async function runClaude(args = []) {
 
   const env = {
     ...process.env,
-    ANTHROPIC_API_KEY: undefined,   // 防止与 ANTHROPIC_AUTH_TOKEN 冲突
+    ANTHROPIC_API_KEY: undefined,
     ANTHROPIC_AUTH_TOKEN: apiKey,
-    ANTHROPIC_BASE_URL: BASE_URL_ANTHROPIC,
+    ANTHROPIC_BASE_URL: `http://127.0.0.1:${port}`,
     CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: '1',
     HOLYSHEEP_CLAUDE_PROCESS_PROXY: '1',
     HOLYSHEEP_CLAUDE_SESSION_ID: sessionId,
-    HTTP_PROXY: proxyUrl,
-    HTTPS_PROXY: proxyUrl,
-    ALL_PROXY: proxyUrl,
-    NO_PROXY: '127.0.0.1,localhost',
+    HTTP_PROXY: undefined,
+    HTTPS_PROXY: undefined,
+    ALL_PROXY: undefined,
+    NO_PROXY: undefined,
   }
 
   const child = spawn('claude', args, {

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

@@ -58,41 +58,36 @@ async function readJsonResponse(response) {
   }
 }
 
-async function requestSessionLease(config, sessionId) {
-  const cached = leaseCache.get(sessionId)
-  if (cached?.expiresAt && new Date(cached.expiresAt).getTime() - Date.now() > 30_000) {
-    return cached
-  }
-
+// 向 relay 申请新 lease（启动时 + CONNECT 失败时被动重试）
+async function fetchFreshLease(config, sessionId) {
   const controlPlaneUrl = getControlPlaneUrl(config)
   if (!controlPlaneUrl) throw new Error('Claude relay control plane is not configured')
 
-  try {
-    const response = await fetch(`${controlPlaneUrl}/session/open`, {
-      method: 'POST',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify({
-        sessionId,
-        bridgeId: config.bridgeId || 'local-bridge',
-        deviceId: config.deviceId || '',
-        installSource: config.installSource || 'holysheep-cli',
-        proxyMode: 'claude-process',
-      }),
-    })
+  const response = await fetch(`${controlPlaneUrl}/session/open`, {
+    method: 'POST',
+    headers: { 'content-type': 'application/json' },
+    body: JSON.stringify({
+      sessionId,
+      bridgeId: config.bridgeId || 'local-bridge',
+      deviceId: config.deviceId || '',
+      installSource: config.installSource || 'holysheep-cli',
+      proxyMode: 'claude-process',
+    }),
+  })
 
-    const payload = await response.json().catch(() => null)
-    if (!response.ok || !payload?.success || !payload?.data?.ticket) {
-      throw new Error(payload?.error?.message || `Failed to open Claude session (HTTP ${response.status})`)
-    }
-    leaseCache.set(sessionId, payload.data)
-    return payload.data
-  } catch (error) {
-    // 续约失败时，只要旧 lease 还没真正过期就继续用，避免网络抖动导致 session 中断
-    if (cached?.expiresAt && new Date(cached.expiresAt).getTime() > Date.now()) {
-      return cached
-    }
-    throw error
+  const payload = await response.json().catch(() => null)
+  if (!response.ok || !payload?.success || !payload?.data?.ticket) {
+    throw new Error(payload?.error?.message || `Failed to open Claude session (HTTP ${response.status})`)
   }
+  leaseCache.set(sessionId, payload.data)
+  return payload.data
+}
+
+// 请求路径：只读缓存，不检查过期时间（续约由失败触发，不由时间触发）
+function getCachedLease(sessionId) {
+  const cached = leaseCache.get(sessionId)
+  if (!cached) throw new Error('No session lease available')
+  return cached
 }
 
 function buildAuthHeaders(config, lease) {
@@ -157,84 +152,124 @@ function pipeWithCleanup(a, b) {
 
 function createProcessProxyServer({ sessionId, configPath = CONFIG_PATH }) {
   const server = http.createServer(async (clientReq, clientRes) => {
-    try {
+    const isDirect = !clientReq.url.startsWith('http')
+
+    const doForward = async (lease) => {
       const config = readConfig(configPath)
-      const lease = await requestSessionLease(config, sessionId)
+
+      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) => {
+            clientRes.writeHead(res.statusCode || 502, res.headers)
+            res.pipe(clientRes)
+            resolve()
+          })
+          fwd.once('error', reject)
+          clientReq.pipe(fwd)
+        })
+      }
+
       const nodeProxyUrl = deriveNodeProxyUrl(lease)
       const headers = {
         ...buildAuthHeaders(config, lease),
         host: new URL(clientReq.url).host,
       }
-
       const upstream = new URL(nodeProxyUrl)
-      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)
+      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)
       })
+    }
 
-      forwardReq.once('error', (error) => {
+    try {
+      await doForward(getCachedLease(sessionId))
+    } catch {
+      try {
+        const config = readConfig(configPath)
+        leaseCache.delete(sessionId)
+        const freshLease = await fetchFreshLease(config, sessionId)
+        await doForward(freshLease)
+      } catch (retryError) {
         clientRes.writeHead(502, { 'content-type': 'text/plain; charset=utf-8' })
-        clientRes.end(error.message || 'Proxy error')
-      })
-
-      clientReq.pipe(forwardReq)
-    } catch (error) {
-      clientRes.writeHead(500, { 'content-type': 'text/plain; charset=utf-8' })
-      clientRes.end(error.message || 'Proxy error')
+        clientRes.end(retryError.message || 'Proxy error')
+      }
     }
   })
 
   server.on('connect', async (req, clientSocket, head) => {
-    try {
-      const config = readConfig(configPath)
-      const lease = await requestSessionLease(config, sessionId)
-      const target = String(req.url || '').trim()
-      const [host, rawPort] = target.split(':')
-      const port = Number(rawPort || 443)
-      if (!host || !Number.isInteger(port) || ![80, 443].includes(port)) {
-        clientSocket.write('HTTP/1.1 403 Forbidden\r\n\r\n')
-        return clientSocket.destroy()
-      }
+    const target = String(req.url || '').trim()
+    const [host, rawPort] = target.split(':')
+    const port = Number(rawPort || 443)
+    if (!host || !Number.isInteger(port) || ![80, 443].includes(port)) {
+      clientSocket.write('HTTP/1.1 403 Forbidden\r\n\r\n')
+      return clientSocket.destroy()
+    }
 
+    const doConnect = async (lease) => {
       const upstreamSocket = await createConnectTunnel(
         deriveNodeProxyUrl(lease),
         target,
-        buildAuthHeaders(config, lease)
+        buildAuthHeaders(readConfig(configPath), lease)
       )
-
       clientSocket.write('HTTP/1.1 200 Connection Established\r\n\r\n')
       if (head?.length) upstreamSocket.write(head)
       pipeWithCleanup(clientSocket, upstreamSocket)
-    } catch (error) {
-      clientSocket.write(`HTTP/1.1 502 Bad Gateway\r\ncontent-type: text/plain; charset=utf-8\r\n\r\n${error.message}`)
-      clientSocket.destroy()
+    }
+
+    try {
+      await doConnect(getCachedLease(sessionId))
+    } catch {
+      // lease 失效，拿新 lease 重试一次
+      try {
+        const config = readConfig(configPath)
+        leaseCache.delete(sessionId)
+        const freshLease = await fetchFreshLease(config, sessionId)
+        await doConnect(freshLease)
+      } catch (retryError) {
+        clientSocket.write(`HTTP/1.1 502 Bad Gateway\r\ncontent-type: text/plain; charset=utf-8\r\n\r\n${retryError.message}`)
+        clientSocket.destroy()
+      }
     }
   })
 
   return server
 }
 
-function startProcessProxy({ port = null, sessionId = null, configPath = CONFIG_PATH } = {}) {
+async function startProcessProxy({ port = null, sessionId = null, configPath = CONFIG_PATH } = {}) {
   const config = readConfig(configPath)
   const preferredPort = port || getProcessProxyPort(config)
   const effectiveSessionId = sessionId || crypto.randomUUID()
+
+  // 启动时拿一次 lease，之后靠被动重试维持，不再主动续约
+  await fetchFreshLease(config, effectiveSessionId)
+
   const server = createProcessProxyServer({ sessionId: effectiveSessionId, configPath })
 
   return new Promise((resolve, reject) => {
     const tryListen = (p) => {
       server.once('error', (err) => {
         if (err.code === 'EADDRINUSE') {
-          // 端口被占用，让 OS 分配一个随机可用端口
           server.once('error', reject)
           server.listen(0, '127.0.0.1')
         } else {
@@ -272,7 +307,6 @@ module.exports = {
   getProcessProxyPort,
   getControlPlaneUrl,
   readConfig,
-  requestSessionLease,
   startProcessProxy,
   writeConfig,
 }