@fdm-monster/server 1.8.3 → 1.9.0-rc1

package/dist/entities/user.entity.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/entities/user.entity.ts"],"names":["User","BaseEntity","id","username","isDemoUser","isRootUser","isVerified","needsPasswordChange","passwordHash","createdAt","roles","refreshTokens","default","UserRole","ur","user","eager","RefreshToken","refreshToken"],"mappings":";;;;+BAMaA;;;eAAAA;;;yBANiF;oCACjE;4BACF;gCACF;;;;;;;;;;AAGlB,MAAMA,aAAaC,sBAAU;IAElCC,GAAY;IAGZC,SAAkB;IAKlBC,WAAqB;IAKrBC,WAAqB;IAKrBC,WAAqB;IAKrBC,oBAA8B;IAG9BC,aAAsB;IAGtBC,UAAiB;IAGjBC,MAA6B;IAG7BC,cAA+B;AACjC;;;;;;;;;;;QA9BIC,SAAS;;;;;;QAKTA,SAAS;;;;;;QAKTA,SAAS;;;;;;QAKTA,SAAS;;;;;;;;;;;;;gCAUMC,wBAAQ,GAAGC,KAAOA,GAAGC,IAAI;QAAIC,OAAO;;;;;gCAGpCC,gCAAY,GAAGC,eAAiBA,aAAaH,IAAI"}
+{"version":3,"sources":["../../src/entities/user.entity.ts"],"names":["User","id","username","isDemoUser","isRootUser","isVerified","needsPasswordChange","passwordHash","createdAt","roles","refreshTokens","default","UserRole","ur","user","eager","RefreshToken","refreshToken"],"mappings":";;;;+BAKaA;;;eAAAA;;;yBALiF;oCACjE;gCACJ;;;;;;;;;;AAGlB,MAAMA;IAEXC,GAAW;IAGXC,SAAiB;IAKjBC,WAAoB;IAKpBC,WAAoB;IAKpBC,WAAoB;IAKpBC,oBAA6B;IAG7BC,aAAqB;IAGrBC,UAAgB;IAOhBC,MAA6B;IAM7BC,cAA8B;AAChC;;;;;;;;;;;QArCIC,SAAS;;;;;;QAKTA,SAAS;;;;;;QAKTA,SAAS;;;;;;QAKTA,SAAS;;;;;;;;;;;;;gCAWHC,wBAAQ,GACbC,KAAOA,GAAGC,IAAI;QACbC,OAAO;;;;;gCAKHC,gCAAY,GACjBC,eAAiBA,aAAaH,IAAI"}

package/dist/exceptions/runtime.exceptions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/exceptions/runtime.exceptions.ts"],"names":["AuthenticationError","AuthorizationError","BadRequestException","ExternalServiceError","ForbiddenError","InternalServerException","NotFoundException","NotImplementedException","ValidationException","Error","constructor","message","name","reasonCode","error","permissions","roles","reason","path","errors","validationObject","JSON","stringify","serviceType","responseObject","stack"],"mappings":";;;;;;;;;;;IAOaA,mBAAmB;eAAnBA;;IAgBAC,kBAAkB;eAAlBA;;IAcAC,mBAAmB;eAAnBA;;IA2BAC,oBAAoB;eAApBA;;IAhDAC,cAAc;eAAdA;;IA4DAC,uBAAuB;eAAvBA;;IAhCAC,iBAAiB;eAAjBA;;IA5CAC,uBAAuB;eAAvBA;;IAsDAC,mBAAmB;eAAnBA;;;AAtDN,MAAMD,gCAAgCE;IAC3CC,YAAYC,OAAgB,CAAE;QAC5B,KAAK,CAACA;QACN,IAAI,CAACC,IAAI,GAAGL,wBAAwBK,IAAI;IAC1C;AACF;AAEO,MAAMZ,4BAA4BS;IACvCI,WAAmB;IACnBH,YAAYI,KAAc,EAAED,aAAa,EAAE,CAAE;QAC3C,KAAK,CAACC;QACN,IAAI,CAACF,IAAI,GAAGZ,oBAAoBY,IAAI;QACpC,IAAI,CAACC,UAAU,GAAGA;IACpB;AACF;AAEO,MAAMT,uBAAuBK;IAClCC,YAAYI,KAAc,CAAE;QAC1B,KAAK,CAACA;QACN,IAAI,CAACF,IAAI,GAAGR,eAAeQ,IAAI;IACjC;AACF;AAEO,MAAMX,2BAA2BQ;IACtCM,cAAyB,EAAE,CAAC;IAC5BC,QAAmB,EAAE,CAAC;IACtBC,OAAgB;IAEhBP,YAAY,EAAEK,WAAW,EAAEC,KAAK,EAAEC,MAAM,EAAiE,CAAE;QACzG,KAAK,CAAC;QACN,IAAI,CAACL,IAAI,GAAGX,mBAAmBW,IAAI;QACnC,IAAI,CAACK,MAAM,GAAGA;QACd,IAAI,CAACF,WAAW,GAAGA;QACnB,IAAI,CAACC,KAAK,GAAGA;IACf;AACF;AAEO,MAAMd,4BAA4BO;IACvCC,YAAYC,OAAe,CAAE;QAC3B,KAAK,CAACA;QACN,IAAI,CAACC,IAAI,GAAGV,oBAAoBU,IAAI;IACtC;AACF;AAEO,MAAMN,0BAA0BG;IACrCS,KAAc;IAEdR,YAAYC,OAAe,EAAEO,IAAa,CAAE;QAC1C,KAAK,CAACP;QACN,IAAI,CAACC,IAAI,GAAGN,kBAAkBM,IAAI;QAClC,IAAI,CAACM,IAAI,GAAGA;IACd;AACF;AAEO,MAAMV,4BAA4BC;IACvCU,OAAY;IAEZT,YAAYU,gBAAqB,CAAE;QACjC,KAAK,CAACC,KAAKC,SAAS,CAACF;QACrB,IAAI,CAACR,IAAI,GAAGJ,oBAAoBI,IAAI;QACpC,IAAI,CAACO,MAAM,GAAGC;IAChB;AACF;AAEO,MAAMjB,6BAA6BM;IACxCK,MAAW;IACXS,YAAqB;IAErBb,YAAYc,cAAmB,EAAED,WAAoB,CAAE;QACrD,KAAK,CAACF,KAAKC,SAAS,CAACE;QACrB,IAAI,CAACZ,IAAI,GAAGT,qBAAqBS,IAAI;QACrC,IAAI,CAACE,KAAK,GAAGU;QACb,IAAI,CAACD,WAAW,GAAGA;IACrB;AACF;AAEO,MAAMlB,gCAAgCI;IAC3CC,YAAYC,OAAe,EAAEc,KAAW,CAAE;QACxC,KAAK,CAACd;QACN,IAAI,CAACC,IAAI,GAAGP,wBAAwBO,IAAI;QACxC,IAAI,CAACa,KAAK,GAAGA;IACf;AACF"}
+{"version":3,"sources":["../../src/exceptions/runtime.exceptions.ts"],"names":["AuthenticationError","AuthorizationError","BadRequestException","ExternalServiceError","ForbiddenError","InternalServerException","NotFoundException","NotImplementedException","ValidationException","Error","constructor","message","name","reasonCode","error","permissions","roles","reason","path","errors","validationObject","JSON","stringify","serviceType","responseObject","stack"],"mappings":";;;;;;;;;;;IAOaA,mBAAmB;eAAnBA;;IAiBAC,kBAAkB;eAAlBA;;IAcAC,mBAAmB;eAAnBA;;IA2BAC,oBAAoB;eAApBA;;IAhDAC,cAAc;eAAdA;;IA4DAC,uBAAuB;eAAvBA;;IAhCAC,iBAAiB;eAAjBA;;IA7CAC,uBAAuB;eAAvBA;;IAuDAC,mBAAmB;eAAnBA;;;AAvDN,MAAMD,gCAAgCE;IAC3CC,YAAYC,OAAgB,CAAE;QAC5B,KAAK,CAACA;QACN,IAAI,CAACC,IAAI,GAAGL,wBAAwBK,IAAI;IAC1C;AACF;AAEO,MAAMZ,4BAA4BS;IACvCI,WAAmB;IAEnBH,YAAYI,KAAc,EAAED,aAAa,EAAE,CAAE;QAC3C,KAAK,CAACC;QACN,IAAI,CAACF,IAAI,GAAGZ,oBAAoBY,IAAI;QACpC,IAAI,CAACC,UAAU,GAAGA;IACpB;AACF;AAEO,MAAMT,uBAAuBK;IAClCC,YAAYI,KAAc,CAAE;QAC1B,KAAK,CAACA;QACN,IAAI,CAACF,IAAI,GAAGR,eAAeQ,IAAI;IACjC;AACF;AAEO,MAAMX,2BAA2BQ;IACtCM,cAAyB,EAAE,CAAC;IAC5BC,QAAmB,EAAE,CAAC;IACtBC,OAAgB;IAEhBP,YAAY,EAAEK,WAAW,EAAEC,KAAK,EAAEC,MAAM,EAAiE,CAAE;QACzG,KAAK,CAAC;QACN,IAAI,CAACL,IAAI,GAAGX,mBAAmBW,IAAI;QACnC,IAAI,CAACK,MAAM,GAAGA;QACd,IAAI,CAACF,WAAW,GAAGA;QACnB,IAAI,CAACC,KAAK,GAAGA;IACf;AACF;AAEO,MAAMd,4BAA4BO;IACvCC,YAAYC,OAAe,CAAE;QAC3B,KAAK,CAACA;QACN,IAAI,CAACC,IAAI,GAAGV,oBAAoBU,IAAI;IACtC;AACF;AAEO,MAAMN,0BAA0BG;IACrCS,KAAc;IAEdR,YAAYC,OAAe,EAAEO,IAAa,CAAE;QAC1C,KAAK,CAACP;QACN,IAAI,CAACC,IAAI,GAAGN,kBAAkBM,IAAI;QAClC,IAAI,CAACM,IAAI,GAAGA;IACd;AACF;AAEO,MAAMV,4BAAqCC;IAChDU,OAAU;IAEVT,YAAYU,gBAAmB,CAAE;QAC/B,KAAK,CAACC,KAAKC,SAAS,CAACF;QACrB,IAAI,CAACR,IAAI,GAAGJ,oBAAoBI,IAAI;QACpC,IAAI,CAACO,MAAM,GAAGC;IAChB;AACF;AAEO,MAAMjB,6BAA6BM;IACxCK,MAAW;IACXS,YAAqB;IAErBb,YAAYc,cAAmB,EAAED,WAAoB,CAAE;QACrD,KAAK,CAACF,KAAKC,SAAS,CAACE;QACrB,IAAI,CAACZ,IAAI,GAAGT,qBAAqBS,IAAI;QACrC,IAAI,CAACE,KAAK,GAAGU;QACb,IAAI,CAACD,WAAW,GAAGA;IACrB;AACF;AAEO,MAAMlB,gCAAgCI;IAC3CC,YAAYC,OAAe,EAAEc,KAAW,CAAE;QACxC,KAAK,CAACd;QACN,IAAI,CAACC,IAAI,GAAGP,wBAAwBO,IAAI;QACxC,IAAI,CAACa,KAAK,GAAGA;IACf;AACF"}

package/dist/handlers/logger.js

@@ -13,72 +13,167 @@ const _path = require("path");
 const _luxon = require("luxon");
 const _serverconstants = require("../server.constants");
 const _fsutils = require("../utils/fs.utils");
+const _winstonloki = /*#__PURE__*/ _interop_require_default(require("winston-loki"));
+const _zod = require("zod");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-const dtFormat = new Intl.DateTimeFormat("en-GB", {
-    timeStyle: "medium",
-    dateStyle: "short",
-    timeZone: "UTC"
-});
-const dateFormat = ()=>{
-    return dtFormat.format(new Date());
+const levelMap = {
+    error: "ERR",
+    warn: "WRN",
+    info: "INF",
+    debug: "DBG",
+    http: "HTT",
+    verbose: "VRB",
+    silly: "SLY"
 };
+const lokiLineClassProperty = "class";
+const lokiValidationSchema = _zod.z.object({
+    lokiEnabled: _zod.z.boolean(),
+    lokiAddress: _zod.z.string().url(),
+    lokiTimeoutSeconds: _zod.z.coerce.number().positive().default(30),
+    lokiInterval: _zod.z.coerce.number().positive().default(15)
+});
 class LoggerService {
     name;
     logger;
     constructor(name, enableFileLogs = true, logFilterLevel = ""){
         const isProd = process.env[_serverconstants.AppConstants.NODE_ENV_KEY] === _serverconstants.AppConstants.defaultProductionEnv;
         const isTest = process.env[_serverconstants.AppConstants.NODE_ENV_KEY] === _serverconstants.AppConstants.defaultTestEnv;
-        if (!logFilterLevel) {
-            logFilterLevel = isProd || isTest ? "warn" : "info";
+        let effectiveLogLevel = logFilterLevel;
+        if (!effectiveLogLevel) {
+            effectiveLogLevel = isProd || isTest ? "warn" : "debug";
+        }
+        const isLokiEnabled = process.env[_serverconstants.AppConstants.ENABLE_LOKI_LOGGING] === "true";
+        const extraWinstonTransports = [];
+        if (isLokiEnabled) {
+            const lokiConfigValidationResult = lokiValidationSchema.safeParse({
+                lokiEnabled: isLokiEnabled,
+                lokiTimeoutSeconds: process.env[_serverconstants.AppConstants.LOKI_TIMEOUT_SECONDS],
+                lokiAddress: process.env[_serverconstants.AppConstants.LOKI_ADDRESS],
+                lokiInterval: process.env[_serverconstants.AppConstants.LOKI_INTERVAL]
+            });
+            if (lokiConfigValidationResult.success) {
+                extraWinstonTransports.push(new _winstonloki.default({
+                    level: effectiveLogLevel,
+                    host: lokiConfigValidationResult.data.lokiAddress,
+                    interval: lokiConfigValidationResult.data.lokiInterval,
+                    timeout: lokiConfigValidationResult.data.lokiTimeoutSeconds,
+                    handleExceptions: true,
+                    onConnectionError (error) {
+                        console.debug(`Loki logger enabled, but connection failed. ${error}`);
+                    },
+                    labels: {
+                        app: "fdm-monster-server"
+                    },
+                    json: false,
+                    useWinstonMetaAsLabels: false,
+                    format: _winston.default.format.json()
+                }));
+            }
         }
-        const date = _luxon.DateTime.now().toISODate();
         this.name = name;
         this.logger = _winston.default.createLogger({
             transports: [
+                ...extraWinstonTransports,
                 new _winston.default.transports.Console({
-                    level: logFilterLevel
-                }),
-                ...enableFileLogs ? [
-                    new _winston.default.transports.File({
-                        level: isTest ? "warn" : "info",
-                        filename: (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultLogsFolder, `${_serverconstants.AppConstants.logAppName}-${date}.log`),
-                        maxsize: 5000000,
-                        maxFiles: 5
-                    })
-                ] : []
+                    level: effectiveLogLevel,
+                    format: _winston.default.format.combine(_winston.default.format((info)=>{
+                        info.rawLevel = info.level;
+                        return info;
+                    })(), _winston.default.format.colorize({
+                        colors: {
+                            error: "red",
+                            warn: "yellow",
+                            info: "white",
+                            debug: "gray",
+                            http: "magenta",
+                            verbose: "cyan",
+                            silly: "gray"
+                        },
+                        level: true,
+                        message: true,
+                        all: false
+                    }), _winston.default.format.printf((info)=>{
+                        const now = new Date();
+                        const timestamp = `${now.toISOString().split("T")[0]} ${now.toTimeString().split(" ")[0]}.${now.getMilliseconds().toString().padStart(3, "0")}`;
+                        const levelAbbr = levelMap[info.rawLevel] || info.rawLevel.substring(0, 3).toUpperCase();
+                        const gray = "\x1b[90m";
+                        const reset = info.message.substring(0, 5) ?? "\x1b[0m";
+                        const numberRegex = /\b\d+\b/g;
+                        const coloredMessage = info.message.replace(numberRegex, (match)=>`\x1b[35m${match}${reset}`);
+                        let logEntry = `${gray}[${timestamp} ${reset}${levelAbbr}${reset}${gray}]${reset} ${gray}[${reset}${name}${gray}]${reset} ${coloredMessage}`;
+                        if (info.meta) {
+                            const metaString = JSON.stringify(info.meta);
+                            const coloredMeta = metaString.replace(numberRegex, (match)=>`\x1b[35m${match}${reset}`);
+                            logEntry += ` ${coloredMeta}`;
+                        }
+                        return logEntry;
+                    }))
+                })
             ],
             format: _winston.default.format.printf((info)=>{
-                const level = info.level.toUpperCase();
-                const date = dateFormat();
-                let message = `${date} | ${level} | ${name} | ${info.message}`;
-                message = info.meta ? message + ` - ${JSON.stringify(info.meta)}` : message;
+                const now = new Date();
+                const timestamp = `${now.toISOString().split("T")[0]} ${now.toTimeString().split(" ")[0]}.${now.getMilliseconds().toString().padStart(3, "0")}`;
+                const levelAbbr = levelMap[info.level] || `[${info.level.substring(0, 3).toUpperCase()}]`;
+                let message = `[${timestamp} ${levelAbbr}] [${name}] ${info.message}`;
+                if (info.meta) {
+                    const pascalCaseMeta = Object.entries(info.meta).reduce((acc, [key, value])=>{
+                        const pascalKey = key.charAt(0).toUpperCase() + key.slice(1);
+                        acc[pascalKey] = value;
+                        return acc;
+                    }, {});
+                    message += ` ${JSON.stringify(pascalCaseMeta)}`;
+                }
                 return message;
             })
         });
+        if (enableFileLogs) {
+            const date = _luxon.DateTime.now().toISODate();
+            const logFilePath = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultLogsFolder, `${_serverconstants.AppConstants.logAppName}-${date}.log`);
+            this.logger.add(new _winston.default.transports.File({
+                level: isTest ? "warn" : "info",
+                filename: logFilePath,
+                maxsize: 5000000,
+                maxFiles: 5
+            }));
+        }
     }
-    log(message, meta) {
-        this.logger.log("info", message, {
-            meta
+    newDebug(object) {
+        this.logger.debug({
+            ...object,
+            [lokiLineClassProperty]: this.name
         });
     }
+    log(message, meta) {
+        const enrichedMeta = {
+            ...meta,
+            [lokiLineClassProperty]: this.name
+        };
+        this.logger.log("info", message, enrichedMeta);
+    }
     warn(message, meta) {
-        this.logger.log("warn", message, {
-            meta
-        });
+        const enrichedMeta = {
+            ...meta,
+            [lokiLineClassProperty]: this.name
+        };
+        this.logger.log("warn", message, enrichedMeta);
     }
     debug(message, meta) {
-        this.logger.log("debug", message, {
-            meta
-        });
+        const enrichedMeta = {
+            ...meta,
+            [lokiLineClassProperty]: this.name
+        };
+        this.logger.log("debug", message, enrichedMeta);
     }
     error(message, meta) {
-        this.logger.log("error", message, {
-            meta
-        });
+        const enrichedMeta = {
+            ...meta,
+            [lokiLineClassProperty]: this.name
+        };
+        this.logger.log("error", message, enrichedMeta);
     }
 }
 

package/dist/handlers/logger.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/handlers/logger.ts"],"names":["LoggerService","dtFormat","Intl","DateTimeFormat","timeStyle","dateStyle","timeZone","dateFormat","format","Date","name","logger","constructor","enableFileLogs","logFilterLevel","isProd","process","env","AppConstants","NODE_ENV_KEY","defaultProductionEnv","isTest","defaultTestEnv","date","DateTime","now","toISODate","winston","createLogger","transports","Console","level","File","filename","join","superRootPath","defaultLogsFolder","logAppName","maxsize","maxFiles","printf","info","toUpperCase","message","meta","JSON","stringify","log","warn","debug","error"],"mappings":";;;;+BAgBaA;;;eAAAA;;;gEAhBO;sBACC;uBACI;iCACI;yBACC;;;;;;AAE9B,MAAMC,WAAW,IAAIC,KAAKC,cAAc,CAAC,SAAS;IAChDC,WAAW;IACXC,WAAW;IACXC,UAAU;AACZ;AAEA,MAAMC,aAAa;IACjB,OAAON,SAASO,MAAM,CAAC,IAAIC;AAC7B;AAEO,MAAMT;IACXU,KAAa;IACbC,OAAuB;IAEvBC,YAAYF,IAAY,EAAEG,iBAAiB,IAAI,EAAEC,iBAAyB,EAAE,CAAE;QAC5E,MAAMC,SAASC,QAAQC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC,KAAKD,6BAAY,CAACE,oBAAoB;QAC3F,MAAMC,SAASL,QAAQC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC,KAAKD,6BAAY,CAACI,cAAc;QAErF,IAAI,CAACR,gBAAgB;YACnBA,iBAAiBC,UAAUM,SAAS,SAAS;QAC/C;QAEA,MAAME,OAAOC,eAAQ,CAACC,GAAG,GAAGC,SAAS;QACrC,IAAI,CAAChB,IAAI,GAAGA;QACZ,IAAI,CAACC,MAAM,GAAGgB,gBAAO,CAACC,YAAY,CAAC;YACjCC,YAAY;gBACV,IAAIF,gBAAO,CAACE,UAAU,CAACC,OAAO,CAAC;oBAC7BC,OAAOjB;gBACT;mBACID,iBACA;oBACE,IAAIc,gBAAO,CAACE,UAAU,CAACG,IAAI,CAAC;wBAC1BD,OAAOV,SAAS,SAAS;wBACzBY,UAAUC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIjB,6BAAY,CAACkB,iBAAiB,EAAE,GAAGlB,6BAAY,CAACmB,UAAU,CAAC,CAAC,EAAEd,KAAK,IAAI,CAAC;wBACxGe,SAAS;wBACTC,UAAU;oBACZ;iBACD,GACD,EAAE;aACP;YACD/B,QAAQmB,gBAAO,CAACnB,MAAM,CAACgC,MAAM,CAAC,CAACC;gBAC7B,MAAMV,QAAQU,KAAKV,KAAK,CAACW,WAAW;gBACpC,MAAMnB,OAAOhB;gBACb,IAAIoC,UAAU,GAAGpB,KAAK,GAAG,EAAEQ,MAAM,GAAG,EAAErB,KAAK,GAAG,EAAE+B,KAAKE,OAAO,EAAE;gBAC9DA,UAAUF,KAAKG,IAAI,GAAGD,UAAU,CAAC,GAAG,EAAEE,KAAKC,SAAS,CAACL,KAAKG,IAAI,GAAG,GAAGD;gBACpE,OAAOA;YACT;QACF;IACF;IAEAI,IAAIJ,OAAe,EAAEC,IAAU,EAAE;QAC/B,IAAI,CAACjC,MAAM,CAACoC,GAAG,CAAC,QAAQJ,SAAS;YAC/BC;QACF;IACF;IAEAI,KAAKL,OAAe,EAAEC,IAAU,EAAE;QAChC,IAAI,CAACjC,MAAM,CAACoC,GAAG,CAAC,QAAQJ,SAAS;YAC/BC;QACF;IACF;IAEAK,MAAMN,OAAe,EAAEC,IAAU,EAAE;QACjC,IAAI,CAACjC,MAAM,CAACoC,GAAG,CAAC,SAASJ,SAAS;YAChCC;QACF;IACF;IAEAM,MAAMP,OAAe,EAAEC,IAAU,EAAE;QACjC,IAAI,CAACjC,MAAM,CAACoC,GAAG,CAAC,SAASJ,SAAS;YAAEC;QAAK;IAC3C;AACF"}
+{"version":3,"sources":["../../src/handlers/logger.ts"],"names":["LoggerService","levelMap","error","warn","info","debug","http","verbose","silly","lokiLineClassProperty","lokiValidationSchema","z","object","lokiEnabled","boolean","lokiAddress","string","url","lokiTimeoutSeconds","coerce","number","positive","default","lokiInterval","name","logger","constructor","enableFileLogs","logFilterLevel","isProd","process","env","AppConstants","NODE_ENV_KEY","defaultProductionEnv","isTest","defaultTestEnv","effectiveLogLevel","isLokiEnabled","ENABLE_LOKI_LOGGING","extraWinstonTransports","lokiConfigValidationResult","safeParse","LOKI_TIMEOUT_SECONDS","LOKI_ADDRESS","LOKI_INTERVAL","success","push","LokiTransport","level","host","data","interval","timeout","handleExceptions","onConnectionError","console","labels","app","json","useWinstonMetaAsLabels","format","winston","createLogger","transports","Console","combine","rawLevel","colorize","colors","message","all","printf","now","Date","timestamp","toISOString","split","toTimeString","getMilliseconds","toString","padStart","levelAbbr","substring","toUpperCase","gray","reset","numberRegex","coloredMessage","replace","match","logEntry","meta","metaString","JSON","stringify","coloredMeta","pascalCaseMeta","Object","entries","reduce","acc","key","value","pascalKey","charAt","slice","date","DateTime","toISODate","logFilePath","join","superRootPath","defaultLogsFolder","logAppName","add","File","filename","maxsize","maxFiles","newDebug","log","enrichedMeta"],"mappings":"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"}

package/dist/handlers/validators.js

@@ -9,12 +9,6 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    getExtendedValidator: function() {
-        return getExtendedValidator;
-    },
-    getScopedPrinter: function() {
-        return getScopedPrinter;
-    },
     validateInput: function() {
         return validateInput;
     },
@@ -23,118 +17,15 @@ _export(exports, {
     }
 });
 const _runtimeexceptions = require("../exceptions/runtime.exceptions");
-const _printer = require("../middleware/printer");
-const _normalizeurl = require("../utils/normalize-url");
-const _nodeinputvalidator = /*#__PURE__*/ _interop_require_wildcard(require("node-input-validator"));
-const _urlutils = require("../utils/url.utils");
-function _getRequireWildcardCache(nodeInterop) {
-    if (typeof WeakMap !== "function") return null;
-    var cacheBabelInterop = new WeakMap();
-    var cacheNodeInterop = new WeakMap();
-    return (_getRequireWildcardCache = function(nodeInterop) {
-        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
-    })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-    if (!nodeInterop && obj && obj.__esModule) {
-        return obj;
-    }
-    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-        return {
-            default: obj
-        };
-    }
-    var cache = _getRequireWildcardCache(nodeInterop);
-    if (cache && cache.has(obj)) {
-        return cache.get(obj);
-    }
-    var newObj = {
-        __proto__: null
-    };
-    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-    for(var key in obj){
-        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-            if (desc && (desc.get || desc.set)) {
-                Object.defineProperty(newObj, key, desc);
-            } else {
-                newObj[key] = obj[key];
-            }
-        }
-    }
-    newObj.default = obj;
-    if (cache) {
-        cache.set(obj, newObj);
-    }
-    return newObj;
-}
-function getExtendedValidator() {
-    (0, _nodeinputvalidator.extend)("wsurl", ({ value, args }, validator)=>{
-        if (!value) return false;
-        try {
-            const url = new URL((0, _normalizeurl.normalizeUrl)(value, {
-                defaultProtocol: "wss"
-            }));
-            return url.protocol === "ws:" || url.protocol === "wss:";
-        } catch (e) {
-            return false;
-        }
-    });
-    (0, _nodeinputvalidator.extend)("httpurl", ({ value, args }, validator)=>{
-        if (!value) return false;
-        try {
-            const url = new URL((0, _normalizeurl.normalizeUrl)(value, {
-                defaultProtocol: _urlutils.defaultHttpProtocol
-            }));
-            return url.protocol === "http:" || url.protocol === "https:";
-        } catch (e) {
-            return false;
-        }
-    });
-    (0, _nodeinputvalidator.extend)("not", ({ value, args }, validator)=>{
-        return !value && value !== false;
-    });
-    (0, _nodeinputvalidator.extendMessages)({
-        not: "The :attribute field may not be present."
-    });
-    return _nodeinputvalidator.default;
-}
-function getScopedPrinter(req) {
-    const tokens = [
-        _printer.printerApiToken,
-        _printer.printerLoginToken,
-        _printer.currentPrinterToken,
-        _printer.printerIdToken
-    ];
-    let resolvedDependencies = {};
-    let errors = [];
-    tokens.forEach((t)=>{
-        try {
-            const dependency = req.container.resolve(t);
-            if (!dependency) {
-                errors.push(`Scoped Dependency '${t}' was not resolved. Please ensure the route requires a :id param and the printerId was provided.`);
-            }
-            resolvedDependencies[t] = dependency;
-        } catch (e) {
-            throw new _runtimeexceptions.InternalServerException(`Dependency ${t} could not be resolved. Aborted request.`);
-        }
-    });
-    if (errors.length > 0) {
-        throw new _runtimeexceptions.ValidationException(errors);
-    }
-    return resolvedDependencies;
-}
-async function validateInput(data, rules) {
-    const localNIV = getExtendedValidator();
-    const v = new localNIV.Validator(data, rules);
-    const matched = await v.check();
-    if (!matched) {
-        throw new _runtimeexceptions.ValidationException(v.errors);
+async function validateInput(data, zodSchema) {
+    const result = await zodSchema.safeParseAsync(data);
+    if (!result.success) {
+        throw new _runtimeexceptions.ValidationException(result.error);
     }
-    return v.inputs;
+    return result.data;
 }
-async function validateMiddleware(req, rules) {
-    return validateInput(req.body, rules);
+async function validateMiddleware(req, zodSchema) {
+    return validateInput(req.body, zodSchema);
 }
 
 //# sourceMappingURL=validators.js.map

package/dist/handlers/validators.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/handlers/validators.ts"],"names":["getExtendedValidator","getScopedPrinter","validateInput","validateMiddleware","extend","value","args","validator","url","URL","normalizeUrl","defaultProtocol","protocol","e","defaultHttpProtocol","extendMessages","not","nodeInputValidator","req","tokens","printerApiToken","printerLoginToken","currentPrinterToken","printerIdToken","resolvedDependencies","errors","forEach","t","dependency","container","resolve","push","InternalServerException","length","ValidationException","data","rules","localNIV","v","Validator","matched","check","inputs","body"],"mappings":";;;;;;;;;;;IAWgBA,oBAAoB;eAApBA;;IAkCAC,gBAAgB;eAAhBA;;IAiCMC,aAAa;eAAbA;;IAeAC,kBAAkB;eAAlBA;;;mCA5FuC;yBAC2B;8BAC3D;4EAC8B;0BAKvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE7B,SAASH;IACdI,IAAAA,0BAAM,EAAC,SAAS,CAAC,EAAEC,KAAK,EAAEC,IAAI,EAA6B,EAAEC;QAC3D,IAAI,CAACF,OAAO,OAAO;QAEnB,IAAI;YACF,MAAMG,MAAM,IAAIC,IAAIC,IAAAA,0BAAY,EAACL,OAAO;gBAAEM,iBAAiB;YAAM;YACjE,OAAOH,IAAII,QAAQ,KAAK,SAASJ,IAAII,QAAQ,KAAK;QACpD,EAAE,OAAOC,GAAG;YACV,OAAO;QACT;IACF;IAEAT,IAAAA,0BAAM,EAAC,WAAW,CAAC,EAAEC,KAAK,EAAEC,IAAI,EAA6B,EAAEC;QAC7D,IAAI,CAACF,OAAO,OAAO;QAEnB,IAAI;YACF,MAAMG,MAAM,IAAIC,IAAIC,IAAAA,0BAAY,EAACL,OAAO;gBAAEM,iBAAiBG,6BAAmB;YAAC;YAC/E,OAAON,IAAII,QAAQ,KAAK,WAAWJ,IAAII,QAAQ,KAAK;QACtD,EAAE,OAAOC,GAAG;YACV,OAAO;QACT;IACF;IAEAT,IAAAA,0BAAM,EAAC,OAAO,CAAC,EAAEC,KAAK,EAAEC,IAAI,EAA6B,EAAEC;QACzD,OAAO,CAACF,SAASA,UAAU;IAC7B;IAEAU,IAAAA,kCAAc,EAAC;QACbC,KAAK;IACP;IAEA,OAAOC,2BAAkB;AAC3B;AAEO,SAAShB,iBAAiBiB,GAAY;IAC3C,MAAMC,SAAS;QAACC,wBAAe;QAAEC,0BAAiB;QAAEC,4BAAmB;QAAEC,uBAAc;KAAC;IACxF,IAAIC,uBAKA,CAAC;IACL,IAAIC,SAAgB,EAAE;IACtBN,OAAOO,OAAO,CAAC,CAACC;QACd,IAAI;YACF,MAAMC,aAAaV,IAAIW,SAAS,CAACC,OAAO,CAACH;YACzC,IAAI,CAACC,YAAY;gBACfH,OAAOM,IAAI,CACT,CAAC,mBAAmB,EAAEJ,EAAE,gGAAgG,CAAC;YAE7H;YACAH,oBAAoB,CAACG,EAAE,GAAGC;QAC5B,EAAE,OAAOf,GAAG;YACV,MAAM,IAAImB,0CAAuB,CAAC,CAAC,WAAW,EAAEL,EAAE,wCAAwC,CAAC;QAC7F;IACF;IAEA,IAAIF,OAAOQ,MAAM,GAAG,GAAG;QACrB,MAAM,IAAIC,sCAAmB,CAACT;IAChC;IAEA,OAAOD;AACT;AAKO,eAAetB,cAAiBiC,IAAS,EAAEC,KAAQ;IACxD,MAAMC,WAAWrC;IAEjB,MAAMsC,IAAI,IAAID,SAASE,SAAS,CAACJ,MAAMC;IAEvC,MAAMI,UAAU,MAAMF,EAAEG,KAAK;IAC7B,IAAI,CAACD,SAAS;QACZ,MAAM,IAAIN,sCAAmB,CAACI,EAAEb,MAAM;IACxC;IACA,OAAOa,EAAEI,MAAM;AACjB;AAKO,eAAevC,mBAAsBe,GAAY,EAAEkB,KAAQ;IAChE,OAAOlC,cAAcgB,IAAIyB,IAAI,EAAEP;AACjC"}
+{"version":3,"sources":["../../src/handlers/validators.ts"],"names":["validateInput","validateMiddleware","data","zodSchema","result","safeParseAsync","success","ValidationException","error","req","body"],"mappings":";;;;;;;;;;;IAIsBA,aAAa;eAAbA;;IASAC,kBAAkB;eAAlBA;;;mCAZc;AAG7B,eAAeD,cAAoBE,IAAO,EAAEC,SAAuB;IACxE,MAAMC,SAAS,MAAMD,UAAUE,cAAc,CAACH;IAE9C,IAAI,CAACE,OAAOE,OAAO,EAAE;QACnB,MAAM,IAAIC,sCAAmB,CAACH,OAAOI,KAAK;IAC5C;IACA,OAAOJ,OAAOF,IAAI;AACpB;AAEO,eAAeD,mBAAyBQ,GAAe,EAAEN,SAAuB;IACrF,OAAOH,cAAcS,IAAIC,IAAI,EAAEP;AACjC"}

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":["setupEnvConfig","setupServer","then","httpServer","container","resolve","DITokens","serverHost","boot","catch","e","console","error","captureException","flush","process","exit"],"mappings":";;;;sBAAwC;2BACT;4BACH;iCACH;AAEzBA,IAAAA,yBAAc;AAEdC,IAAAA,uBAAW,IAAGC,IAAI,CAAC,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE;IAC3CA,UACGC,OAAO,CAACC,yBAAQ,CAACC,UAAU,EAC3BC,IAAI,CAACL,YACLM,KAAK,CAAC,OAAOC;QACZC,QAAQC,KAAK,CAAC,2DAA2DF;QAEzEG,IAAAA,sBAAgB,EAACH;QACjB,MAAMI,IAAAA,WAAK,EAAC;QACZC,QAAQC,IAAI,CAAC;IACf;AACJ"}
+{"version":3,"sources":["../src/index.ts"],"names":["setupEnvConfig","setupServer","then","httpServer","container","resolve","DITokens","serverHost","boot","catch","e","console","error","captureException","flush","process","exit"],"mappings":";;;;sBAAwC;2BACT;4BACH;iCACH;AAGzBA,IAAAA,yBAAc;AAEdC,IAAAA,uBAAW,IAAGC,IAAI,CAAC,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE;IAC3CA,UACGC,OAAO,CAAaC,yBAAQ,CAACC,UAAU,EACvCC,IAAI,CAACL,YACLM,KAAK,CAAC,OAAOC;QACZC,QAAQC,KAAK,CAAC,2DAA2DF;QAEzEG,IAAAA,sBAAgB,EAACH;QACjB,MAAMI,IAAAA,WAAK,EAAC;QACZC,QAAQC,IAAI,CAAC;IACf;AACJ"}

package/dist/middleware/authenticate.js

@@ -12,20 +12,17 @@ _export(exports, {
     authenticate: function() {
         return authenticate;
     },
-    authorizePermission: function() {
-        return authorizePermission;
-    },
     authorizeRoles: function() {
         return authorizeRoles;
     },
-    withPermission: function() {
-        return withPermission;
+    permission: function() {
+        return permission;
     }
 });
 const _awilixexpress = require("awilix-express");
 const _runtimeexceptions = require("../exceptions/runtime.exceptions");
 const _authorizationconstants = require("../constants/authorization.constants");
-const authenticate = ()=>(0, _awilixexpress.inject)(({ settingsStore, authService, loggerFactory })=>async (req, res, next)=>{
+const authenticate = ()=>(0, _awilixexpress.inject)((authService, loggerFactory, settingsStore)=>async (req, res, next)=>{
             const logger = loggerFactory("Middleware:authenticate");
             const isLoginRequired = await settingsStore.getLoginRequired();
             if (!isLoginRequired) {
@@ -35,8 +32,7 @@ const authenticate = ()=>(0, _awilixexpress.inject)(({ settingsStore, authServic
                 throw new _runtimeexceptions.AuthenticationError("Password change required", _authorizationconstants.AUTH_ERROR_REASON.PasswordChangeRequired);
             }
             const bearer = req.headers.authorization?.replace("Bearer ", "") || undefined;
-            const isJwtBlacklisted = authService.isJwtTokenBlacklisted(bearer);
-            if (!!bearer?.length && isJwtBlacklisted) {
+            if (!!bearer?.length && authService.isJwtTokenBlacklisted(bearer)) {
                 throw new _runtimeexceptions.AuthenticationError("Not authenticated", _authorizationconstants.AUTH_ERROR_REASON.LoginRequired);
             }
             if (req.isAuthenticated()) {
@@ -45,41 +41,34 @@ const authenticate = ()=>(0, _awilixexpress.inject)(({ settingsStore, authServic
             logger.log(`Not authenticated for route: ${req.originalUrl}`);
             throw new _runtimeexceptions.AuthenticationError("Not authenticated", _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredAuthToken);
         });
-function authorizePermission(permission) {
-    return (0, _awilixexpress.inject)(({ permissionService, roleService })=>async (req, res, next)=>{
+function permission(requiredPermission) {
+    return (0, _awilixexpress.inject)((permissionService, roleService)=>async (req, res, next)=>{
             const userRoles = req.roles;
             if (!userRoles?.length) {
                 throw new _runtimeexceptions.AuthorizationError({
                     permissions: [
-                        permission
+                        requiredPermission
                     ]
                 });
             }
             const assignedPermissions = roleService.getRolesPermissions(userRoles);
-            if (!permissionService.authorizePermission(permission, assignedPermissions)) {
+            if (!permissionService.authorizePermission(requiredPermission, assignedPermissions)) {
                 throw new _runtimeexceptions.AuthorizationError({
                     permissions: [
-                        permission
+                        requiredPermission
                     ]
                 });
             }
             next();
         });
 }
-const authorizeRoles = (roles, subset = true)=>(0, _awilixexpress.inject)(({ roleService })=>async (req, res, next)=>{
-            if (!roleService.authorizeRoles(roles, req.roles, subset)) {
+const authorizeRoles = (roles, subset = true)=>(0, _awilixexpress.inject)((roleService)=>async (req, res, next)=>{
+            if (!req.roles?.length || !roleService.authorizeRoles(roles, req.roles, subset)) {
                 throw new _runtimeexceptions.AuthorizationError({
                     roles
                 });
             }
             next();
         });
-function withPermission(permission) {
-    return {
-        before: [
-            authorizePermission(permission)
-        ]
-    };
-}
 
 //# sourceMappingURL=authenticate.js.map

package/dist/middleware/authenticate.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/middleware/authenticate.ts"],"names":["authenticate","authorizePermission","authorizeRoles","withPermission","inject","settingsStore","authService","loggerFactory","req","res","next","logger","isLoginRequired","getLoginRequired","user","needsPasswordChange","AuthenticationError","AUTH_ERROR_REASON","PasswordChangeRequired","bearer","headers","authorization","replace","undefined","isJwtBlacklisted","isJwtTokenBlacklisted","length","LoginRequired","isAuthenticated","log","originalUrl","InvalidOrExpiredAuthToken","permission","permissionService","roleService","userRoles","roles","AuthorizationError","permissions","assignedPermissions","getRolesPermissions","subset","before"],"mappings":";;;;;;;;;;;IAWaA,YAAY;eAAZA;;IAuCGC,mBAAmB;eAAnBA;;IAmBHC,cAAc;eAAdA;;IASGC,cAAc;eAAdA;;;+BA9EO;mCACiC;wCAEtB;AAQ3B,MAAMH,eAAe,IAC1BI,IAAAA,qBAAM,EACJ,CAAC,EACGC,aAAa,EACbC,WAAW,EACXC,aAAa,EAKd,GACD,OAAOC,KAAcC,KAAeC;YAClC,MAAMC,SAASJ,cAAc;YAC7B,MAAMK,kBAAkB,MAAMP,cAAcQ,gBAAgB;YAC5D,IAAI,CAACD,iBAAiB;gBACpB,OAAOF;YACT;YAGA,IAAIF,IAAIM,IAAI,EAAEC,qBAAqB;gBACjC,MAAM,IAAIC,sCAAmB,CAAC,4BAA4BC,yCAAiB,CAACC,sBAAsB;YACpG;YAGA,MAAMC,SAASX,IAAIY,OAAO,CAACC,aAAa,EAAEC,QAAQ,WAAW,OAAOC;YACpE,MAAMC,mBAAmBlB,YAAYmB,qBAAqB,CAACN;YAC3D,IAAI,CAAC,CAACA,QAAQO,UAAUF,kBAAkB;gBACxC,MAAM,IAAIR,sCAAmB,CAAC,qBAAqBC,yCAAiB,CAACU,aAAa;YACpF;YAEA,IAAInB,IAAIoB,eAAe,IAAI;gBACzB,OAAOlB;YACT;YAEAC,OAAOkB,GAAG,CAAC,CAAC,6BAA6B,EAAErB,IAAIsB,WAAW,EAAE;YAC5D,MAAM,IAAId,sCAAmB,CAAC,qBAAqBC,yCAAiB,CAACc,yBAAyB;QAChG;AAGC,SAAS9B,oBAAoB+B,UAAkB;IACpD,OAAO5B,IAAAA,qBAAM,EACX,CAAC,EAAE6B,iBAAiB,EAAEC,WAAW,EAAwE,GACvG,OAAO1B,KAAcC,KAAeC;YAClC,MAAMyB,YAAY3B,IAAI4B,KAAK;YAC3B,IAAI,CAACD,WAAWT,QAAQ;gBACtB,MAAM,IAAIW,qCAAkB,CAAC;oBAAEC,aAAa;wBAACN;qBAAW;gBAAC;YAC3D;YAEA,MAAMO,sBAAsBL,YAAYM,mBAAmB,CAACL;YAC5D,IAAI,CAACF,kBAAkBhC,mBAAmB,CAAC+B,YAAYO,sBAAsB;gBAC3E,MAAM,IAAIF,qCAAkB,CAAC;oBAAEC,aAAa;wBAACN;qBAAW;gBAAC;YAC3D;YAEAtB;QACF;AAEN;AAEO,MAAMR,iBAAiB,CAACkC,OAAiBK,SAAS,IAAI,GAC3DrC,IAAAA,qBAAM,EAAC,CAAC,EAAE8B,WAAW,EAAiC,GAAK,OAAO1B,KAAcC,KAAeC;YAC7F,IAAI,CAACwB,YAAYhC,cAAc,CAACkC,OAAO5B,IAAI4B,KAAK,EAAEK,SAAS;gBACzD,MAAM,IAAIJ,qCAAkB,CAAC;oBAAED;gBAAM;YACvC;YAEA1B;QACF;AAEK,SAASP,eAAe6B,UAAkB;IAC/C,OAAO;QACLU,QAAQ;YAACzC,oBAAoB+B;SAAY;IAC3C;AACF"}
+{"version":3,"sources":["../../src/middleware/authenticate.ts"],"names":["authenticate","authorizeRoles","permission","inject","authService","loggerFactory","settingsStore","req","res","next","logger","isLoginRequired","getLoginRequired","user","needsPasswordChange","AuthenticationError","AUTH_ERROR_REASON","PasswordChangeRequired","bearer","headers","authorization","replace","undefined","length","isJwtTokenBlacklisted","LoginRequired","isAuthenticated","log","originalUrl","InvalidOrExpiredAuthToken","requiredPermission","permissionService","roleService","userRoles","roles","AuthorizationError","permissions","assignedPermissions","getRolesPermissions","authorizePermission","subset"],"mappings":";;;;;;;;;;;IAWaA,YAAY;eAAZA;;IAkDAC,cAAc;eAAdA;;IAnBGC,UAAU;eAAVA;;;+BA1CO;mCACiC;wCAEtB;AAQ3B,MAAMF,eAAe,IAC1BG,IAAAA,qBAAM,EACJ,CAACC,aAA0BC,eAA+BC,gBACxD,OAAOC,KAAcC,KAAeC;YAClC,MAAMC,SAASL,cAAc;YAE7B,MAAMM,kBAAkB,MAAML,cAAcM,gBAAgB;YAC5D,IAAI,CAACD,iBAAiB;gBACpB,OAAOF;YACT;YAGA,IAAIF,IAAIM,IAAI,EAAEC,qBAAqB;gBACjC,MAAM,IAAIC,sCAAmB,CAAC,4BAA4BC,yCAAiB,CAACC,sBAAsB;YACpG;YAGA,MAAMC,SAASX,IAAIY,OAAO,CAACC,aAAa,EAAEC,QAAQ,WAAW,OAAOC;YACpE,IAAI,CAAC,CAACJ,QAAQK,UAAUnB,YAAYoB,qBAAqB,CAACN,SAAS;gBACjE,MAAM,IAAIH,sCAAmB,CAAC,qBAAqBC,yCAAiB,CAACS,aAAa;YACpF;YAEA,IAAIlB,IAAImB,eAAe,IAAI;gBACzB,OAAOjB;YACT;YAEAC,OAAOiB,GAAG,CAAC,CAAC,6BAA6B,EAAEpB,IAAIqB,WAAW,EAAE;YAC5D,MAAM,IAAIb,sCAAmB,CAAC,qBAAqBC,yCAAiB,CAACa,yBAAyB;QAChG;AAGC,SAAS3B,WAAW4B,kBAA0B;IACnD,OAAO3B,IAAAA,qBAAM,EACX,CAAC4B,mBAAuCC,cACtC,OAAOzB,KAAcC,KAAeC;YAClC,MAAMwB,YAAY1B,IAAI2B,KAAK;YAC3B,IAAI,CAACD,WAAWV,QAAQ;gBACtB,MAAM,IAAIY,qCAAkB,CAAC;oBAAEC,aAAa;wBAACN;qBAAmB;gBAAC;YACnE;YAEA,MAAMO,sBAAsBL,YAAYM,mBAAmB,CAACL;YAC5D,IAAI,CAACF,kBAAkBQ,mBAAmB,CAACT,oBAAoBO,sBAAsB;gBACnF,MAAM,IAAIF,qCAAkB,CAAC;oBAAEC,aAAa;wBAACN;qBAAmB;gBAAC;YACnE;YAEArB;QACF;AAEN;AAEO,MAAMR,iBAAiB,CAACiC,OAAiBM,SAAS,IAAI,GAC3DrC,IAAAA,qBAAM,EAAC,CAAC6B,cAA8B,OAAOzB,KAAcC,KAAeC;YACxE,IAAI,CAACF,IAAI2B,KAAK,EAAEX,UAAU,CAACS,YAAY/B,cAAc,CAACiC,OAAO3B,IAAI2B,KAAK,EAAEM,SAAS;gBAC/E,MAAM,IAAIL,qCAAkB,CAAC;oBAAED;gBAAM;YACvC;YAEAzB;QACF"}

package/dist/middleware/database.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/middleware/database.ts"],"names":["interceptDatabaseError","req","res","next","serverHost","container","resolve","DITokens","databaseReadyState","hasConnected","status","send","state"],"mappings":";;;;+BAMsBA;;;eAAAA;;;iCANG;AAMlB,eAAeA,uBAAuBC,GAAY,EAAEC,GAAa,EAAEC,IAAkB;IAC1F,MAAMC,aAAaH,IAAII,SAAS,CAACC,OAAO,CAACC,yBAAQ,CAACH,UAAU;IAE5D,MAAMI,qBAAqBJ,WAAWK,YAAY;IAClD,IAAID,uBAAuB,GAAG;QAC5BL;IACF,OAAO;QACLD,IAAIQ,MAAM,CAAC;QACXR,IAAIS,IAAI,CAAC;YACPH,oBAAoBJ,WAAWK,YAAY;YAC3CG,OAAO;QACT;IACF;AACF"}
+{"version":3,"sources":["../../src/middleware/database.ts"],"names":["interceptDatabaseError","req","res","next","serverHost","container","resolve","DITokens","databaseReadyState","hasConnected","status","send","state"],"mappings":";;;;+BAMsBA;;;eAAAA;;;iCANG;AAMlB,eAAeA,uBAAuBC,GAAkB,EAAEC,GAAa,EAAEC,IAAkB;IAChG,MAAMC,aAAaH,IAAII,SAAS,CAACC,OAAO,CAACC,yBAAQ,CAACH,UAAU;IAE5D,MAAMI,qBAAqBJ,WAAWK,YAAY;IAClD,IAAID,uBAAuB,GAAG;QAC5BL;IACF,OAAO;QACLD,IAAIQ,MAAM,CAAC;QACXR,IAAIS,IAAI,CAAC;YACPH,oBAAoBJ,WAAWK,YAAY;YAC3CG,OAAO;QACT;IACF;AACF"}

package/dist/middleware/demo.middleware.js

@@ -2,23 +2,15 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    demoUserNotAllowed: function() {
+Object.defineProperty(exports, "demoUserNotAllowed", {
+    enumerable: true,
+    get: function() {
         return demoUserNotAllowed;
-    },
-    demoUserNotAllowedInterceptor: function() {
-        return demoUserNotAllowedInterceptor;
     }
 });
 const _runtimeexceptions = require("../exceptions/runtime.exceptions");
 const _awilixexpress = require("awilix-express");
-const demoUserNotAllowed = (0, _awilixexpress.inject)(({ userService, configService, loggerFactory })=>{
+const demoUserNotAllowed = (0, _awilixexpress.inject)((userService, configService, loggerFactory)=>{
     const logger = loggerFactory(demoUserNotAllowed.name);
     return async (req, res, next)=>{
         const isDemoMode = configService.isDemoMode();
@@ -34,10 +26,5 @@ const demoUserNotAllowed = (0, _awilixexpress.inject)(({ userService, configServ
         next();
     };
 });
-const demoUserNotAllowedInterceptor = {
-    before: [
-        demoUserNotAllowed
-    ]
-};
 
 //# sourceMappingURL=demo.middleware.js.map

package/dist/middleware/demo.middleware.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/middleware/demo.middleware.ts"],"names":["demoUserNotAllowed","demoUserNotAllowedInterceptor","inject","userService","configService","loggerFactory","logger","name","req","res","next","isDemoMode","demoUserId","getDemoUserId","user","id","warn","path","ForbiddenError","before"],"mappings":";;;;;;;;;;;IAOaA,kBAAkB;eAAlBA;;IA2BAC,6BAA6B;eAA7BA;;;mCAlCkB;+BAER;AAKhB,MAAMD,qBAAqBE,IAAAA,qBAAM,EACtC,CAAC,EACCC,WAAW,EACXC,aAAa,EACbC,aAAa,EAKd;IACC,MAAMC,SAASD,cAAcL,mBAAmBO,IAAI;IACpD,OAAO,OAAOC,KAAcC,KAAeC;QACzC,MAAMC,aAAaP,cAAcO,UAAU;QAC3C,IAAI,CAACA,YAAY;YACfD;YACA;QACF;QACA,MAAME,aAAa,MAAMT,YAAYU,aAAa;QAClD,IAAIL,IAAIM,IAAI,EAAEC,OAAOH,YAAY;YAC/BN,OAAOU,IAAI,CAAC,qDAAqDR,IAAIS,IAAI;YACzE,MAAM,IAAIC,iCAAc,CAAC;QAC3B;QACAR;IACF;AACF;AAGK,MAAMT,gCAAgC;IAC3CkB,QAAQ;QAACnB;KAAmB;AAC9B"}
+{"version":3,"sources":["../../src/middleware/demo.middleware.ts"],"names":["demoUserNotAllowed","inject","userService","configService","loggerFactory","logger","name","req","res","next","isDemoMode","demoUserId","getDemoUserId","user","id","warn","path","ForbiddenError"],"mappings":";;;;+BAOaA;;;eAAAA;;;mCAPkB;+BAER;AAKhB,MAAMA,qBAAqBC,IAAAA,qBAAM,EACtC,CAACC,aAA2BC,eAA+BC;IACzD,MAAMC,SAASD,cAAcJ,mBAAmBM,IAAI;IACpD,OAAO,OAAOC,KAAcC,KAAeC;QACzC,MAAMC,aAAaP,cAAcO,UAAU;QAC3C,IAAI,CAACA,YAAY;YACfD;YACA;QACF;QACA,MAAME,aAAa,MAAMT,YAAYU,aAAa;QAClD,IAAIL,IAAIM,IAAI,EAAEC,OAAOH,YAAY;YAC/BN,OAAOU,IAAI,CAAC,qDAAqDR,IAAIS,IAAI;YACzE,MAAM,IAAIC,iCAAc,CAAC;QAC3B;QACAR;IACF;AACF"}