@xrystal/core 3.16.7 → 3.16.9

package/package.json

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

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

@@ -1,6 +1,6 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
-import LoggerService from '../logger';
 import { ProtocolEnum } from '../../utils/index';
+import LoggerService from '../logger';
 export declare const controllerContextStorage: AsyncLocalStorage<{
     protocol?: ProtocolEnum;
     ctx?: any;
@@ -33,7 +33,8 @@ export interface CustomRequest {
     body?: any;
     params: Record<string, any>;
     query: Record<string, any>;
-    t: (k: string) => string;
+    lang: string;
+    t: (k: string, args?: any) => string;
 }
 export interface CustomResponse {
     status: (code: number) => CustomResponse;
@@ -42,9 +43,9 @@ export interface CustomResponse {
     locals: Record<string, any>;
 }
 declare abstract class Controller {
-    protected loggerService: LoggerService;
+    protected logger: LoggerService;
     protected supportedProtocols: ProtocolEnum[];
-    constructor({ loggerService }: any);
+    constructor();
     protected get protocol(): ProtocolEnum;
     protected get currentStore(): {
         protocol?: ProtocolEnum;
@@ -63,7 +64,6 @@ declare abstract class Controller {
     protected parsedQuerys: (url: string) => Record<string, any>;
 }
 export declare abstract class ControllerService extends Controller {
-    constructor({ loggerService }: any);
     load(props?: {
         type?: ProtocolEnum | ProtocolEnum[];
     }): Promise<void>;

package/source/loader/controller/index.js

@@ -1,13 +1,13 @@
 import qs from 'qs';
 import { AsyncLocalStorage } from 'node:async_hooks';
-import { ProtocolEnum, responseMessageHelper, ResponseSchema } from '../../utils/index';
+import { LoggerLayerEnum, ProtocolEnum, responseMessageHelper, ResponseSchema, x } from '../../utils/index';
+import LoggerService from '../logger';
 export const controllerContextStorage = new AsyncLocalStorage();
 export const getControllerCtx = () => controllerContextStorage.getStore();
 class Controller {
-    loggerService;
+    logger = x.get(LoggerService);
     supportedProtocols = [ProtocolEnum.HTTP, ProtocolEnum.WEBSOCKET];
-    constructor({ loggerService }) {
-        this.loggerService = loggerService;
+    constructor() {
     }
     get protocol() {
         return this.currentStore?.protocol || ProtocolEnum.HTTP;
@@ -19,7 +19,7 @@ class Controller {
         const store = this.currentStore;
         const identityT = (k) => k;
         if (!store)
-            return { url: '', method: '', headers: {}, params: {}, query: {}, t: identityT };
+            return { url: '', method: '', headers: {}, params: {}, query: {}, lang: 'en', t: identityT };
         const { ctx, req: nativeReq } = store;
         const source = nativeReq || ctx?.request || ctx;
         return {
@@ -32,6 +32,7 @@ class Controller {
             params: ctx?.params || nativeReq?.params || source?.params || {},
             query: ctx?.query || nativeReq?.query || source?.query || {},
             accounts: ctx?.user || nativeReq?.accounts || source?.accounts,
+            lang: ctx?.lang || nativeReq?.lang || 'en',
             t: ctx?.t || nativeReq?.t || identityT
         };
     }
@@ -88,9 +89,6 @@ class Controller {
     };
 }
 export class ControllerService extends Controller {
-    constructor({ loggerService }) {
-        super({ loggerService });
-    }
     async load(props = {}) {
         if (props.type)
             this.supportedProtocols = Array.isArray(props.type) ? props.type : [props.type];
@@ -117,7 +115,7 @@ export class ControllerService extends Controller {
                 const successObj = {
                     status: true,
                     message: Array.isArray(resResult.message)
-                        ? responseMessageHelper.successFully(resResult.message[0], resResult.message[1], req.t)
+                        ? responseMessageHelper.successFully(resResult.message[0], resResult.message[1], req.lang)
                         : resResult.message,
                     payload: logicResult?.payload !== undefined ? logicResult.payload : logicResult
                 };
@@ -126,7 +124,10 @@ export class ControllerService extends Controller {
             return res.send(logicResult?.payload !== undefined ? logicResult.payload : logicResult);
         }
         catch (error) {
-            this.loggerService.winston.error(`Controller Error: ${error.message}`, { stack: error.stack });
+            this.logger.winston.log({
+                level: LoggerLayerEnum[LoggerLayerEnum.CRITICAL].toLowerCase(),
+                message: `Controller Error: ${error}`,
+            });
             return this.res.status(500).send({
                 status: false,
                 message: error.message