mslxdff 0.1.197 → 0.1.200

package/src/server.js

@@ -1,78 +1,78 @@
-import { createServer as httpCreateServer } from "node:http";
-import { DEFAULT_PORT, getPort } from "./state.js";
-import { flushAgentLoop } from "./talk-full.js"; // 关停收尾：talk/full 捕获是异步队列落盘，退出前排空（空队列时近似 O(1)，且自身不抛）
-
-export function startServer({ router, signals = true, host, onBeforeClose }, port = resolvePort()) {
-  const listenHost = host ?? resolveHost();
-  const server = httpCreateServer((req, res) => {
-    router(req, res).catch((err) => {
-      res.statusCode = 500;
-      res.setHeader("Content-Type", "application/json");
-      res.end(JSON.stringify({ error: String(err?.message || err) }));
-    });
-  });
-
-  const ready = () =>
-    new Promise((resolve, reject) => {
-      server.on("error", reject);
-      if (listenHost) server.listen(port, listenHost, resolve);
-      else server.listen(port, resolve);
-    });
-
-  const close = async () => {
-    // 关停序列里唯一的新增步：先排空 agent 回路捕获（talk/full）的异步写队列，再走既有顺序
-    // （server:stop hook → server.close/closeAllConnections）。既有关停顺序语义一字未动；
-    // 队列空时 flush 即刻返回，且 flushAgentLoop 自身不抛（外层 try 只为兜住 import 侧意外）。
-    try { await flushAgentLoop(); } catch {}
-    // 插件 hook：server:stop — 关闭前触发（fire-and-forget，不阻塞关停）
-    try { await onBeforeClose?.(); } catch {}
-    await new Promise((resolve) => {
-      server.close(resolve);
-      // SSE debug streams keep connections open — force-close so shutdown
-      // never waits on them.
-      server.closeAllConnections?.();
-    });
-  };
-
-  if (signals) {
-    // 关停留痕（Linux 有效：可捕获 SIGTERM/SIGINT 并记录）。Windows 注意：process.kill 的
-    // SIGTERM 实为 TerminateProcess 强杀，被杀的 JS 进程收不到该事件，此处不会触发——
-    // Windows 的"谁杀了我"靠 src/daemon.js stopDaemon() 的杀者留痕 + 最后一条 heartbeat。
-    let stopping = false;
-    const onSignal = (sig) => {
-      if (stopping) return;
-      stopping = true;
-      try { console.log(`[lifecycle] ${sig} received — shutting down (pid ${process.pid}, uptime ${Math.round(process.uptime())}s)`); } catch {}
-      // 关停必须**真的退出**：warp-pool 的 wireproxy 子进程 stdio 是 pipe，活着的子进程会把事件循环钉住；
-      // 只 close() server（放开 8989）会留下「不监听端口却还活着」的幽灵 daemon
-      //（真机 2026-10-17：Oct16 起的幽灵与新版互杀 warp-pool 端口一整天，且它不在 daemon.pid 里，-restart 永远碰不到）。
-      // process.exit 会跑 exit 钩子（warp-pool 杀隧道、lifecycle 写遗书），故清理不会被跳过。
-      const hard = setTimeout(() => { try { console.log(`[lifecycle] ${sig} 优雅关停 8s 未完成 — 强制退出`); } catch {} process.exit(0); }, 8000);
-      hard.unref?.();
-      close().then(() => process.exit(0), (e) => { try { console.log(`[lifecycle] 关停抛错：${String(e?.message || e)}`); } catch {} process.exit(1); });
-    };
-    process.on("SIGINT", () => onSignal("SIGINT"));
-    process.on("SIGTERM", () => onSignal("SIGTERM"));
-  }
-
-  return { server, ready, close };
-}
-
-export function resolveHost() {
-  const envHost = process.env.MSLXDFF_HOST || process.env.MSLXDFF_BIND_HOST;
-  if (typeof envHost === "string" && envHost.trim()) return envHost.trim();
-  return "0.0.0.0";
-}
-
-export function resolvePort() {
-  // 8989 is the hard default. Port only changes via an explicit, mslxdff-owned
-  // override: the persisted `-port N` setting, or the MSLXDFF_PORT env var.
-  // Bare `PORT` is deliberately NOT read — an ssh session / wrapper script
-  // commonly injects it and would silently override the default.
-  const persisted = getPort();
-  if (persisted) return persisted;
-  const env = Number(process.env.MSLXDFF_PORT);
-  // 0 = OS-assigned ephemeral port (valid; used by tests/containers)
-  if (Number.isInteger(env) && env >= 0) return env;
-  return DEFAULT_PORT;
-}
+import { createServer as httpCreateServer } from "node:http";
+import { DEFAULT_PORT, getPort } from "./state.js";
+import { flushAgentLoop } from "./talk-full.js"; // 关停收尾：talk/full 捕获是异步队列落盘，退出前排空（空队列时近似 O(1)，且自身不抛）
+
+export function startServer({ router, signals = true, host, onBeforeClose }, port = resolvePort()) {
+  const listenHost = host ?? resolveHost();
+  const server = httpCreateServer((req, res) => {
+    router(req, res).catch((err) => {
+      res.statusCode = 500;
+      res.setHeader("Content-Type", "application/json");
+      res.end(JSON.stringify({ error: String(err?.message || err) }));
+    });
+  });
+
+  const ready = () =>
+    new Promise((resolve, reject) => {
+      server.on("error", reject);
+      if (listenHost) server.listen(port, listenHost, resolve);
+      else server.listen(port, resolve);
+    });
+
+  const close = async () => {
+    // 关停序列里唯一的新增步：先排空 agent 回路捕获（talk/full）的异步写队列，再走既有顺序
+    // （server:stop hook → server.close/closeAllConnections）。既有关停顺序语义一字未动；
+    // 队列空时 flush 即刻返回，且 flushAgentLoop 自身不抛（外层 try 只为兜住 import 侧意外）。
+    try { await flushAgentLoop(); } catch {}
+    // 插件 hook：server:stop — 关闭前触发（fire-and-forget，不阻塞关停）
+    try { await onBeforeClose?.(); } catch {}
+    await new Promise((resolve) => {
+      server.close(resolve);
+      // SSE debug streams keep connections open — force-close so shutdown
+      // never waits on them.
+      server.closeAllConnections?.();
+    });
+  };
+
+  if (signals) {
+    // 关停留痕（Linux 有效：可捕获 SIGTERM/SIGINT 并记录）。Windows 注意：process.kill 的
+    // SIGTERM 实为 TerminateProcess 强杀，被杀的 JS 进程收不到该事件，此处不会触发——
+    // Windows 的"谁杀了我"靠 src/daemon.js stopDaemon() 的杀者留痕 + 最后一条 heartbeat。
+    let stopping = false;
+    const onSignal = (sig) => {
+      if (stopping) return;
+      stopping = true;
+      try { console.log(`[lifecycle] ${sig} received — shutting down (pid ${process.pid}, uptime ${Math.round(process.uptime())}s)`); } catch {}
+      // 关停必须**真的退出**：warp-pool 的 wireproxy 子进程 stdio 是 pipe，活着的子进程会把事件循环钉住；
+      // 只 close() server（放开 8989）会留下「不监听端口却还活着」的幽灵 daemon
+      //（真机 2026-10-17：Oct16 起的幽灵与新版互杀 warp-pool 端口一整天，且它不在 daemon.pid 里，-restart 永远碰不到）。
+      // process.exit 会跑 exit 钩子（warp-pool 杀隧道、lifecycle 写遗书），故清理不会被跳过。
+      const hard = setTimeout(() => { try { console.log(`[lifecycle] ${sig} 优雅关停 8s 未完成 — 强制退出`); } catch {} process.exit(0); }, 8000);
+      hard.unref?.();
+      close().then(() => process.exit(0), (e) => { try { console.log(`[lifecycle] 关停抛错：${String(e?.message || e)}`); } catch {} process.exit(1); });
+    };
+    process.on("SIGINT", () => onSignal("SIGINT"));
+    process.on("SIGTERM", () => onSignal("SIGTERM"));
+  }
+
+  return { server, ready, close };
+}
+
+export function resolveHost() {
+  const envHost = process.env.MSLXDFF_HOST || process.env.MSLXDFF_BIND_HOST;
+  if (typeof envHost === "string" && envHost.trim()) return envHost.trim();
+  return "0.0.0.0";
+}
+
+export function resolvePort() {
+  // 8989 is the hard default. Port only changes via an explicit, mslxdff-owned
+  // override: the persisted `-port N` setting, or the MSLXDFF_PORT env var.
+  // Bare `PORT` is deliberately NOT read — an ssh session / wrapper script
+  // commonly injects it and would silently override the default.
+  const persisted = getPort();
+  if (persisted) return persisted;
+  const env = Number(process.env.MSLXDFF_PORT);
+  // 0 = OS-assigned ephemeral port (valid; used by tests/containers)
+  if (Number.isInteger(env) && env >= 0) return env;
+  return DEFAULT_PORT;
+}

package/src/state/schemas/allowlist.js

@@ -1,92 +1,92 @@
-import { defaultStateFile, readState, writeStateImmediate } from "../store.js";
-import {
-  normalizeAllowedModel,
-  normalizeBaseUrl,
-  normalizeAuths,
-  normalizeEndpointPath,
-  loadProviderConfigs,
-  loadProviderConfig,
-  loadProviderBaseUrl,
-  loadProviderKeys,
-} from "./provider.js";
-
-export function loadProviderAllowedModels(id, { file = defaultStateFile() } = {}) {
-  const cfg = loadProviderConfig(id, { file });
-  if (cfg && Array.isArray(cfg.allowedModels)) return [...cfg.allowedModels];
-  const raw = readState(file).providerConfigs?.[id];
-  if (raw && Array.isArray(raw.allowedModels)) return [...new Set(raw.allowedModels.map((m) => normalizeAllowedModel(m, id)).filter(Boolean))];
-  return [];
-}
-
-export function saveProviderAllowedModels(id, list, { file = defaultStateFile() } = {}) {
-  const clean = [...new Set((Array.isArray(list) ? list : []).map((m) => normalizeAllowedModel(m, id)).filter(Boolean))];
-  const configs = { ...loadProviderConfigs({ file }) };
-  const cur = configs[id] && typeof configs[id] === "object" ? configs[id] : {};
-  const baseUrl = normalizeBaseUrl(cur.baseUrl || loadProviderBaseUrl(id, { file }) || "");
-  const keys = Array.isArray(cur.keys) ? cur.keys : loadProviderKeys(id, { file });
-  const auths = normalizeAuths(cur.auths);
-  const modelsPath = typeof cur.modelsPath === "string" ? normalizeEndpointPath(cur.modelsPath) : "";
-  const chatPath = typeof cur.chatPath === "string" ? normalizeEndpointPath(cur.chatPath) : "";
-  // allowAnyModels 是独立语义开关：只有它也设过时，即使其余字段全空也不能整键删（否则 clear 会把「允许任意」连带抹掉，供应商从放行降级成全拦 403）
-  if (!baseUrl && !keys.length && !auths.length && !clean.length && !modelsPath && !chatPath && typeof cur.allowAnyModels !== "boolean") {
-    delete configs[id];
-  } else {
-    configs[id] = { baseUrl, keys };
-    // 重建 cfg 是 `{ baseUrl, keys }` 起手，不显式带 allowAnyModels 就会静默丢用户的「允许任意」设置
-    // （实测 2026-09-24：saveProviderAllowedModels 把 allowAnyModels:true 抹成默认 false）。
-    // cline 白名单 auto-sync 会周期性写这里，丢了就是持续丢，必须保留。
-    if (typeof cur.allowAnyModels === "boolean") configs[id].allowAnyModels = cur.allowAnyModels;
-    if (auths.length) configs[id].auths = auths;
-    if (clean.length) configs[id].allowedModels = clean;
-    if (modelsPath) configs[id].modelsPath = modelsPath;
-    if (chatPath) configs[id].chatPath = chatPath;
-  }
-  writeStateImmediate(file, { providerConfigs: configs });
-  return clean;
-}
-
-export function addProviderAllowedModel(id, model, opts = {}) {
-  const cur = loadProviderAllowedModels(id, opts);
-  const norm = normalizeAllowedModel(model, id);
-  if (!norm || cur.includes(norm)) return cur;
-  return saveProviderAllowedModels(id, [...cur, norm], opts);
-}
-
-export function removeProviderAllowedModel(id, model, opts = {}) {
-  return removeProviderAllowedModels(id, [model], opts);
-}
-
-export function removeProviderAllowedModels(id, targets = [], opts = {}) {
-  const set = new Set((Array.isArray(targets) ? targets : [targets]).map((m) => normalizeAllowedModel(m, id)).filter(Boolean));
-  const cur = loadProviderAllowedModels(id, opts);
-  const next = cur.filter((m) => !set.has(m));
-  return saveProviderAllowedModels(id, next, opts);
-}
-
-function normalizeAllowAny(v, id) {
-  if (typeof v === "boolean") return v;
-  if (String(id || "").toLowerCase() === "opencode") return true;
-  return false;
-}
-export function loadProviderAllowAnyModels(id, { file = defaultStateFile() } = {}) {
-  const cfg = readState(file).providerConfigs?.[id];
-  if (cfg && typeof cfg.allowAnyModels === "boolean") return cfg.allowAnyModels;
-  return normalizeAllowAny(undefined, id);
-}
-export function saveProviderAllowAnyModels(id, allowAny, { file = defaultStateFile() } = {}) {
-  const state = readState(file);
-  const cfgs = { ...(state.providerConfigs || {}) };
-  const cur = cfgs[id] || {};
-  cfgs[id] = { ...cur, allowAnyModels: normalizeAllowAny(allowAny, id) };
-  writeStateImmediate(file, { providerConfigs: cfgs });
-  return cfgs[id].allowAnyModels;
-}
-export function isModelAllowed(id, rawModel, { file = defaultStateFile() } = {}) {
-  const raw = String(rawModel || "").trim();
-  if (!raw) return true;
-  const allowed = loadProviderAllowedModels(id, { file });
-  const allowAny = loadProviderAllowAnyModels(id, { file });
-  if (!allowed.length) return allowAny;
-  const norm = normalizeAllowedModel(raw, id);
-  return allowed.includes(norm);
-}
+import { defaultStateFile, readState, writeStateImmediate } from "../store.js";
+import {
+  normalizeAllowedModel,
+  normalizeBaseUrl,
+  normalizeAuths,
+  normalizeEndpointPath,
+  loadProviderConfigs,
+  loadProviderConfig,
+  loadProviderBaseUrl,
+  loadProviderKeys,
+} from "./provider.js";
+
+export function loadProviderAllowedModels(id, { file = defaultStateFile() } = {}) {
+  const cfg = loadProviderConfig(id, { file });
+  if (cfg && Array.isArray(cfg.allowedModels)) return [...cfg.allowedModels];
+  const raw = readState(file).providerConfigs?.[id];
+  if (raw && Array.isArray(raw.allowedModels)) return [...new Set(raw.allowedModels.map((m) => normalizeAllowedModel(m, id)).filter(Boolean))];
+  return [];
+}
+
+export function saveProviderAllowedModels(id, list, { file = defaultStateFile() } = {}) {
+  const clean = [...new Set((Array.isArray(list) ? list : []).map((m) => normalizeAllowedModel(m, id)).filter(Boolean))];
+  const configs = { ...loadProviderConfigs({ file }) };
+  const cur = configs[id] && typeof configs[id] === "object" ? configs[id] : {};
+  const baseUrl = normalizeBaseUrl(cur.baseUrl || loadProviderBaseUrl(id, { file }) || "");
+  const keys = Array.isArray(cur.keys) ? cur.keys : loadProviderKeys(id, { file });
+  const auths = normalizeAuths(cur.auths);
+  const modelsPath = typeof cur.modelsPath === "string" ? normalizeEndpointPath(cur.modelsPath) : "";
+  const chatPath = typeof cur.chatPath === "string" ? normalizeEndpointPath(cur.chatPath) : "";
+  // allowAnyModels 是独立语义开关：只有它也设过时，即使其余字段全空也不能整键删（否则 clear 会把「允许任意」连带抹掉，供应商从放行降级成全拦 403）
+  if (!baseUrl && !keys.length && !auths.length && !clean.length && !modelsPath && !chatPath && typeof cur.allowAnyModels !== "boolean") {
+    delete configs[id];
+  } else {
+    configs[id] = { baseUrl, keys };
+    // 重建 cfg 是 `{ baseUrl, keys }` 起手，不显式带 allowAnyModels 就会静默丢用户的「允许任意」设置
+    // （实测 2026-09-24：saveProviderAllowedModels 把 allowAnyModels:true 抹成默认 false）。
+    // cline 白名单 auto-sync 会周期性写这里，丢了就是持续丢，必须保留。
+    if (typeof cur.allowAnyModels === "boolean") configs[id].allowAnyModels = cur.allowAnyModels;
+    if (auths.length) configs[id].auths = auths;
+    if (clean.length) configs[id].allowedModels = clean;
+    if (modelsPath) configs[id].modelsPath = modelsPath;
+    if (chatPath) configs[id].chatPath = chatPath;
+  }
+  writeStateImmediate(file, { providerConfigs: configs });
+  return clean;
+}
+
+export function addProviderAllowedModel(id, model, opts = {}) {
+  const cur = loadProviderAllowedModels(id, opts);
+  const norm = normalizeAllowedModel(model, id);
+  if (!norm || cur.includes(norm)) return cur;
+  return saveProviderAllowedModels(id, [...cur, norm], opts);
+}
+
+export function removeProviderAllowedModel(id, model, opts = {}) {
+  return removeProviderAllowedModels(id, [model], opts);
+}
+
+export function removeProviderAllowedModels(id, targets = [], opts = {}) {
+  const set = new Set((Array.isArray(targets) ? targets : [targets]).map((m) => normalizeAllowedModel(m, id)).filter(Boolean));
+  const cur = loadProviderAllowedModels(id, opts);
+  const next = cur.filter((m) => !set.has(m));
+  return saveProviderAllowedModels(id, next, opts);
+}
+
+function normalizeAllowAny(v, id) {
+  if (typeof v === "boolean") return v;
+  if (String(id || "").toLowerCase() === "opencode") return true;
+  return false;
+}
+export function loadProviderAllowAnyModels(id, { file = defaultStateFile() } = {}) {
+  const cfg = readState(file).providerConfigs?.[id];
+  if (cfg && typeof cfg.allowAnyModels === "boolean") return cfg.allowAnyModels;
+  return normalizeAllowAny(undefined, id);
+}
+export function saveProviderAllowAnyModels(id, allowAny, { file = defaultStateFile() } = {}) {
+  const state = readState(file);
+  const cfgs = { ...(state.providerConfigs || {}) };
+  const cur = cfgs[id] || {};
+  cfgs[id] = { ...cur, allowAnyModels: normalizeAllowAny(allowAny, id) };
+  writeStateImmediate(file, { providerConfigs: cfgs });
+  return cfgs[id].allowAnyModels;
+}
+export function isModelAllowed(id, rawModel, { file = defaultStateFile() } = {}) {
+  const raw = String(rawModel || "").trim();
+  if (!raw) return true;
+  const allowed = loadProviderAllowedModels(id, { file });
+  const allowAny = loadProviderAllowAnyModels(id, { file });
+  if (!allowed.length) return allowAny;
+  const norm = normalizeAllowedModel(raw, id);
+  return allowed.includes(norm);
+}