@xrystal/core 3.19.7 → 3.20.0

package/package.json

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

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

@@ -25,6 +25,7 @@ export declare const getControllerCtx: () => {
         _isRaw?: boolean;
     };
 };
+export declare const protocol: (callback: () => Promise<any>, protocol?: ProtocolEnum) => Promise<any>;
 export interface CustomRequest {
     accounts?: any;
     url: string;

package/source/loader/controller/index.js

@@ -1,8 +1,15 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
-import { LoggerLayerEnum, ProtocolEnum, responseMessageHelper, ResponseSchema, x } from '../../utils/index';
+import { ProtocolEnum, responseMessageHelper, ResponseSchema, x } from '../../utils/index';
 import LoggerService from '../logger';
 export const controllerContextStorage = new AsyncLocalStorage();
 export const getControllerCtx = () => controllerContextStorage.getStore();
+export const protocol = async (callback, protocol = ProtocolEnum.HTTP) => {
+    const store = controllerContextStorage.getStore();
+    if (store) {
+        store.protocol = protocol;
+    }
+    return await callback();
+};
 class Controller {
     logger = x.get(LoggerService);
     supportedProtocols = [ProtocolEnum.HTTP, ProtocolEnum.WEBSOCKET];
@@ -15,18 +22,17 @@ class Controller {
     get req() {
         const store = this.currentStore;
         const identityT = (k) => k;
-        if (!store?.ctx)
-            return { url: '', method: '', headers: {}, params: {}, query: {}, lang: 'en', t: identityT };
+        const ctx = store?.ctx || {};
         return {
-            url: store.ctx.url,
-            method: store.ctx.method,
-            headers: store.ctx.headers,
-            body: store.ctx.body,
-            query: store.ctx.query,
-            params: store.ctx.params,
-            lang: store.ctx.lang,
-            t: store.ctx.t || identityT,
-            accounts: store.ctx.accounts || store.req?.accounts
+            url: ctx.url || '',
+            method: ctx.method || '',
+            headers: ctx.headers || {},
+            body: ctx.body || {},
+            query: ctx.query || {},
+            params: ctx.params || {},
+            lang: ctx.lang || 'en',
+            t: ctx.t || identityT,
+            accounts: ctx.accounts || store?.req?.accounts
         };
     }
     get res() {
@@ -81,10 +87,16 @@ export class ControllerService extends Controller {
         try {
             const currentReq = this.req;
             const currentRes = this.res;
-            const payload = { req: currentReq, res: currentRes };
-            const convertedPayload = { ...payload, query: currentReq.query, body: currentReq.body, params: currentReq.params };
+            const p = {
+                req: currentReq,
+                res: currentRes,
+                body: currentReq.body,
+                query: currentReq.query,
+                params: currentReq.params,
+                t: currentReq.t
+            };
             if (checks) {
-                const checkResult = await checks({ payload, convertedPayload });
+                const checkResult = await checks(p);
                 if (checkResult === false || (checkResult && typeof checkResult === 'object' && !Array.isArray(checkResult))) {
                     return currentRes.status(checkResult?.code || 400).send(new ResponseSchema({
                         status: false,
@@ -93,7 +105,7 @@ export class ControllerService extends Controller {
                     }).getResponse);
                 }
             }
-            const logicResult = logic ? await logic({ payload, convertedPayload }) : null;
+            const logicResult = logic ? await logic(p) : null;
             if (logicResult?.status === false) {
                 return currentRes.status(logicResult.code || 400).send(new ResponseSchema({
                     status: false,
@@ -103,7 +115,7 @@ export class ControllerService extends Controller {
             }
             if (logicResult instanceof Response)
                 return logicResult;
-            const resResult = response ? await response({ payload, convertedPayload, logicResult }) : logicResult;
+            const resResult = response ? await response({ ...p, logicResult }) : logicResult;
             let finalMessage = '';
             let rawMessageValue = '';
             const messageSource = resResult?.message || (typeof resResult === 'string' || Array.isArray(resResult) ? resResult : '');
@@ -125,8 +137,7 @@ export class ControllerService extends Controller {
             let finalPayload = undefined;
             if (logic) {
                 finalPayload = logicResult?.payload !== undefined ? logicResult.payload : logicResult;
-                // Eğer payload sadece bir mesajdan ibaretse temizle
-                if (finalPayload === messageSource || (finalPayload && typeof finalPayload === 'object' && finalPayload.message === rawMessageValue)) {
+                if (finalPayload === messageSource || (finalPayload && typeof finalPayload === 'object' && (finalPayload.message === rawMessageValue || finalPayload.message === finalMessage))) {
                     finalPayload = undefined;
                 }
             }
@@ -138,8 +149,8 @@ export class ControllerService extends Controller {
         }
         catch (error) {
             this.logger.winston.log({
-                level: LoggerLayerEnum[LoggerLayerEnum.CRITICAL].toLowerCase(),
-                message: `Controller Error: ${error}`
+                level: 'error',
+                message: `Controller Error: ${error.message}`
             });
             return this.res.status(500).send(new ResponseSchema({
                 status: false,