@xrystal/core 3.24.0 → 3.24.2

package/package.json

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

package/source/loader/controller/index.js

@@ -35,7 +35,7 @@ export class BaseController {
             body,
             query,
             params,
-            lang: ctx.lang || req.lang || 'en',
+            lang: ctx.lang || req.lang,
             t: ctx.t || req.t || identityT,
             accounts: ctx.accounts || req.accounts || ctx.user
         };
@@ -93,25 +93,25 @@ export default class Controller extends BaseController {
         this.supportedProtocols = Array.isArray(protocols) ? protocols : [protocols || ProtocolEnum.HTTP];
     }
     parseMessage(msg, t, isError = false) {
-        if (!msg)
-            return '';
-        let content = String(msg);
-        let useDirect = isError;
+        const content = String(msg || (isError ? 'unsuccessful' : 'success_process'));
+        const parts = content.split(' ');
+        let method = isError ? 'unsuccessful' : 'successfully';
+        let startIdx = 0;
         if (content.startsWith('@')) {
-            content = content.substring(1);
-            useDirect = true;
+            method = parts[0].substring(1);
+            startIdx = 1;
         }
-        const parts = content.split(' ');
-        const key = parts[0];
-        const params = parts.slice(1).map(p => t(p));
-        if (useDirect) {
-            return t(key, params);
+        const p1Raw = parts[startIdx] || '';
+        const p1 = (p1Raw === method || p1Raw === 'unsuccessful' || p1Raw === 'success_process') ? '' : t(p1Raw);
+        const p2 = parts.slice(startIdx + 1).map(v => t(v)).join(' ');
+        if (responseMessageHelper[method]) {
+            return responseMessageHelper[method](p1, p2, t);
         }
-        return responseMessageHelper.successfully(t(key), params.join(' '), t);
+        return isError ? responseMessageHelper.unsuccessful(p1, p2, t) : responseMessageHelper.successfully(p1, p2, t);
     }
     async schema({ checks, logic, response }) {
+        let currentReq = this.req;
         try {
-            const currentReq = this.req;
             const currentRes = this.res;
             const p = {
                 req: currentReq,
@@ -126,7 +126,7 @@ export default class Controller extends BaseController {
                 const checkResult = await checks(p);
                 if (checkResult !== true) {
                     const bizCode = checkResult?.code ?? 400;
-                    const msg = checkResult?.message || (typeof checkResult === 'string' ? checkResult : 'error_validation');
+                    const msg = checkResult?.message || checkResult;
                     let errorPayload = undefined;
                     if (checkResult?.payload) {
                         errorPayload = {
@@ -153,7 +153,7 @@ export default class Controller extends BaseController {
                 const bizCode = logicResult.code ?? 400;
                 return currentRes.status(bizCode).send(new ResponseSchema({
                     status: false,
-                    message: this.parseMessage(logicResult.message || 'error_process', currentReq.t, true),
+                    message: this.parseMessage(logicResult.message, currentReq.t, true),
                     code: bizCode
                 }).getResponse);
             }
@@ -209,9 +209,10 @@ export default class Controller extends BaseController {
         }
         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: error.message || 'error_internal',
+                message: this.parseMessage(error.message, t, true),
                 code: 500
             }).getResponse);
         }