luckytri 1.0.6 → 1.0.7

package/server/runtime/installation.js

@@ -1,116 +1,116 @@
-import {
-  existsSync,
-  lstatSync,
-  mkdirSync,
-  readFileSync,
-  realpathSync,
-  readdirSync,
-  renameSync,
-  rmdirSync,
-  writeFileSync,
-  unlinkSync,
-} from "node:fs";
-import { join, relative, isAbsolute } from "node:path";
-import { randomUUID } from "node:crypto";
-import { compareVersions } from "../studio/updates.js";
-export const UPDATE_ID =
-  /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/;
-export const updateRoot = (home) => join(home, "runtime");
-export function updatePath(home, id) {
-  if (!UPDATE_ID.test(String(id))) throw Error("更新任务无效");
-  const root = updateRoot(home),
-    path = join(root, "releases", id);
-  // Managed paths cannot be symlinked into an unrelated installation.
-  for (const p of [root, join(root, "releases"), path])
-    if (existsSync(p) && lstatSync(p).isSymbolicLink())
-      throw Error("更新目录无效");
-  return path;
-}
-export function readActive(home) {
-  try {
-    return JSON.parse(
-      readFileSync(join(updateRoot(home), "active.json"), "utf8"),
-    );
-  } catch {
-    return null;
-  }
-}
-export function atomicJson(file, value) {
-  const tmp = `${file}.${randomUUID()}.partial`;
-  try {
-    writeFileSync(tmp, JSON.stringify(value), {
-      mode: 0o600,
-      flag: "wx",
-      flush: true,
-    });
-    renameSync(tmp, file);
-  } finally {
-    if (existsSync(tmp)) unlinkSync(tmp);
-  }
-}
-export function writeActive(home, value) {
-  const root = updateRoot(home);
-  if (value) updatePath(home, value.id);
-  mkdirSync(root, { recursive: true, mode: 0o700 });
-  if (value) atomicJson(join(root, "active.json"), value);
-  else if (existsSync(join(root, "active.json")))
-    unlinkSync(join(root, "active.json"));
-}
-export function installedRelease(home, id, version) {
-  const slot = updatePath(home, id),
-    root = join(slot, "node_modules", "luckytri");
-  const part = relative(realpathSync(slot), realpathSync(root));
-  if (part.startsWith("..") || isAbsolute(part)) throw Error("更新目录无效");
-  const pkg = JSON.parse(readFileSync(join(root, "package.json"), "utf8"));
-  if (
-    pkg.name !== "luckytri" ||
-    pkg.version !== version ||
-    !existsSync(join(root, "server", "index.js")) ||
-    !existsSync(join(root, "public", "app", "index.html"))
-  )
-    throw Error("更新程序校验失败");
-  return root;
-}
-export function resolveInstallation(home, basePackage, baseVersion) {
-  const active = readActive(home);
-  if (active) {
-    try {
-      // An explicit newer/equal global npm or source install takes precedence.
-      if (compareVersions(active.version, baseVersion) > 0)
-        return {
-          package: installedRelease(home, active.id, active.version),
-          version: active.version,
-        };
-    } catch {
-      /* Invalid receipts never route the launcher to arbitrary code. */
-    }
-  }
-  return { package: basePackage, version: baseVersion };
-}
-export function pruneInstallations(home, keep) {
-  const root = join(updateRoot(home), "releases");
-  if (!existsSync(root)) return;
-  for (const entry of readdirSync(root, { withFileTypes: true })) {
-    if (
-      !entry.isDirectory() ||
-      !UPDATE_ID.test(entry.name) ||
-      keep.includes(entry.name)
-    )
-      continue;
-    const path = updatePath(home, entry.name),
-      part = relative(realpathSync(root), realpathSync(path));
-    if (!part || part.startsWith("..") || isAbsolute(part))
-      throw Error("更新目录无效");
-    // File removal uses unlink, including Unicode/short Windows paths where
-    // recursive rm can return without actually removing a lock or directory.
-    const remove = (directory) => {
-      for (const child of readdirSync(directory, { withFileTypes: true })) {
-        const target = join(directory, child.name);
-        if (child.isDirectory() && !child.isSymbolicLink()) remove(target);
-        else unlinkSync(target);
-      }
-      rmdirSync(directory);
-    };
-    remove(path);
-  }
-}
+import {
+  existsSync,
+  lstatSync,
+  mkdirSync,
+  readFileSync,
+  realpathSync,
+  readdirSync,
+  renameSync,
+  rmdirSync,
+  writeFileSync,
+  unlinkSync,
+} from "node:fs";
+import { join, relative, isAbsolute } from "node:path";
+import { randomUUID } from "node:crypto";
+import { compareVersions } from "../studio/updates.js";
+export const UPDATE_ID =
+  /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/;
+export const updateRoot = (home) => join(home, "runtime");
+export function updatePath(home, id) {
+  if (!UPDATE_ID.test(String(id))) throw Error("更新任务无效");
+  const root = updateRoot(home),
+    path = join(root, "releases", id);
+  // Managed paths cannot be symlinked into an unrelated installation.
+  for (const p of [root, join(root, "releases"), path])
+    if (existsSync(p) && lstatSync(p).isSymbolicLink())
+      throw Error("更新目录无效");
+  return path;
+}
+export function readActive(home) {
+  try {
+    return JSON.parse(
+      readFileSync(join(updateRoot(home), "active.json"), "utf8"),
+    );
+  } catch {
+    return null;
+  }
+}
+export function atomicJson(file, value) {
+  const tmp = `${file}.${randomUUID()}.partial`;
+  try {
+    writeFileSync(tmp, JSON.stringify(value), {
+      mode: 0o600,
+      flag: "wx",
+      flush: true,
+    });
+    renameSync(tmp, file);
+  } finally {
+    if (existsSync(tmp)) unlinkSync(tmp);
+  }
+}
+export function writeActive(home, value) {
+  const root = updateRoot(home);
+  if (value) updatePath(home, value.id);
+  mkdirSync(root, { recursive: true, mode: 0o700 });
+  if (value) atomicJson(join(root, "active.json"), value);
+  else if (existsSync(join(root, "active.json")))
+    unlinkSync(join(root, "active.json"));
+}
+export function installedRelease(home, id, version) {
+  const slot = updatePath(home, id),
+    root = join(slot, "node_modules", "luckytri");
+  const part = relative(realpathSync(slot), realpathSync(root));
+  if (part.startsWith("..") || isAbsolute(part)) throw Error("更新目录无效");
+  const pkg = JSON.parse(readFileSync(join(root, "package.json"), "utf8"));
+  if (
+    pkg.name !== "luckytri" ||
+    pkg.version !== version ||
+    !existsSync(join(root, "server", "index.js")) ||
+    !existsSync(join(root, "public", "app", "index.html"))
+  )
+    throw Error("更新程序校验失败");
+  return root;
+}
+export function resolveInstallation(home, basePackage, baseVersion) {
+  const active = readActive(home);
+  if (active) {
+    try {
+      // An explicit newer/equal global npm or source install takes precedence.
+      if (compareVersions(active.version, baseVersion) > 0)
+        return {
+          package: installedRelease(home, active.id, active.version),
+          version: active.version,
+        };
+    } catch {
+      /* Invalid receipts never route the launcher to arbitrary code. */
+    }
+  }
+  return { package: basePackage, version: baseVersion };
+}
+export function pruneInstallations(home, keep) {
+  const root = join(updateRoot(home), "releases");
+  if (!existsSync(root)) return;
+  for (const entry of readdirSync(root, { withFileTypes: true })) {
+    if (
+      !entry.isDirectory() ||
+      !UPDATE_ID.test(entry.name) ||
+      keep.includes(entry.name)
+    )
+      continue;
+    const path = updatePath(home, entry.name),
+      part = relative(realpathSync(root), realpathSync(path));
+    if (!part || part.startsWith("..") || isAbsolute(part))
+      throw Error("更新目录无效");
+    // File removal uses unlink, including Unicode/short Windows paths where
+    // recursive rm can return without actually removing a lock or directory.
+    const remove = (directory) => {
+      for (const child of readdirSync(directory, { withFileTypes: true })) {
+        const target = join(directory, child.name);
+        if (child.isDirectory() && !child.isSymbolicLink()) remove(target);
+        else unlinkSync(target);
+      }
+      rmdirSync(directory);
+    };
+    remove(path);
+  }
+}

package/server/runtime/update-manager.js

@@ -1,140 +1,140 @@
-import { randomUUID } from "node:crypto";
-import { mkdirSync, readFileSync } from "node:fs";
-import { join } from "node:path";
-import {
-  atomicJson,
-  UPDATE_ID,
-  updatePath,
-  updateRoot,
-} from "./installation.js";
-export const UPDATE_FAILED =
-  "更新未完成，原程序和数据已保留，请查看运行日志后重试。";
-export const UPDATE_RECOVERY_FAILED =
-  "自动恢复未完成，更新前的校验备份已保留，请查看运行日志并手动恢复。";
-const ACTIVE = new Set([
-  "queued",
-  "downloading",
-  "checking",
-  "stopping",
-  "backup",
-  "restarting",
-  "verifying",
-  "restoring",
-]);
-export const processAlive = (pid) => {
-  if (!Number.isInteger(pid) || pid <= 0) return false;
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch (e) {
-    return e.code !== "ESRCH";
-  }
-};
-export function readUpdateJob(home, id) {
-  updatePath(home, id);
-  const job = JSON.parse(
-    readFileSync(join(updateRoot(home), "job.json"), "utf8"),
-  );
-  if (job.id !== id || !UPDATE_ID.test(job.id)) throw Error("更新任务无效");
-  return job;
-}
-export const writeUpdateJob = (home, job) => {
-  updatePath(home, job.id);
-  atomicJson(join(updateRoot(home), "job.json"), job);
-  return job;
-};
-export class InstanceUpdater {
-  constructor({
-    paths,
-    checker,
-    launch,
-    occupied = () => false,
-    now = Date.now,
-  }) {
-    this.paths = paths;
-    this.checker = checker;
-    this.launch = launch;
-    this.occupied = occupied;
-    this.now = now;
-    this.starting = false;
-  }
-  status() {
-    let job;
-    try {
-      job = JSON.parse(
-        readFileSync(join(updateRoot(this.paths.home), "job.json"), "utf8"),
-      );
-      if (!UPDATE_ID.test(job.id)) return null;
-    } catch {
-      return null;
-    }
-    if (
-      ACTIVE.has(job.status) &&
-      job.workerPid &&
-      !processAlive(job.workerPid)
-    ) {
-      job = writeUpdateJob(this.paths.home, {
-        ...job,
-        status: "error",
-        error: ["queued", "downloading", "checking"].includes(job.status)
-          ? UPDATE_FAILED
-          : UPDATE_RECOVERY_FAILED,
-        finished: this.now(),
-      });
-    }
-    // Public progress is deliberately free of filesystem paths and process data.
-    return {
-      id: job.id,
-      version: job.version,
-      previous: job.previous,
-      status: job.status,
-      started: job.started,
-      finished: job.finished,
-      error: job.error || "",
-      restored: !!job.restored,
-    };
-  }
-  get busy() {
-    return this.starting || ACTIVE.has(this.status()?.status);
-  }
-  async install(version) {
-    if (this.busy) return this.status();
-    if (this.occupied()) throw Error("数据处理或备份正在进行，请稍后再试");
-    if (!this.launch || this.paths.database === ":memory:")
-      throw Error("当前实例不支持自动更新");
-    this.starting = true;
-    try {
-      const info = await this.checker.check();
-      if (info.status !== "available" || version !== info.latest)
-        throw Error("请重新检查并选择可用的新版本");
-      updatePath(this.paths.home, randomUUID());
-      mkdirSync(updateRoot(this.paths.home), { recursive: true, mode: 0o700 });
-      const job = {
-        id: randomUUID(),
-        version,
-        previous: info.current,
-        status: "queued",
-        started: this.now(),
-        parent: process.pid,
-      };
-      writeUpdateJob(this.paths.home, job);
-      try {
-        const pid = await this.launch(job.id);
-        writeUpdateJob(this.paths.home, {
-          ...readUpdateJob(this.paths.home, job.id),
-          workerPid: pid,
-        });
-      } catch {
-        writeUpdateJob(this.paths.home, {
-          ...job,
-          status: "error",
-          error: UPDATE_FAILED,
-        });
-        throw Error(UPDATE_FAILED);
-      }
-      return this.status();
-    } finally {
-      this.starting = false;
-    }
-  }
-}
+import { randomUUID } from "node:crypto";
+import { mkdirSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+import {
+  atomicJson,
+  UPDATE_ID,
+  updatePath,
+  updateRoot,
+} from "./installation.js";
+export const UPDATE_FAILED =
+  "更新未完成，原程序和数据已保留，请查看运行日志后重试。";
+export const UPDATE_RECOVERY_FAILED =
+  "自动恢复未完成，更新前的校验备份已保留，请查看运行日志并手动恢复。";
+const ACTIVE = new Set([
+  "queued",
+  "downloading",
+  "checking",
+  "stopping",
+  "backup",
+  "restarting",
+  "verifying",
+  "restoring",
+]);
+export const processAlive = (pid) => {
+  if (!Number.isInteger(pid) || pid <= 0) return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (e) {
+    return e.code !== "ESRCH";
+  }
+};
+export function readUpdateJob(home, id) {
+  updatePath(home, id);
+  const job = JSON.parse(
+    readFileSync(join(updateRoot(home), "job.json"), "utf8"),
+  );
+  if (job.id !== id || !UPDATE_ID.test(job.id)) throw Error("更新任务无效");
+  return job;
+}
+export const writeUpdateJob = (home, job) => {
+  updatePath(home, job.id);
+  atomicJson(join(updateRoot(home), "job.json"), job);
+  return job;
+};
+export class InstanceUpdater {
+  constructor({
+    paths,
+    checker,
+    launch,
+    occupied = () => false,
+    now = Date.now,
+  }) {
+    this.paths = paths;
+    this.checker = checker;
+    this.launch = launch;
+    this.occupied = occupied;
+    this.now = now;
+    this.starting = false;
+  }
+  status() {
+    let job;
+    try {
+      job = JSON.parse(
+        readFileSync(join(updateRoot(this.paths.home), "job.json"), "utf8"),
+      );
+      if (!UPDATE_ID.test(job.id)) return null;
+    } catch {
+      return null;
+    }
+    if (
+      ACTIVE.has(job.status) &&
+      job.workerPid &&
+      !processAlive(job.workerPid)
+    ) {
+      job = writeUpdateJob(this.paths.home, {
+        ...job,
+        status: "error",
+        error: ["queued", "downloading", "checking"].includes(job.status)
+          ? UPDATE_FAILED
+          : UPDATE_RECOVERY_FAILED,
+        finished: this.now(),
+      });
+    }
+    // Public progress is deliberately free of filesystem paths and process data.
+    return {
+      id: job.id,
+      version: job.version,
+      previous: job.previous,
+      status: job.status,
+      started: job.started,
+      finished: job.finished,
+      error: job.error || "",
+      restored: !!job.restored,
+    };
+  }
+  get busy() {
+    return this.starting || ACTIVE.has(this.status()?.status);
+  }
+  async install(version) {
+    if (this.busy) return this.status();
+    if (this.occupied()) throw Error("数据处理或备份正在进行，请稍后再试");
+    if (!this.launch || this.paths.database === ":memory:")
+      throw Error("当前实例不支持自动更新");
+    this.starting = true;
+    try {
+      const info = await this.checker.check();
+      if (info.status !== "available" || version !== info.latest)
+        throw Error("请重新检查并选择可用的新版本");
+      updatePath(this.paths.home, randomUUID());
+      mkdirSync(updateRoot(this.paths.home), { recursive: true, mode: 0o700 });
+      const job = {
+        id: randomUUID(),
+        version,
+        previous: info.current,
+        status: "queued",
+        started: this.now(),
+        parent: process.pid,
+      };
+      writeUpdateJob(this.paths.home, job);
+      try {
+        const pid = await this.launch(job.id);
+        writeUpdateJob(this.paths.home, {
+          ...readUpdateJob(this.paths.home, job.id),
+          workerPid: pid,
+        });
+      } catch {
+        writeUpdateJob(this.paths.home, {
+          ...job,
+          status: "error",
+          error: UPDATE_FAILED,
+        });
+        throw Error(UPDATE_FAILED);
+      }
+      return this.status();
+    } finally {
+      this.starting = false;
+    }
+  }
+}