@xrystal/core 3.24.6 → 3.24.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "author": "Yusuf Yasir KAYGUSUZ",
   "name": "@xrystal/core",
-  "version": "3.24.6",
+  "version": "3.24.7",
   "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

@@ -93,9 +93,11 @@ export default class Controller extends BaseController {
                 payloadString = '';
             }
         }
+        else if (content === 'unsuccessful' || content === 'success_process') {
+            payloadString = '';
+        }
         const params = payloadString.split('-').map(p => p.trim()).filter(p => p !== '');
-        const p1Raw = params[0] || '';
-        const p1 = (p1Raw === method || p1Raw === 'unsuccessful' || p1Raw === 'success_process') ? '' : t(p1Raw);
+        const p1 = params[0] ? t(params[0]) : '';
         const p2 = params.slice(1).map(v => t(v)).join(' ');
         if (responseMessageHelper[method])
             return responseMessageHelper[method](p1, p2, t);
@@ -119,7 +121,7 @@ export default class Controller extends BaseController {
                 const checkResult = await checks(p);
                 if (checkResult !== true) {
                     extractMeta(checkResult);
-                    const bizCode = store?.metadata._code ?? 400;
+                    const bizCode = store?.metadata?._code ?? 400;
                     let errorPayload = undefined;
                     if (checkResult?.payload) {
                         const d = checkResult.payload.data ?? checkResult.payload;
@@ -139,7 +141,7 @@ export default class Controller extends BaseController {
                 extractMeta(logicResult);
             }
             if (logicResult?.status === false) {
-                const bizCode = store?.metadata._code ?? 400;
+                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);
             }
             const resResult = response ? await response({ ...p, logicResult }) : logicResult;
@@ -175,7 +177,7 @@ export default class Controller extends BaseController {
             else {
                 extractData(resResult !== undefined ? resResult : logicResult);
             }
-            const bizSuccessCode = store?.metadata._code || 200;
+            let bizSuccessCode = store?.metadata?._code || 200;
             let payload = undefined;
             if (finalData !== undefined || finalExtraData !== undefined) {
                 payload = {};

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

@@ -2,15 +2,15 @@ export interface PayloadSchemaInterface {
     status: boolean;
     message: string;
     payload?: any;
-    [key: string]: any;
     code?: number;
+    [key: string]: any;
 }
 export declare class ResponseSchema {
-    constructor({ status, message, payload, code }: PayloadSchemaInterface);
     status: boolean;
     message: string;
     payload: any;
     code: number;
+    constructor({ status, message, payload, code }: PayloadSchemaInterface);
     validData(): any;
     statusCodeGenerator(): number;
     get getResponse(): any;

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

@@ -1,14 +1,14 @@
 export class ResponseSchema {
+    status;
+    message;
+    payload;
+    code;
     constructor({ status = false, message = '', payload = null, code = 0 }) {
         this.status = status;
         this.message = message;
         this.payload = payload;
         this.code = code;
     }
-    status;
-    message;
-    payload;
-    code;
     validData() {
         return this.payload;
     }
@@ -24,7 +24,7 @@ export class ResponseSchema {
         }
     }
     get getResponse() {
-        let response = {
+        const response = {
             status: this.status,
             message: this.message
         };
@@ -32,6 +32,6 @@ export class ResponseSchema {
             response.payload = this.validData();
         }
         response.code = this.statusCodeGenerator();
-        return { ...response };
+        return response;
     }
 }