azify-logger 1.0.35 → 1.0.36

package/middleware-express.js

@@ -306,11 +306,6 @@ function createExpressLoggingMiddleware(options = {}) {
     const originalEnd = res.end.bind(res)
     
     res.end = (chunk, encoding) => {
-      if (logSent) {
-        return originalEnd(chunk, encoding)
-      }
-      logSent = true
-      
       const result = originalEnd(chunk, encoding)
 
       if (chunk != null && config.captureResponseBody && !responseChunkCaptured) {
@@ -318,43 +313,77 @@ function createExpressLoggingMiddleware(options = {}) {
         responseChunkCaptured = true
       }
       
-      process.nextTick(() => {
-        ensureIds()
-        
-        const statusCode = res.statusCode || 200
-        const duration = Date.now() - startTime
-        const response = { statusCode, durationMs: duration }
-        
-        if (config.captureHeaders) {
-          ensureHeaders()
-        }
-        
-        const requestObj = {
-          id: requestId,
-          method,
-          url,
-          path,
-          ip: clientIp
-        }
-        if (query) requestObj.query = query
-        if (config.captureHeaders && cachedHeaders) requestObj.headers = cachedHeaders
-        
-        const meta = {
-          traceId: reqCtx.traceId,
-          spanId: reqCtx.spanId,
-          parentSpanId: reqCtx.parentSpanId || null,
-          requestId,
-          request: requestObj,
-          response,
-          timestamp: Date.now(),
-          hostname
-        }
-        if (serviceObj) meta.service = serviceObj
-        if (config.environment) meta.environment = config.environment
+      if (!logSent) {
+        logSent = true
         
-        const chunkToProcess = (responseChunk !== null && responseChunkCaptured) ? responseChunk : null
-        emitResponseLog(meta, chunkToProcess)
-      })
+        process.nextTick(() => {
+          try {
+            ensureIds()
+            
+            const statusCode = res.statusCode || 200
+            const duration = Date.now() - startTime
+            const response = { statusCode, durationMs: duration }
+            
+            if (config.captureHeaders) {
+              ensureHeaders()
+            }
+            
+            const requestObj = {
+              id: requestId,
+              method,
+              url,
+              path,
+              ip: clientIp
+            }
+            if (query) requestObj.query = query
+            if (config.captureHeaders && cachedHeaders) requestObj.headers = cachedHeaders
+            
+            const meta = {
+              traceId: reqCtx.traceId,
+              spanId: reqCtx.spanId,
+              parentSpanId: reqCtx.parentSpanId || null,
+              requestId,
+              request: requestObj,
+              response,
+              timestamp: Date.now(),
+              hostname
+            }
+            if (serviceObj) meta.service = serviceObj
+            if (config.environment) meta.environment = config.environment
+            
+            const chunkToProcess = (responseChunk !== null && responseChunkCaptured) ? responseChunk : null
+            emitResponseLog(meta, chunkToProcess)
+          } catch (err) {
+            try {
+              ensureIds()
+              const statusCode = res.statusCode || 200
+              const duration = Date.now() - startTime
+              const response = { statusCode, durationMs: duration }
+              const requestObj = {
+                id: requestId,
+                method,
+                url,
+                path,
+                ip: clientIp || 'unknown'
+              }
+              const meta = {
+                traceId: reqCtx?.traceId || traceId,
+                spanId: reqCtx?.spanId || spanId,
+                parentSpanId: reqCtx?.parentSpanId || parentSpanId || null,
+                requestId: requestId || fastUUID(),
+                request: requestObj,
+                response,
+                timestamp: Date.now(),
+                hostname
+              }
+              if (serviceObj) meta.service = serviceObj
+              if (config.environment) meta.environment = config.environment
+              emitResponseLog(meta, null)
+            } catch (_) {
+            }
+          }
+        })
+      }
       
       return result
     }

package/package.json

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

package/register.js

@@ -894,10 +894,7 @@ try {
 
           markSource(requestMeta, 'http-client')
           if (HTTP_CLIENT_MODE !== 'off') {
-            try {
-              sendOutboundLog('info', `[REQUEST] ${method} ${url}`, requestMeta)
-            } catch (_) {
-            }
+            sendOutboundLog('info', `[REQUEST] ${method} ${url}`, requestMeta)
           }
 
           const childCtx = {
@@ -937,7 +934,7 @@ try {
           const duration = Number((performance.now() - start).toFixed(2))
           const shouldLogResponse = HTTP_CLIENT_MODE !== 'off'
 
-          if (shouldLogResponse) {
+          if (shouldLogResponse && response) {
             const headersToObject = (headers) => {
               try {
                 if (!headers) return {}
@@ -1030,32 +1027,10 @@ try {
               responseMeta.responseBody = responseBodyString
             }
             
-            try {
-              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 (err) {
-              try {
-                const fallbackMeta = {
-                  traceId: requestMeta.traceId || randomUUID(),
-                  spanId: requestMeta.spanId || randomBytes(8).toString('hex'),
-                  parentSpanId: requestMeta.parentSpanId || null,
-                  requestId: requestMeta.requestId || randomUUID(),
-                  method,
-                  url,
-                  statusCode: response.status,
-                  responseTimeMs: duration,
-                  headers: requestMeta.headers || {},
-                  responseHeaders: {}
-                }
-                markSource(fallbackMeta, '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, fallbackMeta)
-              } catch (_) {
-              }
-            }
+            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)
           }
 
           return response