@xrystal/core 3.22.2 → 3.22.5

package/package.json

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

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

@@ -34,8 +34,8 @@ export default class Configs implements IProvide<any> {
     #private;
     readonly publicFolderName: string;
     readonly kafkaLogsTopic: string;
-    constructor({ systemService }: {
-        systemService: System;
+    constructor({ system }: {
+        system: System;
     });
     onInit: ({}: {}) => Promise<void>;
     private initializeKafkaInfrastructure;

package/source/loader/configs/index.js

@@ -6,10 +6,10 @@ import { Constants } from '../../utils';
 export default class Configs {
     publicFolderName = Constants.publicFolderName;
     kafkaLogsTopic = Constants.kafkaLogsTopic;
-    #systemService;
+    #system;
     #config;
-    constructor({ systemService }) {
-        this.#systemService = systemService;
+    constructor({ system }) {
+        this.#system = system;
         const proxy = new Proxy(this, {
             get: (target, prop) => {
                 return target[prop] || target.config?.[prop];
@@ -19,7 +19,7 @@ export default class Configs {
     }
     onInit = async ({}) => {
         const cwd = process.cwd();
-        const tmp = this.#systemService.tmp;
+        const tmp = this.#system.tmp;
         const extendConfigs = tmp.configs.loaders.configs.loadPath;
         const fullPath = extendConfigs.startsWith('@/')
             ? path.join(process.cwd(), extendConfigs.slice(2))
@@ -76,7 +76,7 @@ export default class Configs {
                     ...this.#config.kafkaTopics
                 ])
             ],
-            serviceName: this.#systemService.tmp.configs.service
+            serviceName: this.#system.tmp.configs.service
         };
         if (isKafkaPassive === true || !kafkaBrokers)
             return;

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

@@ -47,11 +47,12 @@ export declare abstract class BaseController {
     protected get res(): CustomResponse;
 }
 export default abstract class Controller extends BaseController implements IProvide<any> {
-    constructor({}: {});
+    constructor();
     onInit(): Promise<void>;
-    schema({ checks, logic, response }: {
+    private parseMessage;
+    schema<T = any>({ checks, logic, response }: {
         checks?: (args: any) => Promise<any>;
-        logic?: (args: any) => Promise<any>;
+        logic?: (args: any) => Promise<T | boolean | string | any[]>;
         response?: (args: any) => Promise<any>;
     }): Promise<any>;
 }

package/source/loader/controller/index.js

@@ -1,3 +1,4 @@
+import qs from 'qs';
 import { AsyncLocalStorage } from 'node:async_hooks';
 import Logger from '../logger';
 import System from '../system';
@@ -8,25 +9,17 @@ export class BaseController {
     system = x.get(System);
     logger = x.get(Logger);
     supportedProtocols = [ProtocolEnum.HTTP, ProtocolEnum.WEBSOCKET];
-    get protocol() {
-        return this.currentStore?.protocol || ProtocolEnum.HTTP;
-    }
-    get currentStore() {
-        return getControllerCtx();
-    }
+    get protocol() { return this.currentStore?.protocol || ProtocolEnum.HTTP; }
+    get currentStore() { return getControllerCtx(); }
     get req() {
         const store = this.currentStore;
         const identityT = (k) => k;
         const ctx = store?.ctx || {};
+        const query = typeof ctx.query === 'string' ? qs.parse(ctx.query) : (ctx.query || {});
         return {
-            url: ctx.url || '',
-            method: ctx.method || '',
-            headers: ctx.headers || {},
-            body: ctx.body || {},
-            query: ctx.query || {},
-            params: ctx.params || {},
-            lang: ctx.lang || 'en',
-            t: ctx.t || identityT,
+            url: ctx.url || '', method: ctx.method || '', headers: ctx.headers || {},
+            body: ctx.body || {}, query: query, params: ctx.params || {},
+            lang: ctx.lang || 'en', t: ctx.t || identityT,
             accounts: ctx.accounts || store?.req?.accounts
         };
     }
@@ -54,115 +47,92 @@ export class BaseController {
                     return data;
                 if (data instanceof Response)
                     return data;
-                const isBinary = data instanceof Blob || data instanceof Uint8Array || data instanceof ArrayBuffer;
-                const isRaw = store.metadata?._isRaw || isBinary;
-                let contentType = store.metadata?._contentType;
-                if (!contentType) {
-                    contentType = isRaw ? 'application/octet-stream' : 'application/json';
-                }
+                const isRaw = store.metadata?._isRaw || (data instanceof Blob || data instanceof Uint8Array || data instanceof ArrayBuffer);
                 const status = store.metadata?._code || 200;
-                const body = isRaw || typeof data === 'string'
-                    ? data
-                    : JSON.stringify(data?.getResponse ? data.getResponse : data);
-                return new Response(body, {
-                    status,
-                    headers: { 'content-type': contentType }
-                });
+                const body = isRaw || typeof data === 'string' ? data : JSON.stringify(data?.getResponse ? data.getResponse : data);
+                return new Response(body, { status, headers: { 'content-type': isRaw ? 'application/octet-stream' : 'application/json' } });
             },
             json(data) { return this.send(data); }
         };
     }
 }
 export default class Controller extends BaseController {
-    constructor({}) {
-        super();
-    }
+    constructor() { super(); }
     async onInit() {
         const protocols = this.system?.tmp?.configs?.loaders?.controller?.protocols;
         this.supportedProtocols = Array.isArray(protocols) ? protocols : [protocols || ProtocolEnum.HTTP];
     }
+    parseMessage(input, t) {
+        if (!input || typeof input !== 'string' || !input.startsWith('@'))
+            return input;
+        const parts = input.substring(1).split(' ').filter(p => p !== '');
+        const maybeMethod = parts[0];
+        const hasMethod = typeof responseMessageHelper[maybeMethod] === 'function';
+        const methodName = hasMethod ? maybeMethod : 'successfully';
+        const rawArgs = hasMethod ? parts.slice(1) : parts;
+        const translatedArgs = rawArgs.map(arg => {
+            const res = t(`keywords.${arg}`);
+            return res !== `keywords.${arg}` ? res : (t(arg) !== arg ? t(arg) : arg);
+        });
+        return responseMessageHelper[methodName](translatedArgs[0] || '', translatedArgs.slice(1).join(' '), t);
+    }
     async schema({ checks, logic, response }) {
         try {
             const currentReq = this.req;
             const currentRes = this.res;
-            const p = {
-                req: currentReq,
-                res: currentRes,
-                body: currentReq.body,
-                query: currentReq.query,
-                params: currentReq.params,
-                t: currentReq.t
-            };
+            const store = this.currentStore;
+            const t = currentReq.t;
+            const p = { req: currentReq, res: currentRes, body: currentReq.body, query: currentReq.query, params: currentReq.params, locals: store?.metadata?.locals || {}, t };
             if (checks) {
-                const checkResult = await checks(p);
-                if (checkResult === false || (checkResult && typeof checkResult === 'object' && !Array.isArray(checkResult))) {
-                    const checkCode = checkResult?.code || 400;
-                    return currentRes.status(checkCode).send(new ResponseSchema({
+                const checkRes = await checks(p);
+                if (checkRes !== true) {
+                    const isObj = checkRes && typeof checkRes === 'object';
+                    const code = isObj ? checkRes.code || 400 : 400;
+                    const rawMsg = isObj ? checkRes.message : (typeof checkRes === 'string' ? checkRes : '@schemaMissingDataChecks');
+                    const { message, status, code: _c, data, payload, ...extras } = isObj ? checkRes : {};
+                    const coreData = data || payload;
+                    return currentRes.status(code).send(new ResponseSchema({
                         status: false,
-                        message: checkResult?.message || '',
-                        code: checkCode
+                        message: this.parseMessage(rawMsg, t),
+                        payload: (coreData !== undefined || Object.keys(extras).length > 0) ? { data: coreData, extraData: extras } : undefined,
+                        code
                     }).getResponse);
                 }
             }
-            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;
+            let logicRes = logic ? await logic(p) : null;
+            if (logic && logicRes === false) {
+                return currentRes.status(400).send(new ResponseSchema({ status: false, message: this.parseMessage('@unsuccessful logic', t), code: 400 }).getResponse);
             }
-            if (logicResult?.status === false) {
-                const errorCode = logicResult.code || 400;
-                return currentRes.status(errorCode).send(new ResponseSchema({
-                    status: false,
-                    message: logicResult.message || '',
-                    code: errorCode
-                }).getResponse);
+            let finalRes = response ? await response({ ...p, logicResult: logicRes }) : logicRes;
+            if (typeof finalRes === 'function')
+                finalRes = await finalRes(p);
+            if (Array.isArray(finalRes)) {
+                finalRes = { message: `@successfully ${finalRes.join(' ')}` };
             }
-            const resResult = response ? await response({ ...p, logicResult }) : logicResult;
-            if (resResult instanceof Response || (resResult?.constructor?.name === 'Response')) {
-                return resResult;
+            else if (typeof finalRes === 'string' && !finalRes.startsWith('@')) {
+                finalRes = { message: `@successfully ${finalRes}` };
             }
-            let finalMessage = '';
-            let rawMessageValue = '';
-            const messageSource = resResult?.message || (typeof resResult === 'string' || Array.isArray(resResult) ? resResult : '');
-            if (Array.isArray(messageSource)) {
-                finalMessage = responseMessageHelper.successFully(messageSource[0], messageSource[1], currentReq.t);
-                rawMessageValue = messageSource[0];
-            }
-            else if (typeof messageSource === 'string' && messageSource !== '') {
-                if (messageSource.startsWith('@')) {
-                    const cleanMsg = messageSource.substring(1);
-                    finalMessage = currentReq.t(cleanMsg, {});
-                    rawMessageValue = cleanMsg;
-                }
-                else {
-                    finalMessage = responseMessageHelper.successFully(messageSource, '', currentReq.t);
-                    rawMessageValue = messageSource;
-                }
-            }
-            let finalPayload = undefined;
-            if (logic) {
-                finalPayload = logicResult?.payload !== undefined ? logicResult.payload : logicResult;
-                if (finalPayload === messageSource || (finalPayload && typeof finalPayload === 'object' && (finalPayload.message === rawMessageValue || finalPayload.message === finalMessage))) {
-                    finalPayload = undefined;
-                }
+            if (finalRes instanceof Response || finalRes?.constructor?.name === 'Response')
+                return finalRes;
+            const isSuccess = finalRes?.status !== false;
+            const finalCode = finalRes?.code || store?.metadata?._code || 200;
+            let msgSource = finalRes?.message || (typeof finalRes === 'string' ? finalRes : '@successfully');
+            const rawOutput = (finalRes && typeof finalRes === 'object' && !Array.isArray(finalRes)) ? finalRes : { data: finalRes };
+            const { message, status, code, data, payload, ...extraData } = rawOutput;
+            const coreData = data !== undefined ? data : payload;
+            const responseData = {
+                status: isSuccess,
+                message: this.parseMessage(msgSource, t)
+            };
+            if (coreData !== undefined || Object.keys(extraData).length > 0) {
+                responseData.payload = { data: coreData, extraData: Object.keys(extraData).length > 0 ? extraData : undefined };
             }
-            const successCode = this.currentStore?.metadata?._code || 200;
-            return currentRes.status(successCode).send(new ResponseSchema({
-                status: true,
-                message: finalMessage,
-                ...(finalPayload && { payload: finalPayload }),
-                code: successCode
-            }).getResponse);
+            responseData.code = finalCode;
+            return currentRes.status(finalCode).send(new ResponseSchema(responseData).getResponse);
         }
         catch (error) {
             this.logger?.log(LoggerLayerEnum.ERROR, `Controller Error: ${error.message}`);
-            return this.res.status(500).send(new ResponseSchema({
-                status: false,
-                message: error.message,
-                code: 500
-            }).getResponse);
+            return this.res.status(500).send(new ResponseSchema({ status: false, message: error.message, code: 500 }).getResponse);
         }
     }
 }

package/source/loader/index.d.ts

@@ -4,6 +4,5 @@ import Logger from "./logger";
 import Events from "./events";
 import Localizations from "./localizations";
 import Controller from "./controller";
-import Service from "./service";
 import Clients from "./clients";
-export { System, Configs, Logger, Events, Localizations, Controller, Service, Clients };
+export { System, Configs, Logger, Events, Localizations, Controller, Clients };

package/source/loader/index.js

@@ -4,6 +4,5 @@ import Logger from "./logger";
 import Events from "./events";
 import Localizations from "./localizations";
 import Controller from "./controller";
-import Service from "./service";
 import Clients from "./clients";
-export { System, Configs, Logger, Events, Localizations, Controller, Service, Clients };
+export { System, Configs, Logger, Events, Localizations, Controller, Clients };

package/source/utils/helpers/locales/index.d.ts

@@ -1,53 +1,28 @@
 declare const coreMessages: {
-    successFully: (process?: string, event?: string, t?: any) => string;
-    unsuccessful: (process?: string, event?: string, t?: any) => string;
-    notFound: (process?: string, event?: string, t?: any) => string;
-    notMatch: (process?: string, event?: string, t?: any) => string;
-    notUse: (process?: string, event?: string, t?: any) => string;
-    invalid: (process?: string, event?: string, t?: any) => string;
-    checked: (process?: string, event?: string, t?: any) => string;
-    process: (process?: string, event?: string, t?: any) => string;
-    missingData: (process?: string, event?: string, t?: any) => string;
-    allreadyHave: (process?: string, event?: string, t?: any) => string;
-    wrongFormat: (process?: string, event?: string, t?: any) => string;
-    externalApiError: (process?: string, event?: string, t?: any) => string;
-    unauthorizedUrl: (process?: string, event?: string, t?: any) => string;
+    successfully: (p?: string, e?: string, t?: any) => string;
+    unsuccessful: (p?: string, e?: string, t?: any) => string;
+    notFound: (p?: string, e?: string, t?: any) => string;
+    notMatch: (p?: string, e?: string, t?: any) => string;
+    notUse: (p?: string, e?: string, t?: any) => string;
+    invalid: (p?: string, e?: string, t?: any) => string;
+    checked: (p?: string, e?: string, t?: any) => string;
+    process: (p?: string, e?: string, t?: any) => string;
+    missingData: (p?: string, e?: string, t?: any) => string;
+    allreadyHave: (p?: string, e?: string, t?: any) => string;
+    wrongFormat: (p?: string, e?: string, t?: any) => string;
+    externalApiError: (p?: string, e?: string, t?: any) => string;
+    unauthorizedUrl: (p?: string, e?: string, t?: any) => string;
     endpointNotWorking: (endpoint?: string, t?: any) => string;
     schemaMissingDataChecks: (t?: any) => string;
     schemaInvalidDataChecks: (t?: any) => string;
-    schemaUnknowErrorChecks: (a: any, b: any, t?: any) => string;
-    schemaUnknowErrorLogic: (a: any, b: any, t?: any) => string;
-    schemaUnknowErrorResponse: (a: any, b: any, t?: any) => string;
-    schemaUnknowErrorMain: (a: any, b: any, t?: any) => string;
-    dbQueryError: (process?: string, event?: string, t?: any) => string;
-    unknowError: (process?: string, event?: string, t?: any) => string;
-    serverError: (process?: string, event?: string, t?: any) => string;
-    emailWelcomeTemplateTitle: (t?: any) => string;
-    emailWelcomeTemplateExplanation: (t?: any) => string;
-    emailForgotPasswordTemplateTitle: (t?: any) => string;
-    emailForgotPasswordTemplateExplanation: (t?: any) => string;
-    allRightsReserved: (extra1?: string, extra2?: string, t?: any) => string;
-    emailButtonText: (t?: any) => string;
-    emailIgnoreText: (t?: any) => string;
-    welcomeMessage: (username?: string, t?: any) => string;
-    userIsBlocked: (extra1?: string, t?: any) => string;
-    passwordChangeCode: (username?: string, t?: any) => string;
-    notEnoughWalletBalance: (money?: string, currency?: string, t?: any) => string;
-    openAuthConsumerOverhang: (param1?: string, param2?: string, t?: any) => string;
-    thirdPartySystemOverhang: (param1?: string, param2?: string, t?: any) => string;
-    deviceOverhang: (param1?: string, param2?: string, t?: any) => string;
-    provisionOverhang: (money?: string, currency?: string, t?: any) => string;
-    balanceOverhang: (money?: string, currency?: string, t?: any) => string;
-    debtOverhang: (money?: string, currency?: string, t?: any) => string;
-    shipmentNotAccepted: (value1?: string, value2?: string, t?: any) => string;
-    optionsMethod: (methods?: string, t?: any) => string;
-    notAllowedCORS: (methods?: string, t?: any) => string;
-    missingCRSFToken: (t?: any) => string;
-    invalidCRSFToken: (t?: any) => string;
+    dbQueryError: (p?: string, e?: string, t?: any) => string;
+    unknowError: (p?: string, e?: string, t?: any) => string;
+    serverError: (p?: string, e?: string, t?: any) => string;
+    welcomeMessage: (u?: string, t?: any) => string;
+    userIsBlocked: (e?: string, t?: any) => string;
+    notEnoughWalletBalance: (m?: string, c?: string, t?: any) => string;
     tooManyRequest: (t?: any) => string;
-    endpointNotFound: (t?: any) => string;
-    roleAccess: (error?: string, t?: any) => string;
-    authenticationRequiredTokenExpired: (t?: any) => string;
+    roleAccess: (e?: string, t?: any) => string;
     authenticationRequired: (t?: any) => string;
 };
 export declare const responseMessageHelper: typeof coreMessages & Record<string, Function>;

package/source/utils/helpers/locales/index.js

@@ -1,173 +1,38 @@
+const f = (...args) => args.filter(item => item && typeof item === 'string' && item.trim() !== '').join(' ').trim();
 const coreMessages = {
-    'successFully': (process = '', event = '', t) => {
-        return `${process + ' ' + event} ${t && t('responseMessage.successfully')}.`;
-    },
-    'unsuccessful': (process = '', event = '', t) => {
-        return `${process + ' ' + event} ${t && t('responseMessage.unsuccessful')}.`;
-    },
-    'notFound': (process = '', event = '', t) => {
-        return `${process + ' ' + event} ${t && t('responseMessage.notFound')}.`;
-    },
-    'notMatch': (process = '', event = '', t) => {
-        return `${process + ' ' + event} ${t && t('responseMessage.notMatch')}.`;
-    },
-    'notUse': (process = '', event = '', t) => {
-        return `${process + ' ' + event} ${t && t('responseMessage.notUse')}.`;
-    },
-    'invalid': (process = '', event = '', t) => {
-        return `${process + ' ' + event} ${t && t('responseMessage.invalid')}.`;
-    },
-    'checked': (process = '', event = '', t) => {
-        return `${process + ' ' + event} ${t && t('responseMessage.checked')}.`;
-    },
-    'process': (process = '', event = '', t) => {
-        return `${process + ' ' + event} ${t && t('responseMessage.process')}.`;
-    },
-    'missingData': (process = '', event = '', t) => {
-        return `${process + ' ' + event} ${t && t('responseMessage.missingData')}.`;
-    },
-    'allreadyHave': (process = '', event = '', t) => {
-        return `${process + ' ' + event} ${t && t('responseMessage.allreadyHave')}.`;
-    },
-    'wrongFormat': (process = '', event = '', t) => {
-        return `${process + ' ' + event} ${t && t('responseMessage.wrongFormat')}.`;
-    },
-    'externalApiError': (process = '', event = '', t) => {
-        return `${process + ' ' + event}, ${t && t('responseMessage.externalApiError')}.`;
-    },
-    'unauthorizedUrl': (process = '', event = '', t) => {
-        return `${process + ' ' + event}, ${t && t('responseMessage.unauthorizedUrl')}.`;
-    },
-    'endpointNotWorking': (endpoint = '', t) => {
-        return `${endpoint}, ${t && t('responseMessage.endpointNotWorking')}.`;
-    },
-    // schema
-    // => special
-    'schemaMissingDataChecks': (t) => {
-        return `${t && t('responseMessage.schemaMissingDataChecks')}.`;
-    },
-    'schemaInvalidDataChecks': (t) => {
-        return `${t && t('responseMessage.schemaInvalidDataChecks')}.`;
-    },
-    'schemaUnknowErrorChecks': (a, b, t) => {
-        return `${t && t('responseMessage.schemaUnknowErrorChecks')}. ${a}. ${t('responseMessage.schemaErrorExtraExplanation')}: ${b}`;
-    },
-    'schemaUnknowErrorLogic': (a, b, t) => {
-        return `${t && t('responseMessage.schemaUnknowErrorLogic')}. ${a}. ${t('responseMessage.schemaErrorExtraExplanation')}: ${b}`;
-    },
-    'schemaUnknowErrorResponse': (a, b, t) => {
-        return `${t && t('responseMessage.schemaUnknowErrorLogic')}. ${a}. ${t('responseMessage.schemaErrorExtraExplanation')}: ${b}`;
-    },
-    'schemaUnknowErrorMain': (a, b, t) => {
-        return `${t && t('responseMessage.schemaUnknowErrorMain')}. ${a}. ${t('responseMessage.schemaErrorExtraExplanation')}: ${b}`;
-    },
-    //
-    'dbQueryError': (process = '', event = '', t) => {
-        return `${t && t('responseMessage.dbQueryError')}. ${process + ' ' + event}`;
-    },
-    'unknowError': (process = '', event = '', t) => {
-        return `${t && t('responseMessage.unknowError')}. ${process + ' ' + event}`;
-    },
-    'serverError': (process = '', event = '', t) => {
-        return `${t && t('responseMessage.serverError')}. ${process + ' ' + event}`;
-    },
-    // specific
-    // => email
-    // => templates
-    'emailWelcomeTemplateTitle': (t) => {
-        return `${t && t('responseMessage.emailWelcomeTemplateTitle')}`;
-    },
-    'emailWelcomeTemplateExplanation': (t) => {
-        return `${t && t('responseMessage.emailWelcomeTemplateExplanation')}.`;
-    },
-    'emailForgotPasswordTemplateTitle': (t) => {
-        return `${t && t('responseMessage.emailForgotPasswordTemplateTitle')}`;
-    },
-    'emailForgotPasswordTemplateExplanation': (t) => {
-        return `${t && t('responseMessage.emailForgotPasswordTemplateExplanation')}.`;
-    },
-    //
-    'allRightsReserved': (extra1 = '', extra2 = '', t) => {
-        return `${extra1 + ' ' + extra2}, ${t && t('responseMessage.allRightsReserved')}.`;
-    },
-    'emailButtonText': (t) => {
-        return `${t && t('responseMessage.emailButtonText')}.`;
-    },
-    'emailIgnoreText': (t) => {
-        return `${t && t('responseMessage.emailIgnoreText')}.`;
-    },
-    //
-    'welcomeMessage': (username = '', t) => {
-        return `@${username} - ${t && t('responseMessage.welcome')}.`;
-    },
-    'userIsBlocked': (extra1 = '', t) => {
-        return `${extra1}, ${t && t('responseMessage.userIsBlocked')}.`;
-    },
-    'passwordChangeCode': (username = '', t) => {
-        return `@${username} - ${t && t('responseMessage.passwordChangeCode')}.`;
-    },
-    'notEnoughWalletBalance': (money = '', currency = '', t) => {
-        return `${money + ' ' + currency}, ${t && t('responseMessage.notEnoughWalletBalance')}.`;
-    },
-    'openAuthConsumerOverhang': (param1 = '', param2 = '', t) => {
-        return `${param1 + ' ' + param2}, ${t && t('responseMessage.openAuthConsumerOverhang')}.`;
-    },
-    'thirdPartySystemOverhang': (param1 = '', param2 = '', t) => {
-        return `${param1 + ' ' + param2}, ${t && t('responseMessage.thirdPartySystems')}.`;
-    },
-    'deviceOverhang': (param1 = '', param2 = '', t) => {
-        return `${param1 + ' ' + param2}, ${t && t('responseMessage.deviceOverhang')}.`;
-    },
-    'provisionOverhang': (money = '', currency = '', t) => {
-        return `${money + ' ' + currency}, ${t && t('responseMessage.provisionOverhang')}.`;
-    },
-    'balanceOverhang': (money = '', currency = '', t) => {
-        return `${money + ' ' + currency}, ${t && t('responseMessage.balanceOverhang')}.`;
-    },
-    'debtOverhang': (money = '', currency = '', t) => {
-        return `${money + ' ' + currency}, ${t && t('responseMessage.debtOverhang')}.`;
-    },
-    'shipmentNotAccepted': (value1 = '', value2 = '', t) => {
-        return `${t && t('responseMessage.shipmentNotAccepted')}. ${value1} ${value2}`;
-    },
-    // system
-    'optionsMethod': (methods = '', t) => {
-        return `${t && t('responseMessage.optionsMethod')}. ${methods}`;
-    },
-    'notAllowedCORS': (methods = '', t) => {
-        return `${t && t('responseMessage.notAllowedCORS')}. ${methods}`;
-    },
-    'missingCRSFToken': (t) => {
-        return `${t && t('responseMessage.missingCSRFToken')}.`;
-    },
-    'invalidCRSFToken': (t) => {
-        return `${t && t('responseMessage.invalidCSRFToken')}.`;
-    },
-    'tooManyRequest': (t) => {
-        return `${t && t('responseMessage.tooManyRequest')}.`;
-    },
-    'endpointNotFound': (t) => {
-        return `${t && t('responseMessage.endpointNotFound')}.`;
-    },
-    'roleAccess': (error = '', t) => {
-        return `${t && t('responseMessage.roleAccess')}. ${error}`;
-    },
-    'authenticationRequiredTokenExpired': (t) => {
-        return `${t && t('responseMessage.authenticationRequiredTokenExpired')}.`;
-    },
-    'authenticationRequired': (t) => {
-        return `${t && t('responseMessage.authenticationRequired')}.`;
-    },
+    successfully: (p = '', e = '', t) => `${f(p, e)} ${t && t('responseMessage.successfully')}.`.trim(),
+    unsuccessful: (p = '', e = '', t) => `${f(p, e)} ${t && t('responseMessage.unsuccessful')}.`.trim(),
+    notFound: (p = '', e = '', t) => `${f(p, e)} ${t && t('responseMessage.notFound')}.`.trim(),
+    notMatch: (p = '', e = '', t) => `${f(p, e)} ${t && t('responseMessage.notMatch')}.`.trim(),
+    notUse: (p = '', e = '', t) => `${f(p, e)} ${t && t('responseMessage.notUse')}.`.trim(),
+    invalid: (p = '', e = '', t) => `${f(p, e)} ${t && t('responseMessage.invalid')}.`.trim(),
+    checked: (p = '', e = '', t) => `${f(p, e)} ${t && t('responseMessage.checked')}.`.trim(),
+    process: (p = '', e = '', t) => `${f(p, e)} ${t && t('responseMessage.process')}.`.trim(),
+    missingData: (p = '', e = '', t) => `${f(p, e)} ${t && t('responseMessage.missingData')}.`.trim(),
+    allreadyHave: (p = '', e = '', t) => `${f(p, e)} ${t && t('responseMessage.allreadyHave')}.`.trim(),
+    wrongFormat: (p = '', e = '', t) => `${f(p, e)} ${t && t('responseMessage.wrongFormat')}.`.trim(),
+    externalApiError: (p = '', e = '', t) => `${f(p, e)}, ${t && t('responseMessage.externalApiError')}.`.trim(),
+    unauthorizedUrl: (p = '', e = '', t) => `${f(p, e)}, ${t && t('responseMessage.unauthorizedUrl')}.`.trim(),
+    endpointNotWorking: (endpoint = '', t) => `${endpoint}, ${t && t('responseMessage.endpointNotWorking')}.`.trim(),
+    schemaMissingDataChecks: (t) => `${t && t('responseMessage.schemaMissingDataChecks')}.`.trim(),
+    schemaInvalidDataChecks: (t) => `${t && t('responseMessage.schemaInvalidDataChecks')}.`.trim(),
+    dbQueryError: (p = '', e = '', t) => `${t && t('responseMessage.dbQueryError')}. ${f(p, e)}`.trim(),
+    unknowError: (p = '', e = '', t) => `${t && t('responseMessage.unknowError')}. ${f(p, e)}`.trim(),
+    serverError: (p = '', e = '', t) => `${t && t('responseMessage.serverError')}. ${f(p, e)}`.trim(),
+    welcomeMessage: (u = '', t) => `@${u} - ${t && t('responseMessage.welcome')}.`.trim(),
+    userIsBlocked: (e = '', t) => `${e}, ${t && t('responseMessage.userIsBlocked')}.`.trim(),
+    notEnoughWalletBalance: (m = '', c = '', t) => `${f(m, c)}, ${t && t('responseMessage.notEnoughWalletBalance')}.`.trim(),
+    tooManyRequest: (t) => `${t && t('responseMessage.tooManyRequest')}.`.trim(),
+    roleAccess: (e = '', t) => `${t && t('responseMessage.roleAccess')}. ${e}`.trim(),
+    authenticationRequired: (t) => `${t && t('responseMessage.authenticationRequired')}.`.trim()
 };
 export const responseMessageHelper = new Proxy(coreMessages, {
     get(target, prop) {
-        if (prop in target) {
+        if (prop in target)
             return target[prop];
-        }
         const local = globalThis.__LOCAL_MESSAGES__;
-        if (local && prop in local) {
+        if (local && prop in local)
             return local[prop];
-        }
-        return () => `[Message '${prop}' not found]`;
+        return (p = '', e = '', t) => `${f(p, e)} ${prop}.`.trim();
     }
 });

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

@@ -3,7 +3,7 @@ import x from './classes/class.x';
 import locator from './classes/class.service-locator';
 export * from './classes/class.tmp-file-loader';
 export * from './classes/class.response';
-export * from './classes/class.services';
+export * from './classes/class.client';
 export * from './classes/class.interfaces';
 export * from './types';
 export * from './enums';

package/source/utils/models/index.js

@@ -3,7 +3,7 @@ import x from './classes/class.x';
 import locator from './classes/class.service-locator';
 export * from './classes/class.tmp-file-loader';
 export * from './classes/class.response';
-export * from './classes/class.services';
+export * from './classes/class.client';
 export * from './classes/class.interfaces';
 export * from './types';
 export * from './enums';

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

@@ -1,12 +0,0 @@
-import Logger from '../logger';
-import System from '../system';
-import { IProvide } from '../../utils';
-export declare abstract class BaseService {
-    protected system: System;
-    protected logger: Logger;
-    constructor();
-}
-export default abstract class Service extends BaseService implements IProvide<any> {
-    constructor({}: {});
-    onInit(): Promise<void>;
-}

package/source/loader/service/index.js

@@ -1,16 +0,0 @@
-import Logger from '../logger';
-import System from '../system';
-import { x } from '../../utils';
-export class BaseService {
-    system = x.get(System);
-    logger = x.get(Logger);
-    constructor() {
-    }
-}
-export default class Service extends BaseService {
-    constructor({}) {
-        super();
-    }
-    async onInit() {
-    }
-}