@browserless/screenshot 10.8.0-beta.0 → 10.8.0-beta.16
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 +3 -3
- package/src/index.js +12 -17
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@browserless/screenshot",
|
|
3
3
|
"description": "Take a clean screenshot of any website",
|
|
4
4
|
"homepage": "https://browserless.js.org/#/?id=screenshoturl-options",
|
|
5
|
-
"version": "10.8.0-beta.
|
|
5
|
+
"version": "10.8.0-beta.16",
|
|
6
6
|
"main": "src/index.js",
|
|
7
7
|
"author": {
|
|
8
8
|
"email": "hello@microlink.io",
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"screenshot"
|
|
29
29
|
],
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@browserless/goto": "^10.
|
|
31
|
+
"@browserless/goto": "^10.8.0-beta.16",
|
|
32
32
|
"@kikobeats/time-span": "~1.0.8",
|
|
33
33
|
"debug-logfmt": "~1.4.0",
|
|
34
34
|
"got": "~11.8.6",
|
|
@@ -66,5 +66,5 @@
|
|
|
66
66
|
"timeout": "2m",
|
|
67
67
|
"workerThreads": false
|
|
68
68
|
},
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "99489d79d64e80161ee16a1571be5420727de1a5"
|
|
70
70
|
}
|
package/src/index.js
CHANGED
|
@@ -14,17 +14,6 @@ const getBoundingClientRect = element => {
|
|
|
14
14
|
return { top, left, height, width, x, y }
|
|
15
15
|
}
|
|
16
16
|
|
|
17
|
-
const takeScreenshot = async ({ page, goto, opts }) => {
|
|
18
|
-
let screenshot
|
|
19
|
-
screenshot = await page.screenshot(opts)
|
|
20
|
-
const isWhite = await isWhiteScreenshot(screenshot)
|
|
21
|
-
if (isWhite) {
|
|
22
|
-
await goto.waitUntilAuto(page, opts)
|
|
23
|
-
screenshot = await page.screenshot(opts)
|
|
24
|
-
}
|
|
25
|
-
return { isWhite }
|
|
26
|
-
}
|
|
27
|
-
|
|
28
17
|
const waitForImagesOnViewport = page =>
|
|
29
18
|
page.$$eval('img[src]:not([aria-hidden="true"])', elements =>
|
|
30
19
|
Promise.all(
|
|
@@ -93,6 +82,16 @@ module.exports = ({ goto, ...gotoOpts }) => {
|
|
|
93
82
|
)
|
|
94
83
|
}
|
|
95
84
|
|
|
85
|
+
const takeScreenshot = async opts => {
|
|
86
|
+
screenshot = await page.screenshot(opts)
|
|
87
|
+
const isWhite = await isWhiteScreenshot(screenshot)
|
|
88
|
+
if (isWhite) {
|
|
89
|
+
await goto.waitUntilAuto(page, opts)
|
|
90
|
+
screenshot = await page.screenshot(opts)
|
|
91
|
+
}
|
|
92
|
+
return { isWhite }
|
|
93
|
+
}
|
|
94
|
+
|
|
96
95
|
page.on('dialog', dialog => pReflect(dialog.dismiss()))
|
|
97
96
|
|
|
98
97
|
const timeScreenshot = timeSpan()
|
|
@@ -112,11 +111,7 @@ module.exports = ({ goto, ...gotoOpts }) => {
|
|
|
112
111
|
waitForElement(page, element),
|
|
113
112
|
beforeScreenshot(response)
|
|
114
113
|
])
|
|
115
|
-
const { isWhite } = await takeScreenshot({
|
|
116
|
-
page,
|
|
117
|
-
goto,
|
|
118
|
-
opts: { ...opts, ...screenshotOpts }
|
|
119
|
-
})
|
|
114
|
+
const { isWhite } = await takeScreenshot({ ...opts, ...screenshotOpts })
|
|
120
115
|
debug('screenshot', { waitUntil, isWhite, duration: timeScreenshot() })
|
|
121
116
|
}
|
|
122
117
|
}
|
|
@@ -128,4 +123,4 @@ module.exports = ({ goto, ...gotoOpts }) => {
|
|
|
128
123
|
}
|
|
129
124
|
}
|
|
130
125
|
|
|
131
|
-
module.exports.
|
|
126
|
+
module.exports.isWhiteScreenshot = isWhiteScreenshot
|