mslxdff 0.1.80 → 0.1.82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mslxdff",
-  "version": "0.1.80",
+  "version": "0.1.82",
   "description": "测试项目，请勿使用。",
   "type": "module",
   "bin": {

package/src/cli/commands/provider/bench.js

@@ -29,11 +29,10 @@ async function clineBenchOne({ baseUrl, model, accessToken, prompt, maxTokens, t
     const reader = res.body.getReader();
     const decoder = new TextDecoder();
     let buf = "";
-    const firstChunkAt = performance.now();
     for (;;) {
       const { done, value } = await reader.read();
       if (done) break;
-      if (ttfbMs === null) ttfbMs = Math.round(performance.now() - firstChunkAt);
+      if (ttfbMs === null) ttfbMs = Math.round(performance.now() - t0);
       buf += decoder.decode(value, { stream: true });
       let idx;
       while ((idx = buf.indexOf("\n")) >= 0) {
@@ -174,7 +173,7 @@ async function handleVia({ providerId, opts, fetchImpl, loadConfigs, loadKeys, l
       const aIdx = Math.min(kIdx, Math.max(auths.length - 1, 0));
       const key = keys[kIdx] || keys[0] || "";
       const auth = auths[aIdx] || auths[0] || null;
-      const cKeys = keys.filter((k) => isRefreshToken(k));
+      const cKeys = keys.filter((k) => isRefreshToken(k, p));
       if (cKeys.length) {
         const normBase = String(baseUrl).replace(/\/+$/, "");
         const chatBase = normBase.endsWith("/api/v1") ? normBase.slice(0, -7) : normBase;
@@ -197,10 +196,20 @@ async function handleVia({ providerId, opts, fetchImpl, loadConfigs, loadKeys, l
       const aIdx = Math.min(kIdx, Math.max(auths.length - 1, 0));
       const key = keys[kIdx] || keys[0] || "";
       const auth = auths[aIdx] || auths[0] || null;
-      const cKeys = keys.filter((k) => isRefreshToken(k));
+      const cKeys = keys.filter((k) => isRefreshToken(k, p));
       if (cKeys.length) {
-        // cline refreshToken 需特殊流，暂走旧的 peer chat（peer 需自有 cline 配置）
-        return viaProbe({ ...args, token, fetchImpl });
+        const normBase = String(baseUrl).replace(/\/+$/, "");
+        const chatBase = normBase.endsWith("/api/v1") ? normBase.slice(0, -7) : normBase;
+        const rt = cKeys[0];
+        const at = await refreshTokenForBase({ refreshToken: rt, baseUrl: normBase, fetchImpl });
+        if (!at) return { ok: false, label: "鉴权失败", error: "refresh failed", ttfbMs: null, totalMs: 0 };
+        const targetUrl = `${chatBase}/api/v1/chat/completions`;
+        const headers = clineHeaders(`sess_bench_via_${Date.now()}`, at);
+        const rawModel = String(model).startsWith(`${p}/`) ? String(model).slice(p.length + 1) : String(model);
+        const body = { model: rawModel, messages: [{ role: "user", content: "hi" }], stream: true, max_tokens: 5, session_id: `sess_bench_via_${Date.now()}`, reasoning_effort: "high" };
+        const peer = peers.find((pe) => pe.url === peerUrl || (pe.name || pe.id) === peerUrl);
+        const peerToken = peer?.token || token;
+        return viaProbe({ peerUrl, token: peerToken, relayTarget: targetUrl, relayHeaders: headers, relayBody: body, timeoutMs: opts.timeoutMs, fetchImpl });
       }
       const rawModel = String(model).startsWith(`${p}/`) ? String(model).slice(p.length + 1) : String(model);
       const targetUrl = p === "opencode" ? `${process.env.UPSTREAM_BASE_URL || "https://opencode.ai"}/zen/v1/chat/completions` : `${String(baseUrl).replace(/\/+$/, "")}${chatPath}`;
@@ -280,7 +289,7 @@ export async function handleProviderBench(id, sub, rest, args, deps = {}) {
   log(`bench ${providerId}: 共 ${allowed.length} 个已勾选模型，逐个测速（串行，${opts.timeoutMs}ms 超时）...`);
   if (!opts.json) console.log(`prompt="${opts.prompt}" maxTokens=${opts.maxTokens}\n`);
   const chatPath = cfg.chatPath || defaultChatPath(providerId);
-  const rtKeys = keys.filter((k) => isRefreshToken(k));
+  const rtKeys = keys.filter((k) => isRefreshToken(k, providerId));
   const normBase = String(baseUrl).replace(/\/+$/, "");
   const clineChatBase = normBase.endsWith("/api/v1") ? normBase.slice(0, -7) : normBase;
   const results = [];

package/src/providers/cline/headers.js

@@ -20,12 +20,18 @@ export function clineHeaders(sessionId, token) {
   };
 }
 
-export function isRefreshToken(key) {
+export function isRefreshToken(key, providerId = "") {
   const s = String(key || "").trim();
   if (!s) return false;
-  // sk_ / sk- 形态直接视为旧直连 key（OpenAI 兼容网关），不走 refresh 链
+  // 仅 cline 系供应商才有 refreshToken 形态（WorkOS 设备授权）；其他一律走传统 Key
+  const pid = String(providerId || "").toLowerCase();
+  const baseHint = pid;
+  const isCline = baseHint.includes("cline");
+  if (!isCline) {
+    // 非 cline 供应商，即使长串也不视为 refreshToken，默认传统 Key（以后 xxx.bot 再扩展此处白名单）
+    return false;
+  }
   if (s.startsWith("sk_") || s.startsWith("sk-")) return false;
-  // refreshToken 通常为 JWT 或长随机串，长度 > 20 且含 . 或 -
   if (s.length > 20) return true;
   return false;
 }

package/src/providers/cline/index.js

@@ -45,8 +45,8 @@ export function createClineProvider({
     if (alt.length) extraKeys = alt;
   } catch {}
   const allKeys = [...new Set([...rawKeys, ...extraKeys].map((k) => String(k).trim()).filter(Boolean))];
-  const hasRefresh = allKeys.some((k) => isRefreshToken(k));
-  const ring = createKeyRing(allKeys.filter((k) => !isRefreshToken(k)), { cooldownMs });
+  const hasRefresh = allKeys.some((k) => isRefreshToken(k, id));
+  const ring = createKeyRing(allKeys.filter((k) => !isRefreshToken(k, id)), { cooldownMs });
 
   let dispatcher = null; let agent = null;
   const a = createAgent({ keepAliveTimeout: envInt("MSLXDFF_CLINE_KEEPALIVE_TIMEOUT", 30_000), keepAliveMaxTimeout: envInt("MSLXDFF_CLINE_KEEPALIVE_MAX_TIMEOUT", 60_000), connections: envInt("MSLXDFF_CLINE_KEEPALIVE_CONNECTIONS", 20) });
@@ -62,7 +62,7 @@ export function createClineProvider({
   // 新 refreshToken 模式
   let authPool = null; let newChatSvc = null;
   if (hasRefresh) {
-    const refreshTokens = allKeys.filter((k) => isRefreshToken(k));
+    const refreshTokens = allKeys.filter((k) => isRefreshToken(k, id));
     authPool = createAuthPool({
       id, keys: refreshTokens, fetchImpl, dispatcher, baseUrl: resolvedBase, file,
       saveFn: async ({ oldRefreshToken, newRefreshToken }) => {
@@ -94,13 +94,13 @@ export function createClineProvider({
   }
 
   async function chatWithKeys(body, keys) {
-    const refreshSubset = (keys || []).filter((k) => isRefreshToken(k));
+    const refreshSubset = (keys || []).filter((k) => isRefreshToken(k, id));
     if (refreshSubset.length && hasRefresh) {
       const tmpPool = createAuthPool({ id, keys: refreshSubset, fetchImpl, dispatcher, baseUrl: resolvedBase, file });
       const tmpSvc = createChatService({ id, baseUrl: resolvedBase, chatPath: resolvedChatPath, fetchImpl, dispatcher, authPool: tmpPool, connectTimeoutMs, retry });
       return tmpSvc.runChat(body, createKeyRing([], { cooldownMs }), "shared");
     }
-    const tmpRing = createKeyRing((keys || []).filter((k) => !isRefreshToken(k)), { cooldownMs });
+    const tmpRing = createKeyRing((keys || []).filter((k) => !isRefreshToken(k, id)), { cooldownMs });
     return oldRunner.runChat(body, tmpRing, "shared provider keys");
   }