@simonyea/holysheep-cli 1.7.46 → 1.7.47

package/package.json

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

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

@@ -1,8 +1,8 @@
 'use strict'
 /**
  * 进程级代理注入 — 通过 NODE_OPTIONS=--require 加载
- * 在 net.createConnection 最底层拦截所有 TCP 连接，强制走 CONNECT 隧道
- * 使得所有出口流量（undici / https / 任意 HTTP 客户端）都通过 node 节点 IP 出去
+ * patch sock.emit 拦截 'connect' 事件，强制所有 TCP 连接走 CONNECT 隧道
+ * 无论 TLSSocket 用何种方式注册监听器都无法绕过
  */
 const net = require('net')
 const { URL } = require('url')
@@ -34,54 +34,41 @@ function proxied(options, cb) {
 
   if (!port || SKIP.has(host)) return _orig.apply(this, arguments)
 
-  // 建立到本地 bridge CONNECT 代理的 TCP 连接
   const sock = _orig({ host: PROXY_HOST, port: PROXY_PORT })
-  const pending = []
+  let tunnelReady = false
+  const origEmit = sock.emit.bind(sock)
 
-  // 暂时拦截 'connect' 事件，等 CONNECT 隧道建好才放行
-  const _on = sock.on.bind(sock)
-  const _once = sock.once.bind(sock)
-  sock.on = function(event, listener) {
-    if (event === 'connect') { pending.push(['on', listener]); return sock }
-    return _on(event, listener)
+  // patch emit 而不是 on/once：无论监听器怎么注册都能拦截
+  sock.emit = function(type) {
+    if (type === 'connect' && !tunnelReady) {
+      // proxy TCP 已建立，发起 CONNECT 隧道
+      sock.write(`CONNECT ${host}:${port} HTTP/1.1\r\nHost: ${host}:${port}\r\n\r\n`)
+      let buf = Buffer.alloc(0)
+      sock.on('data', function onData(chunk) {
+        buf = Buffer.concat([buf, chunk])
+        const i = buf.indexOf('\r\n\r\n')
+        if (i === -1) return
+        sock.removeListener('data', onData)
+        const header = buf.slice(0, i).toString()
+        if (!header.includes(' 200 ')) {
+          sock.emit = origEmit
+          sock.destroy(new Error(`CONNECT ${host}:${port} failed: ${header.split('\r\n')[0]}`))
+          return
+        }
+        const rest = buf.slice(i + 4)
+        if (rest.length) sock.unshift(rest)
+        // 隧道就绪：恢复 emit，触发所有注册的 connect 监听器（含 TLSSocket）
+        tunnelReady = true
+        sock.emit = origEmit
+        origEmit('connect')
+      })
+      return false
+    }
+    // eslint-disable-next-line prefer-rest-params
+    return origEmit.apply(null, arguments)
   }
-  sock.once = function(event, listener) {
-    if (event === 'connect') { pending.push(['once', listener]); return sock }
-    return _once(event, listener)
-  }
-  if (typeof cb === 'function') pending.push(['once', cb])
-
-  // TCP 到 proxy 建立后，发送 CONNECT 请求
-  _once('connect', () => {
-    sock.write(`CONNECT ${host}:${port} HTTP/1.1\r\nHost: ${host}:${port}\r\n\r\n`)
-    let buf = Buffer.alloc(0)
-    _on('data', function onData(chunk) {
-      buf = Buffer.concat([buf, chunk])
-      const i = buf.indexOf('\r\n\r\n')
-      if (i === -1) return
-      sock.removeListener('data', onData)
-
-      const header = buf.slice(0, i).toString()
-      if (!header.includes(' 200 ')) {
-        sock.destroy(new Error(`CONNECT ${host}:${port} failed: ${header.split('\r\n')[0]}`))
-        return
-      }
-
-      const rest = buf.slice(i + 4)
-      if (rest.length) sock.unshift(rest)
-
-      // 隧道建好：恢复 on/once，触发所有等待中的 connect 监听器
-      sock.on = _on
-      sock.once = _once
-      for (const [type, listener] of pending) {
-        if (type === 'once') sock.once('connect', listener)
-        else sock.on('connect', listener)
-      }
-      pending.length = 0
-      sock.emit('connect')
-    })
-  })
 
+  if (typeof cb === 'function') sock.once('connect', cb)
   return sock
 }