fix(goto): pass waitUntil (#420)

* fix(goto): pass waitUntil * perf(screenshot): cache height & width values
microlinkhq · Oct 5, 2022 · 7b0d2c8 · 7b0d2c8
1 parent f0ddebc
commit 7b0d2c8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/packages/goto/src/index.js b/packages/goto/src/index.js
@@ -364,9 +364,11 @@ module.exports = ({
     await Promise.all(prePromises.concat(applyEvasions))
 
     const { value: response, reason: error } = await run({
-      fn: html ? page.setContent(html, args) : page.goto(url, args),
+      fn: html
+        ? page.setContent(html, { waitUntil, ...args })
+        : page.goto(url, { waitUntil, ...args }),
       timeout: gotoTimeout,
-      debug: html ? 'html' : 'url'
+      debug: { fn: html ? 'html' : 'url', waitUntil }
     })
 
     for (const [key, value] of Object.entries({

diff --git a/packages/screenshot/src/index.js b/packages/screenshot/src/index.js
@@ -98,7 +98,7 @@ module.exports = ({ goto, ...gotoOpts }) => {
       screenshot = await page.screenshot({ ...opts, ...screenshotOpts })
       debug('screenshot', { waitUntil, duration: prettyMs(timeScreenshot()) })
     } else {
-      ;({ response } = await goto(page, { ...opts, url, waitUntilAuto }))
+      ;({ response } = await goto(page, { ...opts, url, waitUntil, waitUntilAuto }))
       async function waitUntilAuto (page, { response }) {
         const [screenshotOpts] = await Promise.all([
           waitForElement(page, element),

diff --git a/packages/screenshot/src/is-white-screenshot.js b/packages/screenshot/src/is-white-screenshot.js
@@ -5,9 +5,11 @@ const jimp = require('jimp')
 module.exports = async buffer => {
   const image = await jimp.read(buffer)
   const firstPixel = image.getPixelColor(0, 0)
+  const height = image.getHeight()
+  const width = image.getWidth()
 
-  for (let i = 0; i < image.getHeight(); i++) {
-    for (let j = 0; j < image.getWidth(); j++) {
+  for (let i = 0; i < height; i++) {
+    for (let j = 0; j < width; j++) {
       if (firstPixel !== image.getPixelColor(j, i)) return false
     }
   }