mslxdff 0.1.20 → 0.1.22

package/bin/mslxdff.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import { execFile } from "node:child_process";
-import { readFileSync, existsSync, statSync } from "node:fs";
+import { readFileSync, existsSync, statSync, rmSync } from "node:fs";
 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 { DEFAULT_PORT, defaultStateFile } from "../src/state.js";
 import { createRouter } from "../src/routes.js";
 import { createUpstreamClient } from "../src/upstream.js";
 import { createModelsService } from "../src/models.js";
@@ -54,6 +54,37 @@ if (args.includes("-stop") || args.includes("--stop")) {
   process.exit(0);
 }
 
+if (args.includes("-uninstall") || args.includes("--uninstall")) {
+  const { stopped, pid } = stopDaemon();
+  if (stopped) console.log(`mslxdff daemon stopped (pid ${pid})`);
+  else console.log("mslxdff daemon not running");
+
+  const stateFile = defaultStateFile();
+  const dir = dirname(stateFile);
+  const removed = [];
+  for (const f of [
+    stateFile,
+    pidFile(),
+    logFile(),
+    join(dir, "calls.log"),
+    join(dir, "errors.log"),
+    join(dir, "events.log"),
+  ]) {
+    try {
+      rmSync(f, { force: true });
+      removed.push(f);
+    } catch {
+      // already gone, fine
+    }
+  }
+  if (removed.length) console.log(`removed ${removed.length} file(s):\n  ${removed.join("\n  ")}`);
+  else console.log("no state/log files to remove");
+
+  console.log("\npackage still installed — finish with:");
+  console.log("  npm uninstall -g mslxdff");
+  process.exit(0);
+}
+
 if (args.includes("-status") || args.includes("--status") || args.includes("-s")) {
   await printStatus();
   process.exit(0);
@@ -604,6 +635,7 @@ Usage:
   mslxdff -model refresh           force-refresh the model cache from the upstream
   mslxdff -debug                   live-follow the daemon event stream (requests, errors, peer forwards)
   mslxdff -stop                    stop the running daemon
+  mslxdff -uninstall               stop the daemon and delete all state/log files
   mslxdff -port N                  persist the listen port (restarts the daemon on it if running)
   mslxdff -update                  update mslxdff to the latest published version
   mslxdff -showtoken               print the current auth token

package/package.json

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

package/src/groups.js

@@ -27,6 +27,20 @@ export function createGroup(name, { file, key = name } = {}) {
   return { name, key, created: true };
 }
 
+// Shared writer: register a member, de-duplicated by url (same ip:port
+// re-registering under a different name updates the existing entry instead of
+// creating a duplicate).
+function writeMember(group, memberName, url, token) {
+  const members = group.members || (group.members = {});
+  const byUrl = Object.entries(members).find(([, m]) => m.url === url);
+  if (byUrl) {
+    members[byUrl[0]] = { url, token: token || "" };
+    return;
+  }
+  const id = memberName || url;
+  members[id] = { url, token: token || "" };
+}
+
 // Leader side: add a member after verifying the join key.
 export function addGroupMember(name, { key, memberName, url, token, file } = {}) {
   const groups = loadGroups(file ? { file } : {});
@@ -34,8 +48,7 @@ export function addGroupMember(name, { key, memberName, url, token, file } = {})
   if (!group) throw new Error(`group "${name}" not found on this node`);
   if (!verifyGroupKey(key, group.key)) throw new Error("invalid group key");
   if (!url) throw new Error("member url is required");
-  const id = memberName || url;
-  group.members[id] = { url, token: token || "" };
+  writeMember(group, memberName, url, token);
   saveGroups(groups, file ? { file } : {});
   return group.members;
 }
@@ -47,8 +60,7 @@ export function upsertMember(name, { memberName, url, token, file } = {}) {
   const group = groups[name];
   if (!group) return null;
   if (!url) throw new Error("member url is required");
-  const id = memberName || url;
-  group.members[id] = { url, token: token || "" };
+  writeMember(group, memberName, url, token);
   saveGroups(groups, file ? { file } : {});
   return group.members;
 }