@browserless/pdf 10.8.0-beta.0 → 10.8.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +2 -2
  2. package/src/index.js +18 -2
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@browserless/pdf",
3
3
  "description": "Sensible good defaults for exporting a website as PDF",
4
4
  "homepage": "https://browserless.js.org/#/?id=pdfurl-options",
5
- "version": "10.8.0-beta.0",
5
+ "version": "10.8.0-beta.2",
6
6
  "main": "src",
7
7
  "repository": {
8
8
  "directory": "packages/pdf",
@@ -38,5 +38,5 @@
38
38
  "test": "exit 0"
39
39
  },
40
40
  "license": "MIT",
41
- "gitHead": "e7c845edfd2552f48b8f6f3b70d887ec497955b0"
41
+ "gitHead": "7f293ddfa791439d087ce5ee3d87eca4d1abb08c"
42
42
  }
package/src/index.js CHANGED
@@ -4,6 +4,7 @@ const { takeScreenshot } = require('@browserless/screenshot')
4
4
  const debug = require('debug-logfmt')('browserless:pdf')
5
5
  const createGoto = require('@browserless/goto')
6
6
  const timeSpan = require('@kikobeats/time-span')({ format: require('pretty-ms') })
7
+ const { setTimeout } = require('node:timers/promises')
7
8
 
8
9
  const getMargin = unit => {
9
10
  if (!unit) return unit
@@ -42,9 +43,24 @@ module.exports = ({ goto, ...gotoOpts } = {}) => {
42
43
  } else {
43
44
  await goto(page, { ...opts, url, waitUntil, waitUntilAuto })
44
45
  async function waitUntilAuto (page) {
45
- const { isWhite } = await takeScreenshot({ page, goto, opts })
46
+ let isWhite = false
47
+ let retryCount = 0
48
+ const maxRetries = 3
49
+
50
+ do {
51
+ const screenshotResult = await takeScreenshot({ page, goto, opts })
52
+ isWhite = screenshotResult.isWhite
53
+
54
+ if (isWhite && retryCount < maxRetries) {
55
+ retryCount++
56
+ debug('screenshot:retry', { waitUntil, isWhite, retryCount, maxRetries })
57
+ await setTimeout(500)
58
+ await goto.waitUntilAuto(page, { timeout: opts.timeout })
59
+ }
60
+ } while (isWhite && retryCount < maxRetries)
61
+
46
62
  pdfBuffer = await generatePdf(page)
47
- debug('screenshot', { waitUntil, isWhite, duration: timePdf() })
63
+ debug('screenshot', { waitUntil, isWhite, retryCount, duration: timePdf() })
48
64
  }
49
65
  }
50
66