browserless 9.11.1-4 → 9.11.2-beta.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-4",
+  "version": "9.11.2-beta.0",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -37,7 +37,6 @@
     "@browserless/screenshot": "^9.11.0",
     "debug-logfmt": "~1.0.4",
     "kill-process-group": "~1.0.3",
-    "p-cancelable": "2.1.1",
     "p-reflect": "~2.1.0",
     "p-retry": "~4.6.1",
     "p-timeout": "~4.1.0",

package/src/index.js

@@ -5,7 +5,6 @@ const createScreenshot = require('@browserless/screenshot')
 const debug = require('debug-logfmt')('browserless')
 const createGoto = require('@browserless/goto')
 const createPdf = require('@browserless/pdf')
-const PCancelable = require('p-cancelable')
 const { withLock } = require('superlock')
 const pReflect = require('p-reflect')
 const pTimeout = require('p-timeout')
@@ -108,47 +107,49 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
       }
     }
 
-    const withPage = (fn, { timeout: evaluateTimeout } = {}) =>
-      PCancelable.fn(async (...args) => {
-        const onCancel = args.pop()
-        let isRejected = false
-
-        async function run () {
-          let page
-          try {
-            page = await createPage(args)
-            onCancel(() => closePage(page))
-            const value = await fn(page)(...args)
-            await closePage(page)
-            return value
-          } catch (error) {
-            await closePage(page)
-            if (!isRejected) throw ensureError(error)
+    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 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 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 { message, attemptNumber, retriesLeft } = error
-              debug('retry', { attemptNumber, retriesLeft, message })
-            }
-          })
+            })
 
-        const timeout = evaluateTimeout || contextTimeout || globalTimeout
+          const timeout = evaluateTimeout || contextTimeout || globalTimeout
 
-        return pTimeout(task(), timeout, () => {
-          isRejected = true
-          throw browserTimeout({ timeout })
-        })
-      })
+          return pTimeout(task(), timeout, () => {
+            isRejected = true
+            throw browserTimeout({ timeout })
+          })
+        }
 
     const evaluate = (fn, gotoOpts) =>
       withPage(