nestjs-fox-logger 0.0.2 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nestjs-fox-logger",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Модуль логгера для Nestj.js",
   "author": "Semen Kononets <sploit.strannik@gmail.com, s.d.kononets@foxford.ru>",
   "license": "MIT",

package/src/fox-logger.interfaces.ts

@@ -1,7 +1,9 @@
 import { ModuleMetadata, Provider, Type } from '@nestjs/common';
+import { ClsService } from 'nestjs-cls';
 
 export interface FoxLoggerServiceOptions {
   name?: string;
+  cls?: ClsService;
   timestamp?: boolean;
 }
 

package/src/fox-logger.service.spec.ts

@@ -16,8 +16,9 @@ describe('FoxLoggerService', () => {
         ClsModule.forRoot({
           global: true,
         }),
-        FoxLoggerModule.forFeature({
-          name: 'TEST',
+        FoxLoggerModule.forFeatureAsync({
+          useFactory: (cls: ClsService) => ({ name: 'TEST', cls }),
+          inject: [ClsService],
         }),
       ],
       providers: [FoxLoggerService, ClsService],

package/src/fox-logger.service.ts

@@ -6,95 +6,93 @@ import { FoxLoggerServiceOptions } from './fox-logger.interfaces';
 
 @Injectable()
 export class FoxLoggerService extends Logger {
-  private readonly name?: string;
+  private readonly $name?: string;
+  private readonly cls?: ClsService;
 
   constructor(
     @Inject(FOXLOGGER_SERVICE_OPTIONS)
     readonly options: FoxLoggerServiceOptions,
-    private readonly cls?: ClsService,
   ) {
     super();
-    this.name = options.name;
+    this.$name = options.name;
+    this.cls = options.cls;
+  }
+
+  /**
+   * Вынимаем данные из разных объектов ошибок
+   * и не только, со статусом и пр.
+   */
+  static FormatObjectMessage(msg: object) {
+    const prefix = [
+      'statusCode' in msg && `[${msg.statusCode}]`,
+      'status' in msg && `[${msg.status}]`,
+      'error' in msg && `[${msg.error}]`,
+    ].filter(Boolean);
+    if (prefix.length > 0) prefix.push(': ');
+    const message = [
+      msg['response']?.['data']?.['message'] && `: ${msg['data']['message']}`,
+      msg['data']?.['message'] && `: ${msg['data']['message']}`,
+      msg['message'] && `${msg['message']}`,
+      msg['msg'] && `${msg['msg']}`,
+    ].filter(Boolean);
+    /** Если есть, что отдавать - пишем */
+    if (prefix.length + message.length > 0) {
+      return prefix.join(``) + message.join(' ');
+    }
+    return JSON.stringify(msg);
   }
 
   /** Получение сообщения из разных видов данных  */
-  static FormatMsg(msg: unknown) {
+  static FormatMessage(msg: unknown) {
     /** делаем сообщение из разных типов данных */
     switch (typeof msg) {
-      case 'string':
-        return msg;
-      case 'number':
-      case 'bigint':
-      case 'boolean':
-      case 'symbol':
-      case 'undefined':
-      case 'function':
-        return String(msg);
       case 'object':
-        /**
-         * Вынимаем данные из разных объектов ошибок
-         * и не только, со статусом и пр.
-         */
-        const prefix = [
-          'statusCode' in msg && `[${msg.statusCode}]`,
-          'status' in msg && `[${msg.status}]`,
-          'error' in msg && `[${msg.error}]`,
-        ].filter(Boolean);
-        if (prefix.length > 0) prefix.push(': ');
-        const message = [
-          msg['response']?.['data']?.['message'] &&
-            `: ${msg['data']['message']}`,
-          msg['data']?.['message'] && `: ${msg['data']['message']}`,
-          msg['message'] && `${msg['message']}`,
-          msg['msg'] && `${msg['msg']}`,
-        ].filter(Boolean);
-        /** Если есть, что отдавать - пишем-с */
-        if (prefix.length + message.length > 0) {
-          return prefix.join(``) + message.join(' ');
+        if (Array.isArray(msg)) {
+          return msg.map(this.FormatObjectMessage).join(`\n`);
         }
-      /** В противном случае */
+        return this.FormatObjectMessage(msg);
       default:
-        JSON.stringify(msg);
+        return String(msg);
     }
   }
 
   /** Задаем префикс на базе имени, cls и возможного id */
   private getPrefix(eventId?: string) {
     return (
-      `${this.name ? `[${this.name}]` : ``}` +
-      `${this.cls.getId() ? `[${this.cls.getId()}]` : ''}` +
+      `${this.$name ? `[${this.$name}]` : ``}` +
+      `${this.cls?.getId() ? `[${this.cls?.getId()}]` : ''}` +
       `${eventId ? `[${eventId}]` : ``}`
     );
   }
 
   public log(msg: any, eventId?: string) {
     return Logger.log(
-      this.getPrefix(eventId) + `: ` + FoxLoggerService.FormatMsg(msg),
+      `${this.getPrefix(eventId)}: ${FoxLoggerService.FormatMessage(msg)}`,
     );
   }
   public warn(msg: any, eventId?: string) {
     return Logger.warn(
-      this.getPrefix(eventId) + `: ` + FoxLoggerService.FormatMsg(msg),
+      `${this.getPrefix(eventId)}: ${FoxLoggerService.FormatMessage(msg)}`,
     );
   }
   public debug(msg: any, eventId?: string) {
     return Logger.debug(
-      this.getPrefix(eventId) + `: ` + FoxLoggerService.FormatMsg(msg),
+      `${this.getPrefix(eventId)}: ${FoxLoggerService.FormatMessage(msg)}`,
     );
   }
   public error(msg: any, eventId?: string) {
     return Logger.error(
-      this.getPrefix(eventId) + `: ` + FoxLoggerService.FormatMsg(msg),
+      `${this.getPrefix(eventId)}: ${FoxLoggerService.FormatMessage(msg)}`,
     );
   }
   public verbose(msg: any, eventId?: string) {
     return Logger.verbose(
-      this.getPrefix(eventId) + `: ` + FoxLoggerService.FormatMsg(msg),
+      `${this.getPrefix(eventId)}: ${FoxLoggerService.FormatMessage(msg)}`,
     );
   }
   public fatal(msg: any, eventId?: string) {
     return Logger.fatal(
-      this.getPrefix(eventId) + `: ` + FoxLoggerService.FormatMsg(msg),
+      `${this.getPrefix(eventId)}: ${FoxLoggerService.FormatMessage(msg)}`,
     );
   }
 }