@xrystal/core 3.17.6 → 3.17.9

package/package.json

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

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

@@ -4,6 +4,7 @@ export default class ConfigsService implements IService {
     #private;
     private config;
     publicFolderName: string;
+    kafkaLogsTopic: string;
     constructor({ systemService }: {
         systemService: SystemService;
     });

package/source/loader/configs/index.js

@@ -1,8 +1,9 @@
 import path from 'node:path';
-import { publicFolderName } from '../../utils';
+import { kafkaLogsTopic, publicFolderName } from '../../utils';
 export default class ConfigsService {
     config = {};
     publicFolderName = publicFolderName;
+    kafkaLogsTopic = kafkaLogsTopic;
     #systemService;
     constructor({ systemService }) {
         this.#systemService = systemService;
@@ -26,6 +27,8 @@ export default class ConfigsService {
             projectNameSuffixEnv: process.env.PROJECT_NAME_SUFFIX || '',
             systemStaticFolderPath: path.resolve(rawConfigs.rootFolderPath, this.publicFolderName),
             systemLoggerLayer: process.env.SYSTEM_LOGGER_LAYER,
+            kafkaBrokers: process.env?.KAFKA_BROKERS,
+            kafkaLogsTopic: kafkaLogsTopic,
             baseApiUri: process.env.HTTPS === 'true' ? process.env.SYSTEM_HTTPS_BASE_API_URI : process.env.SYSTEM_BASE_API_URI,
             port: process.env.PORT || rawConfigs.port || 3000,
             internalSecret: process.env.INTERNAL_SECRET,

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

@@ -20,7 +20,9 @@ export default class LoggerService implements IService {
     private kafkaTopic;
     private isKafkaReady;
     winston: CustomLogger;
-    constructor(deps: any);
+    constructor({ configsService }: {
+        configsService: any;
+    });
     load: (config: Record<string, any>) => Promise<void>;
     winstonLoader: ({ loadPath, loggerLevel }: {
         loadPath: string;
@@ -30,7 +32,7 @@ export default class LoggerService implements IService {
     private getTracingFormat;
     private getConsoleFormat;
     runWithId: <T>(id: string, callback: () => T) => T;
-    private logToKafka;
+    logToKafka(info: any): Promise<void>;
     log(level: LoggerLayerEnum, message: any, payload?: any, code?: string | number): void;
     log(options: LogOptions): void;
 }

package/source/loader/logger/index.js

@@ -39,23 +39,20 @@ export default class LoggerService {
     isKafkaReady = false;
     winston;
     #configsService;
-    constructor(deps) {
-        if (!deps || !deps.configsService) {
-            throw new Error("LoggerService: configsService is required");
-        }
-        this.#configsService = deps.configsService;
+    constructor({ configsService }) {
+        this.#configsService = configsService;
+        this.kafkaTopic = this.#configsService?.all.kafkaTopic;
         winston.addColors(customColors);
         this.winston = winston.createLogger({
-            level: this.#configsService.all.systemLoggerLayer || 'info',
+            level: this.#configsService.all.systemLoggerLayer,
             levels: customLevels,
             format: this.getConsoleFormat(),
             transports: [new winston.transports.Console()]
         });
     }
     load = async (config) => {
-        this.serviceName = config?.serviceName || "service";
-        this.kafkaTopic = config?.kafkaTopic || "logs";
-        const rawBrokers = config?.kafkaBrokers;
+        this.serviceName = config?.serviceName;
+        const rawBrokers = this.#configsService.all.kafkaBrokers;
         const brokers = rawBrokers ? String(rawBrokers).split(",").map((b) => b.trim()) : [];
         if (brokers.length > 0) {
             const kafka = new Kafka({
@@ -67,17 +64,13 @@ export default class LoggerService {
                 createPartitioner: Partitioners.DefaultPartitioner,
                 retry: { initialRetryTime: 500, retries: 5 }
             });
-            const connectKafka = async () => {
-                try {
-                    await this.kafkaProducer?.connect();
-                    this.isKafkaReady = true;
-                }
-                catch (err) {
-                    this.isKafkaReady = false;
-                    setTimeout(connectKafka, 10000);
-                }
-            };
-            connectKafka();
+            try {
+                await this.kafkaProducer.connect();
+                this.isKafkaReady = true;
+            }
+            catch (err) {
+                this.isKafkaReady = false;
+            }
         }
         this.winstonLoader({
             loadPath: config?.loadPath,
@@ -172,7 +165,7 @@ export default class LoggerService {
                             env: this.#configsService.all.env
                         }, this.safeReplacer)
                     }],
-                acks: 0
+                acks: 1
             });
         }
         catch (err) {
@@ -184,6 +177,7 @@ export default class LoggerService {
         const { level, message, payload, code } = isObj
             ? arg1
             : { level: arg1, message: arg2, payload: arg3, code: arg4 };
-        this.winston.log(LoggerLayerEnum[level].toLowerCase(), message, { payload, code });
+        const levelKey = typeof level === 'string' ? level.toLowerCase() : LoggerLayerEnum[level].toLowerCase();
+        this.winston.log(levelKey, message, { payload, code });
     }
 }

package/source/project/index.js

@@ -1,7 +1,6 @@
-// => import dependencies
 import path from 'path';
 import { SystemService, ConfigsService, LoggerService, EventsService, LocalizationsService, ClientsService, ControllerService } from '../loader/index';
-import { packageName, x, kafkaBrokers, systemLoggerLayer, getTmp, } from '../utils/index';
+import { packageName, x, getTmp, } from '../utils/index';
 //
 let coreHasRun = false;
 export const core = getTmp();
@@ -38,10 +37,8 @@ const coreLoader = async ({}) => {
                 service: LoggerService,
                 props: {
                     loadPath: path.join(rootFolderPath, configs.loaders.loggers.loadPath),
-                    loggerLevel: systemLoggerLayer ?? configs.loaders.loggers.logLevel,
+                    loggerLevel: configs.loaders.loggers.logLevel,
                     serviceName: configs.service,
-                    kafkaBrokers: kafkaBrokers ?? "",
-                    kafkaTopic: configs.loaders.loggers.topic
                 }
             },
             {

package/source/utils/constants/index.d.ts

@@ -5,5 +5,5 @@ export declare const tmpFileDefaultExt = ".yml";
 export declare const defaultTmpFilePath: string;
 export declare const defaultOwnerTmpFilePath: string;
 export declare const systemLoggerLayer: string;
-export declare const kafkaBrokers: string;
 export declare const publicFolderName = "public";
+export declare const kafkaLogsTopic = "logs";

package/source/utils/constants/index.js

@@ -7,5 +7,5 @@ export const tmpFileDefaultExt = '.yml';
 export const defaultTmpFilePath = path.resolve(__dirname(import.meta.url), `../../${tmpFileDefaultMainFolderName}/${tmpFileDefaultName}.yml`);
 export const defaultOwnerTmpFilePath = path.resolve(`./${tmpFileDefaultMainFolderName}/${tmpFileDefaultName}.yml`);
 export const systemLoggerLayer = process.env.SYSTEM_LOGGER_LAYER;
-export const kafkaBrokers = process.env?.KAFKA_BROKERS;
 export const publicFolderName = 'public';
+export const kafkaLogsTopic = 'logs';

package/source/utils/index.d.ts

@@ -1,3 +1,3 @@
-export * from './constants/index.js';
-export * from './helpers/index.js';
-export * from './models/index.js';
+export * from './constants';
+export * from './helpers';
+export * from './models';

package/source/utils/index.js

@@ -1,3 +1,3 @@
-export * from './constants/index.js';
-export * from './helpers/index.js';
-export * from './models/index.js';
+export * from './constants';
+export * from './helpers';
+export * from './models';