mslxdff 0.1.81 → 0.1.83

package/package.json

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

package/src/bench/report.js

@@ -91,7 +91,15 @@ export function formatViaReport(results, { peers = [], meta = {}, json = false }
     const isDirectBest = bestKey === "direct";
     const directCell = pad(`${directTxt}${isDirectBest ? "★" : ""}`, colW, "right");
     const viaCells = peerIds.map((pid) => {
-      const v = r.via?.[pid];
+      // via keys 可能存为完整 url（如 http://172...）而 peerIds 已短化，兼容两者
+      let v = r.via?.[pid];
+      if (!v) {
+        // 尝试完整 url 变体
+        const full = Object.keys(r.via || {}).find((k) => {
+          try { const u = new URL(k); return (u.hostname + (u.port ? `:${u.port}` : "")) === pid; } catch { return false; }
+        });
+        if (full) v = r.via[full];
+      }
       if (!v) return pad("—", colW, "right");
       if (v.ok) {
         const txt = `${v.ttfbMs ?? v.totalMs ?? "—"}ms`;

package/src/bench/via.js

@@ -101,8 +101,10 @@ export async function orchestrateVia({
     for (const peer of peers) {
       const raw = String(peer.name || peer.id || peer.url || "peer");
       let peerId = raw;
-      // 仅当 raw 本身就是 url 时才短化；显式 name/id 保持原样，避免 B → b:8989
-      if (!peer.name && !peer.id && raw.includes("://")) { try { const u = new URL(raw); peerId = u.hostname + (u.port ? `:${u.port}` : ""); } catch { peerId = raw.slice(-16); } }
+      // 组员 name 可能存为完整 url（如 http://172.93...），统一短化为 host:port，防止 report 端 peerIds 与 via keys 不一致导致表格空白
+      if (raw.includes("://")) {
+        try { const u = new URL(raw); const host = u.hostname; const port = u.port ? `:${u.port}` : ""; if (host) peerId = `${host}${port}`; else peerId = raw.slice(-16); } catch { peerId = raw.slice(-16); }
+      }
       const peerToken = peer.token || token || "";
       try {
         const r = await viaProbeFn({ peerUrl: peer.url, token: peerToken, providerId: provider, model, prompt: "hi", maxTokens: 5, timeoutMs, clock });

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) {
@@ -199,8 +198,18 @@ async function handleVia({ providerId, opts, fetchImpl, loadConfigs, loadKeys, l
       const auth = auths[aIdx] || auths[0] || null;
       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}`;