mslxdff 0.1.10 → 0.1.12

package/bin/mslxdff.js

@@ -4,6 +4,7 @@ import { readFileSync, existsSync, statSync, watch, openSync, closeSync, mkdirSy
 import { fileURLToPath } from "node:url";
 import { dirname, join, basename } from "node:path";
 import { startServer, resolvePort } from "../src/server.js";
+import { DEFAULT_PORT } from "../src/state.js";
 import { createRouter } from "../src/routes.js";
 import { createUpstreamClient } from "../src/upstream.js";
 import { createModelsService } from "../src/models.js";
@@ -11,6 +12,7 @@ import { loadToken, refreshToken, setPort, getPort, loadGroupsJoined, saveGroups
 import { startDaemon, stopDaemon, writePid, pidFile, logFile, readPid, readPidVersion, isPidAlive } from "../src/daemon.js";
 import { createAutoSelector } from "../src/auto.js";
 import { createPeersService } from "../src/peers.js";
+import { createEventBus } from "../src/events.js";
 import { createGroupsService, createBansService, refreshGroupMembers, syncPeersFromMembers } from "../src/groups.js";
 import { logDir, recentCalls, lastError, appendCall, appendError, appendEvent, eventsFile, recentEvents } from "../src/logs.js";
 
@@ -405,7 +407,8 @@ const peers = createPeersService({ cooldownMs: peerCooldownMs(), heatMs: peerHea
 const groups = createGroupsService({});
 const bans = createBansService({ windowMs: banWindowMs(), threshold: banThreshold() });
 
-const router = createRouter({ token, upstream, models, auto, logs, peers, maxHops: maxHopsValue(), groups, bans });
+const bus = createEventBus();
+const router = createRouter({ token, upstream, models, auto, logs, peers, maxHops: maxHopsValue(), groups, bans, bus });
 const srv = startServer({ router });
 
 await srv.ready();
@@ -706,70 +709,132 @@ function fmtEvent(e) {
   }
 }
 
-// Live-follow the daemon's event stream: print the recent tail, then stream
-// new lines as they are appended (Ctrl+C to exit).
+// Live-follow the daemon: replay the file backlog, then stream events over
+// HTTP (SSE) which the daemon pushes from memory — no filesystem watch/poll
+// involved on the live path. Falls back to file polling if the stream fails.
 async function liveDebug() {
   const file = eventsFile();
-  // ensure the event file exists so watch() doesn't fail on a fresh daemon dir
+  const dir = dirname(file);
+  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 to exit) ---");
+
+  try {
+    await streamEventsHttp();
+    return; // stream kept running until Ctrl+C
+  } catch (err) {
+    console.error(`[debug] streaming failed (${err.message}) — falling back to file polling`);
+  }
+
+  // File-poll fallback (daemon too old to expose the SSE endpoint).
   if (!existsSync(file)) {
     try {
-      mkdirSync(dirname(file), { recursive: true });
+      mkdirSync(dir, { recursive: true });
       closeSync(openSync(file, "a"));
     } catch {
       console.error(`cannot create event file: ${file}`);
       process.exit(1);
     }
   }
-  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 to exit) ---");
-  if (!existsSync(file)) console.log("(no events yet — trigger a chat request to see the flow)");
-
   let pos = existsSync(file) ? statSync(file).size : 0;
   let buf = "";
   const pump = () => {
-    if (!existsSync(file)) {
-      pos = 0;
-      buf = "";
-      return;
+    try {
+      if (!existsSync(file)) {
+        pos = 0;
+        buf = "";
+        return;
+      }
+      const size = statSync(file).size;
+      if (size < pos) {
+        pos = 0;
+        buf = "";
+      }
+      if (size === pos) return;
+      buf += readFileSync(file, "utf8").slice(pos);
+      pos = size;
+      const lines = buf.split("\n");
+      buf = lines.pop() || "";
+      for (const l of lines) {
+        if (!l.trim()) continue;
+        try {
+          console.log(fmtEvent(JSON.parse(l)));
+        } catch {
+          // partial/corrupt line while trimming — skip
+        }
+      }
+    } catch (err) {
+      console.error(`[debug] poll error: ${err.message}`);
     }
-    const size = statSync(file).size;
-    if (size < pos) {
-      pos = 0; // file trimmed/rewritten: re-follow from the start of what remains
-      buf = "";
+  };
+  setInterval(pump, 500);
+  pump();
+  await new Promise(() => {}); // run until Ctrl+C
+}
+
+// Connect to the daemon's SSE stream (authenticated), print each event.
+// Resolves when the connection ends; throws on connect failure.
+async function streamEventsHttp() {
+  const { token } = await loadToken();
+  const port = getPort() || DEFAULT_PORT;
+  const url = `http://127.0.0.1:${port}/v1/_debug/stream`;
+  // daemon may still be starting when -debug is launched right after it —
+  // retry a few times before giving up on the stream.
+  let res = null;
+  let lastErr = null;
+  for (let attempt = 1; attempt <= 10 && !res; attempt++) {
+    try {
+      res = await fetch(url, {
+        headers: { Authorization: `Bearer ${token}` },
+        signal: AbortSignal.timeout(10_000),
+      });
+    } catch (err) {
+      lastErr = err;
+      await new Promise((r) => setTimeout(r, 500));
     }
-    if (size === pos) return;
-    buf += readFileSync(file, "utf8").slice(pos);
-    pos = size;
-    const lines = buf.split("\n");
-    buf = lines.pop() || "";
-    for (const l of lines) {
-      if (!l.trim()) continue;
+  }
+  if (!res) throw lastErr || new Error("cannot reach daemon");
+  if (res.status === 401) throw new Error("unauthorized (token mismatch?)");
+  if (res.status === 404) throw new Error("daemon too old (no stream endpoint)");
+  if (!res.ok) throw new Error(`daemon responded ${res.status}`);
+  const reader = res.body.getReader();
+  const decoder = new TextDecoder();
+  let chunk = "";
+  const first = await Promise.race([
+    reader.read(),
+    new Promise((_, reject) => setTimeout(() => reject(new Error("no data from stream")), 15_000)),
+  ]);
+  if (first.done) return;
+  console.log(`streaming from http://127.0.0.1:${port} (Ctrl+C to exit)`);
+  chunk += decoder.decode(first.value, { stream: true });
+  const lines = chunk.split("\n");
+  chunk = lines.pop() || "";
+  for (const l of lines) {
+    if (!l.startsWith("data: ")) continue;
+    try {
+      console.log(fmtEvent(JSON.parse(l.slice(6))));
+    } catch {
+      // skip malformed frames
+    }
+  }
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    chunk += decoder.decode(value, { stream: true });
+    const frameLines = chunk.split("\n");
+    chunk = frameLines.pop() || "";
+    for (const l of frameLines) {
+      if (!l.startsWith("data: ")) continue;
       try {
-        console.log(fmtEvent(JSON.parse(l)));
+        console.log(fmtEvent(JSON.parse(l.slice(6))));
       } catch {
-        // partial/corrupt line while trimming — skip
+        // skip malformed frames
       }
     }
-  };
-  try {
-    mkdirSync(dirname(file), { recursive: true });
-    watch(dirname(file), (_evt, filename) => {
-      if (!filename || basename(String(filename)) !== basename(file)) return;
-      pump();
-    });
-  } catch {
-    console.error(`cannot watch event dir: ${dirname(file)}`);
-    process.exit(1);
   }
-  // fs.watch is unreliable for freshly-created files on Windows — poll as a
-  // safety net so events are never missed.
-  setInterval(pump, 250);
-  pump();
-  await new Promise(() => {}); // run until Ctrl+C
 }
 
 function fmtTs(iso) {  if (!iso) return "-";

package/package.json

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

package/src/events.js

@@ -0,0 +1,39 @@
+// In-memory event bus for live debugging: routes.js emits, -debug streams
+// over HTTP. Keeps a small ring buffer so late subscribers can catch up.
+
+const MAX_BUFFERED = 500;
+
+export function createEventBus() {
+  let buffer = [];
+  const listeners = new Set();
+
+  return {
+    // emit an event to every current subscriber (sync, never throws)
+    emit(event) {
+      buffer.push(event);
+      if (buffer.length > MAX_BUFFERED) buffer.splice(0, buffer.length - MAX_BUFFERED);
+      for (const fn of listeners) {
+        try {
+          fn(event);
+        } catch {
+          // subscriber errors must never break the request path
+        }
+      }
+    },
+    // subscribe; returns an unsubscribe fn
+    subscribe(fn) {
+      listeners.add(fn);
+      return () => listeners.delete(fn);
+    },
+    // buffered events since start (or from offset), consumed left-to-right
+    replay({ since = 0 } = {}) {
+      return buffer.slice(since);
+    },
+    replayAll() {
+      return buffer.slice();
+    },
+    size() {
+      return buffer.length;
+    },
+  };
+}

package/src/routes.js

@@ -6,12 +6,23 @@ import { DEFAULT_MAX_HOPS } from "./peers.js";
 
 export const errMsg = (err) => String(err?.message || err);
 
-export function createRouter({ token, upstream, models, auto, logs, peers, maxHops = DEFAULT_MAX_HOPS, groups, bans }) {
+export function createRouter({ token, upstream, models, auto, logs, peers, maxHops = DEFAULT_MAX_HOPS, groups, bans, bus }) {
   return async function router(req, res) {
     const method = req.method || "GET";
     const path = (req.url || "").split("?")[0];
 
     const route = ROUTES.find((r) => r.method === method && r.path === path);
+
+    if (bus && path === "/v1/_debug/stream") {
+      // live debug stream (SSE): auth REQUIRED, then replay backlog + push
+      if (!authorized(req, token)) {
+        res.statusCode = 401;
+        res.setHeader("WWW-Authenticate", "Bearer");
+        return json(res, 401, { error: "Unauthorized" });
+      }
+      return streamEvents(req, res, bus);
+    }
+
     if (!route) return notFound(res);
 
     if (route.requiresAuth && !authorized(req, token)) {
@@ -20,10 +31,39 @@ export function createRouter({ token, upstream, models, auto, logs, peers, maxHo
       return json(res, 401, { error: "Unauthorized" });
     }
 
-    await route.handler({ req, res, upstream, models, auto, logs, peers, maxHops, groups, bans, token });
+    await route.handler({ req, res, upstream, models, auto, logs, peers, maxHops, groups, bans, token, bus });
   };
 }
 
+// SSE endpoint consumed by `mslxdff -debug`: replays the buffered backlog,
+// then pushes each new event as it happens. One second heartbeat keeps
+// proxies/NAT from closing the connection.
+function streamEvents(req, res, bus) {
+  res.statusCode = 200;
+  res.setHeader("Content-Type", "text/event-stream");
+  res.setHeader("Cache-Control", "no-cache");
+  res.setHeader("Connection", "keep-alive");
+  res.flushHeaders?.();
+
+  for (const e of bus.replayAll()) {
+    res.write(`data: ${JSON.stringify(e)}\n\n`);
+  }
+  const unsubscribe = bus.subscribe((e) => {
+    res.write(`data: ${JSON.stringify(e)}\n\n`);
+  });
+  const heartbeat = setInterval(() => {
+    res.write(`: ping\n\n`);
+  }, 15_000);
+  res.on("close", () => {
+    clearInterval(heartbeat);
+    unsubscribe();
+  });
+  req.on("close", () => {
+    clearInterval(heartbeat);
+    unsubscribe();
+  });
+}
+
 function clientIp(req) {
   const fwd = req.headers["x-forwarded-for"];
   const head = typeof fwd === "string" ? fwd.split(",")[0].trim() : "";
@@ -175,7 +215,7 @@ const ROUTES = [
     method: "POST",
     path: "/v1/chat/completions",
     requiresAuth: true,
-    handler: async ({ req, res, upstream, auto, logs, peers, maxHops }) => {
+    handler: async ({ req, res, upstream, auto, logs, peers, maxHops, bus }) => {
       let body;
       try {
         body = await readBody(req);
@@ -205,7 +245,11 @@ const ROUTES = [
         logs?.appendCall({ model, auto: useAuto, status, durationMs: Date.now() - startedAt, stream: Boolean(body.stream) });
       const logError = (model, status, message) =>
         logs?.appendError({ model, auto: useAuto, status, message });
-      const evt = (type, data) => logs?.appendEvent?.({ type, ...data, model: data.model ?? requested, auto: useAuto, durationMs: Date.now() - startedAt });
+      const evt = (type, data) => {
+        const entry = { ts: Date.now(), type, ...data, model: data.model ?? requested, auto: useAuto, durationMs: Date.now() - startedAt };
+        if (bus) bus.emit(entry);
+        logs?.appendEvent?.(entry);
+      };
       evt("request", { hops, ip: clientIp(req), stream: Boolean(body.stream), prompt: summarizePrompt(body) });
 
       let lastErr = null;

package/src/server.js

@@ -19,6 +19,9 @@ export function startServer({ router }, port = resolvePort()) {
   const close = () =>
     new Promise((resolve) => {
       server.close(resolve);
+      // SSE debug streams keep connections open — force-close so shutdown
+      // never waits on them.
+      server.closeAllConnections?.();
     });
 
   process.on("SIGINT", close);