@xrystal/core 3.10.4 → 3.10.6

package/package.json

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

package/source/loader/configs/index.js

@@ -1,5 +1,5 @@
 import path from 'node:path';
-import { publicFolderName } from 'source/utils';
+import { publicFolderName } from '../../utils';
 export default class ConfigsService {
     config = {};
     publicFolderName = publicFolderName;

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

@@ -1,3 +1,4 @@
+import { LoggerService } from '../../../loader';
 import { ProtocolEnum } from '../../index';
 export interface CustomRequest {
     accounts?: any;
@@ -16,15 +17,16 @@ export interface CustomResponse {
     locals: Record<string, any>;
 }
 declare abstract class Controller {
-    private logger;
+    protected loggerService: LoggerService;
     protected protocol: ProtocolEnum | null;
     protected req: CustomRequest | null;
     protected res: CustomResponse | null;
-    constructor({ protocol, req, res, ctx }: {
+    constructor({ protocol, req, res, ctx, loggerService }: {
         protocol: ProtocolEnum;
         req?: any;
         res?: any;
         ctx?: any;
+        loggerService: LoggerService;
     });
     protected responseProtocolSwitch: ({ res, resStatus, context, req }: any) => Promise<any>;
     protected parsedQuerys: (url: string) => Record<string, any>;

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

@@ -1,13 +1,13 @@
 import qs from 'qs';
-import { LoggerService } from '../../../loader';
-import { ProtocolEnum, responseMessageHelper, ResponseSchema, x } from '../../index';
+import { ProtocolEnum, responseMessageHelper, ResponseSchema } from '../../index';
 class Controller {
-    logger = x.get(LoggerService);
+    loggerService;
     protocol = null;
     req = null;
     res = null;
-    constructor({ protocol, req, res, ctx }) {
+    constructor({ protocol, req, res, ctx, loggerService }) {
         this.protocol = protocol;
+        this.loggerService = loggerService;
         if (ctx) {
             this.req = {
                 url: ctx.request?.url || '',

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

@@ -11,14 +11,14 @@ export declare class ClientStore {
     static set(clientName: string, data: Record<string, any>): void;
 }
 export declare abstract class Client {
-    protected configService: ConfigsService;
-    protected logger: LoggerService;
     clientName: string;
     protected baseURL: string;
     protected version: string | null;
     protected timeout: number;
     protected debug: boolean;
     protected authConfigs: any;
+    protected loggerService: LoggerService;
+    protected configsService: ConfigsService;
     protected breaker: {
         failures: number;
         lastFailure: number;
@@ -26,7 +26,7 @@ export declare abstract class Client {
         threshold: number;
         cooldown: number;
     };
-    constructor({ clientName, baseURL, version, timeout, auth, debug }: any);
+    constructor({ loggerService, configsService, clientName, baseURL, version, timeout, auth, debug }: any);
     protected resolvePath(obj: any, path: string): any;
     static cryptoHashGenerate: ({ algorithm, input, digest }: {
         algorithm: string;

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

@@ -1,7 +1,7 @@
 import { createHash, createHmac } from 'node:crypto';
 import soap from 'soap';
-import { ConfigsService, LoggerService } from '../../../loader';
-import { LoggerLayerEnum, x } from '../../index';
+import { LoggerService } from '../../../loader';
+import { LoggerLayerEnum } from '../../index';
 export class ClientStore {
     static _store = {};
     static get(clientName) { return this._store[clientName] || {}; }
@@ -10,14 +10,14 @@ export class ClientStore {
     }
 }
 export class Client {
-    configService = x.get(ConfigsService);
-    logger = x.get(LoggerService);
     clientName;
     baseURL;
     version = null;
     timeout = 15000;
-    debug = Number(this.configService.all.debug) >= LoggerLayerEnum.DEBUG;
+    debug = false;
     authConfigs;
+    loggerService;
+    configsService;
     breaker = {
         failures: 0,
         lastFailure: 0,
@@ -25,12 +25,15 @@ export class Client {
         threshold: 5,
         cooldown: 30000
     };
-    constructor({ clientName, baseURL, version, timeout, auth, debug }) {
+    constructor({ loggerService, configsService, clientName, baseURL, version, timeout, auth, debug }) {
+        this.loggerService = loggerService;
+        this.configsService = configsService;
+        this.debug = Number(this.configsService.all.debug) >= LoggerLayerEnum.DEBUG;
+        this.debug = debug ?? this.debug;
         this.clientName = clientName;
         this.baseURL = baseURL;
         this.version = version || null;
         this.authConfigs = auth;
-        this.debug = debug ?? this.debug;
         if (timeout)
             this.timeout = timeout;
         if (auth?.token)
@@ -94,7 +97,7 @@ export class BaseApiClient extends Client {
         headers.set('Content-Type', 'application/json');
         if (correlationId)
             headers.set('x-correlation-id', correlationId);
-        const systemSecret = this.configService.all.internalSecret || process.env.INTERNAL_SECRET;
+        const systemSecret = this.configsService.all.internalSecret || process.env.INTERNAL_SECRET;
         if (systemSecret) {
             const timestamp = Date.now().toString();
             const signature = createHmac('sha256', systemSecret)
@@ -116,7 +119,7 @@ export class BaseApiClient extends Client {
                 headers: Object.fromEntries(headers.entries()),
                 body: options.body
             };
-            this.logger.winston.info(`${this.clientName} Request Details: ${JSON.stringify(logPayload, null, 2)}`);
+            this.loggerService.winston.info(`${this.clientName} Request Details: ${JSON.stringify(logPayload, null, 2)}`);
         }
         const controller = new AbortController();
         const timeoutId = setTimeout(() => controller.abort(), this.timeout);
@@ -189,7 +192,7 @@ export class SoapClient extends Client {
             return result[0];
         }
         catch (error) {
-            this.logger.winston.error(`${this.clientName} SOAP Error: ${error.message}`);
+            this.loggerService.winston.error(`${this.clientName} SOAP Error: ${error.message}`);
             return null;
         }
     }