@xrystal/core 3.23.7 → 3.24.0

package/package.json

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

package/source/loader/controller/index.js

@@ -20,18 +20,16 @@ export class BaseController {
         const ctx = store?.ctx || {};
         const req = store?.req || {};
         const identityT = (k) => k;
-        const body = ctx.body || req.body || {};
+        const body = ctx.body || req.body || ctx.request?.body || {};
         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 urlStr = ctx.url || req.url || ctx.request?.url || '';
+        if (Object.keys(query).length === 0 && typeof urlStr === 'string' && urlStr.includes('?')) {
+            query = qs.parse(urlStr.split('?')[1]);
         }
         const params = ctx.params || req.params || {};
         const headers = ctx.headers || req.headers || ctx.request?.headers || {};
         return {
-            url: ctx.url || req.url || ctx.request?.url || '',
+            url: urlStr,
             method: ctx.method || req.method || ctx.request?.method || '',
             headers,
             body,
@@ -72,12 +70,13 @@ export class BaseController {
                 if (!contentType) {
                     contentType = isRaw ? 'application/octet-stream' : 'application/json';
                 }
-                const status = store.metadata?._code || 200;
+                let rawCode = store.metadata._code || 200;
+                let httpStatus = (rawCode >= 100 && rawCode <= 101) || (rawCode >= 200 && rawCode <= 599) ? rawCode : (rawCode === 0 || (rawCode >= 200 && rawCode <= 299) ? 200 : 400);
                 const body = isRaw || typeof data === 'string'
                     ? data
                     : JSON.stringify(data?.getResponse ? data.getResponse : data);
                 return new Response(body, {
-                    status,
+                    status: httpStatus,
                     headers: { 'content-type': contentType }
                 });
             },
@@ -126,12 +125,20 @@ export default class Controller extends BaseController {
             if (checks) {
                 const checkResult = await checks(p);
                 if (checkResult !== true) {
-                    const code = checkResult?.code || 400;
+                    const bizCode = checkResult?.code ?? 400;
                     const msg = checkResult?.message || (typeof checkResult === 'string' ? checkResult : 'error_validation');
-                    return currentRes.status(code).send(new ResponseSchema({
+                    let errorPayload = undefined;
+                    if (checkResult?.payload) {
+                        errorPayload = {
+                            data: checkResult.payload.data ?? checkResult.payload,
+                            extraData: checkResult.payload.extraData ?? {}
+                        };
+                    }
+                    return currentRes.status(bizCode).send(new ResponseSchema({
                         status: false,
                         message: this.parseMessage(msg, currentReq.t, true),
-                        code
+                        code: bizCode,
+                        payload: errorPayload
                     }).getResponse);
                 }
             }
@@ -143,11 +150,11 @@ export default class Controller extends BaseController {
                 logicResult = await logicResult.response();
             }
             if (logicResult?.status === false) {
-                const code = logicResult.code || 400;
-                return currentRes.status(code).send(new ResponseSchema({
+                const bizCode = logicResult.code ?? 400;
+                return currentRes.status(bizCode).send(new ResponseSchema({
                     status: false,
                     message: this.parseMessage(logicResult.message || 'error_process', currentReq.t, true),
-                    code
+                    code: bizCode
                 }).getResponse);
             }
             const resResult = response ? await response({ ...p, logicResult }) : logicResult;
@@ -157,7 +164,7 @@ export default class Controller extends BaseController {
             let finalData = undefined;
             let finalExtraData = undefined;
             let messageSource = 'success_process';
-            let successCode = this.currentStore?.metadata?._code || 200;
+            let bizSuccessCode = this.currentStore?.metadata?._code || 200;
             const extract = (obj) => {
                 if (!obj || typeof obj !== 'object')
                     return;
@@ -170,15 +177,14 @@ export default class Controller extends BaseController {
                     finalExtraData = obj.extraData;
                 }
                 else {
-                    const hasMetadata = obj.status !== undefined || obj.message !== undefined || obj.code !== undefined;
-                    if (!hasMetadata && Object.keys(obj).length > 0) {
+                    const hasMeta = obj.status !== undefined || obj.message !== undefined || obj.code !== undefined;
+                    if (!hasMeta && Object.keys(obj).length > 0)
                         finalData = obj;
-                    }
                 }
                 if (obj.message)
                     messageSource = obj.message;
                 if (obj.code !== undefined)
-                    successCode = obj.code;
+                    bizSuccessCode = obj.code;
             };
             if (typeof resResult === 'string') {
                 messageSource = resResult;
@@ -194,11 +200,11 @@ export default class Controller extends BaseController {
                     extraData: finalExtraData ?? {}
                 };
             }
-            return currentRes.status(successCode).send(new ResponseSchema({
+            return currentRes.status(bizSuccessCode).send(new ResponseSchema({
                 status: true,
                 message: this.parseMessage(messageSource, currentReq.t, false),
                 payload,
-                code: successCode
+                code: bizSuccessCode
             }).getResponse);
         }
         catch (error) {