@browserless/pdf 10.8.0-beta.9 → 10.8.0

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.9",
+  "version": "10.8.0",
   "main": "src",
   "repository": {
     "directory": "packages/pdf",
@@ -24,8 +24,8 @@
     "screen"
   ],
   "dependencies": {
-    "@browserless/goto": "^10.8.0-beta.4",
-    "@browserless/screenshot": "^10.8.0-beta.8",
+    "@browserless/goto": "^10.8.0",
+    "@browserless/screenshot": "^10.8.0",
     "@kikobeats/time-span": "~1.0.8",
     "debug-logfmt": "~1.4.0",
     "pretty-ms": "~7.0.1"
@@ -36,10 +36,9 @@
   "files": [
     "src"
   ],
+  "license": "MIT",
   "scripts": {
     "coverage": "exit 0",
     "test": "exit 0"
-  },
-  "license": "MIT",
-  "gitHead": "2f08bb034d09fe09159427ea139f6487e31a4c40"
-}
+  }
+}

package/src/index.js

@@ -3,7 +3,6 @@
 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 getMargin = unit => {
@@ -41,7 +40,7 @@ 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))
+          const timeout = goto.timeouts.action(opts.timeout)
           let isWhite = false
           let retry = -1
 
@@ -50,16 +49,22 @@ module.exports = ({ goto, ...gotoOpts } = {}) => {
           do {
             ++retry
             const screenshotTime = timeSpan()
-            isWhite = await isWhiteScreenshot(await page.screenshot(opts))
-            debug('screenshot', { waitUntil, isWhite, retry, timeout, duration: screenshotTime() })
-            if (retry > 0) {
-              if (retry === 1) await goto.waitUntilAuto(page, { timeout: opts.timeout })
-              else await setTimeout(500)
-            }
+            ;[isWhite, pdfBuffer] = await Promise.all([
+              isWhiteScreenshot(
+                await page.screenshot({
+                  ...opts,
+                  optimizeForSpeed: true,
+                  type: 'jpeg',
+                  quality: 30
+                })
+              ),
+              generatePdf(page),
+              retry === 1 ? goto.waitUntilAuto(page, { timeout: opts.timeout }) : Promise.resolve()
+            ])
+            debug('retry', { waitUntil, isWhite, retry, duration: screenshotTime() })
           } while (isWhite && timePdf() < timeout)
 
-          pdfBuffer = await generatePdf(page)
-          debug({ waitUntil, isWhite, retry, timeout, duration: require('pretty-ms')(timePdf()) })
+          debug({ waitUntil, isWhite, timeout, duration: require('pretty-ms')(timePdf()) })
         }
       }