@xrystal/core 3.24.6 → 3.24.8

package/package.json

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

package/source/loader/controller/index.js

@@ -79,26 +79,23 @@ export default class Controller extends BaseController {
         this.supportedProtocols = Array.isArray(protocols) ? protocols : [protocols || ProtocolEnum.HTTP];
     }
     parseMessage(msg, t, isError = false) {
-        const content = String(msg || (isError ? 'unsuccessful' : 'success_process'));
+        const content = String(msg || '');
+        if (!content || content === 'success_process' || content === 'unsuccessful') {
+            return isError ? responseMessageHelper.unsuccessful('', '', t) : responseMessageHelper.successfully('', '', t);
+        }
         let method = isError ? 'unsuccessful' : 'successfully';
         let payloadString = content;
         if (content.startsWith('@')) {
-            const firstSpace = content.indexOf(' ');
-            if (firstSpace !== -1) {
-                method = content.substring(1, firstSpace);
-                payloadString = content.substring(firstSpace + 1);
-            }
-            else {
-                method = content.substring(1);
-                payloadString = '';
-            }
+            const parts = content.split(' ');
+            method = parts[0].substring(1);
+            payloadString = parts.slice(1).join(' ');
         }
         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])
+        if (responseMessageHelper[method]) {
             return responseMessageHelper[method](p1, p2, t);
+        }
         return isError ? responseMessageHelper.unsuccessful(p1, p2, t) : responseMessageHelper.successfully(p1, p2, t);
     }
     async schema({ checks, logic, response }) {
@@ -119,7 +116,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;
@@ -127,7 +124,12 @@ 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
+                    }).getResponse);
                 }
             }
             let logicResult = logic ? await logic(p) : {};
@@ -139,13 +141,18 @@ export default class Controller extends BaseController {
                 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);
+                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;
             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';
@@ -175,7 +182,7 @@ export default class Controller extends BaseController {
             else {
                 extractData(resResult !== undefined ? resResult : logicResult);
             }
-            const bizSuccessCode = store?.metadata._code || 200;
+            const bizSuccessCode = store?.metadata?._code || 200;
             let payload = undefined;
             if (finalData !== undefined || finalExtraData !== undefined) {
                 payload = {};
@@ -184,12 +191,21 @@ 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
+            }).getResponse);
         }
         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
+            }).getResponse);
         }
     }
 }

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,30 +1,28 @@
 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;
     }
     statusCodeGenerator() {
-        if (this.status === false && (this.code === 401 || this.code === 403)) {
+        if (this.code !== 0 && this.code !== 1 && this.code !== undefined) {
             return Number(this.code);
         }
-        else if (this.status === true) {
+        if (this.status === true) {
             return 0;
         }
-        else {
-            return 1;
-        }
+        return 1;
     }
     get getResponse() {
-        let response = {
+        const response = {
             status: this.status,
             message: this.message
         };
@@ -32,6 +30,6 @@ export class ResponseSchema {
             response.payload = this.validData();
         }
         response.code = this.statusCodeGenerator();
-        return { ...response };
+        return response;
     }
 }