luckytri 1.0.5 → 1.0.6

package/scripts/import-data.js

@@ -1,128 +1,128 @@
-import { spawn } from "node:child_process";
-import { openSync, closeSync } from "node:fs";
-import { join } from "node:path";
-import { prepareRuntime } from "./runtime.js";
-import { claimLaunch, clearStarting } from "../server/startup-lock.js";
-import { applyDataImport } from "../server/storage/data-package.js";
-import {
-  transferRoot,
-  readTransferJob,
-  writeTransferJob,
-  IMPORT_FAILURE,
-  IMPORT_START_FAILURE,
-  IMPORT_RESTART_FAILURE,
-} from "../server/storage/data-transfer.js";
-
-const id = process.argv[2];
-const parent = Number(process.argv[3]);
-let job,
-  paths,
-  claimed = false;
-const alive = (pid) => {
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch (error) {
-    return error.code !== "ESRCH";
-  }
-};
-try {
-  paths = prepareRuntime({ initialize: false });
-  if (!Number.isInteger(parent) || parent <= 0) throw Error("导入启动信息无效");
-  job = readTransferJob(transferRoot(), id);
-  if (job.kind !== "import" || job.status !== "queued")
-    throw Error("导入任务已经处理或不可用");
-  for (let attempt = 0; attempt < 160 && alive(parent); attempt++)
-    await new Promise((resolve) => setTimeout(resolve, 250));
-  if (alive(parent)) throw Error("旧实例仍在运行，未替换数据");
-  if (!claimLaunch()) throw Error("另一次启动正在进行，未替换数据");
-  claimed = true;
-  try {
-    const result = applyDataImport(
-      join(transferRoot(), id, "data.db"),
-      paths.database,
-      paths.backups,
-      {
-        id,
-        beforeSwap(backup) {
-          job = { ...job, backup };
-          writeTransferJob(transferRoot(), job);
-        },
-      },
-    );
-    job = {
-      ...job,
-      status: "done",
-      applied: Date.now(),
-      ...result,
-    };
-    try {
-      writeTransferJob(transferRoot(), job);
-    } catch {
-      console.error("导入结果记录未写入，重启后会核对已提交的数据。");
-    }
-    console.log("数据导入完成，当前数据快照已保留。");
-  } catch (error) {
-    writeTransferJob(transferRoot(), {
-      ...job,
-      status: "error",
-      error: IMPORT_FAILURE,
-    });
-    console.error("数据导入未完成：", error.code || "校验或替换失败");
-  }
-  // Hand the launch claim directly to the new server so no other launch can
-  // open the database halfway through the swap.
-  const log = openSync(paths.log, "a", 0o600);
-  const child = spawn(
-    process.execPath,
-    [
-      ...(process.execArgv.includes("--use-env-proxy")
-        ? ["--use-env-proxy"]
-        : []),
-      join(paths.package, "server", "index.js"),
-    ],
-    {
-      cwd: paths.home,
-      env: { ...process.env, LUCKYTRI_LAUNCH_PID: String(process.pid) },
-      detached: true,
-      windowsHide: true,
-      stdio: ["ignore", log, log],
-    },
-  );
-  closeSync(log);
-  await new Promise((resolve, reject) => {
-    child.once("spawn", resolve);
-    child.once("error", reject);
-  });
-  child.unref();
-  for (let attempt = 0; attempt < 120; attempt++) {
-    try {
-      const info = JSON.parse(
-        (await import("node:fs")).readFileSync(
-          join(paths.data, "startup.json"),
-          "utf8",
-        ),
-      );
-      if (info.pid === child.pid && info.role === "server") {
-        claimed = false;
-        break;
-      }
-    } catch {}
-    await new Promise((resolve) => setTimeout(resolve, 250));
-  }
-} catch (error) {
-  if (job) {
-    try {
-      writeTransferJob(transferRoot(), {
-        ...job,
-        status: "error",
-        error:
-          job.status === "done" ? IMPORT_RESTART_FAILURE : IMPORT_START_FAILURE,
-      });
-    } catch {}
-  }
-  console.error("导入启动失败：", error.code || "请查看数据任务状态");
-  process.exitCode = 1;
-} finally {
-  if (claimed) clearStarting();
-}
+import { spawn } from "node:child_process";
+import { openSync, closeSync } from "node:fs";
+import { join } from "node:path";
+import { prepareRuntime } from "./runtime.js";
+import { claimLaunch, clearStarting } from "../server/startup-lock.js";
+import { applyDataImport } from "../server/storage/data-package.js";
+import {
+  transferRoot,
+  readTransferJob,
+  writeTransferJob,
+  IMPORT_FAILURE,
+  IMPORT_START_FAILURE,
+  IMPORT_RESTART_FAILURE,
+} from "../server/storage/data-transfer.js";
+
+const id = process.argv[2];
+const parent = Number(process.argv[3]);
+let job,
+  paths,
+  claimed = false;
+const alive = (pid) => {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    return error.code !== "ESRCH";
+  }
+};
+try {
+  paths = prepareRuntime({ initialize: false });
+  if (!Number.isInteger(parent) || parent <= 0) throw Error("导入启动信息无效");
+  job = readTransferJob(transferRoot(), id);
+  if (job.kind !== "import" || job.status !== "queued")
+    throw Error("导入任务已经处理或不可用");
+  for (let attempt = 0; attempt < 160 && alive(parent); attempt++)
+    await new Promise((resolve) => setTimeout(resolve, 250));
+  if (alive(parent)) throw Error("旧实例仍在运行，未替换数据");
+  if (!claimLaunch()) throw Error("另一次启动正在进行，未替换数据");
+  claimed = true;
+  try {
+    const result = applyDataImport(
+      join(transferRoot(), id, "data.db"),
+      paths.database,
+      paths.backups,
+      {
+        id,
+        beforeSwap(backup) {
+          job = { ...job, backup };
+          writeTransferJob(transferRoot(), job);
+        },
+      },
+    );
+    job = {
+      ...job,
+      status: "done",
+      applied: Date.now(),
+      ...result,
+    };
+    try {
+      writeTransferJob(transferRoot(), job);
+    } catch {
+      console.error("导入结果记录未写入，重启后会核对已提交的数据。");
+    }
+    console.log("数据导入完成，当前数据快照已保留。");
+  } catch (error) {
+    writeTransferJob(transferRoot(), {
+      ...job,
+      status: "error",
+      error: IMPORT_FAILURE,
+    });
+    console.error("数据导入未完成：", error.code || "校验或替换失败");
+  }
+  // Hand the launch claim directly to the new server so no other launch can
+  // open the database halfway through the swap.
+  const log = openSync(paths.log, "a", 0o600);
+  const child = spawn(
+    process.execPath,
+    [
+      ...(process.execArgv.includes("--use-env-proxy")
+        ? ["--use-env-proxy"]
+        : []),
+      join(paths.package, "server", "index.js"),
+    ],
+    {
+      cwd: paths.home,
+      env: { ...process.env, LUCKYTRI_LAUNCH_PID: String(process.pid) },
+      detached: true,
+      windowsHide: true,
+      stdio: ["ignore", log, log],
+    },
+  );
+  closeSync(log);
+  await new Promise((resolve, reject) => {
+    child.once("spawn", resolve);
+    child.once("error", reject);
+  });
+  child.unref();
+  for (let attempt = 0; attempt < 120; attempt++) {
+    try {
+      const info = JSON.parse(
+        (await import("node:fs")).readFileSync(
+          join(paths.data, "startup.json"),
+          "utf8",
+        ),
+      );
+      if (info.pid === child.pid && info.role === "server") {
+        claimed = false;
+        break;
+      }
+    } catch {}
+    await new Promise((resolve) => setTimeout(resolve, 250));
+  }
+} catch (error) {
+  if (job) {
+    try {
+      writeTransferJob(transferRoot(), {
+        ...job,
+        status: "error",
+        error:
+          job.status === "done" ? IMPORT_RESTART_FAILURE : IMPORT_START_FAILURE,
+      });
+    } catch {}
+  }
+  console.error("导入启动失败：", error.code || "请查看数据任务状态");
+  process.exitCode = 1;
+} finally {
+  if (claimed) clearStarting();
+}

package/scripts/proxy-config.js

@@ -1,167 +1,167 @@
-import { execFileSync } from "node:child_process";
-import net from "node:net";
-
-const WINDOWS_INTERNET_SETTINGS =
-  "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings";
-const LOCAL_BYPASS = ["localhost", "127.0.0.1", "::1"];
-
-function environmentProxy(env) {
-  const http = env.http_proxy || env.HTTP_PROXY || "";
-  const https = env.https_proxy || env.HTTPS_PROXY || http;
-  return http || https ? { http, https } : null;
-}
-
-function readWindowsValue(name) {
-  try {
-    const output = execFileSync(
-      "reg.exe",
-      ["query", WINDOWS_INTERNET_SETTINGS, "/v", name],
-      {
-        encoding: "utf8",
-        windowsHide: true,
-        stdio: ["ignore", "pipe", "ignore"],
-      },
-    );
-    return (
-      output
-        .match(new RegExp(`\\b${name}\\s+REG_\\w+\\s+(.+)$`, "im"))?.[1]
-        ?.trim() || ""
-    );
-  } catch {
-    return "";
-  }
-}
-
-function parseWindowsProxyServer(value) {
-  const routes = {};
-  for (const part of String(value || "").split(";")) {
-    const item = part.trim();
-    if (!item) continue;
-    const separator = item.indexOf("=");
-    if (separator < 0) routes.default = item;
-    else
-      routes[item.slice(0, separator).trim().toLowerCase()] = item
-        .slice(separator + 1)
-        .trim();
-  }
-  const normalize = (item) => {
-    if (!item) return "";
-    try {
-      const url = new URL(
-        /^[a-z][a-z\d+.-]*:\/\//i.test(item) ? item : `http://${item}`,
-      );
-      return ["http:", "https:"].includes(url.protocol) ? url.href : "";
-    } catch {
-      return "";
-    }
-  };
-  const fallback = routes.default || routes.http || routes.https || "";
-  return {
-    http: normalize(routes.http || fallback || routes.https),
-    https: normalize(routes.https || fallback || routes.http),
-  };
-}
-
-function isLoopbackProxy(url) {
-  try {
-    const host = new URL(url).hostname.toLowerCase();
-    return host === "localhost" || host === "::1" || host.startsWith("127.");
-  } catch {
-    return false;
-  }
-}
-
-function isListening(url) {
-  return new Promise((resolve) => {
-    try {
-      const proxy = new URL(url);
-      const socket = net.createConnection({
-        host: proxy.hostname,
-        port: Number(proxy.port || (proxy.protocol === "https:" ? 443 : 80)),
-      });
-      const finish = (value) => {
-        socket.destroy();
-        resolve(value);
-      };
-      socket.setTimeout(700, () => finish(false));
-      socket.once("connect", () => finish(true));
-      socket.once("error", () => finish(false));
-    } catch {
-      resolve(false);
-    }
-  });
-}
-
-function mergeNoProxy(...values) {
-  const hosts = new Set(LOCAL_BYPASS);
-  for (const value of values) {
-    for (const host of String(value || "").split(/[;,]/)) {
-      const item = host.trim();
-      if (item && item.toLowerCase() !== "<local>") hosts.add(item);
-    }
-  }
-  return [...hosts].join(",");
-}
-
-export async function resolveProxyEnvironment(env = process.env) {
-  const configured = environmentProxy(env);
-  if (configured) {
-    return {
-      enabled: true,
-      source: "environment",
-      env: {
-        HTTP_PROXY: configured.http || configured.https,
-        HTTPS_PROXY: configured.https || configured.http,
-        NO_PROXY: mergeNoProxy(env.NO_PROXY, env.no_proxy),
-      },
-    };
-  }
-
-  if (process.platform !== "win32")
-    return { enabled: false, source: "none", env: {} };
-
-  const enabled = /^\s*(?:1|0x1)\s*$/i.test(readWindowsValue("ProxyEnable"));
-  const server = readWindowsValue("ProxyServer");
-  const routes = parseWindowsProxyServer(server);
-  const bypass = readWindowsValue("ProxyOverride");
-  let source = enabled ? "windows-system" : "none";
-
-  // Some proxy clients leave the Windows system-proxy toggle off while their
-  // local HTTP proxy remains active. Honor that live endpoint for LuckyTri.
-  if (
-    !enabled &&
-    routes.https &&
-    isLoopbackProxy(routes.https) &&
-    (await isListening(routes.https))
-  )
-    source = "windows-local-proxy";
-
-  if (source === "none")
-    return {
-      enabled: false,
-      source: readWindowsValue("AutoConfigURL")
-        ? "windows-pac-unsupported"
-        : source,
-      env: {},
-    };
-
-  if (!routes.http && !routes.https)
-    return { enabled: false, source: "windows-proxy-invalid", env: {} };
-
-  return {
-    enabled: true,
-    source,
-    env: {
-      HTTP_PROXY: routes.http || routes.https,
-      HTTPS_PROXY: routes.https || routes.http,
-      NO_PROXY: mergeNoProxy(env.NO_PROXY, env.no_proxy, bypass),
-    },
-  };
-}
-
-export function supportsNodeEnvironmentProxy(version = process.versions.node) {
-  const [major, minor] = version.split(".").map(Number);
-  return (
-    major > 24 || (major === 24 && minor >= 5) || (major === 22 && minor >= 21)
-  );
-}
+import { execFileSync } from "node:child_process";
+import net from "node:net";
+
+const WINDOWS_INTERNET_SETTINGS =
+  "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings";
+const LOCAL_BYPASS = ["localhost", "127.0.0.1", "::1"];
+
+function environmentProxy(env) {
+  const http = env.http_proxy || env.HTTP_PROXY || "";
+  const https = env.https_proxy || env.HTTPS_PROXY || http;
+  return http || https ? { http, https } : null;
+}
+
+function readWindowsValue(name) {
+  try {
+    const output = execFileSync(
+      "reg.exe",
+      ["query", WINDOWS_INTERNET_SETTINGS, "/v", name],
+      {
+        encoding: "utf8",
+        windowsHide: true,
+        stdio: ["ignore", "pipe", "ignore"],
+      },
+    );
+    return (
+      output
+        .match(new RegExp(`\\b${name}\\s+REG_\\w+\\s+(.+)$`, "im"))?.[1]
+        ?.trim() || ""
+    );
+  } catch {
+    return "";
+  }
+}
+
+function parseWindowsProxyServer(value) {
+  const routes = {};
+  for (const part of String(value || "").split(";")) {
+    const item = part.trim();
+    if (!item) continue;
+    const separator = item.indexOf("=");
+    if (separator < 0) routes.default = item;
+    else
+      routes[item.slice(0, separator).trim().toLowerCase()] = item
+        .slice(separator + 1)
+        .trim();
+  }
+  const normalize = (item) => {
+    if (!item) return "";
+    try {
+      const url = new URL(
+        /^[a-z][a-z\d+.-]*:\/\//i.test(item) ? item : `http://${item}`,
+      );
+      return ["http:", "https:"].includes(url.protocol) ? url.href : "";
+    } catch {
+      return "";
+    }
+  };
+  const fallback = routes.default || routes.http || routes.https || "";
+  return {
+    http: normalize(routes.http || fallback || routes.https),
+    https: normalize(routes.https || fallback || routes.http),
+  };
+}
+
+function isLoopbackProxy(url) {
+  try {
+    const host = new URL(url).hostname.toLowerCase();
+    return host === "localhost" || host === "::1" || host.startsWith("127.");
+  } catch {
+    return false;
+  }
+}
+
+function isListening(url) {
+  return new Promise((resolve) => {
+    try {
+      const proxy = new URL(url);
+      const socket = net.createConnection({
+        host: proxy.hostname,
+        port: Number(proxy.port || (proxy.protocol === "https:" ? 443 : 80)),
+      });
+      const finish = (value) => {
+        socket.destroy();
+        resolve(value);
+      };
+      socket.setTimeout(700, () => finish(false));
+      socket.once("connect", () => finish(true));
+      socket.once("error", () => finish(false));
+    } catch {
+      resolve(false);
+    }
+  });
+}
+
+function mergeNoProxy(...values) {
+  const hosts = new Set(LOCAL_BYPASS);
+  for (const value of values) {
+    for (const host of String(value || "").split(/[;,]/)) {
+      const item = host.trim();
+      if (item && item.toLowerCase() !== "<local>") hosts.add(item);
+    }
+  }
+  return [...hosts].join(",");
+}
+
+export async function resolveProxyEnvironment(env = process.env) {
+  const configured = environmentProxy(env);
+  if (configured) {
+    return {
+      enabled: true,
+      source: "environment",
+      env: {
+        HTTP_PROXY: configured.http || configured.https,
+        HTTPS_PROXY: configured.https || configured.http,
+        NO_PROXY: mergeNoProxy(env.NO_PROXY, env.no_proxy),
+      },
+    };
+  }
+
+  if (process.platform !== "win32")
+    return { enabled: false, source: "none", env: {} };
+
+  const enabled = /^\s*(?:1|0x1)\s*$/i.test(readWindowsValue("ProxyEnable"));
+  const server = readWindowsValue("ProxyServer");
+  const routes = parseWindowsProxyServer(server);
+  const bypass = readWindowsValue("ProxyOverride");
+  let source = enabled ? "windows-system" : "none";
+
+  // Some proxy clients leave the Windows system-proxy toggle off while their
+  // local HTTP proxy remains active. Honor that live endpoint for LuckyTri.
+  if (
+    !enabled &&
+    routes.https &&
+    isLoopbackProxy(routes.https) &&
+    (await isListening(routes.https))
+  )
+    source = "windows-local-proxy";
+
+  if (source === "none")
+    return {
+      enabled: false,
+      source: readWindowsValue("AutoConfigURL")
+        ? "windows-pac-unsupported"
+        : source,
+      env: {},
+    };
+
+  if (!routes.http && !routes.https)
+    return { enabled: false, source: "windows-proxy-invalid", env: {} };
+
+  return {
+    enabled: true,
+    source,
+    env: {
+      HTTP_PROXY: routes.http || routes.https,
+      HTTPS_PROXY: routes.https || routes.http,
+      NO_PROXY: mergeNoProxy(env.NO_PROXY, env.no_proxy, bypass),
+    },
+  };
+}
+
+export function supportsNodeEnvironmentProxy(version = process.versions.node) {
+  const [major, minor] = version.split(".").map(Number);
+  return (
+    major > 24 || (major === 24 && minor >= 5) || (major === 22 && minor >= 21)
+  );
+}

package/scripts/service-supervisor.js

@@ -0,0 +1,50 @@
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+import { processAlive } from "../server/runtime/update-manager.js";
+
+const ACTIVE_UPDATE = new Set([
+  "queued",
+  "downloading",
+  "checking",
+  "stopping",
+  "backup",
+  "restarting",
+  "verifying",
+  "restoring",
+]);
+
+function readJob(home) {
+  try {
+    return JSON.parse(readFileSync(join(home, "runtime", "job.json"), "utf8"));
+  } catch {
+    return null;
+  }
+}
+
+const pause = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
+// Keep the foreground service alive while its update worker gracefully stops
+// the old server. Otherwise systemd can tear down the worker with the old
+// server's cgroup before it has started the replacement.
+export async function updatedServerAfterExit(
+  home,
+  parentPid,
+  { read = () => readJob(home), alive = processAlive, sleep = pause } = {},
+) {
+  while (true) {
+    const job = read();
+    if (!job || job.parent !== parentPid) return { matched: false, pid: null };
+    if (!ACTIVE_UPDATE.has(job.status))
+      return { matched: true, pid: alive(job.childPid) ? job.childPid : null };
+    if (!alive(job.workerPid))
+      return { matched: true, pid: alive(job.childPid) ? job.childPid : null };
+    await sleep(250);
+  }
+}
+
+export async function waitForProcessExit(
+  pid,
+  { alive = processAlive, sleep = pause } = {},
+) {
+  while (alive(pid)) await sleep(250);
+}