@akairos/typeset-studio 0.2.1 → 0.2.3

package/src/adapter.ts

@@ -1,9 +1,7 @@
-import { mkdir, writeFile } from "node:fs/promises";
-import { join } from "node:path";
-import { renderTypesetResultToPngs } from "./core/canvas-renderer";
-import { scanLocalFonts } from "./core/font-loader";
-import { FlowImage } from "./core/types";
-import { resolveTypesetResult } from "./server/routes/render";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { extname, join } from "node:path";
+import type { FlowImage, PipelineCoverTheme } from "./core/types";
+import type { RenderRequestBody } from "./server/routes/render";
 
 // ── Typeset Studio & zzhub-pipeline compatible types ──────────────
 
@@ -15,8 +13,14 @@ export interface PipelinePluginDoctorCheck {
 }
 
 export interface ImageRenderInput {
-  coverTheme?: any;
-  onProgress?: (progress: any) => void;
+  /** Studio 模板与任务素材替换，旧插件可忽略。 */
+  studioTemplates?: { cover?: string; content?: string };
+  templateImageOverrides?: { cover?: Record<string, string>; content?: Record<string, string> };
+  coverTheme?: PipelineCoverTheme;
+  onProgress?: (progress: {
+    stage: string; message?: string; current?: number; total?: number;
+    unit?: "pages" | "files" | "bytes" | "targets"; route?: string; account?: string;
+  }) => void;
   state: {
     route: {
       account?: string;
@@ -34,6 +38,7 @@ export interface ImageRenderInput {
         pagination_mode?: string;
         min_pages?: number;
         max_pages?: number;
+        target_fill_ratio?: number;
         page_specs?: Array<{
           page: number;
           image_markers: string[];
@@ -102,11 +107,13 @@ export interface ImageRenderPlugin {
 
 // ── Helpers ───────────────────────────────────────────────────────
 
+// 清理流水线标题中的 Markdown 标记。
 function cleanTitle(raw: string): string {
   if (!raw) return "未命名文章";
   return raw.replace(/^#+\s*/, "").trim();
 }
 
+// 将流水线图片标记映射为页码和排版预设。
 function mapBodyImages(
   bodyImages?: Array<{ marker: string; path: string }>,
   pageSpecs?: ImageRenderInput["pageSpecs"],
@@ -131,46 +138,76 @@ function mapBodyImages(
       src: img.path,
       alt: img.marker,
       pageIndex: spec?.page,
-      layoutPreset: (spec?.imageLayout as any) || "mid-right",
+      layoutPreset: (spec?.imageLayout as FlowImage["layoutPreset"]) || "mid-right",
     };
   });
 }
 
 // ── Typeset Studio Pipeline Adapter ───────────────────────────────
 
-const REMOTE_STUDIO_URL = process.env.TYPESET_STUDIO_URL?.replace(/\/$/, "");
+// 配置远程地址后，由独立服务负责图片渲染。
+const remoteStudioUrl = () => process.env.TYPESET_STUDIO_URL?.replace(/\/$/, "");
 
+// 下载远程生成的页面，并写入流水线输出目录。
 async function renderRemoteBatch(
   studioUrl: string,
-  body: any,
+  body: RenderRequestBody,
   outputDir: string,
-  filenamePrefix: string,
   route: "wechat-article" | "wechat-newspic",
   kind: "cover" | "page",
-): Promise<{ assets: RenderAsset[]; pageCount: number; pages: ImageRenderOutput["pages"] }> {
+): Promise<ImageRenderOutput> {
+  // 远程进程无法读取客户端文件，发送图片字节并保留来源摘要映射。
+  const sources = new Map<string, string>();
+  const originalImages = new Map([...(body.config?.images || []), ...(body.images || [])].map((image) => [image.id, image.src]));
+  const transfer = async (src: string) => {
+    if (/^(https?:|data:)/i.test(src) || src.startsWith("/uploads/")) return src;
+    const bytes = await readFile(src);
+    const mime = ({ ".jpg": "image/jpeg", ".jpeg": "image/jpeg", ".svg": "image/svg+xml", ".webp": "image/webp", ".gif": "image/gif" } as Record<string, string>)[extname(src).toLowerCase()] || "image/png";
+    const dataUrl = `data:${mime};base64,${bytes.toString("base64")}`;
+    sources.set(dataUrl, src);
+    return dataUrl;
+  };
+  const requestBody = structuredClone(body);
+  for (const image of requestBody.images || []) image.src = await transfer(image.src);
+  // 保留模板样式时，备用配置不参与正常模板渲染，也不读取其本地素材。
+  if (!requestBody.preserveTemplateStyle) {
+    for (const image of requestBody.config?.images || []) image.src = await transfer(image.src);
+  }
+  for (const [key, src] of Object.entries(requestBody.templateImageOverrides || {})) {
+    try {
+      requestBody.templateImageOverrides![key] = await transfer(src);
+    } catch (error) {
+      throw new Error(`模板素材 ${key} 加载失败：${error instanceof Error ? error.message : String(error)}`);
+    }
+  }
+  const coverTheme = requestBody.config?.coverTheme;
+  for (const image of requestBody.preserveTemplateStyle ? [] : [coverTheme?.background.image, coverTheme?.decoration.image]) {
+    if (image) image.src = await transfer(image.src);
+  }
   const res = await fetch(`${studioUrl}/api/render/export`, {
     method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(body),
+    headers: { "Content-Type": "application/json", "X-Admin-Key": process.env.TYPESET_ADMIN_KEY || "" },
+    body: JSON.stringify(requestBody),
   });
   if (!res.ok) {
-    throw new Error(`Cloud Typeset Studio returned HTTP ${res.status}: ${res.statusText}`);
+    const detail = (await res.text()).slice(0, 500);
+    throw new Error(`Cloud Typeset Studio returned HTTP ${res.status}: ${detail || res.statusText}`);
   }
   const data = (await res.json()) as {
     ok: boolean;
     pageCount: number;
-    pages: Array<{ pageNumber: number; dataUrl: string }>;
+    pages: Array<{ pageNumber: number; dataUrl: string; imageCount: number; imageSources: string[]; imageIds: string[]; bodyImageCount: number; bodyImageSources: string[]; bodyImageIds: string[] }>;
   };
   const assets: RenderAsset[] = [];
   const pagesSummary: ImageRenderOutput["pages"] = [];
 
-  for (let i = 0; i < data.pages.length; i++) {
-    const pageItem = data.pages[i];
+  if (!data.ok || !Array.isArray(data.pages)) throw new Error("Invalid Typeset Studio export response");
+  for (const pageItem of (kind === "cover" ? data.pages.slice(0, 1) : data.pages)) {
     const pageNum = pageItem.pageNumber;
     const base64Data = pageItem.dataUrl.replace(/^data:image\/png;base64,/, "");
     const buffer = Buffer.from(base64Data, "base64");
     const filename =
-      kind === "cover" ? "cover.png" : `${filenamePrefix}-${String(pageNum).padStart(2, "0")}.png`;
+      kind === "cover" ? "cover.png" : `article-${String(pageNum).padStart(2, "0")}.png`;
     const filePath = join(outputDir, filename);
     await writeFile(filePath, buffer);
 
@@ -182,30 +219,70 @@ async function renderRemoteBatch(
     });
     pagesSummary.push({
       page: pageNum,
-      imageCount: 0,
-      imageSources: [],
+      imageCount: pageItem.bodyImageCount,
+      imageSources: pageItem.bodyImageSources.map((src, index) => originalImages.get(pageItem.bodyImageIds[index]) || sources.get(src) || src),
     });
   }
 
-  return { assets, pageCount: data.pageCount, pages: pagesSummary };
+  return { assets, pageCount: assets.length, pages: pagesSummary };
+}
+
+// 本地渲染与远程服务共用请求，保留各自的图片输出方式。
+async function renderLocalBatch(
+  body: RenderRequestBody,
+  outputDir: string,
+  route: RenderAsset["route"],
+  kind: RenderAsset["kind"],
+): Promise<ImageRenderOutput> {
+  const [{ resolveTypesetResult }, { renderTypesetResultToPngs }] = await Promise.all([
+    import("./server/routes/render"), import("./core/canvas-renderer"),
+  ]);
+  const { result } = resolveTypesetResult(body);
+  const pngs = await renderTypesetResultToPngs(result);
+  const outputs = kind === "cover" ? pngs.slice(0, 1) : pngs;
+  if (kind === "cover" && outputs.length === 0) {
+    throw new Error("Typeset Studio failed to render cover buffer");
+  }
+
+  const assets: RenderAsset[] = [];
+  const pages: ImageRenderOutput["pages"] = [];
+  for (const [index, output] of outputs.entries()) {
+    const pageNumber = index + 1;
+    const filename = kind === "cover"
+      ? "cover.png"
+      : `article-${String(pageNumber).padStart(2, "0")}.png`;
+    const path = join(outputDir, filename);
+    await writeFile(path, output.buffer);
+    assets.push({ kind, route, path, ...(kind === "page" ? { index: pageNumber } : {}) });
+    const images = result.pages[index].images.filter((image) => !image.templateAssetKey);
+    pages.push({
+      page: pageNumber,
+      imageCount: images.length,
+      imageSources: images.map((image) => image.src),
+    });
+  }
+  return { assets, pageCount: outputs.length, pages };
 }
 
 export const typesetStudioAdapter: ImageRenderPlugin = {
   name: "typeset-studio",
-  version: "0.2.1",
+  version: "0.2.2",
 
   async doctor(): Promise<PipelinePluginDoctorCheck[]> {
     const checks: PipelinePluginDoctorCheck[] = [];
 
-    // 0. Remote cloud service check (if TYPESET_STUDIO_URL is set)
+    const REMOTE_STUDIO_URL = remoteStudioUrl();
     if (REMOTE_STUDIO_URL) {
       try {
-        const res = await fetch(`${REMOTE_STUDIO_URL}/api/health`);
-        const data = (await res.json()) as any;
+        const res = await fetch(`${REMOTE_STUDIO_URL}/api/auth/verify`, {
+          method: "POST", headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ key: process.env.TYPESET_ADMIN_KEY || "" }),
+        });
+        const data = (await res.json()) as { ok?: boolean };
         checks.push({
           name: "remote-service",
-          ok: res.ok,
-          message: `Connected to Cloud Typeset Studio at ${REMOTE_STUDIO_URL} (${data.name || "active"})`,
+          ok: res.ok && data.ok === true,
+          message: data.ok ? `Authenticated with Typeset Studio at ${REMOTE_STUDIO_URL}` : "Remote admin key is missing or invalid",
         });
       } catch (err) {
         checks.push({
@@ -216,7 +293,6 @@ export const typesetStudioAdapter: ImageRenderPlugin = {
       }
     }
 
-    // 1. Skia engine check (for local/in-process rendering)
     try {
       const { createCanvas } = await import("@napi-rs/canvas");
       const canvas = createCanvas(10, 10);
@@ -231,15 +307,15 @@ export const typesetStudioAdapter: ImageRenderPlugin = {
     } catch (err) {
       checks.push({
         name: "@napi-rs/canvas",
-        ok: !REMOTE_STUDIO_URL,
+        ok: Boolean(REMOTE_STUDIO_URL),
         message: REMOTE_STUDIO_URL
           ? "@napi-rs/canvas not installed locally (using Cloud Typeset Studio microservice)"
           : `@napi-rs/canvas initialization failed: ${err}`,
       });
     }
 
-    // 2. Local fonts check
     try {
+      const { scanLocalFonts } = await import("./core/font-loader");
       const localFonts = scanLocalFonts();
       checks.push({
         name: "local-fonts",
@@ -258,266 +334,99 @@ export const typesetStudioAdapter: ImageRenderPlugin = {
   },
 
   async render(input: ImageRenderInput): Promise<ImageRenderOutput> {
-    const { route, outputDir, title, bodyText, state } = input;
+    const { route, outputDir, bodyText, state } = input;
     await mkdir(outputDir, { recursive: true });
+    if (route === "blog") return { assets: [], pageCount: 0, pages: [] };
 
+    const REMOTE_STUDIO_URL = remoteStudioUrl();
     const account = state.route.account || "default";
-    const highlightWords = state.route.highlight_words || [];
-    const footerText = input.accountVisualParams?.footer;
-    const watermarkText = account ? `@${account}` : undefined;
-    const effectiveTitle = cleanTitle(title || state.metadata?.title || "");
-
-    // ── 0. Optional: Remote Cloud Microservice Mode ─────────────
-    if (REMOTE_STUDIO_URL) {
-      if (route === "wechat-article") {
-        const coverImages = mapBodyImages(input.bodyImages, input.pageSpecs);
-        return await renderRemoteBatch(
-          REMOTE_STUDIO_URL,
-          {
-            slot: "article_cover",
-            route: "wechat-article",
-            account,
-            title: effectiveTitle,
-            markdown: `# ${effectiveTitle}`,
-            template: input.template,
-            images: coverImages,
-            highlightWords,
-            config: { footerText, watermarkText },
-          },
-          outputDir,
-          "cover",
-          "wechat-article",
-          "cover",
-        );
-      }
-
-      if (route === "wechat-newspic") {
-        const newspicSpec = state.intent?.newspic_render;
-        const paginationMode =
-          input.template === "longform-3-4"
-            ? "multi"
-            : input.template === "poster-3-4"
-            ? "single"
-            : newspicSpec?.pagination_mode || "multi";
-
-        const isMultiPage = paginationMode === "multi";
-        const coverImages = mapBodyImages(input.bodyImages, input.pageSpecs);
-
-        // Remote cover
-        const coverRes = await renderRemoteBatch(
-          REMOTE_STUDIO_URL,
-          {
-            slot: "newspic_cover",
-            route: "wechat-newspic",
-            kind: "cover",
-            account,
-            title: effectiveTitle,
-            markdown: `# ${effectiveTitle}`,
-            template: input.template,
-            images: coverImages,
-            highlightWords,
-            config: { footerText, watermarkText },
-          },
-          outputDir,
-          "cover",
-          "wechat-newspic",
-          "cover",
-        );
-
-        if (!isMultiPage) {
-          return coverRes;
-        }
-
-        // Remote content pages
-        const contentImages = mapBodyImages(input.bodyImages, input.pageSpecs);
-        const contentRes = await renderRemoteBatch(
-          REMOTE_STUDIO_URL,
-          {
-            slot: "newspic_content",
-            route: "wechat-newspic",
-            kind: "content",
-            account,
-            title: effectiveTitle,
-            markdown: bodyText || `# ${effectiveTitle}`,
-            template: input.template,
-            images: contentImages,
-            highlightWords,
-            config: { footerText, watermarkText },
-          },
-          outputDir,
-          "article",
-          "wechat-newspic",
-          "page",
-        );
-
-        return {
-          assets: [...coverRes.assets, ...contentRes.assets],
-          pageCount: contentRes.pageCount,
-          pages: contentRes.pages,
-        };
-      }
-    }
-
-    // ── 1. Route: wechat-article (2.35:1 Cover only) ─────────────
-    if (route === "wechat-article") {
-      const coverImages = mapBodyImages(input.bodyImages, input.pageSpecs);
-
-      const resolved = resolveTypesetResult({
-        slot: "article_cover",
-        route: "wechat-article",
-        account,
-        title: effectiveTitle,
-        markdown: `# ${effectiveTitle}`,
-        template: input.template,
-        images: coverImages,
-        highlightWords,
-        config: {
-          footerText: footerText ?? undefined,
-          watermarkText: watermarkText ?? undefined,
-        },
-      });
-
-      const pngOutputs = await renderTypesetResultToPngs(resolved.result);
-      const coverBuffer = pngOutputs[0]?.buffer;
-      if (!coverBuffer) {
-        throw new Error("Typeset Studio failed to render cover buffer");
-      }
-      const coverPath = join(outputDir, "cover.png");
-      await writeFile(coverPath, coverBuffer);
-
-      const asset: RenderAsset = {
-        kind: "cover",
-        route: "wechat-article",
-        path: coverPath,
-      };
-
-      return {
-        assets: [asset],
-        pageCount: 1,
-        pages: [
-          {
-            page: 1,
-            imageCount: resolved.result.pages[0]?.images.length || 0,
-            imageSources: (resolved.result.pages[0]?.images || []).map((img) => img.src),
-          },
-        ],
-      };
-    }
-
-    // ── 2. Route: blog (no image rendering required) ──────────────
-    if (route === "blog") {
-      return {
-        assets: [],
-        pageCount: 0,
-        pages: [],
-      };
-    }
-
-    // ── 3. Route: wechat-newspic (Poster Cover + Multi-page Content) ─
-    const newspicSpec = state.intent?.newspic_render;
-    const paginationMode =
-      input.template === "longform-3-4"
-        ? "multi"
-        : input.template === "poster-3-4"
-        ? "single"
-        : newspicSpec?.pagination_mode || "multi";
-
-    const isMultiPage = paginationMode === "multi";
-    const assets: RenderAsset[] = [];
-    const pagesSummary: ImageRenderOutput["pages"] = [];
-
-    // 3.1 Render Poster Cover (3:4)
-    const coverImages = mapBodyImages(input.bodyImages, input.pageSpecs);
-    const resolvedCover = resolveTypesetResult({
-      slot: "newspic_cover",
-      route: "wechat-newspic",
-      kind: "cover",
+    const saved = state.intent?.newspic_render;
+    const pageSpecs = input.pageSpecs ?? saved?.page_specs?.map((spec) => ({
+      page: spec.page, imageMarkers: spec.image_markers, imageLayout: spec.image_layout, targetFillRatio: spec.target_fill_ratio,
+    }));
+    const visual = input.accountVisualParams || {};
+    const stateVisual = state.route.account_visual_params;
+    const footer = visual.footer ?? stateVisual?.footer;
+    const bg = visual.bg ?? stateVisual?.bg;
+    const highlight = visual.highlight ?? stateVisual?.highlight;
+    const fallbackIcon = visual.fallbackIcon ?? stateVisual?.fallback_icon;
+    // pipeline 的模式标记只选择分页方式，具体模板名才参与模板解析。
+    const template = ["wechat-cover-split", "poster-3-4", "longform-3-4"].includes(input.template || "") ? undefined : input.template;
+    input.onProgress?.({ stage: "typeset", message: "开始排版", route, account });
+    const title = cleanTitle(input.title || state.metadata?.title || "");
+    const common: RenderRequestBody = {
       account,
-      title: effectiveTitle,
-      markdown: `# ${effectiveTitle}`,
-      template: input.template,
-      images: coverImages,
-      highlightWords,
+      title,
+      preserveTemplateStyle: true,
+      images: mapBodyImages(input.bodyImages, pageSpecs),
+      highlightWords: state.route.highlight_words || [],
       config: {
-        footerText: footerText ?? undefined,
-        watermarkText: watermarkText ?? undefined,
+        ...(footer !== undefined ? { footerText: footer } : {}),
+        watermarkText: `@${account}`,
+        ...((bg || highlight) ? { theme: {
+          ...(bg ? { bgColor: bg } : {}), ...(highlight ? { accentColor: highlight } : {}),
+        } } : {}),
       },
-    });
-
-    const coverPngs = await renderTypesetResultToPngs(resolvedCover.result);
-    const coverBuffer = coverPngs[0]?.buffer;
-    if (!coverBuffer) {
-      throw new Error("Typeset Studio failed to render newspic cover buffer");
-    }
-    const coverPath = join(outputDir, "cover.png");
-    await writeFile(coverPath, coverBuffer);
-    assets.push({
-      kind: "cover",
-      route: "wechat-newspic",
-      path: coverPath,
-    });
-
-    // 3.2 If single-page mode, return immediately
-    if (!isMultiPage) {
-      return {
-        assets,
-        pageCount: 1,
-        pages: [
-          {
-            page: 1,
-            imageCount: resolvedCover.result.pages[0]?.images.length || 0,
-            imageSources: (resolvedCover.result.pages[0]?.images || []).map((img) => img.src),
-          },
-        ],
+    };
+    const articleCover = route === "wechat-article";
+    const renderRoute = articleCover ? "wechat-article" : "wechat-newspic";
+
+    // 统一封面和正文的请求构造，传输方式只在这里分流。
+    const renderBatch = (body: RenderRequestBody, kind: RenderAsset["kind"]) =>
+      REMOTE_STUDIO_URL && (route === "wechat-article" || route === "wechat-newspic")
+        ? renderRemoteBatch(REMOTE_STUDIO_URL, body, outputDir, renderRoute, kind)
+        : renderLocalBatch(body, outputDir, renderRoute, kind);
+
+    const coverTheme = input.coverTheme;
+    const coverConfig = { ...common.config, algorithm: { targetFillRatio: 1 } };
+    if (coverTheme) {
+      coverConfig.coverTheme = coverTheme;
+      if (footer) coverConfig.chrome = { showHeader: false, showFooter: true, showFooterDivider: false, showFooterText: true };
+      coverConfig.algorithm = { ...coverTheme.layout, targetFillRatio: 1 };
+      coverConfig.theme = {
+        bgColor: coverTheme.background.fill.type === "solid" ? coverTheme.background.fill.color : "transparent",
+        textColor: coverTheme.colors.text, headingColor: coverTheme.colors.text,
+        accentColor: coverTheme.colors.accent, quoteColor: coverTheme.colors.muted,
+        captionColor: coverTheme.colors.muted, watermarkColor: coverTheme.colors.muted,
       };
     }
+    const firstPageImages = (common.images || []).filter((image) => !image.pageIndex || image.pageIndex === 1)
+      .map((image) => ({ ...image, pageIndex: 1 }));
+    if (fallbackIcon) coverConfig.images = [{
+      id: "account_icon", src: fallbackIcon, alt: "账号标识", isAbsolute: true,
+      x: 0, y: 0, width: 48, height: 48, zIndex: 20, pageIndex: 1,
+      templateAssetKey: "account_icon",
+    }];
+    const cover = await renderBatch({
+      ...common, config: coverConfig, images: firstPageImages,
+      template: input.studioTemplates?.cover || template,
+      templateImageOverrides: input.templateImageOverrides?.cover,
+      route: renderRoute, slot: articleCover ? "article_cover" : "newspic_cover",
+      kind: "cover", maxPages: 1, markdown: `# ${title}`,
+    }, "cover");
+    input.onProgress?.({ stage: "cover", message: "封面已生成", current: 1, total: 1, unit: "pages", route, account });
+    const paginationMode = input.template === "longform-3-4"
+      ? "multi"
+      : input.template === "poster-3-4"
+        ? "single"
+        : state.intent?.newspic_render?.pagination_mode || "multi";
+    if (articleCover || paginationMode !== "multi") return cover;
 
-    // 3.3 Render Content Pages (3:4 Multi-page longform)
-    const contentImages = mapBodyImages(input.bodyImages, input.pageSpecs);
-    const resolvedContent = resolveTypesetResult({
-      slot: "newspic_content",
+    const content = await renderBatch({
+      ...common,
       route: "wechat-newspic",
+      template: input.studioTemplates?.content || template,
+      templateImageOverrides: input.templateImageOverrides?.content,
       kind: "content",
-      account,
-      title: effectiveTitle,
-      markdown: bodyText || `# ${effectiveTitle}`,
-      template: input.template,
-      images: contentImages,
-      highlightWords,
-      config: {
-        footerText: footerText ?? undefined,
-        watermarkText: watermarkText ?? undefined,
-      },
-    });
-
-    const contentPngs = await renderTypesetResultToPngs(resolvedContent.result);
-
-    for (let i = 0; i < contentPngs.length; i++) {
-      const pageNum = i + 1;
-      const fileName = `article-${String(pageNum).padStart(2, "0")}.png`;
-      const pagePath = join(outputDir, fileName);
-      await writeFile(pagePath, contentPngs[i].buffer);
-
-      assets.push({
-        kind: "page",
-        route: "wechat-newspic",
-        index: pageNum,
-        path: pagePath,
-      });
-
-      const flowPage = resolvedContent.result.pages[i];
-      pagesSummary.push({
-        page: pageNum,
-        imageCount: flowPage?.images.length || 0,
-        imageSources: (flowPage?.images || []).map((img) => img.src),
-      });
-    }
-
-    return {
-      assets,
-      pageCount: contentPngs.length,
-      pages: pagesSummary,
-    };
+      slot: "newspic_content",
+      markdown: bodyText || `# ${title}`,
+      config: { ...common.config, ...(saved?.target_fill_ratio != null ? { algorithm: { targetFillRatio: saved.target_fill_ratio } } : {}) },
+      minPages: input.minPages ?? saved?.min_pages,
+      maxPages: input.maxPages ?? saved?.max_pages,
+      pageFillRatios: Object.fromEntries((pageSpecs || []).filter((spec) => spec.targetFillRatio != null).map((spec) => [spec.page, spec.targetFillRatio!])),
+    }, "page");
+    input.onProgress?.({ stage: "content", message: "正文已生成", current: content.pageCount, total: content.pageCount, unit: "pages", route, account });
+    return { ...content, assets: [...cover.assets, ...content.assets] };
   },
 };