mslxdff 0.1.8 → 0.1.10

package/bin/mslxdff.js

@@ -8,7 +8,7 @@ import { createRouter } from "../src/routes.js";
 import { createUpstreamClient } from "../src/upstream.js";
 import { createModelsService } from "../src/models.js";
 import { loadToken, refreshToken, setPort, getPort, loadGroupsJoined, saveGroupsJoined, loadModelErrors } from "../src/state.js";
-import { startDaemon, stopDaemon, writePid, pidFile, logFile, readPid } from "../src/daemon.js";
+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 { createGroupsService, createBansService, refreshGroupMembers, syncPeersFromMembers } from "../src/groups.js";
@@ -303,6 +303,26 @@ async function syncAllJoinedGroups({ peers, groups }) {
   return results;
 }
 
+// Upgrade-aware handling of a running daemon: keep it when it already runs
+// our version, otherwise stop it so the spawn below takes over. Cleans up
+// stale pid files (daemon died without -stop).
+function stopDaemonIfOutdated() {
+  const pid = readPid();
+  if (!pid) return;
+  if (!isPidAlive(pid)) {
+    console.log(`daemon pid ${pid} is stale (not running) — starting fresh`);
+    return;
+  }
+  const runningVersion = readPidVersion();
+  if (runningVersion === VERSION) return;
+  console.log(
+    runningVersion
+      ? `daemon running v${runningVersion} — upgrading to v${VERSION}, restarting...`
+      : `daemon version unknown — restarting with v${VERSION}...`
+  );
+  stopDaemon();
+}
+
 // -port N: persist the port, then restart the daemon on it if one is running.
 // Skip when we ARE the daemon child (it already carries the port via args).
 const portArg = argValue("-port", "--port");
@@ -330,6 +350,7 @@ if (args.includes("-d") || args.includes("--daemon")) {
   if (!process.env.MSLXDFF_DAEMON) {
     // foreground: spawn the detached background instance, then wait for health
     const port = effectivePort();
+    stopDaemonIfOutdated();
     const spawnedPid = startDaemon(args.filter((a) => a !== "-d" && a !== "--daemon"));
     await waitForHealth(port, 4000);
     console.log(`mslxdff daemon started (pid ${spawnedPid})`);
@@ -343,12 +364,14 @@ if (args.includes("-d") || args.includes("--daemon")) {
 // Bare run: show status + help when the daemon is already up; otherwise spawn it
 // as a background daemon and exit — never holds the terminal (npx-friendly).
 if (!process.env.MSLXDFF_DAEMON) {
-  if (readPid()) {
+  const pid = readPid();
+  if (pid && isPidAlive(pid) && readPidVersion() === VERSION) {
     await printStatus();
     printHelp();
     process.exit(0);
   }
   const port = effectivePort();
+  stopDaemonIfOutdated();
   const spawnedPid = startDaemon([]);
   await waitForHealth(port, 4000);
   console.log(`mslxdff v${VERSION} started as a background daemon (pid ${spawnedPid})`);
@@ -388,7 +411,7 @@ const srv = startServer({ router });
 await srv.ready();
 models.startAutoRefresh();
 if (process.env.MSLXDFF_DAEMON) {
-  writePid(process.pid);
+  writePid(process.pid, VERSION);
 }
 const addr = srv.server.address();
 const host = addr.address === "0.0.0.0" || addr.address === "::" ? "localhost" : addr.address;
@@ -656,6 +679,11 @@ function fmtStatus(id, statuses) {
   return `${e.status}${when}${code}`;
 }
 
+function fmtDur(ms) {
+  if (!Number.isFinite(ms)) return "?";
+  return ms < 1000 ? `${Math.round(ms)}ms` : `${(ms / 1000).toFixed(1)}s`;
+}
+
 function fmtEvent(e) {
   const t = e?.ts ? new Date(e.ts).toISOString().slice(11, 19) : "--:--:--";
   const head = `[${t}]`;
@@ -672,7 +700,7 @@ function fmtEvent(e) {
     case "peer-error":
       return `${head} peer err      ${e.peer} ${e.status ? `HTTP ${e.status}` : "network"}: ${m(e.message)}`;
     case "result":
-      return `${head} result        ${e.status} ${m(e.model)} via=${e.via} ${e.durationMs ?? "?"}ms`;
+      return `${head} result        ${e.status} ${m(e.model)} via=${e.via} 响应耗时 ${fmtDur(e.durationMs)}`;
     default:
       return `${head} ${e?.type || "?"} ${JSON.stringify(e || {})}`;
   }

package/package.json

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

package/src/daemon.js

@@ -33,19 +33,36 @@ export function startDaemon(args = []) {
   return child.pid;
 }
 
-export function writePid(pid) {
+export function writePid(pid, version) {
   const dir = daemonDir();
   mkdirSync(dir, { recursive: true });
-  writeFileSync(pidFile(), String(pid), { mode: 0o600 });
+  writeFileSync(pidFile(), version ? `${pid}\n${version}` : String(pid), { mode: 0o600 });
 }
 
 export function readPid() {
   if (!existsSync(pidFile())) return null;
   const raw = readFileSync(pidFile(), "utf8").trim();
-  const n = Number(raw);
+  const n = Number(raw.split("\n")[0]);
   return Number.isInteger(n) && n > 0 ? n : null;
 }
 
+export function readPidVersion() {
+  if (!existsSync(pidFile())) return null;
+  const raw = readFileSync(pidFile(), "utf8");
+  const lines = raw.split("\n");
+  return lines.length > 1 && lines[1].trim() ? lines[1].trim() : null;
+}
+
+// Best-effort liveness check (signal 0); ESRCH means the process is gone.
+export function isPidAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (err) {
+    return err.code !== "ESRCH";
+  }
+}
+
 export function stopDaemon() {
   const pid = readPid();
   if (!pid) return { stopped: false, reason: "no pid file" };