@simonyea/holysheep-cli 2.1.33 → 2.1.34

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "2.1.33",
-  "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": "2.1.34",
+  "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.",
   "scripts": {
     "test": "node tests/droid.test.js && node tests/workspace-store.test.js && node tests/runtime-stale-upgrade.test.js && node tests/hermes.test.js && node tests/preflight.test.js",
     "prepublishOnly": "node scripts/check-tarball-size.js"

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

@@ -229,8 +229,17 @@ function deriveNodeProxyUrl(lease) {
   if (process.env.HS_CLAUDE_NODE_PROXY_OVERRIDE) {
     return String(process.env.HS_CLAUDE_NODE_PROXY_OVERRIDE).replace(/\/+$/, '')
   }
-  if (lease.nodeProxyUrl) return String(lease.nodeProxyUrl)
-  if (!lease.nodeBaseUrl) throw new Error('Lease does not include node proxy information')
+  // [HolySheep fork v2.1.34 / hs23] Distinguish "field present but empty"
+  // (sub2api nodes have no process-proxy) from "field absent" (old lease format).
+  // Control plane sets nodeProxyUrl:"" for sub2api nodes = no process proxy exists.
+  // Return null so callers skip node-proxy and go straight to direct-https.
+  // Only fall through to port inference when field is entirely absent (legacy leases).
+  if (Object.prototype.hasOwnProperty.call(lease, 'nodeProxyUrl')) {
+    if (!lease.nodeProxyUrl) return null  // explicit empty = no proxy on this node
+    return String(lease.nodeProxyUrl)
+  }
+  // Legacy fallback: field absent → infer proxy port from nodeBaseUrl
+  if (!lease.nodeBaseUrl) return null
   const upstream = new URL(String(lease.nodeBaseUrl))
   const proxyPort = upstream.port === '3101' ? '3129' : upstream.port
   upstream.port = proxyPort || '3129'
@@ -678,6 +687,16 @@ function createProcessProxyServer({ sessionId, configPath = CONFIG_PATH, allowAn
       const config = readConfig(configPath)
       const nodeProxyUrl = deriveNodeProxyUrl(lease)
 
+      // [HolySheep fork v2.1.34 / hs23] nodeProxyUrl===null means the control
+      // plane signalled this node has no process proxy (sub2api nodes).
+      // Skip node-proxy entirely and go straight to direct-https. This avoids
+      // the ECONNREFUSED → retry × MAX_PROXY_RETRIES delay that was burning
+      // ~5 s before falling back.
+      if (nodeProxyUrl === null) {
+        logProxyTiming('request.direct-noproxy', { sessionId, nodeId: lease.nodeId || '', attempt })
+        return forwardDirectHttps({ config, lease, clientReq, clientRes, trace: null })
+      }
+
       if (isDirect) {
         const crsBase = config.baseUrlAnthropic || 'https://api.holysheep.ai'
         const target = new URL(clientReq.url, crsBase)
@@ -824,8 +843,23 @@ function createProcessProxyServer({ sessionId, configPath = CONFIG_PATH, allowAn
     }
 
     const doConnect = async (lease) => {
+      const nodeProxyUrl = deriveNodeProxyUrl(lease)
+      // [HolySheep fork v2.1.34 / hs23] No process proxy on this node (sub2api).
+      // CONNECT tunnels go directly to the target host — no bridge headers needed.
+      if (nodeProxyUrl === null) {
+        logProxyTiming('connect.direct-noproxy', { sessionId, nodeId: lease.nodeId || '', target })
+        const upstreamSocket = await new Promise((resolve, reject) => {
+          const sock = net.connect(port, host, () => resolve(sock))
+          sock.once('error', reject)
+          sock.setTimeout(15000, () => sock.destroy(new Error('CONNECT direct tunnel timeout')))
+        })
+        clientSocket.write('HTTP/1.1 200 Connection Established\r\n\r\n')
+        if (head?.length) upstreamSocket.write(head)
+        pipeWithCleanup(clientSocket, upstreamSocket)
+        return
+      }
       const upstreamSocket = await createConnectTunnel(
-        deriveNodeProxyUrl(lease),
+        nodeProxyUrl,
         target,
         buildAuthHeaders(readConfig(configPath), lease)
       )