-
-
+
+
@@ -755,6 +749,8 @@
function setLoading(loading) {
$('btn-qrcode').disabled = loading;
+ var btnQrcodeMac = $('btn-qrcode-mac');
+ if (btnQrcodeMac) btnQrcodeMac.disabled = loading;
var btnWake = $('btn-wake');
if (btnWake) btnWake.disabled = loading;
$('btn-check-scan').disabled = loading;
@@ -762,20 +758,21 @@
$('btn-logout').disabled = loading;
}
- function getCommonPayload() {
+ function getCommonPayload(requireProxy) {
const key = $('key').value.trim();
const proxy = $('proxy').value.trim();
- const device = $('device').value;
- const check = $('check-proxy').checked;
if (!key) {
alert('请先填写账号唯一标识（key）');
return null;
}
+ if (requireProxy && !proxy) {
+ alert('请先填写 socks5 代理。服务器在香港，不上代理必封号。');
+ return null;
+ }
return {
key,
proxy: proxy || undefined,
- ipadOrMac: device,
- check,
+ ipadOrMac: 'ipad',
};
}
@@ -999,16 +996,46 @@
return body;
}
- async function onGetQrCode() {
+ async function onWake() {
const payload = getCommonPayload();
if (!payload) return;
setLoading(true);
try {
- log('请求登录二维码...');
+ log('唤醒登录（仅扫码登录）...');
+ const body = {
+ key: payload.key,
+ Check: !!payload.check,
+ IpadOrmac: payload.ipadOrMac || 'ipad',
+ Proxy: payload.proxy || '',
+ };
+ const data = await callApi('/auth/wake', {
+ method: 'POST',
+ body: JSON.stringify(body),
+ });
+ log('唤醒请求已发送');
+ if (data && typeof data === 'object' && (data.error || data.detail)) {
+ log(JSON.stringify(data.error || data.detail), 'warn');
+ }
+ updateLoginState('已发送唤醒', 'pending', '如需扫码请点击「获取登录二维码」');
+ } catch (e) {
+ log('唤醒失败: ' + (e.message || e), 'error');
+ updateLoginState('唤醒失败', 'offline', e.message || '');
+ } finally {
+ setLoading(false);
+ }
+ }
+
+ async function onGetQrCode(forceMac) {
+ const payload = getCommonPayload(true);
+ if (!payload) return;
+ setLoading(true);
+ try {
+ log(forceMac ? '重新取码(Mac)，用于无数字时走滑块…' : '请求登录二维码(iPad)...');
const body = {
Proxy: payload.proxy || '',
- IpadOrmac: payload.ipadOrMac || '',
- Check: !!payload.check,
+ IpadOrmac: forceMac ? 'mac' : 'ipad',
+ Check: false,
+ force_mac: !!forceMac,
};
const data = await callApi('/auth/qrcode', {
method: 'POST',
@@ -1029,17 +1056,22 @@
if (line3) log(line3);
})();
renderQrFromResponse(data);
- updateLoginState('等待扫码 / 确认中', 'pending', '请在 60 秒内使用微信扫码。');
- // 仅通过轮询检测扫码状态，不立即查状态（避免沿用上次的「需验证」误弹滑块）
- if (state.pollingScan) {
- clearInterval(state.pollingScan);
+ updateLoginState(forceMac ? '已用 Mac 重新取码，请手机停在确认页并完成下方滑块' : '等待扫码 / 确认中', 'pending', forceMac ? '滑块 Key=408449830，Data62 已更新' : '请在 60 秒内使用微信扫码。');
+ if (forceMac && data) {
+ var newData62 = (data.Data && data.Data.Data62) || data.Data62 || data.data62 || '';
+ if (newData62) {
+ if (!state.sliderParams) state.sliderParams = {};
+ state.sliderParams.data62 = newData62;
+ state.sliderParams.key = state.sliderParams.key || '408449830';
+ showSliderAreaAndFill(state.sliderParams);
+ log('已用新 Data62 更新滑块区域，请完成滑块后到手机点确认。', 'warn');
+ }
}
+ if (state.pollingScan) clearInterval(state.pollingScan);
setTimeout(() => onCheckScanStatus(true), 2000);
- state.pollingScan = setInterval(() => {
- onCheckScanStatus(true);
- }, 5000);
+ state.pollingScan = setInterval(() => { onCheckScanStatus(true); }, 5000);
} catch (e) {
- log('获取二维码失败: ' + e.message, 'error');
+ log('获取二维码失败: ' + (e.message || e), 'error');
updateLoginState('二维码获取失败', 'offline', e.message || '');
} finally {
setLoading(false);
@@ -1047,7 +1079,7 @@
}
async function onCheckScanStatus(silent = false) {
- const payload = getCommonPayload();
+ const payload = getCommonPayload(false);
if (!payload) return;
if (!silent) setLoading(true);
try {
@@ -1172,17 +1204,15 @@
if ($('slider-area') && $('slider-area').style.display !== 'none') {
showQrArea();
}
- onGetQrCode();
+ onGetQrCode(false);
+ });
+ $('btn-qrcode-mac') && $('btn-qrcode-mac').addEventListener('click', (e) => {
+ e.preventDefault();
+ onGetQrCode(true);
});
$('btn-wake') && $('btn-wake').addEventListener('click', function(e) {
e.preventDefault();
- var device = ($('device') && $('device').value) || '';
- if (device === 'mac') {
- if ($('slider-area') && $('slider-area').style.display !== 'none') showQrArea();
- onGetQrCode();
- } else {
- log('唤醒：请先将「登录设备类型」选为 Mac，再点击唤醒以获取二维码。', 'warn');
- }
+ onWake();
});
$('btn-show-slider') && $('btn-show-slider').addEventListener('click', function() {
if (state.sliderParams) showSliderAreaAndFill(state.sliderParams);
diff --git a/public/manage.html b/public/manage.html
index f2c66d3..fea7400 100644
--- a/public/manage.html
+++ b/public/manage.html
@@ -211,11 +211,6 @@
—
-
- 消息回调（7006 → 本服务）：
- —
-
-
@@ -302,43 +297,27 @@
}
async function loadAiReplyStatus() {
- const key = $('key').value.trim();
+ const key = getKey();
const el = $('ai-reply-status-text');
if (!el) return;
- if (!key) { el.textContent = '请先登录'; return; }
+ if (!key) { el.textContent = '请先登录'; el.style.color = 'var(--muted, #94a3b8)'; return; }
el.textContent = '检测中…';
- try {
- const data = await callApi('/api/ai-reply-status?key=' + encodeURIComponent(key));
- el.textContent = data.ok ? '正常（WS 已连接，已配置白名单/超级管理员，已选模型）' : (data.message || '异常');
- el.style.color = data.ok ? 'var(--success, #22c55e)' : 'var(--muted, #94a3b8)';
- } catch (e) {
- el.textContent = '检查失败: ' + (e.message || e);
- el.style.color = 'var(--danger, #ef4444)';
- }
- }
-
- async function loadCallbackStatus() {
- const key = getKey();
- const el = $('callback-status-text');
- if (!el) return;
- if (!key) { el.textContent = '请先登录'; el.style.color = 'var(--muted)'; return; }
- el.textContent = '检测中…';
- el.style.color = 'var(--muted)';
+ el.style.color = 'var(--muted, #94a3b8)';
try {
const data = await callApi('/api/callback-status?key=' + encodeURIComponent(key));
if (!data.configured) {
- el.textContent = '未配置（未设置 CALLBACK_BASE_URL，使用 WS 拉取消息）';
+ el.textContent = '未配置回调（AI 未接管）';
el.style.color = 'var(--muted, #94a3b8)';
return;
}
if (data.registered === true) {
- el.textContent = '已配置且已向 7006 注册成功，新消息将推送到: ' + (data.callback_url || '');
+ el.textContent = '回调已配置且注册成功（AI 已接管）';
el.style.color = 'var(--success, #22c55e)';
} else if (data.registered === false) {
- el.textContent = '已配置但向 7006 注册失败，请检查网络或 7006 服务。回调地址: ' + (data.callback_url || '');
+ el.textContent = '回调已配置但注册失败（AI 未接管）';
el.style.color = 'var(--danger, #ef4444)';
} else {
- el.textContent = '已配置，回调地址: ' + (data.callback_url || '');
+ el.textContent = '回调已配置（AI 接管状态未知，请检查 7006）';
el.style.color = 'var(--muted, #94a3b8)';
}
} catch (e) {
@@ -403,7 +382,7 @@
if (!key) { alert('请先登录'); return; }
sel.innerHTML = '';
try {
- const data = await callApi('/api/contact-list?key=' + encodeURIComponent(key), { cache: 'no-store' });
+ const data = await callApi('/api/contact-list?key=' + encodeURIComponent(key) + '&refresh=1', { cache: 'no-store' });
const list = data.items || [];
lastLoadedContactList = list;
if (data.error) {
@@ -862,7 +841,6 @@
}
$('btn-ai-reply-save').addEventListener('click', async () => { await saveAiReplyConfig(); loadAiReplyStatus(); });
$('btn-ai-reply-status') && $('btn-ai-reply-status').addEventListener('click', loadAiReplyStatus);
- $('btn-callback-status') && $('btn-callback-status').addEventListener('click', loadCallbackStatus);
$('btn-pt-add').addEventListener('click', addProductTag);
$('btn-push-group-add').addEventListener('click', createPushGroup);
$('btn-push-send').addEventListener('click', doPushSend);
diff --git a/run-docker.sh b/run-docker.sh
index d45cf73..1717c53 100755
--- a/run-docker.sh
+++ b/run-docker.sh
@@ -42,10 +42,16 @@ fi
mkdir -p "${HOST_DATA_DIR}"
echo "Data dir (host): ${HOST_DATA_DIR} -> container /app/backend/data"
-ENV_FILE=".env"
-if [ ! -f "${ENV_FILE}" ]; then
- echo "Env file ${ENV_FILE} not found, copying from .env.example ..."
- cp .env.example "${ENV_FILE}"
+# 优先使用 .env.prod 作为生产环境配置（例如在服务器上单独维护 CALLBACK_BASE_URL 等），
+# 若不存在则回退到 .env；再没有则从 .env.example 复制一份。
+if [ -f ".env.prod" ]; then
+ ENV_FILE=".env.prod"
+else
+ ENV_FILE=".env"
+ if [ ! -f "${ENV_FILE}" ]; then
+ echo "Env file ${ENV_FILE} not found, copying from .env.example ..."
+ cp .env.example "${ENV_FILE}"
+ fi
fi
echo "Running container ${CONTAINER_NAME} (frontend :${PORT}, backend :${BACKEND_PORT})..."
diff --git a/run-ngrok.sh b/run-ngrok.sh
index 4111649..cd28bf3 100755
--- a/run-ngrok.sh
+++ b/run-ngrok.sh
@@ -17,10 +17,10 @@ rm -f "$NGROK_LOG"
if curl -s -o /dev/null -w "%{http_code}" http://127.0.0.1:4040/api/tunnels 2>/dev/null | grep -q 200; then
echo "检测到 ngrok 已在运行（4040 可访问），直接读取 URL..."
else
- echo "启动 ngrok http 8000（后端需在 8000 端口，可先在本脚本之后另开终端运行 ./run-dev.sh）..."
+ echo "启动 ngrok http 8000（后端需在 8000 端口）..."
nohup ngrok http 8000 --log=stdout > "$NGROK_LOG" 2>&1 &
NGROK_PID=$!
- echo "等待 ngrok 就绪（最多 30 秒，并从日志解析 URL）..."
+ echo "等待 ngrok 就绪（最多 30 秒）..."
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30; do
if curl -s -o /dev/null -w "%{http_code}" http://127.0.0.1:4040/api/tunnels 2>/dev/null | grep -q 200; then
break
@@ -73,11 +73,9 @@ import sys, json
try:
d = json.load(sys.stdin)
tunnels = d.get('tunnels') if isinstance(d, dict) else (d if isinstance(d, list) else [])
- if not isinstance(tunnels, list):
- tunnels = []
+ if not isinstance(tunnels, list): tunnels = []
for t in tunnels:
- if not isinstance(t, dict):
- continue
+ if not isinstance(t, dict): continue
u = (t.get('public_url') or t.get('PublicURL') or '').strip()
if u.startswith('https://'):
print(u.rstrip('/'))
@@ -85,17 +83,11 @@ try:
else:
if tunnels:
u = (tunnels[0].get('public_url') or tunnels[0].get('PublicURL') or '').strip()
- if u:
- print(u.rstrip('/'))
-except Exception:
- pass
+ if u: print(u.rstrip('/'))
+except Exception: pass
" 2>/dev/null)
- if [ -z "$PUBLIC_URL" ]; then
- PUBLIC_URL=$(echo "$PAYLOAD" | grep -oE 'https://[a-zA-Z0-9][-a-zA-Z0-9.]*\.(ngrok-free\.app|ngrok\.io|ngrok-app\.com)[^"]*' | head -1 | sed 's|"$||')
- fi
- if [ -z "$PUBLIC_URL" ]; then
- PUBLIC_URL=$(echo "$PAYLOAD" | grep -oE '"public_url"\s*:\s*"https://[^"]+' | sed 's/.*"https:/https:/' | sed 's/"$//' | head -1)
- fi
+ [ -z "$PUBLIC_URL" ] && PUBLIC_URL=$(echo "$PAYLOAD" | grep -oE 'https://[a-zA-Z0-9][-a-zA-Z0-9.]*\.(ngrok-free\.app|ngrok\.io|ngrok-app\.com)[^"]*' | head -1 | sed 's|"$||')
+ [ -z "$PUBLIC_URL" ] && PUBLIC_URL=$(echo "$PAYLOAD" | grep -oE '"public_url"\s*:\s*"https://[^"]+' | sed 's/.*"https:/https:/' | sed 's/"$//' | head -1)
fi
if [ -z "$PUBLIC_URL" ]; then
diff --git a/run.sh b/run.sh
index c4edf69..e55e2d2 100644
--- a/run.sh
+++ b/run.sh
@@ -1,2 +1,63 @@
-sh ./run-ngrok.sh
-sh ./run-dev.sh
\ No newline at end of file
+#!/usr/bin/env bash
+# 统一启动：可选代理桥接 → ngrok 暴露回调 → 后端+前端
+set -e
+cd "$(dirname "$0")"
+
+# 用法
+usage() {
+ echo "用法: ./run.sh [--proxy-bridge]"
+ echo " --proxy-bridge 先启动本地代理桥接(8899→127.0.0.1:7890)，便于 7006 通过 ngrok 使用本机代理"
+ echo "无参数时仅: ngrok 暴露 8000 并写入 CALLBACK_BASE_URL → 启动 run-dev.sh"
+ echo ""
+ echo "注意: ngrok 免费版仅 1 个隧道，已用于 8000（回调）；代理需另开隧道或 cloudflared 暴露 8899 后填 .env。"
+}
+
+USE_PROXY_BRIDGE=0
+for arg in "$@"; do
+ case "$arg" in
+ -h|--help) usage; exit 0 ;;
+ --proxy-bridge) USE_PROXY_BRIDGE=1 ;;
+ esac
+done
+
+# 可选：启动本地代理桥接（8899 → 127.0.0.1:7890）
+if [ "$USE_PROXY_BRIDGE" = "1" ]; then
+ if [ ! -f "scripts/local_proxy_bridge.py" ]; then
+ echo "未找到 scripts/local_proxy_bridge.py，跳过代理桥接"
+ else
+ PYTHON="python3"
+ if [ -d ".venv" ]; then
+ PYTHON=".venv/bin/python"
+ fi
+ if ! lsof -i :8899 >/dev/null 2>&1; then
+ echo "启动本地代理桥接 :8899 → 127.0.0.1:7890 ..."
+ nohup "$PYTHON" scripts/local_proxy_bridge.py >> /tmp/proxy-bridge.log 2>&1 &
+ echo $! > /tmp/proxy-bridge.pid
+ sleep 1
+ echo " 已启动。若需 7006 走本机代理，需另用 ngrok 付费多隧道或 cloudflared 暴露 8899，将 URL 填入 .env 的 HTTP_PROXY。"
+ else
+ echo "端口 8899 已被占用，跳过代理桥接（可能已在运行）"
+ fi
+ fi
+fi
+
+# 退出时清理本脚本启动的代理桥接
+cleanup_proxy_bridge() {
+ if [ -f /tmp/proxy-bridge.pid ]; then
+ PID=$(cat /tmp/proxy-bridge.pid 2>/dev/null)
+ if [ -n "$PID" ] && kill -0 "$PID" 2>/dev/null; then
+ kill "$PID" 2>/dev/null || true
+ echo "已停止代理桥接 (PID $PID)"
+ fi
+ rm -f /tmp/proxy-bridge.pid
+ fi
+}
+trap cleanup_proxy_bridge EXIT
+
+# 1) ngrok 暴露 8000，写入 .env 的 CALLBACK_BASE_URL
+echo ">>> 配置 ngrok 回调地址..."
+sh ./run-ngrok.sh
+
+# 2) 启动后端 + 前端（run-dev.sh）
+echo ">>> 启动后端与前端..."
+sh ./run-dev.sh
diff --git a/scripts/expose-proxy-with-cloudflared.sh b/scripts/expose-proxy-with-cloudflared.sh
new file mode 100755
index 0000000..22e5486
--- /dev/null
+++ b/scripts/expose-proxy-with-cloudflared.sh
@@ -0,0 +1,65 @@
+#!/usr/bin/env bash
+# 用 cloudflared 暴露本机 8899（代理桥接），将公网 URL 写入 .env 的 HTTP_PROXY/HTTPS_PROXY
+# 前提：先在本机跑起代理桥接（python scripts/local_proxy_bridge.py）且 8899 可访问
+set -e
+cd "$(dirname "$0")/.."
+
+if ! command -v cloudflared >/dev/null 2>&1; then
+ echo "未检测到 cloudflared。请先安装："
+ echo " brew install cloudflared # macOS"
+ echo " 或 https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/download-and-install/install-cloudflared/"
+ exit 1
+fi
+
+LOG="/tmp/cloudflared-8899.log"
+rm -f "$LOG"
+
+echo "启动 cloudflared 隧道 -> http://127.0.0.1:8899 ..."
+cloudflared tunnel --url http://127.0.0.1:8899 > "$LOG" 2>&1 &
+CF_PID=$!
+echo $CF_PID > /tmp/cloudflared-8899.pid
+
+echo "等待隧道 URL（约 5–15 秒）..."
+PUBLIC_URL=""
+for i in $(seq 1 20); do
+ sleep 1
+ if [ -f "$LOG" ] && [ -s "$LOG" ]; then
+ PUBLIC_URL=$(grep -oE 'https://[a-zA-Z0-9][-a-zA-Z0-9.]*\.trycloudflare\.com' "$LOG" 2>/dev/null | head -1)
+ [ -z "$PUBLIC_URL" ] && PUBLIC_URL=$(grep -oE 'https://[^[:space:]]+trycloudflare\.com' "$LOG" 2>/dev/null | head -1)
+ if [ -n "$PUBLIC_URL" ]; then
+ break
+ fi
+ fi
+done
+
+if [ -z "$PUBLIC_URL" ]; then
+ echo "未从 cloudflared 输出解析到 URL。请查看: cat $LOG"
+ kill $CF_PID 2>/dev/null || true
+ rm -f /tmp/cloudflared-8899.pid
+ exit 1
+fi
+
+echo "隧道地址: $PUBLIC_URL"
+
+# 写入 .env
+ENV_FILE=".env"
+touch "$ENV_FILE"
+_upsert() {
+ local key="$1" val="$2"
+ if grep -q "^${key}=" "$ENV_FILE" 2>/dev/null; then
+ if [[ "$(uname)" == "Darwin" ]]; then
+ sed -i '' "s|^${key}=.*|${key}=${val}|" "$ENV_FILE"
+ else
+ sed -i "s|^${key}=.*|${key}=${val}|" "$ENV_FILE"
+ fi
+ else
+ echo "${key}=${val}" >> "$ENV_FILE"
+ fi
+}
+_upsert "HTTP_PROXY" "$PUBLIC_URL"
+_upsert "HTTPS_PROXY" "$PUBLIC_URL"
+echo "已写入 $ENV_FILE: HTTP_PROXY / HTTPS_PROXY = $PUBLIC_URL"
+
+echo ""
+echo "cloudflared 已在后台运行 (PID $CF_PID)。停止: kill $CF_PID 或 kill \$(cat /tmp/cloudflared-8899.pid)"
+echo "请重启本项目的后端使代理生效；7006 将经此地址使用你的本机代理(8899->7890)。"
diff --git a/scripts/local_proxy_bridge.py b/scripts/local_proxy_bridge.py
new file mode 100644
index 0000000..c0a9d16
--- /dev/null
+++ b/scripts/local_proxy_bridge.py
@@ -0,0 +1,148 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+本地代理桥接：在本机起一个 HTTP 代理端口，把请求转发到本机真实代理（如 127.0.0.1:7890）。
+再用 ngrok 暴露该端口，把 ngrok 公网地址填给 7006 的 Proxy，7006 即可通过你的本地代理出网。
+
+用法:
+ python scripts/local_proxy_bridge.py
+ # 默认监听 0.0.0.0:8899，上游代理 127.0.0.1:7890（本机 Clash/V2Ray 等）
+ # 再开一个终端: ngrok http 8899 （或 ngrok tcp 8899，则填 http://0.tcp.ngrok.io:端口）
+ # 把 ngrok 生成的公网 URL 填到 .env 的 HTTP_PROXY / HTTPS_PROXY，7006 即可通过你的本机代理出网
+
+环境变量（可选）:
+ PROXY_BRIDGE_LISTEN=0.0.0.0:8899 # 监听地址
+ PROXY_BRIDGE_UPSTREAM=127.0.0.1:7890 # 上游代理（本机 Clash/V2Ray 等）
+"""
+
+import asyncio
+import os
+import sys
+
+# 可选：把项目根加入 path
+_SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+_ROOT = os.path.dirname(_SCRIPT_DIR)
+if _ROOT not in sys.path:
+ sys.path.insert(0, _ROOT)
+
+
+def _parse_addr(s: str, default_host: str, default_port: int):
+ s = (s or "").strip()
+ if not s:
+ return default_host, default_port
+ if ":" in s:
+ host, _, port = s.rpartition(":")
+ return host or default_host, int(port) if port else default_port
+ return default_host, int(s) if s.isdigit() else default_port
+
+
+async def _relay(reader: asyncio.StreamReader, writer: asyncio.StreamWriter):
+ """双向转发：reader -> writer 直到 EOF。"""
+ try:
+ while True:
+ data = await reader.read(65536)
+ if not data:
+ break
+ writer.write(data)
+ await writer.drain()
+ except (ConnectionResetError, BrokenPipeError, asyncio.CancelledError):
+ pass
+ finally:
+ try:
+ writer.close()
+ await writer.wait_closed()
+ except Exception:
+ pass
+
+
+async def _handle_client(
+ client_reader: asyncio.StreamReader,
+ client_writer: asyncio.StreamWriter,
+ upstream_host: str,
+ upstream_port: int,
+):
+ """处理一个客户端连接：把首包（CONNECT/GET 等）转发到上游代理，再双向 relay。"""
+ try:
+ # 读首行 + headers（到 \r\n\r\n）
+ first_line = await client_reader.readline()
+ if not first_line:
+ return
+ header_lines = []
+ while True:
+ line = await client_reader.readline()
+ if line in (b"\r\n", b"\n"):
+ break
+ header_lines.append(line)
+
+ request_head = first_line + b"".join(header_lines) + b"\r\n"
+
+ # 连上游代理
+ try:
+ up_reader, up_writer = await asyncio.wait_for(
+ asyncio.open_connection(upstream_host, upstream_port), timeout=10.0
+ )
+ except Exception as e:
+ print(f"[proxy-bridge] upstream connect failed: {e}", flush=True)
+ client_writer.write(
+ b"HTTP/1.1 502 Bad Gateway\r\nConnection: close\r\n\r\n"
+ b"Upstream proxy connect failed"
+ )
+ await client_writer.drain()
+ client_writer.close()
+ return
+
+ # 把请求头发给上游
+ up_writer.write(request_head)
+ await up_writer.drain()
+
+ # CONNECT 时上游会先回 200 Connection Established，需要把这部分先读完并回给客户端，再双向 relay
+ # 非 CONNECT 时上游直接回响应，也要先读完并回给客户端
+ # 为简单起见：先读上游的响应头（到 \r\n\r\n），转发给客户端，然后双向 relay 剩余 body/隧道
+ up_buf = b""
+ while b"\r\n\r\n" not in up_buf and len(up_buf) < 65536:
+ chunk = await up_reader.read(4096)
+ if not chunk:
+ break
+ up_buf += chunk
+ if up_buf:
+ client_writer.write(up_buf)
+ await client_writer.drain()
+
+ # 双向转发剩余数据（CONNECT 隧道或响应 body）
+ await asyncio.gather(
+ _relay(client_reader, up_writer),
+ _relay(up_reader, client_writer),
+ )
+ except Exception as e:
+ print(f"[proxy-bridge] handle error: {e}", flush=True)
+ finally:
+ try:
+ client_writer.close()
+ await client_writer.wait_closed()
+ except Exception:
+ pass
+
+
+async def _run(listen_host: str, listen_port: int, upstream_host: str, upstream_port: int):
+ server = await asyncio.start_server(
+ lambda r, w: _handle_client(r, w, upstream_host, upstream_port),
+ listen_host,
+ listen_port,
+ )
+ addrs = ", ".join(str(s.getsockname()) for s in server.sockets)
+ print(f"[proxy-bridge] listening on {addrs}, upstream={upstream_host}:{upstream_port}", flush=True)
+ print(f"[proxy-bridge] expose with: ngrok http {listen_port}", flush=True)
+ async with server:
+ await server.serve_forever()
+
+
+def main():
+ listen_spec = os.environ.get("PROXY_BRIDGE_LISTEN", "0.0.0.0:8899")
+ upstream_spec = os.environ.get("PROXY_BRIDGE_UPSTREAM", "127.0.0.1:7890")
+ listen_host, listen_port = _parse_addr(listen_spec, "0.0.0.0", 8899)
+ upstream_host, upstream_port = _parse_addr(upstream_spec, "127.0.0.1", 7890)
+ asyncio.run(_run(listen_host, listen_port, upstream_host, upstream_port))
+
+
+if __name__ == "__main__":
+ main()