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

package/dist/index.d.cts

@@ -1,15 +1,14 @@
 import { LoggerService, LogLevel, NestMiddleware } from '@nestjs/common';
 import { Logger } from 'pino';
-import { RequestContextService } from '@lark-apaas/nestjs-common';
-export { RequestContextService } from '@lark-apaas/nestjs-common';
+import { RequestContextService, ObservableService } from '@lark-apaas/nestjs-common';
 import { Request, Response, NextFunction } from 'express';
 
 declare abstract class BasePinoLogger implements LoggerService {
     protected readonly logger: Logger;
     protected readonly contextStore: RequestContextService;
+    protected readonly observableService: ObservableService;
     private readonly levelState;
-    private readonly observableService;
-    constructor(logger: Logger, contextStore: RequestContextService);
+    constructor(logger: Logger, contextStore: RequestContextService, observableService: ObservableService);
     setLogLevels(levels: LogLevel[]): void;
     log(message: unknown, ...optionalParams: unknown[]): void;
     error(message: unknown, ...optionalParams: unknown[]): void;
@@ -31,7 +30,7 @@ declare abstract class BasePinoLogger implements LoggerService {
     private static looksLikeStack;
 }
 declare class AppLogger extends BasePinoLogger {
-    constructor(logger: Logger, requestContext: RequestContextService);
+    constructor(logger: Logger, observableService: ObservableService, requestContext: RequestContextService);
 }
 declare class PinoLoggerService extends BasePinoLogger {
 }

package/dist/index.d.ts

@@ -1,15 +1,14 @@
 import { LoggerService, LogLevel, NestMiddleware } from '@nestjs/common';
 import { Logger } from 'pino';
-import { RequestContextService } from '@lark-apaas/nestjs-common';
-export { RequestContextService } from '@lark-apaas/nestjs-common';
+import { RequestContextService, ObservableService } from '@lark-apaas/nestjs-common';
 import { Request, Response, NextFunction } from 'express';
 
 declare abstract class BasePinoLogger implements LoggerService {
     protected readonly logger: Logger;
     protected readonly contextStore: RequestContextService;
+    protected readonly observableService: ObservableService;
     private readonly levelState;
-    private readonly observableService;
-    constructor(logger: Logger, contextStore: RequestContextService);
+    constructor(logger: Logger, contextStore: RequestContextService, observableService: ObservableService);
     setLogLevels(levels: LogLevel[]): void;
     log(message: unknown, ...optionalParams: unknown[]): void;
     error(message: unknown, ...optionalParams: unknown[]): void;
@@ -31,7 +30,7 @@ declare abstract class BasePinoLogger implements LoggerService {
     private static looksLikeStack;
 }
 declare class AppLogger extends BasePinoLogger {
-    constructor(logger: Logger, requestContext: RequestContextService);
+    constructor(logger: Logger, observableService: ObservableService, requestContext: RequestContextService);
 }
 declare class PinoLoggerService extends BasePinoLogger {
 }

package/dist/index.js

@@ -452,7 +452,7 @@ var require_config_constants = __commonJS({
       value: true
     });
     exports.AS_PROVIDER_METHOD_KEY = exports.VALIDATED_ENV_PROPNAME = exports.PARTIAL_CONFIGURATION_PROPNAME = exports.PARTIAL_CONFIGURATION_KEY = exports.VALIDATED_ENV_LOADER = exports.CONFIGURATION_LOADER = exports.CONFIGURATION_TOKEN = exports.CONFIGURATION_SERVICE_TOKEN = void 0;
-    exports.CONFIGURATION_SERVICE_TOKEN = Symbol("CONFIG_SERVICE");
+    exports.CONFIGURATION_SERVICE_TOKEN = /* @__PURE__ */ Symbol("CONFIG_SERVICE");
     exports.CONFIGURATION_TOKEN = "CONFIGURATION_TOKEN";
     exports.CONFIGURATION_LOADER = "CONFIGURATION_LOADER";
     exports.VALIDATED_ENV_LOADER = "VALIDATED_ENV_LOADER";
@@ -14371,15 +14371,13 @@ var require_operators = __commonJS({
 
 // src/service/app-logger.service.ts
 import { Inject, Injectable, Logger } from "@nestjs/common";
-import { ObservableService } from "@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
-import { RequestContextService } from "@lark-apaas/nestjs-common";
+import { RequestContextService, OBSERVABLE_SERVICE, ObservableService } from "@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);
@@ -14494,11 +14492,12 @@ var BasePinoLogger = class _BasePinoLogger {
   }
   logger;
   contextStore;
+  observableService;
   levelState = new LogLevelState();
-  observableService = new 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);
@@ -14606,12 +14605,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 = [
@@ -14671,17 +14673,19 @@ var AppLogger = class extends BasePinoLogger {
   static {
     __name(this, "AppLogger");
   }
-  constructor(logger, requestContext) {
-    super(logger, requestContext);
+  constructor(logger, observableService, requestContext) {
+    super(logger, requestContext, observableService);
     Logger.overrideLogger(this);
   }
 };
 AppLogger = _ts_decorate([
   Injectable(),
   _ts_param(0, Inject(PINO_ROOT_LOGGER)),
+  _ts_param(1, Inject(OBSERVABLE_SERVICE)),
   _ts_metadata("design:type", Function),
   _ts_metadata("design:paramtypes", [
     typeof PinoLogger === "undefined" ? Object : PinoLogger,
+    typeof ObservableService === "undefined" ? Object : ObservableService,
     typeof RequestContextService === "undefined" ? Object : RequestContextService
   ])
 ], AppLogger);
@@ -14733,7 +14737,7 @@ __name(sanitizeValue, "sanitizeValue");
 var import_config3 = __toESM(require_config2(), 1);
 import { Global, Module } from "@nestjs/common";
 import { APP_INTERCEPTOR } from "@nestjs/core";
-import { CommonModule, RequestContextService as RequestContextService4 } from "@lark-apaas/nestjs-common";
+import { OBSERVABLE_SERVICE as OBSERVABLE_SERVICE2, RequestContextService as RequestContextService4 } from "@lark-apaas/nestjs-common";
 
 // src/config/logger.config.ts
 var import_config = __toESM(require_config2(), 1);
@@ -15022,20 +15026,14 @@ var LoggerContextMiddleware = class {
   }
   use(req, res, next) {
     const requestId = req.headers["x-tt-log-id"] ?? 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([
@@ -15063,8 +15061,7 @@ LoggerModule = _ts_decorate4([
   Global(),
   Module({
     imports: [
-      import_config3.ConfigModule.forFeature(logger_config_default),
-      CommonModule
+      import_config3.ConfigModule.forFeature(logger_config_default)
     ],
     providers: [
       LoggerContextMiddleware,
@@ -15082,13 +15079,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: [
           RequestContextService4,
-          logger_config_default.KEY
+          logger_config_default.KEY,
+          OBSERVABLE_SERVICE2
         ]
       },
       AppLogger,
@@ -15105,15 +15103,11 @@ LoggerModule = _ts_decorate4([
     ]
   })
 ], LoggerModule);
-
-// src/index.ts
-import { RequestContextService as RequestContextService5 } from "@lark-apaas/nestjs-common";
 export {
   AppLogger,
   LoggerContextMiddleware,
   LoggerModule,
   PinoLoggerService,
-  RequestContextService5 as RequestContextService,
   TRACE_LOGGER
 };
 //# sourceMappingURL=index.js.map