@browserless/screenshot 13.6.10 → 13.6.12

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.10",
+  "version": "13.6.12",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -33,7 +33,7 @@
   ],
   "dependencies": {
     "@browserless/errors": "13.6.10",
-    "@browserless/goto": "13.6.10",
+    "@browserless/goto": "13.6.12",
     "@kikobeats/content-type": "~1.0.4",
     "@kikobeats/time-span": "~1.0.12",
     "automad-prism-themes": "~0.3.7",
@@ -52,7 +52,6 @@
     "svg-gradient": "~1.0.4"
   },
   "devDependencies": {
-    "@browserless/test": "13.6.10",
     "ava": "5"
   },
   "engines": {
@@ -71,5 +70,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "0bdae87d4aff5b26de301b2947b70d8ae6c0dcfd"
+  "gitHead": "363898247585b3b6cd51781fbd55ca61ee9ef8a6"
 }

package/src/index.js

@@ -3,6 +3,7 @@
 const debug = require('debug-logfmt')('browserless:screenshot')
 const { isContextDestroyed } = require('@browserless/errors')
 const createGoto = require('@browserless/goto')
+const { extname } = require('node:path')
 const pReflect = require('p-reflect')
 
 const isWhiteScreenshot = require('./is-white-screenshot')
@@ -96,6 +97,14 @@ const SCREENSHOT_DEFAULT_OPTS = {
   isPageReady: defaultIsPageReady
 }
 
+const LOSSY_TYPES = new Set(['jpeg', 'webp'])
+const LOSSY_EXTENSIONS = new Set(['.jpg', '.jpeg', '.webp'])
+
+const isLossy = ({ type, path }) =>
+  type !== undefined
+    ? LOSSY_TYPES.has(type)
+    : LOSSY_EXTENSIONS.has(extname(path ?? '').toLowerCase())
+
 module.exports = ({ goto, ...gotoOpts }) => {
   goto = goto || createGoto(gotoOpts)
 
@@ -110,6 +119,8 @@ module.exports = ({ goto, ...gotoOpts }) => {
         ...opts
       } = {}
     ) => {
+      if (opts.quality !== undefined && !isLossy(opts)) opts.quality = undefined
+
       let screenshot
       let response
 
@@ -177,11 +188,11 @@ module.exports = ({ goto, ...gotoOpts }) => {
 
         do {
           screenshot = await captureWithNavigationRetry(
-            () =>
-              page.screenshot({
-                ...opts,
-                ...(opts.fullPage ? { fullPage: false, path: undefined } : {})
-              }),
+            () => {
+              if (!opts.fullPage) return page.screenshot(opts)
+              const { fullPage, path, quality, ...probeOpts } = opts
+              return page.screenshot({ ...probeOpts, fullPage: false })
+            },
             { page, goto, timeout }
           )
           isWhite = await isWhiteScreenshot(screenshot)
@@ -195,7 +206,7 @@ module.exports = ({ goto, ...gotoOpts }) => {
           if (isReady || elapsed() >= timeout) break
 
           const remaining = timeout - elapsed()
-          if (opts.fullPage && !didHydrateAttempt && !isWhite) {
+          if (opts.fullPage && !didHydrateAttempt) {
             didHydrateAttempt = true
             const { hydrated, info } = await tryHydrateScroll(page, remaining)
             didHydrateScroll = hydrated

package/src/prepare-full-document.js

@@ -222,7 +222,7 @@ const prepareFullDocument = async (page, { goto, timeout, scrolled = false } = {
       duration: elapsed()
     })
 
-    await scrollFullPageToLoadContent(page, scrollTimeout)
+    await pReflect(scrollFullPageToLoadContent(page, scrollTimeout))
     debug('prepareFullDocument:scroll', { duration: elapsed() })
   } else {
     debug('prepareFullDocument:skipScroll', { duration: elapsed() })