browserless 9.10.2 → 9.11.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.10.2",
+  "version": "9.11.0",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -32,11 +32,12 @@
   ],
   "dependencies": {
     "@browserless/errors": "^9.10.2",
-    "@browserless/goto": "^9.10.2",
-    "@browserless/pdf": "^9.10.2",
-    "@browserless/screenshot": "^9.10.2",
+    "@browserless/goto": "^9.11.0",
+    "@browserless/pdf": "^9.11.0",
+    "@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",
@@ -44,7 +45,7 @@
     "superlock": "~1.0.1"
   },
   "devDependencies": {
-    "@browserless/test": "^9.10.2",
+    "@browserless/test": "^9.11.0",
     "ava": "latest"
   },
   "engines": {
@@ -59,7 +60,7 @@
     "timeout": "30s",
     "workerThreads": false
   },
-  "gitHead": "878aab8fd97879b6ab7729b4d15945a235c3a203",
+  "gitHead": "9e24768346df1dda9df4be065137deb1783c37c3",
   "scripts": {
     "test": "ava"
   }

package/src/index.js

@@ -5,6 +5,7 @@ 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')
@@ -107,46 +108,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)
-          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 } = {}) =>
+      PCancelable.fn(async (...args) => {
+        const onCancel = args.pop()
+        let isRejected = false
+
+        async function run () {
+          let page
+
+          try {
+            page = await createPage(args)
+            const close = () => closePage(page)
+            onCancel(close)
+            setTimeout(close, 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 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(
@@ -172,7 +177,7 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
       browser: getBrowser,
       evaluate,
       goto,
-      html: evaluate(page => page.content(), { animations: true }),
+      html: evaluate(page => page.content()),
       page: createPage,
       pdf: withPage(createPdf({ goto })),
       screenshot: withPage(createScreenshot({ goto })),