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

package/LICENSE

@@ -0,0 +1,13 @@
+MIT License
+
+Copyright (c) 2024 Lark Technologies Pte. Ltd. and/or its affiliates
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted,provided that the above copyright notice and this permission notice appear in all copies.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

package/dist/index.cjs

@@ -452,7 +452,7 @@ var require_config_constants = __commonJS({
       value: true
     });
     exports2.AS_PROVIDER_METHOD_KEY = exports2.VALIDATED_ENV_PROPNAME = exports2.PARTIAL_CONFIGURATION_PROPNAME = exports2.PARTIAL_CONFIGURATION_KEY = exports2.VALIDATED_ENV_LOADER = exports2.CONFIGURATION_LOADER = exports2.CONFIGURATION_TOKEN = exports2.CONFIGURATION_SERVICE_TOKEN = void 0;
-    exports2.CONFIGURATION_SERVICE_TOKEN = Symbol("CONFIG_SERVICE");
+    exports2.CONFIGURATION_SERVICE_TOKEN = /* @__PURE__ */ Symbol("CONFIG_SERVICE");
     exports2.CONFIGURATION_TOKEN = "CONFIGURATION_TOKEN";
     exports2.CONFIGURATION_LOADER = "CONFIGURATION_LOADER";
     exports2.VALIDATED_ENV_LOADER = "VALIDATED_ENV_LOADER";
@@ -14376,19 +14376,16 @@ __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_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");
+var PINO_ROOT_LOGGER = /* @__PURE__ */ Symbol("PINO_ROOT_LOGGER");
+var TRACE_LOGGER = /* @__PURE__ */ Symbol("TRACE_LOGGER");
 
 // src/service/app-logger.service.ts
 var import_nestjs_common = require("@lark-apaas/nestjs-common");
@@ -14506,11 +14503,12 @@ var BasePinoLogger = class _BasePinoLogger {
   }
   logger;
   contextStore;
+  observableService;
   levelState = new LogLevelState();
-  observableService = new import_nestjs_observable.ObservableService();
-  constructor(logger, contextStore) {
+  constructor(logger, contextStore, observableService) {
     this.logger = logger;
     this.contextStore = contextStore;
+    this.observableService = observableService;
     const pinoLevel = this.logger.level;
     const nestLevels = LogLevelState.fromPinoLevel(pinoLevel);
     this.levelState.set(nestLevels);
@@ -14618,12 +14616,15 @@ 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);
     }
-    this.observableService.log(level, messageText ?? "", payload);
   }
   extractOptionalParams(optionalParams, treatStack) {
     const params = [
@@ -14683,17 +14684,19 @@ var AppLogger = class extends BasePinoLogger {
   static {
     __name(this, "AppLogger");
   }
-  constructor(logger, requestContext) {
-    super(logger, requestContext);
+  constructor(logger, observableService, requestContext) {
+    super(logger, requestContext, observableService);
     import_common.Logger.overrideLogger(this);
   }
 };
 AppLogger = _ts_decorate([
   (0, import_common.Injectable)(),
   _ts_param(0, (0, import_common.Inject)(PINO_ROOT_LOGGER)),
+  _ts_param(1, (0, import_common.Inject)(import_nestjs_common.OBSERVABLE_SERVICE)),
   _ts_metadata("design:type", Function),
   _ts_metadata("design:paramtypes", [
     typeof PinoLogger === "undefined" ? Object : PinoLogger,
+    typeof import_nestjs_common.ObservableService === "undefined" ? Object : import_nestjs_common.ObservableService,
     typeof import_nestjs_common.RequestContextService === "undefined" ? Object : import_nestjs_common.RequestContextService
   ])
 ], AppLogger);
@@ -15034,20 +15037,14 @@ var LoggerContextMiddleware = class {
   }
   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,
-      method: req.method,
-      userId: userContext.userId,
-      tenantId: userContext.tenantId,
-      appId: userContext.appId
-    }, () => next());
+    this.requestContext.setContext({
+      requestId
+    });
+    next();
   }
 };
 LoggerContextMiddleware = _ts_decorate3([
@@ -15075,8 +15072,7 @@ LoggerModule = _ts_decorate4([
   (0, import_common4.Global)(),
   (0, import_common4.Module)({
     imports: [
-      import_config3.ConfigModule.forFeature(logger_config_default),
-      import_nestjs_common4.CommonModule
+      import_config3.ConfigModule.forFeature(logger_config_default)
     ],
     providers: [
       LoggerContextMiddleware,
@@ -15094,13 +15090,14 @@ LoggerModule = _ts_decorate4([
       },
       {
         provide: TRACE_LOGGER,
-        useFactory: /* @__PURE__ */ __name((requestContext, config) => new PinoLoggerService(createPinoLogger({
+        useFactory: /* @__PURE__ */ __name((requestContext, config, observableService) => new PinoLoggerService(createPinoLogger({
           level: config.level,
           filePath: `${config.logDir}/trace.log`
-        }), requestContext), "useFactory"),
+        }), requestContext, observableService), "useFactory"),
         inject: [
           import_nestjs_common4.RequestContextService,
-          logger_config_default.KEY
+          logger_config_default.KEY,
+          import_nestjs_common4.OBSERVABLE_SERVICE
         ]
       },
       AppLogger,
@@ -15117,16 +15114,12 @@ LoggerModule = _ts_decorate4([
     ]
   })
 ], 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