@xrystal/core 3.16.7 → 3.16.8

package/package.json

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

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

@@ -1,5 +1,4 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
-import LoggerService from '../logger';
 import { ProtocolEnum } from '../../utils/index';
 export declare const controllerContextStorage: AsyncLocalStorage<{
     protocol?: ProtocolEnum;
@@ -33,7 +32,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,7 +42,7 @@ export interface CustomResponse {
     locals: Record<string, any>;
 }
 declare abstract class Controller {
-    protected loggerService: LoggerService;
+    protected loggerService: any;
     protected supportedProtocols: ProtocolEnum[];
     constructor({ loggerService }: any);
     protected get protocol(): ProtocolEnum;

package/source/loader/controller/index.js

@@ -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
         };
     }
@@ -117,7 +118,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,10 +127,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.loggerService.error(`Controller Error: ${error.message}`, { stack: error.stack });
             return this.res.status(500).send({
                 status: false,
-                message: error.message
+                message: error.message || "Internal Server Error"
             });
         }
     }