@browserless/pdf 10.8.0-beta.1 → 10.8.0-beta.3

package/package.json

@@ -2,7 +2,7 @@
   "name": "@browserless/pdf",
   "description": "Sensible good defaults for exporting a website as PDF",
   "homepage": "https://browserless.js.org/#/?id=pdfurl-options",
-  "version": "10.8.0-beta.1",
+  "version": "10.8.0-beta.3",
   "main": "src",
   "repository": {
     "directory": "packages/pdf",
@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "@browserless/goto": "^10.7.13",
-    "@browserless/screenshot": "^10.8.0-beta.0"
+    "@browserless/screenshot": "^10.8.0-beta.3"
   },
   "engines": {
     "node": ">= 12"
@@ -38,5 +38,5 @@
     "test": "exit 0"
   },
   "license": "MIT",
-  "gitHead": "c94f407b23a2ad309f71069c1a3e4a9b74c09fd5"
+  "gitHead": "99ff22f6be1b8dfd3b5ebeeef36cc38ef583b6fb"
 }

package/src/index.js

@@ -1,9 +1,10 @@
 'use strict'
 
-const { takeScreenshot } = require('@browserless/screenshot')
+const { isWhiteScreenshot } = require('@browserless/screenshot')
 const debug = require('debug-logfmt')('browserless:pdf')
 const createGoto = require('@browserless/goto')
 const timeSpan = require('@kikobeats/time-span')({ format: require('pretty-ms') })
+const { setTimeout } = require('node:timers/promises')
 
 const getMargin = unit => {
   if (!unit) return unit
@@ -42,23 +43,22 @@ module.exports = ({ goto, ...gotoOpts } = {}) => {
       } else {
         await goto(page, { ...opts, url, waitUntil, waitUntilAuto })
         async function waitUntilAuto (page) {
+          const timeout = goto.timeouts.action(goto.timeouts.base(opts.timeout))
           let isWhite = false
-          let retryCount = 0
-          const maxRetries = 3
+          let retry = -1
 
           do {
-            const screenshotResult = await takeScreenshot({ page, goto, opts })
-            isWhite = screenshotResult.isWhite
-
-            if (isWhite && retryCount < maxRetries) {
-              retryCount++
-              debug('screenshot:retry', { waitUntil, isWhite, retryCount, maxRetries })
+            const screenshotTime = timeSpan()
+            isWhite = await isWhiteScreenshot(await page.screenshot(opts))
+            debug('screenshot', { waitUntil, isWhite, retry, duration: screenshotTime() })
+            if (++retry > 0) {
+              await setTimeout(100)
               await goto.waitUntilAuto(page, { timeout: opts.timeout })
             }
-          } while (isWhite && retryCount < maxRetries)
+          } while (isWhite && timePdf() < timeout)
 
           pdfBuffer = await generatePdf(page)
-          debug('screenshot', { waitUntil, isWhite, retryCount, duration: timePdf() })
+          debug({ waitUntil, isWhite, retry, duration: timePdf() })
         }
       }