@lark-apaas/nestjs-logger 0.1.0-alpha.3 → 0.1.0-alpha.5

package/dist/index.cjs

@@ -14375,6 +14375,7 @@ __export(index_exports, {
   AppLogger: () => AppLogger,
   LoggerContextMiddleware: () => LoggerContextMiddleware,
   LoggerModule: () => LoggerModule,
+  PinoLoggerService: () => PinoLoggerService,
   TRACE_LOGGER: () => TRACE_LOGGER
 });
 module.exports = __toCommonJS(index_exports);
@@ -14521,6 +14522,36 @@ var BasePinoLogger = class _BasePinoLogger {
   fatal(message, ...optionalParams) {
     this.write("fatal", message, optionalParams, true);
   }
+  /**
+  * 记录结构化日志，将 meta 对象合并到日志字段中
+  * @param level 日志级别
+  * @param message 消息文本
+  * @param meta 要合并的元数据对象
+  * @param context 上下文标识
+  */
+  logStructured(level, message, meta, context) {
+    if (!this.levelState.isEnabled(level)) {
+      return;
+    }
+    const requestState = this.contextStore.getContext();
+    const traceId = requestState?.requestId ?? null;
+    const payload = {
+      trace_id: traceId,
+      path: requestState?.path,
+      method: requestState?.method,
+      user_id: requestState?.userId ?? null,
+      app_id: requestState?.appId ?? null,
+      tenant_id: requestState?.tenantId ?? null,
+      pid: process.pid,
+      ...sanitizeValue(meta)
+    };
+    if (context) {
+      payload.context = context;
+    }
+    const pinoLevel = mapLogLevelToPino(level);
+    const sanitizedPayload = sanitizeValue(payload);
+    this.logger[pinoLevel](sanitizedPayload, message);
+  }
   write(level, message, optionalParams, treatStack = false) {
     if (!this.levelState.isEnabled(level)) {
       return;
@@ -14742,10 +14773,12 @@ var LoggingInterceptor = class {
   }
   traceLogger;
   requestContext;
+  appLogger;
   config;
-  constructor(traceLogger, requestContext, config) {
+  constructor(traceLogger, requestContext, appLogger, config) {
     this.traceLogger = traceLogger;
     this.requestContext = requestContext;
+    this.appLogger = appLogger;
     this.config = config;
   }
   intercept(context, next) {
@@ -14772,45 +14805,60 @@ var LoggingInterceptor = class {
       ip: req.ip ?? null,
       pid: process.pid
     };
+    this.appLogger.logStructured("log", "HTTP request started", baseMeta, "HTTPTraceInterceptor");
     const requestMeta = {
       ...baseMeta
     };
     if (this.config.logRequestBody && req.body) {
-      requestMeta["requestBody"] = this.sanitizeAndTruncate(req.body);
+      requestMeta["request_body"] = this.sanitizeAndTruncate(req.body);
     }
     if (this.config.logRequestBody && Object.keys(req.query || {}).length > 0) {
-      requestMeta["queryParams"] = this.sanitizeAndTruncate(req.query);
+      requestMeta["query_params"] = this.sanitizeAndTruncate(req.query);
     }
-    this.traceLogger.verbose?.("HTTP request started", requestMeta, "HTTP");
+    this.traceLogger.logStructured("verbose", "HTTP request started", requestMeta, "HTTPTraceInterceptor");
     return next.handle().pipe((0, import_operators.tap)((responseData) => {
       const durationMs = Date.now() - startedAt;
       const statusCode = res.statusCode;
+      this.appLogger.logStructured("log", "HTTP request completed", {
+        ...baseMeta,
+        status_code: statusCode,
+        duration_ms: durationMs
+      }, "HTTPTraceInterceptor");
       const responseMeta = {
         ...baseMeta,
-        statusCode,
-        durationMs
+        status_code: statusCode,
+        duration_ms: durationMs
       };
       if (this.config.logResponseBody && responseData !== void 0) {
-        const contentType = res.getHeader("content-type");
-        const isJsonResponse = this.isJsonContentType(contentType);
-        if (isJsonResponse) {
-          responseMeta["responseBody"] = this.sanitizeAndTruncate(responseData);
-        }
+        responseMeta["response_body"] = this.sanitizeAndTruncate(responseData);
       }
-      this.traceLogger.verbose?.("HTTP request completed", responseMeta, "HTTP");
+      this.traceLogger.logStructured("verbose", "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;
+      }
+      this.appLogger.logStructured("log", "HTTP request failed", linkMeta, "HTTPTraceInterceptor");
       const meta = {
         ...baseMeta,
-        statusCode,
-        durationMs
+        status_code: statusCode,
+        duration_ms: durationMs
       };
       if (error instanceof Error) {
-        this.traceLogger.error(error, meta, "HTTP");
+        meta["error"] = {
+          message: error.message,
+          stack: error.stack
+        };
       } else {
-        this.traceLogger.error("Unknown error thrown", meta, "HTTP");
+        meta["error"] = String(error);
       }
+      this.traceLogger.logStructured("verbose", "HTTP request failed", meta, "HTTPTraceInterceptor");
       throw error;
     }));
   }
@@ -14835,21 +14883,12 @@ var LoggingInterceptor = class {
     } catch (error) {
       return {
         _error: "Failed to serialize data",
-        _message: error instanceof Error ? error.message : String(error)
+        _type: typeof data,
+        _constructor: data?.constructor?.name
       };
     }
   }
   /**
-  * 判断是否是 JSON 响应类型
-  */
-  isJsonContentType(contentType) {
-    if (typeof contentType !== "string") {
-      return false;
-    }
-    const contentTypeLower = contentType.toLowerCase();
-    return contentTypeLower.includes("application/json") || contentTypeLower.includes("application/vnd.api+json") || contentTypeLower.includes("+json");
-  }
-  /**
   * 脱敏敏感字段
   */
   maskSensitiveFields(data) {
@@ -14880,11 +14919,13 @@ var LoggingInterceptor = class {
 LoggingInterceptor = _ts_decorate3([
   (0, import_common3.Injectable)(),
   _ts_param2(0, (0, import_common3.Inject)(TRACE_LOGGER)),
-  _ts_param2(2, (0, import_common3.Inject)(logger_config_default.KEY)),
+  _ts_param2(2, (0, import_common3.Inject)(AppLogger)),
+  _ts_param2(3, (0, import_common3.Inject)(logger_config_default.KEY)),
   _ts_metadata2("design:type", Function),
   _ts_metadata2("design:paramtypes", [
-    typeof import_common3.LoggerService === "undefined" ? Object : import_common3.LoggerService,
+    typeof PinoLoggerService === "undefined" ? Object : PinoLoggerService,
     typeof RequestContextService === "undefined" ? Object : RequestContextService,
+    typeof AppLogger === "undefined" ? Object : AppLogger,
     typeof import_config2.ConfigType === "undefined" ? Object : import_config2.ConfigType
   ])
 ], LoggingInterceptor);
@@ -15051,6 +15092,7 @@ LoggerModule = _ts_decorate5([
   AppLogger,
   LoggerContextMiddleware,
   LoggerModule,
+  PinoLoggerService,
   TRACE_LOGGER
 });
 //# sourceMappingURL=index.cjs.map