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

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.11",
   "main": "src",
   "repository": {
     "directory": "packages/pdf",
@@ -24,8 +24,11 @@
     "screen"
   ],
   "dependencies": {
-    "@browserless/goto": "^10.7.13",
-    "@browserless/screenshot": "^10.8.0-beta.0"
+    "@browserless/goto": "^10.8.0-beta.4",
+    "@browserless/screenshot": "^10.8.0-beta.8",
+    "@kikobeats/time-span": "~1.0.8",
+    "debug-logfmt": "~1.4.0",
+    "pretty-ms": "~7.0.1"
   },
   "engines": {
     "node": ">= 12"
@@ -38,5 +41,5 @@
     "test": "exit 0"
   },
   "license": "MIT",
-  "gitHead": "c94f407b23a2ad309f71069c1a3e4a9b74c09fd5"
+  "gitHead": "cc1bbedae796643bcf394c198afe1c51646c41d0"
 }

package/src/index.js

@@ -1,9 +1,10 @@
 'use strict'
 
-const { takeScreenshot } = require('@browserless/screenshot')
+const timeSpan = require('@kikobeats/time-span')({ format: n => Math.round(n) })
+const { isWhiteScreenshot } = require('@browserless/screenshot')
 const debug = require('debug-logfmt')('browserless:pdf')
+const { setTimeout } = require('node:timers/promises')
 const createGoto = require('@browserless/goto')
-const timeSpan = require('@kikobeats/time-span')({ format: require('pretty-ms') })
 
 const getMargin = unit => {
   if (!unit) return unit
@@ -34,31 +35,38 @@ module.exports = ({ goto, ...gotoOpts } = {}) => {
           scale
         })
 
-      const timePdf = timeSpan()
-
       if (waitUntil !== 'auto') {
         await goto(page, { ...opts, url, waitUntil })
         pdfBuffer = await generatePdf(page)
       } else {
         await goto(page, { ...opts, url, waitUntil, waitUntilAuto })
         async function waitUntilAuto (page) {
+          const timeout = goto.timeouts.action(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
+          const timePdf = timeSpan()
 
-            if (isWhite && retryCount < maxRetries) {
-              retryCount++
-              debug('screenshot:retry', { waitUntil, isWhite, retryCount, maxRetries })
-              await goto.waitUntilAuto(page, { timeout: opts.timeout })
+          do {
+            ++retry
+            const screenshotTime = timeSpan()
+            isWhite = await isWhiteScreenshot(
+              await page.screenshot({
+                ...opts,
+                optimizeForSpeed: true,
+                type: 'jpeg',
+                quality: 30
+              })
+            )
+            debug('screenshot', { waitUntil, isWhite, retry, duration: screenshotTime() })
+            if (retry > 0) {
+              if (retry === 1) await goto.waitUntilAuto(page, { timeout: opts.timeout })
+              else await setTimeout(500)
             }
-          } while (isWhite && retryCount < maxRetries)
+          } while (isWhite && timePdf() < timeout)
 
           pdfBuffer = await generatePdf(page)
-          debug('screenshot', { waitUntil, isWhite, retryCount, duration: timePdf() })
+          debug({ waitUntil, isWhite, retry, timeout, duration: require('pretty-ms')(timePdf()) })
         }
       }