browserless 13.5.0 → 13.5.3

package/package.json

@@ -2,7 +2,7 @@
   "name": "browserless",
   "description": "The headless Chrome/Chromium driver on top of Puppeteer. Take screenshots, generate PDFs, extract text and HTML with a production-ready API.",
   "homepage": "https://browserless.js.org",
-  "version": "13.5.0",
+  "version": "13.5.3",
   "types": "index.d.ts",
   "main": "src/index.js",
   "author": {
@@ -36,9 +36,9 @@
   ],
   "dependencies": {
     "@browserless/errors": "13.1.7",
-    "@browserless/goto": "13.4.1",
-    "@browserless/pdf": "13.4.1",
-    "@browserless/screenshot": "13.4.1",
+    "@browserless/goto": "13.5.3",
+    "@browserless/pdf": "13.5.3",
+    "@browserless/screenshot": "13.5.3",
     "debug-logfmt": "~1.4.10",
     "kill-process-group": "~1.0.13",
     "p-reflect": "~2.1.0",
@@ -48,7 +48,7 @@
     "superlock": "~1.2.7"
   },
   "devDependencies": {
-    "@browserless/test": "13.5.0",
+    "@browserless/test": "13.5.3",
     "ava": "5",
     "ps-list": "7",
     "puppeteer": "25",
@@ -70,5 +70,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "000c5ca9e84696666e3c652a9a0a2dab325e9576"
+  "gitHead": "3aed0ceefb700a38debc5be98241a7985818c88d"
 }

package/src/report.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { execFile } = require('child_process')
-const { readFileSync, existsSync } = require('fs')
+const { readFileSync, readdirSync, existsSync } = require('fs')
 const { promisify } = require('util')
 const os = require('os')
 
@@ -225,9 +225,38 @@ const parseRenderer = renderer => {
   }
 }
 
-// ANGLE hides the underlying Mesa version, so read it from the installed driver
-// package. Best-effort: null off Debian/Ubuntu (e.g. macOS dev) or if dpkg fails.
+// Directories where the loaded Mesa Gallium driver may live. The multiarch path
+// is resolved at runtime so this works on amd64 and arm64 without a hardcode.
+const GALLIUM_LIB_DIRS = [
+  `/usr/lib/${process.arch === 'arm64' ? 'aarch64' : 'x86_64'}-linux-gnu`,
+  '/usr/lib',
+  '/usr/local/lib'
+]
+
+// Modern Mesa ships the version in the shared-object filename, e.g.
+// `libgallium-26.1.3.so`. Pure so it can be unit-tested without a filesystem.
+const parseGalliumVersion = filenames => {
+  for (const name of filenames) {
+    const m = /^libgallium-(\d+\.\d+(?:\.\d+)?)\.so$/.exec(name)
+    if (m) return m[1]
+  }
+  return null
+}
+
+// ANGLE hides the underlying Mesa version. Read it from the ACTUALLY loaded
+// Gallium driver (`libgallium-<ver>.so`) first — when Mesa is side-loaded over
+// the distro package (our Docker image COPYs a source build over apt's), dpkg
+// still reports the stale apt version while this reflects what Chromium loads.
+// Fall back to the dpkg package version, then null (e.g. macOS dev, no Mesa).
 const readMesaVersion = async () => {
+  for (const dir of GALLIUM_LIB_DIRS) {
+    try {
+      const version = parseGalliumVersion(readdirSync(dir))
+      if (version) return version
+    } catch {
+      // dir absent / unreadable — try the next candidate.
+    }
+  }
   try {
     // Default output is `<name>\t<version>`; take the version field.
     const { stdout } = await execFileAsync('dpkg-query', ['-W', 'libgl1-mesa-dri'], {
@@ -449,4 +478,5 @@ const report =
 
 module.exports = report
 module.exports.parseRenderer = parseRenderer
+module.exports.parseGalliumVersion = parseGalliumVersion
 module.exports.detectBuild = detectBuild