hdoc-tools 0.56.1 → 0.57.0

package/.puppeteerrc.cjs

@@ -9,13 +9,30 @@
 // not where the browser is launched from at runtime.
 const path = require("node:path");
 
+// Single source of truth for the browser build and cache location. Both the
+// install script (hdoc-install-browser.js) and the runtime launch
+// (hdoc-build.js) import these so provisioning and launch can never disagree.
+//
+// Keep chromeBuild in lockstep with the puppeteer version in package.json
+// (puppeteer 25.1.0 ships Chrome 149.0.7827.22).
+const chromeBuild = "149.0.7827.22";
+
+// Pin a fixed, user-independent cache dir inside the package root. Under a
+// global install, postinstall runs as root (sudo) while `hdoc` later runs as a
+// normal user; os.homedir() resolves to different homes for each, so the old
+// ~/.cache/puppeteer default left the browser in root's home and the runtime
+// launch (a normal user) never found it. Anchoring to __dirname makes
+// install-time provisioning and runtime launch agree on one absolute path.
+//
+// NOTE: Puppeteer only auto-discovers this file via cosmiconfig by searching up
+// from process.cwd(). At install time cwd is the package root, so skipDownload
+// is honored. At runtime cwd is the user's docbook repo, so this file is NEVER
+// found and cacheDir here is ignored — hdoc-build.js therefore computes an
+// explicit executablePath from these exports rather than relying on discovery.
+const cacheDir = path.join(__dirname, ".cache", "puppeteer");
+
 module.exports = {
 	skipDownload: true,
-	// Pin a fixed, user-independent cache dir inside the package root. Under a
-	// global install, postinstall runs as root (sudo) while `hdoc` later runs as
-	// a normal user; os.homedir() resolves to different homes for each, so the
-	// old ~/.cache/puppeteer default left the browser in root's home and the
-	// runtime launch (a normal user) never found it. Anchoring to __dirname makes
-	// install-time provisioning and runtime launch agree on one absolute path.
-	cacheDir: path.join(__dirname, ".cache", "puppeteer"),
+	cacheDir,
+	chromeBuild,
 };

package/hdoc-build.js

@@ -1331,8 +1331,31 @@
 		// Get a list of MD files in work_path
 		hdoc.scan_dir(work_path, dreeOptions, build_file_callback);
 
-		// Create a Chromium browser instance generate PDFs and validate links with
-		browser = await puppeteer.launch({ headless: "shell", args: ['--no-sandbox'] });
+		// Create a Chromium browser instance generate PDFs and validate links with.
+		// Resolve the executable explicitly from the browser cache provisioned by
+		// hdoc-install-browser.js. We cannot rely on Puppeteer auto-discovering
+		// .puppeteerrc.cjs at runtime: cosmiconfig searches up from process.cwd()
+		// (the user's docbook repo), never the global node_modules where our config
+		// and cache live, so Puppeteer would fall back to ~/.cache/puppeteer and
+		// fail with "Could not find Chrome". headless:"shell" launches
+		// chrome-headless-shell, so resolve that binary specifically.
+		const {
+			computeExecutablePath,
+			detectBrowserPlatform,
+			Browser,
+		} = require("@puppeteer/browsers");
+		const puppeteerConfig = require(path.join(__dirname, ".puppeteerrc.cjs"));
+		const executablePath = computeExecutablePath({
+			browser: Browser.CHROMEHEADLESSSHELL,
+			buildId: puppeteerConfig.chromeBuild,
+			cacheDir: process.env.PUPPETEER_CACHE_DIR || puppeteerConfig.cacheDir,
+			platform: detectBrowserPlatform(),
+		});
+		browser = await puppeteer.launch({
+			headless: "shell",
+			executablePath,
+			args: ['--no-sandbox'],
+		});
 
 		// Work through MD files and convert to HTML
 		const mdPromiseArray = [];

package/hdoc-install-browser.js

@@ -28,9 +28,10 @@
 		Browser,
 	} = require("@puppeteer/browsers");
 
-	// Keep this build id in lockstep with the puppeteer version pinned in
-	// package.json (puppeteer 25.1.0 ships Chrome 149.0.7827.22).
-	const CHROME_BUILD = "149.0.7827.22";
+	// Build id + cache dir come from the shared .puppeteerrc.cjs so install and
+	// runtime launch can never drift apart.
+	const puppeteerConfig = require(path.join(__dirname, ".puppeteerrc.cjs"));
+	const CHROME_BUILD = puppeteerConfig.chromeBuild;
 	const MAX_ATTEMPTS = 3;
 
 	const RED = "\x1b[31m";
@@ -46,9 +47,7 @@
 	// os.homedir()) guarantees we install to exactly the path the browser is
 	// later launched from — critical for `sudo npm i -g`, where postinstall runs
 	// as root but `hdoc` runs as a normal user with a different home directory.
-	const cacheDir =
-		process.env.PUPPETEER_CACHE_DIR ||
-		require(path.join(__dirname, ".puppeteerrc.cjs")).cacheDir;
+	const cacheDir = process.env.PUPPETEER_CACHE_DIR || puppeteerConfig.cacheDir;
 
 	let platform;
 	try {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "hdoc-tools",
-	"version": "0.56.1",
+	"version": "0.57.0",
 	"description": "Hornbill HDocBook Development Support Tool",
 	"main": "hdoc.js",
 	"bin": {