@xrystal/core 3.25.1 → 3.25.2

package/package.json

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

package/source/loader/controller/index.js

@@ -89,11 +89,11 @@ 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(' ');
+        // Kritik Düzeltme: Çiftlemeyi önlemek için parametreleri helper'a t() ile sarmadan gönderiyoruz
+        // Çünkü helper zaten kendi içinde t() kullanıyor
+        const p1 = params[0] || '';
+        const p2 = params.slice(1).join(' ');
         if (responseMessageHelper[method]) {
             return responseMessageHelper[method](p1, p2, t);
         }
@@ -125,16 +125,20 @@ 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 }));
+                    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) : {};
             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 }));
+                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);
@@ -178,12 +182,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 }));
+            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 }));
+            return this.res.status(500).send(new ResponseSchema({ status: false, message: this.parseMessage(error.message, t, true), code: 500 }).getResponse);
         }
     }
 }