Merge pull request #5280 from usu/chore/print-logging

chore(print): improved request logging for nuxt-print
ecamp · Jun 8, 2024 · 9b624fb · 9b624fb
2 parents 3f7bf76 + ca58443
commit 9b624fb
Showing 1 changed file with 30 additions and 20 deletions.
diff --git a/print/server/api/pdf.js b/print/server/api/pdf.js
@@ -13,22 +13,19 @@ import { URL } from 'url'
 import { memoryUsage } from 'process'
 import * as Sentry from '@sentry/node'
 
-let lastTime = null
-function measurePerformance(msg) {
+function measurePerformance(performanceMeasurements, key) {
   const now = performance.now()
   const memory = memoryUsage()
 
-  if (lastTime !== null) {
-    console.log(
-      `(took ${Math.round(now - lastTime)} millisecons / using ${
-        memory.heapUsed / 1000000
-      }MB)`
-    )
-  }
-  lastTime = now
+  const lastTime = performanceMeasurements.lastTime
 
-  console.log('\n')
-  console.log(msg || '')
+  if (lastTime !== null && key !== null) {
+    performanceMeasurements.measurements[key] = {
+      duration: Math.round(now - lastTime),
+      memory: memory.heapUsed / 1000000,
+    }
+  }
+  performanceMeasurements.lastTime = now
 }
 
 export default defineEventHandler(async (event) => {
@@ -42,16 +39,25 @@ export default defineEventHandler(async (event) => {
   } = useRuntimeConfig(event)
 
   let browser = null
+  let status = 200
+  const performanceMeasurements = {
+    lastTime: null,
+    measurements: {},
+  }
+  const logOutput = {
+    timestamp: new Date(),
+  }
 
   try {
-    measurePerformance('Connecting to puppeteer...')
+    measurePerformance(performanceMeasurements)
+
     // Connect to browserless.io (puppeteer websocket)
     browser = await puppeteer.connect({
       browserWSEndpoint: browserWsEndpoint,
     })
     const context = await browser.createIncognitoBrowserContext()
+    measurePerformance(performanceMeasurements, 'puppeteer_connect')
 
-    measurePerformance('Open new page & set cookies...')
     const page = await context.newPage()
     const printUrlObj = new URL(printUrl)
     const requestCookies = parseCookies(event)
@@ -82,6 +88,7 @@ export default defineEventHandler(async (event) => {
       extraHeaders['Authorization'] = `Basic ${basicAuthToken}`
       await page.setExtraHTTPHeaders(extraHeaders)
     }
+    measurePerformance(performanceMeasurements, 'open_page')
 
     /**
      * Debugging puppeteer
@@ -101,20 +108,20 @@ export default defineEventHandler(async (event) => {
     }) */
 
     // set HTML content of current page
-    measurePerformance('Puppeteer load HTML content...')
     page.setUserAgent(
       'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:96.0) Gecko/20100101 Firefox/96.0'
     )
 
     // HTTP request back to Print Nuxt App
     const queryParams = getQuery(event)
+    logOutput.config = queryParams.config
     await page.goto(`${printUrl}/?config=${queryParams.config}`, {
       timeout: renderHtmlTimeoutMs || 30000,
       waitUntil: 'networkidle0',
     })
+    measurePerformance(performanceMeasurements, 'load_content')
 
     // print pdf
-    measurePerformance('Generate PDf...')
     const pdf = await page.pdf({
       printBackground: true,
       format: 'A4',
@@ -130,10 +137,9 @@ export default defineEventHandler(async (event) => {
       },
       timeout: renderPdfTimeoutMs || 30000,
     })
+    measurePerformance(performanceMeasurements, 'generate_pdf')
 
-    measurePerformance()
     browser.disconnect()
-
     defaultContentType(event, 'application/pdf')
     return pdf
   } catch (error) {
@@ -142,7 +148,7 @@ export default defineEventHandler(async (event) => {
     }
 
     let errorMessage = null
-    let status = 500
+    status = 500
     if (error.error) {
       // error is a WebSocket ErrorEvent Object which contains an error property
       errorMessage = error.error.message
@@ -155,10 +161,14 @@ export default defineEventHandler(async (event) => {
     }
 
     captureError(error)
-
+    logOutput.error = errorMessage
     setResponseStatus(event, status)
     defaultContentType(event, 'application/problem+json')
     return { status, title: errorMessage }
+  } finally {
+    logOutput.measurements = performanceMeasurements.measurements
+    logOutput.status = status
+    console.log(logOutput)
   }
 })