browserless 10.7.6 → 10.7.8

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.6",
+  "version": "10.7.8",
   "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.6",
+    "@browserless/screenshot": "^10.7.7",
     "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": "c13e129a1a20b78a0391aedc349dad90136adb6e"
+  "gitHead": "d253216077d72daa09942484dba75f3cfe365a08"
 }

package/src/index.js

@@ -78,13 +78,15 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
 
     const getBrowserContext = () => _contextPromise
 
-    const createPage = async () => {
+    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,
         browserPid: driver.pid(browserProcess)
@@ -92,14 +94,16 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
       return page
     }
 
-    const closePage = async page => {
+    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,
           browserPid: driver.pid(browserProcess)
@@ -107,55 +111,64 @@ 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).unref()
-              const value = await fn(page, goto)(...args)
-              await closePage(page)
-              return value
-            } catch (error) {
-              await closePage(page)
-              if (!isRejected) throw ensureError(error)
-            }
+    const withPage = (fn, { 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).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)
           }
+        }
 
-          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(
-        (page, goto) => async (url, opts) => {
-          const { response, error } = await goto(page, { url, ...gotoOpts, ...opts })
-          return fn(page, response, error)
-        },
+        Object.defineProperty(
+          (page, goto) => async (url, opts) => {
+            const { response, error } = await goto(page, { url, ...gotoOpts, ...opts })
+            return fn(page, response, error)
+          },
+          'name',
+          {
+            value: fn.name || 'evaluate',
+            writable: false
+          }
+        ),
         gotoOpts
       )