browserless 10.10.0 → 10.10.2

package/package.json

@@ -2,7 +2,7 @@
   "name": "browserless",
   "description": "The headless Chrome/Chromium driver on top of Puppeteer. Take screenshots, generate PDFs, extract text and HTML with a production-ready API.",
   "homepage": "https://browserless.js.org",
-  "version": "10.10.0",
+  "version": "10.10.2",
   "main": "src/index.js",
   "author": {
     "email": "hello@microlink.io",
@@ -34,10 +34,10 @@
     "javascript"
   ],
   "dependencies": {
-    "@browserless/errors": "^10.9.18",
-    "@browserless/goto": "^10.10.0",
-    "@browserless/pdf": "^10.10.0",
-    "@browserless/screenshot": "^10.10.0",
+    "@browserless/errors": "^10.10.1",
+    "@browserless/goto": "^10.10.2",
+    "@browserless/pdf": "^10.10.2",
+    "@browserless/screenshot": "^10.10.2",
     "debug-logfmt": "~1.4.7",
     "kill-process-group": "~1.0.13",
     "p-reflect": "~2.1.0",
@@ -67,5 +67,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "9b80e677418f2defb804d39043680fe65e3e277b"
+  "gitHead": "ec6a614923a1a692bd717ecc8e6f1b09417801d9"
 }

package/src/driver.js

@@ -71,16 +71,27 @@ const getPid = subprocess => {
 
 const close = async (subprocess, { signal = 'SIGKILL', ...debugOpts } = {}) => {
   const pid = getPid(subprocess)
-  if (pid === undefined) return
+  const hasDisconnect = subprocess && typeof subprocess.disconnect === 'function'
+  const hasClose = subprocess && typeof subprocess.close === 'function'
+
+  if (pid === undefined && !hasDisconnect && !hasClose) return
 
   // It's necessary to call `browser.close` for removing temporal files associated
   // and remove listeners attached to the main process; check
   // - https://github.com/puppeteer/puppeteer/blob/778ac92469d66c542c3c12fe0aa23703dd6315c2/src/node/BrowserRunner.ts#L146
   // - https://github.com/puppeteer/puppeteer/blob/69d85e874416d62de6e821bef30e5cebcfd42f15/src/node/BrowserRunner.ts#L189
-  await pReflect('close' in subprocess ? subprocess.close() : killProcessGroup(subprocess, signal))
+  await pReflect(
+    pid === undefined
+      ? hasDisconnect
+        ? subprocess.disconnect()
+        : subprocess.close()
+      : hasClose
+        ? subprocess.close()
+        : killProcessGroup(subprocess, signal)
+  )
 
   debug('close', { pid, signal, ...debugOpts })
-  return { pid }
+  return pid === undefined ? {} : { pid }
 }
 
 module.exports = { spawn, pid: getPid, close, defaultArgs }

package/src/index.js

@@ -14,9 +14,8 @@ const { AbortError } = pRetry
 
 const driver = require('./driver')
 
-const lock = withLock()
-
 module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
+  const lock = withLock()
   const goto = createGoto({ timeout: globalTimeout, ...launchOpts })
   const { defaultViewport } = goto
 
@@ -75,22 +74,22 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
   const createContext = async ({ retry = 2, timeout: contextTimeout, ...contextOpts } = {}) => {
     let _contextPromise = createBrowserContext(contextOpts)
     let isDestroyedForced = false
+    const pageMetadata = new WeakMap()
 
     const getBrowserContext = () => _contextPromise
 
     const createPage = async name => {
       const duration = debug.duration('createPage')
-      const [browserProcess, browserContext] = await Promise.all([
-        getBrowser(),
-        getBrowserContext()
-      ])
+      const browserContext = await getBrowserContext()
       const page = await browserContext.newPage()
-      duration({
-        name,
+      const browser = typeof page.browser === 'function' ? page.browser() : undefined
+      const metadata = {
         id: page._client().id(),
         contextId: browserContext.id,
-        browserPid: driver.pid(browserProcess)
-      })
+        browserPid: browser ? driver.pid(browser) : undefined
+      }
+      pageMetadata.set(page, metadata)
+      duration({ name, ...metadata })
       return page
     }
 
@@ -98,17 +97,9 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
       if (page && !page.isClosed()) {
         const duration = debug.duration('closePage')
         if (page.disableAdblock) page.disableAdblock()
-        const [browserProcess, browserContext] = await Promise.all([
-          getBrowser(),
-          getBrowserContext(),
-          pReflect(page.close())
-        ])
-        duration({
-          name,
-          id: page._client().id(),
-          contextId: browserContext.id,
-          browserPid: driver.pid(browserProcess)
-        })
+        await pReflect(page.close())
+        duration({ name, ...(pageMetadata.get(page) || {}) })
+        pageMetadata.delete(page)
       }
     }
 
@@ -120,16 +111,25 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
 
         async function run () {
           let page
+          let closePageTimeout
 
           try {
             page = await createPage(name)
-            setTimeout(() => closePage(page, name), timeout).unref()
+            closePageTimeout = setTimeout(() => {
+              closePage(page, name).catch(error => {
+                const { message, code, name } = ensureError(error)
+                debug('closePage:timeout:error', { message, code, name })
+              })
+            }, timeout)
+            if (typeof closePageTimeout.unref === 'function') closePageTimeout.unref()
             const value = await fn(page, goto)(...args)
             await closePage(page, `${name}:success`)
             return value
           } catch (error) {
             await closePage(page, `${name}:error`)
             if (!isRejected) throw ensureError(error)
+          } finally {
+            if (closePageTimeout) clearTimeout(closePageTimeout)
           }
         }
 
@@ -140,9 +140,9 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
               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 isRetryable = error.code === 'EBRWSRCONTEXTCONNRESET'
+              if (!isRetryable) throw error
+              _contextPromise = createBrowserContext(contextOpts)
               const { message, attemptNumber, retriesLeft } = error
               debug('retry', { attemptNumber, retriesLeft, message })
             }