@lark-apaas/nestjs-logger 1.0.0 → 1.0.1-alpha.1

package/dist/index.js

@@ -10567,7 +10567,7 @@ var require_tap = __commonJS({
     var lift_1 = require_lift();
     var OperatorSubscriber_1 = require_OperatorSubscriber();
     var identity_1 = require_identity();
-    function tap2(observerOrNext, error, complete) {
+    function tap(observerOrNext, error, complete) {
       var tapObserver = isFunction_1.isFunction(observerOrNext) || error || complete ? {
         next: observerOrNext,
         error,
@@ -10600,8 +10600,8 @@ var require_tap = __commonJS({
         }));
       }) : identity_1.identity;
     }
-    __name(tap2, "tap");
-    exports.tap = tap2;
+    __name(tap, "tap");
+    exports.tap = tap;
   }
 });
 
@@ -14844,6 +14844,16 @@ var LoggingInterceptor = class {
       ip: req.ip ?? null,
       pid: process.pid
     };
+    const originalJson = res.json.bind(res);
+    const originalSend = res.send.bind(res);
+    res.json = function(body) {
+      res.__finalResponseBody = body;
+      return originalJson(body);
+    };
+    res.send = function(body) {
+      res.__finalResponseBody = body;
+      return originalSend(body);
+    };
     const requestMeta = {
       ...baseMeta
     };
@@ -14855,47 +14865,45 @@ var LoggingInterceptor = class {
     }
     this.appLogger.log("HTTP request started \n url=%s \n request_query=%o \n request_body=%o", req.url, requestMeta["query_params"] ?? {}, requestMeta["request_body"] ?? {});
     this.traceLogger.logStructured("verbose", "HTTP request started", requestMeta, "HTTPTraceInterceptor");
-    return next.handle().pipe((0, import_operators.tap)((responseData) => {
+    let logged = false;
+    res.on("finish", () => {
+      if (logged) {
+        return;
+      }
+      logged = true;
       const durationMs = Date.now() - startedAt;
       const statusCode = res.statusCode;
-      const appLog = this.appLogger[res.statusCode >= 400 ? "error" : "log"].bind(this.appLogger);
       const responseMeta = {
         ...baseMeta,
         status_code: statusCode,
         duration_ms: durationMs
       };
-      if (this.config.logResponseBody && responseData !== void 0) {
-        responseMeta["response_body"] = this.sanitizeAndTruncate(responseData);
-      }
-      const traceLevel = res.statusCode >= 400 ? "error" : "verbose";
-      appLog("HTTP request completed\n url=%s \n status_code=%d \n duration_ms=%d \n response_body=%o", req.url, statusCode, durationMs, responseMeta.response_body ?? {});
-      this.traceLogger.logStructured(traceLevel, "HTTP request completed", responseMeta, "HTTPTraceInterceptor");
-    }), (0, import_operators.catchError)((error) => {
-      const durationMs = Date.now() - startedAt;
-      const statusCode = res.statusCode >= 400 ? res.statusCode : 500;
-      const linkMeta = {
-        ...baseMeta,
-        status_code: statusCode,
-        duration_ms: durationMs
-      };
-      if (error instanceof Error) {
-        linkMeta["error_message"] = error.message;
-      }
-      const meta = {
-        ...baseMeta,
-        status_code: statusCode,
-        duration_ms: durationMs
-      };
-      if (error instanceof Error) {
-        meta["error"] = {
-          message: error.message,
-          stack: error.stack
-        };
+      const finalResponseBody = res.__finalResponseBody;
+      const contentType = res.getHeader("content-type");
+      const isJsonResponse = typeof contentType === "string" && contentType.includes("application/json");
+      if (this.config.logResponseBody && finalResponseBody !== void 0 && isJsonResponse) {
+        responseMeta["response_body"] = this.sanitizeAndTruncate(finalResponseBody);
+      }
+      const isError = statusCode >= 400;
+      const appLog = this.appLogger[isError ? "error" : "log"].bind(this.appLogger);
+      const traceLevel = isError ? "error" : "verbose";
+      const shouldLogBody = this.config.logResponseBody && isJsonResponse && finalResponseBody !== void 0;
+      if (isError) {
+        if (shouldLogBody) {
+          appLog("HTTP request failed\n url=%s \n status_code=%d \n duration_ms=%d \n response_body=%o", req.url, statusCode, durationMs, finalResponseBody);
+        } else {
+          appLog("HTTP request failed\n url=%s \n status_code=%d \n duration_ms=%d", req.url, statusCode, durationMs);
+        }
       } else {
-        meta["error"] = String(error);
+        if (shouldLogBody) {
+          appLog("HTTP request completed\n url=%s \n status_code=%d \n duration_ms=%d \n response_body=%o", req.url, statusCode, durationMs, finalResponseBody);
+        } else {
+          appLog("HTTP request completed\n url=%s \n status_code=%d \n duration_ms=%d", req.url, statusCode, durationMs);
+        }
       }
-      this.appLogger.error("HTTP request failed\n url=%s \n status_code=%d \n duration_ms=%d \n error=%o", req.url, statusCode, durationMs, meta.error);
-      this.traceLogger.logStructured("error", "HTTP request failed", meta, "HTTPTraceInterceptor");
+      this.traceLogger.logStructured(traceLevel, isError ? "HTTP request failed" : "HTTP request completed", responseMeta, "HTTPTraceInterceptor");
+    });
+    return next.handle().pipe((0, import_operators.catchError)((error) => {
       throw error;
     }));
   }