browserless 9.11.1 → 9.12.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "browserless",
   "description": "The headless Chrome/Chromium performance driver for Node.js",
   "homepage": "https://browserless.js.org",
-  "version": "9.11.1",
+  "version": "9.12.0",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -62,5 +62,5 @@
     "timeout": "30s",
     "workerThreads": false
   },
-  "gitHead": "27c817029945630ccaede934c8a7e9fa5c2800aa"
+  "gitHead": "a996a7bd3f068dbe800001c0399f51ddff8d901d"
 }

package/src/index.js

@@ -107,46 +107,49 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
       }
     }
 
-    const withPage = (fn, { timeout: evaluateTimeout } = {}) => async (...args) => {
-      let isRejected = false
-
-      async function run () {
-        let page
-
-        try {
-          page = await createPage(args)
-          setTimeout(() => closePage(page), timeout).unref()
-          const value = await fn(page)(...args)
-          await closePage(page)
-          return value
-        } catch (error) {
-          await closePage(page)
-          if (!isRejected) throw ensureError(error)
-        }
-      }
-
-      const task = () =>
-        pRetry(run, {
-          retries: retry,
-          onFailedAttempt: async error => {
-            debug('onFailedAttempt', { name: error.name, code: error.code, isRejected })
-            if (error.name === 'AbortError') throw error
-            if (isRejected) throw new AbortError()
-            if (error.code === 'EBRWSRCONTEXTCONNRESET') {
-              _contextPromise = createBrowserContext(contextOpts)
+    const withPage =
+      (fn, { timeout: evaluateTimeout } = {}) =>
+        async (...args) => {
+          let isRejected = false
+
+          async function run () {
+            let page
+
+            try {
+              page = await createPage(args)
+              setTimeout(() => closePage(page), timeout).unref()
+
+              const value = await fn(page, goto)(...args)
+              await closePage(page)
+              return value
+            } catch (error) {
+              await closePage(page)
+              if (!isRejected) throw ensureError(error)
             }
-            const { message, attemptNumber, retriesLeft } = error
-            debug('retry', { attemptNumber, retriesLeft, message })
           }
-        })
-
-      const timeout = evaluateTimeout || contextTimeout || globalTimeout
 
-      return pTimeout(task(), timeout, () => {
-        isRejected = true
-        throw browserTimeout({ timeout })
-      })
-    }
+          const task = () =>
+            pRetry(run, {
+              retries: retry,
+              onFailedAttempt: async error => {
+                debug('onFailedAttempt', { name: error.name, code: error.code, isRejected })
+                if (error.name === 'AbortError') throw error
+                if (isRejected) throw new AbortError()
+                if (error.code === 'EBRWSRCONTEXTCONNRESET') {
+                  _contextPromise = createBrowserContext(contextOpts)
+                }
+                const { message, attemptNumber, retriesLeft } = error
+                debug('retry', { attemptNumber, retriesLeft, message })
+              }
+            })
+
+          const timeout = evaluateTimeout || contextTimeout || globalTimeout
+
+          return pTimeout(task(), timeout, () => {
+            isRejected = true
+            throw browserTimeout({ timeout })
+          })
+        }
 
     const evaluate = (fn, gotoOpts) =>
       withPage(