chore: associate fn.name with logging (#611)

Author: Kikobeats

packages/browserless/src/index.js

@@ -78,28 +78,30 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
 
     const getBrowserContext = () => _contextPromise
 
-    const createPage = async () => {
+    const createPage = async name => {
       const [browserProcess, browserContext] = await Promise.all([
         getBrowser(),
         getBrowserContext()
       ])
       const page = await browserContext.newPage()
       debug('createPage', {
+        name,
         id: page._client().id(),
         contextId: browserContext.id,
         browserPid: driver.pid(browserProcess)
       })
       return page
     }
 
-    const closePage = async page => {
+    const closePage = async (page, name) => {
       if (page && !page.isClosed()) {
         const [browserProcess, browserContext] = await Promise.all([
           getBrowser(),
           getBrowserContext(),
           pReflect(page.close())
         ])
         debug('closePage', {
+          name,
           id: page._client().id(),
           contextId: browserContext.id,
           browserPid: driver.pid(browserProcess)
@@ -116,13 +118,13 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
             let page
 
             try {
-              page = await createPage(args)
-              setTimeout(() => closePage(page), timeout).unref()
+              page = await createPage(fn.name)
+              setTimeout(() => closePage(page, fn.name), timeout).unref()
               const value = await fn(page, goto)(...args)
-              await closePage(page)
+              await closePage(page, fn.name)
               return value
             } catch (error) {
-              await closePage(page)
+              await closePage(page, fn.name)
               if (!isRejected) throw ensureError(error)
             }
           }
@@ -152,10 +154,17 @@ module.exports = ({ timeout: globalTimeout = 30000, ...launchOpts } = {}) => {
 
     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
       )
 

packages/screenshot/src/index.js

@@ -48,8 +48,8 @@ const waitForElement = async (page, element) => {
 module.exports = ({ goto, ...gotoOpts }) => {
   goto = goto || createGoto(gotoOpts)
 
-  return page =>
-    async (
+  return function screenshot (page) {
+    return async (
       url,
       {
         element,
@@ -120,4 +120,5 @@ module.exports = ({ goto, ...gotoOpts }) => {
         ? screenshot
         : overlay(screenshot, { ...opts, ...overlayOpts, viewport: page.viewport() })
     }
+  }
 }