mioku-service-webui 4.4.0 → 4.4.1

package/index.ts

@@ -30,6 +30,7 @@ import {
   createStrangerRoutes,
   createAccessControlRoutes,
 } from "./routes";
+import { freePort } from "./port-utils";
 
 export interface WebUIServiceAPI {
   getSettings(): WebUISettings;
@@ -44,7 +45,7 @@ class WebUIRuntime {
     logger.info(`[webui-action] ${action}${text}`);
   }
 
-  public initRoutes(): void {
+  public async initRoutes(): Promise<void> {
     const { upgradeWebSocket, injectWebSocket } = createNodeWebSocket({
       app: this.app,
     });
@@ -172,6 +173,12 @@ class WebUIRuntime {
     });
 
     const settings = getWebUISettings();
+    const freed = await freePort(settings.port);
+    if (freed.remainingPids.length > 0) {
+      throw new Error(
+        `webui 端口 ${settings.port} 被占用且无法结束 (PID: ${freed.remainingPids.join(", ")})`,
+      );
+    }
     const server = serve({
       fetch: this.app.fetch,
       port: settings.port,
@@ -232,7 +239,7 @@ const webUIService: MiokuService = {
     initBuiltinDatasources();
     ensureAuthConfig();
     await ensureWebUIDist();
-    runtime.initRoutes();
+    await runtime.initRoutes();
   },
 
   async dispose() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mioku-service-webui",
-  "version": "4.4.0",
+  "version": "4.4.1",
   "description": "Mioku WebUI 服务",
   "main": "index.ts",
   "type": "module",

package/port-utils.ts

@@ -0,0 +1,159 @@
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+import { logger } from "mioki";
+
+const execFileAsync = promisify(execFile);
+
+export interface FreePortLogger {
+  info: (msg: string) => void;
+  warn: (msg: string) => void;
+  error: (msg: string) => void;
+}
+
+export interface FreePortOptions {
+  logger?: FreePortLogger;
+  graceMs?: number;
+  sigkillDelayMs?: number;
+}
+
+export interface FreePortResult {
+  port: number;
+  wasOccupied: boolean;
+  killedPids: number[];
+  remainingPids: number[];
+  lsofAvailable: boolean;
+}
+
+function sleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+function parsePids(raw: string): number[] {
+  const pids = new Set<number>();
+  for (const line of raw.split(/\r?\n/)) {
+    const trimmed = line.trim();
+    if (!trimmed) continue;
+    const pid = Number(trimmed);
+    if (Number.isFinite(pid) && pid > 0 && Math.floor(pid) === pid) {
+      pids.add(pid);
+    }
+  }
+  return Array.from(pids);
+}
+
+async function listListeningPids(
+  port: number,
+): Promise<{ pids: number[]; lsofAvailable: boolean }> {
+  try {
+    const { stdout } = await execFileAsync("lsof", [
+      "-nP",
+      `-iTCP:${port}`,
+      "-sTCP:LISTEN",
+      "-t",
+    ]);
+    return { pids: parsePids(stdout), lsofAvailable: true };
+  } catch (err: any) {
+    if (err?.code === "ENOENT") {
+      return { pids: [], lsofAvailable: false };
+    }
+    return { pids: [], lsofAvailable: true };
+  }
+}
+
+async function sendSignal(
+  pid: number,
+  signal: NodeJS.Signals,
+): Promise<boolean> {
+  if (pid === process.pid) return false;
+  try {
+    process.kill(pid, signal);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export async function freePort(
+  port: number,
+  options: FreePortOptions = {},
+): Promise<FreePortResult> {
+  const log = options.logger ?? (logger as unknown as FreePortLogger);
+  const graceMs = options.graceMs ?? 1500;
+  const sigkillDelayMs = options.sigkillDelayMs ?? 500;
+
+  const initial = await listListeningPids(port);
+
+  if (!initial.lsofAvailable) {
+    log.warn(
+      `未检测到 lsof 命令，无法定位端口 ${port} 的占用进程，建议安装 lsof`,
+    );
+    return {
+      port,
+      wasOccupied: false,
+      killedPids: [],
+      remainingPids: [],
+      lsofAvailable: false,
+    };
+  }
+
+  const occupied = initial.pids.filter((pid) => pid !== process.pid);
+  if (occupied.length === 0) {
+    return {
+      port,
+      wasOccupied: false,
+      killedPids: [],
+      remainingPids: [],
+      lsofAvailable: true,
+    };
+  }
+
+  log.warn(
+    `端口 ${port} 被占用，进程 PID: ${occupied.join(", ")}，正在尝试结束...`,
+  );
+
+  const killed: number[] = [];
+  for (const pid of occupied) {
+    if (await sendSignal(pid, "SIGTERM")) {
+      killed.push(pid);
+    }
+  }
+
+  if (killed.length > 0) {
+    await sleep(graceMs);
+  }
+
+  let remaining = (await listListeningPids(port)).pids.filter(
+    (pid) => pid !== process.pid,
+  );
+
+  if (remaining.length > 0) {
+    log.warn(
+      `端口 ${port} 仍被占用 (PID: ${remaining.join(", ")})，发送 SIGKILL 强制结束...`,
+    );
+    for (const pid of remaining) {
+      if (await sendSignal(pid, "SIGKILL")) {
+        killed.push(pid);
+      }
+    }
+    await sleep(sigkillDelayMs);
+    remaining = (await listListeningPids(port)).pids.filter(
+      (pid) => pid !== process.pid,
+    );
+  }
+
+  if (remaining.length > 0) {
+    log.error(
+      `端口 ${port} 仍被占用，无法结束进程 PID: ${remaining.join(", ")}`,
+    );
+  } else {
+    log.info(`端口 ${port} 已释放`);
+  }
+
+  return {
+    port,
+    wasOccupied: true,
+    killedPids: killed,
+    remainingPids: remaining,
+    lsofAvailable: true,
+  };
+}

package/routes/data-management.ts

@@ -514,7 +514,7 @@ export function createDataManagementRoutes() {
 
   app.post("/node-modules/refresh", async (c) => {
     const settings = getWebUISettings();
-    const command = getInstallCommand(settings.packageManager);
+    const command = getInstallCommand();
     const startedAt = Date.now();
     const result = await runCommand(command.cmd, command.args, process.cwd());
     const finishedAt = Date.now();

package/system.ts

@@ -96,6 +96,66 @@ const BOOT_CONFIG_PATH = path.join(
   "base.json",
 );
 
+export interface BootSystemCommandsConfig {
+  update: {
+    enabled: boolean;
+    selectTimeoutMs: number;
+  };
+  install: {
+    enabled: boolean;
+  };
+  market: {
+    enabled: boolean;
+  };
+  restart: {
+    enabled: boolean;
+  };
+}
+
+const DEFAULT_BOOT_SYSTEM_COMMANDS_CONFIG: BootSystemCommandsConfig = {
+  update: {
+    enabled: true,
+    selectTimeoutMs: 60000,
+  },
+  install: {
+    enabled: true,
+  },
+  market: {
+    enabled: true,
+  },
+  restart: {
+    enabled: true,
+  },
+};
+
+function normalizeBootSystemCommandsConfig(
+  input: any,
+): BootSystemCommandsConfig {
+  const merged = deepMerge(
+    cloneJson(DEFAULT_BOOT_SYSTEM_COMMANDS_CONFIG),
+    input || {},
+  );
+  const rawTimeout = Number(merged?.update?.selectTimeoutMs);
+  return {
+    update: {
+      enabled: Boolean(merged?.update?.enabled),
+      selectTimeoutMs:
+        Number.isFinite(rawTimeout) && rawTimeout >= 1000
+          ? Math.floor(rawTimeout)
+          : DEFAULT_BOOT_SYSTEM_COMMANDS_CONFIG.update.selectTimeoutMs,
+    },
+    install: {
+      enabled: Boolean(merged?.install?.enabled),
+    },
+    market: {
+      enabled: Boolean(merged?.market?.enabled),
+    },
+    restart: {
+      enabled: Boolean(merged?.restart?.enabled),
+    },
+  };
+}
+
 interface AccessRuleConfig {
   whitelist: Array<string | number>;
   blacklist: Array<string | number>;
@@ -1345,8 +1405,7 @@ export async function getManagedPackageDetail(
   const missingServices = checkDependentServices(pkg);
 
   const isSystemPlugin = target === "plugin" ? isSystemPluginName(name) : false;
-  const isSystemService =
-    target === "service" ? isSystemServiceName(name) : false;
+  const isSystemService = false;
   return {
     ok: true,
     data: {