@xrystal/core 3.16.2 → 3.16.3

package/package.json

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

package/source/loader/controller/index.js

@@ -23,7 +23,7 @@ class Controller {
         if (!store)
             return { url: '', method: '', headers: {}, params: {}, query: {}, t: identityT };
         const { ctx, req: nativeReq } = store;
-        const reqSource = nativeReq?.url ? nativeReq : (ctx?.request?.url ? ctx.request : nativeReq);
+        const reqSource = nativeReq || ctx?.request || ctx?.data?.request;
         return {
             url: reqSource?.url || '',
             method: reqSource?.method || 'GET',
@@ -34,22 +34,23 @@ class Controller {
             params: ctx?.params || nativeReq?.params || {},
             query: ctx?.query || nativeReq?.query || {},
             accounts: ctx?.user || ctx?.data?.user || nativeReq?.accounts,
-            t: ctx?.t || nativeReq?.t || identityT
+            t: ctx?.t || ctx?.data?.t || nativeReq?.t || identityT
         };
     }
     get res() {
         const store = this.currentStore;
+        const fallbackRes = {
+            status: function () { return this; },
+            send: (d) => new Response(typeof d === 'string' ? d : JSON.stringify(d), { status: 500, headers: { 'content-type': 'application/json' } }),
+            json: function (d) { return this.send(d); },
+            locals: {}
+        };
         if (!store)
-            return {
-                status: function () { return this; },
-                send: (data) => new Response(JSON.stringify(data), { status: 500, headers: { 'content-type': 'application/json' } }),
-                json: function (data) { return this.send(data); },
-                locals: {}
-            };
-        const currentProtocol = this.protocol;
+            return fallbackRes;
         if (store.ctx || store.req) {
             if (!store.metadata)
                 store.metadata = { locals: {} };
+            const currentProtocol = this.protocol;
             return {
                 locals: store.metadata.locals,
                 status(code) {
@@ -57,11 +58,12 @@ class Controller {
                     return this;
                 },
                 send: (data) => {
-                    const isRaw = data instanceof Blob || data instanceof Uint8Array || store.metadata?._isRaw;
-                    const contentType = store.metadata?._contentType || (isRaw ? 'application/octet-stream' : 'application/json');
                     if (currentProtocol === ProtocolEnum.WEBSOCKET)
                         return data;
-                    const body = isRaw ? data : JSON.stringify(data && typeof data === 'object' ? JSON.parse(JSON.stringify(data)) : data);
+                    const isBinary = data instanceof Blob || data instanceof Uint8Array || data instanceof ArrayBuffer;
+                    const isRaw = store.metadata?._isRaw || isBinary;
+                    const contentType = store.metadata?._contentType || (isBinary ? 'application/octet-stream' : 'application/json');
+                    const body = isRaw ? data : JSON.stringify(data && typeof data === 'object' ? (data.getResponse || data) : data);
                     return new Response(body, {
                         status: store.metadata?._code || 200,
                         headers: { 'content-type': contentType }
@@ -70,7 +72,7 @@ class Controller {
                 json(data) { return this.send(data); }
             };
         }
-        return store.res;
+        return store.res || fallbackRes;
     }
     responseProtocolSwitch = async ({ res, resStatus = 200, context }) => {
         const responseData = context({ localeLanguageConverter: this.req?.t });
@@ -106,9 +108,9 @@ export class ControllerService extends Controller {
                 }
             }
             const logicResult = await logic({ payload, convertedPayload });
-            if (logicResult.response instanceof Function)
+            if (logicResult?.response instanceof Function)
                 return logicResult.response(logicResult.payload);
-            if (logicResult.message) {
+            if (logicResult?.message) {
                 return await this.responseProtocolSwitch({ res: currentRes, resStatus: 400, context: () => new ResponseSchema(logicResult).getResponse });
             }
             if (response) {
@@ -118,15 +120,14 @@ export class ControllerService extends Controller {
                     message: Array.isArray(resResult.message)
                         ? responseMessageHelper.successFully(resResult.message[0], resResult.message[1], currentReq.t)
                         : resResult.message,
-                    payload: logicResult.payload
+                    payload: logicResult?.payload || logicResult
                 };
                 return await this.responseProtocolSwitch({ res: currentRes, resStatus: 200, context: () => new ResponseSchema(successObj).getResponse });
             }
-            const finalData = logicResult.payload !== undefined ? logicResult.payload : logicResult;
-            return finalData && typeof finalData === 'object' ? JSON.parse(JSON.stringify(finalData)) : finalData;
+            return currentRes.send(logicResult?.payload !== undefined ? logicResult.payload : logicResult);
         }
         catch (error) {
-            return { status: false, message: error.message };
+            return this.res.status(500).send({ status: false, message: error.message });
         }
     }
 }