@browserless/screenshot 10.7.13 → 10.8.0-beta.3

package/package.json

@@ -2,7 +2,7 @@
   "name": "@browserless/screenshot",
   "description": "Take a clean screenshot of any website",
   "homepage": "https://browserless.js.org/#/?id=screenshoturl-options",
-  "version": "10.7.13",
+  "version": "10.8.0-beta.3",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -66,5 +66,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "9ed950add1325d6f93d072d6475f1603e4b97d45"
+  "gitHead": "99ff22f6be1b8dfd3b5ebeeef36cc38ef583b6fb"
 }

package/src/index.js

@@ -14,6 +14,17 @@ const getBoundingClientRect = element => {
   return { top, left, height, width, x, y }
 }
 
+const takeScreenshot = async ({ page, goto, opts }) => {
+  let screenshot
+  screenshot = await page.screenshot(opts)
+  const isWhite = await isWhiteScreenshot(screenshot)
+  if (isWhite) {
+    await goto.waitUntilAuto(page, opts)
+    screenshot = await page.screenshot(opts)
+  }
+  return { isWhite }
+}
+
 const waitForImagesOnViewport = page =>
   page.$$eval('img[src]:not([aria-hidden="true"])', elements =>
     Promise.all(
@@ -82,16 +93,6 @@ module.exports = ({ goto, ...gotoOpts }) => {
         )
       }
 
-      const takeScreenshot = async opts => {
-        screenshot = await page.screenshot(opts)
-        const isWhite = await isWhiteScreenshot(screenshot)
-        if (isWhite) {
-          await goto.waitUntilAuto(page, opts)
-          screenshot = await page.screenshot(opts)
-        }
-        return { isWhite }
-      }
-
       page.on('dialog', dialog => pReflect(dialog.dismiss()))
 
       const timeScreenshot = timeSpan()
@@ -111,7 +112,11 @@ module.exports = ({ goto, ...gotoOpts }) => {
             waitForElement(page, element),
             beforeScreenshot(response)
           ])
-          const { isWhite } = await takeScreenshot({ ...opts, ...screenshotOpts })
+          const { isWhite } = await takeScreenshot({
+            page,
+            goto,
+            opts: { ...opts, ...screenshotOpts }
+          })
           debug('screenshot', { waitUntil, isWhite, duration: timeScreenshot() })
         }
       }
@@ -122,3 +127,6 @@ module.exports = ({ goto, ...gotoOpts }) => {
     }
   }
 }
+
+module.exports.takeScreenshot = takeScreenshot
+module.exports.isWhiteScreenshot = isWhiteScreenshot