@xrystal/core 3.23.5 → 3.23.7

package/package.json

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

package/source/loader/controller/index.js

@@ -21,19 +21,25 @@ export class BaseController {
         const req = store?.req || {};
         const identityT = (k) => k;
         const body = ctx.body || req.body || {};
-        const query = ctx.query || req.query || (typeof req.url === 'string' && req.url.includes('?') ? qs.parse(req.url.split('?')[1]) : {});
+        let query = ctx.query || req.query || {};
+        if (Object.keys(query).length === 0) {
+            const urlStr = ctx.url || req.url || ctx.request?.url || '';
+            if (typeof urlStr === 'string' && urlStr.includes('?')) {
+                query = qs.parse(urlStr.split('?')[1]);
+            }
+        }
         const params = ctx.params || req.params || {};
-        const headers = ctx.headers || req.headers || {};
+        const headers = ctx.headers || req.headers || ctx.request?.headers || {};
         return {
-            url: ctx.url || req.url || '',
-            method: ctx.method || req.method || '',
+            url: ctx.url || req.url || ctx.request?.url || '',
+            method: ctx.method || req.method || ctx.request?.method || '',
             headers,
             body,
             query,
             params,
             lang: ctx.lang || req.lang || 'en',
             t: ctx.t || req.t || identityT,
-            accounts: ctx.accounts || req.accounts
+            accounts: ctx.accounts || req.accounts || ctx.user
         };
     }
     get res() {
@@ -152,30 +158,42 @@ export default class Controller extends BaseController {
             let finalExtraData = undefined;
             let messageSource = 'success_process';
             let successCode = this.currentStore?.metadata?._code || 200;
-            const source = resResult !== undefined ? resResult : logicResult;
-            if (source !== null && typeof source === 'object') {
-                if (source.payload) {
-                    finalData = source.payload.data;
-                    finalExtraData = source.payload.extraData;
+            const extract = (obj) => {
+                if (!obj || typeof obj !== 'object')
+                    return;
+                if (obj.payload && typeof obj.payload === 'object') {
+                    finalData = obj.payload.data !== undefined ? obj.payload.data : obj.payload;
+                    finalExtraData = obj.payload.extraData;
                 }
-                else if (source.data !== undefined || source.extraData !== undefined) {
-                    finalData = source.data;
-                    finalExtraData = source.extraData;
+                else if (obj.data !== undefined || obj.extraData !== undefined) {
+                    finalData = obj.data;
+                    finalExtraData = obj.extraData;
                 }
-                else if (!source.status && !source.message && !source.code) {
-                    finalData = source;
+                else {
+                    const hasMetadata = obj.status !== undefined || obj.message !== undefined || obj.code !== undefined;
+                    if (!hasMetadata && Object.keys(obj).length > 0) {
+                        finalData = obj;
+                    }
                 }
-                if (source.message)
-                    messageSource = source.message;
-                if (source.code)
-                    successCode = source.code;
+                if (obj.message)
+                    messageSource = obj.message;
+                if (obj.code !== undefined)
+                    successCode = obj.code;
+            };
+            if (typeof resResult === 'string') {
+                messageSource = resResult;
+                extract(logicResult);
+            }
+            else {
+                extract(resResult !== undefined ? resResult : logicResult);
             }
-            else if (source !== undefined) {
-                messageSource = source;
+            let payload = undefined;
+            if (finalData !== undefined || finalExtraData !== undefined) {
+                payload = {
+                    data: finalData ?? {},
+                    extraData: finalExtraData ?? {}
+                };
             }
-            const payload = (finalData !== undefined || finalExtraData !== undefined)
-                ? { data: finalData, extraData: finalExtraData || {} }
-                : undefined;
             return currentRes.status(successCode).send(new ResponseSchema({
                 status: true,
                 message: this.parseMessage(messageSource, currentReq.t, false),