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

package/dist/index.d.cts

@@ -1,30 +1,14 @@
 import { LoggerService, LogLevel, NestMiddleware } from '@nestjs/common';
 import { Logger } from 'pino';
+import { RequestContextService, ObservableService } from '@lark-apaas/nestjs-common';
 import { Request, Response, NextFunction } from 'express';
 
-interface RequestContextState {
-    requestId: string;
-    path?: string;
-    method?: string;
-    userId?: string;
-    appId?: string;
-    tenantId?: string;
-    ip?: string;
-    [key: string]: unknown;
-}
-declare class RequestContextService {
-    private readonly storage;
-    run<T>(context: RequestContextState, callback: () => T): T;
-    setContext(partial: Partial<RequestContextState>): void;
-    getContext(): RequestContextState | undefined;
-    get<K extends keyof RequestContextState>(key: K): RequestContextState[K] | undefined;
-}
-
 declare abstract class BasePinoLogger implements LoggerService {
     protected readonly logger: Logger;
     protected readonly contextStore: RequestContextService;
+    protected readonly observableService: ObservableService;
     private readonly levelState;
-    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;
@@ -46,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,30 +1,14 @@
 import { LoggerService, LogLevel, NestMiddleware } from '@nestjs/common';
 import { Logger } from 'pino';
+import { RequestContextService, ObservableService } from '@lark-apaas/nestjs-common';
 import { Request, Response, NextFunction } from 'express';
 
-interface RequestContextState {
-    requestId: string;
-    path?: string;
-    method?: string;
-    userId?: string;
-    appId?: string;
-    tenantId?: string;
-    ip?: string;
-    [key: string]: unknown;
-}
-declare class RequestContextService {
-    private readonly storage;
-    run<T>(context: RequestContextState, callback: () => T): T;
-    setContext(partial: Partial<RequestContextState>): void;
-    getContext(): RequestContextState | undefined;
-    get<K extends keyof RequestContextState>(key: K): RequestContextState[K] | undefined;
-}
-
 declare abstract class BasePinoLogger implements LoggerService {
     protected readonly logger: Logger;
     protected readonly contextStore: RequestContextService;
+    protected readonly observableService: ObservableService;
     private readonly levelState;
-    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;
@@ -46,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";
@@ -14370,17 +14370,14 @@ var require_operators = __commonJS({
 });
 
 // src/service/app-logger.service.ts
-import { Inject, Injectable as Injectable2, Logger } from "@nestjs/common";
-import { inspect } from "util";
+import { Inject, Injectable, Logger } from "@nestjs/common";
 
 // 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/request-context.service.ts
-import { Injectable } from "@nestjs/common";
-import { AsyncLocalStorage } from "async_hooks";
+// src/service/app-logger.service.ts
+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);
@@ -14388,43 +14385,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 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([
-  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);
 }
@@ -14532,10 +14492,12 @@ var BasePinoLogger = class _BasePinoLogger {
   }
   logger;
   contextStore;
+  observableService;
   levelState = new LogLevelState();
-  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);
@@ -14599,6 +14561,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,
@@ -14606,12 +14588,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) {
@@ -14622,10 +14605,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) {
@@ -14654,7 +14641,7 @@ var BasePinoLogger = class _BasePinoLogger {
       extras: params
     };
   }
-  buildMessagePayload(message, extras) {
+  buildMessagePayload(message) {
     if (message instanceof Error) {
       return {
         messageText: message.message,
@@ -14662,17 +14649,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) {
@@ -14695,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_decorate2([
-  Injectable2(),
+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);
@@ -14732,18 +14712,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 inspect(param, inspectOptions);
-}
-__name(stringifyParam, "stringifyParam");
 function sanitizeValue(value) {
   if (value === null || value === void 0) {
     return value;
@@ -14769,6 +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 { 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);
@@ -14804,15 +14773,16 @@ var logger_config_default = (0, import_config.registerAs)("logger", () => {
 // src/interceptor/logging.interceptor.ts
 var import_config2 = __toESM(require_config2(), 1);
 var import_operators = __toESM(require_operators(), 1);
-import { Inject as Inject2, Injectable as Injectable3 } from "@nestjs/common";
+import { Inject as Inject2, Injectable as Injectable2 } from "@nestjs/common";
 import { format } from "util";
-function _ts_decorate3(decorators, target, key, desc) {
+import { RequestContextService as RequestContextService2 } from "@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);
 }
@@ -14961,20 +14931,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([
-  Injectable3(),
+LoggingInterceptor = _ts_decorate2([
+  Injectable2(),
   _ts_param2(0, Inject2(TRACE_LOGGER)),
   _ts_param2(2, Inject2(AppLogger)),
   _ts_param2(3, Inject2(logger_config_default.KEY)),
   _ts_metadata2("design:type", Function),
   _ts_metadata2("design:paramtypes", [
     typeof PinoLoggerService === "undefined" ? Object : PinoLoggerService,
-    typeof RequestContextService === "undefined" ? Object : RequestContextService,
+    typeof RequestContextService2 === "undefined" ? Object : RequestContextService2,
     typeof AppLogger === "undefined" ? Object : AppLogger,
     typeof import_config2.ConfigType === "undefined" ? Object : import_config2.ConfigType
   ])
@@ -15031,15 +15002,16 @@ function createFileDestination(pathname) {
 __name(createFileDestination, "createFileDestination");
 
 // src/middleware/logger-context.middleware.ts
-import { Injectable as Injectable4 } from "@nestjs/common";
+import { Injectable as Injectable3 } from "@nestjs/common";
 import { randomUUID } from "crypto";
-function _ts_decorate4(decorators, target, key, desc) {
+import { RequestContextService as RequestContextService3 } from "@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);
 }
@@ -15054,51 +15026,44 @@ 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_decorate4([
-  Injectable4(),
+LoggerContextMiddleware = _ts_decorate3([
+  Injectable3(),
   _ts_metadata3("design:type", Function),
   _ts_metadata3("design:paramtypes", [
-    typeof RequestContextService === "undefined" ? Object : RequestContextService
+    typeof RequestContextService3 === "undefined" ? Object : RequestContextService3
   ])
 ], 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([
+LoggerModule = _ts_decorate4([
   Global(),
   Module({
     imports: [
       import_config3.ConfigModule.forFeature(logger_config_default)
     ],
     providers: [
-      RequestContextService,
       LoggerContextMiddleware,
       {
         provide: PINO_ROOT_LOGGER,
@@ -15114,13 +15079,14 @@ LoggerModule = _ts_decorate5([
       },
       {
         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: [
-          RequestContextService,
-          logger_config_default.KEY
+          RequestContextService4,
+          logger_config_default.KEY,
+          OBSERVABLE_SERVICE2
         ]
       },
       AppLogger,
@@ -15133,7 +15099,6 @@ LoggerModule = _ts_decorate5([
     exports: [
       AppLogger,
       TRACE_LOGGER,
-      RequestContextService,
       LoggerContextMiddleware
     ]
   })