@simonyea/holysheep-cli 2.1.21 → 2.1.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "2.1.21",
+  "version": "2.1.22",
   "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.",
   "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",

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

@@ -324,6 +324,26 @@ function forwardViaNodeProxy({ nodeProxyUrl, targetUrl, clientReq, clientRes, ex
       host: targetUrl.host,
       connection: 'close',
     }
+    // Build the forward-proxy path. CRS's per-node proxy at :3129 accepts an
+    // absolute URL as the HTTP/1.1 request target and rewrites the scheme
+    // internally. We ALWAYS send http:// in the path (even if targetUrl is
+    // https://) because:
+    //   1. node:3129 listens on plain HTTP and ignores the scheme of the
+    //      request-target — it reads `targetUrl = new URL(req.url)`,
+    //      validates hostname, and proxies upstream.
+    //   2. bun's `http.request` treats `path: 'https://...'` as a signal to
+    //      issue a CONNECT tunnel (instead of a plain absolute-URI forward
+    //      request), which silently drops the x-hs-* headers we injected
+    //      because they would only ride on the outer CONNECT, not the inner
+    //      TLS tunnel — yielding 403 'Missing bridge session headers'.
+    //      (Node's `http.request` does NOT have this behaviour; the bug is
+    //      bun-specific. Reproduced under bun 1.3.9 at AionUi's runtime.)
+    // Rewriting to http:// preserves correctness on both runtimes.
+    const forwardPath = (() => {
+      const clone = new URL(targetUrl.toString())
+      clone.protocol = 'http:'
+      return clone.toString()
+    })()
     if (ENABLE_TIMING_LOG) {
       const hsHeaders = Object.fromEntries(
         Object.entries(finalHeaders).filter(([k]) => /^x-hs-/i.test(k))
@@ -331,6 +351,7 @@ function forwardViaNodeProxy({ nodeProxyUrl, targetUrl, clientReq, clientRes, ex
       console.error(
         `[hs-claude-proxy] forward.headers ${JSON.stringify({
           target: sanitizeUrl(targetUrl),
+          forwardPath,
           node: sanitizeUrl(nodeProxyUrl),
           hsHeaders,
           clientHeadersKeys: Object.keys(clientReq.headers).slice(0, 20),
@@ -341,7 +362,7 @@ function forwardViaNodeProxy({ nodeProxyUrl, targetUrl, clientReq, clientRes, ex
       host: upstream.hostname,
       port: Number(upstream.port || 80),
       method: clientReq.method,
-      path: targetUrl.toString(),
+      path: forwardPath,
       agent: false,
       headers: finalHeaders,
     }, (forwardRes) => {
@@ -505,6 +526,17 @@ function pipeWithCleanup(a, b) {
 function createProcessProxyServer({ sessionId, configPath = CONFIG_PATH, allowAnthropicConnect = false }) {
   const server = http.createServer(async (clientReq, clientRes) => {
     const isDirect = !clientReq.url.startsWith('http')
+    if (ENABLE_TIMING_LOG) {
+      console.error(
+        `[hs-claude-proxy] incoming ${JSON.stringify({
+          method: clientReq.method,
+          url: String(clientReq.url).slice(0, 120),
+          ua: String(clientReq.headers['user-agent'] || '').slice(0, 60),
+          host: clientReq.headers.host || '',
+          isDirect,
+        })}`
+      )
+    }
 
     const doForward = async (lease, attempt) => {
       const config = readConfig(configPath)
@@ -602,6 +634,15 @@ function createProcessProxyServer({ sessionId, configPath = CONFIG_PATH, allowAn
 
   server.on('connect', async (req, clientSocket, head) => {
     const target = String(req.url || '').trim()
+    if (ENABLE_TIMING_LOG) {
+      console.error(
+        `[hs-claude-proxy] incoming.CONNECT ${JSON.stringify({
+          target: target.slice(0, 120),
+          ua: String(req.headers['user-agent'] || '').slice(0, 60),
+          headers: Object.keys(req.headers).slice(0, 20),
+        })}`
+      )
+    }
     const [host, rawPort] = target.split(':')
     const port = Number(rawPort || 443)
     if (!host || !Number.isInteger(port) || ![80, 443].includes(port)) {