mslxdff 0.1.231 → 0.1.233

package/src/routes/chat/broadband-handler.js

@@ -1,80 +1,80 @@
-import { relay, SLOW_TOTAL_MS, STREAM_TIMEOUT_MS, STALL_TIMEOUT_MS, SCORE_STALL_MS } from "../stream.js";
-import { buildFallbackInfo } from "../fallback.js";
-import { createRelayPipeline } from "./relay-pipeline.js";
-import { tryBroadbandRelay } from "../relay-queue.js";
-import { overForwardLimit, contextGuardMessage } from "../../chat-pipeline/context-guard.js";
-
-/** 薄适配：broadband 两种形态合一经由 pipeline */
-export async function handleBroadbandRelay({
-  model,
-  body,
-  hops,
-  lastErr,
-  requested,
-  useAuto,
-  lockModel,
-  auto,
-  groups,
-  token,
-  bus,
-  logs,
-  handlerCtx,
-  evt,
-  mark,
-  perf0,
-  attemptStartMs,
-  stages,
-  res,
-  startedAt,
-  plugins,
-  deps = {},
-}) {
-  const { createPipeline = createRelayPipeline, tryBroadbandRelay: tryRelay = tryBroadbandRelay } = deps;
-  // 转发前上下文预检：宽带成员是完全不同的另一台机器，上下文撑爆的代价（白烧它的额度）最实在。
-  const guard = overForwardLimit(body);
-  if (guard) {
-    const msg = contextGuardMessage(guard);
-    evt("context-guard", { reqId: handlerCtx.reqId, model, via: "broadband", estimated: guard.estimated, limit: guard.limit, over: guard.over });
-    return { handled: false, lastErr: { model, upstream: null, status: 400, message: msg, contextGuard: true } };
-  }
-  const bb = await tryRelay({ groups, token, model, body, hops, bus, logs, reqId: handlerCtx.reqId, evt, res, mark, perf0, stages });
-  if (!bb) {
-    evt("relay-miss", { reqId: handlerCtx.reqId, model });
-    return { handled: false };
-  }
-  const pipeline = createPipeline({
-    relay,
-    buildFallbackInfo,
-    auto,
-    plugins,
-    evt,
-    mark,
-    logCall: () => {},
-    logError: () => {},
-    constants: { STREAM_TIMEOUT_MS, SLOW_TOTAL_MS, STALL_TIMEOUT_MS, SCORE_STALL_MS },
-    startedAt,
-    stages,
-  });
-  const isResponse = bb.result && typeof bb.result.status === "number" && typeof bb.result.headers?.get === "function";
-  if (isResponse) {
-    const r = await pipeline.execute({ res, upRes: bb.result, body, requested, actual: model, lastErr, via: "broadband", lockModel, useAuto, handlerCtx, mark, perf0, attemptStartMs, stages, startedAt });
-    if (!r.handled) return { handled: false, upRes: null, lastErr: r.lastErr };
-    return { handled: true };
-  }
-  if (bb.result && typeof bb.result.status === "number") {
-    const b = bb.result.body || "";
-    const str = typeof b === "string" ? b : JSON.stringify(b);
-    const isSSE = bb.result.headers?.["Content-Type"]?.includes("text/event-stream");
-    const fakeRes = {
-      status: bb.result.status,
-      headers: { get: (k) => bb.result.headers?.[k] || bb.result.headers?.[k.toLowerCase()] || null },
-      text: async () => str,
-      body: isSSE ? (async function* () { yield Buffer.from(str); })() : null,
-    };
-    const r = await pipeline.execute({ res, upRes: fakeRes, body, requested, actual: model, lastErr, via: "broadband-local", lockModel, useAuto, handlerCtx, mark, perf0, attemptStartMs, stages, startedAt });
-    if (!r.handled) return { handled: false, upRes: null, lastErr: r.lastErr };
-    return { handled: true };
-  }
-  evt("relay-miss", { reqId: handlerCtx.reqId, model });
-  return { handled: false };
-}
+import { relay, SLOW_TOTAL_MS, STREAM_TIMEOUT_MS, STALL_TIMEOUT_MS, SCORE_STALL_MS } from "../stream.js";
+import { buildFallbackInfo } from "../fallback.js";
+import { createRelayPipeline } from "./relay-pipeline.js";
+import { tryBroadbandRelay } from "../relay-queue.js";
+import { overForwardLimit, contextGuardMessage } from "../../chat-pipeline/context-guard.js";
+
+/** 薄适配：broadband 两种形态合一经由 pipeline */
+export async function handleBroadbandRelay({
+  model,
+  body,
+  hops,
+  lastErr,
+  requested,
+  useAuto,
+  lockModel,
+  auto,
+  groups,
+  token,
+  bus,
+  logs,
+  handlerCtx,
+  evt,
+  mark,
+  perf0,
+  attemptStartMs,
+  stages,
+  res,
+  startedAt,
+  plugins,
+  deps = {},
+}) {
+  const { createPipeline = createRelayPipeline, tryBroadbandRelay: tryRelay = tryBroadbandRelay } = deps;
+  // 转发前上下文预检：宽带成员是完全不同的另一台机器，上下文撑爆的代价（白烧它的额度）最实在。
+  const guard = overForwardLimit(body);
+  if (guard) {
+    const msg = contextGuardMessage(guard);
+    evt("context-guard", { reqId: handlerCtx.reqId, model, via: "broadband", estimated: guard.estimated, limit: guard.limit, over: guard.over });
+    return { handled: false, lastErr: { model, upstream: null, status: 400, message: msg, contextGuard: true } };
+  }
+  const bb = await tryRelay({ groups, token, model, body, hops, bus, logs, reqId: handlerCtx.reqId, evt, res, mark, perf0, stages });
+  if (!bb) {
+    evt("relay-miss", { reqId: handlerCtx.reqId, model });
+    return { handled: false };
+  }
+  const pipeline = createPipeline({
+    relay,
+    buildFallbackInfo,
+    auto,
+    plugins,
+    evt,
+    mark,
+    logCall: () => {},
+    logError: () => {},
+    constants: { STREAM_TIMEOUT_MS, SLOW_TOTAL_MS, STALL_TIMEOUT_MS, SCORE_STALL_MS },
+    startedAt,
+    stages,
+  });
+  const isResponse = bb.result && typeof bb.result.status === "number" && typeof bb.result.headers?.get === "function";
+  if (isResponse) {
+    const r = await pipeline.execute({ res, upRes: bb.result, body, requested, actual: model, lastErr, via: "broadband", lockModel, useAuto, handlerCtx, mark, perf0, attemptStartMs, stages, startedAt });
+    if (!r.handled) return { handled: false, upRes: null, lastErr: r.lastErr };
+    return { handled: true };
+  }
+  if (bb.result && typeof bb.result.status === "number") {
+    const b = bb.result.body || "";
+    const str = typeof b === "string" ? b : JSON.stringify(b);
+    const isSSE = bb.result.headers?.["Content-Type"]?.includes("text/event-stream");
+    const fakeRes = {
+      status: bb.result.status,
+      headers: { get: (k) => bb.result.headers?.[k] || bb.result.headers?.[k.toLowerCase()] || null },
+      text: async () => str,
+      body: isSSE ? (async function* () { yield Buffer.from(str); })() : null,
+    };
+    const r = await pipeline.execute({ res, upRes: fakeRes, body, requested, actual: model, lastErr, via: "broadband-local", lockModel, useAuto, handlerCtx, mark, perf0, attemptStartMs, stages, startedAt });
+    if (!r.handled) return { handled: false, upRes: null, lastErr: r.lastErr };
+    return { handled: true };
+  }
+  evt("relay-miss", { reqId: handlerCtx.reqId, model });
+  return { handled: false };
+}

package/src/routes/chat/gateway.js

@@ -1,47 +1,47 @@
-import { clientIp, json, readBody, parseHops } from "../helpers.js";
-import { runHook } from "../../plugins.js";
-import { createChatPipeline } from "../../chat-pipeline/index.js";
-
-/**
- * ChatGateway 薄适配层：仅负责 HTTP I/O（readBody + request:received hook）→ 委托 ChatPipeline.execute
- * Policy/Order/AutoRace/hedge/peer/broadband 全部在 chat-pipeline 深模块内。
- */
-export function createChatGateway(deps = {}) {
-  const pipeline = createChatPipeline(deps);
-
-  async function handle({ req, res }) {
-    let body;
-    try {
-      body = await readBody(req);
-    } catch {
-      return json(res, 400, { error: "Invalid JSON body" });
-    }
-    if (deps.plugins?.length) {
-      const rc = await runHook(deps.plugins, "request:received", {
-        ip: clientIp(req),
-        hops: parseHops(req.headers["x-mslxdff-hops"]),
-        headers: { "content-type": req.headers["content-type"] },
-        body,
-      });
-      for (const e of rc.errors) deps.logs?.appendEvent?.({ ts: Date.now(), type: "plugin-hook-error", hook: "request:received", plugin: e.plugin, error: e.error });
-      const respond = rc.value?.respond;
-      if (respond && typeof respond === "object") return json(res, respond.status || 200, respond.body ?? {});
-    }
-    req.body = body;
-    try {
-      await pipeline.execute({ req, res });
-    } catch (err) {
-      const msg = err?.message || String(err);
-      if (!res.headersSent) return json(res, 502, { error: msg });
-      try { res.end(); } catch {}
-    }
-  }
-
-  return { handle };
-}
-
-// 薄适配：保持原 chatHandler 签名兼容
-export async function chatHandler(ctx) {
-  const gw = createChatGateway(ctx);
-  return gw.handle(ctx);
+import { clientIp, json, readBody, parseHops } from "../helpers.js";
+import { runHook } from "../../plugins.js";
+import { createChatPipeline } from "../../chat-pipeline/index.js";
+
+/**
+ * ChatGateway 薄适配层：仅负责 HTTP I/O（readBody + request:received hook）→ 委托 ChatPipeline.execute
+ * Policy/Order/AutoRace/hedge/peer/broadband 全部在 chat-pipeline 深模块内。
+ */
+export function createChatGateway(deps = {}) {
+  const pipeline = createChatPipeline(deps);
+
+  async function handle({ req, res }) {
+    let body;
+    try {
+      body = await readBody(req);
+    } catch {
+      return json(res, 400, { error: "Invalid JSON body" });
+    }
+    if (deps.plugins?.length) {
+      const rc = await runHook(deps.plugins, "request:received", {
+        ip: clientIp(req),
+        hops: parseHops(req.headers["x-mslxdff-hops"]),
+        headers: { "content-type": req.headers["content-type"] },
+        body,
+      });
+      for (const e of rc.errors) deps.logs?.appendEvent?.({ ts: Date.now(), type: "plugin-hook-error", hook: "request:received", plugin: e.plugin, error: e.error });
+      const respond = rc.value?.respond;
+      if (respond && typeof respond === "object") return json(res, respond.status || 200, respond.body ?? {});
+    }
+    req.body = body;
+    try {
+      await pipeline.execute({ req, res });
+    } catch (err) {
+      const msg = err?.message || String(err);
+      if (!res.headersSent) return json(res, 502, { error: msg });
+      try { res.end(); } catch {}
+    }
+  }
+
+  return { handle };
+}
+
+// 薄适配：保持原 chatHandler 签名兼容
+export async function chatHandler(ctx) {
+  const gw = createChatGateway(ctx);
+  return gw.handle(ctx);
 }