@rsdk/logging 5.12.0-next.4 → 5.12.0-next.6

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { DEFAULT_LEVEL } from './defaults';
 export { PinoLogger } from './implementations/pino-logger.class';
-export { LogLevel, Params, LoggerOptions, LoggingContext, OnMessage, LoggerSerealizerMetadata, } from './types';
+export { LogLevel, Params, LoggerOptions, LoggingContext, OnMessage, LoggerSerializerMetadata, LogTimestampFormat, } from './types';
 export { ILogger, ILogSerializer, LogSerializerBase } from './logger.interface';
 export { stringifyContext } from './helpers';
 export { LoggerFactory } from './logger.factory';

package/dist/index.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogSerializer = exports.LoggerFactory = exports.stringifyContext = exports.LogLevel = exports.PinoLogger = exports.DEFAULT_LEVEL = void 0;
+exports.LogSerializer = exports.LoggerFactory = exports.stringifyContext = exports.LogTimestampFormat = exports.LogLevel = exports.PinoLogger = exports.DEFAULT_LEVEL = void 0;
 var defaults_1 = require("./defaults");
 Object.defineProperty(exports, "DEFAULT_LEVEL", { enumerable: true, get: function () { return defaults_1.DEFAULT_LEVEL; } });
 var pino_logger_class_1 = require("./implementations/pino-logger.class");
 Object.defineProperty(exports, "PinoLogger", { enumerable: true, get: function () { return pino_logger_class_1.PinoLogger; } });
 var types_1 = require("./types");
 Object.defineProperty(exports, "LogLevel", { enumerable: true, get: function () { return types_1.LogLevel; } });
+Object.defineProperty(exports, "LogTimestampFormat", { enumerable: true, get: function () { return types_1.LogTimestampFormat; } });
 var helpers_1 = require("./helpers");
 Object.defineProperty(exports, "stringifyContext", { enumerable: true, get: function () { return helpers_1.stringifyContext; } });
 var logger_factory_1 = require("./logger.factory");

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,uCAA2C;AAAlC,yGAAA,aAAa,OAAA;AAEtB,yEAAiE;AAAxD,+GAAA,UAAU,OAAA;AACnB,iCAOiB;AANf,iGAAA,QAAQ,OAAA;AAQV,qCAA6C;AAApC,2GAAA,gBAAgB,OAAA;AACzB,mDAAiD;AAAxC,+GAAA,aAAa,OAAA;AACtB,kFAAsE;AAA7D,yHAAA,aAAa,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,uCAA2C;AAAlC,yGAAA,aAAa,OAAA;AAEtB,yEAAiE;AAAxD,+GAAA,UAAU,OAAA;AACnB,iCAQiB;AAPf,iGAAA,QAAQ,OAAA;AAMR,2GAAA,kBAAkB,OAAA;AAGpB,qCAA6C;AAApC,2GAAA,gBAAgB,OAAA;AACzB,mDAAiD;AAAxC,+GAAA,aAAa,OAAA;AACtB,kFAAsE;AAA7D,yHAAA,aAAa,OAAA"}

package/dist/logger.factory.d.ts

@@ -6,6 +6,8 @@ import type { LoggerOptions, LoggingContext, OnMessage } from './types';
  */
 export declare class LoggerFactory {
     private static readonly events;
+    private static readonly opts;
+    private static pinoTimestampFormatMap;
     /**
      * Under the hood every logger instance will use this
      * static instance. Motivation for this is that it's much
@@ -17,7 +19,7 @@ export declare class LoggerFactory {
      */
     private static _globalPino;
     private static _serializers;
-    private static readonly opts;
+    private static get pinoConfig();
     /**
      * Переконфигурация pino нужна потому, что изначально логгер инициализируется
      * с дефолтными настройками, т. к. конфигурация ещё не прочитана.

package/dist/logger.factory.js

@@ -5,6 +5,7 @@ const node_events_1 = require("node:events");
 const logger_metadata_registry_1 = require("./metadata/logger-metadata.registry");
 const defaults_1 = require("./defaults");
 const implementations_1 = require("./implementations");
+const types_1 = require("./types");
 /**
  * ATTENTION: require('pino') тут не просто так, в общем они нужны для корректной работы хуков из `@opentelemetry/instrumentation-pino`
  */
@@ -19,6 +20,18 @@ const requirePino = () => {
 class LoggerFactory {
     // eslint-disable-next-line unicorn/prefer-event-target
     static events = new node_events_1.EventEmitter();
+    static opts = {
+        level: defaults_1.DEFAULT_LEVEL,
+        redact: [],
+        stream: requirePino().destination(),
+        timestampFormat: types_1.LogTimestampFormat.isoTime,
+    };
+    static pinoTimestampFormatMap = {
+        [types_1.LogTimestampFormat.epochTime]: requirePino().stdTimeFunctions.epochTime,
+        [types_1.LogTimestampFormat.unixTime]: requirePino().stdTimeFunctions.unixTime,
+        [types_1.LogTimestampFormat.nullTime]: requirePino().stdTimeFunctions.nullTime,
+        [types_1.LogTimestampFormat.isoTime]: requirePino().stdTimeFunctions.isoTime,
+    };
     /**
      * Under the hood every logger instance will use this
      * static instance. Motivation for this is that it's much
@@ -31,13 +44,16 @@ class LoggerFactory {
     // eslint-disable-next-line @typescript-eslint/no-require-imports
     static _globalPino = requirePino()({
         level: defaults_1.DEFAULT_LEVEL,
+        timestamp: this.pinoTimestampFormatMap[this.opts.timestampFormat],
     });
     static _serializers = null;
-    static opts = {
-        level: defaults_1.DEFAULT_LEVEL,
-        redact: [],
-        stream: requirePino().destination(),
-    };
+    static get pinoConfig() {
+        const { timestampFormat, ...other } = this.opts;
+        return {
+            ...other,
+            timestamp: this.pinoTimestampFormatMap[timestampFormat],
+        };
+    }
     /**
      * Переконфигурация pino нужна потому, что изначально логгер инициализируется
      * с дефолтными настройками, т. к. конфигурация ещё не прочитана.
@@ -47,7 +63,7 @@ class LoggerFactory {
      */
     static reconfigure(opts) {
         this.applyOptions(opts);
-        const { stream, ...other } = this.opts;
+        const { stream, ...other } = this.pinoConfig;
         this._globalPino = requirePino()(other, stream);
     }
     /**
@@ -70,6 +86,7 @@ class LoggerFactory {
         // eslint-disable-next-line @typescript-eslint/no-require-imports
         this._globalPino = requirePino()({
             ...other,
+            timestamp: this.pinoTimestampFormatMap[this.opts.timestampFormat],
             /**
              * Функция которая позволяет добавить дополнительные данные в логи Pino
              */
@@ -80,13 +97,11 @@ class LoggerFactory {
                      * https://getpino.io/#/docs/api?id=logmethod
                      */
                     logMethod: function (inputArgs, method) {
-                        if (inputArgs.length >= 2) {
-                            const arg1 = inputArgs.shift() || {};
-                            const arg2 = inputArgs.shift();
+                        const arg1 = inputArgs[0];
+                        if (arg1 && typeof arg1 === 'object') {
                             logHookFunction(arg1);
-                            // eslint-disable-next-line unicorn/prefer-reflect-apply
-                            return method.apply(this, [arg1, arg2, ...inputArgs]);
                         }
+                        // eslint-disable-next-line unicorn/prefer-reflect-apply
                         return method.apply(this, inputArgs);
                     },
                 }
@@ -144,8 +159,13 @@ class LoggerFactory {
         return this._serializers.has(name);
     }
     static applyOptions(opts) {
-        const { redact, level, stream = requirePino().destination() } = opts || {};
-        Object.assign(this.opts, { redact, level: level ?? defaults_1.DEFAULT_LEVEL, stream });
+        const { redact, level, stream, timestampFormat } = opts || {};
+        Object.assign(this.opts, {
+            redact,
+            level: level ?? defaults_1.DEFAULT_LEVEL,
+            stream: stream ?? requirePino().destination(),
+            timestampFormat: timestampFormat ?? requirePino().stdTimeFunctions.isoTime,
+        });
     }
 }
 exports.LoggerFactory = LoggerFactory;

package/dist/logger.factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.factory.js","sourceRoot":"","sources":["../src/logger.factory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"logger.factory.js","sourceRoot":"","sources":["../src/logger.factory.ts"],"names":[],"mappings":"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"}

package/dist/metadata/logger-metadata.registry.d.ts

@@ -1,7 +1,7 @@
 import type { Constructor } from '@rsdk/common';
-import type { LoggerSerealizerMetadata } from '../types';
+import type { LoggerSerializerMetadata } from '../types';
 export declare class LoggerMetadataRegistry {
     private static readonly serializers;
-    static registerSerializer(target: Constructor, metadata: LoggerSerealizerMetadata): void;
-    static getSerializers(): LoggerSerealizerMetadata[];
+    static registerSerializer(target: Constructor, metadata: LoggerSerializerMetadata): void;
+    static getSerializers(): LoggerSerializerMetadata[];
 }

package/dist/types.d.ts

@@ -8,14 +8,22 @@ export declare enum LogLevel {
     debug = "debug",
     trace = "trace"
 }
+export declare enum LogTimestampFormat {
+    epochTime = "epochTime",
+    unixTime = "unixTime",
+    nullTime = "nullTime",
+    isoTime = "isoTime"
+}
+export type TimeFn = () => string;
 export type Params = Record<string, unknown>;
 export interface LoggerOptions {
     level: LogLevel;
     redact: string[];
     stream: pino.DestinationStream;
+    timestampFormat: LogTimestampFormat;
 }
 export type LoggingContext = string | Constructor;
 export type OnMessage = (level: LogLevel, data: Record<string, unknown>) => void;
-export interface LoggerSerealizerMetadata {
+export interface LoggerSerializerMetadata {
     target: Constructor;
 }

package/dist/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogLevel = void 0;
+exports.LogTimestampFormat = exports.LogLevel = void 0;
 var LogLevel;
 (function (LogLevel) {
     LogLevel["fatal"] = "fatal";
@@ -10,4 +10,11 @@ var LogLevel;
     LogLevel["debug"] = "debug";
     LogLevel["trace"] = "trace";
 })(LogLevel || (exports.LogLevel = LogLevel = {}));
+var LogTimestampFormat;
+(function (LogTimestampFormat) {
+    LogTimestampFormat["epochTime"] = "epochTime";
+    LogTimestampFormat["unixTime"] = "unixTime";
+    LogTimestampFormat["nullTime"] = "nullTime";
+    LogTimestampFormat["isoTime"] = "isoTime";
+})(LogTimestampFormat || (exports.LogTimestampFormat = LogTimestampFormat = {}));
 //# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAGA,IAAY,QAOX;AAPD,WAAY,QAAQ;IAClB,2BAAe,CAAA;IACf,2BAAe,CAAA;IACf,yBAAa,CAAA;IACb,yBAAa,CAAA;IACb,2BAAe,CAAA;IACf,2BAAe,CAAA;AACjB,CAAC,EAPW,QAAQ,wBAAR,QAAQ,QAOnB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAGA,IAAY,QAOX;AAPD,WAAY,QAAQ;IAClB,2BAAe,CAAA;IACf,2BAAe,CAAA;IACf,yBAAa,CAAA;IACb,yBAAa,CAAA;IACb,2BAAe,CAAA;IACf,2BAAe,CAAA;AACjB,CAAC,EAPW,QAAQ,wBAAR,QAAQ,QAOnB;AAED,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,6CAAuB,CAAA;IACvB,2CAAqB,CAAA;IACrB,2CAAqB,CAAA;IACrB,yCAAmB,CAAA;AACrB,CAAC,EALW,kBAAkB,kCAAlB,kBAAkB,QAK7B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/logging",
-  "version": "5.12.0-next.4",
+  "version": "5.12.0-next.6",
   "description": "Base framework independent logging functionality",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -18,5 +18,5 @@
     "reflect-metadata": "^0.1.12 || ^0.2.0",
     "rxjs": "^7.1.0"
   },
-  "gitHead": "7d42d139bc812ac8526d6d9848d24165f8e15a20"
+  "gitHead": "32103725bddbe5e7e99074ba40b5032dc14cf60c"
 }

package/src/decorators/log-serializer.decorator.ts

@@ -4,12 +4,12 @@ import 'reflect-metadata';
 
 import { LOGGER_METADATA_KEY } from '../metadata/constants';
 import { LoggerMetadataRegistry } from '../metadata/logger-metadata.registry';
-import type { LoggerSerealizerMetadata } from '../types';
+import type { LoggerSerializerMetadata } from '../types';
 
 const logSerializerDecorator: ClassDecorator = function (
   target: Function,
 ): void {
-  const metadata: LoggerSerealizerMetadata = {
+  const metadata: LoggerSerializerMetadata = {
     target: target as Constructor,
   };
 

package/src/index.ts

@@ -7,7 +7,8 @@ export {
   LoggerOptions,
   LoggingContext,
   OnMessage,
-  LoggerSerealizerMetadata,
+  LoggerSerializerMetadata,
+  LogTimestampFormat,
 } from './types';
 export { ILogger, ILogSerializer, LogSerializerBase } from './logger.interface';
 export { stringifyContext } from './helpers';

package/src/logger.factory.ts

@@ -1,6 +1,10 @@
 import { EventEmitter } from 'node:events';
 import type _pino from 'pino';
-import type { Logger as Pino } from 'pino';
+import type {
+  DestinationStream,
+  Logger as Pino,
+  LoggerOptions as LoggerOptsPino,
+} from 'pino';
 
 import { LoggerMetadataRegistry } from './metadata/logger-metadata.registry';
 import { DEFAULT_LEVEL } from './defaults';
@@ -8,11 +12,13 @@ import { PinoLogger } from './implementations';
 import type { ILogger, LogSerializerBase } from './logger.interface';
 import type {
   LoggerOptions,
-  LoggerSerealizerMetadata,
+  LoggerSerializerMetadata,
   LoggingContext,
   LogLevel,
   OnMessage,
+  TimeFn,
 } from './types';
+import { LogTimestampFormat } from './types';
 
 /**
  * ATTENTION: require('pino') тут не просто так, в общем они нужны для корректной работы хуков из `@opentelemetry/instrumentation-pino`
@@ -30,6 +36,20 @@ export class LoggerFactory {
   // eslint-disable-next-line unicorn/prefer-event-target
   private static readonly events = new EventEmitter();
 
+  private static readonly opts: LoggerOptions = {
+    level: DEFAULT_LEVEL,
+    redact: [],
+    stream: requirePino().destination(),
+    timestampFormat: LogTimestampFormat.isoTime,
+  };
+
+  private static pinoTimestampFormatMap: Record<LogTimestampFormat, TimeFn> = {
+    [LogTimestampFormat.epochTime]: requirePino().stdTimeFunctions.epochTime,
+    [LogTimestampFormat.unixTime]: requirePino().stdTimeFunctions.unixTime,
+    [LogTimestampFormat.nullTime]: requirePino().stdTimeFunctions.nullTime,
+    [LogTimestampFormat.isoTime]: requirePino().stdTimeFunctions.isoTime,
+  };
+
   /**
    * Under the hood every logger instance will use this
    * static instance. Motivation for this is that it's much
@@ -42,15 +62,21 @@ export class LoggerFactory {
   // eslint-disable-next-line @typescript-eslint/no-require-imports
   private static _globalPino: Pino = requirePino()({
     level: DEFAULT_LEVEL,
+    timestamp: this.pinoTimestampFormatMap[this.opts.timestampFormat],
   });
 
   private static _serializers: Map<string, LogSerializerBase> | null = null;
 
-  private static readonly opts: LoggerOptions = {
-    level: DEFAULT_LEVEL,
-    redact: [],
-    stream: requirePino().destination(),
-  };
+  private static get pinoConfig(): LoggerOptsPino & {
+    stream: DestinationStream;
+  } {
+    const { timestampFormat, ...other } = this.opts;
+
+    return {
+      ...other,
+      timestamp: this.pinoTimestampFormatMap[timestampFormat],
+    };
+  }
 
   /**
    * Переконфигурация pino нужна потому, что изначально логгер инициализируется
@@ -62,7 +88,7 @@ export class LoggerFactory {
   static reconfigure(opts: Partial<LoggerOptions>): void {
     this.applyOptions(opts);
 
-    const { stream, ...other } = this.opts;
+    const { stream, ...other } = this.pinoConfig;
 
     this._globalPino = requirePino()(other, stream);
   }
@@ -91,6 +117,7 @@ export class LoggerFactory {
     this._globalPino = requirePino()(
       {
         ...other,
+        timestamp: this.pinoTimestampFormatMap[this.opts.timestampFormat],
 
         /**
          * Функция которая позволяет добавить дополнительные данные в логи Pino
@@ -105,15 +132,11 @@ export class LoggerFactory {
                 inputArgs: any[],
                 method: Function,
               ): unknown {
-                if (inputArgs.length >= 2) {
-                  const arg1: T = inputArgs.shift() || {};
-                  const arg2 = inputArgs.shift();
-
-                  logHookFunction(arg1);
-
-                  // eslint-disable-next-line unicorn/prefer-reflect-apply
-                  return method.apply(this, [arg1, arg2, ...inputArgs]);
+                const arg1 = inputArgs[0];
+                if (arg1 && typeof arg1 === 'object') {
+                  logHookFunction(arg1 as T);
                 }
+                // eslint-disable-next-line unicorn/prefer-reflect-apply
                 return method.apply(this, inputArgs);
               },
             }
@@ -139,7 +162,7 @@ export class LoggerFactory {
   static getSerializers(): LogSerializerBase[] {
     if (this._serializers) return Array.from(this._serializers.values());
 
-    const metas: LoggerSerealizerMetadata[] =
+    const metas: LoggerSerializerMetadata[] =
       LoggerMetadataRegistry.getSerializers();
 
     this._serializers = new Map<string, LogSerializerBase>();
@@ -189,8 +212,14 @@ export class LoggerFactory {
   }
 
   private static applyOptions(opts: Partial<LoggerOptions>): void {
-    const { redact, level, stream = requirePino().destination() } = opts || {};
-
-    Object.assign(this.opts, { redact, level: level ?? DEFAULT_LEVEL, stream });
+    const { redact, level, stream, timestampFormat } = opts || {};
+
+    Object.assign(this.opts, {
+      redact,
+      level: level ?? DEFAULT_LEVEL,
+      stream: stream ?? requirePino().destination(),
+      timestampFormat:
+        timestampFormat ?? requirePino().stdTimeFunctions.isoTime,
+    });
   }
 }

package/src/metadata/logger-metadata.registry.ts

@@ -1,21 +1,21 @@
 import type { Constructor } from '@rsdk/common';
 
-import type { LoggerSerealizerMetadata } from '../types';
+import type { LoggerSerializerMetadata } from '../types';
 
 export class LoggerMetadataRegistry {
   private static readonly serializers = new Map<
     Constructor,
-    LoggerSerealizerMetadata
+    LoggerSerializerMetadata
   >();
 
   static registerSerializer(
     target: Constructor,
-    metadata: LoggerSerealizerMetadata,
+    metadata: LoggerSerializerMetadata,
   ): void {
     this.serializers.set(target, metadata);
   }
 
-  static getSerializers(): LoggerSerealizerMetadata[] {
+  static getSerializers(): LoggerSerializerMetadata[] {
     return Array.from(this.serializers.values());
   }
 }

package/src/types.ts

@@ -10,12 +10,21 @@ export enum LogLevel {
   trace = 'trace',
 }
 
+export enum LogTimestampFormat {
+  epochTime = 'epochTime',
+  unixTime = 'unixTime',
+  nullTime = 'nullTime',
+  isoTime = 'isoTime',
+}
+export type TimeFn = () => string;
+
 export type Params = Record<string, unknown>;
 
 export interface LoggerOptions {
   level: LogLevel;
   redact: string[];
   stream: pino.DestinationStream;
+  timestampFormat: LogTimestampFormat;
 }
 
 export type LoggingContext = string | Constructor;
@@ -25,6 +34,6 @@ export type OnMessage = (
   data: Record<string, unknown>,
 ) => void;
 
-export interface LoggerSerealizerMetadata {
+export interface LoggerSerializerMetadata {
   target: Constructor;
 }