@xrystal/core 3.15.9 → 3.16.2

package/package.json

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

package/source/loader/controller/index.js

@@ -22,39 +22,32 @@ class Controller {
         const identityT = (k) => k;
         if (!store)
             return { url: '', method: '', headers: {}, params: {}, query: {}, t: identityT };
-        const ctx = store.ctx;
-        if (ctx) {
-            const request = ctx.request || ctx.data?.request;
-            return {
-                url: request?.url || '',
-                method: request?.method || '',
-                headers: ctx.headers || {},
-                body: ctx.body,
-                params: ctx.params || {},
-                query: ctx.query || {},
-                accounts: ctx.user || ctx.data?.user || ctx.accounts,
-                t: ctx.t || ctx.data?.t || identityT
-            };
-        }
-        const req = store.req;
+        const { ctx, req: nativeReq } = store;
+        const reqSource = nativeReq?.url ? nativeReq : (ctx?.request?.url ? ctx.request : nativeReq);
         return {
-            url: req?.originalUrl || req?.url || '',
-            method: req?.method || 'GET',
-            headers: req?.headers || {},
-            body: req?.body,
-            params: req?.params || {},
-            query: req?.query || {},
-            accounts: req?.accounts,
-            t: req?.t || identityT
+            url: reqSource?.url || '',
+            method: reqSource?.method || 'GET',
+            headers: reqSource?.headers && typeof reqSource.headers.entries === 'function'
+                ? Object.fromEntries(reqSource.headers.entries())
+                : (ctx?.headers || nativeReq?.headers || {}),
+            body: ctx?.body || nativeReq?.body,
+            params: ctx?.params || nativeReq?.params || {},
+            query: ctx?.query || nativeReq?.query || {},
+            accounts: ctx?.user || ctx?.data?.user || nativeReq?.accounts,
+            t: ctx?.t || nativeReq?.t || identityT
         };
     }
     get res() {
         const store = this.currentStore;
         if (!store)
-            return { status: () => { }, send: () => { }, json: () => { }, locals: {} };
+            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;
-        if (store.ctx) {
-            // Metadata'yı ALS üzerinden yönetiyoruz (Thread-safe)
+        if (store.ctx || store.req) {
             if (!store.metadata)
                 store.metadata = { locals: {} };
             return {
@@ -84,8 +77,13 @@ class Controller {
         return res.status(resStatus).send(responseData);
     };
     parsedQuerys = (url) => {
-        const queryString = url.includes('?') ? url.split('?')[1] : '';
-        return queryString ? qs.parse(queryString, { decoder: decodeURIComponent }) : {};
+        try {
+            const queryString = url.includes('?') ? url.split('?')[1] : '';
+            return queryString ? qs.parse(queryString, { decoder: decodeURIComponent }) : {};
+        }
+        catch {
+            return {};
+        }
     };
 }
 export class ControllerService extends Controller {
@@ -97,6 +95,8 @@ export class ControllerService extends Controller {
         try {
             const currentReq = this.req;
             const currentRes = this.res;
+            if (!currentReq.url)
+                throw new Error("Request URL is missing from context");
             const payload = { req: currentReq, res: currentRes };
             const convertedPayload = { ...payload, parsedQuerys: this.parsedQuerys(currentReq.url) };
             if (checks) {