browserless 9.12.0 → 9.12.2-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.12.0",
+  "version": "9.12.2-0",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -32,9 +32,9 @@
   ],
   "dependencies": {
     "@browserless/errors": "^9.10.2",
-    "@browserless/goto": "^9.11.0",
-    "@browserless/pdf": "^9.11.0",
-    "@browserless/screenshot": "^9.11.0",
+    "@browserless/goto": "^9.12.1",
+    "@browserless/pdf": "^9.12.1",
+    "@browserless/screenshot": "^9.12.1",
     "debug-logfmt": "~1.0.4",
     "kill-process-group": "~1.0.3",
     "p-reflect": "~2.1.0",
@@ -44,6 +44,7 @@
     "superlock": "~1.0.1"
   },
   "devDependencies": {
+    "ps-list": "7",
     "@browserless/test": "^9.11.0",
     "ava": "latest"
   },
@@ -53,14 +54,13 @@
   "files": [
     "src"
   ],
-  "scripts": {
-    "test": "ava"
-  },
   "license": "MIT",
   "ava": {
     "serial": true,
     "timeout": "30s",
     "workerThreads": false
   },
-  "gitHead": "a996a7bd3f068dbe800001c0399f51ddff8d901d"
-}
+  "scripts": {
+    "test": "ava"
+  }
+}

package/src/index.js

@@ -24,7 +24,9 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
 
   const close = opts => {
     isClosed = true
-    return browserProcessPromise.then(browserProcess => driver.close(browserProcess, opts))
+    return browserProcessPromise
+      .then(browserProcess => driver.close(browserProcess, opts))
+      .catch(() => {})
   }
 
   const respawn = () =>
@@ -107,53 +109,50 @@ 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 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 value = await fn(page, goto)(...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 { message, attemptNumber, retriesLeft } = error
+            debug('retry', { attemptNumber, retriesLeft, message })
           }
+        })
 
-          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 timeout = evaluateTimeout || contextTimeout || globalTimeout
+
+      return pTimeout(task(), timeout, () => {
+        isRejected = true
+        throw browserTimeout({ timeout })
+      })
+    }
 
     const evaluate = (fn, gotoOpts) =>
       withPage(
-        page => async (url, opts) => {
+        (page, goto) => async (url, opts) => {
           const { response, error } = await goto(page, { url, ...gotoOpts, ...opts })
           return fn(page, response, error)
         },