mslxdff 0.1.31 → 0.1.33

package/bin/mslxdff.js

@@ -14,7 +14,7 @@ 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, recentEvents } from "../src/logs.js";
+import { logDir, recentCalls, lastError, appendCall, appendError, appendEvent, recentEvents, eventsFile, callsFile, errorsFile } from "../src/logs.js";
 
 const logs = { appendCall, appendError, appendEvent };
 
@@ -85,6 +85,29 @@ if (args.includes("-uninstall") || args.includes("--uninstall")) {
   process.exit(0);
 }
 
+if (args.includes("-log") || args.includes("--log") || args.includes("-logs") || args.includes("--logs")) {
+  const idx = args.findIndex((x) => x === "-log" || x === "--log" || x === "-logs" || x === "--logs");
+  const raw = args[idx + 1];
+  const n = Number(raw);
+  const count = Number.isInteger(n) && n > 0 ? n : 10;
+  const file = eventsFile();
+  const dir = logDir();
+  console.log(`log dir: ${dir}`);
+  console.log(`events:  ${file}`);
+  const evts = recentEvents(count);
+  if (!evts.length) {
+    console.log(`(no events yet — file empty or not found)`);
+  } else {
+    console.log(`--- last ${evts.length} event(s) ---`);
+    for (const e of evts) console.log(fmtEvent(e));
+  }
+  // also hint for other logs
+  if (count <= 10) {
+    console.log(`\nhint: mslxdff -log 100  |  calls: ${callsFile()}  errors: ${errorsFile()}  daemon: ${logFile()}`);
+  }
+  process.exit(0);
+}
+
 if (args.includes("-status") || args.includes("--status") || args.includes("-s")) {
   await printStatus();
   process.exit(0);
@@ -664,6 +687,49 @@ const groupSyncTimer = setInterval(() => {
 }, groupSyncIntervalMs());
 groupSyncTimer.unref();
 
+// Auto-update: periodically check npm for a newer mslxdff and restart.
+// Enable with MSLXDFF_AUTO_UPDATE=1 (hourly) or MSLXDFF_AUTO_UPDATE_MS=<ms>.
+// Uses the same npm view/install path as `mslxdff -update`, but runs inside
+// the daemon so no manual intervention is needed.
+const autoUpdateMs = autoUpdateIntervalMs();
+if (autoUpdateMs) {
+  console.log(`auto-update enabled: checking every ${Math.round(autoUpdateMs / 60000)}m`);
+  const autoUpdateTimer = setInterval(() => {
+    checkAndAutoUpdate().catch((err) => console.log(`auto-update check failed: ${errMsg(err)}`));
+  }, autoUpdateMs);
+  autoUpdateTimer.unref();
+}
+
+async function checkAndAutoUpdate() {
+  const info = await run(npmCmd(), ["view", "mslxdff", "version", "dist-tags.latest"]);
+  if (info.err) throw new Error(info.err.message);
+  const parts = (info.stdout || "").trim().split(/\s+/).filter(Boolean);
+  const latest = parts[parts.length - 1];
+  if (!latest || latest === VERSION) return;
+  // simple semver compare: skip if latest is not newer
+  if (compareSemver(latest, VERSION) <= 0) return;
+  console.log(`auto-update: v${VERSION} -> v${latest}, installing...`);
+  const up = await run(npmCmd(), ["install", "-g", `mslxdff@${latest}`]);
+  if (up.err) throw new Error(up.err.message);
+  console.log(`auto-update: installed v${latest}, restarting daemon...`);
+  try { stopDaemon(); } catch {}
+  // startDaemon re-reads VERSION from the newly installed package on next boot;
+  // for the current process we just respawn with the new code.
+  const newPid = startDaemon([]);
+  await waitForHealth(resolvePort(), 8000);
+  console.log(`auto-update: restarted as v${latest} (pid ${newPid})`);
+}
+
+function compareSemver(a, b) {
+  const pa = a.split(".").map((x) => parseInt(x, 10) || 0);
+  const pb = b.split(".").map((x) => parseInt(x, 10) || 0);
+  for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
+    const av = pa[i] || 0, bv = pb[i] || 0;
+    if (av !== bv) return av - bv;
+  }
+  return 0;
+}
+
 function argValue(...names) {
   for (let i = 0; i < args.length; i++) {
     if (names.includes(args[i])) return args[i + 1];
@@ -712,6 +778,14 @@ function groupSyncIntervalMs() {
   return Number.isInteger(n) && n > 0 ? n : 60_000;
 }
 
+function autoUpdateIntervalMs() {
+  const raw = process.env.MSLXDFF_AUTO_UPDATE_MS ?? process.env.MSLXDFF_AUTO_UPDATE;
+  if (raw === undefined || raw === null || raw === "") return 0;
+  if (raw === "1" || String(raw).toLowerCase() === "true") return 60 * 60 * 1000;
+  const n = Number(raw);
+  return Number.isInteger(n) && n > 0 ? n : 0;
+}
+
 function banWindowMs() {
   const n = Number(process.env.MSLXDFF_BAN_WINDOW_MS);
   return Number.isInteger(n) && n > 0 ? n : 48 * 60 * 60 * 1000;
@@ -742,6 +816,7 @@ Usage:
   mslxdff                          start as a background daemon and exit (status + help if one is already running)
   mslxdff -d                       start as a background daemon
   mslxdff -status                  show current status (daemon, models, recent calls, last error)
+  mslxdff -log [N]                 show last N events (default 10, e.g. -log 100)
   mslxdff -model list              list the free models this proxy serves (cached)
   mslxdff -model status            show per-model health status (normal/limit/error)
   mslxdff -model refresh           force-refresh the model cache from the upstream
@@ -778,6 +853,8 @@ Environment:
   MSLXDFF_MAX_HOPS           max peer-forwarding depth (default 3)
   MSLXDFF_BAN_THRESHOLD   failed joins before an ip is banned (default 5)
   MSLXDFF_BAN_WINDOW_MS   ban duration after too many failures (default 48h)
+  MSLXDFF_AUTO_UPDATE   auto-update: 1/true=hourly, or ms interval (0=off)
+  MSLXDFF_AUTO_UPDATE_MS  same as above, explicit ms (overrides AUTO_UPDATE)
 `);
 }
 

package/package.json

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