@browserless/pdf 10.8.0-beta.5 → 10.8.0-beta.7
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.
- package/package.json +6 -3
- package/src/index.js +7 -6
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.
|
|
5
|
+
"version": "10.8.0-beta.7",
|
|
6
6
|
"main": "src",
|
|
7
7
|
"repository": {
|
|
8
8
|
"directory": "packages/pdf",
|
|
@@ -25,7 +25,10 @@
|
|
|
25
25
|
],
|
|
26
26
|
"dependencies": {
|
|
27
27
|
"@browserless/goto": "^10.8.0-beta.4",
|
|
28
|
-
"@browserless/screenshot": "^10.8.0-beta.4"
|
|
28
|
+
"@browserless/screenshot": "^10.8.0-beta.4",
|
|
29
|
+
"@kikobeats/time-span": "~1.0.8",
|
|
30
|
+
"debug-logfmt": "~1.4.0",
|
|
31
|
+
"pretty-ms": "~7.0.1"
|
|
29
32
|
},
|
|
30
33
|
"engines": {
|
|
31
34
|
"node": ">= 12"
|
|
@@ -38,5 +41,5 @@
|
|
|
38
41
|
"test": "exit 0"
|
|
39
42
|
},
|
|
40
43
|
"license": "MIT",
|
|
41
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "7f8cb48198387b737f23747496db873f5dd7e532"
|
|
42
45
|
}
|
package/src/index.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
const { isWhiteScreenshot } = require('@browserless/screenshot')
|
|
4
4
|
const debug = require('debug-logfmt')('browserless:pdf')
|
|
5
5
|
const createGoto = require('@browserless/goto')
|
|
6
|
-
const timeSpan = require('@kikobeats/time-span')({ format:
|
|
6
|
+
const timeSpan = require('@kikobeats/time-span')({ format: n => Math.round(n) })
|
|
7
7
|
const { setTimeout } = require('node:timers/promises')
|
|
8
8
|
|
|
9
9
|
const getMargin = unit => {
|
|
@@ -35,8 +35,6 @@ module.exports = ({ goto, ...gotoOpts } = {}) => {
|
|
|
35
35
|
scale
|
|
36
36
|
})
|
|
37
37
|
|
|
38
|
-
const timePdf = timeSpan()
|
|
39
|
-
|
|
40
38
|
if (waitUntil !== 'auto') {
|
|
41
39
|
await goto(page, { ...opts, url, waitUntil })
|
|
42
40
|
pdfBuffer = await generatePdf(page)
|
|
@@ -47,18 +45,21 @@ module.exports = ({ goto, ...gotoOpts } = {}) => {
|
|
|
47
45
|
let isWhite = false
|
|
48
46
|
let retry = -1
|
|
49
47
|
|
|
48
|
+
const timePdf = timeSpan()
|
|
49
|
+
|
|
50
50
|
do {
|
|
51
|
+
++retry
|
|
51
52
|
const screenshotTime = timeSpan()
|
|
52
53
|
isWhite = await isWhiteScreenshot(await page.screenshot(opts))
|
|
53
54
|
debug('screenshot', { waitUntil, isWhite, retry, timeout, duration: screenshotTime() })
|
|
54
|
-
if (
|
|
55
|
+
if (retry > 0) {
|
|
55
56
|
if (retry === 1) await goto.waitUntilAuto(page, { timeout: opts.timeout })
|
|
56
|
-
else await setTimeout(
|
|
57
|
+
else await setTimeout(50)
|
|
57
58
|
}
|
|
58
59
|
} while (isWhite && timePdf() < timeout)
|
|
59
60
|
|
|
60
61
|
pdfBuffer = await generatePdf(page)
|
|
61
|
-
debug({ waitUntil, isWhite, retry, duration: timePdf() })
|
|
62
|
+
debug({ waitUntil, isWhite, retry, duration: require('pretty-ms')(timePdf()) })
|
|
62
63
|
}
|
|
63
64
|
}
|
|
64
65
|
|