fix: prevent Chromium zombie leak in htmlToPdf

- Wrap browser lifecycle in try/finally so browser.close() always runs
- Fall back to SIGKILL of browser.process() if close() fails
- Add --disable-dev-shm-usage to launch args (container stability)
- Add tini as ENTRYPOINT in Dockerfile for defense in depth
- Bump version to 1.0.2
This commit is contained in:
alexz
2026-04-11 14:59:50 +00:00
parent 6cac4d16e0
commit 43152351fa
3 changed files with 45 additions and 34 deletions

View File

@@ -235,43 +235,52 @@ async function htmlToPdf(html) {
const browser = await puppeteer.launch({
executablePath: process.env.CHROME_PATH || "/usr/bin/google-chrome-stable",
args: ["--no-sandbox", "--disable-setuid-sandbox"],
args: ["--no-sandbox", "--disable-setuid-sandbox", "--disable-dev-shm-usage"],
});
const page = await browser.newPage();
try {
const page = await browser.newPage();
const htmlForPdf = html.replace(
/<script src="https:\/\/cdn\.jsdelivr\.net\/npm\/mermaid@[^"]*"><\/script>/,
""
);
await page.setContent(htmlForPdf, { waitUntil: "domcontentloaded" });
const hasMermaid = await page.evaluate(
() => document.querySelectorAll("pre.mermaid").length > 0
);
if (hasMermaid) {
const mermaidJs = fs.readFileSync(
path.join(__dirname, "mermaid.min.js"),
"utf-8"
const htmlForPdf = html.replace(
/<script src="https:\/\/cdn\.jsdelivr\.net\/npm\/mermaid@[^"]*"><\/script>/,
""
);
await page.addScriptTag({ content: mermaidJs });
await page.evaluate(() => {
mermaid.initialize({
startOnLoad: false,
theme: "default",
flowchart: { useMaxWidth: true, htmlLabels: true, curve: "basis" },
securityLevel: "loose",
});
return mermaid.run({ querySelector: "pre.mermaid" });
});
}
await page.setContent(htmlForPdf, { waitUntil: "domcontentloaded" });
const pdfBuffer = await page.pdf({
format: "A4",
printBackground: true,
margin: { top: "20mm", bottom: "20mm", left: "15mm", right: "15mm" },
});
await browser.close();
return pdfBuffer;
const hasMermaid = await page.evaluate(
() => document.querySelectorAll("pre.mermaid").length > 0
);
if (hasMermaid) {
const mermaidJs = fs.readFileSync(
path.join(__dirname, "mermaid.min.js"),
"utf-8"
);
await page.addScriptTag({ content: mermaidJs });
await page.evaluate(() => {
mermaid.initialize({
startOnLoad: false,
theme: "default",
flowchart: { useMaxWidth: true, htmlLabels: true, curve: "basis" },
securityLevel: "loose",
});
return mermaid.run({ querySelector: "pre.mermaid" });
});
}
const pdfBuffer = await page.pdf({
format: "A4",
printBackground: true,
margin: { top: "20mm", bottom: "20mm", left: "15mm", right: "15mm" },
});
return pdfBuffer;
} finally {
try {
await browser.close();
} catch (e) {
try {
browser.process()?.kill("SIGKILL");
} catch (_) {}
}
}
}
module.exports = { markdownToHtml, htmlToPdf };