@xrystal/core 3.28.0 → 3.28.2

package/package.json

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

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

@@ -1,6 +1,5 @@
 import Configs from "../configs";
 import System from "../system";
-import KafkaForCoreSeeder from "./seeder";
 import { IProvide } from "../../utils";
 type KafkaInstanceType = {
     clientId: string;
@@ -16,13 +15,13 @@ export default class KafkaForCore implements IProvide<any> {
     private brokers;
     private username;
     private password;
-    constructor({ system, configs, kafkaForCoreSeeder }: {
+    constructor({ system, configs, }: {
         system: System;
         configs: Configs;
-        kafkaForCoreSeeder: KafkaForCoreSeeder;
     });
     onInit: ({}: {}) => Promise<void>;
     kafkaLoader: ({ clientId, brokers, username, password }: KafkaInstanceType) => Promise<any>;
+    initializeKafkaInfrastructure: () => Promise<void>;
     sendMessage: (topic: string, message: any) => Promise<void>;
     get producer(): any;
     get instance(): any;

package/source/loader/kafka/index.js

@@ -7,12 +7,10 @@ export default class KafkaForCore {
     username = null;
     password = null;
     #system;
-    #kafkaForCoreSeeder;
     #configs;
-    constructor({ system, configs, kafkaForCoreSeeder }) {
+    constructor({ system, configs, }) {
         this.#system = system;
         this.#configs = configs;
-        this.#kafkaForCoreSeeder = kafkaForCoreSeeder;
     }
     onInit = async ({}) => {
         this.clientId = this.#configs.all?.kafkaClientId;
@@ -34,7 +32,7 @@ export default class KafkaForCore {
             username: this.username,
             password: this.password
         });
-        await this.#kafkaForCoreSeeder.initializeKafkaInfrastructure();
+        await this.initializeKafkaInfrastructure();
     };
     kafkaLoader = async ({ clientId, brokers, username, password }) => {
         const kafkaConfig = {
@@ -64,6 +62,47 @@ export default class KafkaForCore {
             console.error(`Kafka ${error}`);
         }
     };
+    initializeKafkaInfrastructure = async () => {
+        const { kafkaBrokers, kafkaTopics, isKafkaPassive, } = {
+            isKafkaPassive: process.env.IS_KAFKA_PASSIVE === 'true' ? true : false,
+            kafkaBrokers: process.env?.KAFKA_BROKERS,
+            kafkaTopics: [
+                ...new Set([
+                    ...this.#configs.all.kafkaTopics
+                ])
+            ],
+        };
+        if (isKafkaPassive === true || !kafkaBrokers) {
+            return;
+        }
+        const topicsToCreate = Array.isArray(kafkaTopics) ? kafkaTopics : [];
+        if (topicsToCreate.length === 0)
+            return;
+        const admin = this._instance.admin();
+        try {
+            await admin.connect();
+            const existingTopics = await admin.listTopics();
+            const newTopics = topicsToCreate
+                .filter(topic => !existingTopics.includes(topic))
+                .map(topic => ({
+                topic,
+                numPartitions: 1,
+                replicationFactor: 1
+            }));
+            if (newTopics.length > 0) {
+                await admin.createTopics({
+                    waitForLeaders: true,
+                    topics: newTopics
+                });
+            }
+        }
+        catch (error) {
+            //console.log('Core kafka error', error)
+        }
+        finally {
+            await admin.disconnect();
+        }
+    };
     // => Helpers
     sendMessage = async (topic, message) => {
         if (!this.producer)

package/source/loader/logger/index.js

@@ -5,6 +5,7 @@ import path from "node:path";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { Partitioners } from "kafkajs";
 import { LoggerLayerEnum } from '../../utils/models/enums/index';
+import { LogDto } from "../../utils";
 class KafkaTransport extends Transport {
     service;
     constructor(opts, service) {
@@ -153,7 +154,7 @@ export default class Logger {
             await this.kafkaProducer.send({
                 topic: this.kafkaLogsTopic,
                 messages: [{
-                        value: JSON.stringify({
+                        value: JSON.stringify(LogDto.getSchema({
                             level,
                             service: this.serviceName,
                             message,
@@ -162,7 +163,7 @@ export default class Logger {
                             timestamp: new Date().toISOString(),
                             id: id || null,
                             env: this.#configs.all.env
-                        }, this.safeReplacer)
+                        }), this.safeReplacer)
                     }],
                 acks: 1
             });

package/source/utils/models/classes/class.dtos.d.ts

@@ -0,0 +1,44 @@
+import { NodeEnvEnum } from "../enums";
+export interface ILogDto {
+    level: string;
+    service: string;
+    message: string;
+    payload?: Record<string, any>;
+    code: string | number;
+    timestamp: string;
+    id?: string | number;
+    env: NodeEnvEnum;
+}
+export declare class LogDto {
+    static getSchema({ level, service, message, payload, code, timestamp, id, env }: ILogDto): {
+        level: string;
+        service: string;
+        message: string;
+        payload: Record<string, any>;
+        code: string | number;
+        timestamp: string;
+        id: string | number;
+        env: NodeEnvEnum;
+    };
+}
+export interface MetadataDto<M = any> {
+    source: string;
+    eventType: string;
+    timestamp: number;
+    correlationId: string;
+    userId?: string;
+    extra?: M;
+}
+export interface IQueueDto<P = any, M = any> {
+    source: string;
+    eventType: string;
+    userId?: string;
+    payload: P;
+    metadata?: M;
+}
+export declare class QueueDto {
+    static getSchema<P, M>(data: IQueueDto<P, M>): {
+        metadata: MetadataDto<M>;
+        payload: P;
+    };
+}

package/source/utils/models/classes/class.dtos.js

@@ -0,0 +1,36 @@
+export class LogDto {
+    static getSchema({ level, service, message, payload, code, timestamp, id, env }) {
+        if (!level || !service || !message || !timestamp || !env) {
+            throw new Error("Missing data other data required!");
+        }
+        return {
+            level,
+            service,
+            message,
+            payload,
+            code,
+            timestamp,
+            id,
+            env
+        };
+    }
+}
+export class QueueDto {
+    static getSchema(data) {
+        if (!data.source || !data.eventType) {
+            throw new Error("Source and eventType are required");
+        }
+        const metadata = {
+            source: data.source,
+            eventType: data.eventType,
+            timestamp: Date.now(),
+            correlationId: Math.random().toString(36).substring(7),
+            userId: data.userId,
+            extra: data.metadata
+        };
+        return {
+            metadata,
+            payload: data.payload
+        };
+    }
+}

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

@@ -2,9 +2,10 @@ import _ from 'lodash';
 import x from './classes/class.x';
 import locator from './classes/class.service-locator';
 export * from './classes/class.tmp-file-loader';
-export * from './classes/class.response';
-export * from './classes/class.client';
 export * from './classes/class.interfaces';
+export * from './classes/class.dtos';
+export * from './classes/class.response';
+export * from './classes/class.clients';
 export * from './types';
 export * from './enums';
 export { x, locator, _ };

package/source/utils/models/index.js

@@ -2,9 +2,10 @@ import _ from 'lodash';
 import x from './classes/class.x';
 import locator from './classes/class.service-locator';
 export * from './classes/class.tmp-file-loader';
-export * from './classes/class.response';
-export * from './classes/class.client';
 export * from './classes/class.interfaces';
+export * from './classes/class.dtos';
+export * from './classes/class.response';
+export * from './classes/class.clients';
 export * from './types';
 export * from './enums';
 export { x, locator, _ };

package/source/loader/kafka/seeder/index.d.ts

@@ -1,11 +0,0 @@
-import { Kafka } from "kafkajs";
-import Configs from "source/loader/configs";
-export default class KafkaForCoreSeeder {
-    #private;
-    constructor({ kafka, cache, configs, }: {
-        kafka: Kafka;
-        cache: Cache;
-        configs: Configs;
-    });
-    initializeKafkaInfrastructure: () => Promise<void>;
-}

package/source/loader/kafka/seeder/index.js

@@ -1,50 +0,0 @@
-export default class KafkaForCoreSeeder {
-    #configs;
-    #kafka;
-    #cache;
-    constructor({ kafka, cache, configs, }) {
-        this.#kafka = kafka;
-        this.#cache = cache;
-        this.#configs = configs;
-    }
-    initializeKafkaInfrastructure = async () => {
-        const { kafkaBrokers, kafkaTopics, isKafkaPassive, } = {
-            isKafkaPassive: process.env.IS_KAFKA_PASSIVE === 'true' ? true : false,
-            kafkaBrokers: process.env?.KAFKA_BROKERS,
-            kafkaTopics: [
-                ...new Set([
-                    ...this.#configs.all.kafkaTopics
-                ])
-            ],
-        };
-        if (isKafkaPassive === true || !kafkaBrokers)
-            return;
-        const topicsToCreate = Array.isArray(kafkaTopics) ? kafkaTopics : [];
-        if (topicsToCreate.length === 0)
-            return;
-        const admin = this.#kafka.admin();
-        try {
-            await admin.connect();
-            const existingTopics = await admin.listTopics();
-            const newTopics = topicsToCreate
-                .filter(topic => !existingTopics.includes(topic))
-                .map(topic => ({
-                topic,
-                numPartitions: 1,
-                replicationFactor: 1
-            }));
-            if (newTopics.length > 0) {
-                await admin.createTopics({
-                    waitForLeaders: true,
-                    topics: newTopics
-                });
-            }
-        }
-        catch (error) {
-            console.log('comming', error);
-        }
-        finally {
-            await admin.disconnect();
-        }
-    };
-}