luckytri 1.0.4 → 1.0.6

package/scripts/start-server.js

@@ -3,6 +3,10 @@ import { join } from "node:path";
 import { prepareRuntime } from "./runtime.js";
 import { VERSION } from "../server/version.js";
 import { resolveInstallation } from "../server/runtime/installation.js";
+import {
+  updatedServerAfterExit,
+  waitForProcessExit,
+} from "./service-supervisor.js";
 import {
   resolveProxyEnvironment,
   supportsNodeEnvironmentProxy,
@@ -16,11 +20,6 @@ if (proxy.enabled && !supportsNodeEnvironmentProxy())
     "系统代理转发需要 Node.js 24.5 或更高版本。请升级 Node.js 后重启 LuckyTri。",
   );
 
-const args = [
-  ...(proxy.enabled ? ["--use-env-proxy"] : []),
-  join(selected.package, "server", "index.js"),
-];
-const env = { ...process.env, ...proxy.env };
 if (proxy.enabled) console.log("已启用系统代理，外部 API 请求将经代理转发。");
 else if (proxy.source === "windows-pac-unsupported")
   console.log(
@@ -28,17 +27,73 @@ else if (proxy.source === "windows-pac-unsupported")
   );
 else console.log("未检测到系统代理，外部 API 请求将直连。");
 
-const child = spawn(process.execPath, args, {
-  cwd: paths.home,
-  env,
-  stdio: "inherit",
-});
+let currentPid;
 for (const signal of ["SIGINT", "SIGTERM"])
-  process.on(signal, () => child.kill(signal));
-child.once("error", (error) => {
+  process.on(signal, () => {
+    if (currentPid) process.kill(currentPid, signal);
+  });
+
+async function start(root) {
+  const child = spawn(
+    process.execPath,
+    [
+      ...(proxy.enabled ? ["--use-env-proxy"] : []),
+      join(root, "server", "index.js"),
+    ],
+    {
+      cwd: paths.home,
+      env: { ...process.env, ...proxy.env },
+      stdio: "inherit",
+    },
+  );
+  currentPid = child.pid;
+  const exited = new Promise((resolve) =>
+    child.once("exit", (code, signal) => resolve({ code, signal })),
+  );
+  await new Promise((resolve, reject) => {
+    child.once("spawn", resolve);
+    child.once("error", reject);
+  });
+  return { pid: child.pid, exited };
+}
+
+try {
+  let root = selected.package,
+    tracked = await start(root),
+    direct = true;
+  while (true) {
+    if (direct) {
+      const { code, signal } = await tracked.exited;
+      if (signal || code !== 0) {
+        process.exitCode = signal ? 1 : (code ?? 1);
+        break;
+      }
+    } else {
+      await waitForProcessExit(tracked.pid);
+    }
+
+    const update = await updatedServerAfterExit(paths.home, tracked.pid);
+    if (!update.matched) break;
+
+    if (update.pid) {
+      // The update worker starts the verified release (or the previous release
+      // after rollback). Keep this foreground process alive so systemd does not
+      // kill that process or any still-running update work in the same cgroup.
+      tracked = { pid: update.pid };
+      direct = false;
+      continue;
+    }
+
+    // If the worker died after stopping the server, bring back the currently
+    // selected release. The matching update record prevents normal `stop`
+    // requests from being mistaken for a failed update.
+    root = resolveInstallation(paths.home, paths.package, VERSION).package;
+    tracked = await start(root);
+    direct = true;
+  }
+} catch (error) {
   console.error(`LuckyTri 启动失败：${error.message}`);
   process.exitCode = 1;
-});
-child.once("exit", (code, signal) => {
-  process.exitCode = signal ? 1 : (code ?? 1);
-});
+} finally {
+  currentPid = undefined;
+}

package/scripts/update-instance.js

@@ -1,201 +1,201 @@
-import { spawn } from "node:child_process";
-import {
-  openSync,
-  closeSync,
-  writeFileSync,
-  readFileSync,
-  realpathSync,
-} from "node:fs";
-import { dirname, join, delimiter } from "node:path";
-import { pathToFileURL } from "node:url";
-import { prepareRuntime } from "./runtime.js";
-import {
-  running,
-  serviceUrl,
-  serviceHeaders,
-  localServiceRequest,
-} from "./service.js";
-import { claimLaunch, clearStarting } from "../server/startup-lock.js";
-import { performUpdate } from "../server/runtime/update-execution.js";
-import {
-  processAlive,
-  readUpdateJob,
-  writeUpdateJob,
-} from "../server/runtime/update-manager.js";
-import { updateRoot } from "../server/runtime/installation.js";
-
-export function installEnvironment(env) {
-  const kept = {};
-  for (const [key, value] of Object.entries(env))
-    if (
-      /^(?:PATH|PATHEXT|SYSTEMROOT|WINDIR|COMSPEC|USERPROFILE|HOME|APPDATA|LOCALAPPDATA|TEMP|TMP|TMPDIR|HTTP_PROXY|HTTPS_PROXY|ALL_PROXY|NO_PROXY|NODE_USE_ENV_PROXY)$/i.test(
-        key,
-      )
-    )
-      kept[key] = value;
-  return kept;
-}
-export function findNpmCli(env = process.env) {
-  const candidates = [
-    env.npm_execpath,
-    join(dirname(process.execPath), "node_modules/npm/bin/npm-cli.js"),
-    join(dirname(process.execPath), "../lib/node_modules/npm/bin/npm-cli.js"),
-    ...String(env.PATH || env.Path || "")
-      .split(delimiter)
-      .flatMap((dir) => [
-        join(dir, "npm"),
-        join(dir, "node_modules/npm/bin/npm-cli.js"),
-      ]),
-  ];
-  for (const candidate of candidates.filter(Boolean)) {
-    try {
-      const cli = realpathSync(candidate);
-      if (
-        JSON.parse(
-          readFileSync(join(dirname(cli), "..", "package.json"), "utf8"),
-        ).name === "npm"
-      )
-        return cli;
-    } catch {
-      /* Try the next native Node/npm installation location. */
-    }
-  }
-  throw Error("未找到 npm");
-}
-function command(args, { cwd, env = process.env, timeout = 600000, log } = {}) {
-  return new Promise((resolve, reject) => {
-    const fd = log ? openSync(log, "a", 0o600) : null;
-    const child = spawn(process.execPath, args, {
-      cwd,
-      env,
-      windowsHide: true,
-      stdio: fd === null ? "ignore" : ["ignore", fd, fd],
-    });
-    if (fd !== null) closeSync(fd);
-    const timer = setTimeout(() => {
-      child.kill();
-      reject(Error("更新步骤超时"));
-    }, timeout);
-    child.once("error", (e) => {
-      clearTimeout(timer);
-      reject(e);
-    });
-    child.once("exit", (code) => {
-      clearTimeout(timer);
-      code === 0 ? resolve() : reject(Error("更新程序校验失败"));
-    });
-  });
-}
-export function updateExecution(paths) {
-  const base = serviceUrl(),
-    spawned = new Set();
-  const pause = () => new Promise((r) => setTimeout(r, 250));
-  return {
-    async install(slot, version) {
-      const cli = findNpmCli();
-      const userconfig = join(updateRoot(paths.home), "install.npmrc");
-      writeFileSync(userconfig, "", { mode: 0o600 });
-      await command(
-        [
-          cli,
-          "install",
-          "--prefix",
-          slot,
-          "--registry=https://registry.npmjs.org/",
-          "--userconfig",
-          userconfig,
-          "--no-audit",
-          "--no-fund",
-          "--omit=dev",
-          "--engine-strict",
-          `luckytri@${version}`,
-        ],
-        { cwd: slot, env: installEnvironment(process.env), log: paths.log },
-      );
-    },
-    async check(root, version) {
-      const script = `import fs from 'node:fs';import {createRequire} from 'node:module';const p=JSON.parse(fs.readFileSync(${JSON.stringify(join(root, "package.json"))},'utf8'));if(p.version!==${JSON.stringify(version)})process.exit(1);await import(${JSON.stringify(pathToFileURL(join(root, "server/app.js")).href)});const sharp=createRequire(${JSON.stringify(pathToFileURL(join(root, "package.json")).href)})('sharp');await sharp({create:{width:1,height:1,channels:3,background:'#fff'}}).png().toBuffer();`;
-      await command(["--input-type=module", "-e", script], {
-        cwd: root,
-        env: installEnvironment(process.env),
-        timeout: 30000,
-        log: paths.log,
-      });
-    },
-    async stop(pid) {
-      if (!processAlive(pid)) return;
-      const info = await running({ base, lenient: true, local: true });
-      if (info?.pid === pid) {
-        const response = await localServiceRequest(base + "/api/service/stop", {
-          method: "POST",
-          headers: serviceHeaders(),
-          body: "{}",
-          timeout: 5000,
-        });
-        if (!response.ok) throw Error("服务拒绝停止请求");
-        await response.json();
-      } else if (spawned.has(pid)) process.kill(pid, "SIGTERM");
-      else throw Error("运行实例发生变化");
-      for (let n = 0; n < 160 && processAlive(pid); n++) await pause();
-      if (processAlive(pid)) throw Error("旧实例未停止");
-    },
-    claim: claimLaunch,
-    release: clearStarting,
-    async start(root) {
-      const log = openSync(paths.log, "a", 0o600);
-      try {
-        const child = spawn(
-          process.execPath,
-          [
-            ...(process.execArgv.includes("--use-env-proxy")
-              ? ["--use-env-proxy"]
-              : []),
-            join(root, "server", "index.js"),
-          ],
-          {
-            cwd: paths.home,
-            env: { ...process.env, LUCKYTRI_LAUNCH_PID: String(process.pid) },
-            detached: true,
-            windowsHide: true,
-            stdio: ["ignore", log, log],
-          },
-        );
-        await new Promise((resolve, reject) => {
-          child.once("spawn", resolve);
-          child.once("error", reject);
-        });
-        child.unref();
-        spawned.add(child.pid);
-        return child.pid;
-      } finally {
-        closeSync(log);
-      }
-    },
-    async health(pid, version) {
-      for (let n = 0; n < 2400; n++) {
-        if (!processAlive(pid)) throw Error("新实例已退出");
-        const info = await running({ base, lenient: true, local: true });
-        if (info?.pid === pid && info.version === version) return;
-        await pause();
-      }
-      throw Error("新实例启动超时");
-    },
-  };
-}
-async function main() {
-  const paths = prepareRuntime({ initialize: false }),
-    id = process.argv[2],
-    job = readUpdateJob(paths.home, id);
-  if (job.parent !== Number(process.argv[3]) || !processAlive(job.parent))
-    throw Error("更新启动信息无效");
-  writeUpdateJob(paths.home, { ...job, workerPid: process.pid });
-  const result = await performUpdate(paths, id, updateExecution(paths));
-  console.log(
-    result.status === "done" ? "版本更新与实例重启完成。" : result.error,
-  );
-}
-if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href)
-  main().catch((e) => {
-    console.error("版本更新未完成：", e.code || "请查看管理台更新状态");
-    process.exitCode = 1;
-  });
+import { spawn } from "node:child_process";
+import {
+  openSync,
+  closeSync,
+  writeFileSync,
+  readFileSync,
+  realpathSync,
+} from "node:fs";
+import { dirname, join, delimiter } from "node:path";
+import { pathToFileURL } from "node:url";
+import { prepareRuntime } from "./runtime.js";
+import {
+  running,
+  serviceUrl,
+  serviceHeaders,
+  localServiceRequest,
+} from "./service.js";
+import { claimLaunch, clearStarting } from "../server/startup-lock.js";
+import { performUpdate } from "../server/runtime/update-execution.js";
+import {
+  processAlive,
+  readUpdateJob,
+  writeUpdateJob,
+} from "../server/runtime/update-manager.js";
+import { updateRoot } from "../server/runtime/installation.js";
+
+export function installEnvironment(env) {
+  const kept = {};
+  for (const [key, value] of Object.entries(env))
+    if (
+      /^(?:PATH|PATHEXT|SYSTEMROOT|WINDIR|COMSPEC|USERPROFILE|HOME|APPDATA|LOCALAPPDATA|TEMP|TMP|TMPDIR|HTTP_PROXY|HTTPS_PROXY|ALL_PROXY|NO_PROXY|NODE_USE_ENV_PROXY)$/i.test(
+        key,
+      )
+    )
+      kept[key] = value;
+  return kept;
+}
+export function findNpmCli(env = process.env) {
+  const candidates = [
+    env.npm_execpath,
+    join(dirname(process.execPath), "node_modules/npm/bin/npm-cli.js"),
+    join(dirname(process.execPath), "../lib/node_modules/npm/bin/npm-cli.js"),
+    ...String(env.PATH || env.Path || "")
+      .split(delimiter)
+      .flatMap((dir) => [
+        join(dir, "npm"),
+        join(dir, "node_modules/npm/bin/npm-cli.js"),
+      ]),
+  ];
+  for (const candidate of candidates.filter(Boolean)) {
+    try {
+      const cli = realpathSync(candidate);
+      if (
+        JSON.parse(
+          readFileSync(join(dirname(cli), "..", "package.json"), "utf8"),
+        ).name === "npm"
+      )
+        return cli;
+    } catch {
+      /* Try the next native Node/npm installation location. */
+    }
+  }
+  throw Error("未找到 npm");
+}
+function command(args, { cwd, env = process.env, timeout = 600000, log } = {}) {
+  return new Promise((resolve, reject) => {
+    const fd = log ? openSync(log, "a", 0o600) : null;
+    const child = spawn(process.execPath, args, {
+      cwd,
+      env,
+      windowsHide: true,
+      stdio: fd === null ? "ignore" : ["ignore", fd, fd],
+    });
+    if (fd !== null) closeSync(fd);
+    const timer = setTimeout(() => {
+      child.kill();
+      reject(Error("更新步骤超时"));
+    }, timeout);
+    child.once("error", (e) => {
+      clearTimeout(timer);
+      reject(e);
+    });
+    child.once("exit", (code) => {
+      clearTimeout(timer);
+      code === 0 ? resolve() : reject(Error("更新程序校验失败"));
+    });
+  });
+}
+export function updateExecution(paths) {
+  const base = serviceUrl(),
+    spawned = new Set();
+  const pause = () => new Promise((r) => setTimeout(r, 250));
+  return {
+    async install(slot, version) {
+      const cli = findNpmCli();
+      const userconfig = join(updateRoot(paths.home), "install.npmrc");
+      writeFileSync(userconfig, "", { mode: 0o600 });
+      await command(
+        [
+          cli,
+          "install",
+          "--prefix",
+          slot,
+          "--registry=https://registry.npmjs.org/",
+          "--userconfig",
+          userconfig,
+          "--no-audit",
+          "--no-fund",
+          "--omit=dev",
+          "--engine-strict",
+          `luckytri@${version}`,
+        ],
+        { cwd: slot, env: installEnvironment(process.env), log: paths.log },
+      );
+    },
+    async check(root, version) {
+      const script = `import fs from 'node:fs';import {createRequire} from 'node:module';const p=JSON.parse(fs.readFileSync(${JSON.stringify(join(root, "package.json"))},'utf8'));if(p.version!==${JSON.stringify(version)})process.exit(1);await import(${JSON.stringify(pathToFileURL(join(root, "server/app.js")).href)});const sharp=createRequire(${JSON.stringify(pathToFileURL(join(root, "package.json")).href)})('sharp');await sharp({create:{width:1,height:1,channels:3,background:'#fff'}}).png().toBuffer();`;
+      await command(["--input-type=module", "-e", script], {
+        cwd: root,
+        env: installEnvironment(process.env),
+        timeout: 30000,
+        log: paths.log,
+      });
+    },
+    async stop(pid) {
+      if (!processAlive(pid)) return;
+      const info = await running({ base, lenient: true, local: true });
+      if (info?.pid === pid) {
+        const response = await localServiceRequest(base + "/api/service/stop", {
+          method: "POST",
+          headers: serviceHeaders(),
+          body: "{}",
+          timeout: 5000,
+        });
+        if (!response.ok) throw Error("服务拒绝停止请求");
+        await response.json();
+      } else if (spawned.has(pid)) process.kill(pid, "SIGTERM");
+      else throw Error("运行实例发生变化");
+      for (let n = 0; n < 160 && processAlive(pid); n++) await pause();
+      if (processAlive(pid)) throw Error("旧实例未停止");
+    },
+    claim: claimLaunch,
+    release: clearStarting,
+    async start(root) {
+      const log = openSync(paths.log, "a", 0o600);
+      try {
+        const child = spawn(
+          process.execPath,
+          [
+            ...(process.execArgv.includes("--use-env-proxy")
+              ? ["--use-env-proxy"]
+              : []),
+            join(root, "server", "index.js"),
+          ],
+          {
+            cwd: paths.home,
+            env: { ...process.env, LUCKYTRI_LAUNCH_PID: String(process.pid) },
+            detached: true,
+            windowsHide: true,
+            stdio: ["ignore", log, log],
+          },
+        );
+        await new Promise((resolve, reject) => {
+          child.once("spawn", resolve);
+          child.once("error", reject);
+        });
+        child.unref();
+        spawned.add(child.pid);
+        return child.pid;
+      } finally {
+        closeSync(log);
+      }
+    },
+    async health(pid, version) {
+      for (let n = 0; n < 2400; n++) {
+        if (!processAlive(pid)) throw Error("新实例已退出");
+        const info = await running({ base, lenient: true, local: true });
+        if (info?.pid === pid && info.version === version) return;
+        await pause();
+      }
+      throw Error("新实例启动超时");
+    },
+  };
+}
+async function main() {
+  const paths = prepareRuntime({ initialize: false }),
+    id = process.argv[2],
+    job = readUpdateJob(paths.home, id);
+  if (job.parent !== Number(process.argv[3]) || !processAlive(job.parent))
+    throw Error("更新启动信息无效");
+  writeUpdateJob(paths.home, { ...job, workerPid: process.pid });
+  const result = await performUpdate(paths, id, updateExecution(paths));
+  console.log(
+    result.status === "done" ? "版本更新与实例重启完成。" : result.error,
+  );
+}
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href)
+  main().catch((e) => {
+    console.error("版本更新未完成：", e.code || "请查看管理台更新状态");
+    process.exitCode = 1;
+  });

package/server/channels/adapters.js

@@ -1,27 +1,27 @@
-import { onebot } from "./onebot/adapter.js";
-import { qqbot } from "./qqbot/adapter.js";
-import { parseSessionKey } from "./session-key.js";
-
-// What the core may ask a platform without being connected to it, such as
-// which media links are safe to download. One entry per channel type.
-const adapters = new Map([
-  [onebot.type, onebot],
-  [qqbot.type, qqbot],
-]);
-
-export function registerChannel(adapter) {
-  adapters.set(adapter.type, adapter);
-}
-
-export function adapterFor(sessionOrType = "onebot") {
-  try {
-    const type = String(sessionOrType).includes(":")
-      ? parseSessionKey(sessionOrType).channel
-      : sessionOrType;
-    return adapters.get(type) || onebot;
-  } catch {
-    return onebot;
-  }
-}
-
-export { onebot, qqbot };
+import { onebot } from "./onebot/adapter.js";
+import { qqbot } from "./qqbot/adapter.js";
+import { parseSessionKey } from "./session-key.js";
+
+// What the core may ask a platform without being connected to it, such as
+// which media links are safe to download. One entry per channel type.
+const adapters = new Map([
+  [onebot.type, onebot],
+  [qqbot.type, qqbot],
+]);
+
+export function registerChannel(adapter) {
+  adapters.set(adapter.type, adapter);
+}
+
+export function adapterFor(sessionOrType = "onebot") {
+  try {
+    const type = String(sessionOrType).includes(":")
+      ? parseSessionKey(sessionOrType).channel
+      : sessionOrType;
+    return adapters.get(type) || onebot;
+  } catch {
+    return onebot;
+  }
+}
+
+export { onebot, qqbot };