mslxdff 0.1.170 → 0.1.171

package/src/providers/qwenwork/stream.js

@@ -1,130 +1,130 @@
-// vendor 自 _shared/sse.js 的 transform（真流式：上游 SSE → OpenAI chunk，边收边吐）。
-// 唯一一处**有意偏离**原作者实现：把 chunk 里的 `model` 回写成客户端请求的模型名。
-// 上游实际返回的是池名（实测 `qwork-openai-chat-mode-pool`），直接透传会让客户端按模型名匹配失败，
-// 违反本仓契约 1「model 原样透传」。原作者的非流式路径同样做了 `completion.model = wantModel`。
-import { handleLine } from "./sse.js";
-
-function rewriteModel(frameText, model) {
-  if (!model) return frameText;
-  const body = frameText.slice(6, -2);
-  let obj;
-  try {
-    obj = JSON.parse(body);
-  } catch {
-    return frameText;
-  }
-  if (!obj || typeof obj !== "object") return frameText;
-  obj.model = model;
-  return `data: ${JSON.stringify(obj)}\n\n`;
-}
-
-export function transformStream(upstreamBody, model, onUsage, { heartbeatMs = 15000 } = {}) {
-  const reader = upstreamBody.getReader();
-  const decoder = new TextDecoder();
-  const encoder = new TextEncoder();
-  let buffer = "";
-  let notified = false;
-  let heartbeat = null;
-  const state = { usage: null, error: null };
-
-  const notify = () => {
-    if (notified) return;
-    notified = true;
-    if (onUsage) onUsage(state.usage);
-  };
-
-  const emitError = (controller, message) => {
-    try {
-      controller.enqueue(encoder.encode(`data: ${JSON.stringify({ error: { message, type: "upstream_error" } })}\n\n`));
-      controller.enqueue(encoder.encode("data: [DONE]\n\n"));
-      controller.close();
-    } catch {
-      /* 客户端已断开 */
-    }
-  };
-
-  const stopHeartbeat = () => {
-    if (heartbeat) {
-      clearInterval(heartbeat);
-      heartbeat = null;
-    }
-  };
-
-  const finish = () => {
-    stopHeartbeat();
-    notify();
-  };
-
-  return new ReadableStream({
-    start(controller) {
-      if (heartbeatMs > 0) {
-        heartbeat = setInterval(() => {
-          try {
-            controller.enqueue(encoder.encode(": ping\n\n"));
-          } catch {
-            /* 已关闭 */
-          }
-        }, heartbeatMs);
-        if (heartbeat.unref) heartbeat.unref();
-      }
-    },
-    async pull(controller) {
-      try {
-        for (;;) {
-          let read;
-          try {
-            read = await reader.read();
-          } catch (err) {
-            const message = `upstream stream read error: ${err && err.message ? err.message : err}`;
-            stopHeartbeat();
-            emitError(controller, message);
-            notify();
-            return;
-          }
-          if (read.done) {
-            stopHeartbeat();
-            if (buffer) {
-              const out = handleLine(buffer, state);
-              if (out) controller.enqueue(encoder.encode(rewriteModel(out, model)));
-              buffer = "";
-            }
-            if (state.error) emitError(controller, state.error);
-            else {
-              try {
-                controller.enqueue(encoder.encode("data: [DONE]\n\n"));
-                controller.close();
-              } catch {
-                /* 客户端已断开 */
-              }
-            }
-            finish();
-            return;
-          }
-          buffer += decoder.decode(read.value, { stream: true });
-          const lines = buffer.split("\n");
-          buffer = lines.pop() || "";
-          let out = "";
-          for (const line of lines) {
-            const frame = handleLine(line, state);
-            if (frame) out += rewriteModel(frame, model);
-          }
-          if (out) {
-            controller.enqueue(encoder.encode(out));
-            return;
-          }
-        }
-      } catch (err) {
-        finish();
-        try {
-          emitError(controller, `stream error: ${err && err.message ? err.message : err}`);
-        } catch {
-          /* 已关闭 */
-        }
-      }
-    },
-    cancel(reason) {
-      finish();
-      if (reader.cancel) reader.cancel(reason);
-    },
-  });
-}
+// vendor 自 _shared/sse.js 的 transform（真流式：上游 SSE → OpenAI chunk，边收边吐）。
+// 唯一一处**有意偏离**原作者实现：把 chunk 里的 `model` 回写成客户端请求的模型名。
+// 上游实际返回的是池名（实测 `qwork-openai-chat-mode-pool`），直接透传会让客户端按模型名匹配失败，
+// 违反本仓契约 1「model 原样透传」。原作者的非流式路径同样做了 `completion.model = wantModel`。
+import { handleLine } from "./sse.js";
+
+function rewriteModel(frameText, model) {
+  if (!model) return frameText;
+  const body = frameText.slice(6, -2);
+  let obj;
+  try {
+    obj = JSON.parse(body);
+  } catch {
+    return frameText;
+  }
+  if (!obj || typeof obj !== "object") return frameText;
+  obj.model = model;
+  return `data: ${JSON.stringify(obj)}\n\n`;
+}
+
+export function transformStream(upstreamBody, model, onUsage, { heartbeatMs = 15000 } = {}) {
+  const reader = upstreamBody.getReader();
+  const decoder = new TextDecoder();
+  const encoder = new TextEncoder();
+  let buffer = "";
+  let notified = false;
+  let heartbeat = null;
+  const state = { usage: null, error: null };
+
+  const notify = () => {
+    if (notified) return;
+    notified = true;
+    if (onUsage) onUsage(state.usage);
+  };
+
+  const emitError = (controller, message) => {
+    try {
+      controller.enqueue(encoder.encode(`data: ${JSON.stringify({ error: { message, type: "upstream_error" } })}\n\n`));
+      controller.enqueue(encoder.encode("data: [DONE]\n\n"));
+      controller.close();
+    } catch {
+      /* 客户端已断开 */
+    }
+  };
+
+  const stopHeartbeat = () => {
+    if (heartbeat) {
+      clearInterval(heartbeat);
+      heartbeat = null;
+    }
+  };
+
+  const finish = () => {
+    stopHeartbeat();
+    notify();
+  };
+
+  return new ReadableStream({
+    start(controller) {
+      if (heartbeatMs > 0) {
+        heartbeat = setInterval(() => {
+          try {
+            controller.enqueue(encoder.encode(": ping\n\n"));
+          } catch {
+            /* 已关闭 */
+          }
+        }, heartbeatMs);
+        if (heartbeat.unref) heartbeat.unref();
+      }
+    },
+    async pull(controller) {
+      try {
+        for (;;) {
+          let read;
+          try {
+            read = await reader.read();
+          } catch (err) {
+            const message = `upstream stream read error: ${err && err.message ? err.message : err}`;
+            stopHeartbeat();
+            emitError(controller, message);
+            notify();
+            return;
+          }
+          if (read.done) {
+            stopHeartbeat();
+            if (buffer) {
+              const out = handleLine(buffer, state);
+              if (out) controller.enqueue(encoder.encode(rewriteModel(out, model)));
+              buffer = "";
+            }
+            if (state.error) emitError(controller, state.error);
+            else {
+              try {
+                controller.enqueue(encoder.encode("data: [DONE]\n\n"));
+                controller.close();
+              } catch {
+                /* 客户端已断开 */
+              }
+            }
+            finish();
+            return;
+          }
+          buffer += decoder.decode(read.value, { stream: true });
+          const lines = buffer.split("\n");
+          buffer = lines.pop() || "";
+          let out = "";
+          for (const line of lines) {
+            const frame = handleLine(line, state);
+            if (frame) out += rewriteModel(frame, model);
+          }
+          if (out) {
+            controller.enqueue(encoder.encode(out));
+            return;
+          }
+        }
+      } catch (err) {
+        finish();
+        try {
+          emitError(controller, `stream error: ${err && err.message ? err.message : err}`);
+        } catch {
+          /* 已关闭 */
+        }
+      }
+    },
+    cancel(reason) {
+      finish();
+      if (reader.cancel) reader.cancel(reason);
+    },
+  });
+}

package/src/providers/qwenwork/upstream.js

@@ -1,120 +1,120 @@
-// vendor 自 _shared/upstream.js（签名请求装配 + OAuth 设备流），逐字搬；
-// 唯一改动：fetch 实现改为注入（默认本仓统一的 compatFetch，走 undici 连接池，勿混用 globalThis.fetch）。
-import { compatFetch } from "../../compat.js";
-import { uuid, b64url, utf8 } from "./crypto.js";
-import { signHeaders } from "./cosy.js";
-import {
-  UA, CLIENT_ID, REDIRECT_URI, DEVICE_AUTH_URL, CHAT_URL, MODELS_URL,
-  USERINFO_URL, ACCOUNT_CONTEXT_URL, POLL_URL, REFRESH_URL, MODEL_SLICE,
-} from "./constants.js";
-
-function plainHeaders() {
-  return {
-    accept: "application/json, text/plain, */*",
-    "content-type": "application/json",
-    "user-agent": UA,
-  };
-}
-
-export function chatRequest(account, modelKey, bodyStr, signal, fetchImpl = compatFetch) {
-  const headers = signHeaders(account, bodyStr, CHAT_URL, modelKey, "text/event-stream");
-  return fetchImpl(CHAT_URL, { method: "POST", headers, body: bodyStr, signal });
-}
-
-export async function modelList(account, fetchImpl = compatFetch) {
-  const headers = signHeaders(account, "", MODELS_URL, "", "application/json");
-  const res = await fetchImpl(MODELS_URL, { headers });
-  if (!res.ok) throw new Error(`models http ${res.status}`);
-  const data = await res.json();
-  // 实测 11 个根切片只有 `qwork` 非空（其余 n=0）；切片名见 constants.MODEL_SLICE
-  const list = Array.isArray(data && data[MODEL_SLICE]) ? data[MODEL_SLICE] : [];
-  return list
-    .filter((m) => m && m.enable !== false && m.key)
-    .map((m) => ({
-      key: m.key,
-      name: m.display_name || m.key,
-      isReasoning: !!m.is_reasoning,
-      isVL: !!m.is_vl,
-      maxInputTokens: m.max_input_tokens || 0,
-      maxOutputTokens: m.max_output_tokens || 0,
-      priceFactor: typeof m.price_factor === "number" ? m.price_factor : 0,
-      description: typeof m.description === "string" ? m.description : "",
-    }));
-}
-
-export async function userInfo(accessToken, fetchImpl = compatFetch) {
-  const res = await fetchImpl(USERINFO_URL, {
-    headers: { ...plainHeaders(), authorization: `Bearer ${accessToken}` },
-  });
-  if (!res.ok) throw new Error(`userinfo http ${res.status}`);
-  return res.json();
-}
-
-/** 额度/套餐：data.{user,plan,quota}；quota.remaining 即积分余量。 */
-export async function accountContext(accessToken, fetchImpl = compatFetch) {
-  const res = await fetchImpl(ACCOUNT_CONTEXT_URL, {
-    headers: { ...plainHeaders(), authorization: `Bearer ${accessToken}` },
-  });
-  if (!res.ok) throw new Error(`account-context http ${res.status}`);
-  const body = await res.json();
-  if (!body || (body.code && body.code !== "ok")) throw new Error(`account-context code=${body && body.code}`);
-  return (body && body.data) || {};
-}
-
-export async function refreshDeviceToken(refreshToken, fetchImpl = compatFetch) {
-  const res = await fetchImpl(REFRESH_URL, {
-    method: "POST",
-    headers: plainHeaders(),
-    body: JSON.stringify({ refresh_token: refreshToken }),
-  });
-  if (!res.ok) throw new Error(`refresh http ${res.status}`);
-  const data = await res.json();
-  const access = data && (data.token || data.device_token);
-  if (!access || !data.refresh_token) throw new Error("refresh: incomplete token pair");
-  return data;
-}
-
-export async function pollGrant(nonce, verifier, fetchImpl = compatFetch) {
-  const q = new URLSearchParams({ nonce, verifier, challenge_method: "S256" });
-  const res = await fetchImpl(`${POLL_URL}?${q.toString()}`, {
-    headers: { accept: "application/json", "user-agent": UA },
-  });
-  if (res.status === 404 || res.status === 202) return { pending: true };
-  if (!res.ok) throw new Error(`poll http ${res.status}`);
-  const data = await res.json();
-  if (!data || !(data.token || data.device_token)) return { pending: true };
-  return { pending: false, grant: data };
-}
-
-export async function newDeviceFlow() {
-  const alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~";
-  const raw = new Uint8Array(64);
-  crypto.getRandomValues(raw);
-  let verifier = "";
-  for (let i = 0; i < raw.length; i++) verifier += alphabet[raw[i] % alphabet.length];
-  const digest = new Uint8Array(await crypto.subtle.digest("SHA-256", utf8(verifier)));
-  const challenge = b64url(digest);
-  const nonce = uuid();
-  const machineID = uuid();
-  const q = new URLSearchParams({
-    challenge,
-    challenge_method: "S256",
-    nonce,
-    machine_id: machineID,
-    client_id: CLIENT_ID,
-    redirect_uri: REDIRECT_URI,
-  });
-  return { verifier, nonce, url: `${DEVICE_AUTH_URL}?${q.toString()}` };
-}
-
-export function expiryUnix(grant) {
-  if (grant && grant.expires_at) {
-    const t = Date.parse(grant.expires_at);
-    if (!Number.isNaN(t)) return Math.floor(t / 1000);
-  }
-  if (grant && grant.expires_in > 0) {
-    const ms = grant.expires_in > 10000000 ? grant.expires_in : grant.expires_in * 1000;
-    return Math.floor((Date.now() + ms) / 1000);
-  }
-  return Math.floor((Date.now() + 30 * 24 * 3600 * 1000) / 1000);
-}
+// vendor 自 _shared/upstream.js（签名请求装配 + OAuth 设备流），逐字搬；
+// 唯一改动：fetch 实现改为注入（默认本仓统一的 compatFetch，走 undici 连接池，勿混用 globalThis.fetch）。
+import { compatFetch } from "../../compat.js";
+import { uuid, b64url, utf8 } from "./crypto.js";
+import { signHeaders } from "./cosy.js";
+import {
+  UA, CLIENT_ID, REDIRECT_URI, DEVICE_AUTH_URL, CHAT_URL, MODELS_URL,
+  USERINFO_URL, ACCOUNT_CONTEXT_URL, POLL_URL, REFRESH_URL, MODEL_SLICE,
+} from "./constants.js";
+
+function plainHeaders() {
+  return {
+    accept: "application/json, text/plain, */*",
+    "content-type": "application/json",
+    "user-agent": UA,
+  };
+}
+
+export function chatRequest(account, modelKey, bodyStr, signal, fetchImpl = compatFetch) {
+  const headers = signHeaders(account, bodyStr, CHAT_URL, modelKey, "text/event-stream");
+  return fetchImpl(CHAT_URL, { method: "POST", headers, body: bodyStr, signal });
+}
+
+export async function modelList(account, fetchImpl = compatFetch) {
+  const headers = signHeaders(account, "", MODELS_URL, "", "application/json");
+  const res = await fetchImpl(MODELS_URL, { headers });
+  if (!res.ok) throw new Error(`models http ${res.status}`);
+  const data = await res.json();
+  // 实测 11 个根切片只有 `qwork` 非空（其余 n=0）；切片名见 constants.MODEL_SLICE
+  const list = Array.isArray(data && data[MODEL_SLICE]) ? data[MODEL_SLICE] : [];
+  return list
+    .filter((m) => m && m.enable !== false && m.key)
+    .map((m) => ({
+      key: m.key,
+      name: m.display_name || m.key,
+      isReasoning: !!m.is_reasoning,
+      isVL: !!m.is_vl,
+      maxInputTokens: m.max_input_tokens || 0,
+      maxOutputTokens: m.max_output_tokens || 0,
+      priceFactor: typeof m.price_factor === "number" ? m.price_factor : 0,
+      description: typeof m.description === "string" ? m.description : "",
+    }));
+}
+
+export async function userInfo(accessToken, fetchImpl = compatFetch) {
+  const res = await fetchImpl(USERINFO_URL, {
+    headers: { ...plainHeaders(), authorization: `Bearer ${accessToken}` },
+  });
+  if (!res.ok) throw new Error(`userinfo http ${res.status}`);
+  return res.json();
+}
+
+/** 额度/套餐：data.{user,plan,quota}；quota.remaining 即积分余量。 */
+export async function accountContext(accessToken, fetchImpl = compatFetch) {
+  const res = await fetchImpl(ACCOUNT_CONTEXT_URL, {
+    headers: { ...plainHeaders(), authorization: `Bearer ${accessToken}` },
+  });
+  if (!res.ok) throw new Error(`account-context http ${res.status}`);
+  const body = await res.json();
+  if (!body || (body.code && body.code !== "ok")) throw new Error(`account-context code=${body && body.code}`);
+  return (body && body.data) || {};
+}
+
+export async function refreshDeviceToken(refreshToken, fetchImpl = compatFetch) {
+  const res = await fetchImpl(REFRESH_URL, {
+    method: "POST",
+    headers: plainHeaders(),
+    body: JSON.stringify({ refresh_token: refreshToken }),
+  });
+  if (!res.ok) throw new Error(`refresh http ${res.status}`);
+  const data = await res.json();
+  const access = data && (data.token || data.device_token);
+  if (!access || !data.refresh_token) throw new Error("refresh: incomplete token pair");
+  return data;
+}
+
+export async function pollGrant(nonce, verifier, fetchImpl = compatFetch) {
+  const q = new URLSearchParams({ nonce, verifier, challenge_method: "S256" });
+  const res = await fetchImpl(`${POLL_URL}?${q.toString()}`, {
+    headers: { accept: "application/json", "user-agent": UA },
+  });
+  if (res.status === 404 || res.status === 202) return { pending: true };
+  if (!res.ok) throw new Error(`poll http ${res.status}`);
+  const data = await res.json();
+  if (!data || !(data.token || data.device_token)) return { pending: true };
+  return { pending: false, grant: data };
+}
+
+export async function newDeviceFlow() {
+  const alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~";
+  const raw = new Uint8Array(64);
+  crypto.getRandomValues(raw);
+  let verifier = "";
+  for (let i = 0; i < raw.length; i++) verifier += alphabet[raw[i] % alphabet.length];
+  const digest = new Uint8Array(await crypto.subtle.digest("SHA-256", utf8(verifier)));
+  const challenge = b64url(digest);
+  const nonce = uuid();
+  const machineID = uuid();
+  const q = new URLSearchParams({
+    challenge,
+    challenge_method: "S256",
+    nonce,
+    machine_id: machineID,
+    client_id: CLIENT_ID,
+    redirect_uri: REDIRECT_URI,
+  });
+  return { verifier, nonce, url: `${DEVICE_AUTH_URL}?${q.toString()}` };
+}
+
+export function expiryUnix(grant) {
+  if (grant && grant.expires_at) {
+    const t = Date.parse(grant.expires_at);
+    if (!Number.isNaN(t)) return Math.floor(t / 1000);
+  }
+  if (grant && grant.expires_in > 0) {
+    const ms = grant.expires_in > 10000000 ? grant.expires_in : grant.expires_in * 1000;
+    return Math.floor((Date.now() + ms) / 1000);
+  }
+  return Math.floor((Date.now() + 30 * 24 * 3600 * 1000) / 1000);
+}

package/src/providers/qwenwork.js

@@ -1 +1 @@
-export * from "./qwenwork/index.js";
+export * from "./qwenwork/index.js";

package/src/providers/raccoon/chat.js

@@ -9,6 +9,7 @@ import {
   raccoonEffortFromEnv,
   raccoonThinkingType,
 } from "./const.js";
+import { effortFromBody } from "../../thinking-effort.js";
 import { RACCOON_CHAT_ACCEPT, raccoonAuthHeaders } from "./headers.js";
 import {
   aggregateRaccoonSse,
@@ -22,19 +23,23 @@ const PEEK_MAX_BYTES = 8192;
 
 /**
  * 出站请求体：剥 `raccoon/` 前缀 + 注入 `extra_body.thinking`。
- * 思考取值优先级：**请求体自带的 `extra_body.thinking.type`**（客户端显式声明）＞ 构造/调用方 `effort`
+ * 思考取值优先级：**请求体声明的档位**（`extra_body.thinking.type` / `reasoning_effort` / `reasoningEffort`
+ * / `effort` / `thinking.type`，经 src/thinking-effort.js 归一，关断值最高优先）＞ 构造/调用方 `effort`
  * ＞ env `MSLXDFF_RACCOON_THINKING` ＞ 默认「开」。
  * **绝不发 `reasoning_effort`**：上游不认该参数（实测传与不传无可测差异），发了只会多一处形态差异。
+ * 客户端声明的通用档位字段消费后一律剥除，出站只留本家原生形状 `extra_body.thinking.type`。
  */
 export function buildRaccoonWireBody(body = {}, { effort, env = process.env } = {}) {
   const wire = { ...body };
   wire.model = canonicalRaccoonModel(body?.model);
+  // 先读客户端声明再剥字段：档位不能白丢（change fix-thinking-effort-passthrough）。
+  const fromBody = effortFromBody(body);
   delete wire.reasoning_effort;
+  delete wire.reasoningEffort;
+  delete wire.effort;
+  delete wire.thinking;
   const extra = typeof body?.extra_body === "object" && body.extra_body !== null ? { ...body.extra_body } : {};
-  const declared = extra?.thinking?.type;
-  const type = declared === "enabled" || declared === "disabled"
-    ? declared
-    : raccoonThinkingType(effort ?? raccoonEffortFromEnv(env) ?? RACCOON_DEFAULT_EFFORT);
+  const type = raccoonThinkingType(fromBody || effort || raccoonEffortFromEnv(env) || RACCOON_DEFAULT_EFFORT);
   extra.thinking = { type };
   wire.extra_body = extra;
   return wire;

package/src/providers/raccoon/const.js

@@ -2,6 +2,8 @@
 // 端点契约调研自 Ebony-Vinyl/dsh-our-free-model 的 vendor/channel-pack/src/raccoon*.ts
 // （打包产物 pack.js 原文）并逐条本机实测：站点根 200、model_catalog 匿名 401、
 // chat/completions 匿名 401、login_with_qrcode_code 匿名 200 {"code":0,"data":{"status":"pending"}}。
+import { isEffortOff } from "../../thinking-effort.js";
+
 export const RACCOON_ORIGIN = "https://xiaohuanxiong.com";
 
 export const RACCOON_LLM_PREFIX = "/api/web/llm/v2";
@@ -58,12 +60,10 @@ export const RACCOON_DEFAULT_EFFORT = RACCOON_EFFORT_ON;
 
 /**
  * 思考档位 → 出站 `thinking.type`。
- * 上层档位词表跨供应商共用，收到非本家档位（high/xhigh/max/…）时归一为「开」而非报错。
+ * 词表由 src/thinking-effort.js 统一（off/none/disabled 均判关），非本家档位（high/xhigh/max/…）归一为「开」而非报错。
  */
 export function raccoonThinkingType(effort) {
-  const raw = String(effort ?? "").trim().toLowerCase();
-  if (raw === RACCOON_EFFORT_OFF || raw === "none" || raw === "off") return "disabled";
-  return "enabled";
+  return isEffortOff(effort) ? "disabled" : "enabled";
 }
 
 /**