mslxdff 0.1.41 → 0.1.42

package/bin/mslxdff.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { execFile } from "node:child_process";
-import { readFileSync, existsSync, statSync, rmSync } from "node:fs";
+import { readFileSync, existsSync, statSync, rmSync, writeFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import { dirname, join, basename } from "node:path";
 import { startServer, resolvePort } from "../src/server.js";
@@ -192,14 +192,24 @@ if (args.includes("-model") || args.includes("-models")) {
 // event bus — no filesystem polling. Ctrl+C / SIGTERM restarts the daemon in
 // the background, then exits. See the daemon body below for the stream wiring.
 if (args.includes("-debug") || args.includes("--debug")) {
-  const recent = recentEvents(100);
-  if (recent.length) {
-    console.log(`--- last ${recent.length} event(s) ---`);
-    for (const e of recent) console.log(fmtEvent(e));
-  }
-  console.log("--- live (Ctrl+C: stop debugging and restore background daemon) ---");
+  // 先停旧 daemon，再清日志，保持 debug 输出干净（仅本次会话）
   const { stopped, pid } = stopDaemon();
   if (stopped) console.log(`[debug] stopped background daemon (pid ${pid})`);
+  try {
+    const dir = logDir();
+    const toClear = [eventsFile(), callsFile(), errorsFile(), logFile()];
+    let cleared = 0;
+    for (const f of toClear) {
+      try {
+        if (existsSync(f)) {
+          writeFileSync(f, "");
+          cleared++;
+        }
+      } catch {}
+    }
+    console.log(`[debug] 已清理旧日志 ${cleared} 个文件 (${dir})，本次会话干净输出`);
+  } catch {}
+  console.log("--- live (Ctrl+C: stop debugging and restore background daemon) ---");
   process.env.MSLXDFF_DEBUG = "1";
   process.env.MSLXDFF_DAEMON = "1";
   // fall through to the daemon body below — no process.exit() here
@@ -692,6 +702,19 @@ if (isDebug) {
 }
 
 await srv.ready();
+
+// 上游 Keep-Alive 预热：首条 TCP+TLS 暖好，100ms 后异步触发，不阻塞 ready
+setTimeout(() => {
+  upstream.preheat().then((r) => {
+    const entry = { ts: Date.now(), type: "upstream-preheat", ...r, baseUrl };
+    try { bus.emit(entry); } catch {}
+    try { logs.appendEvent(entry); } catch {}
+    if (r.skipped) console.log(`[preheat] skipped (MSLXDFF_PREHEAT disabled)`);
+    else if (r.ok) console.log(`[preheat] opencode models ok ${r.status} ${r.ms}ms`);
+    else console.log(`[preheat] opencode models failed ${r.error || r.status || ""} ${r.ms || 0}ms`);
+  }).catch(() => {});
+}, 100).unref?.();
+
 models.startAutoRefresh();
 if (process.env.MSLXDFF_DAEMON) {
   writePid(process.pid, VERSION);
@@ -1195,6 +1218,9 @@ function fmtEvent(e) {
       return `${head} upstream ok   ${m(e.model)} HTTP ${e.status}${e.timing ? ` total=${e.timing.totalMs}ms` : ""}`;
     case "upstream-error":
       return `${head} upstream err  ${m(e.model)} ${e.status ? `HTTP ${e.status}` : "network"}: ${m(e.message)}`;
+    case "upstream-preheat":
+      if (e.skipped) return `${head} preheat       跳过 (MSLXDFF_PREHEAT disabled)`;
+      return `${head} preheat       预热 opencode models ${e.ok ? "ok" : "fail"} ${e.status ? `HTTP ${e.status}` : e.error || ""} ${e.ms ? `${e.ms}ms` : ""}`;
     case "peer-race-start":
       return `${head} peer race     开始并发给组员 model=${m(e.model)} peers=${e.peers}`;
     case "peer-health":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mslxdff",
-  "version": "0.1.41",
+  "version": "0.1.42",
   "description": "测试项目，请勿使用。",
   "type": "module",
   "bin": {
@@ -23,5 +23,8 @@
     "demo",
     "placeholder"
   ],
-  "license": "MIT"
+  "license": "MIT",
+  "dependencies": {
+    "undici": "^8.10.0"
+  }
 }

package/src/upstream.js

@@ -1,9 +1,31 @@
 import crypto from "node:crypto";
 
+let UndiciAgent = null;
+let UndiciFetch = null;
+try {
+  const mod = await import("undici");
+  UndiciAgent = mod.Agent;
+  UndiciFetch = mod.fetch;
+} catch {
+  // undici not installed — fallback to no dispatcher (still works, just no keep-alive tuning)
+}
+
 function genId(prefix) {
   return `${prefix}${crypto.randomUUID().replace(/-/g, "")}`;
 }
 
+function envInt(name, fallback) {
+  const v = Number(process.env[name]);
+  return Number.isInteger(v) && v > 0 ? v : fallback;
+}
+
+function isPreheatDisabled() {
+  const raw = process.env.MSLXDFF_PREHEAT;
+  if (raw === undefined || raw === null || raw === "") return false;
+  const s = String(raw).trim().toLowerCase();
+  return s === "0" || s === "off" || s === "false" || s === "no" || s === "disable" || s === "disabled";
+}
+
 export function createUpstreamClient({
   baseUrl = process.env.UPSTREAM_BASE_URL || "https://opencode.ai",
   authToken = process.env.UPSTREAM_AUTH_TOKEN || "public",
@@ -15,8 +37,10 @@ export function createUpstreamClient({
     503: { attempts: 1, delayMs: 500 },
     504: { attempts: 1, delayMs: 500 },
   },
-  fetchImpl = fetch,
+  fetchImpl,
 } = {}) {
+  // 使用 undici 的 fetch 与 Agent 配对，避免 global fetch 与 npm undici Agent 不兼容
+  if (!fetchImpl) fetchImpl = UndiciFetch || fetch;
   const baseHeaders = {
     "Content-Type": "application/json",
     "Authorization": `Bearer ${authToken}`,
@@ -35,6 +59,27 @@ export function createUpstreamClient({
     };
   }
 
+  // Keep-Alive Agent（显式复用 TCP+TLS）
+  const keepAliveTimeout = envInt("MSLXDFF_UPSTREAM_KEEPALIVE_TIMEOUT", 30_000);
+  const keepAliveMaxTimeout = envInt("MSLXDFF_UPSTREAM_KEEPALIVE_MAX_TIMEOUT", 60_000);
+  const keepAliveConnections = envInt("MSLXDFF_UPSTREAM_KEEPALIVE_CONNECTIONS", 20);
+  let dispatcher = null;
+  let agent = null;
+  if (UndiciAgent) {
+    try {
+      agent = new UndiciAgent({
+        keepAliveTimeout,
+        keepAliveMaxTimeout,
+        connections: keepAliveConnections,
+        pipelining: 1,
+      });
+      dispatcher = agent;
+    } catch {
+      agent = null;
+      dispatcher = null;
+    }
+  }
+
   async function chat(body) {
     const url = `${baseUrl}/zen/v1/chat/completions`;
     const t0 = performance.now();
@@ -85,12 +130,14 @@ export function createUpstreamClient({
     );
     try {
       const headers = buildHeaders(body);
-      const res = await fetchImpl(url, {
+      const opts = {
         method: "POST",
         headers,
         body: JSON.stringify(body),
         signal: controller.signal,
-      });
+      };
+      if (dispatcher) opts.dispatcher = dispatcher;
+      const res = await fetchImpl(url, opts);
       return res;
     } catch (err) {
       return err;
@@ -99,9 +146,46 @@ export function createUpstreamClient({
     }
   }
 
+  async function preheat() {
+    if (isPreheatDisabled()) return { ok: false, skipped: true, reason: "disabled" };
+    const url = `${baseUrl}/zen/v1/models`;
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(new Error("preheat timed out after 3000ms")), 3000);
+    const t0 = performance.now();
+    try {
+      const headers = buildHeaders({ stream: false });
+      const opts = {
+        method: "GET",
+        headers,
+        signal: controller.signal,
+      };
+      if (dispatcher) opts.dispatcher = dispatcher;
+      const res = await fetchImpl(url, opts);
+      const ms = Math.round(performance.now() - t0);
+      // 消耗 body 以释放连接回池（即使不需要内容）
+      try { if (res.body) await res.text().catch(() => {}); } catch {}
+      return { ok: res.ok, status: res.status, ms };
+    } catch (err) {
+      return { ok: false, error: String(err?.message || err), ms: Math.round(performance.now() - t0) };
+    } finally {
+      clearTimeout(timer);
+    }
+  }
+
+  let closed = false;
+  async function close() {
+    if (closed) return;
+    closed = true;
+    if (agent && typeof agent.close === "function") {
+      try { await agent.close(); } catch {}
+    } else if (dispatcher && typeof dispatcher.close === "function" && dispatcher !== agent) {
+      try { await dispatcher.close(); } catch {}
+    }
+  }
+
   // 兼容旧调用：headers 为动态生成，暴露 getter 快照（用于测试/展示）
   const headers = buildHeaders({});
-  return { chat, headers, buildHeaders };
+  return { chat, preheat, close, headers, buildHeaders, dispatcher, agent, [Symbol.asyncDispose]: close };
 }
 
 function sleep(ms) {