browserless 9.6.0 → 9.6.3

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.6.0",
+  "version": "9.6.3",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -32,16 +32,16 @@
   ],
   "dependencies": {
     "@browserless/errors": "^9.3.21",
-    "@browserless/goto": "^9.6.0",
-    "@browserless/pdf": "^9.6.0",
-    "@browserless/screenshot": "^9.6.0",
+    "@browserless/goto": "^9.6.2",
+    "@browserless/pdf": "^9.6.2",
+    "@browserless/screenshot": "^9.6.2",
     "debug-logfmt": "~1.0.4",
     "kill-process-group": "~1.0.3",
-    "mutexify": "~1.4.0",
     "p-reflect": "~2.1.0",
     "p-retry": "~4.6.1",
     "p-timeout": "~4.1.0",
-    "require-one-of": "~1.0.16"
+    "require-one-of": "~1.0.16",
+    "superlock": "~1.0.0"
   },
   "devDependencies": {
     "@browserless/test": "latest",
@@ -61,5 +61,5 @@
     "timeout": "2m",
     "verbose": true
   },
-  "gitHead": "ed21c66d61affc17cf23dfb54a1c2071dc08de11"
+  "gitHead": "8dbf4161e851ea9c51341301150c32cf1afaab9c"
 }

package/src/index.js

@@ -5,7 +5,7 @@ const createScreenshot = require('@browserless/screenshot')
 const debug = require('debug-logfmt')('browserless')
 const createGoto = require('@browserless/goto')
 const createPdf = require('@browserless/pdf')
-const mutexify = require('mutexify/promise')
+const { withLock } = require('superlock')
 const pReflect = require('p-reflect')
 const pTimeout = require('p-timeout')
 const pRetry = require('p-retry')
@@ -14,7 +14,7 @@ const { AbortError } = pRetry
 
 const driver = require('./driver')
 
-const lock = mutexify()
+const lock = withLock()
 
 module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
   const goto = createGoto({ timeout: globalTimeout, ...launchOpts })
@@ -58,28 +58,23 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
 
   let browserProcessPromise = spawn()
 
-  const createBrowserContext = () =>
-    getBrowser().then(browser => browser.createIncognitoBrowserContext())
+  const createBrowserContext = contextOpts =>
+    getBrowser().then(browser => browser.createIncognitoBrowserContext(contextOpts))
 
   const getBrowser = async () => {
     if (isClosed) return browserProcessPromise
 
-    const release = await lock()
-    const browserProcess = await browserProcessPromise
-
-    if (browserProcess.isConnected()) {
-      release()
-      return browserProcess
-    }
-
-    await respawn()
-    release()
+    const browserProcess = await lock(async () => {
+      const browserProcess = await browserProcessPromise
+      if (browserProcess.isConnected()) return browserProcess
+      respawn()
+    })
 
-    return getBrowser()
+    return browserProcess || getBrowser()
   }
 
-  const createContext = async ({ retry = 2, timeout: contextTimeout } = {}) => {
-    let _contextPromise = createBrowserContext()
+  const createContext = async ({ retry = 2, timeout: contextTimeout, ...contextOpts } = {}) => {
+    let _contextPromise = createBrowserContext(contextOpts)
 
     const getBrowserContext = () => _contextPromise
 
@@ -87,7 +82,7 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
       const browserProcess = context.browser()
       browserProcess.once('disconnected', async () => {
         await getBrowser()
-        _contextPromise = createBrowserContext()
+        _contextPromise = createBrowserContext(contextOpts)
       })
     })
 
@@ -137,7 +132,9 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
             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()
+            if (error.code === 'EBRWSRCONTEXTCONNRESET') {
+              _contextPromise = createBrowserContext(contextOpts)
+            }
             const { message, attemptNumber, retriesLeft } = error
             debug('retry', { attemptNumber, retriesLeft, message })
           }