@xrystal/core 3.28.2 → 3.28.4

package/package.json

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

package/source/loader/configs/index.js

@@ -61,11 +61,14 @@ export default class Configs {
         try {
             const moduleData = await modulePromise;
             const importedConfigs = moduleData?.default || moduleData?.configs || moduleData || {};
-            const merged = merge({}, this.#config, importedConfigs || {});
+            console.log('1111', this.#config);
+            const merged = merge({}, this.#config, importedConfigs);
+            console.log('2222', this.#config);
             this.#config = Object.freeze(merged);
         }
         catch (e) {
             // error
+            console.log(e);
         }
     };
     setConfig(newConfigs) {

package/source/loader/logger/index.js

@@ -5,7 +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";
+import { LogDTO } from "../../utils";
 class KafkaTransport extends Transport {
     service;
     constructor(opts, service) {
@@ -154,7 +154,7 @@ export default class Logger {
             await this.kafkaProducer.send({
                 topic: this.kafkaLogsTopic,
                 messages: [{
-                        value: JSON.stringify(LogDto.getSchema({
+                        value: JSON.stringify(LogDTO.getSchema({
                             level,
                             service: this.serviceName,
                             message,

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

@@ -1,5 +1,5 @@
 import { NodeEnvEnum } from "../enums";
-export interface ILogDto {
+export interface ILogDTO {
     level: string;
     service: string;
     message: string;
@@ -9,8 +9,8 @@ export interface ILogDto {
     id?: string | number;
     env: NodeEnvEnum;
 }
-export declare class LogDto {
-    static getSchema({ level, service, message, payload, code, timestamp, id, env }: ILogDto): {
+export declare class LogDTO {
+    static getSchema({ level, service, message, payload, code, timestamp, id, env }: ILogDTO): {
         level: string;
         service: string;
         message: string;
@@ -21,24 +21,27 @@ export declare class LogDto {
         env: NodeEnvEnum;
     };
 }
-export interface MetadataDto<M = any> {
+export interface IMetadata<E = any> {
     source: string;
     eventType: string;
     timestamp: number;
     correlationId: string;
     userId?: string;
-    extra?: M;
+    extraData?: E;
 }
-export interface IQueueDto<P = any, M = any> {
-    source: string;
-    eventType: string;
-    userId?: string;
+export interface IMessageInput<P = any, E = any> {
+    metadata: {
+        source: string;
+        eventType: string;
+        userId?: string;
+        correlationId?: string;
+        extraData?: E;
+    };
     payload: P;
-    metadata?: M;
 }
-export declare class QueueDto {
-    static getSchema<P, M>(data: IQueueDto<P, M>): {
-        metadata: MetadataDto<M>;
+export declare class QueueDTO {
+    static getSchema<P, E>(input: IMessageInput<P, E>): {
+        metadata: IMetadata<E>;
         payload: P;
     };
 }

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

@@ -1,4 +1,4 @@
-export class LogDto {
+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!");
@@ -15,22 +15,22 @@ export class LogDto {
         };
     }
 }
-export class QueueDto {
-    static getSchema(data) {
-        if (!data.source || !data.eventType) {
-            throw new Error("Source and eventType are required");
+export class QueueDTO {
+    static getSchema(input) {
+        if (!input.metadata.source || !input.metadata.eventType) {
+            throw new Error("Source and eventType are required inside metadata");
         }
-        const metadata = {
-            source: data.source,
-            eventType: data.eventType,
+        const finalMetadata = {
+            source: input.metadata.source,
+            eventType: input.metadata.eventType,
             timestamp: Date.now(),
-            correlationId: Math.random().toString(36).substring(7),
-            userId: data.userId,
-            extra: data.metadata
+            correlationId: input.metadata.correlationId || Math.random().toString(36).substring(7),
+            userId: input.metadata.userId,
+            extraData: input.metadata.extraData
         };
         return {
-            metadata,
-            payload: data.payload
+            metadata: finalMetadata,
+            payload: input.payload
         };
     }
 }