mslxdff 0.1.203 → 0.1.207

package/src/routes/peers.js

@@ -5,7 +5,6 @@ import { runHook } from "../plugins.js";
 import { buildShareKeysHeader, SHARE_KEYS_HEADER } from "../providers/share-keys.js";
 import { compatFetch, timeoutSignal, getUndici } from "../compat.js";
 
-const PEER_TIMEOUT_MS = 30_000;
 // peer 阶段总预算：三批候选（ordered / orderedByLastError / coolingByLastError）共享同一个
 // 截止时间，而不是每批各吃满一次等头超时。实测最坏路径是三批串行各 30s（≈90s），
 // 客户端表现为"随机转圈"；预算到点即停，把余下时间还给本地兜底。
@@ -21,6 +20,15 @@ import { summarizeRequest } from "../model-trace.js";
 const PEER_BODY_TIMEOUT_MS = 120_000;
 export { PEER_BODY_TIMEOUT_MS };
 
+// undici dispatcher 的「收到响应头」时限（headersTimeout）。**必须与 bodyTimeout 同档**：组员节点
+// 自己也压着响应头等首块（ADR-0043 首块前不 flush），undici 层若是 30s，连接会在组建还没吐头时被
+// 掐成 `fetch failed (UND_ERR_HEADERS_TIMEOUT)` —— 实测三个组员全部精确卡 ~30620ms abort，组网
+// 兜底退化成「每次白等 30s」（BUG-1 的 dispatcher 层残留：当时只改了应用层 abort 定时器，漏了这行）。
+// 提到 120s 不会让请求真的挂 120s：真正的闸门是应用层 peer 阶段总预算（peerStageCtx，缺省 45s），
+// 到点即 abort；undici 只做最后兜底，与本文件 PEER_BODY_TIMEOUT_MS / forwardToPeer 的等待上限同口径。
+const PEER_HEADERS_TIMEOUT_MS = PEER_BODY_TIMEOUT_MS;
+export { PEER_HEADERS_TIMEOUT_MS };
+
 function peerConnectTimeoutMs() {
   const n = Number(process.env.MSLXDFF_PEER_CONNECT_TIMEOUT_MS);
   return Number.isInteger(n) && n > 0 ? n : DEFAULT_PEER_CONNECT_TIMEOUT_MS;
@@ -59,7 +67,7 @@ export function getPeerDispatcher() {
   try {
     peerDispatcher = new Agent({
       connect: { timeout: peerConnectTimeoutMs() },
-      headersTimeout: PEER_TIMEOUT_MS,
+      headersTimeout: PEER_HEADERS_TIMEOUT_MS,
       bodyTimeout: PEER_BODY_TIMEOUT_MS,
       keepAliveTimeout: 30_000,
       keepAliveMaxTimeout: 60_000,

package/src/routes/relay-queue.js

@@ -1,181 +1,181 @@
-import { loadGroupsJoined } from "../state.js";
-import { compatFetch } from "../compat.js";
-
-const relayPending = new Map();
-const relayPendingByReqId = new Map();
-const streamSubscribers = new Map(); // key group::target -> Set<res>
-
-function streamKey(group, target) { return `${group}::${target}`; }
-
-export function subscribeStream({ group, target, res }) {
-  const k = streamKey(group, target);
-  const set = streamSubscribers.get(k) || new Set();
-  set.add(res);
-  streamSubscribers.set(k, set);
-}
-
-export function unsubscribeStream({ group, target, res }) {
-  const k = streamKey(group, target);
-  const set = streamSubscribers.get(k);
-  if (!set) return;
-  set.delete(res);
-  if (set.size === 0) streamSubscribers.delete(k);
-}
-
-export function clearStreamSubscribers() { streamSubscribers.clear(); }
-export function getStreamSubscribers() { return streamSubscribers; }
-
-export function pushToStream({ group, target, entry }) {
-  const k = streamKey(group, target);
-  const set = streamSubscribers.get(k);
-  if (!set || set.size === 0) return false;
-  const payload = JSON.stringify({ reqId: entry.reqId, body: entry.body, hops: entry.hops });
-  const frame = `event: relay\ndata: ${payload}\n\n`;
-  let pushed = 0;
-  for (const res of [...set]) {
-    try {
-      res.write(frame);
-      pushed++;
-    } catch {
-      set.delete(res);
-    }
-  }
-  if (set.size === 0) streamSubscribers.delete(k);
-  return pushed > 0;
-}
-
-export function enqueueRelay({ group, target, reqId, body, hops }) {
-  const key = `${group}::${target}`;
-  // try stream push first — if any subscriber, push and don't enqueue to poll queue
-  const entryForPush = { reqId, body, hops };
-  if (pushToStream({ group, target, entry: entryForPush })) {
-    return new Promise((resolve, reject) => {
-      const timer = setTimeout(() => {
-        relayPendingByReqId.delete(reqId);
-        reject(new Error("relay timeout"));
-      }, 30_000);
-      timer.unref?.();
-      const entry = { reqId, body, hops, resolve, reject, timer };
-      relayPendingByReqId.set(reqId, entry);
-    });
-  }
-  const list = relayPending.get(key) || [];
-  return new Promise((resolve, reject) => {
-    const timer = setTimeout(() => {
-      const idx = list.findIndex((e) => e.reqId === reqId);
-      if (idx >= 0) list.splice(idx, 1);
-      relayPendingByReqId.delete(reqId);
-      reject(new Error("relay timeout"));
-    }, 30_000);
-    timer.unref?.();
-    const entry = { reqId, body, hops, resolve, reject, timer };
-    list.push(entry);
-    relayPending.set(key, list);
-    relayPendingByReqId.set(reqId, entry);
-  });
-}
-
-export function dequeueRelayForPoll({ group, target, limit = 10 }) {
-  const key = `${group}::${target}`;
-  const list = relayPending.get(key) || [];
-  const batch = list.splice(0, limit);
-  if (list.length) relayPending.set(key, list);
-  else relayPending.delete(key);
-  return batch.map((e) => ({ reqId: e.reqId, body: e.body, hops: e.hops }));
-}
-
-export function resolveRelay(reqId, result) {
-  const entry = relayPendingByReqId.get(reqId);
-  if (!entry) return false;
-  clearTimeout(entry.timer);
-  relayPendingByReqId.delete(reqId);
-  entry.resolve(result);
-  return true;
-}
-
-export function getRelayPending() { return relayPending; }
-export function getRelayPendingByReqId() { return relayPendingByReqId; }
-
-export async function tryBroadbandRelay({ groups, token: myToken, model, body, hops, bus, logs, reqId, evt, res, mark, perf0, stages }) {
-  try {
-    const joined = loadGroupsJoined();
-    const broadbandGroups = joined.filter((g) => g.kind === "broadband" || g.myUrl?.startsWith("relay://"));
-    const allCandidates = [];
-    if (groups) {
-      const localGroups = groups.list();
-      for (const [gName, g] of Object.entries(localGroups)) {
-        for (const [id, m] of Object.entries(g.members || {})) {
-          if (id === "leader") continue;
-          const isBb = m?.kind === "broadband" || String(m?.url || "").startsWith("relay://");
-          if (!isBb) continue;
-          const staleMs = Number(process.env.MSLXDFF_BROADBAND_STALE_MS) > 0 ? Number(process.env.MSLXDFF_BROADBAND_STALE_MS) : 90_000;
-          if (typeof m.lastSeen === "number" && Date.now() - m.lastSeen > staleMs) continue;
-          allCandidates.push({ group: gName, target: m.url, member: m, via: "local-leader", leaderUrl: null });
-        }
-      }
-    }
-    for (const g of joined) {
-      if (!g.leaderUrl) continue;
-      try {
-        const controller = new AbortController();
-        const timer = setTimeout(() => controller.abort(), 5000);
-        const r = await compatFetch(`${g.leaderUrl}/v1/groups/join`, {
-          method: "POST",
-          headers: { "Content-Type": "application/json", "Authorization": `Bearer ${myToken}` },
-          body: JSON.stringify({ name: g.name, memberName: g.memberName, url: g.myUrl, token: myToken }),
-          signal: controller.signal,
-        });
-        clearTimeout(timer);
-        if (!r.ok) continue;
-        const data = await r.json().catch(() => ({}));
-        const members = data.members || {};
-        for (const [id, m] of Object.entries(members)) {
-          if (id === "leader") continue;
-          const isBb = m?.kind === "broadband" || String(m?.url || "").startsWith("relay://");
-          if (!isBb) continue;
-          if (m.url === g.myUrl) continue;
-          const staleMs = Number(process.env.MSLXDFF_BROADBAND_STALE_MS) > 0 ? Number(process.env.MSLXDFF_BROADBAND_STALE_MS) : 90_000;
-          if (typeof m.lastSeen === "number" && Date.now() - m.lastSeen > staleMs) continue;
-          allCandidates.push({ group: g.name, target: m.url, member: m, via: "via-leader", leaderUrl: g.leaderUrl });
-        }
-      } catch {}
-    }
-    if (!allCandidates.length) return null;
-    for (const cand of allCandidates) {
-      try {
-        evt?.("relay-try", { reqId, model, via: cand.via, target: cand.target, group: cand.group });
-        if (!cand.leaderUrl) {
-          const fwdBody = { model, ...body, model };
-          const reqIdLocal = `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 6)}`;
-          const promise = enqueueRelay({ group: cand.group, target: cand.target, reqId: reqIdLocal, body: fwdBody, hops });
-          const result = await promise;
-          if (result && result.status) {
-            return { via: "broadband-local", result, target: cand.target, group: cand.group };
-          }
-        } else {
-          const ctrl = new AbortController();
-          const t = setTimeout(() => ctrl.abort(), 35_000);
-          const r = await compatFetch(`${cand.leaderUrl}/v1/groups/relay/forward`, {
-            method: "POST",
-            headers: { "Content-Type": "application/json", "Authorization": `Bearer ${myToken}`, "x-mslxdff-hops": String(hops + 1) },
-            body: JSON.stringify({ group: cand.group, target: cand.target, body: { ...body, model }, hops: hops + 1, reqId }),
-            signal: ctrl.signal,
-          });
-          clearTimeout(t);
-          if (!r.ok) {
-            const txt = await r.text().catch(() => "");
-            evt?.("relay-fail", { reqId, model, via: cand.via, target: cand.target, status: r.status, message: txt.slice(0, 200) });
-            continue;
-          }
-          return { via: "broadband-via-leader", result: r, target: cand.target, group: cand.group };
-        }
-      } catch (err) {
-        evt?.("relay-fail", { reqId, model, via: cand.via, target: cand.target, message: String(err?.message || err).slice(0, 200) });
-        continue;
-      }
-    }
-    return null;
-  } catch {
-    return null;
-  }
-}
+import { loadGroupsJoined } from "../state.js";
+import { compatFetch } from "../compat.js";
+
+const relayPending = new Map();
+const relayPendingByReqId = new Map();
+const streamSubscribers = new Map(); // key group::target -> Set<res>
+
+function streamKey(group, target) { return `${group}::${target}`; }
+
+export function subscribeStream({ group, target, res }) {
+  const k = streamKey(group, target);
+  const set = streamSubscribers.get(k) || new Set();
+  set.add(res);
+  streamSubscribers.set(k, set);
+}
+
+export function unsubscribeStream({ group, target, res }) {
+  const k = streamKey(group, target);
+  const set = streamSubscribers.get(k);
+  if (!set) return;
+  set.delete(res);
+  if (set.size === 0) streamSubscribers.delete(k);
+}
+
+export function clearStreamSubscribers() { streamSubscribers.clear(); }
+export function getStreamSubscribers() { return streamSubscribers; }
+
+export function pushToStream({ group, target, entry }) {
+  const k = streamKey(group, target);
+  const set = streamSubscribers.get(k);
+  if (!set || set.size === 0) return false;
+  const payload = JSON.stringify({ reqId: entry.reqId, body: entry.body, hops: entry.hops });
+  const frame = `event: relay\ndata: ${payload}\n\n`;
+  let pushed = 0;
+  for (const res of [...set]) {
+    try {
+      res.write(frame);
+      pushed++;
+    } catch {
+      set.delete(res);
+    }
+  }
+  if (set.size === 0) streamSubscribers.delete(k);
+  return pushed > 0;
+}
+
+export function enqueueRelay({ group, target, reqId, body, hops }) {
+  const key = `${group}::${target}`;
+  // try stream push first — if any subscriber, push and don't enqueue to poll queue
+  const entryForPush = { reqId, body, hops };
+  if (pushToStream({ group, target, entry: entryForPush })) {
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        relayPendingByReqId.delete(reqId);
+        reject(new Error("relay timeout"));
+      }, 30_000);
+      timer.unref?.();
+      const entry = { reqId, body, hops, resolve, reject, timer };
+      relayPendingByReqId.set(reqId, entry);
+    });
+  }
+  const list = relayPending.get(key) || [];
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => {
+      const idx = list.findIndex((e) => e.reqId === reqId);
+      if (idx >= 0) list.splice(idx, 1);
+      relayPendingByReqId.delete(reqId);
+      reject(new Error("relay timeout"));
+    }, 30_000);
+    timer.unref?.();
+    const entry = { reqId, body, hops, resolve, reject, timer };
+    list.push(entry);
+    relayPending.set(key, list);
+    relayPendingByReqId.set(reqId, entry);
+  });
+}
+
+export function dequeueRelayForPoll({ group, target, limit = 10 }) {
+  const key = `${group}::${target}`;
+  const list = relayPending.get(key) || [];
+  const batch = list.splice(0, limit);
+  if (list.length) relayPending.set(key, list);
+  else relayPending.delete(key);
+  return batch.map((e) => ({ reqId: e.reqId, body: e.body, hops: e.hops }));
+}
+
+export function resolveRelay(reqId, result) {
+  const entry = relayPendingByReqId.get(reqId);
+  if (!entry) return false;
+  clearTimeout(entry.timer);
+  relayPendingByReqId.delete(reqId);
+  entry.resolve(result);
+  return true;
+}
+
+export function getRelayPending() { return relayPending; }
+export function getRelayPendingByReqId() { return relayPendingByReqId; }
+
+export async function tryBroadbandRelay({ groups, token: myToken, model, body, hops, bus, logs, reqId, evt, res, mark, perf0, stages }) {
+  try {
+    const joined = loadGroupsJoined();
+    const broadbandGroups = joined.filter((g) => g.kind === "broadband" || g.myUrl?.startsWith("relay://"));
+    const allCandidates = [];
+    if (groups) {
+      const localGroups = groups.list();
+      for (const [gName, g] of Object.entries(localGroups)) {
+        for (const [id, m] of Object.entries(g.members || {})) {
+          if (id === "leader") continue;
+          const isBb = m?.kind === "broadband" || String(m?.url || "").startsWith("relay://");
+          if (!isBb) continue;
+          const staleMs = Number(process.env.MSLXDFF_BROADBAND_STALE_MS) > 0 ? Number(process.env.MSLXDFF_BROADBAND_STALE_MS) : 90_000;
+          if (typeof m.lastSeen === "number" && Date.now() - m.lastSeen > staleMs) continue;
+          allCandidates.push({ group: gName, target: m.url, member: m, via: "local-leader", leaderUrl: null });
+        }
+      }
+    }
+    for (const g of joined) {
+      if (!g.leaderUrl) continue;
+      try {
+        const controller = new AbortController();
+        const timer = setTimeout(() => controller.abort(), 5000);
+        const r = await compatFetch(`${g.leaderUrl}/v1/groups/join`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json", "Authorization": `Bearer ${myToken}` },
+          body: JSON.stringify({ name: g.name, memberName: g.memberName, url: g.myUrl, token: myToken }),
+          signal: controller.signal,
+        });
+        clearTimeout(timer);
+        if (!r.ok) continue;
+        const data = await r.json().catch(() => ({}));
+        const members = data.members || {};
+        for (const [id, m] of Object.entries(members)) {
+          if (id === "leader") continue;
+          const isBb = m?.kind === "broadband" || String(m?.url || "").startsWith("relay://");
+          if (!isBb) continue;
+          if (m.url === g.myUrl) continue;
+          const staleMs = Number(process.env.MSLXDFF_BROADBAND_STALE_MS) > 0 ? Number(process.env.MSLXDFF_BROADBAND_STALE_MS) : 90_000;
+          if (typeof m.lastSeen === "number" && Date.now() - m.lastSeen > staleMs) continue;
+          allCandidates.push({ group: g.name, target: m.url, member: m, via: "via-leader", leaderUrl: g.leaderUrl });
+        }
+      } catch {}
+    }
+    if (!allCandidates.length) return null;
+    for (const cand of allCandidates) {
+      try {
+        evt?.("relay-try", { reqId, model, via: cand.via, target: cand.target, group: cand.group });
+        if (!cand.leaderUrl) {
+          const fwdBody = { model, ...body, model };
+          const reqIdLocal = `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 6)}`;
+          const promise = enqueueRelay({ group: cand.group, target: cand.target, reqId: reqIdLocal, body: fwdBody, hops });
+          const result = await promise;
+          if (result && result.status) {
+            return { via: "broadband-local", result, target: cand.target, group: cand.group };
+          }
+        } else {
+          const ctrl = new AbortController();
+          const t = setTimeout(() => ctrl.abort(), 35_000);
+          const r = await compatFetch(`${cand.leaderUrl}/v1/groups/relay/forward`, {
+            method: "POST",
+            headers: { "Content-Type": "application/json", "Authorization": `Bearer ${myToken}`, "x-mslxdff-hops": String(hops + 1) },
+            body: JSON.stringify({ group: cand.group, target: cand.target, body: { ...body, model }, hops: hops + 1, reqId }),
+            signal: ctrl.signal,
+          });
+          clearTimeout(t);
+          if (!r.ok) {
+            const txt = await r.text().catch(() => "");
+            evt?.("relay-fail", { reqId, model, via: cand.via, target: cand.target, status: r.status, message: txt.slice(0, 200) });
+            continue;
+          }
+          return { via: "broadband-via-leader", result: r, target: cand.target, group: cand.group };
+        }
+      } catch (err) {
+        evt?.("relay-fail", { reqId, model, via: cand.via, target: cand.target, message: String(err?.message || err).slice(0, 200) });
+        continue;
+      }
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}

package/src/routes/relay.js

@@ -1,60 +1,60 @@
-import { readBody, json, authorized } from "./helpers.js";
-import { compatFetch } from "../compat.js";
-
-// POST /v1/relay  纯网络中继：A 把 targetUrl+headers+body 发给 B，B 原样 fetch 到上游再回给 A
-// B 侧不查本地 providerConfigs、不做 model 前缀路由、不验 allowlist，仅当 TCP 出口
-// 鉴权：复用全局 Bearer token（peer.token），与 /v1/chat/completions 同级，避免任意 SSRF
-export async function relayHandler({ req, res, token }) {
-  if (!authorized(req, token)) {
-    res.statusCode = 401;
-    res.setHeader("WWW-Authenticate", "Bearer");
-    return json(res, 401, { error: "Unauthorized" });
-  }
-  let body;
-  try { body = await readBody(req); } catch { return json(res, 400, { error: "Invalid JSON body" }); }
-  const targetUrl = String(body.targetUrl || body.url || "").trim();
-  const method = String(body.method || "POST").toUpperCase();
-  const headers = body.headers && typeof body.headers === "object" ? body.headers : {};
-  const rawBody = body.body ?? body.payload ?? null;
-
-  if (!targetUrl) return json(res, 400, { error: "targetUrl is required" });
-  let u;
-  try { u = new URL(targetUrl); } catch { return json(res, 400, { error: "invalid targetUrl" }); }
-  if (u.protocol !== "https:" && u.protocol !== "http:") return json(res, 400, { error: "targetUrl must be http(s)" });
-  // 简单 SSRF 防护：禁止回环与内网段（除 127.0.0.1:8989 本身已鉴权，仍放行）
-  // 允许外网 https 上游（如 https://api.bai.com、https://opencode.ai），禁止 10/172.16/192.168
-  const host = u.hostname;
-  if (/^(10\.|192\.168\.|172\.(1[6-9]|2\d|3[0-1])\.)/.test(host) && host !== "127.0.0.1" && host !== "localhost") {
-    // 仍允许，因为组员可能是内网 IP 的上游（如自建网关），仅告警不拦
-  }
-
-  // 透传头：只放行受控头，避免把内部头（如 x-mslxdff-*）误带给上游
-  const allowHeaders = new Set(["authorization", "content-type", "accept", "user-agent", "x-client-type", "x-platform", "x-task-id", "x-user-id", "x-domain", "x-enterprise-id", "x-tenant-id", "origin", "referer"]);
-  const fwdHeaders = {};
-  for (const [k, v] of Object.entries(headers)) {
-    const lk = String(k).toLowerCase();
-    if (allowHeaders.has(lk) && typeof v === "string" && v) fwdHeaders[k] = v;
-  }
-  // 强制 JSON
-  if (!fwdHeaders["Content-Type"] && !fwdHeaders["content-type"]) fwdHeaders["Content-Type"] = "application/json";
-  if (!fwdHeaders["Accept"] && !fwdHeaders["accept"]) fwdHeaders["Accept"] = "application/json";
-
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(new Error("relay timeout 30000ms")), 30000);
-  try {
-    const fetchBody = rawBody == null ? undefined : (typeof rawBody === "string" ? rawBody : JSON.stringify(rawBody));
-    const r = await compatFetch(targetUrl, { method, headers: fwdHeaders, body: fetchBody, signal: controller.signal });
-    const txt = await r.text();
-    // 原样回透：状态码 + 头（仅透 content-type） + body
-    res.statusCode = r.status;
-    const ct = r.headers.get("content-type");
-    if (ct) res.setHeader("content-type", ct);
-    // 额外回透上游错误码便于 bench 区分
-    res.setHeader("x-mslxdff-relay-status", String(r.status));
-    return res.end(txt);
-  } catch (e) {
-    const msg = String(e?.message || e);
-    const isTimeout = /timeout|abort/i.test(msg);
-    return json(res, 502, { error: isTimeout ? "relay timeout" : `relay fetch failed: ${msg.slice(0, 300)}` });
-  } finally { clearTimeout(timer); }
-}
+import { readBody, json, authorized } from "./helpers.js";
+import { compatFetch } from "../compat.js";
+
+// POST /v1/relay  纯网络中继：A 把 targetUrl+headers+body 发给 B，B 原样 fetch 到上游再回给 A
+// B 侧不查本地 providerConfigs、不做 model 前缀路由、不验 allowlist，仅当 TCP 出口
+// 鉴权：复用全局 Bearer token（peer.token），与 /v1/chat/completions 同级，避免任意 SSRF
+export async function relayHandler({ req, res, token }) {
+  if (!authorized(req, token)) {
+    res.statusCode = 401;
+    res.setHeader("WWW-Authenticate", "Bearer");
+    return json(res, 401, { error: "Unauthorized" });
+  }
+  let body;
+  try { body = await readBody(req); } catch { return json(res, 400, { error: "Invalid JSON body" }); }
+  const targetUrl = String(body.targetUrl || body.url || "").trim();
+  const method = String(body.method || "POST").toUpperCase();
+  const headers = body.headers && typeof body.headers === "object" ? body.headers : {};
+  const rawBody = body.body ?? body.payload ?? null;
+
+  if (!targetUrl) return json(res, 400, { error: "targetUrl is required" });
+  let u;
+  try { u = new URL(targetUrl); } catch { return json(res, 400, { error: "invalid targetUrl" }); }
+  if (u.protocol !== "https:" && u.protocol !== "http:") return json(res, 400, { error: "targetUrl must be http(s)" });
+  // 简单 SSRF 防护：禁止回环与内网段（除 127.0.0.1:8989 本身已鉴权，仍放行）
+  // 允许外网 https 上游（如 https://api.bai.com、https://opencode.ai），禁止 10/172.16/192.168
+  const host = u.hostname;
+  if (/^(10\.|192\.168\.|172\.(1[6-9]|2\d|3[0-1])\.)/.test(host) && host !== "127.0.0.1" && host !== "localhost") {
+    // 仍允许，因为组员可能是内网 IP 的上游（如自建网关），仅告警不拦
+  }
+
+  // 透传头：只放行受控头，避免把内部头（如 x-mslxdff-*）误带给上游
+  const allowHeaders = new Set(["authorization", "content-type", "accept", "user-agent", "x-client-type", "x-platform", "x-task-id", "x-user-id", "x-domain", "x-enterprise-id", "x-tenant-id", "origin", "referer"]);
+  const fwdHeaders = {};
+  for (const [k, v] of Object.entries(headers)) {
+    const lk = String(k).toLowerCase();
+    if (allowHeaders.has(lk) && typeof v === "string" && v) fwdHeaders[k] = v;
+  }
+  // 强制 JSON
+  if (!fwdHeaders["Content-Type"] && !fwdHeaders["content-type"]) fwdHeaders["Content-Type"] = "application/json";
+  if (!fwdHeaders["Accept"] && !fwdHeaders["accept"]) fwdHeaders["Accept"] = "application/json";
+
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(new Error("relay timeout 30000ms")), 30000);
+  try {
+    const fetchBody = rawBody == null ? undefined : (typeof rawBody === "string" ? rawBody : JSON.stringify(rawBody));
+    const r = await compatFetch(targetUrl, { method, headers: fwdHeaders, body: fetchBody, signal: controller.signal });
+    const txt = await r.text();
+    // 原样回透：状态码 + 头（仅透 content-type） + body
+    res.statusCode = r.status;
+    const ct = r.headers.get("content-type");
+    if (ct) res.setHeader("content-type", ct);
+    // 额外回透上游错误码便于 bench 区分
+    res.setHeader("x-mslxdff-relay-status", String(r.status));
+    return res.end(txt);
+  } catch (e) {
+    const msg = String(e?.message || e);
+    const isTimeout = /timeout|abort/i.test(msg);
+    return json(res, 502, { error: isTimeout ? "relay timeout" : `relay fetch failed: ${msg.slice(0, 300)}` });
+  } finally { clearTimeout(timer); }
+}