@xrystal/core 3.8.5 → 3.8.8

package/package.json

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

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

@@ -1,10 +1,8 @@
-import { ApiClient } from '../../utils/index';
 import ConfigsService from '../configs';
 export default class ClientsService {
-    apiClient: ApiClient;
-    apiClientname: string;
-    load({ configs, tmp }: {
+    static services: Record<string, any>;
+    baseApiClientName: string;
+    load({ configs }: {
         configs: ConfigsService;
-        tmp: any;
     }): Promise<void>;
 }

package/source/loader/clients/index.js

@@ -1,40 +1,12 @@
-import path from 'node:path';
-import { ApiClient, clientRegistry } from '../../utils/index';
+import { BaseApiClient } from '../../utils/index';
 export default class ClientsService {
-    apiClient;
-    apiClientname = 'base-api-client';
-    async load({ configs, tmp }) {
-        this.apiClient = new ApiClient({
-            clientName: this.apiClientname,
+    static services = {};
+    baseApiClientName = 'base-api-client';
+    async load({ configs }) {
+        const baseApiClient = new BaseApiClient({
+            clientName: this.baseApiClientName,
             baseURL: configs.all.baseApiUri || ''
         });
-        clientRegistry[this.apiClientname] = this.apiClient;
-        const loaderConfig = tmp?.configs?.loaders?.clients;
-        if (!loaderConfig)
-            return;
-        const { loadPath, list } = loaderConfig;
-        let serviceMap = {};
-        if (loadPath) {
-            try {
-                const resolvedPath = path.resolve(process.cwd(), loadPath);
-                serviceMap = await import(resolvedPath);
-            }
-            catch (e) {
-                //
-            }
-        }
-        if (list) {
-            for (const [instanceName, className] of Object.entries(list)) {
-                const ServiceClass = serviceMap[className];
-                if (ServiceClass) {
-                    clientRegistry[instanceName] = new ServiceClass({
-                        clientName: instanceName,
-                        baseURL: configs.all[`${instanceName}Uri`] || configs.all.baseApiUri || '',
-                        version: configs.all[`${instanceName}Version`] || 'v1',
-                        timeout: configs.all[`${instanceName}Timeout`] || 15000
-                    });
-                }
-            }
-        }
+        ClientsService.services[this.baseApiClientName] = baseApiClient;
     }
 }

package/source/loader/index.d.ts

@@ -3,4 +3,5 @@ import ConfigsService from "./configs";
 import LoggerService from "./logger";
 import EventsService from "./events";
 import LocalizationsService from "./localizations";
-export { SystemService, ConfigsService, LoggerService, EventsService, LocalizationsService };
+import ClientsService from "./clients";
+export { SystemService, ConfigsService, LoggerService, EventsService, LocalizationsService, ClientsService };

package/source/loader/index.js

@@ -3,4 +3,5 @@ import ConfigsService from "./configs";
 import LoggerService from "./logger";
 import EventsService from "./events";
 import LocalizationsService from "./localizations";
-export { SystemService, ConfigsService, LoggerService, EventsService, LocalizationsService };
+import ClientsService from "./clients";
+export { SystemService, ConfigsService, LoggerService, EventsService, LocalizationsService, ClientsService };

package/source/project/index.js

@@ -1,8 +1,7 @@
 // => import dependencies
 import path from 'path';
-import { SystemService, ConfigsService, LoggerService, EventsService, LocalizationsService } from '../loader/index';
+import { SystemService, ConfigsService, LoggerService, EventsService, LocalizationsService, ClientsService } from '../loader/index';
 import { packageName, tmpFileDefaultName, tmpFileDefaultExt, findFileRecursively, TmpFileLoader, x, kafkaBrokers, systemLoggerLayer, } from '../utils/index';
-import ClientsService from 'source/loader/clients';
 //
 let coreHasRun = false;
 export const coreInit = async (params) => {
@@ -27,7 +26,8 @@ const coreLoader = async ({}) => {
             ConfigsService,
             LoggerService,
             EventsService,
-            LocalizationsService
+            LocalizationsService,
+            ClientsService
         ];
         services.forEach(service => x.set({ service, reference: service }));
         const system = x.get(SystemService);
@@ -62,7 +62,6 @@ const coreLoader = async ({}) => {
         });
         await clientsService.load({
             configs: configService,
-            tmp: r,
         });
         coreHasRun = true;
         return { _: r };

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

@@ -1,6 +1,5 @@
 import nodemailer from 'nodemailer';
 import { ConfigsService, LoggerService } from 'source/loader';
-export declare const clientRegistry: Record<string, any>;
 export declare abstract class Service {
     protected configService: ConfigsService;
     protected logger: LoggerService;
@@ -23,7 +22,7 @@ export declare abstract class Service {
         length?: number;
     }) => string;
 }
-export declare class ApiClient extends Service {
+export declare class BaseApiClient extends Service {
     constructor(config: {
         clientName: string;
         baseURL: string;
@@ -32,7 +31,7 @@ export declare class ApiClient extends Service {
     });
     request(path: string, options?: RequestInit): Promise<Response>;
 }
-export declare abstract class AuthenticatedApiClient extends ApiClient {
+export declare abstract class AuthenticatedApiClient extends BaseApiClient {
     accessToken?: string;
     constructor(config: {
         clientName: string;

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

@@ -5,7 +5,6 @@ import hbs from 'nodemailer-express-handlebars';
 import soap from 'soap';
 import { ConfigsService, LoggerService } from 'source/loader';
 import { TokensEnum, x } from '..';
-export const clientRegistry = {};
 export class Service {
     configService = x.get(ConfigsService);
     logger = x.get(LoggerService);
@@ -31,7 +30,7 @@ export class Service {
         return result;
     };
 }
-export class ApiClient extends Service {
+export class BaseApiClient extends Service {
     constructor(config) {
         super(config);
     }
@@ -61,7 +60,7 @@ export class ApiClient extends Service {
         }
     }
 }
-export class AuthenticatedApiClient extends ApiClient {
+export class AuthenticatedApiClient extends BaseApiClient {
     accessToken;
     constructor(config) {
         super(config);