@xrystal/core 3.8.7 → 3.8.9

package/package.json

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

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

@@ -1,8 +1,6 @@
-import { BaseApiClient } from '../../utils/index';
 import ConfigsService from '../configs';
 export default class ClientsService {
     static services: Record<string, any>;
-    apiClient: BaseApiClient;
     baseApiClientName: string;
     load({ configs }: {
         configs: ConfigsService;

package/source/loader/clients/index.js

@@ -1,13 +1,12 @@
 import { BaseApiClient } from '../../utils/index';
 export default class ClientsService {
     static services = {};
-    apiClient;
     baseApiClientName = 'base-api-client';
     async load({ configs }) {
-        this.apiClient = new BaseApiClient({
+        const baseApiClient = new BaseApiClient({
             clientName: this.baseApiClientName,
             baseURL: configs.all.baseApiUri || ''
         });
-        ClientsService.services[this.baseApiClientName] = this.apiClient;
+        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);

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

@@ -1,5 +1,5 @@
 import nodemailer from 'nodemailer';
-import { ConfigsService, LoggerService } from 'source/loader';
+import { ConfigsService, LoggerService } from '../../../loader';
 export declare abstract class Service {
     protected configService: ConfigsService;
     protected logger: LoggerService;
@@ -29,7 +29,9 @@ export declare class BaseApiClient extends Service {
         version?: string;
         timeout?: number;
     });
-    request(path: string, options?: RequestInit): Promise<Response>;
+    request(path: string, options?: RequestInit & {
+        version?: string;
+    }): Promise<Response>;
 }
 export declare abstract class AuthenticatedApiClient extends BaseApiClient {
     accessToken?: string;
@@ -39,7 +41,9 @@ export declare abstract class AuthenticatedApiClient extends BaseApiClient {
         version?: string;
         timeout?: number;
     });
-    request(path: string, options?: RequestInit): Promise<Response>;
+    request(path: string, options?: RequestInit & {
+        version?: string;
+    }): Promise<Response>;
     abstract authentication(): Promise<any>;
 }
 export declare class EmailClient extends Service {

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

@@ -3,8 +3,8 @@ import path from 'node:path';
 import nodemailer from 'nodemailer';
 import hbs from 'nodemailer-express-handlebars';
 import soap from 'soap';
-import { ConfigsService, LoggerService } from 'source/loader';
-import { TokensEnum, x } from '..';
+import { ConfigsService, LoggerService } from '../../../loader';
+import { TokensEnum, x } from '../../index';
 export class Service {
     configService = x.get(ConfigsService);
     logger = x.get(LoggerService);
@@ -34,9 +34,12 @@ export class BaseApiClient extends Service {
     constructor(config) {
         super(config);
     }
+    // version opsiyonel yapıldı, default constructor'dan gelir ama istek anında ezilebilir
     async request(path, options = {}) {
         const base = this.baseURL.replace(/\/$/, '');
-        const ver = this.version ? `/${this.version.replace(/^\//, '')}` : '';
+        // İstekte versiyon varsa onu, yoksa sınıftaki default versiyonu kullan
+        const activeVersion = options.version !== undefined ? options.version : this.version;
+        const ver = activeVersion ? `/${activeVersion.replace(/^\//, '')}` : '';
         const url = `${base}${ver}${path}`;
         const store = LoggerService.storage.getStore();
         const correlationId = store?.get('correlationId');
@@ -50,7 +53,9 @@ export class BaseApiClient extends Service {
         const controller = new AbortController();
         const timeoutId = setTimeout(() => controller.abort(), this.timeout);
         try {
-            const response = await fetch(url, { ...options, headers, signal: controller.signal });
+            // version alanını fetch options'dan ayıklıyoruz
+            const { version, ...fetchOptions } = options;
+            const response = await fetch(url, { ...fetchOptions, headers, signal: controller.signal });
             clearTimeout(timeoutId);
             return response;
         }