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

package/dist/index.d.cts

@@ -1,29 +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 { 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;
     private readonly levelState;
+    private readonly otelLogger;
     constructor(logger: Logger, contextStore: RequestContextService);
     setLogLevels(levels: LogLevel[]): void;
     log(message: unknown, ...optionalParams: unknown[]): void;
@@ -64,7 +49,7 @@ type RequestWithUserContext = Request & {
 declare class LoggerContextMiddleware implements NestMiddleware {
     private readonly requestContext;
     constructor(requestContext: RequestContextService);
-    use(req: RequestWithUserContext, _res: Response, next: NextFunction): void;
+    use(req: RequestWithUserContext, res: Response, next: NextFunction): void;
 }
 
 declare const TRACE_LOGGER: unique symbol;

package/dist/index.d.ts

@@ -1,29 +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 { 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;
     private readonly levelState;
+    private readonly otelLogger;
     constructor(logger: Logger, contextStore: RequestContextService);
     setLogLevels(levels: LogLevel[]): void;
     log(message: unknown, ...optionalParams: unknown[]): void;
@@ -64,7 +49,7 @@ type RequestWithUserContext = Request & {
 declare class LoggerContextMiddleware implements NestMiddleware {
     private readonly requestContext;
     constructor(requestContext: RequestContextService);
-    use(req: RequestWithUserContext, _res: Response, next: NextFunction): void;
+    use(req: RequestWithUserContext, res: Response, next: NextFunction): void;
 }
 
 declare const TRACE_LOGGER: unique symbol;

package/dist/index.js

@@ -14370,17 +14370,17 @@ var require_operators = __commonJS({
 });
 
 // src/service/app-logger.service.ts
-import { Inject, Injectable as Injectable2, Logger } from "@nestjs/common";
+import { Inject, Injectable, Logger } from "@nestjs/common";
 import { inspect } from "util";
+import { appSdk } from "@lark-apaas/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
-import { Injectable } from "@nestjs/common";
-import { AsyncLocalStorage } from "async_hooks";
+// src/service/app-logger.service.ts
+import { RequestContextService } 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 +14388,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);
 }
@@ -14533,11 +14496,13 @@ var BasePinoLogger = class _BasePinoLogger {
   logger;
   contextStore;
   levelState = new LogLevelState();
+  otelLogger = appSdk;
   constructor(logger, contextStore) {
     this.logger = logger;
     this.contextStore = contextStore;
     const pinoLevel = this.logger.level;
     const nestLevels = LogLevelState.fromPinoLevel(pinoLevel);
+    this.otelLogger.start();
     this.levelState.set(nestLevels);
   }
   setLogLevels(levels) {
@@ -14627,6 +14592,7 @@ var BasePinoLogger = class _BasePinoLogger {
     } else {
       this.logger[pinoLevel](sanitizedPayload);
     }
+    this.otelLogger.log(level, messageText ?? "", sanitizedPayload);
   }
   extractOptionalParams(optionalParams, treatStack) {
     const params = [
@@ -14700,8 +14666,8 @@ var AppLogger = class extends BasePinoLogger {
     Logger.overrideLogger(this);
   }
 };
-AppLogger = _ts_decorate2([
-  Injectable2(),
+AppLogger = _ts_decorate([
+  Injectable(),
   _ts_param(0, Inject(PINO_ROOT_LOGGER)),
   _ts_metadata("design:type", Function),
   _ts_metadata("design:paramtypes", [
@@ -14769,6 +14735,7 @@ __name(sanitizeValue, "sanitizeValue");
 var import_config3 = __toESM(require_config2(), 1);
 import { Global, Module } from "@nestjs/common";
 import { APP_INTERCEPTOR } from "@nestjs/core";
+import { RequestContextService as RequestContextService4 } from "@lark-apaas/nestjs-common";
 
 // src/config/logger.config.ts
 var import_config = __toESM(require_config2(), 1);
@@ -14804,14 +14771,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";
-function _ts_decorate3(decorators, target, key, desc) {
+import { Inject as Inject2, Injectable as Injectable2 } from "@nestjs/common";
+import { format } from "util";
+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);
 }
@@ -14935,6 +14904,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(format("HTTP request exception\nmethod=%s url=%s\nerror=%o", req.method, req.url, error), "HTTPTraceInterceptor");
       throw error;
     }));
   }
@@ -14959,20 +14929,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
   ])
@@ -15029,15 +15000,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);
 }
@@ -15050,13 +15022,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"] ?? 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,
@@ -15067,35 +15040,35 @@ var LoggerContextMiddleware = class {
     }, () => 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,
+      RequestContextService4,
       LoggerContextMiddleware,
       {
         provide: PINO_ROOT_LOGGER,
@@ -15116,7 +15089,7 @@ LoggerModule = _ts_decorate5([
           filePath: `${config.logDir}/trace.log`
         }), requestContext), "useFactory"),
         inject: [
-          RequestContextService,
+          RequestContextService4,
           logger_config_default.KEY
         ]
       },
@@ -15130,16 +15103,20 @@ LoggerModule = _ts_decorate5([
     exports: [
       AppLogger,
       TRACE_LOGGER,
-      RequestContextService,
+      RequestContextService4,
       LoggerContextMiddleware
     ]
   })
 ], 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