browserless 9.2.6 → 9.2.13

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.2.6",
+  "version": "9.2.13",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -34,7 +34,7 @@
     "@browserless/errors": "^9.1.6",
     "@browserless/goto": "^9.2.6",
     "@browserless/pdf": "^9.2.6",
-    "@browserless/screenshot": "^9.2.6",
+    "@browserless/screenshot": "^9.2.9",
     "debug-logfmt": "~1.0.4",
     "mutexify": "~1.3.1",
     "p-reflect": "~2.1.0",
@@ -62,5 +62,5 @@
     "timeout": "2m",
     "verbose": true
   },
-  "gitHead": "cf796edd7ebc358881e28168d14cffe3b98b4bf1"
+  "gitHead": "5e3fa535f0c90777bce6354a1db6f292881e2562"
 }

package/src/index.js

@@ -16,8 +16,8 @@ const driver = require('./driver')
 
 const lock = mutexify()
 
-module.exports = ({ timeout = 30000, ...launchOpts } = {}) => {
-  const goto = createGoto({ timeout, ...launchOpts })
+module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
+  const goto = createGoto({ timeout: globalTimeout, ...launchOpts })
   const { defaultViewport } = goto
 
   let isClosed = false
@@ -40,7 +40,7 @@ module.exports = ({ timeout = 30000, ...launchOpts } = {}) => {
       handleSIGINT: false,
       handleSIGTERM: false,
       handleSIGHUP: false,
-      timeout,
+      timeout: globalTimeout,
       ...launchOpts
     })
 
@@ -79,7 +79,7 @@ module.exports = ({ timeout = 30000, ...launchOpts } = {}) => {
     return getBrowser()
   }
 
-  const createContext = async ({ retry = 2 } = {}) => {
+  const createContext = async ({ retry = 2, timeout: contextTimeout } = {}) => {
     let contextPromise = createBrowserContext()
 
     contextPromise.then(context => {
@@ -98,12 +98,12 @@ module.exports = ({ timeout = 30000, ...launchOpts } = {}) => {
     }
 
     const closePage = async page => {
-      let info
-      if (page) info = await pReflect(page.close())
-      debug('closePage', { page: !!page, ...info })
+      if (page && !page.isClosed()) {
+        debug('closePage', await pReflect(page.close()))
+      }
     }
 
-    const wrapError = (fn, { timeout: milliseconds = timeout } = {}) => async (...args) => {
+    const wrapError = (fn, { timeout: evaluateTimeout } = {}) => async (...args) => {
       let isRejected = false
 
       async function run () {
@@ -111,12 +111,13 @@ module.exports = ({ timeout = 30000, ...launchOpts } = {}) => {
 
         try {
           page = await createPage(args)
+          setTimeout(() => closePage(page), timeout)
           const value = await fn(page)(...args)
           await closePage(page)
           return value
         } catch (error) {
           await closePage(page)
-          throw ensureError(error)
+          if (!isRejected) throw ensureError(error)
         }
       }
 
@@ -132,9 +133,11 @@ module.exports = ({ timeout = 30000, ...launchOpts } = {}) => {
           }
         })
 
-      return pTimeout(task(), milliseconds, () => {
+      const timeout = evaluateTimeout || contextTimeout || globalTimeout
+
+      return pTimeout(task(), timeout, () => {
         isRejected = true
-        throw browserTimeout({ timeout: milliseconds })
+        throw browserTimeout({ timeout })
       })
     }
 
@@ -147,7 +150,10 @@ module.exports = ({ timeout = 30000, ...launchOpts } = {}) => {
         gotoOpts
       )
 
-    const destroyContext = () => pReflect(contextPromise.then(context => context.close()))
+    const destroyContext = async () => {
+      const context = await contextPromise
+      debug('destroyContext', await pReflect(context.close()))
+    }
 
     return {
       respawn,