release: 1.2.0

2026-09-05 08:42:47 +08:00
parent fa2fd94579
commit 620362823b
9 changed files with 120 additions and 195 deletions
@@ -63,7 +63,6 @@ import {
  readCachedRelease,
  writeUpdateRequest,
  cancelUpdateJob,
-  triggerInProcessDownload,
  type UpdateRequest,
 } from "./update-service.js";

@@ -1181,7 +1180,6 @@ export async function buildApp(database: DatabaseContext, config: AppConfig) {
      database.sqlite.prepare("UPDATE update_jobs SET status='failed', error_message=?, updated_at=? WHERE id=?").run("无法创建系统更新请求", Date.now(), id);
      throw new AppError(503, "UPDATE_QUEUE_FAILED", "无法提交更新请求，请检查服务安装权限");
    }
-    triggerInProcessDownload(database.sqlite, config, id, cachedAsset, cachedAsset.sha256);
    reply.header("Cache-Control", "no-store");
    return reply.code(202).send({ job: { id, status: "queued", operation: "download", version } });
  });
@@ -163,7 +163,8 @@ function writeJob(sqlite: Database.Database | undefined, jobId: string, values:
      requested_at=COALESCE(excluded.requested_at, update_jobs.requested_at),
      started_at=COALESCE(excluded.started_at, update_jobs.started_at),
      operation=excluded.operation,
-      status=excluded.status, version=excluded.version, platform=excluded.platform,
+      status=CASE WHEN update_jobs.status='cancelled' THEN update_jobs.status ELSE excluded.status END,
+      version=excluded.version, platform=excluded.platform,
      release_url=COALESCE(excluded.release_url, update_jobs.release_url),
      asset_name=COALESCE(excluded.asset_name, update_jobs.asset_name),
      asset_url=excluded.asset_url,
@@ -276,6 +277,7 @@ export async function runUpdate(options: UpdateRunOptions): Promise<UpdateRunRes
  const platform = options.platform ?? detectPlatform();
  const jobId = options.jobId ?? randomUUID();
  const operation = options.operation ?? "apply";
+  const sqlite = options.sqlite;
  let resolved: Awaited<ReturnType<typeof resolveRelease>> | undefined;
  try {
    resolved = await resolveRelease(options, platform);
@@ -299,7 +301,12 @@ export async function runUpdate(options: UpdateRunOptions): Promise<UpdateRunRes
    if (operation === "download") await mkdir(workspace, { recursive: false, mode: 0o700 });
    const archivePath = path.join(workspace, resolved.asset.name.endsWith(".gz") || resolved.asset.name.endsWith(".zip") ? resolved.asset.name : `${resolved.asset.name}.tar.gz`);
    try {
-      updateJob(options.sqlite, jobId, { operation, status: "downloading", version: resolved.version, platform: platform.target, releaseUrl: resolved.releaseUrl, assetName: resolved.asset.name, assetUrl: resolved.asset.url, expectedSha256, downloadPath: path.basename(archivePath), startedAt: Date.now() });
+      if (sqlite) {
+        const claim = sqlite.prepare("UPDATE update_jobs SET status='downloading', download_started_at=?, started_at=?, download_path=?, updated_at=? WHERE id=? AND status='queued'").run(Date.now(), Date.now(), path.basename(archivePath), Date.now(), jobId);
+        if (claim.changes !== 1) throw new Error("更新任务已取消或已被其他进程接管");
+      } else {
+        updateJob(options.sqlite, jobId, { operation, status: "downloading", version: resolved.version, platform: platform.target, releaseUrl: resolved.releaseUrl, assetName: resolved.asset.name, assetUrl: resolved.asset.url, expectedSha256, downloadPath: path.basename(archivePath), startedAt: Date.now() });
+      }
      const progressStartedAt = Date.now();
      let lastProgressWrite = 0;
      const downloaded = await downloadReleaseAsset(resolved.asset.url, archivePath, {
@@ -337,7 +344,12 @@ export async function runUpdate(options: UpdateRunOptions): Promise<UpdateRunRes
      await normalizeReleasePermissions(stagedDir);
      const payloadInfo = await lstat(path.join(stagedDir, "dist")).catch(() => null);
      if (!payloadInfo?.isDirectory() || payloadInfo.isSymbolicLink()) throw new Error("发布包缺少 dist 目录");
-      updateJob(options.sqlite, jobId, { operation, status: "staged", version: resolved.version, platform: platform.target, releaseUrl: resolved.releaseUrl, assetName: resolved.asset.name, assetUrl: resolved.asset.url, expectedSha256, actualSha256: downloaded.sha256, sizeBytes: downloaded.size, downloadPath: workspace });
+      if (sqlite) {
+        const staged = sqlite.prepare("UPDATE update_jobs SET status='staged', actual_sha256=?, size_bytes=?, download_path=?, updated_at=? WHERE id=? AND status IN ('verifying', 'downloading')").run(downloaded.sha256, downloaded.size, workspace, Date.now(), jobId);
+        if (staged.changes !== 1) throw new Error("更新任务已取消，已停止继续处理");
+      } else {
+        updateJob(options.sqlite, jobId, { operation, status: "staged", version: resolved.version, platform: platform.target, releaseUrl: resolved.releaseUrl, assetName: resolved.asset.name, assetUrl: resolved.asset.url, expectedSha256, actualSha256: downloaded.sha256, sizeBytes: downloaded.size, downloadPath: workspace });
+      }

      if (operation === "download") {
        keepWorkspace = true;
@@ -18,118 +18,12 @@ import {
  selectReleaseAsset,
  validateHttpsUrl,
  RELEASE_NOTES_MAX_BYTES,
-  downloadReleaseAsset,
-  extractSafeArchive,
-  normalizeReleasePermissions,
-  applicationUpdateRuntimeHash,
  type ReleaseAsset,
  type ReleaseMetadata,
 } from "./update.js";
 import type { UpdateJobStatus } from "../shared/contracts.js";


-export const activeInProcessDownloads = new Map<string, AbortController>();
-
-export function triggerInProcessDownload(
-  database: Database.Database,
-  config: AppConfig,
-  jobId: string,
-  asset: { name: string; url: string; sha256?: string },
-  expectedSha256?: string,
-): void {
-  setImmediate(async () => {
-    try {
-      const row = database.prepare("SELECT id, status, operation FROM update_jobs WHERE id=?").get(jobId) as { id: string; status: string; operation: string } | undefined;
-      if (!row || row.status !== "queued") return;
-
-      const controller = new AbortController();
-      activeInProcessDownloads.set(jobId, controller);
-
-      const workspace = path.join(path.resolve(config.stagingDir), `update-${jobId}`);
-      const archivePath = path.join(workspace, asset.name.endsWith(".gz") || asset.name.endsWith(".zip") ? asset.name : `${asset.name}.tar.gz`);
-
-      await mkdir(workspace, { recursive: true, mode: 0o700 });
-      const now = Date.now();
-      database.prepare("UPDATE update_jobs SET status='downloading', download_started_at=?, started_at=?, download_path=?, updated_at=? WHERE id=? AND status='queued'").run(now, now, path.basename(archivePath), now, jobId);
-
-      const progressStartedAt = Date.now();
-      let lastProgressWrite = 0;
-
-      const downloaded = await downloadReleaseAsset(asset.url, archivePath, {
-        allowedHosts: config.updateAllowedHosts,
-        maxBytes: config.updateMaxBytes,
-        fetchImpl: (input, init) => fetch(input, { ...init, signal: controller.signal }),
-        onProgress: (downloadedBytes, totalBytes) => {
-          const cur = Date.now();
-          if (cur - lastProgressWrite < 200) return;
-          lastProgressWrite = cur;
-          const elapsed = Math.max(1, cur - progressStartedAt);
-          const speedBps = Math.round(downloadedBytes * 1000 / elapsed);
-          try {
-            database.prepare("UPDATE update_jobs SET downloaded_bytes=?, size_bytes=COALESCE(?, size_bytes), download_speed_bps=?, updated_at=? WHERE id=? AND status='downloading'").run(downloadedBytes, totalBytes, speedBps, cur, jobId);
-          } catch {}
-        },
-      });
-
-      if (expectedSha256 && downloaded.sha256.toLowerCase() !== expectedSha256.toLowerCase()) {
-        throw new Error("更新文件 SHA-256 校验失败");
-      }
-
-      database.prepare("UPDATE update_jobs SET status='verifying', actual_sha256=?, size_bytes=?, downloaded_bytes=?, updated_at=? WHERE id=? AND status='downloading'").run(downloaded.sha256, downloaded.size, downloaded.size, Date.now(), jobId);
-
-      const stagedDir = path.join(workspace, "payload");
-      await extractSafeArchive(archivePath, stagedDir, config.updateMaxBytes === undefined ? {} : { maxBytes: config.updateMaxBytes });
-
-      if (applicationUpdateRuntimeHash(asset.name)) {
-        try {
-          const currentRelease = realpathSync(config.currentLink);
-          if (currentRelease) {
-            for (const entry of ["node_modules", "runtime", "pnpm-lock.yaml"] as const) {
-              const source = path.join(currentRelease, entry);
-              const target = path.join(stagedDir, entry);
-              let copied = false;
-              try {
-                const { execFile } = await import("node:child_process");
-                const { promisify } = await import("node:util");
-                await promisify(execFile)("cp", ["-a", source, target]);
-                copied = true;
-              } catch {}
-              if (!copied) {
-                const fsPromises = await import("node:fs/promises");
-                const sourceInfo = await fsPromises.lstat(source).catch(() => null);
-                if (sourceInfo && !sourceInfo.isSymbolicLink()) {
-                  await fsPromises.cp(source, target, { recursive: sourceInfo.isDirectory(), errorOnExist: true, force: false }).catch(() => {});
-                }
-              }
-            }
-          }
-        } catch {}
-      }
-
-      await normalizeReleasePermissions(stagedDir).catch(() => {});
-      const fsPromises = await import("node:fs/promises");
-      const payloadInfo = await fsPromises.lstat(path.join(stagedDir, "dist")).catch(() => null);
-      if (!payloadInfo?.isDirectory() || payloadInfo.isSymbolicLink()) {
-        throw new Error("发布包缺少 dist 目录");
-      }
-
-      database.prepare("UPDATE update_jobs SET status='staged', actual_sha256=?, size_bytes=?, download_path=?, updated_at=? WHERE id=? AND status IN ('verifying', 'downloading')").run(downloaded.sha256, downloaded.size, workspace, Date.now(), jobId);
-    } catch (error) {
-      const controller = activeInProcessDownloads.get(jobId);
-      if (controller?.signal.aborted) return;
-      const rawMsg = error instanceof Error ? error.message : "更新文件下载失败";
-      try {
-        database.prepare("UPDATE update_jobs SET status='failed', error_message=?, updated_at=? WHERE id=? AND status NOT IN ('completed', 'staged', 'cancelled')").run(rawMsg, Date.now(), jobId);
-      } catch {}
-      const workspace = path.join(path.resolve(config.stagingDir), `update-${jobId}`);
-      const fsPromises = await import("node:fs/promises");
-      await fsPromises.rm(workspace, { recursive: true, force: true }).catch(() => {});
-    } finally {
-      activeInProcessDownloads.delete(jobId);
-    }
-  });
-}
-
 export const UPDATE_CACHE_KEY = "update.release.v1";
 export const ACTIVE_UPDATE_STATUSES: readonly UpdateJobStatus[] = [
  "queued",
@@ -574,6 +468,36 @@ export function reconcileOrphanedUpdateJobs(database: Database.Database, config:
  let reconciled = 0;
  const reconciledIds = new Set<string>();
  for (const row of rows) {
+    // A request that never gets claimed by the root runner must not remain in
+    // the UI as an endless "queued" task. Once the short hand-off window has
+    // elapsed and no recovery marker exists, release the queue explicitly;
+    // a fresh state marker proves that the runner has already claimed it.
+    if (row.status === "queued" && typeof row.updatedAt === "number" && !stateFresh && now - row.updatedAt >= QUEUED_UPDATE_TIMEOUT_MS) {
+      const changed = database.transaction(() => {
+        const result = database.prepare(`
+          UPDATE update_jobs
+          SET status='failed', error_message=?, completed_at=?, updated_at=?
+          WHERE id=? AND status='queued' AND updated_at=?
+        `).run("更新服务未在规定时间内接管任务", now, now, row.id, row.updatedAt);
+        if (result.changes !== 1) return false;
+        writeAudit(database, {
+          requestId: row.requestId || randomUUID(),
+          actorAdminId: row.adminId,
+          action: "update.reconciled",
+          targetType: "update",
+          targetId: row.id,
+          outcome: "failure",
+          before: { status: row.status, version: row.version },
+          after: { status: "failed", version: row.version, reason: "runner_claim_timeout" },
+        });
+        return true;
+      })();
+      if (changed) {
+        reconciled += 1;
+        reconciledIds.add(row.id);
+      }
+      continue;
+    }
    if (typeof row.updatedAt !== "number" || now - row.updatedAt < ORPHANED_UPDATE_TIMEOUT_MS) continue;
    // The runner refreshes the state marker while a download is in flight.
    // A stale request/state marker therefore no longer protects an orphaned
@@ -668,12 +592,6 @@ export function cancelUpdateJob(
  if (!job) return { cancelled: false, message: "当前没有处于等待调度或下载中的更新任务" };
  if (job.status !== "queued" && job.status !== "downloading") return { cancelled: false, message: "任务已进入就绪或切换阶段，无法取消" };

-  const controller = activeInProcessDownloads.get(job.id);
-  if (controller) {
-    controller.abort();
-    activeInProcessDownloads.delete(job.id);
-  }
-
  const now = Date.now();
  const changed = database.transaction(() => {
    const result = database.prepare("UPDATE update_jobs SET status='cancelled', error_message='已手动取消更新', completed_at=?, updated_at=? WHERE id=? AND status IN ('queued', 'downloading')").run(now, now, job.id);