@xrystal/core 3.17.0 → 3.17.2

package/package.json

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

package/source/loader/configs/index.js

@@ -11,13 +11,21 @@ export default class ConfigsService {
         const tmp = this.#systemService.tmp;
         const rawConfigs = tmp?.configs || tmp?.configs || {};
         this.config = {
+            worker: process.env.WORKER === 'true' ? true : false || false,
+            nodeEnv: process.env.NODE_ENV === 'true' ? true : false || false,
             debug: process.env.SYSTEM_LOGGER_LAYER,
+            https: process.env.HTTPS,
+            httpsfileEncoding: process.env.ENCODING || 'utf8',
             rootFolderPath: rawConfigs.rootFolderPath || 'x',
             projectName: tmp.project.name,
             serviceName: rawConfigs.service,
-            port: process.env.PORT || rawConfigs.port || 3000,
+            projectNamePrefixEnv: process.env.PROJECT_NAME_PREFIX || '',
+            projectNameEnv: process.env.PROJECT_NAME || '',
+            projectNameSuffixEnv: process.env.PROJECT_NAME_SUFFIX || '',
             systemStaticFolderPath: path.resolve(rawConfigs.rootFolderPath, this.publicFolderName),
+            systemLoggerLayer: process.env.SYSTEM_LOGGER_LAYER,
             baseApiUri: process.env.HTTPS === 'true' ? process.env.SYSTEM_HTTPS_BASE_API_URI : process.env.SYSTEM_BASE_API_URI,
+            port: process.env.PORT || rawConfigs.port || 3000,
             internalSecret: process.env.INTERNAL_SECRET,
             secret: process.env.SECRET,
             cwd: process.cwd(),

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

@@ -45,7 +45,6 @@ export interface CustomResponse {
 declare abstract class Controller {
     protected logger: LoggerService;
     protected supportedProtocols: ProtocolEnum[];
-    constructor();
     protected get protocol(): ProtocolEnum;
     protected get currentStore(): {
         protocol?: ProtocolEnum;

package/source/loader/controller/index.js

@@ -7,8 +7,6 @@ export const getControllerCtx = () => controllerContextStorage.getStore();
 class Controller {
     logger = x.get(LoggerService);
     supportedProtocols = [ProtocolEnum.HTTP, ProtocolEnum.WEBSOCKET];
-    constructor() {
-    }
     get protocol() {
         return this.currentStore?.protocol || ProtocolEnum.HTTP;
     }
@@ -32,8 +30,8 @@ class Controller {
             params: ctx?.params || nativeReq?.params || source?.params || {},
             query: ctx?.query || nativeReq?.query || source?.query || {},
             accounts: ctx?.user || nativeReq?.accounts || source?.accounts,
-            lang: ctx?.lang || nativeReq?.lang || 'en',
-            t: ctx?.t || nativeReq?.t || identityT
+            lang: ctx?.lang || nativeReq?.lang || source?.lang || 'en',
+            t: ctx?.t || nativeReq?.t || source?.t || identityT
         };
     }
     get res() {
@@ -41,7 +39,7 @@ class Controller {
         const self = this;
         const fallbackRes = {
             status: function () { return this; },
-            send: (d) => d instanceof Response ? d : new Response(JSON.stringify(d), { status: 500 }),
+            send: (d) => d,
             json: function (d) { return this.send(d); },
             locals: {}
         };
@@ -101,22 +99,34 @@ export class ControllerService extends Controller {
             const convertedPayload = { ...payload, query: this.parsedQuerys(req.url) };
             if (checks) {
                 const checkResult = await checks({ payload, convertedPayload });
-                if (checkResult) {
-                    return res.status(checkResult.code || 400).send(new ResponseSchema(checkResult).getResponse);
+                if (checkResult === false || (checkResult && !Array.isArray(checkResult) && typeof checkResult === 'object')) {
+                    return res.status(checkResult?.code || 400).send(new ResponseSchema({
+                        status: false,
+                        message: checkResult?.message || '',
+                        code: checkResult?.code || 400
+                    }).getResponse);
                 }
             }
             const logicResult = await logic({ payload, convertedPayload });
+            if (logicResult?.status === false) {
+                return res.status(logicResult.code || 400).send(new ResponseSchema({
+                    status: false,
+                    message: logicResult.message,
+                    code: logicResult.code || 400
+                }).getResponse);
+            }
             if (logicResult?.response instanceof Function)
                 return logicResult.response(logicResult.payload);
             if (logicResult instanceof Response)
                 return logicResult;
             if (response) {
                 const resResult = await response({ payload, convertedPayload, logicResult });
+                const messageData = Array.isArray(resResult) ? resResult : resResult?.message;
                 const successObj = {
                     status: true,
-                    message: Array.isArray(resResult.message)
-                        ? responseMessageHelper.successFully(resResult.message[0], resResult.message[1], req.lang)
-                        : resResult.message,
+                    message: Array.isArray(messageData)
+                        ? responseMessageHelper.successFully(messageData[0], messageData[1], req.t)
+                        : (messageData || ''),
                     payload: logicResult?.payload !== undefined ? logicResult.payload : logicResult
                 };
                 return res.status(200).send(new ResponseSchema(successObj).getResponse);
@@ -128,10 +138,11 @@ export class ControllerService extends Controller {
                 level: LoggerLayerEnum[LoggerLayerEnum.CRITICAL].toLowerCase(),
                 message: `Controller Error: ${error}`,
             });
-            return this.res.status(500).send({
+            return this.res.status(500).send(new ResponseSchema({
                 status: false,
-                message: error.message
-            });
+                message: error.message,
+                code: 500
+            }).getResponse);
         }
     }
 }

package/source/utils/models/enums/index.d.ts

@@ -78,7 +78,8 @@ export declare enum TimezoneEnum {
 }
 export declare enum WsActionsEnum {
     REGISTER = "register",
-    JOIN = "join"
+    JOIN = "join",
+    MESSAGE = "message"
 }
 export declare enum WsKeyEnum {
     BUS = "WS_BUS",

package/source/utils/models/enums/index.js

@@ -94,6 +94,7 @@ export var WsActionsEnum;
 (function (WsActionsEnum) {
     WsActionsEnum["REGISTER"] = "register";
     WsActionsEnum["JOIN"] = "join";
+    WsActionsEnum["MESSAGE"] = "message";
 })(WsActionsEnum || (WsActionsEnum = {}));
 export var WsKeyEnum;
 (function (WsKeyEnum) {