mikser-io 7.10.1 → 7.10.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mikser-io",
-	"version": "7.10.1",
+	"version": "7.10.2",
 	"description": "<p align=\"center\">   <img src=\"mikser-lockup-stacked.svg\" alt=\"mikser\" width=\"198\" /> </p>",
 	"main": "index.js",
 	"scripts": {

package/src/plugins/post/pdf.js

@@ -13,16 +13,6 @@ export async function setup({ config, logger }) {
         return
     }
 
-    const { default: puppeteer } = await import('puppeteer').catch(() => {
-        throw new Error('Puppeteer is required for the pdf postprocessor — run: npm install puppeteer')
-    })
-    // --no-sandbox / --disable-setuid-sandbox are required on most
-    // headless Linux servers and Docker images where Chrome's sandbox
-    // can't be set up. Applied by default and merged (deduped) with any
-    // user-supplied launch.args so callers can add flags without losing
-    // these. To run WITH the sandbox, override launch.args explicitly.
-    const defaultArgs = ['--no-sandbox', '--disable-setuid-sandbox']
-
     // Resolve which chrome to use, in precedence order:
     //   1. config.launch.executablePath  — explicit, wins
     //   2. config.executable             — friendly top-level alias
@@ -33,16 +23,50 @@ export async function setup({ config, logger }) {
     //      that fails when ~/.cache/puppeteer is half-populated)
     //
     // For headless production servers, pointing at a system chromium
-    // installed via apt (executable: '/usr/bin/chromium') skips
-    // puppeteer's postinstall download entirely. Set
-    // PUPPETEER_SKIP_DOWNLOAD=true at npm install time to keep it from
-    // even trying.
+    // installed via apt skips puppeteer's postinstall download entirely.
     const executablePath =
         config?.launch?.executablePath
         ?? config?.executable
         ?? process.env.PUPPETEER_EXECUTABLE_PATH
         ?? undefined
 
+    // Driver library: try `puppeteer` first (most common, bundles chrome),
+    // then `puppeteer-core` (same API without the chrome auto-download —
+    // the right choice when you've configured an external `executable`).
+    // Either is fine; either can drive any chrome binary you point at.
+    const puppeteer =
+        await import('puppeteer').then(m => m.default).catch(() => null)
+        ?? await import('puppeteer-core').then(m => m.default).catch(() => null)
+
+    if (!puppeteer) {
+        // Context-aware install instructions. If the user already configured
+        // an executable, they almost certainly want puppeteer-core (lean,
+        // no chrome download). Otherwise either works.
+        if (executablePath) {
+            throw new Error(
+                `post-pdf needs the puppeteer driver library to talk to chrome at ${executablePath}.\n` +
+                `Since you've configured an external executable, install the lean driver (no bundled chrome):\n` +
+                `  npm install puppeteer-core`
+            )
+        }
+        throw new Error(
+            'post-pdf needs a puppeteer driver to render PDFs.\n' +
+            'Two options:\n' +
+            '  - Quickest:   npm install puppeteer            (bundles chrome ~500MB)\n' +
+            '  - Headless:   sudo apt install google-chrome-stable\n' +
+            '                npm install puppeteer-core      (no chrome download)\n' +
+            '                # then in mikser.config.js:\n' +
+            "                'post-pdf': { executable: '/usr/bin/google-chrome-stable' }"
+        )
+    }
+
+    // --no-sandbox / --disable-setuid-sandbox are required on most
+    // headless Linux servers and Docker images where Chrome's sandbox
+    // can't be set up. Applied by default and merged (deduped) with any
+    // user-supplied launch.args so callers can add flags without losing
+    // these. To run WITH the sandbox, override launch.args explicitly.
+    const defaultArgs = ['--no-sandbox', '--disable-setuid-sandbox']
+
     browser = await puppeteer.launch({
         headless: true,
         ...config?.launch,