@lark-apaas/nestjs-logger 1.0.1 → 1.0.2-alpha.10

package/dist/index.cjs

@@ -14376,22 +14376,22 @@ __export(index_exports, {
   LoggerContextMiddleware: () => LoggerContextMiddleware,
   LoggerModule: () => LoggerModule,
   PinoLoggerService: () => PinoLoggerService,
+  RequestContextService: () => import_nestjs_common5.RequestContextService,
   TRACE_LOGGER: () => TRACE_LOGGER
 });
 module.exports = __toCommonJS(index_exports);
 
 // src/service/app-logger.service.ts
-var import_common2 = require("@nestjs/common");
-var import_util = require("util");
+var import_common = require("@nestjs/common");
+var import_nestjs_observable = require("@lark-apaas/nestjs-observable");
 
 // src/helper/constants.ts
 var PINO_ROOT_LOGGER = Symbol("PINO_ROOT_LOGGER");
 var TRACE_LOGGER = Symbol("TRACE_LOGGER");
 var METRICS_LOGGER = Symbol("METRICS_LOGGER");
 
-// src/service/request-context.service.ts
-var import_common = require("@nestjs/common");
-var import_async_hooks = require("async_hooks");
+// src/service/app-logger.service.ts
+var import_nestjs_common = require("@lark-apaas/nestjs-common");
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -14399,43 +14399,6 @@ function _ts_decorate(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 __name(_ts_decorate, "_ts_decorate");
-var RequestContextService = class {
-  static {
-    __name(this, "RequestContextService");
-  }
-  storage = new import_async_hooks.AsyncLocalStorage();
-  run(context, callback) {
-    const store = {
-      ...context
-    };
-    return this.storage.run(store, callback);
-  }
-  setContext(partial) {
-    const store = this.storage.getStore();
-    if (!store) {
-      return;
-    }
-    Object.assign(store, partial);
-  }
-  getContext() {
-    return this.storage.getStore();
-  }
-  get(key) {
-    return this.storage.getStore()?.[key];
-  }
-};
-RequestContextService = _ts_decorate([
-  (0, import_common.Injectable)()
-], RequestContextService);
-
-// src/service/app-logger.service.ts
-function _ts_decorate2(decorators, target, key, desc) {
-  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-__name(_ts_decorate2, "_ts_decorate");
 function _ts_metadata(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
@@ -14544,6 +14507,7 @@ var BasePinoLogger = class _BasePinoLogger {
   logger;
   contextStore;
   levelState = new LogLevelState();
+  observableService = new import_nestjs_observable.ObservableService();
   constructor(logger, contextStore) {
     this.logger = logger;
     this.contextStore = contextStore;
@@ -14610,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,
@@ -14617,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) {
@@ -14633,10 +14618,14 @@ var BasePinoLogger = class _BasePinoLogger {
     }
     const pinoLevel = mapLogLevelToPino(level);
     const sanitizedPayload = sanitizeValue(payload);
-    if (messageText) {
-      this.logger[pinoLevel](sanitizedPayload, messageText);
+    if (process.env.NODE_ENV === "development") {
+      if (messageText) {
+        this.logger[pinoLevel](sanitizedPayload, messageText);
+      } else {
+        this.logger[pinoLevel](sanitizedPayload);
+      }
     } else {
-      this.logger[pinoLevel](sanitizedPayload);
+      this.observableService.log(level, messageText ?? "", payload);
     }
   }
   extractOptionalParams(optionalParams, treatStack) {
@@ -14665,7 +14654,7 @@ var BasePinoLogger = class _BasePinoLogger {
       extras: params
     };
   }
-  buildMessagePayload(message, extras) {
+  buildMessagePayload(message) {
     if (message instanceof Error) {
       return {
         messageText: message.message,
@@ -14673,17 +14662,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) {
@@ -14708,16 +14688,16 @@ var AppLogger = class extends BasePinoLogger {
   }
   constructor(logger, requestContext) {
     super(logger, requestContext);
-    import_common2.Logger.overrideLogger(this);
+    import_common.Logger.overrideLogger(this);
   }
 };
-AppLogger = _ts_decorate2([
-  (0, import_common2.Injectable)(),
-  _ts_param(0, (0, import_common2.Inject)(PINO_ROOT_LOGGER)),
+AppLogger = _ts_decorate([
+  (0, import_common.Injectable)(),
+  _ts_param(0, (0, import_common.Inject)(PINO_ROOT_LOGGER)),
   _ts_metadata("design:type", Function),
   _ts_metadata("design:paramtypes", [
     typeof PinoLogger === "undefined" ? Object : PinoLogger,
-    typeof RequestContextService === "undefined" ? Object : RequestContextService
+    typeof import_nestjs_common.RequestContextService === "undefined" ? Object : import_nestjs_common.RequestContextService
   ])
 ], AppLogger);
 var PinoLoggerService = class extends BasePinoLogger {
@@ -14743,18 +14723,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;
@@ -14777,9 +14745,10 @@ function sanitizeValue(value) {
 __name(sanitizeValue, "sanitizeValue");
 
 // src/module.ts
-var import_common5 = require("@nestjs/common");
+var import_common4 = require("@nestjs/common");
 var import_core = require("@nestjs/core");
 var import_config3 = __toESM(require_config2(), 1);
+var import_nestjs_common4 = require("@lark-apaas/nestjs-common");
 
 // src/config/logger.config.ts
 var import_config = __toESM(require_config2(), 1);
@@ -14813,16 +14782,18 @@ var logger_config_default = (0, import_config.registerAs)("logger", () => {
 });
 
 // src/interceptor/logging.interceptor.ts
-var import_common3 = require("@nestjs/common");
+var import_common2 = require("@nestjs/common");
 var import_config2 = __toESM(require_config2(), 1);
 var import_operators = __toESM(require_operators(), 1);
-function _ts_decorate3(decorators, target, key, desc) {
+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;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate3, "_ts_decorate");
+__name(_ts_decorate2, "_ts_decorate");
 function _ts_metadata2(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
@@ -14946,6 +14917,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_util.format)("HTTP request exception\nmethod=%s url=%s\nerror=%o", req.method, req.url, error), "HTTPTraceInterceptor");
       throw error;
     }));
   }
@@ -14970,20 +14942,21 @@ duration_ms=${durationMs}`, "HTTPTraceInterceptor");
       return {
         _error: "Failed to serialize data",
         _type: typeof data,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         _constructor: data?.constructor?.name
       };
     }
   }
 };
-LoggingInterceptor = _ts_decorate3([
-  (0, import_common3.Injectable)(),
-  _ts_param2(0, (0, import_common3.Inject)(TRACE_LOGGER)),
-  _ts_param2(2, (0, import_common3.Inject)(AppLogger)),
-  _ts_param2(3, (0, import_common3.Inject)(logger_config_default.KEY)),
+LoggingInterceptor = _ts_decorate2([
+  (0, import_common2.Injectable)(),
+  _ts_param2(0, (0, import_common2.Inject)(TRACE_LOGGER)),
+  _ts_param2(2, (0, import_common2.Inject)(AppLogger)),
+  _ts_param2(3, (0, import_common2.Inject)(logger_config_default.KEY)),
   _ts_metadata2("design:type", Function),
   _ts_metadata2("design:paramtypes", [
     typeof PinoLoggerService === "undefined" ? Object : PinoLoggerService,
-    typeof RequestContextService === "undefined" ? Object : RequestContextService,
+    typeof import_nestjs_common2.RequestContextService === "undefined" ? Object : import_nestjs_common2.RequestContextService,
     typeof AppLogger === "undefined" ? Object : AppLogger,
     typeof import_config2.ConfigType === "undefined" ? Object : import_config2.ConfigType
   ])
@@ -15040,15 +15013,16 @@ function createFileDestination(pathname) {
 __name(createFileDestination, "createFileDestination");
 
 // src/middleware/logger-context.middleware.ts
-var import_common4 = require("@nestjs/common");
+var import_common3 = require("@nestjs/common");
 var import_crypto = require("crypto");
-function _ts_decorate4(decorators, target, key, desc) {
+var import_nestjs_common3 = require("@lark-apaas/nestjs-common");
+function _ts_decorate3(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate4, "_ts_decorate");
+__name(_ts_decorate3, "_ts_decorate");
 function _ts_metadata3(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
@@ -15061,13 +15035,14 @@ var LoggerContextMiddleware = class {
   constructor(requestContext) {
     this.requestContext = requestContext;
   }
-  use(req, _res, next) {
+  use(req, res, next) {
     const requestId = req.headers["x-tt-log-id"] ?? (0, import_crypto.randomUUID)();
     const path = req.originalUrl ?? req.url;
     const userContext = req.userContext ?? {};
     const mutableReq = req;
     mutableReq.requestId = requestId;
     mutableReq.id = requestId;
+    res.setHeader("x-log-trace-id", requestId);
     this.requestContext.run({
       requestId,
       path,
@@ -15078,35 +15053,35 @@ var LoggerContextMiddleware = class {
     }, () => next());
   }
 };
-LoggerContextMiddleware = _ts_decorate4([
-  (0, import_common4.Injectable)(),
+LoggerContextMiddleware = _ts_decorate3([
+  (0, import_common3.Injectable)(),
   _ts_metadata3("design:type", Function),
   _ts_metadata3("design:paramtypes", [
-    typeof RequestContextService === "undefined" ? Object : RequestContextService
+    typeof import_nestjs_common3.RequestContextService === "undefined" ? Object : import_nestjs_common3.RequestContextService
   ])
 ], LoggerContextMiddleware);
 
 // src/module.ts
-function _ts_decorate5(decorators, target, key, desc) {
+function _ts_decorate4(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate5, "_ts_decorate");
+__name(_ts_decorate4, "_ts_decorate");
 var LoggerModule = class {
   static {
     __name(this, "LoggerModule");
   }
 };
-LoggerModule = _ts_decorate5([
-  (0, import_common5.Global)(),
-  (0, import_common5.Module)({
+LoggerModule = _ts_decorate4([
+  (0, import_common4.Global)(),
+  (0, import_common4.Module)({
     imports: [
-      import_config3.ConfigModule.forFeature(logger_config_default)
+      import_config3.ConfigModule.forFeature(logger_config_default),
+      import_nestjs_common4.CommonModule
     ],
     providers: [
-      RequestContextService,
       LoggerContextMiddleware,
       {
         provide: PINO_ROOT_LOGGER,
@@ -15127,7 +15102,7 @@ LoggerModule = _ts_decorate5([
           filePath: `${config.logDir}/trace.log`
         }), requestContext), "useFactory"),
         inject: [
-          RequestContextService,
+          import_nestjs_common4.RequestContextService,
           logger_config_default.KEY
         ]
       },
@@ -15141,17 +15116,20 @@ LoggerModule = _ts_decorate5([
     exports: [
       AppLogger,
       TRACE_LOGGER,
-      RequestContextService,
       LoggerContextMiddleware
     ]
   })
 ], LoggerModule);
+
+// src/index.ts
+var import_nestjs_common5 = require("@lark-apaas/nestjs-common");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AppLogger,
   LoggerContextMiddleware,
   LoggerModule,
   PinoLoggerService,
+  RequestContextService,
   TRACE_LOGGER
 });
 //# sourceMappingURL=index.cjs.map