mslxdff 0.1.65 → 0.1.67

package/src/providers/base.js

@@ -0,0 +1,159 @@
+import { createKeyRing } from "./keyring.js";
+import { joinModelId } from "./model-id.js";
+
+let UndiciAgent = null;
+let UndiciFetch = null;
+try {
+  const mod = await import("undici");
+  UndiciAgent = mod.Agent;
+  UndiciFetch = mod.fetch;
+} catch {}
+
+export function envInt(name, fallback) {
+  const v = Number(process.env[name]);
+  return Number.isInteger(v) && v > 0 ? v : fallback;
+}
+
+export function joinUrl(base, path) {
+  const b = String(base || "").trim().replace(/\/+$/, "");
+  const p = String(path || "").trim();
+  if (!p) return b;
+  const pp = p.startsWith("/") ? p : `/${p}`;
+  return `${b}${pp}`;
+}
+
+export function sleep(ms) {
+  return new Promise((r) => setTimeout(r, ms));
+}
+
+export function getUndici() {
+  return { UndiciAgent, UndiciFetch };
+}
+
+export function createAgent({ keepAliveTimeout = 30_000, keepAliveMaxTimeout = 60_000, connections = 20 } = {}) {
+  if (!UndiciAgent) return { agent: null, dispatcher: null };
+  try {
+    const agent = new UndiciAgent({ keepAliveTimeout, keepAliveMaxTimeout, connections, pipelining: 1 });
+    return { agent, dispatcher: agent };
+  } catch {
+    return { agent: null, dispatcher: null };
+  }
+}
+
+export function collectApiKeysGeneric(id, apiKeys, apiKey, loadKeys) {
+  const list = [
+    ...(Array.isArray(apiKeys) ? apiKeys : [apiKeys].filter(Boolean)),
+    apiKey,
+    ...(apiKeys === undefined && apiKey === undefined ? loadKeys(id) : []),
+  ].filter((k) => typeof k === "string" && k.trim().length);
+  return [...new Set(list.map((k) => k.trim()))];
+}
+
+export function createChatRunner({ id, ring, cooldownMs, retry, fetchImpl, dispatcher, buildHeaders, getUrl, connectTimeoutMs = 30_000 }) {
+  async function attemptOnce(url, body, key, activeRing) {
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(new Error(`${id} timed out after ${connectTimeoutMs}ms`)), connectTimeoutMs);
+    try {
+      const opts = { method: "POST", headers: buildHeaders(body, key), body: JSON.stringify(body), signal: controller.signal };
+      if (dispatcher) opts.dispatcher = dispatcher;
+      const res = await fetchImpl(url, opts);
+      if (res.status === 401 && !activeRing.size) return { __needKey: true };
+      return res;
+    } catch (err) {
+      return err;
+    } finally {
+      clearTimeout(timer);
+    }
+  }
+
+  async function runChat(body, activeRing, sourceKey) {
+    const url = getUrl();
+    const t0 = performance.now();
+    const attempts = [];
+    let waitMs = 0;
+    const key = activeRing.next();
+    if (!key && activeRing.size > 0) {
+      const err = new Error(`${id}: all API keys are in cooldown (last error < ${cooldownMs}ms ago) — provider temporarily unavailable`);
+      err._t = { attempts: [], waitMs: 0, totalMs: Math.round(performance.now() - t0), cooldownMs };
+      throw err;
+    }
+    for (let attempt = 0; ; attempt++) {
+      const t = performance.now();
+      const result = await attemptOnce(url, body, key, activeRing);
+      const type = result instanceof Error ? "network" : `http${result?.status}`;
+      attempts.push({ attempt, type, ms: Math.round(performance.now() - t) });
+      if (result?.__needKey) {
+        const err = new Error(`${id}: missing ${sourceKey} (chat requires a real key)`);
+        err._t = { attempts, waitMs, totalMs: Math.round(performance.now() - t0) };
+        throw err;
+      }
+      if (result instanceof Error) {
+        const entry = retry?.network;
+        if (entry && attempt < entry.attempts) { await sleep(entry.delayMs); waitMs += entry.delayMs; continue; }
+        activeRing.onError(key);
+        result._t = { attempts, waitMs, totalMs: Math.round(performance.now() - t0) };
+        throw result;
+      }
+      const entry = retry?.[result.status];
+      if (entry && attempt < entry.attempts) { await sleep(entry.delayMs); waitMs += entry.delayMs; continue; }
+      if (result.status === 401 || result.status === 403 || result.status === 429 || result.status >= 500) activeRing.onError(key);
+      result._t = { attempts, waitMs, totalMs: Math.round(performance.now() - t0) };
+      return result;
+    }
+  }
+
+  return { attemptOnce, runChat };
+}
+
+export function createListModelsRunner({ id, ring, dispatcher, fetchImpl, getUrl, mapModel }) {
+  const CACHE_TTL_MS = 10 * 60 * 1000;
+  let cache = null;
+  let fetchedAt = 0;
+  async function listModels() {
+    const now = Date.now();
+    if (cache && now - fetchedAt < CACHE_TTL_MS) return cache;
+    const url = getUrl();
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(new Error(`${id} models timed out`)), 15_000);
+    try {
+      const headers = { Accept: "application/json" };
+      const key = ring.next();
+      if (key) headers["Authorization"] = `Bearer ${key}`;
+      const opts = { headers, signal: controller.signal };
+      if (dispatcher) opts.dispatcher = dispatcher;
+      const res = await fetchImpl(url, opts);
+      if (!res.ok) return [];
+      const json = await res.json().catch(() => ({}));
+      const raw = Array.isArray(json.data) ? json.data : Array.isArray(json) ? json : [];
+      const mapped = mapModel ? mapModel(raw) : raw;
+      cache = mapped.filter((m) => m && typeof m.id === "string").map((m) => ({ ...m, id: joinModelId(id, m.id) }));
+      fetchedAt = now;
+      return cache;
+    } catch {
+      return [];
+    } finally {
+      clearTimeout(timer);
+    }
+  }
+  return { listModels, _cache: () => cache };
+}
+
+export function createPreheatRunner({ dispatcher, fetchImpl, getUrl, id, ring, loadKeys }) {
+  async function preheat() {
+    const url = getUrl();
+    const t0 = performance.now();
+    try {
+      const headers = { Accept: "application/json" };
+      const key = (loadKeys ? loadKeys(id)[0] : ring.next()) || ring.next();
+      if (key) headers["Authorization"] = `Bearer ${key}`;
+      const opts = { headers };
+      if (dispatcher) opts.dispatcher = dispatcher;
+      const res = await fetchImpl(url, opts);
+      try { if (res.body) await res.text().catch(() => {}); } catch {}
+      return { ok: res.ok, status: res.status, ms: Math.round(performance.now() - t0) };
+    } catch (err) {
+      return { ok: false, error: String(err?.message || err), ms: Math.round(performance.now() - t0) };
+    }
+  }
+  return { preheat };
+}

package/src/providers/dispatcher.js

@@ -1,10 +1,22 @@
 import { splitModelId, DEFAULT_PROVIDER, joinModelId } from "./model-id.js";
-import { isModelAllowed, loadProviderAllowedModels, loadProviderAllowAnyModels } from "../state.js";
+import { isModelAllowed as stateIsAllowed, loadProviderAllowedModels as stateLoadAllowed, loadProviderAllowAnyModels as stateLoadAllowAny } from "../state.js";
 
 // 多供应商 dispatcher：把多个 Provider 聚合成一个 `upstream` 形状（chat/preheat/close），
 // 按 body.model 的前缀路由到对应供应商，转发上游前剥掉前缀只发原始 id。
-export function createProviderDispatcher(providers = []) {
+// 纯化：第二参可注入纯函数 isAllowed/getAllowed/getAllowAny，便于单测不读盘
+export function createProviderDispatcher(providers = [], opts = {}) {
   const byId = new Map(providers.map((p) => [p.id, p]));
+  // 纯化注入：第二参可为 {isAllowed, getAllowedModels, getAllowAny} 或直接函数 isAllowed
+  let isAllowedFn, getAllowedFn, getAllowAnyFn;
+  if (typeof opts === "function") {
+    isAllowedFn = opts;
+    getAllowedFn = stateLoadAllowed;
+    getAllowAnyFn = stateLoadAllowAny;
+  } else {
+    isAllowedFn = opts.isAllowed || stateIsAllowed;
+    getAllowedFn = opts.getAllowedModels || stateLoadAllowed;
+    getAllowAnyFn = opts.getAllowAny || stateLoadAllowAny;
+  }
 
   function resolve(model) {
     const split = splitModelId(model, providers.map((p) => p.id));
@@ -29,8 +41,8 @@ export function createProviderDispatcher(providers = []) {
         raw = modelPart;
       }
     }
-    if (!isModelAllowed(provider.id, raw)) {
-      const allowed = loadProviderAllowedModels(provider.id);
+    if (!isAllowedFn(provider.id, raw)) {
+      const allowed = getAllowedFn(provider.id) || [];
       const msg = `model not allowed for provider "${provider.id}": "${raw}" — allowed: ${allowed.join(", ") || "(none)"} (use: mslxdff -provider ${provider.id} allowlist add <model>)`;
       return new Response(JSON.stringify({ error: msg }), { status: 403, headers: { "Content-Type": "application/json", "x-mslxdff-allowlist": "1" } });
     }
@@ -58,8 +70,8 @@ export function createProviderDispatcher(providers = []) {
       } catch {
         list = [];
       }
-      const allowed = loadProviderAllowedModels(p.id);
-      const allowAny = loadProviderAllowAnyModels(p.id);
+      const allowed = getAllowedFn(p.id) || [];
+      const allowAny = getAllowAnyFn(p.id);
       const allowedSet = allowed.length ? new Set(allowed) : null;
       // 空名单且不允许任意模型 => 该供应商不暴露任何模型（安全默认）
       if (!allowedSet && !allowAny) continue;

package/src/providers/generic.js

@@ -1,36 +1,8 @@
-import { joinModelId } from "./model-id.js";
 import { createKeyRing } from "./keyring.js";
 import { loadProviderKeys, loadProviderBaseUrl, loadProviderModelsPath, loadProviderChatPath } from "../state.js";
+import { envInt, joinUrl, getUndici, createAgent, collectApiKeysGeneric, createChatRunner, createListModelsRunner, createPreheatRunner } from "./base.js";
 
-function joinUrl(base, path) {
-  const b = String(base || "").trim().replace(/\/+$/, "");
-  const p = String(path || "").trim();
-  if (!p) return b;
-  const pp = p.startsWith("/") ? p : `/${p}`;
-  return `${b}${pp}`;
-}
-
-let UndiciAgent = null;
-let UndiciFetch = null;
-try {
-  const mod = await import("undici");
-  UndiciAgent = mod.Agent;
-  UndiciFetch = mod.fetch;
-} catch {}
-
-function envInt(name, fallback) {
-  const v = Number(process.env[name]);
-  return Number.isInteger(v) && v > 0 ? v : fallback;
-}
-
-function collectApiKeys(id, apiKeys, apiKey) {
-  const list = [
-    ...(Array.isArray(apiKeys) ? apiKeys : [apiKeys].filter(Boolean)),
-    apiKey,
-    ...(apiKeys === undefined && apiKey === undefined ? loadProviderKeys(id) : []),
-  ].filter((k) => typeof k === "string" && k.trim().length);
-  return [...new Set(list.map((k) => k.trim()))];
-}
+const { UndiciFetch } = getUndici();
 
 function resolveBaseUrl(id, baseUrl) {
   if (baseUrl) return String(baseUrl).trim().replace(/\/+$/, "");
@@ -57,6 +29,7 @@ export function createGenericProvider({
   },
   fetchImpl,
   headers: extraHeaders,
+  mapModel,
   noAgent = false,
   file,
 } = {}) {
@@ -66,169 +39,58 @@ export function createGenericProvider({
   if (!fetchImpl) fetchImpl = UndiciFetch || fetch;
   const resolvedModelsPath = modelsPath || loadProviderModelsPath(id, file ? { file } : {});
   const resolvedChatPath = chatPath || loadProviderChatPath(id, file ? { file } : {});
-
-  const ring = createKeyRing(collectApiKeys(id, apiKeys, apiKey), { cooldownMs });
+  const ring = createKeyRing(collectApiKeysGeneric(id, apiKeys, apiKey, loadProviderKeys), { cooldownMs });
 
   let dispatcher = null;
   let agent = null;
-  if (UndiciAgent && !noAgent) {
-    try {
-      agent = new UndiciAgent({
-        keepAliveTimeout: envInt("MSLXDFF_GENERIC_KEEPALIVE_TIMEOUT", 30_000),
-        keepAliveMaxTimeout: envInt("MSLXDFF_GENERIC_KEEPALIVE_MAX_TIMEOUT", 60_000),
-        connections: envInt("MSLXDFF_GENERIC_KEEPALIVE_CONNECTIONS", 20),
-        pipelining: 1,
-      });
-      dispatcher = agent;
-    } catch {}
+  if (!noAgent) {
+    const a = createAgent({
+      keepAliveTimeout: envInt("MSLXDFF_GENERIC_KEEPALIVE_TIMEOUT", 30_000),
+      keepAliveMaxTimeout: envInt("MSLXDFF_GENERIC_KEEPALIVE_MAX_TIMEOUT", 60_000),
+      connections: envInt("MSLXDFF_GENERIC_KEEPALIVE_CONNECTIONS", 20),
+    });
+    agent = a.agent; dispatcher = a.dispatcher;
   }
 
   function buildHeaders(body, key) {
     const isStream = body?.stream !== false;
     const h = {
       "Content-Type": "application/json",
-      "Accept": isStream ? "text/event-stream" : "*/*",
+      Accept: isStream ? "text/event-stream" : "*/*",
       "User-Agent": "mslxdff",
     };
     if (key) h["Authorization"] = `Bearer ${key}`;
     return { ...h, ...extraHeaders };
   }
 
-  async function attemptOnce(url, body, key, activeRing) {
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(new Error(`${id} timed out after ${connectTimeoutMs}ms`)), connectTimeoutMs);
-    try {
-      const opts = { method: "POST", headers: buildHeaders(body, key), body: JSON.stringify(body), signal: controller.signal };
-      if (dispatcher) opts.dispatcher = dispatcher;
-      const res = await fetchImpl(url, opts);
-      if (res.status === 401 && !activeRing.size) return { __needKey: true };
-      return res;
-    } catch (err) {
-      return err;
-    } finally {
-      clearTimeout(timer);
-    }
-  }
-
-  async function runChat(body, activeRing, sourceKey) {
-    const url = joinUrl(resolvedBase, resolvedChatPath);
-    const t0 = performance.now();
-    const attempts = [];
-    let waitMs = 0;
-    const key = activeRing.next();
-    if (!key && activeRing.size > 0) {
-      const err = new Error(`${id}: all API keys are in cooldown (last error < ${cooldownMs}ms ago) — provider temporarily unavailable`);
-      err._t = { attempts: [], waitMs: 0, totalMs: Math.round(performance.now() - t0), cooldownMs };
-      throw err;
-    }
-    for (let attempt = 0; ; attempt++) {
-      const t = performance.now();
-      const result = await attemptOnce(url, body, key, activeRing);
-      const type = result instanceof Error ? "network" : `http${result?.status}`;
-      attempts.push({ attempt, type, ms: Math.round(performance.now() - t) });
-      if (result?.__needKey) {
-        const err = new Error(`${id}: missing ${sourceKey} (chat requires a real key)`);
-        err._t = { attempts, waitMs, totalMs: Math.round(performance.now() - t0) };
-        throw err;
-      }
-      if (result instanceof Error) {
-        const entry = retry?.network;
-        if (entry && attempt < entry.attempts) {
-          await sleep(entry.delayMs);
-          waitMs += entry.delayMs;
-          continue;
-        }
-        activeRing.onError(key);
-        result._t = { attempts, waitMs, totalMs: Math.round(performance.now() - t0) };
-        throw result;
-      }
-      const entry = retry?.[result.status];
-      if (entry && attempt < entry.attempts) {
-        await sleep(entry.delayMs);
-        waitMs += entry.delayMs;
-        continue;
-      }
-      if (result.status === 401 || result.status === 403 || result.status === 429 || result.status >= 500) activeRing.onError(key);
-      result._t = { attempts, waitMs, totalMs: Math.round(performance.now() - t0) };
-      return result;
-    }
-  }
+  const { runChat } = createChatRunner({
+    id, ring, cooldownMs, retry, fetchImpl, dispatcher, buildHeaders,
+    getUrl: () => joinUrl(resolvedBase, resolvedChatPath),
+    connectTimeoutMs,
+  });
 
   async function chat(body) {
     return runChat(body, ring, `MSLXDFF_${id.toUpperCase()}_KEY`);
   }
-
   async function chatWithKeys(body, keys) {
     const tmp = createKeyRing(keys, { cooldownMs });
     return runChat(body, tmp, "shared provider keys");
   }
 
-  const CACHE_TTL_MS = 10 * 60 * 1000;
-  let cache = null;
-  let fetchedAt = 0;
-  async function listModels() {
-    const now = Date.now();
-    if (cache && now - fetchedAt < CACHE_TTL_MS) return cache;
-    const url = joinUrl(resolvedBase, resolvedModelsPath);
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(new Error(`${id} models timed out`)), 15_000);
-    try {
-      const headers = { Accept: "application/json" };
-      const key = ring.next();
-      if (key) headers["Authorization"] = `Bearer ${key}`;
-      const opts = { headers, signal: controller.signal };
-      if (dispatcher) opts.dispatcher = dispatcher;
-      const res = await fetchImpl(url, opts);
-      if (!res.ok) return [];
-      const json = await res.json().catch(() => ({}));
-      const raw = Array.isArray(json.data) ? json.data : Array.isArray(json) ? json : [];
-      // 通用：不过滤 pricing，全部前缀化
-      cache = raw.filter((m) => m && typeof m.id === "string").map((m) => ({ ...m, id: joinModelId(id, m.id) }));
-      fetchedAt = now;
-      return cache;
-    } catch {
-      return [];
-    } finally {
-      clearTimeout(timer);
-    }
-  }
+  const { listModels } = createListModelsRunner({
+    id, ring, dispatcher, fetchImpl,
+    getUrl: () => joinUrl(resolvedBase, resolvedModelsPath),
+    mapModel,
+  });
 
-  async function preheat() {
-    const url = joinUrl(resolvedBase, resolvedModelsPath);
-    const t0 = performance.now();
-    try {
-      const headers = { Accept: "application/json" };
-      const key = loadProviderKeys(id)[0] || ring.next();
-      if (key) headers["Authorization"] = `Bearer ${key}`;
-      const opts = { headers };
-      if (dispatcher) opts.dispatcher = dispatcher;
-      const res = await fetchImpl(url, opts);
-      try { if (res.body) await res.text().catch(() => {}); } catch {}
-      return { ok: res.ok, status: res.status, ms: Math.round(performance.now() - t0) };
-    } catch (err) {
-      return { ok: false, error: String(err?.message || err), ms: Math.round(performance.now() - t0) };
-    }
-  }
+  const { preheat } = createPreheatRunner({
+    dispatcher, fetchImpl, getUrl: () => joinUrl(resolvedBase, resolvedModelsPath),
+    id, ring, loadKeys: loadProviderKeys,
+  });
 
   async function close() {
-    if (agent && typeof agent.close === "function") {
-      try { await agent.close(); } catch {}
-    }
+    if (agent && typeof agent.close === "function") { try { await agent.close(); } catch {} }
   }
 
-  return {
-    id,
-    chat,
-    chatWithKeys,
-    listModels,
-    preheat,
-    close,
-    agent,
-    keyRing: ring,
-    baseUrl: resolvedBase,
-  };
-}
-
-function sleep(ms) {
-  return new Promise((r) => setTimeout(r, ms));
+  return { id, chat, chatWithKeys, listModels, preheat, close, agent, keyRing: ring, baseUrl: resolvedBase };
 }

package/src/providers/openrouter.js

@@ -1,217 +1,31 @@
-import { joinModelId } from "./model-id.js";
-import { createKeyRing } from "./keyring.js";
-import { loadProviderKeys } from "../state.js";
-
-let UndiciAgent = null;
-let UndiciFetch = null;
-try {
-  const mod = await import("undici");
-  UndiciAgent = mod.Agent;
-  UndiciFetch = mod.fetch;
-} catch {}
+import { createGenericProvider } from "./generic.js";
 
 const DEFAULT_BASE_URL = "https://openrouter.ai/api/v1";
 
-function envInt(name, fallback) {
-  const v = Number(process.env[name]);
-  return Number.isInteger(v) && v > 0 ? v : fallback;
-}
-
-// 把 `apiKeys`(数组) + `apiKey`(单串) + state 的 key 合并成去重数组。
-// state 为空时只看显式传入；两者皆空 → []（无 key）。
-function collectApiKeys(apiKeys, apiKey) {
-  const list = [
-    ...(Array.isArray(apiKeys) ? apiKeys : [apiKeys].filter(Boolean)),
-    apiKey,
-    ...(apiKeys === undefined && apiKey === undefined ? loadProviderKeys("openrouter") : []),
-  ].filter((k) => typeof k === "string" && k.trim().length);
-  return [...new Set(list.map((k) => k.trim()))];
-}
-
 export function createOpenRouterProvider({
   apiKeys,
   apiKey,
   baseUrl = process.env.MSLXDFF_OPENROUTER_BASE_URL || DEFAULT_BASE_URL,
-  connectTimeoutMs = Number(process.env.MSLXDFF_OPENROUTER_TIMEOUT_MS) || 30_000,
-  cooldownMs = envInt("MSLXDFF_OPENROUTER_COOLDOWN_MS", 30_000),
-  retry = {
-    network: { attempts: 2, delayMs: 300 },
-    429: { attempts: 1, delayMs: 100 },
-    502: { attempts: 1, delayMs: 100 },
-    503: { attempts: 1, delayMs: 100 },
-    504: { attempts: 1, delayMs: 100 },
-  },
   fetchImpl,
-  headers: extraHeaders,
+  headers,
   noAgent = false,
+  ...rest
 } = {}) {
-  if (!fetchImpl) fetchImpl = UndiciFetch || fetch;
-
-  const ring = createKeyRing(collectApiKeys(apiKeys, apiKey), { cooldownMs });
-
-  let dispatcher = null;
-  let agent = null;
-  if (UndiciAgent && !noAgent) {
-    try {
-      agent = new UndiciAgent({
-        keepAliveTimeout: envInt("MSLXDFF_OA_KEEPALIVE_TIMEOUT", 30_000),
-        keepAliveMaxTimeout: envInt("MSLXDFF_OA_KEEPALIVE_MAX_TIMEOUT", 60_000),
-        connections: envInt("MSLXDFF_OA_KEEPALIVE_CONNECTIONS", 20),
-        pipelining: 1,
-      });
-      dispatcher = agent;
-    } catch {}
-  }
-
-  function buildHeaders(body, key) {
-    const isStream = body?.stream !== false;
-    const h = {
-      "Content-Type": "application/json",
-      "Accept": isStream ? "text/event-stream" : "*/*",
-      "User-Agent": "mslxdff",
-    };
-    if (key) h["Authorization"] = `Bearer ${key}`;
-    h["HTTP-Referer"] = process.env.MSLXDFF_OPENROUTER_REFERER || "https://github.com/mslxdff";
-    h["X-Title"] = process.env.MSLXDFF_OPENROUTER_TITLE || "mslxdff";
-    return { ...h, ...extraHeaders };
-  }
-
-  async function attemptOnce(url, body, key, activeRing) {
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(new Error(`openrouter timed out after ${connectTimeoutMs}ms`)), connectTimeoutMs);
-    try {
-      const opts = { method: "POST", headers: buildHeaders(body, key), body: JSON.stringify(body), signal: controller.signal };
-      if (dispatcher) opts.dispatcher = dispatcher;
-      const res = await fetchImpl(url, opts);
-      if (res.status === 401 && !activeRing.size) return { __needKey: true };
-      return res;
-    } catch (err) {
-      return err;
-    } finally {
-      clearTimeout(timer);
-    }
-  }
-
-  async function runChat(body, activeRing, sourceKey) {
-    const url = `${baseUrl}/chat/completions`;
-    const t0 = performance.now();
-    const attempts = [];
-    let waitMs = 0;
-
-    // 轮转取一个可用 key；仅当"有 key 但全部在冷却"才算供应商暂时失效。
-    // 没有配置任何 key 时不在这拦截——下降到 401 无 key 报错路径（__needKey）。
-    const key = activeRing.next();
-    if (!key && activeRing.size > 0) {
-      const err = new Error(`openrouter: all API keys are in cooldown (last error < ${cooldownMs}ms ago) — provider temporarily unavailable`);
-      err._t = { attempts: [], waitMs: 0, totalMs: Math.round(performance.now() - t0), cooldownMs };
-      throw err;
-    }
-
-    for (let attempt = 0; ; attempt++) {
-      const t = performance.now();
-      const result = await attemptOnce(url, body, key, activeRing);
-      const type = result instanceof Error ? "network" : `http${result?.status}`;
-      attempts.push({ attempt, type, ms: Math.round(performance.now() - t) });
-      if (result?.__needKey) {
-        const err = new Error(`openrouter: missing ${sourceKey} (chat requires a real key)`);
-        err._t = { attempts, waitMs, totalMs: Math.round(performance.now() - t0) };
-        throw err;
-      }
-      if (result instanceof Error) {
-        const entry = retry?.network;
-        if (entry && attempt < entry.attempts) {
-          await sleep(entry.delayMs);
-          waitMs += entry.delayMs;
-          continue;
-        }
-        activeRing.onError(key);
-        result._t = { attempts, waitMs, totalMs: Math.round(performance.now() - t0) };
-        throw result;
-      }
-      const entry = retry?.[result.status];
-      if (entry && attempt < entry.attempts) {
-        await sleep(entry.delayMs);
-        waitMs += entry.delayMs;
-        continue;
-      }
-      if (result.status === 401 || result.status === 403 || result.status === 429 || result.status >= 500) activeRing.onError(key);
-      result._t = { attempts, waitMs, totalMs: Math.round(performance.now() - t0) };
-      return result;
-    }
-  }
-
-  async function chat(body) {
-    return runChat(body, ring, "MSLXDFF_OPENROUTER_KEY");
-  }
-
-  // ADR-0008 瞬时共享：用组员方传来的临时 key 发布请求（不污染本 provider 的持久 ring）。
-  async function chatWithKeys(body, keys) {
-    const tmp = createKeyRing(keys, { cooldownMs });
-    return runChat(body, tmp, "shared provider keys");
-  }
-
-  // 拉免费模型：pricing 全 0 + 前缀化；可匿名
-  const CACHE_TTL_MS = 10 * 60 * 1000;
-  let cache = null;
-  let fetchedAt = 0;
-  async function listModels() {
-    const now = Date.now();
-    if (cache && now - fetchedAt < CACHE_TTL_MS) return cache;
-    const url = `${baseUrl}/models`;
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(new Error("openrouter models timed out")), 15_000);
-    try {
-      const opts = { headers: { Accept: "application/json" }, signal: controller.signal };
-      if (dispatcher) opts.dispatcher = dispatcher;
-      const res = await fetchImpl(url, opts);
-      if (!res.ok) return [];
-      const json = await res.json().catch(() => ({}));
-      const raw = Array.isArray(json.data) ? json.data : [];
-      const free = raw.filter((m) =>
-        Number(m.pricing?.prompt || 0) === 0 && Number(m.pricing?.completion || 0) === 0
-      );
-      cache = free.map((m) => ({ ...m, id: joinModelId("openrouter", m.id) }));
-      fetchedAt = now;
-      return cache;
-    } catch {
-      return [];
-    } finally {
-      clearTimeout(timer);
-    }
-  }
-
-  async function preheat() {
-    const url = `${baseUrl}/models`;
-    const t0 = performance.now();
-    try {
-      const opts = { headers: { Accept: "application/json" } };
-      if (dispatcher) opts.dispatcher = dispatcher;
-      const res = await fetchImpl(url, opts);
-      try { if (res.body) await res.text().catch(() => {}); } catch {}
-      return { ok: res.ok, status: res.status, ms: Math.round(performance.now() - t0) };
-    } catch (err) {
-      return { ok: false, error: String(err?.message || err), ms: Math.round(performance.now() - t0) };
-    }
-  }
-
-  async function close() {
-    if (agent && typeof agent.close === "function") {
-      try { await agent.close(); } catch {}
-    }
-  }
-
-  return {
+  return createGenericProvider({
     id: "openrouter",
-    chat,
-    chatWithKeys,
-    listModels,
-    preheat,
-    close,
-    agent,
-    keyRing: ring,
-  };
+    baseUrl,
+    apiKeys,
+    apiKey,
+    modelsPath: "/models",
+    chatPath: "/chat/completions",
+    headers: {
+      "HTTP-Referer": process.env.MSLXDFF_OPENROUTER_REFERER || "https://github.com/mslxdff",
+      "X-Title": process.env.MSLXDFF_OPENROUTER_TITLE || "mslxdff",
+      ...(headers || {}),
+    },
+    mapModel: (raw) => raw.filter((m) => Number(m.pricing?.prompt || 0) === 0 && Number(m.pricing?.completion || 0) === 0),
+    fetchImpl,
+    noAgent,
+    ...rest,
+  });
 }
-
-function sleep(ms) {
-  return new Promise((r) => setTimeout(r, ms));
-}