browserless 10.7.9-beta.0 → 10.7.9

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.9-beta.0",
+  "version": "10.7.9",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -34,7 +34,7 @@
     "@browserless/errors": "^10.7.1",
     "@browserless/goto": "^10.7.6",
     "@browserless/pdf": "^10.7.6",
-    "@browserless/screenshot": "^10.7.7",
+    "@browserless/screenshot": "^10.7.9",
     "debug-logfmt": "~1.2.3",
     "kill-process-group": "~1.0.11",
     "p-reflect": "~2.1.0",
@@ -64,5 +64,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "112999584d7b7137fb0eab858d31396eaf3c52e8"
+  "gitHead": "a82182ec098073ab2debbf60f5db8c09c177b1c5"
 }

package/src/index.js

@@ -111,12 +111,7 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
       }
     }
 
-    /**
-     * 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 withPage = (fn, { timeout: evaluateTimeout } = {}) => {
       const name = fn.name || 'anonymous'
 
       return async (...args) => {
@@ -127,12 +122,12 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
 
           try {
             page = await createPage(name)
-            setTimeout(() => closePage(page, `${name}:timeout`), timeout).unref()
+            setTimeout(() => closePage(page, name), timeout).unref()
             const value = await fn(page, goto)(...args)
-            if (withClosePage) await closePage(page, `${name}:success`)
+            await closePage(page, `${name}:success`)
             return value
           } catch (error) {
-            if (withClosePage) await closePage(page, `${name}:error`)
+            await closePage(page, `${name}:error`)
             if (!isRejected) throw ensureError(error)
           }
         }
@@ -197,7 +192,7 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
       html: evaluate(page => page.content()),
       page: createPage,
       pdf: withPage(createPdf({ goto })),
-      screenshot: withPage(createScreenshot({ goto }), { closePage: false }),
+      screenshot: withPage(createScreenshot({ goto })),
       text: evaluate(page => page.evaluate(() => document.body.innerText)),
       getDevice: goto.getDevice,
       destroyContext,