@xrystal/core 3.24.8 → 3.25.1

package/package.json

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

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

@@ -2,6 +2,23 @@ import { AsyncLocalStorage } from 'node:async_hooks';
 import Logger from '../logger';
 import System from '../system';
 import { IProvide, ProtocolEnum } from '../../utils/index';
+export interface CustomRequest {
+    accounts?: any;
+    url: string;
+    method: string;
+    headers: Record<string, any>;
+    body?: any;
+    params: Record<string, any>;
+    query: Record<string, any>;
+    lang: string;
+    t: (k: string, args?: any) => string;
+}
+export interface CustomResponse {
+    status: (code: number) => CustomResponse;
+    send: (data: any) => any;
+    json: (data: any) => any;
+    locals: Record<string, any>;
+}
 export declare const controllerContextStorage: AsyncLocalStorage<{
     protocol?: ProtocolEnum;
     ctx?: any;
@@ -59,20 +76,3 @@ export default abstract class Controller extends BaseController implements IProv
         response?: (args: any) => Promise<any>;
     }): Promise<any>;
 }
-export interface CustomRequest {
-    accounts?: any;
-    url: string;
-    method: string;
-    headers: Record<string, any>;
-    body?: any;
-    params: Record<string, any>;
-    query: Record<string, any>;
-    lang: string;
-    t: (k: string, args?: any) => string;
-}
-export interface CustomResponse {
-    status: (code: number) => CustomResponse;
-    send: (data: any) => any;
-    json: (data: any) => any;
-    locals: Record<string, any>;
-}

package/source/loader/controller/index.js

@@ -80,9 +80,8 @@ export default class Controller extends BaseController {
     }
     parseMessage(msg, t, isError = false) {
         const content = String(msg || '');
-        if (!content || content === 'success_process' || content === 'unsuccessful') {
+        if (!content)
             return isError ? responseMessageHelper.unsuccessful('', '', t) : responseMessageHelper.successfully('', '', t);
-        }
         let method = isError ? 'unsuccessful' : 'successfully';
         let payloadString = content;
         if (content.startsWith('@')) {
@@ -90,6 +89,8 @@ export default class Controller extends BaseController {
             method = parts[0].substring(1);
             payloadString = parts.slice(1).join(' ');
         }
+        // Parametreleri '-' ile ayırıyoruz (Örn: @unsuccessful secret and code verifier)
+        // Eğer '-' yoksa tamamı tek parametre (p1) olur
         const params = payloadString.split('-').map(p => p.trim()).filter(p => p !== '');
         const p1 = params[0] ? t(params[0]) : '';
         const p2 = params.slice(1).map(v => t(v)).join(' ');
@@ -124,35 +125,21 @@ export default class Controller extends BaseController {
                         if (checkResult.payload.extraData !== undefined)
                             errorPayload.extraData = checkResult.payload.extraData;
                     }
-                    return currentRes.status(bizCode).send(new ResponseSchema({
-                        status: false,
-                        message: this.parseMessage(checkResult?.message || checkResult, currentReq.t, true),
-                        code: bizCode,
-                        payload: errorPayload
-                    }).getResponse);
+                    return currentRes.status(bizCode).send(new ResponseSchema({ status: false, message: this.parseMessage(checkResult?.message || checkResult, currentReq.t, true), code: bizCode, payload: errorPayload }));
                 }
             }
             let logicResult = logic ? await logic(p) : {};
             extractMeta(logicResult);
             if (logicResult instanceof Response || logicResult?.constructor?.name === 'Response')
                 return logicResult;
-            if (logicResult && typeof logicResult === 'object' && typeof logicResult.response === 'function') {
-                logicResult = await logicResult.response();
-                extractMeta(logicResult);
-            }
             if (logicResult?.status === false) {
                 const bizCode = store?.metadata?._code ?? 400;
-                return currentRes.status(bizCode).send(new ResponseSchema({
-                    status: false,
-                    message: this.parseMessage(logicResult.message, currentReq.t, true),
-                    code: bizCode
-                }).getResponse);
+                return currentRes.status(bizCode).send(new ResponseSchema({ status: false, message: this.parseMessage(logicResult.message, currentReq.t, true), code: bizCode }));
             }
             const resResult = response ? await response({ ...p, logicResult }) : logicResult;
             extractMeta(resResult);
-            if (resResult instanceof Response || resResult instanceof Blob || resResult instanceof Uint8Array || resResult instanceof ArrayBuffer) {
+            if (resResult instanceof Response || resResult instanceof Blob || resResult instanceof Uint8Array || resResult instanceof ArrayBuffer)
                 return currentRes.status(200).send(resResult);
-            }
             let finalData = undefined;
             let finalExtraData = undefined;
             let messageSource = 'success_process';
@@ -191,21 +178,12 @@ export default class Controller extends BaseController {
                 if (finalExtraData !== undefined)
                     payload.extraData = finalExtraData;
             }
-            return currentRes.status(bizSuccessCode).send(new ResponseSchema({
-                status: true,
-                message: this.parseMessage(messageSource, currentReq.t, false),
-                payload,
-                code: bizSuccessCode
-            }).getResponse);
+            return currentRes.status(bizSuccessCode).send(new ResponseSchema({ status: true, message: this.parseMessage(messageSource, currentReq.t, false), payload, code: bizSuccessCode }));
         }
         catch (error) {
             this.logger?.log(LoggerLayerEnum.ERROR, `Controller Error: ${error.message}`);
             const t = currentReq?.t || ((k) => k);
-            return this.res.status(500).send(new ResponseSchema({
-                status: false,
-                message: this.parseMessage(error.message, t, true),
-                code: 500
-            }).getResponse);
+            return this.res.status(500).send(new ResponseSchema({ status: false, message: this.parseMessage(error.message, t, true), code: 500 }));
         }
     }
 }

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

@@ -13,13 +13,13 @@ export class ResponseSchema {
         return this.payload;
     }
     statusCodeGenerator() {
-        if (this.code !== 0 && this.code !== 1 && this.code !== undefined) {
-            return Number(this.code);
+        if (this.status === false) {
+            if (this.code !== 0 && this.code !== 1) {
+                return Number(this.code);
+            }
+            return 1;
         }
-        if (this.status === true) {
-            return 0;
-        }
-        return 1;
+        return 0;
     }
     get getResponse() {
         const response = {