@lark-apaas/nestjs-logger 1.0.2-alpha.8 → 1.0.2-alpha.9

package/dist/index.cjs

@@ -14383,7 +14383,6 @@ module.exports = __toCommonJS(index_exports);
 
 // src/service/app-logger.service.ts
 var import_common = require("@nestjs/common");
-var import_util = require("util");
 var import_nestjs_observable = require("@lark-apaas/nestjs-observable");
 
 // src/helper/constants.ts
@@ -14575,6 +14574,26 @@ var BasePinoLogger = class _BasePinoLogger {
     const { context, stack, extras } = this.extractOptionalParams(optionalParams, treatStack);
     const requestState = this.contextStore.getContext();
     const traceId = requestState?.requestId ?? null;
+    const flatObject = /* @__PURE__ */ __name((extra) => {
+      let res = {};
+      try {
+        extra.forEach((item) => {
+          if (typeof item === "object" && item !== null) {
+            res = {
+              ...res,
+              ...item
+            };
+          }
+        });
+        delete res.message;
+        delete res.level;
+        delete res.time;
+        delete res.context;
+        return res;
+      } catch {
+      }
+    }, "flatObject");
+    const processedExtra = flatObject(extras);
     const payload = {
       trace_id: traceId,
       path: requestState?.path,
@@ -14582,12 +14601,13 @@ var BasePinoLogger = class _BasePinoLogger {
       user_id: requestState?.userId ?? null,
       app_id: requestState?.appId ?? null,
       tenant_id: requestState?.tenantId ?? null,
-      pid: process.pid
+      pid: process.pid,
+      ...processedExtra
     };
     if (context) {
       payload.context = context;
     }
-    const { messageText, stack: computedStack, data } = this.buildMessagePayload(message, extras);
+    const { messageText, stack: computedStack, data } = this.buildMessagePayload(message);
     if (stack) {
       payload.stack = stack;
     } else if (computedStack) {
@@ -14603,7 +14623,7 @@ var BasePinoLogger = class _BasePinoLogger {
     } else {
       this.logger[pinoLevel](sanitizedPayload);
     }
-    this.observableService.log(level, messageText ?? "", optionalParams?.[0] ?? {});
+    this.observableService.log(level, messageText ?? "", payload);
   }
   extractOptionalParams(optionalParams, treatStack) {
     const params = [
@@ -14631,7 +14651,7 @@ var BasePinoLogger = class _BasePinoLogger {
       extras: params
     };
   }
-  buildMessagePayload(message, extras) {
+  buildMessagePayload(message) {
     if (message instanceof Error) {
       return {
         messageText: message.message,
@@ -14639,17 +14659,8 @@ var BasePinoLogger = class _BasePinoLogger {
       };
     }
     if (typeof message === "string") {
-      if (extras.length === 0) {
-        return {
-          messageText: message
-        };
-      }
-      const allMessages = [
-        message,
-        ...extras.map((e) => stringifyParam(e))
-      ].join(" ");
       return {
-        messageText: allMessages
+        messageText: message
       };
     }
     if (typeof message === "object" && message !== null) {
@@ -14709,18 +14720,6 @@ function mapLogLevelToPino(level) {
   }
 }
 __name(mapLogLevelToPino, "mapLogLevelToPino");
-function stringifyParam(param) {
-  if (typeof param === "string") {
-    return param;
-  }
-  const inspectOptions = {
-    depth: 4,
-    colors: false,
-    compact: true
-  };
-  return (0, import_util.inspect)(param, inspectOptions);
-}
-__name(stringifyParam, "stringifyParam");
 function sanitizeValue(value) {
   if (value === null || value === void 0) {
     return value;
@@ -14783,7 +14782,7 @@ var logger_config_default = (0, import_config.registerAs)("logger", () => {
 var import_common2 = require("@nestjs/common");
 var import_config2 = __toESM(require_config2(), 1);
 var import_operators = __toESM(require_operators(), 1);
-var import_util2 = require("util");
+var import_util = require("util");
 var import_nestjs_common2 = require("@lark-apaas/nestjs-common");
 function _ts_decorate2(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -14915,7 +14914,7 @@ 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_util2.format)("HTTP request exception\nmethod=%s url=%s\nerror=%o", req.method, req.url, error), "HTTPTraceInterceptor");
+      this.appLogger.error((0, import_util.format)("HTTP request exception\nmethod=%s url=%s\nerror=%o", req.method, req.url, error), "HTTPTraceInterceptor");
       throw error;
     }));
   }