@xrystal/core 3.21.7 → 3.21.9

package/package.json

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

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

@@ -1,7 +1,7 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
-import { IService, ProtocolEnum } from '../../utils/index';
 import LoggerService from '../logger';
 import SystemService from '../system';
+import { IService, ProtocolEnum } from '../../utils/index';
 export declare const controllerContextStorage: AsyncLocalStorage<{
     protocol?: ProtocolEnum;
     ctx?: any;

package/source/loader/controller/index.js

@@ -1,7 +1,7 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
-import { LoggerLayerEnum, ProtocolEnum, responseMessageHelper, ResponseSchema, x } from '../../utils/index';
 import LoggerService from '../logger';
 import SystemService from '../system';
+import { LoggerLayerEnum, ProtocolEnum, responseMessageHelper, ResponseSchema, x } from '../../utils/index';
 export const controllerContextStorage = new AsyncLocalStorage();
 export const getControllerCtx = () => controllerContextStorage.getStore();
 export class Controller {
@@ -103,7 +103,13 @@ export class ControllerService extends Controller {
                     }).getResponse);
                 }
             }
-            const logicResult = logic ? await logic(p) : null;
+            let logicResult = logic ? await logic(p) : null;
+            if (logicResult && typeof logicResult === 'object' && typeof logicResult.response === 'function') {
+                logicResult = await logicResult.response();
+            }
+            if (logicResult instanceof Response || (logicResult?.constructor?.name === 'Response')) {
+                return logicResult;
+            }
             if (logicResult?.status === false) {
                 return currentRes.status(logicResult.code || 400).send(new ResponseSchema({
                     status: false,
@@ -111,9 +117,10 @@ export class ControllerService extends Controller {
                     code: logicResult.code || 400
                 }).getResponse);
             }
-            if (logicResult instanceof Response)
-                return logicResult;
             const resResult = response ? await response({ ...p, logicResult }) : logicResult;
+            if (resResult instanceof Response || (resResult?.constructor?.name === 'Response')) {
+                return resResult;
+            }
             let finalMessage = '';
             let rawMessageValue = '';
             const messageSource = resResult?.message || (typeof resResult === 'string' || Array.isArray(resResult) ? resResult : '');

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

@@ -1,9 +1,10 @@
 import winston from "winston";
 import "winston-daily-rotate-file";
 import { AsyncLocalStorage } from "node:async_hooks";
-import ConfigsService from "../configs";
-import { LoggerLayerEnum, IService } from "../../utils";
 import SystemService from "../system";
+import ConfigsService from "../configs";
+import { LoggerLayerEnum } from '../../utils/models/enums/index';
+import { IService } from "../../utils";
 export interface ICustomLogger extends winston.Logger {
     critical: winston.LeveledLogMethod;
     http: winston.LeveledLogMethod;

package/source/loader/logger/index.js

@@ -4,7 +4,7 @@ import "winston-daily-rotate-file";
 import path from "node:path";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { Kafka, Partitioners, logLevel } from "kafkajs";
-import { LoggerLayerEnum } from "../../utils";
+import { LoggerLayerEnum } from '../../utils/models/enums/index';
 class KafkaTransport extends Transport {
     service;
     constructor(opts, service) {