@browserless/screenshot 13.10.1 → 13.11.2

package/package.json

@@ -2,7 +2,7 @@
   "name": "@browserless/screenshot",
   "description": "Capture high-quality screenshots of websites with overlay support, device emulation, and automated image optimization.",
   "homepage": "https://browserless.js.org/#/?id=screenshoturl-options",
-  "version": "13.10.1",
+  "version": "13.11.2",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -70,5 +70,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "1b6ea5387978d49eba0ed4d8643e2f5ff5a88875"
+  "gitHead": "e2deda7c4f16f6d926d9f4d61b6a523ffaba9ba7"
 }

package/src/index.js

@@ -116,6 +116,13 @@ const isLossy = ({ type, path }) =>
     ? LOSSY_TYPES.has(type)
     : LOSSY_EXTENSIONS.has(extname(path ?? '').toLowerCase())
 
+// Captures stay binary until returned: the blank-page check and the overlay
+// decode them with sharp, which reads a base64 string as raw bytes.
+const encodeScreenshot = (image, encoding) =>
+  encoding === 'base64' && ArrayBuffer.isView(image)
+    ? Buffer.from(image.buffer, image.byteOffset, image.byteLength).toString('base64')
+    : image
+
 module.exports = ({ goto, ...gotoOpts }) => {
   goto = goto || createGoto(gotoOpts)
 
@@ -127,6 +134,7 @@ module.exports = ({ goto, ...gotoOpts }) => {
         overlay: overlayOpts = SCREENSHOT_DEFAULT_OPTS.overlay,
         waitUntil = SCREENSHOT_DEFAULT_OPTS.waitUntil,
         isPageReady = SCREENSHOT_DEFAULT_OPTS.isPageReady,
+        encoding,
         ...opts
       } = {}
     ) => {
@@ -287,9 +295,11 @@ module.exports = ({ goto, ...gotoOpts }) => {
           }
         }
 
-        return Object.keys(overlayOpts).length === 0
-          ? screenshot
-          : overlay(screenshot, { ...opts, ...overlayOpts, viewport: page.viewport() })
+        const image =
+          Object.keys(overlayOpts).length === 0
+            ? screenshot
+            : await overlay(screenshot, { ...opts, ...overlayOpts, viewport: page.viewport() })
+        return encodeScreenshot(image, encoding)
       } finally {
         page.off('dialog', onDialog)
       }