agent-reader 1.1.1 → 1.1.2

package/README.md

@@ -232,6 +232,7 @@ Claude Desktop 配置（`claude_desktop_config.json`）：
 ## 云环境部署
 
 在 Docker/CI 中，Agent Reader 会自动检测环境并在需要时为 Puppeteer 关闭沙盒参数（`--no-sandbox` 等）。
+在部分非标准云环境里，`auto` 模式首次失败时也会自动重试一次 `no-sandbox`，减少手动排障。
 
 手动覆盖方式：
 

package/bin/agent-reader.js

@@ -17,7 +17,7 @@ const program = new Command();
 program
   .name('agent-reader')
   .description('AI Agent output beautifier and slideshow generator')
-  .version('1.1.1');
+  .version('1.1.2');
 
 setupCommonCommandOptions(
   program

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-reader",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "AI Agent 的文档美化引擎 — 一键把 Markdown 变成漂亮网页、Word、PDF 和幻灯片",
   "main": "index.js",
   "directories": {

package/src/core/exporter.js

@@ -690,30 +690,15 @@ export function createPandocFallbackWarnings(platform = process.platform) {
   ];
 }
 
-export async function exportPDF(html, options = {}) {
-  const {
-    pageSize = 'A4',
-    landscape = false,
-    outDir = os.tmpdir(),
-    fileName = 'output.pdf',
-    htmlPath,
-    sandbox,
-  } = options;
-
-  let puppeteer;
-  try {
-    const mod = await import('puppeteer');
-    puppeteer = mod.default || mod;
-  } catch {
-    throw new Error('Puppeteer is not installed. Install optional dependency: npm install puppeteer');
-  }
-
-  const warnings = [];
-  const pdfPath = path.join(path.resolve(outDir), fileName);
-  const resolvedSandboxMode = resolveSandboxMode(sandbox);
-  const launchArgs = landscape ? ['--allow-file-access-from-files'] : [];
-  launchArgs.push(...getSandboxArgs(resolvedSandboxMode));
-
+async function renderPdfWithPuppeteer({
+  puppeteer,
+  launchArgs,
+  html,
+  htmlPath,
+  pageSize,
+  landscape,
+  pdfPath,
+}) {
   const browser = await puppeteer.launch({
     headless: true,
     args: launchArgs,
@@ -731,7 +716,7 @@ export async function exportPDF(html, options = {}) {
       });
     }
 
-    // Wait for images and fonts to finish loading before generating PDF
+    // Wait for images and fonts to finish loading before generating PDF.
     await page.evaluate(() =>
       Promise.all([
         document.fonts?.ready,
@@ -808,7 +793,72 @@ blockquote { break-inside: avoid; }`,
       tagged: true,
     });
   } finally {
-    await browser.close();
+    await browser.close().catch(() => {});
+  }
+}
+
+export async function exportPDF(html, options = {}) {
+  const {
+    pageSize = 'A4',
+    landscape = false,
+    outDir = os.tmpdir(),
+    fileName = 'output.pdf',
+    htmlPath,
+    sandbox,
+    puppeteerInstance,
+    sandboxRuntime,
+  } = options;
+
+  let puppeteer = puppeteerInstance;
+  try {
+    if (!puppeteer) {
+      const mod = await import('puppeteer');
+      puppeteer = mod.default || mod;
+    }
+  } catch {
+    throw new Error('Puppeteer is not installed. Install optional dependency: npm install puppeteer');
+  }
+
+  const warnings = [];
+  const pdfPath = path.join(path.resolve(outDir), fileName);
+  const resolvedSandboxMode = resolveSandboxMode(sandbox);
+  const baseArgs = landscape ? ['--allow-file-access-from-files'] : [];
+  const primaryArgs = [...baseArgs, ...getSandboxArgs(resolvedSandboxMode, sandboxRuntime)];
+  const canRetryWithNoSandbox = resolvedSandboxMode === 'auto'
+    && !primaryArgs.includes('--no-sandbox');
+
+  try {
+    await renderPdfWithPuppeteer({
+      puppeteer,
+      launchArgs: primaryArgs,
+      html,
+      htmlPath,
+      pageSize,
+      landscape,
+      pdfPath,
+    });
+  } catch (primaryError) {
+    if (!canRetryWithNoSandbox) {
+      throw primaryError;
+    }
+
+    const fallbackArgs = [...baseArgs, ...SANDBOX_DISABLED_ARGS];
+    try {
+      await renderPdfWithPuppeteer({
+        puppeteer,
+        launchArgs: fallbackArgs,
+        html,
+        htmlPath,
+        pageSize,
+        landscape,
+        pdfPath,
+      });
+      warnings.push('sandbox_auto_retry_off');
+    } catch (fallbackError) {
+      throw new Error(
+        `PDF export failed in auto mode and fallback off mode: ${fallbackError.message} (auto error: ${primaryError.message})`,
+      );
+    }
   }
 
   const stat = await fs.stat(pdfPath);

package/src/mcp/server.js

@@ -72,7 +72,7 @@ async function saveHtmlResult(html, outputDir, name = 'output') {
 
 const server = new McpServer({
   name: 'agent-reader',
-  version: '1.1.1',
+  version: '1.1.2',
 });
 
 server.registerTool(