@lark-apaas/nestjs-logger 1.0.2-alpha.37 → 1.0.2-alpha.39

package/dist/index.cjs

@@ -9241,6 +9241,7 @@ var BasePinoLogger = class _BasePinoLogger {
     const { context, stack, extras } = this.extractOptionalParams(optionalParams, treatStack);
     const requestState = this.contextStore.getContext();
     const traceId = requestState?.requestId ?? null;
+    const firstParam = optionalParams[0];
     const flatObject = /* @__PURE__ */ __name((extra) => {
       let res = {};
       try {
@@ -9285,8 +9286,10 @@ var BasePinoLogger = class _BasePinoLogger {
     }
     const pinoLevel = mapLogLevelToPino(level);
     const sanitizedPayload = sanitizeValue(payload);
+    const isTriggerLog = firstParam?.module === "trigger";
+    const platformModule = isTriggerLog ? "trigger" : firstParam?.paas_attributes_module;
     if (process.env.NODE_ENV === "development") {
-      if (sanitizedPayload.source_type === "platform") {
+      if (platformModule) {
         return;
       }
       if (messageText) {
@@ -9296,11 +9299,36 @@ var BasePinoLogger = class _BasePinoLogger {
       }
     } else {
       let finalMessage = messageText;
-      if (typeof message === "object" && message !== null) {
-        finalMessage = safeStringify(message);
+      if (platformModule) {
+        if (typeof message !== "string") {
+          finalMessage = safeStringify(message);
+        }
+        this.observableService.log(level, finalMessage ?? "", {
+          ...payload,
+          module: platformModule
+        });
+      } else {
+        const reportMessage = this.processLogParams([
+          message,
+          ...optionalParams
+        ]);
+        this.observableService.log(level, reportMessage, {});
+      }
+    }
+  }
+  processLogParams(args) {
+    if (args.length === 1) {
+      const firstParam = args[0];
+      if (typeof firstParam !== "string") {
+        return safeStringify(firstParam);
       }
-      this.observableService.log(level, finalMessage ?? "", payload);
+      return firstParam;
+    }
+    const obj = {};
+    for (let i = 0; i < args.length; i++) {
+      obj[i.toString()] = args[i];
     }
+    return safeStringify(obj);
   }
   extractOptionalParams(optionalParams, treatStack) {
     const params = [
@@ -9499,6 +9527,7 @@ var LoggingInterceptor = class {
     if (context.getType() !== "http") {
       return next.handle();
     }
+    const isDev = process.env.NODE_ENV === "development";
     const httpContext = context.switchToHttp();
     const req = httpContext.getRequest();
     const res = httpContext.getResponse();
@@ -9533,10 +9562,6 @@ var LoggingInterceptor = class {
       res.__finalResponseBody = body;
       return originalSend(body);
     };
-    if (process.env.NODE_ENV === "development") {
-      this.appLogger.log(`HTTP request started
-url=${req.url}`, "HTTPTraceInterceptor");
-    }
     const requestMeta = {
       ...baseMeta
     };
@@ -9546,6 +9571,10 @@ url=${req.url}`, "HTTPTraceInterceptor");
     if (this.config.logRequestBody && Object.keys(req.query || {}).length > 0) {
       requestMeta["query_params"] = this.sanitizeAndTruncate(req.query);
     }
+    if (isDev) {
+      this.appLogger.log(`HTTP request started
+url=${req.url}`, "HTTPTraceInterceptor");
+    }
     this.traceLogger.logStructured("verbose", "HTTP request started", requestMeta, "HTTPTraceInterceptor");
     let logged = false;
     res.on("finish", () => {
@@ -9581,13 +9610,45 @@ url=${req.url}`, "HTTPTraceInterceptor");
         responseData.response = JSON.parse(finalResponseBody);
       }
       const reportData = JSON.stringify(responseData);
-      appLog(reportData, {
-        source_type: "platform"
-      }, "HTTPTraceInterceptor");
+      if (!isDev) {
+        this.appLogger.log(reportData, {
+          paas_attributes_module: "app_server",
+          source_type: "platform"
+        }, "HTTPTraceInterceptor");
+      }
+      const shouldLogBody = this.config.logResponseBody && isJsonResponse && finalResponseBody !== void 0;
+      if (isError) {
+        if (shouldLogBody) {
+          appLog(`HTTP request failed
+url=${req.url}
+status_code=${statusCode}
+duration_ms=${durationMs}
+response_body=${JSON.stringify(finalResponseBody ?? {})}`, "HTTPTraceInterceptor");
+        } else {
+          appLog(`HTTP request failed
+url=${req.url}
+status_code=${statusCode}
+duration_ms=${durationMs}`, "HTTPTraceInterceptor");
+        }
+      } else if (isDev) {
+        if (shouldLogBody) {
+          appLog(`HTTP request completed
+url=${req.url}
+status_code=${statusCode}
+duration_ms=${durationMs}
+response_body=${JSON.stringify(finalResponseBody ?? {})}`, "HTTPTraceInterceptor");
+        } else {
+          appLog(`HTTP request completed
+url=${req.url}
+status_code=${statusCode}
+duration_ms=${durationMs}`, "HTTPTraceInterceptor");
+        }
+      }
       this.traceLogger.logStructured(traceLevel, isError ? "HTTP request failed" : "HTTP request completed", responseMeta, "HTTPTraceInterceptor");
     });
     return next.handle().pipe((0, import_operators.catchError)((error) => {
       this.appLogger.error((0, import_util.format)("HTTP request exception\nmethod=%s url=%s\nerror=%o", req.method, req.url, error), {
+        paas_attributes_module: "app_server",
         source_type: "platform"
       }, "HTTPTraceInterceptor");
       throw error;