@browserless/screenshot 13.6.12 → 13.8.0

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.6.12",
+  "version": "13.8.0",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -33,7 +33,7 @@
   ],
   "dependencies": {
     "@browserless/errors": "13.6.10",
-    "@browserless/goto": "13.6.12",
+    "@browserless/goto": "13.8.0",
     "@kikobeats/content-type": "~1.0.4",
     "@kikobeats/time-span": "~1.0.12",
     "automad-prism-themes": "~0.3.7",
@@ -70,5 +70,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "363898247585b3b6cd51781fbd55ca61ee9ef8a6"
+  "gitHead": "c8ee02797b7f301426683171bf7132b0df695ca1"
 }

package/src/index.js

@@ -241,22 +241,33 @@ module.exports = ({ goto, ...gotoOpts }) => {
 
       try {
         const timeScreenshot = prettyTimeSpan()
+        const hasActionScreenshot =
+          Array.isArray(opts.actions) && opts.actions.some(action => action.type === 'screenshot')
+        let actionCaptures
 
         if (waitUntil !== 'auto') {
-          ;({ response } = await goto(page, { ...opts, url, waitUntil }))
-          const screenshotOpts = await beforeScreenshot(page, response, opts)
-          if (opts.fullPage) {
-            await prepareFullDocument(page, { goto, timeout: opts.timeout })
+          ;({ response, actionCaptures } = await goto(page, { ...opts, url, waitUntil }))
+          if (!hasActionScreenshot) {
+            const screenshotOpts = await beforeScreenshot(page, response, opts)
+            if (opts.fullPage) {
+              await prepareFullDocument(page, { goto, timeout: opts.timeout })
+            }
+            screenshot = await captureExpanded(
+              opts.fullPage,
+              { ...opts, ...screenshotOpts },
+              goto.timeouts.action(opts.timeout)
+            )
           }
-          screenshot = await captureExpanded(
-            opts.fullPage,
-            { ...opts, ...screenshotOpts },
-            goto.timeouts.action(opts.timeout)
-          )
           debug('screenshot', { waitUntil, duration: timeScreenshot() })
         } else {
-          ;({ response } = await goto(page, { ...opts, url, waitUntil, waitUntilAuto }))
+          ;({ response, actionCaptures } = await goto(page, {
+            ...opts,
+            url,
+            waitUntil,
+            waitUntilAuto
+          }))
           async function waitUntilAuto (page, { response }) {
+            if (hasActionScreenshot) return
             const screenshotOpts = await beforeScreenshot(page, response, opts)
             const { isWhite, isReady, retry } = await takeScreenshot({
               ...opts,
@@ -274,6 +285,14 @@ module.exports = ({ goto, ...gotoOpts }) => {
           }
         }
 
+        if (hasActionScreenshot) {
+          const last = actionCaptures?.screenshots?.at(-1)
+          if (!last?.buffer) {
+            throw new Error('actions: screenshot action produced no buffer')
+          }
+          screenshot = last.buffer
+        }
+
         return Object.keys(overlayOpts).length === 0
           ? screenshot
           : overlay(screenshot, { ...opts, ...overlayOpts, viewport: page.viewport() })