@zzclub/pipeline 0.13.1 → 0.13.2

package/src/wechat-preview/assets/templates/export-shell.html

@@ -12,11 +12,17 @@
       <script id="zzhub-wechat-export-result" type="application/json">{"status":"pending"}</script>
     </div>
     <script>
+      var renderFinished = false;
+      var resolveRender;
+      window.__zzhubRenderReady = new Promise(function (resolve) { resolveRender = resolve; });
       window.__ZZHUB_SET_RESULT__ = function (payload) {
+        if (renderFinished) return;
+        renderFinished = true;
         var el = document.getElementById("zzhub-wechat-export-result");
         if (el) {
           el.textContent = JSON.stringify(payload);
         }
+        resolveRender();
       };
       window.addEventListener("error", function (event) {
         window.__ZZHUB_SET_RESULT__({

package/src/wechat-preview/browser/editor-export.ts

@@ -13,24 +13,17 @@ interface BrowserPayload {
   customCss?: string;
 }
 
+type BrowserResult =
+  | { status: "success"; html: string; semanticHtml?: string }
+  | { status: "error"; error: string };
+
 declare global {
   interface Window {
     __ZZHUB_WECHAT_PAYLOAD__?: BrowserPayload;
+    __ZZHUB_SET_RESULT__: (result: BrowserResult) => void;
   }
 }
 
-function setResult(
-  result:
-    | { status: "success"; html: string; semanticHtml?: string }
-    | { status: "error"; error: string },
-): void {
-  const el = document.getElementById("zzhub-wechat-export-result");
-  if (!el) {
-    return;
-  }
-  el.textContent = JSON.stringify(result);
-}
-
 async function main(): Promise<void> {
   const payload = window.__ZZHUB_WECHAT_PAYLOAD__;
   if (!payload) {
@@ -59,10 +52,10 @@ async function main(): Promise<void> {
     theme: payload.exportTheme,
   });
   await editor.destroy();
-  setResult({ status: "success", html, semanticHtml });
+  window.__ZZHUB_SET_RESULT__({ status: "success", html, semanticHtml });
 }
 
 void main().catch((error: unknown) => {
   const detail = error instanceof Error ? error.message : String(error);
-  setResult({ status: "error", error: detail });
+  window.__ZZHUB_SET_RESULT__({ status: "error", error: detail });
 });

package/src/wechat-preview/index.ts

@@ -4,14 +4,13 @@ import { createRequire } from "module";
 import { dirname, isAbsolute, join, resolve } from "path";
 import { pathToFileURL } from "url";
 import {
-  ChromeDumpError,
-  dumpHtmlDom,
   ensureParentDir,
   escapeHtml,
   findChrome,
   readUtf8,
   renderTemplate,
 } from "../imgx/runtime";
+import { ChromeRenderError, dumpReadyHtml } from "../imgx/chrome-render";
 import {
   PACKAGE_ROOT,
   TEMPLATE_PATH,
@@ -45,6 +44,7 @@ export type WechatExportErrorKind =
 export interface WechatExportDebugInfo {
   chrome_path?: string;
   virtual_time_budget_ms?: number;
+  timeout_ms?: number;
   bundle_stale?: boolean;
   bundle_rebuilt?: boolean;
   shell_path?: string;
@@ -94,7 +94,7 @@ export interface ExportMarkdownToWechatHtmlInput {
     editorVars?: Record<string, string>;
     exportTheme?: Record<string, string>;
   };
-  /** Chrome virtual-time-budget in ms (default 15000). */
+  /** 浏览器真实等待上限，默认 15000 毫秒。 */
   timeoutMs?: number;
   /** Write intermediate artifacts for debugging. */
   debugDir?: string;
@@ -320,7 +320,7 @@ export async function exportMarkdownToWechatHtml(
   input: ExportMarkdownToWechatHtmlInput,
 ): Promise<ExportMarkdownToWechatHtmlResult> {
   const started = Date.now();
-  const timeoutMs = input.timeoutMs ?? 15_000;
+  const timeoutMs = input.timeoutMs && Number.isFinite(input.timeoutMs) && input.timeoutMs > 0 ? input.timeoutMs : 15_000;
   const title = input.title ?? "Wechat Preview Export";
   let chromePath: string | undefined;
   let bundleRebuilt = false;
@@ -339,7 +339,7 @@ export async function exportMarkdownToWechatHtml(
       markdownPath: input.markdownPath,
       debug: {
         chrome_path: chromePath,
-        virtual_time_budget_ms: timeoutMs,
+        timeout_ms: timeoutMs,
         bundle_stale: bundleStale,
         bundle_rebuilt: bundleRebuilt,
         debug_dir: input.debugDir,
@@ -401,29 +401,31 @@ export async function exportMarkdownToWechatHtml(
 
     let dumpedDom: string;
     try {
-      dumpedDom = dumpHtmlDom({
+      dumpedDom = await dumpReadyHtml({
         chromePath,
         html: shellHtml,
-        virtualTimeBudgetMs: timeoutMs,
-        keepTempOnError: Boolean(input.debugDir),
+        timeoutMs,
       });
     } catch (error) {
-      if (error instanceof ChromeDumpError) {
+      if (error instanceof ChromeRenderError) {
         if (input.debugDir) {
           await writeDebugArtifacts(input.debugDir, {
             "00-payload-markdown.md": markdown,
             "01-export-shell.html": shellHtml,
             "meta.json": JSON.stringify({
               status: "failed",
-              kind: "chrome_failed",
+              kind: error.kind,
               error: error.message,
               stderr: error.stderr,
               duration_ms: Date.now() - started,
+              timeout_ms: timeoutMs,
             }, null, 2),
           });
         }
-        throw makeError("chrome_failed", error.message, {
-          shell_path: error.tempHtmlPath,
+        throw makeError(error.kind, error.kind === "timeout"
+          ? `Wechat preview export did not finish before timeout (${timeoutMs}ms real time)`
+          : error.message, {
+          shell_path: input.debugDir ? join(input.debugDir, "01-export-shell.html") : undefined,
           stderr_tail: stderrTail(error.stderr),
           debug_dir: input.debugDir,
         });
@@ -445,15 +447,15 @@ export async function exportMarkdownToWechatHtml(
           "02-dump-dom.html": dumpedDom,
           "meta.json": JSON.stringify({
             status: "failed",
-            kind: "timeout",
+            kind: "render_error",
             error: error instanceof Error ? error.message : String(error),
             duration_ms: Date.now() - started,
           }, null, 2),
         });
       }
       throw makeError(
-        "timeout",
-        `Wechat preview export did not finish before timeout (${timeoutMs}ms): ${
+        "render_error",
+        `Wechat preview export returned an invalid result: ${
           error instanceof Error ? error.message : String(error)
         }`,
       );
@@ -483,15 +485,15 @@ export async function exportMarkdownToWechatHtml(
           "02-dump-dom.html": dumpedDom,
           "meta.json": JSON.stringify({
             status: "failed",
-            kind: "timeout",
+            kind: "render_error",
             status_value: result.status,
             duration_ms: Date.now() - started,
           }, null, 2),
         });
       }
       throw makeError(
-        "timeout",
-        `Wechat preview export did not finish before timeout (status=${result.status}, budget=${timeoutMs}ms)`,
+        "render_error",
+        `Wechat preview export returned an incomplete result (status=${result.status})`,
       );
     }
 

package/src/wechat-preview/server/types.ts

@@ -11,6 +11,7 @@ export type PreviewEntryStatus = "success" | "failed";
 export interface PreviewEntryDebug {
   chrome_path?: string;
   virtual_time_budget_ms?: number;
+  timeout_ms?: number;
   bundle_stale?: boolean;
   bundle_rebuilt?: boolean;
   shell_path?: string;

package/src/wechat-preview/wechat-export.integration.test.ts

@@ -5,8 +5,10 @@ import { dirname, join } from "path";
 import { fileURLToPath } from "url";
 import { PNG } from "pngjs";
 import { findChrome } from "../imgx/runtime";
+import { dumpReadyHtml } from "../imgx/chrome-render";
+import { TEMPLATE_PATH } from "../runtime-paths";
 import { replaceImageUrls } from "../providers/wechat";
-import { exportMarkdownToWechatHtml } from "./index";
+import { exportMarkdownToWechatHtml, extractRenderResult } from "./index";
 
 const fixturePath = join(
   dirname(fileURLToPath(import.meta.url)),
@@ -165,4 +167,53 @@ describe("semantic WeChat HTML export", () => {
       message: expect.stringContaining("无法读取缩放图片的原始尺寸"),
     });
   }, 30_000);
+
+  test.skipIf(findChrome() === null)("waits for remote PNG and GIF responses before completing scaled HTML export", async () => {
+    tempDir = await mkdtemp(join(tmpdir(), "zzhub-wechat-remote-"));
+    const png = new PNG({ width: 200, height: 100 });
+    png.data.fill(255);
+    const pngBytes = PNG.sync.write(png);
+    const gif = Buffer.from("R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7", "base64");
+    const requested = Promise.withResolvers<void>();
+    const release = Promise.withResolvers<void>();
+    const server = Bun.serve({ hostname: "127.0.0.1", port: 0, async fetch(request) {
+      requested.resolve();
+      await release.promise;
+      const isGif = request.url.endsWith(".gif");
+      return new Response(isGif ? gif : pngBytes, { headers: { "content-type": isGif ? "image/gif" : "image/png", "cache-control": "no-store" } });
+    } });
+    const markdownPath = join(tempDir, "images.md");
+    await writeFile(markdownPath, `![0.50](http://127.0.0.1:${server.port}/photo.png "远程图注")\n\n![0.50](http://127.0.0.1:${server.port}/motion.gif "动图图注")`);
+    let finished = false;
+    const exporting = exportMarkdownToWechatHtml({ markdownPath, outPath: join(tempDir, "images.html"), account: "default" })
+      .then(result => { finished = true; return result; });
+    try {
+      await Promise.race([requested.promise, exporting]);
+      // 人为延迟网络响应，确认导出不会提前读到 pending。
+      await Bun.sleep(800);
+      expect(finished).toBe(false);
+      release.resolve();
+      const { html } = await exporting;
+      expect(html).toContain("width: 50%;");
+      expect(html).toContain("max-width: 100px;");
+      expect(html).toContain("max-width: 0.5px;");
+      expect(html).toContain("远程图注</p>");
+      expect(html).toContain("动图图注</p>");
+      expect(html).toContain("/motion.gif");
+    } finally {
+      release.resolve();
+      await exporting.catch(() => {});
+      await server.stop(true);
+    }
+  }, 30_000);
+
+  test.skipIf(findChrome() === null)("settles the export result when the browser module fails to load", async () => {
+    const html = (await readFile(TEMPLATE_PATH, "utf8"))
+      .replace("{{PAGE_TITLE}}", "加载失败")
+      .replace("{{CSS_LINK}}", "")
+      .replace("{{PAYLOAD_JSON}}", "{}")
+      .replace("{{SCRIPT_URL}}", "file:///missing/wechat-editor.js");
+    const result = extractRenderResult(await dumpReadyHtml({ chromePath: findChrome()!, html, timeoutMs: 5000 }));
+    expect(result).toEqual({ status: "error", error: "failed to load wechat preview bundle" });
+  }, 10_000);
 });