azify-logger 1.0.33 → 1.0.34

package/middleware-express.js

@@ -297,6 +297,15 @@ function createExpressLoggingMiddleware(options = {}) {
           timestamp: Date.now(),
           hostname
         }
+        
+        if (config.captureRequestBody && req.body !== undefined && req.body != null) {
+          const serializedBody = safeSerializeBody(req.body)
+          if (typeof serializedBody === 'string') {
+            meta.requestBody = serializedBody
+          } else {
+            meta.requestBody = JSON.stringify(serializedBody)
+          }
+        }
         if (serviceObj) meta.service = serviceObj
         if (config.environment) meta.environment = config.environment
         

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azify-logger",
-  "version": "1.0.33",
+  "version": "1.0.34",
   "description": "Azify Logger Client - Centralized logging for OpenSearch",
   "main": "index.js",
   "types": "index.d.ts",

package/register.js

@@ -899,82 +899,49 @@ try {
               }
             }
             
-            markSource(requestMeta, 'http-client')
-            const hasTraceHeaders = !!(requestMeta.traceId && requestMeta.spanId)
-            const shouldLogRequest =
-              HTTP_CLIENT_MODE === 'all' ||
-              hasTraceHeaders
-
-            if (shouldLogRequest) {
-              if (hasTraceHeaders) {
-                const metaCopy = { ...requestMeta }
-                if (metaCopy.requestBody != null && typeof metaCopy.requestBody !== 'string') {
-                  try {
-                    metaCopy.requestBody = JSON.stringify(metaCopy.requestBody)
-                  } catch (_) {
-                    metaCopy.requestBody = String(metaCopy.requestBody)
-                  }
-                }
-                const payload = {
-                  level: 'info',
-                  message: `[REQUEST] ${method} ${url}`,
-                  meta: {
-                    ...metaCopy,
-                    service: {
-                      name: serviceName,
-                      version: '1.0.0'
-                    },
-                    environment,
-                    timestamp: new Date().toISOString(),
-                    hostname: os.hostname()
-                  }
-                }
-                transport.enqueue(payload, {
-                  'content-type': 'application/json'
-                })
-              } else {
-                sendOutboundLog('info', `[REQUEST] ${method} ${url}`, requestMeta)
-              }
-            }
-            
-            return originalFetch(input, init)
+            request = ensureRequest(input, init)
           }
 
           markSource(requestMeta, 'http-client')
           const hasTraceHeaders = !!(requestMeta.traceId && requestMeta.spanId)
           const shouldLogRequest =
             HTTP_CLIENT_MODE === 'all' ||
+            HTTP_CLIENT_MODE === 'errors' ||
             hasTraceHeaders
+          
+          let requestWasLogged = false
 
           if (shouldLogRequest) {
-            if (hasTraceHeaders) {
-              const metaCopy = { ...requestMeta }
-              if (metaCopy.requestBody != null && typeof metaCopy.requestBody !== 'string') {
-                try {
-                  metaCopy.requestBody = JSON.stringify(metaCopy.requestBody)
-                } catch (_) {
-                  metaCopy.requestBody = String(metaCopy.requestBody)
-                }
+            const metaCopy = { ...requestMeta }
+            if (metaCopy.requestBody != null && typeof metaCopy.requestBody !== 'string') {
+              try {
+                metaCopy.requestBody = JSON.stringify(metaCopy.requestBody)
+              } catch (_) {
+                metaCopy.requestBody = String(metaCopy.requestBody)
               }
-              const payload = {
-                level: 'info',
-                message: `[REQUEST] ${method} ${url}`,
-                meta: {
-                  ...metaCopy,
-                  service: {
-                    name: serviceName,
-                    version: '1.0.0'
-                  },
-                  environment,
-                  timestamp: new Date().toISOString(),
-                  hostname: os.hostname()
-                }
+            }
+            const payload = {
+              level: 'info',
+              message: `[REQUEST] ${method} ${url}`,
+              meta: {
+                ...metaCopy,
+                service: {
+                  name: serviceName,
+                  version: '1.0.0'
+                },
+                environment,
+                timestamp: new Date().toISOString(),
+                hostname: os.hostname()
               }
+            }
+            try {
               transport.enqueue(payload, {
                 'content-type': 'application/json'
               })
-            } else {
+              requestWasLogged = true
+            } catch (enqueueErr) {
               sendOutboundLog('info', `[REQUEST] ${method} ${url}`, requestMeta)
+              requestWasLogged = true
             }
           }
 
@@ -994,34 +961,32 @@ try {
 
             const duration = Number((performance.now() - start).toFixed(2))
             const hasTraceHeaders = !!(requestMeta.traceId && requestMeta.spanId)
+            const wasRequestLogged = requestWasLogged || HTTP_CLIENT_MODE === 'all' || HTTP_CLIENT_MODE === 'errors' || hasTraceHeaders
             const shouldLogResponse =
               HTTP_CLIENT_MODE === 'all' ||
-              (HTTP_CLIENT_MODE === 'errors' && response.status >= 400) ||
-              hasTraceHeaders
+              (HTTP_CLIENT_MODE === 'errors' && (response.status >= 400 || wasRequestLogged)) ||
+              hasTraceHeaders ||
+              requestWasLogged
+
+            let responseCloneForLogging = null
+            if (shouldLogResponse) {
+              try {
+                responseCloneForLogging = response.clone()
+              } catch (cloneError) {
+                responseCloneForLogging = null
+              }
+            }
 
             if (shouldLogResponse) {
               const logResponse = async () => {
                 let responseBody = null
                 const contentType = response.headers.get('content-type') || ''
                 
-                try {
-                  const clonedResponse = response.clone()
-                  if (contentType.includes('application/json') || contentType.includes('text/')) {
-                    const bodyText = await clonedResponse.text()
-                    if (contentType.includes('application/json')) {
-                      try {
-                        responseBody = JSON.parse(bodyText)
-                      } catch (_) {
-                        responseBody = bodyText
-                      }
-                    } else {
-                      responseBody = bodyText
-                    }
-                  }
-                } catch (cloneError) {
+                if (responseCloneForLogging) {
                   try {
+                    const clonedResponse = responseCloneForLogging
                     if (contentType.includes('application/json') || contentType.includes('text/')) {
-                      const bodyText = await response.text()
+                      const bodyText = await clonedResponse.text()
                       if (contentType.includes('application/json')) {
                         try {
                           responseBody = JSON.parse(bodyText)
@@ -1032,9 +997,26 @@ try {
                         responseBody = bodyText
                       }
                     }
-                  } catch (_) {
-                    responseBody = null
+                  } catch (cloneError) {
+                    try {
+                      if (contentType.includes('application/json') || contentType.includes('text/')) {
+                        const bodyText = await response.text()
+                        if (contentType.includes('application/json')) {
+                          try {
+                            responseBody = JSON.parse(bodyText)
+                          } catch (_) {
+                            responseBody = bodyText
+                          }
+                        } else {
+                          responseBody = bodyText
+                        }
+                      }
+                    } catch (_) {
+                      responseBody = null
+                    }
                   }
+                } else {
+                  responseBody = null
                 }
 
                 try {
@@ -1050,7 +1032,37 @@ try {
                   const message = `[RESPONSE] ${method} ${url} ${response.status} ${duration}ms`
                   
                   const level = response.status >= 500 ? 'error' : response.status >= 400 ? 'warn' : 'info'
-                  sendOutboundLog(level, message, responseMeta)
+                  
+                  const metaCopy = { ...responseMeta }
+                  if (metaCopy.responseBody != null && typeof metaCopy.responseBody !== 'string') {
+                    try {
+                      metaCopy.responseBody = JSON.stringify(metaCopy.responseBody)
+                    } catch (_) {
+                      metaCopy.responseBody = String(metaCopy.responseBody)
+                    }
+                  }
+                  
+                  const payload = {
+                    level,
+                    message,
+                    meta: {
+                      ...metaCopy,
+                      service: {
+                        name: serviceName,
+                        version: '1.0.0'
+                      },
+                      environment,
+                      timestamp: new Date().toISOString(),
+                      hostname: os.hostname()
+                    }
+                  }
+                  try {
+                    transport.enqueue(payload, {
+                      'content-type': 'application/json'
+                    })
+                  } catch (enqueueErr) {
+                    sendOutboundLog(level, message, responseMeta)
+                  }
                 } catch (err) {
                   try {
                     const responseMeta = {
@@ -1058,20 +1070,67 @@ try {
                       statusCode: response.status,
                       responseTimeMs: duration,
                       responseHeaders: Object.fromEntries(response.headers.entries()),
-                      responseBody: null
+                      responseBody: responseBody != null ? String(responseBody) : null
                     }
                     
                     markSource(responseMeta, 'http-client')
                     const message = `[RESPONSE] ${method} ${url} ${response.status} ${duration}ms`
                     
                     const level = response.status >= 500 ? 'error' : response.status >= 400 ? 'warn' : 'info'
-                    sendOutboundLog(level, message, responseMeta)
-                  } catch (_) {
+                    
+                    const metaCopy = { ...responseMeta }
+                    if (metaCopy.responseBody != null && typeof metaCopy.responseBody !== 'string') {
+                      try {
+                        metaCopy.responseBody = JSON.stringify(metaCopy.responseBody)
+                      } catch (_) {
+                        metaCopy.responseBody = String(metaCopy.responseBody)
+                      }
+                    }
+                    const payload = {
+                      level,
+                      message,
+                      meta: {
+                        ...metaCopy,
+                        service: {
+                          name: serviceName,
+                          version: '1.0.0'
+                        },
+                        environment,
+                        timestamp: new Date().toISOString(),
+                        hostname: os.hostname()
+                      }
+                    }
+                    try {
+                      transport.enqueue(payload, {
+                        'content-type': 'application/json'
+                      })
+                    } catch (enqueueErr) {
+                      sendOutboundLog(level, message, responseMeta)
+                    }
+                  } catch (innerErr) {
+                    console.error('[azify-logger] Erro ao logar resposta (fallback):', innerErr)
                   }
                 }
               }
               
-              logResponse().catch(() => {})
+              logResponse().catch((err) => {
+                console.error('[azify-logger] Erro ao executar logResponse para', method, url, ':', err)
+                const responseMeta = {
+                  ...requestMeta,
+                  statusCode: response.status,
+                  responseTimeMs: duration,
+                  responseHeaders: Object.fromEntries(response.headers.entries()),
+                  responseBody: null
+                }
+                markSource(responseMeta, 'http-client')
+                const message = `[RESPONSE] ${method} ${url} ${response.status} ${duration}ms`
+                const level = response.status >= 500 ? 'error' : response.status >= 400 ? 'warn' : 'info'
+                try {
+                  sendOutboundLog(level, message, responseMeta)
+                } catch (fallbackErr) {
+                  console.error('[azify-logger] Erro ao enviar log de fallback:', fallbackErr)
+                }
+              })
             }
 
             return response