feat: split image assemble and download APIs; switch assemble-image to POST

GuXianWN · GuXianWN · commit 89895e88bad2 · 2026-03-04T22:49:34.000+08:00
diff --git a/components/PullPanel.vue b/components/PullPanel.vue
@@ -113,9 +113,12 @@
 <script setup lang="ts">
 import { ref, computed, watch, onBeforeUnmount } from "vue";
 import type {
+  AssembleResponse,
   TokenResponse,
   ManifestResponse,
   ManifestDetailResponse,
+  DockerManifest,
+  DockerLayer,
   DockerPlatform,
   DownloadProgress,
 } from "~/types/docker";
@@ -130,7 +133,7 @@ const selectedPlatform = ref<DockerPlatform | null>(null);
 const downloadProgress = ref<Record<string, DownloadProgress>>({});
 const activeDownloads = ref(new Set<string>());
 const currentToken = ref("");
-const currentManifest = ref<any>(null);
+const currentManifest = ref<{ platform: DockerManifest; detail: ManifestDetailResponse } | null>(null);
 const downloadComplete = ref(false);
 const downloadSummary = ref<{
   total: number;
@@ -214,7 +217,7 @@ const fetchManifests = async () => {
   return response;
 };
 
-const fetchManifestDetail = async (targetManifest: any) => {
+const fetchManifestDetail = async (targetManifest: DockerManifest) => {
   return await $fetch<ManifestDetailResponse>("/api/docker/manifest-detail", {
     params: {
       imageName: imageName.value,
@@ -227,7 +230,7 @@ const fetchManifestDetail = async (targetManifest: any) => {
 // #endregion
 
 // #region Download
-const handleDownloadProgress = async (eventSource: EventSource, layers: any[]) => {
+const handleDownloadProgress = async (eventSource: EventSource, layers: DockerLayer[]) => {
   return new Promise((resolve, reject) => {
     eventSource.onmessage = async (event) => {
       const data = JSON.parse(event.data);
@@ -273,7 +276,7 @@ const handleDownloadProgress = async (eventSource: EventSource, layers: any[]) =
   });
 };
 
-const downloadAllLayers = async (layers: any[]) => {
+const downloadAllLayers = async (layers: DockerLayer[]) => {
   if (activeDownloads.value.size > 0) return;
 
   const eventSource = new EventSource(
@@ -302,31 +305,31 @@ const downloadAllLayers = async (layers: any[]) => {
 // #region Assemble
 const assembleImage = async () => {
   try {
-    const response = await $fetch("/api/docker/assemble-image", {
-      params: {
+    if (!currentManifest.value) {
+      throw new Error("manifest 信息缺失");
+    }
+
+    const response = await $fetch<AssembleResponse>("/api/docker/assemble-image", {
+      method: "POST",
+      body: {
         imageName: imageName.value,
         tag: tag.value,
         token: currentToken.value,
-        manifest: JSON.stringify({
+        manifest: {
           config: currentManifest.value.detail.config,
           layers: currentManifest.value.detail.layers,
           platform: currentManifest.value.platform.platform,
-        }),
+        },
       },
-      responseType: "blob",
     });
 
-    const buffer = await (response as unknown as Response).arrayBuffer();
-    const blob = new Blob([buffer], { type: "application/x-tar" });
-
-    const url = window.URL.createObjectURL(blob);
     const a = document.createElement("a");
-    a.href = url;
-    const safeName = imageName.value.replaceAll("/", "_");
-    a.download = `${safeName}-${tag.value}.tar`;
+    a.href = `/api/docker/download-image?${new URLSearchParams({
+      downloadId: response.downloadId,
+    }).toString()}`;
+    a.download = response.fileName;
     document.body.appendChild(a);
     a.click();
-    window.URL.revokeObjectURL(url);
     document.body.removeChild(a);
   } catch (e) {
     console.error("组装镜像时出错:", e);
diff --git a/server/api/docker/assemble-image.post.ts b/server/api/docker/assemble-image.post.ts
@@ -1,8 +1,6 @@
-import { writeFileSync, promises as fs } from "fs";
-import { join } from "path";
-import { Readable } from "node:stream";
-import type { H3Event } from "h3";
-import { sendStream } from "h3";
+import { randomUUID } from "node:crypto";
+import { writeFileSync, promises as fs } from "node:fs";
+import { join } from "node:path";
 import * as tar from "tar";
 import axiosInstance from "~/server/config/axios";
 import { getErrorMessage } from "~/server/utils/http-error";
@@ -13,13 +11,6 @@ import {
 } from "~/server/utils/imageName";
 import { logger } from "~/server/utils/logger";
 
-type AssembleParams = {
-  imageName: string;
-  tag: string;
-  token: string;
-  manifest: string;
-};
-
 type DockerConfig = {
   digest: string;
   mediaType: string;
@@ -43,6 +34,18 @@ type DockerManifest = {
   platform: DockerPlatform;
 };
 
+type AssembleBody = {
+  imageName: string;
+  tag: string;
+  token: string;
+  manifest: DockerManifest;
+};
+
+type AssembleResponse = {
+  downloadId: string;
+  fileName: string;
+};
+
 type LayerJson = {
   id: string;
   parent?: string;
@@ -52,15 +55,6 @@ type LayerJson = {
   os: string;
 };
 
-type AssembleContext = {
-  imageName: string;
-  repoTagName: string;
-  fileBaseName: string;
-  tag: string;
-  token: string;
-  manifest: DockerManifest;
-};
-
 const stripSha256 = (digest: string) => digest.replace("sha256:", "");
 const TAR_OPTIONS = {
   preservePaths: true,
@@ -70,19 +64,20 @@ const TAR_OPTIONS = {
   gzip: false,
 } as const;
 
-const parseAssembleContext = (event: H3Event): AssembleContext => {
-  const query = getQuery(event) as unknown as AssembleParams;
-  const imageName = normalizeImageName(query.imageName || "");
-  if (!query.tag || !query.token || !query.manifest) {
+const parseAssembleBody = (body: Partial<AssembleBody>) => {
+  const imageName = normalizeImageName((body.imageName || "").trim());
+  const tag = (body.tag || "").trim();
+  const token = (body.token || "").trim();
+  if (!imageName || !tag || !token || !body.manifest) {
     throw createError({ statusCode: 400, message: "缺少必要参数" });
   }
   return {
     imageName,
-    repoTagName: getRepoTagName(query.imageName || imageName),
-    fileBaseName: getSafeFileBaseName(query.imageName || imageName),
-    tag: query.tag,
-    token: query.token,
-    manifest: JSON.parse(query.manifest) as DockerManifest,
+    tag,
+    token,
+    manifest: body.manifest,
+    repoTagName: getRepoTagName(body.imageName || imageName),
+    fileBaseName: getSafeFileBaseName(body.imageName || imageName),
   };
 };
 
@@ -104,10 +99,8 @@ const processLayer = async (
   const layerId = stripSha256(layer.digest);
   const parentLayer = index > 0 ? manifest.layers[index - 1] : undefined;
   const layerDir = join(tmpDir, layerId);
-
   await fs.mkdir(layerDir, { recursive: true });
   writeFileSync(join(layerDir, "VERSION"), "1.0");
-
   const layerJson: LayerJson = {
     id: layerId,
     parent: parentLayer ? stripSha256(parentLayer.digest) : undefined,
@@ -116,9 +109,7 @@ const processLayer = async (
     architecture: manifest.platform.architecture,
     os: manifest.platform.os,
   };
-
   writeFileSync(join(layerDir, "json"), JSON.stringify(layerJson, null, 2));
-
   const sourceFile = join(
     process.cwd(),
     "downloads",
@@ -143,72 +134,49 @@ const writeMetadataFiles = (
       Layers: manifest.layers.map((layer) => `${stripSha256(layer.digest)}/layer.tar`),
     },
   ];
-
   const repositories = { [repoTagName]: { [tag]: configFileName } };
-
   writeFileSync(join(tmpDir, "manifest.json"), JSON.stringify(dockerManifest, null, 2));
   writeFileSync(join(tmpDir, `${configFileName}.json`), JSON.stringify(configJson, null, 2));
   writeFileSync(join(tmpDir, "repositories"), JSON.stringify(repositories, null, 2));
 };
 
-export default defineEventHandler(async (event) => {
-  const ctx = parseAssembleContext(event);
-  const { imageName, repoTagName, fileBaseName, tag, token, manifest } = ctx;
+export default defineEventHandler(async (event): Promise<AssembleResponse> => {
+  const body = await readBody<Partial<AssembleBody>>(event);
+  const { imageName, tag, token, manifest, repoTagName, fileBaseName } = parseAssembleBody(body);
   const startedAt = Date.now();
+  const tempId = randomUUID();
+  const tmpDir = join(process.cwd(), "tmp", `${imageName}-${Date.now()}`);
+  const assembleDir = join(process.cwd(), "tmp", "assembled");
+  const tarPath = join(assembleDir, `${tempId}.tar`);
+  const metaPath = join(assembleDir, `${tempId}.json`);
+  const fileName = `${fileBaseName}-${tag}.tar`;
 
   logger.info("assemble start", { imageName, tag, layers: manifest.layers.length });
-
-  const tmpDir = join(process.cwd(), "tmp", `${imageName}-${Date.now()}`);
   await fs.mkdir(tmpDir, { recursive: true });
-
-  const cleanup = async () => {
-    await fs.rm(tmpDir, { recursive: true, force: true });
-  };
+  await fs.mkdir(assembleDir, { recursive: true });
 
   try {
     const configJson = await fetchConfigJson(imageName, token, manifest.config.digest);
     const configFileName = stripSha256(manifest.config.digest);
-
     await Promise.all(
       manifest.layers.map((layer, index) => processLayer(tmpDir, imageName, manifest, layer, index))
     );
-
     writeMetadataFiles(tmpDir, manifest, repoTagName, tag, configFileName, configJson);
+    await tar.create({ cwd: tmpDir, file: tarPath, ...TAR_OPTIONS }, ["."]);
+    await fs.writeFile(metaPath, JSON.stringify({ fileName }, null, 2), "utf-8");
+    await fs.rm(tmpDir, { recursive: true, force: true });
 
-    setHeader(event, "Content-Type", "application/x-tar");
-    setHeader(
-      event,
-      "Content-Disposition",
-      `attachment; filename="${fileBaseName}-${tag}.tar"`
-    );
-
-    const tarStream = tar.create({ cwd: tmpDir, ...TAR_OPTIONS }, ["."]);
-
-    tarStream.on("close", async () => {
-      await cleanup();
-      logger.info("assemble complete", { imageName, tag, elapsedMs: Date.now() - startedAt });
-    });
-    tarStream.on("error", async (error: unknown) => {
-      await cleanup();
-      logger.error("assemble stream error", {
-        imageName,
-        tag,
-        message: getErrorMessage(error),
-      });
+    logger.info("assemble complete", {
+      imageName,
+      tag,
+      downloadId: tempId,
+      elapsedMs: Date.now() - startedAt,
     });
-
-    return sendStream(event, tarStream as unknown as Readable);
+    return { downloadId: tempId, fileName };
   } catch (error: unknown) {
-    try {
-      await cleanup();
-    } catch (cleanupError: unknown) {
-      logger.warn("assemble cleanup failed", {
-        imageName,
-        tag,
-        message: getErrorMessage(cleanupError),
-      });
-    }
-
+    await fs.rm(tmpDir, { recursive: true, force: true });
+    await fs.rm(tarPath, { force: true });
+    await fs.rm(metaPath, { force: true });
     const message = getErrorMessage(error);
     logger.error("assemble failed", { imageName, tag, message, elapsedMs: Date.now() - startedAt });
     throw createError({ statusCode: 500, message });
diff --git a/server/api/docker/download-image.get.ts b/server/api/docker/download-image.get.ts
@@ -0,0 +1,52 @@
+import { createReadStream } from "node:fs";
+import { promises as fs } from "node:fs";
+import { join } from "node:path";
+import { sendStream } from "h3";
+import { getErrorMessage } from "~/server/utils/http-error";
+import { logger } from "~/server/utils/logger";
+
+type DownloadQuery = {
+  downloadId?: string;
+};
+
+type DownloadMeta = {
+  fileName: string;
+};
+
+const DOWNLOAD_ID_PATTERN = /^[a-f0-9-]{36}$/i;
+
+export default defineEventHandler(async (event) => {
+  const query = getQuery(event) as DownloadQuery;
+  const downloadId = (query.downloadId || "").trim();
+  if (!DOWNLOAD_ID_PATTERN.test(downloadId)) {
+    throw createError({ statusCode: 400, message: "无效下载ID" });
+  }
+
+  const assembleDir = join(process.cwd(), "tmp", "assembled");
+  const tarPath = join(assembleDir, `${downloadId}.tar`);
+  const metaPath = join(assembleDir, `${downloadId}.json`);
+
+  try {
+    const metaRaw = await fs.readFile(metaPath, "utf-8");
+    const meta = JSON.parse(metaRaw) as DownloadMeta;
+
+    setHeader(event, "Content-Type", "application/x-tar");
+    setHeader(event, "Content-Disposition", `attachment; filename="${meta.fileName}"`);
+
+    const tarStream = createReadStream(tarPath);
+    tarStream.on("close", async () => {
+      await fs.rm(tarPath, { force: true });
+      await fs.rm(metaPath, { force: true });
+    });
+    tarStream.on("error", async (error: unknown) => {
+      logger.error("download stream failed", { downloadId, message: getErrorMessage(error) });
+      await fs.rm(tarPath, { force: true });
+      await fs.rm(metaPath, { force: true });
+    });
+
+    return sendStream(event, tarStream);
+  } catch (error: unknown) {
+    logger.error("download failed", { downloadId, message: getErrorMessage(error) });
+    throw createError({ statusCode: 404, message: "文件不存在或已失效" });
+  }
+});
diff --git a/types/docker.ts b/types/docker.ts
@@ -52,6 +52,11 @@ export type ManifestDetailResponse = {
   schemaVersion: number;
 };
 
+export type AssembleResponse = {
+  downloadId: string;
+  fileName: string;
+};
+
 export type DownloadSummary = {
   total: number;
   skipped: number;
