mslxdff 0.1.1 → 0.1.2

package/README.md

@@ -14,31 +14,42 @@ Zero runtime dependencies: Node ≥ 20, built-in `node:http`, `node:crypto`, `no
 
 ```
 npm install      # no deps actually fetched; just links the bin
-mslxdfree        # or: node bin/mslxdfree.js
+mslxdff          # or: node bin/mslxdff.js
 ```
 
 First run generates a bearer token, writes it to the state file, and prints it:
 
 ```
-mslxdfree listening on http://localhost:8080
+mslxdff listening on http://localhost:8989
 auth token: 9b5de021e914...
-endpoint:   http://localhost:8080/v1
+endpoint:   http://localhost:8989/v1
 ```
 
+### Port
+
+Default port is **8989**. Persist a different port (and hot-restart the daemon onto it if one is running):
+
+```
+mslxdff -port 8000     # set port to 8000; restarts the daemon on 8000
+mslxdff -d             # next starts reuse the persisted port (8000)
+```
+
+Priority: `-port` arg > persisted port > `PORT` env > default `8989`.
+
 ### Daemon (background, stays resident)
 
 ```
-mslxdfree -d        # start detached background daemon
-mslxdfree -stop     # stop it
+mslxdff -d        # start detached background daemon
+mslxdff -stop     # stop it
 ```
 
-Logs go to `~/.config/mslxdfree/daemon.log`, the daemon pid to `daemon.pid` (both overridable via `MSLXDFREE_DAEMON_DIR`). The daemon keeps running after your shell exits.
+Logs go to `~/.config/mslxdff/daemon.log`, the daemon pid to `daemon.pid` (both overridable via `MSLXDFF_DAEMON_DIR`). The daemon keeps running after your shell exits.
 
 ### Token
 
 ```
-mslxdfree -showtoken      # print the current token (creates one on first use)
-mslxdfree -refresh-token  # rotate it (prints the new token, does not start the server)
+mslxdff -showtoken      # print the current token (creates one on first use)
+mslxdff -refresh-token  # rotate it (prints the new token, does not start the server)
 ```
 
 ## Client configuration
@@ -46,7 +57,7 @@ mslxdfree -refresh-token  # rotate it (prints the new token, does not start the
 Point any OpenAI-compatible client at the endpoint with the token:
 
 ```
-Endpoint:   http://localhost:8080/v1
+Endpoint:   http://localhost:8989/v1
 API Key:    <the bearer token>      (sent as Authorization: Bearer <token>)
 Model:      oc/deepseek-v4-flash-free   (the oc/ prefix is optional)
 ```
@@ -54,7 +65,7 @@ Model:      oc/deepseek-v4-flash-free   (the oc/ prefix is optional)
 <x-model list>
 
 ```
-$ curl -H "Authorization: Bearer <token>" http://localhost:8080/v1/models
+$ curl -H "Authorization: Bearer <token>" http://localhost:8989/v1/models
 {"object":"list","data":[{"id":"big-pickle",...},{"id":"deepseek-v4-flash-free",...}, ...]}
 </x-model list>
 
@@ -62,9 +73,9 @@ $ curl -H "Authorization: Bearer <token>" http://localhost:8080/v1/models
 
 | Variable | Default | Purpose |
 |---|---|---|
-| `PORT` | `8080` | listen port |
-| `MSLXDFREE_STATE_FILE` | `~/.config/mslxdfree/state.json` | token state file (mode 0600) |
-| `MSLXDFREE_DAEMON_DIR` | `~/.config/mslxdfree` | daemon pid + log directory |
+| `PORT` | `8989` | listen port (used when no `-port` arg and no persisted port) |
+| `MSLXDFF_STATE_FILE` | `~/.config/mslxdff/state.json` | token/port state file (mode 0600) |
+| `MSLXDFF_DAEMON_DIR` | `~/.config/mslxdff` | daemon pid + log directory |
 | `UPSTREAM_BASE_URL` | `https://opencode.ai` | upstream base |
 | `UPSTREAM_AUTH_TOKEN` | `public` | upstream `Authorization: Bearer <…>` value |
 | `UPSTREAM_CONNECT_TIMEOUT_MS` | `30000` | upstream connect timeout |
@@ -72,7 +83,7 @@ $ curl -H "Authorization: Bearer <token>" http://localhost:8080/v1/models
 
 ## Clients
 
-Point your OpenAI client at `http://<host>:8080/v1` (or the equivalent config seen above). Works for streaming and non-streaming chat completions.
+Point your OpenAI client at `http://<host>:8989/v1` (or the equivalent config seen above). Works for streaming and non-streaming chat completions.
 
 ## Development
 
@@ -80,4 +91,4 @@ Point your OpenAI client at `http://<host>:8080/v1` (or the equivalent config se
 npm test        # node --test, no network access
 ```
 
-The reference implementation is 9Router v0.5.45 (`/root/9router`); see `CLAUDE.md`, `CONTEXT.md`, and `docs/adr/` for the contract and the decisions behind it.
+The reference implementation is 9Router v0.5.45 (`/root/9router`); see `CLAUDE.md`, `CONTEXT.md`, and `docs/adr/` for the contract and the decisions behind it.

package/bin/{mslxdfree.js → mslxdff.js}

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import { startServer } from "../src/server.js";
+import { startServer, resolvePort } from "../src/server.js";
 import { createRouter } from "../src/routes.js";
 import { createUpstreamClient } from "../src/upstream.js";
 import { createModelsService } from "../src/models.js";
-import { loadToken, refreshToken } from "../src/state.js";
-import { startDaemon, stopDaemon, writePid, pidFile, logFile } from "../src/daemon.js";
+import { loadToken, refreshToken, setPort } from "../src/state.js";
+import { startDaemon, stopDaemon, writePid, pidFile, logFile, readPid } from "../src/daemon.js";
 
 const args = process.argv.slice(2);
 
@@ -23,19 +23,43 @@ if (args.includes("-showtoken") || args.includes("--showtoken")) {
 if (args.includes("-stop") || args.includes("--stop")) {
   const { stopped, pid, reason } = stopDaemon();
   if (stopped) {
-    console.log(`mslxdfree daemon stopped (pid ${pid})`);
+    console.log(`mslxdff daemon stopped (pid ${pid})`);
   } else {
-    console.log(`mslxdfree daemon not running${reason ? ` (${reason})` : ""}`);
+    console.log(`mslxdff daemon not running${reason ? ` (${reason})` : ""}`);
+  }
+  process.exit(0);
+}
+
+// -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");
+if (portArg && !process.env.MSLXDFF_DAEMON) {
+  const port = Number(portArg);
+  if (!Number.isInteger(port) || port <= 0 || port > 65535) {
+    console.error(`invalid port: ${portArg}`);
+    process.exit(1);
+  }
+  setPort(port);
+  const daemon = readPid();
+  if (daemon) {
+    stopDaemon();
+    startDaemon(["-port", String(port)]);
+    await waitForHealth(port, 4000);
+    console.log(`mslxdff restarted on port ${port} (pid ${readPid()})`);
+    console.log(`endpoint:   http://localhost:${port}/v1`);
+  } else {
+    console.log(`port saved: ${port} (daemon not running; takes effect on next start)`);
   }
   process.exit(0);
 }
 
 if (args.includes("-d") || args.includes("--daemon")) {
-  if (!process.env.MSLXDFREE_DAEMON) {
+  if (!process.env.MSLXDFF_DAEMON) {
     // foreground: spawn the detached background instance, then wait for health
+    const port = effectivePort();
     const spawnedPid = startDaemon(args.filter((a) => a !== "-d" && a !== "--daemon"));
-    await waitForHealth(4000);
-    console.log(`mslxdfree daemon started (pid ${spawnedPid})`);
+    await waitForHealth(port, 4000);
+    console.log(`mslxdff daemon started (pid ${spawnedPid})`);
     console.log(`log: ${logFile()}`);
     console.log(`pid: ${pidFile()}`);
     process.exit(0);
@@ -52,20 +76,32 @@ const router = createRouter({ token, upstream, models });
 const srv = startServer({ router });
 
 await srv.ready();
-if (process.env.MSLXDFREE_DAEMON) {
+if (process.env.MSLXDFF_DAEMON) {
   writePid(process.pid);
 }
 const addr = srv.server.address();
 const host = addr.address === "0.0.0.0" || addr.address === "::" ? "localhost" : addr.address;
-console.log(`mslxdfree listening on http://${host}:${addr.port}`);
+console.log(`mslxdff listening on http://${host}:${addr.port}`);
 if (created) {
   console.log(`auth token: ${token}`);
 }
 console.log(`endpoint:   http://${host}:${addr.port}/v1`);
 
-async function waitForHealth(timeoutMs) {
+function argValue(...names) {
+  for (let i = 0; i < args.length; i++) {
+    if (names.includes(args[i])) return args[i + 1];
+  }
+  return null;
+}
+
+function effectivePort() {
+  const arg = argValue("-port", "--port");
+  if (arg) return Number(arg);
+  return resolvePort();
+}
+
+async function waitForHealth(port, timeoutMs) {
   const start = Date.now();
-  const port = Number(process.env.PORT) || 8080;
   while (Date.now() - start < timeoutMs) {
     try {
       const res = await fetch(`http://127.0.0.1:${port}/health`);
@@ -75,4 +111,4 @@ async function waitForHealth(timeoutMs) {
     }
     await new Promise((r) => setTimeout(r, 100));
   }
-}
+}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "mslxdff",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "测试项目，请勿使用。",
   "type": "module",
   "bin": {
-    "mslxdfree": "bin/mslxdfree.js"
+    "mslxdff": "bin/mslxdff.js"
   },
   "scripts": {
-    "start": "node bin/mslxdfree.js",
+    "start": "node bin/mslxdff.js",
     "test": "node --test test/"
   },
   "engines": {

package/src/daemon.js

@@ -5,7 +5,7 @@ import os from "node:os";
 import { fileURLToPath } from "node:url";
 
 export function daemonDir() {
-  return process.env.MSLXDFREE_DAEMON_DIR || join(os.homedir(), ".config", "mslxdfree");
+  return process.env.MSLXDFF_DAEMON_DIR || join(os.homedir(), ".config", "mslxdff");
 }
 
 export function pidFile() {
@@ -18,16 +18,16 @@ export function logFile() {
 
 export function startDaemon(args = []) {
   const here = fileURLToPath(import.meta.url);
-  const entry = here.endsWith("bin/mslxdfree.js")
+  const entry = here.endsWith("bin/mslxdff.js")
     ? here
-    : join(dirname(here), "..", "bin", "mslxdfree.js");
+    : join(dirname(here), "..", "bin", "mslxdff.js");
   const dir = daemonDir();
   mkdirSync(dir, { recursive: true });
   const logFd = openSync(logFile(), "a", 0o600);
   const child = spawn(process.execPath, [entry, ...args, "--daemon"], {
     detached: true,
     stdio: ["ignore", logFd, logFd],
-    env: { ...process.env, MSLXDFREE_DAEMON: "1" },
+    env: { ...process.env, MSLXDFF_DAEMON: "1" },
   });
   child.unref();
   return child.pid;

package/src/server.js

@@ -1,6 +1,7 @@
 import { createServer as httpCreateServer } from "node:http";
+import { DEFAULT_PORT, getPort } from "./state.js";
 
-export function startServer({ router }, port = Number(process.env.PORT) || 8080) {
+export function startServer({ router }, port = resolvePort()) {
   const server = httpCreateServer((req, res) => {
     router(req, res).catch((err) => {
       res.statusCode = 500;
@@ -24,4 +25,12 @@ export function startServer({ router }, port = Number(process.env.PORT) || 8080)
   process.on("SIGTERM", close);
 
   return { server, ready, close };
-}
+}
+
+export function resolvePort() {
+  const persisted = getPort();
+  if (persisted) return persisted;
+  const env = Number(process.env.PORT);
+  if (Number.isInteger(env) && env > 0) return env;
+  return DEFAULT_PORT;
+}

package/src/state.js

@@ -3,9 +3,11 @@ import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import os from "node:os";
 
+export const DEFAULT_PORT = 8989;
+
 export function defaultStateFile() {
-  return process.env.MSLXDFREE_STATE_FILE ||
-    join(os.homedir(), ".config", "mslxdfree", "state.json");
+  return process.env.MSLXDFF_STATE_FILE ||
+    join(os.homedir(), ".config", "mslxdff", "state.json");
 }
 
 export function generateToken() {
@@ -13,27 +15,39 @@ export function generateToken() {
 }
 
 export async function loadToken({ file = defaultStateFile() } = {}) {
-  try {
-    const saved = JSON.parse(readFileSync(file, "utf8"));
-    if (typeof saved.token === "string" && saved.token.length > 0) {
-      return { token: saved.token, created: false };
-    }
-  } catch {
-    // missing or unreadable → generate fresh below
+  const state = readState(file);
+  if (typeof state.token === "string" && state.token.length > 0) {
+    return { token: state.token, created: false };
   }
-  return { token: writeToken(file), created: true };
+  return { token: writeState(file, { token: generateToken(), createdAt: new Date().toISOString() }).token, created: true };
 }
 
 export async function refreshToken({ file = defaultStateFile() } = {}) {
-  return writeToken(file);
+  return writeState(file, { token: generateToken(), createdAt: new Date().toISOString() }).token;
+}
+
+export function setPort(port, { file = defaultStateFile() } = {}) {
+  const state = readState(file);
+  writeState(file, { ...state, port: Number(port) });
+}
+
+export function getPort({ file = defaultStateFile() } = {}) {
+  const port = readState(file).port;
+  return typeof port === "number" && Number.isInteger(port) && port > 0 ? port : null;
 }
 
-function writeToken(file) {
-  const state = {
-    token: generateToken(),
-    createdAt: new Date().toISOString(),
-  };
+function readState(file) {
+  try {
+    const saved = JSON.parse(readFileSync(file, "utf8"));
+    return typeof saved === "object" && saved !== null ? saved : {};
+  } catch {
+    return {};
+  }
+}
+
+function writeState(file, patch) {
+  const merged = { ...readState(file), ...patch };
   mkdirSync(dirname(file), { recursive: true });
-  writeFileSync(file, JSON.stringify(state, null, 2), { mode: 0o600 });
-  return state.token;
-}
+  writeFileSync(file, JSON.stringify(merged, null, 2), { mode: 0o600 });
+  return merged;
+}