@xrystal/core 3.24.2 → 3.24.4

package/package.json

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

package/source/loader/controller/index.d.ts

@@ -10,6 +10,7 @@ export declare const controllerContextStorage: AsyncLocalStorage<{
     metadata?: {
         locals: Record<string, any>;
         _code?: number;
+        _statusCode?: number;
         _contentType?: string;
         _isRaw?: boolean;
     };
@@ -22,6 +23,7 @@ export declare const getControllerCtx: () => {
     metadata?: {
         locals: Record<string, any>;
         _code?: number;
+        _statusCode?: number;
         _contentType?: string;
         _isRaw?: boolean;
     };
@@ -39,6 +41,7 @@ export declare abstract class BaseController {
         metadata?: {
             locals: Record<string, any>;
             _code?: number;
+            _statusCode?: number;
             _contentType?: string;
             _isRaw?: boolean;
         };

package/source/loader/controller/index.js

@@ -26,16 +26,14 @@ export class BaseController {
         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: urlStr,
             method: ctx.method || req.method || ctx.request?.method || '',
-            headers,
+            headers: ctx.headers || req.headers || ctx.request?.headers || {},
             body,
             query,
-            params,
-            lang: ctx.lang || req.lang,
+            params: ctx.params || req.params || {},
+            lang: ctx.lang || req.lang || 'en',
             t: ctx.t || req.t || identityT,
             accounts: ctx.accounts || req.accounts || ctx.user
         };
@@ -66,12 +64,14 @@ export class BaseController {
                     return data;
                 const isBinary = data instanceof Blob || data instanceof Uint8Array || data instanceof ArrayBuffer || (typeof data?.pipe === 'function');
                 const isRaw = store.metadata?._isRaw || isBinary;
-                let contentType = store.metadata?._contentType;
-                if (!contentType) {
-                    contentType = isRaw ? 'application/octet-stream' : 'application/json';
+                let contentType = store.metadata?._contentType || (isRaw ? 'application/octet-stream' : 'application/json');
+                let bizCode = store.metadata._code || 200;
+                let httpStatus = store.metadata._statusCode;
+                if (!httpStatus) {
+                    httpStatus = (bizCode >= 100 && bizCode <= 101) || (bizCode >= 200 && bizCode <= 599)
+                        ? bizCode
+                        : (bizCode === 0 || (bizCode >= 200 && bizCode <= 299) ? 200 : 400);
                 }
-                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);
@@ -94,25 +94,33 @@ export default class Controller extends BaseController {
     }
     parseMessage(msg, t, isError = false) {
         const content = String(msg || (isError ? 'unsuccessful' : 'success_process'));
-        const parts = content.split(' ');
         let method = isError ? 'unsuccessful' : 'successfully';
-        let startIdx = 0;
+        let payloadString = content;
         if (content.startsWith('@')) {
-            method = parts[0].substring(1);
-            startIdx = 1;
+            const firstSpace = content.indexOf(' ');
+            if (firstSpace !== -1) {
+                method = content.substring(1, firstSpace);
+                payloadString = content.substring(firstSpace + 1);
+            }
+            else {
+                method = content.substring(1);
+                payloadString = '';
+            }
         }
-        const p1Raw = parts[startIdx] || '';
+        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 p2 = parts.slice(startIdx + 1).map(v => t(v)).join(' ');
+        const p2 = params.slice(1).map(v => t(v)).join(' ');
         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 }) {
-        let currentReq = this.req;
+        const currentReq = this.req;
+        const currentRes = this.res;
+        const store = this.currentStore;
         try {
-            const currentRes = this.res;
             const p = {
                 req: currentReq,
                 res: currentRes,
@@ -122,17 +130,27 @@ export default class Controller extends BaseController {
                 t: currentReq.t,
                 accounts: currentReq.accounts
             };
+            const extractMeta = (obj) => {
+                if (!obj || typeof obj !== 'object')
+                    return;
+                if (obj.code !== undefined && store?.metadata)
+                    store.metadata._code = obj.code;
+                if (obj.statusCode !== undefined && store?.metadata)
+                    store.metadata._statusCode = obj.statusCode;
+            };
             if (checks) {
                 const checkResult = await checks(p);
                 if (checkResult !== true) {
-                    const bizCode = checkResult?.code ?? 400;
+                    extractMeta(checkResult);
+                    const bizCode = store?.metadata?._code ?? 400;
                     const msg = checkResult?.message || checkResult;
                     let errorPayload = undefined;
                     if (checkResult?.payload) {
-                        errorPayload = {
-                            data: checkResult.payload.data ?? checkResult.payload,
-                            extraData: checkResult.payload.extraData ?? {}
-                        };
+                        const d = checkResult.payload.data ?? checkResult.payload;
+                        const e = checkResult.payload.extraData;
+                        errorPayload = { data: d };
+                        if (e !== undefined)
+                            errorPayload.extraData = e;
                     }
                     return currentRes.status(bizCode).send(new ResponseSchema({
                         status: false,
@@ -143,14 +161,15 @@ export default class Controller extends BaseController {
                 }
             }
             let logicResult = logic ? await logic(p) : {};
-            if (logicResult instanceof Response || logicResult?.constructor?.name === 'Response') {
+            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 = logicResult.code ?? 400;
+                const bizCode = store?.metadata?._code ?? 400;
                 return currentRes.status(bizCode).send(new ResponseSchema({
                     status: false,
                     message: this.parseMessage(logicResult.message, currentReq.t, true),
@@ -158,14 +177,15 @@ export default class Controller extends BaseController {
                 }).getResponse);
             }
             const resResult = response ? await response({ ...p, logicResult }) : logicResult;
+            extractMeta(resResult);
             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';
-            let bizSuccessCode = this.currentStore?.metadata?._code || 200;
-            const extract = (obj) => {
+            let bizSuccessCode = store?.metadata?._code || 200;
+            const extractData = (obj) => {
                 if (!obj || typeof obj !== 'object')
                     return;
                 if (obj.payload && typeof obj.payload === 'object') {
@@ -177,28 +197,27 @@ export default class Controller extends BaseController {
                     finalExtraData = obj.extraData;
                 }
                 else {
-                    const hasMeta = obj.status !== undefined || obj.message !== undefined || obj.code !== undefined;
+                    const hasMeta = obj.status !== undefined || obj.message !== undefined || obj.code !== undefined || obj.statusCode !== undefined;
                     if (!hasMeta && Object.keys(obj).length > 0)
                         finalData = obj;
                 }
                 if (obj.message)
                     messageSource = obj.message;
-                if (obj.code !== undefined)
-                    bizSuccessCode = obj.code;
             };
             if (typeof resResult === 'string') {
                 messageSource = resResult;
-                extract(logicResult);
+                extractData(logicResult);
             }
             else {
-                extract(resResult !== undefined ? resResult : logicResult);
+                extractData(resResult !== undefined ? resResult : logicResult);
             }
             let payload = undefined;
             if (finalData !== undefined || finalExtraData !== undefined) {
-                payload = {
-                    data: finalData ?? {},
-                    extraData: finalExtraData ?? {}
-                };
+                payload = {};
+                if (finalData !== undefined)
+                    payload.data = finalData;
+                if (finalExtraData !== undefined)
+                    payload.extraData = finalExtraData;
             }
             return currentRes.status(bizSuccessCode).send(new ResponseSchema({
                 status: true,