browserless 10.7.7 → 10.7.9-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": "10.7.7",
+  "version": "10.7.9-beta.0",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -64,5 +64,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "94347ab5501efdcac49da85f5a670821c37b5173"
+  "gitHead": "112999584d7b7137fb0eab858d31396eaf3c52e8"
 }

package/src/index.js

@@ -79,12 +79,13 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
     const getBrowserContext = () => _contextPromise
 
     const createPage = async name => {
+      const duration = debug.duration('createPage')
       const [browserProcess, browserContext] = await Promise.all([
         getBrowser(),
         getBrowserContext()
       ])
       const page = await browserContext.newPage()
-      debug('createPage', {
+      duration({
         name,
         id: page._client().id(),
         contextId: browserContext.id,
@@ -95,12 +96,13 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
 
     const closePage = async (page, name) => {
       if (page && !page.isClosed()) {
+        const duration = debug.duration('closePage')
         const [browserProcess, browserContext] = await Promise.all([
           getBrowser(),
           getBrowserContext(),
           pReflect(page.close())
         ])
-        debug('closePage', {
+        duration({
           name,
           id: page._client().id(),
           contextId: browserContext.id,
@@ -109,48 +111,55 @@ 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(fn.name)
-              setTimeout(() => closePage(page, fn.name), timeout).unref()
-              const value = await fn(page, goto)(...args)
-              await closePage(page, fn.name)
-              return value
-            } catch (error) {
-              await closePage(page, fn.name)
-              if (!isRejected) throw ensureError(error)
-            }
+    /**
+     * FIXME: Apparently there is a kind of race condition if you have more than one context and you close the page,
+     * the browser context is closed but the browser process is broken
+     * Related: https://github.com/search?q=repo%3Apuppeteer%2Fpuppeteer%20waitForScreenshotOperations&type=code
+     */
+    const withPage = (fn, { closePage: withClosePage = true, timeout: evaluateTimeout } = {}) => {
+      const name = fn.name || 'anonymous'
+
+      return async (...args) => {
+        let isRejected = false
+
+        async function run () {
+          let page
+
+          try {
+            page = await createPage(name)
+            setTimeout(() => closePage(page, `${name}:timeout`), timeout).unref()
+            const value = await fn(page, goto)(...args)
+            if (withClosePage) await closePage(page, `${name}:success`)
+            return value
+          } catch (error) {
+            if (withClosePage) await closePage(page, `${name}:error`)
+            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 || isDestroyedForced) 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 || isDestroyedForced) 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
+        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(
@@ -188,7 +197,7 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
       html: evaluate(page => page.content()),
       page: createPage,
       pdf: withPage(createPdf({ goto })),
-      screenshot: withPage(createScreenshot({ goto })),
+      screenshot: withPage(createScreenshot({ goto }), { closePage: false }),
       text: evaluate(page => page.evaluate(() => document.body.innerText)),
       getDevice: goto.getDevice,
       destroyContext,