@xrystal/core 3.17.2 → 3.17.4

package/README.md

@@ -1,14 +1,21 @@
 ##  **DOCUMENT**
 
 # LOG Schema
+     JS
      '
-          service: this.serviceName,
+          level
+          message
+          payload?
+          code?
+     '
+     KAFKA
+     '
+          service,
           level,
-
           message,
-          ...rest,
-          timestamp: new Date().toISOString(),
-
-          id: id || null,
-          env: this.environment
+          payload,
+          code,
+          timestamp: ISO String,
+          id,
+          env
      '

package/package.json

@@ -1,7 +1,7 @@
 {
   "author": "Yusuf Yasir KAYGUSUZ",
   "name": "@xrystal/core",
-  "version": "3.17.2",
+  "version": "3.17.4",
   "description": "Project core for xrystal",
   "publishConfig": {
     "access": "public",

package/source/loader/configs/index.js

@@ -16,6 +16,8 @@ export default class ConfigsService {
             debug: process.env.SYSTEM_LOGGER_LAYER,
             https: process.env.HTTPS,
             httpsfileEncoding: process.env.ENCODING || 'utf8',
+            httpsCertfile: process.env.HTTPS_CERT_FILE,
+            httpsKeyfile: process.env.HTTPS_KEY_FILE,
             rootFolderPath: rawConfigs.rootFolderPath || 'x',
             projectName: tmp.project.name,
             serviceName: rawConfigs.service,

package/source/loader/logger/index.d.ts

@@ -2,11 +2,17 @@ import winston from "winston";
 import "winston-daily-rotate-file";
 import { AsyncLocalStorage } from "node:async_hooks";
 import ConfigsService from "../configs";
-import { IService } from "../../utils";
+import { LoggerLayerEnum, IService } from "../../utils";
 interface CustomLogger extends winston.Logger {
     critical: winston.LeveledLogMethod;
     http: winston.LeveledLogMethod;
 }
+interface LogOptions {
+    level: LoggerLayerEnum;
+    message: any;
+    payload?: any;
+    code?: string | number;
+}
 export default class LoggerService implements IService {
     #private;
     static readonly storage: AsyncLocalStorage<Map<string, string>>;
@@ -18,15 +24,17 @@ export default class LoggerService implements IService {
         configsService: ConfigsService;
     });
     load: (config: Record<string, any>) => Promise<void>;
-    private safeReplacer;
-    private getTracingFormat;
-    private getConsoleFormat;
-    winston: CustomLogger;
-    runWithId: <T>(id: string, callback: () => T) => T;
     winstonLoader: ({ loadPath, loggerLevel }: {
         loadPath: string;
         loggerLevel: string;
     }) => CustomLogger;
+    winston: CustomLogger;
+    private safeReplacer;
+    private getTracingFormat;
+    private getConsoleFormat;
+    runWithId: <T>(id: string, callback: () => T) => T;
     private logToKafka;
+    log(level: LoggerLayerEnum, message: any, payload?: any, code?: string | number): void;
+    log(options: LogOptions): void;
 }
 export {};

package/source/loader/logger/index.js

@@ -74,45 +74,6 @@ export default class LoggerService {
             loggerLevel: config?.loggerLevel
         });
     };
-    safeReplacer = (key, value) => {
-        if (value instanceof Headers)
-            return Object.fromEntries(value.entries());
-        if (value instanceof Error)
-            return { message: value.message, stack: value.stack };
-        return value;
-    };
-    getTracingFormat = format((info) => {
-        const store = LoggerService.storage.getStore();
-        if (store && store.has("correlationId")) {
-            info.id = store.get("correlationId");
-        }
-        Object.keys(info).forEach(key => {
-            if (info[key] instanceof Headers) {
-                info[key] = Object.fromEntries(info[key].entries());
-            }
-        });
-        return info;
-    });
-    getConsoleFormat() {
-        return format.combine(this.getTracingFormat(), format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }), format.colorize({ all: true }), format.printf((info) => {
-            const msg = typeof info.message === "object"
-                ? JSON.stringify(info.message, this.safeReplacer)
-                : info.message;
-            const idPart = info.id ? ` : id: ${info.id}` : "";
-            return `${info.timestamp} [${this.serviceName}] ${info.level}: ${msg}${idPart}`;
-        }));
-    }
-    winston = winston.createLogger({
-        level: "debug",
-        levels: customLevels,
-        format: this.getConsoleFormat(),
-        transports: [new winston.transports.Console()]
-    });
-    runWithId = (id, callback) => {
-        const store = new Map();
-        store.set("correlationId", id);
-        return LoggerService.storage.run(store, callback);
-    };
     winstonLoader = ({ loadPath, loggerLevel }) => {
         const { combine, timestamp, json, errors } = format;
         const tracing = this.getTracingFormat();
@@ -147,11 +108,52 @@ export default class LoggerService {
         });
         return this.winston;
     };
+    winston = winston.createLogger({
+        level: this.#configsService.all.systemLoggerLayer,
+        levels: customLevels,
+        format: this.getConsoleFormat(),
+        transports: [new winston.transports.Console()]
+    });
+    safeReplacer = (key, value) => {
+        if (value instanceof Headers)
+            return Object.fromEntries(value.entries());
+        if (value instanceof Error)
+            return { message: value.message, stack: value.stack };
+        return value;
+    };
+    getTracingFormat = format((info) => {
+        const store = LoggerService.storage.getStore();
+        if (store && store.has("correlationId")) {
+            info.id = store.get("correlationId");
+        }
+        Object.keys(info).forEach(key => {
+            if (info[key] instanceof Headers) {
+                info[key] = Object.fromEntries(info[key].entries());
+            }
+        });
+        return info;
+    });
+    getConsoleFormat() {
+        return format.combine(this.getTracingFormat(), format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }), format.colorize({ all: true }), format.printf((info) => {
+            const msg = typeof info.message === "object"
+                ? JSON.stringify(info.message, this.safeReplacer)
+                : info.message;
+            const idPart = info.id ? ` : id: ${info.id}` : "";
+            const payloadPart = info.payload ? `\nPayload: ${JSON.stringify(info.payload, this.safeReplacer)}` : "";
+            const codePart = info.code ? ` [Code: ${info.code}]` : "";
+            return `${info.timestamp} [${this.serviceName}] ${info.level}${codePart}: ${msg}${idPart}${payloadPart}`;
+        }));
+    }
+    runWithId = (id, callback) => {
+        const store = new Map();
+        store.set("correlationId", id);
+        return LoggerService.storage.run(store, callback);
+    };
     async logToKafka(info) {
         if (!this.kafkaProducer || !this.isKafkaReady)
             return;
         try {
-            const { id, level, message, ...rest } = info;
+            const { id, level, message, payload, code } = info;
             await this.kafkaProducer.send({
                 topic: this.kafkaTopic,
                 messages: [{
@@ -159,7 +161,8 @@ export default class LoggerService {
                             service: this.serviceName,
                             level,
                             message,
-                            ...rest,
+                            payload,
+                            code,
                             timestamp: new Date().toISOString(),
                             id: id || null,
                             env: this.#configsService.all.env
@@ -171,4 +174,24 @@ export default class LoggerService {
             this.isKafkaReady = false;
         }
     }
+    log(arg1, arg2, arg3, arg4) {
+        let level;
+        let message;
+        let payload;
+        let code;
+        if (typeof arg1 === 'object' && arg1 !== null && 'level' in arg1) {
+            level = arg1.level;
+            message = arg1.message;
+            payload = arg1.payload;
+            code = arg1.code;
+        }
+        else {
+            level = arg1;
+            message = arg2;
+            payload = arg3;
+            code = arg4;
+        }
+        const levelName = LoggerLayerEnum[level].toLowerCase();
+        this.winston.log(levelName, message, { payload, code });
+    }
 }