@fdm-monster/server 1.8.2 → 1.9.0-rc1

package/dist/server.constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultPrinterThumbnailsStorage","defaultFileUploadsStorage","defaultAcceptedGcodeExtensions","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","serverRepoName","clientPackageName","clientRepoName","clientNextPackageName","clientNextRepoName","githubUrl","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,WAAW;IACXC,eAAe;IACfC,eAAe;IAEfC,gBAAgB;IAChBC,YAAY;IAGZC,0BAA0B;IAC1BC,mBAAmB;IACnBC,sBAAsB;IAEtBC,4BAA4B;IAC5BC,gCAAgC;IAChCC,iCAAiC;IACjCC,2BAA2B;IAC3BC,gCAAgC;QAAC;QAAU;KAAU;IACrDC,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,yBAAyB;IAEzBC,+BAA+B;IAE/BC,yBAAyB;IAEzBC,yBAAyB;IAEzBC,qBAAqB;IAErBC,yBAAyB;IACzBC,wBAAwB,KAAK;IAE7BC,gCAAgC,CAAC;IAEjCC,8BAA8B,KAAK,KAAK,KAAK;IAE7CC,qBAAqB;IACrBC,oBAAoB;IAEpBC,uBAAuB;IACvBC,sBAAsB;IAEtBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,oBAAoB;IACpBC,mBAAmB;IAEnBC,uBAAuB;IACvBC,gBAAgB;IAChBC,sBAAsB;IACtBC,eAAe;QAAC;QAAe;QAAc;KAAO;IACpDC,YAAY;IACZC,mBAAmB;IACnBC,gBAAgB;IAChBC,mBAAmB;IACnBC,gBAAgB;IAChBC,uBAAuB;IACvBC,oBAAoB;IACpBC,WAAW;IACXC,SAAS;IAETC,sBAAsB;IACtBC,sBAAsB;IAEtBC,WAAW;IACXC,aAAa;IACbC,WAAW;IACXC,cAAc;IAGdC,kCAAkC;IAClCC,2BAA2B;IAC3BC,sBAAsB;IACtBC,0BAA0B;IAC1BC,gCAAgC;IAChCC,oCAAoC;IAGpCC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAGnBC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBAAwB;IAExBC,gBAAgB;IAEhBC,6BAA6B;IAC7BC,kCAAkC;AACpC"}
+{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultPrinterThumbnailsStorage","defaultFileUploadsStorage","defaultAcceptedGcodeExtensions","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","serverRepoName","clientPackageName","clientRepoName","clientNextPackageName","clientNextRepoName","githubUrl","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault","ENABLE_PROMETHEUS_METRICS","ENABLE_LOKI_LOGGING","LOKI_ADDRESS","LOKI_TIMEOUT_SECONDS","LOKI_INTERVAL"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,WAAW;IACXC,eAAe;IACfC,eAAe;IAEfC,gBAAgB;IAChBC,YAAY;IAGZC,0BAA0B;IAC1BC,mBAAmB;IACnBC,sBAAsB;IAEtBC,4BAA4B;IAC5BC,gCAAgC;IAChCC,iCAAiC;IACjCC,2BAA2B;IAC3BC,gCAAgC;QAAC;QAAU;KAAU;IACrDC,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,yBAAyB;IAEzBC,+BAA+B;IAE/BC,yBAAyB;IAEzBC,yBAAyB;IAEzBC,qBAAqB;IAErBC,yBAAyB;IACzBC,wBAAwB,KAAK;IAE7BC,gCAAgC,CAAC;IAEjCC,8BAA8B,KAAK,KAAK,KAAK;IAE7CC,qBAAqB;IACrBC,oBAAoB;IAEpBC,uBAAuB;IACvBC,sBAAsB;IAEtBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,oBAAoB;IACpBC,mBAAmB;IAEnBC,uBAAuB;IACvBC,gBAAgB;IAChBC,sBAAsB;IACtBC,eAAe;QAAC;QAAe;QAAc;KAAO;IACpDC,YAAY;IACZC,mBAAmB;IACnBC,gBAAgB;IAChBC,mBAAmB;IACnBC,gBAAgB;IAChBC,uBAAuB;IACvBC,oBAAoB;IACpBC,WAAW;IACXC,SAAS;IAETC,sBAAsB;IACtBC,sBAAsB;IAEtBC,WAAW;IACXC,aAAa;IACbC,WAAW;IACXC,cAAc;IAGdC,kCAAkC;IAClCC,2BAA2B;IAC3BC,sBAAsB;IACtBC,0BAA0B;IAG1BC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAGnBC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBACE;IAEFC,gBAAgB;IAEhBC,6BAA6B;IAC7BC,kCAAkC;IAClCC,2BAA2B;IAC3BC,qBAAqB;IACrBC,cAAc;IACdC,sBAAsB;IACtBC,eAAe;AACjB"}

package/dist/server.core.js

@@ -22,6 +22,8 @@ const _serverconstants = require("./server.constants");
 const _path = require("path");
 const _fsutils = require("./utils/fs.utils");
 const _envutils = require("./utils/env.utils");
+const _promclient = require("prom-client");
+const _logger = require("./handlers/logger");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -68,16 +70,41 @@ function _interop_require_wildcard(obj, nodeInterop) {
     }
     return newObj;
 }
+const httpRequestsTotal = new _promclient.Counter({
+    name: "http_requests_total",
+    help: "HTTP requests executed"
+});
 async function setupServer() {
     const httpServer = (0, _express.default)();
     const experimentalTypeormEnabled = (0, _envutils.getEnvOrDefault)(_serverconstants.AppConstants.ENABLE_EXPERIMENTAL_TYPEORM, _serverconstants.AppConstants.enableExperimentalTypeormDefault) === "true";
     if (experimentalTypeormEnabled) {
-        const dbFolder = process.env[_serverconstants.AppConstants.DATABASE_PATH] || "./database";
+        const dbFolder = process.env[_serverconstants.AppConstants.DATABASE_PATH] ?? "./database";
         (0, _fsutils.ensureDirExists)((0, _path.join)((0, _fsutils.superRootPath)(), dbFolder));
     }
     const container = (0, _container.configureContainer)(experimentalTypeormEnabled);
     (0, _passport1.initializePassportStrategies)(_passport.default, container);
-    httpServer.use((0, _cors.default)({
+    httpServer.use((req, res, next)=>{
+        const route = req.route?.path ?? req.path ?? "unknown";
+        if (route.includes("/api")) {
+            const start = process.hrtime();
+            res.on("finish", ()=>{
+                httpRequestsTotal.inc();
+                const delta = process.hrtime(start);
+                const duration = delta[0] + delta[1] / 1e9;
+                const logger = new _logger.LoggerService("HttpRequest");
+                logger.newDebug({
+                    message: `HTTP request ${req.method} ${req.originalUrl} ${res.statusCode}`,
+                    method: req.method,
+                    path: req.originalUrl,
+                    statusCode: res.statusCode,
+                    responseTimeMs: duration.toFixed(2),
+                    clientIp: req.ip,
+                    userAgent: req.get("User-Agent")
+                });
+            });
+        }
+        next();
+    }).use((0, _cors.default)({
         origin: "*",
         methods: "GET,HEAD,PUT,PATCH,POST,DELETE"
     })).use((0, _helmet.default)({

package/dist/server.core.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.core.ts"],"names":["setupServer","httpServer","express","experimentalTypeormEnabled","getEnvOrDefault","AppConstants","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault","dbFolder","process","env","DATABASE_PATH","ensureDirExists","join","superRootPath","container","configureContainer","initializePassportStrategies","passport","use","cors","origin","methods","helmet","contentSecurityPolicy","json","limit","cookieParser","urlencoded","extended","initialize","authenticate","session","scopePerRequest","interceptDatabaseError","validateWizardCompleted","interceptRoles"],"mappings":";;;;+BAesBA;;;eAAAA;;;iEAfoB;qEACjB;iEACJ;6DACJ;+DACE;+BACa;2BACG;0BACI;kCACiB;2BACX;iCAChB;sBACR;yBAC0B;0BACf;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEzB,eAAeA;IACpB,MAAMC,aAAaC,IAAAA,gBAAO;IAC1B,MAAMC,6BACJC,IAAAA,yBAAe,EAACC,6BAAY,CAACC,2BAA2B,EAAED,6BAAY,CAACE,gCAAgC,MAAM;IAC/G,IAAIJ,4BAA4B;QAC9B,MAAMK,WAAWC,QAAQC,GAAG,CAACL,6BAAY,CAACM,aAAa,CAAC,IAAI;QAC5DC,IAAAA,wBAAe,EAACC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIN;IACxC;IAEA,MAAMO,YAAYC,IAAAA,6BAAkB,EAACb;IACrCc,IAAAA,uCAA4B,EAACC,iBAAQ,EAAEH;IAEvCd,WACGkB,GAAG,CACFC,IAAAA,aAAI,EAAC;QACHC,QAAQ;QACRC,SAAS;IACX,IAEDH,GAAG,CACFI,IAAAA,eAAM,EAAC;QACLC,uBAAuB;IACzB,IAEDL,GAAG,CAACM,IAAAA,aAAI,EAAC;QAAEC,OAAO;IAAO,IACzBP,GAAG,CAACQ,IAAAA,qBAAY,KAChBR,GAAG,CAACS,IAAAA,mBAAU,EAAC;QAAEC,UAAU;IAAM,IACjCV,GAAG,CAACD,iBAAQ,CAACY,UAAU,IACvBX,GAAG,CAACD,iBAAQ,CAACa,YAAY,CAAC;QAAC;QAAO;KAAY,EAAE;QAAEC,SAAS;IAAM,IACjEb,GAAG,CAACc,IAAAA,8BAAe,EAAClB,YACpBI,GAAG,CAACe,gCAAsB,EAE1Bf,GAAG,CAACgB,yCAAuB,EAC3BhB,GAAG,CAACiB,gCAAc;IAErB,OAAO;QACLnC;QACAc;IACF;AACF"}
+{"version":3,"sources":["../src/server.core.ts"],"names":["setupServer","httpRequestsTotal","Counter","name","help","httpServer","express","experimentalTypeormEnabled","getEnvOrDefault","AppConstants","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault","dbFolder","process","env","DATABASE_PATH","ensureDirExists","join","superRootPath","container","configureContainer","initializePassportStrategies","passport","use","req","res","next","route","path","includes","start","hrtime","on","inc","delta","duration","logger","LoggerService","newDebug","message","method","originalUrl","statusCode","responseTimeMs","toFixed","clientIp","ip","userAgent","get","cors","origin","methods","helmet","contentSecurityPolicy","json","limit","cookieParser","urlencoded","extended","initialize","authenticate","session","scopePerRequest","interceptDatabaseError","validateWizardCompleted","interceptRoles"],"mappings":";;;;+BAsBsBA;;;eAAAA;;;iEAtBoB;qEACjB;iEACJ;6DACJ;+DACE;+BACa;2BACG;0BACI;kCACiB;2BACX;iCAChB;sBACR;yBAC0B;0BACf;4BACR;wBACM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE9B,MAAMC,oBAAoB,IAAIC,mBAAO,CAAC;IACpCC,MAAM;IACNC,MAAM;AACR;AAEO,eAAeJ;IACpB,MAAMK,aAAaC,IAAAA,gBAAO;IAC1B,MAAMC,6BACJC,IAAAA,yBAAe,EAACC,6BAAY,CAACC,2BAA2B,EAAED,6BAAY,CAACE,gCAAgC,MAAM;IAC/G,IAAIJ,4BAA4B;QAC9B,MAAMK,WAAWC,QAAQC,GAAG,CAACL,6BAAY,CAACM,aAAa,CAAC,IAAI;QAC5DC,IAAAA,wBAAe,EAACC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIN;IACxC;IAEA,MAAMO,YAAYC,IAAAA,6BAAkB,EAACb;IACrCc,IAAAA,uCAA4B,EAACC,iBAAQ,EAAEH;IAEvCd,WACGkB,GAAG,CAAC,CAACC,KAAKC,KAAKC;QACd,MAAMC,QAAQ,AAACH,IAAIG,KAAK,EAAEC,QAAQJ,IAAII,IAAI,IAAK;QAE/C,IAAID,MAAME,QAAQ,CAAC,SAAS;YAC1B,MAAMC,QAAQjB,QAAQkB,MAAM;YAE5BN,IAAIO,EAAE,CAAC,UAAU;gBACf/B,kBAAkBgC,GAAG;gBAErB,MAAMC,QAAQrB,QAAQkB,MAAM,CAACD;gBAC7B,MAAMK,WAAWD,KAAK,CAAC,EAAE,GAAGA,KAAK,CAAC,EAAE,GAAG;gBACvC,MAAME,SAAS,IAAIC,qBAAa,CAAC;gBACjCD,OAAOE,QAAQ,CAAC;oBACdC,SAAS,CAAC,aAAa,EAAEf,IAAIgB,MAAM,CAAC,CAAC,EAAEhB,IAAIiB,WAAW,CAAC,CAAC,EAAEhB,IAAIiB,UAAU,EAAE;oBAC1EF,QAAQhB,IAAIgB,MAAM;oBAClBZ,MAAMJ,IAAIiB,WAAW;oBACrBC,YAAYjB,IAAIiB,UAAU;oBAC1BC,gBAAgBR,SAASS,OAAO,CAAC;oBACjCC,UAAUrB,IAAIsB,EAAE;oBAChBC,WAAWvB,IAAIwB,GAAG,CAAC;gBACrB;YACF;QACF;QAEAtB;IACF,GACCH,GAAG,CACF0B,IAAAA,aAAI,EAAC;QACHC,QAAQ;QACRC,SAAS;IACX,IAED5B,GAAG,CACF6B,IAAAA,eAAM,EAAC;QACLC,uBAAuB;IACzB,IAED9B,GAAG,CAAC+B,IAAAA,aAAI,EAAC;QAAEC,OAAO;IAAO,IACzBhC,GAAG,CAACiC,IAAAA,qBAAY,KAChBjC,GAAG,CAACkC,IAAAA,mBAAU,EAAC;QAAEC,UAAU;IAAM,IACjCnC,GAAG,CAACD,iBAAQ,CAACqC,UAAU,IACvBpC,GAAG,CAACD,iBAAQ,CAACsC,YAAY,CAAC;QAAC;QAAO;KAAY,EAAE;QAAEC,SAAS;IAAM,IACjEtC,GAAG,CAACuC,IAAAA,8BAAe,EAAC3C,YACpBI,GAAG,CAACwC,gCAAsB,EAE1BxC,GAAG,CAACyC,yCAAuB,EAC3BzC,GAAG,CAAC0C,gCAAc;IAErB,OAAO;QACL5D;QACAc;IACF;AACF"}

package/dist/server.env.js

@@ -9,8 +9,8 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    ensureMongoDBConnectionStringSet: function() {
-        return ensureMongoDBConnectionStringSet;
+    ensureMongoDbConnectionStringSet: function() {
+        return ensureMongoDbConnectionStringSet;
     },
     ensurePortSet: function() {
         return ensurePortSet;
@@ -43,6 +43,7 @@ const _logger = require("./handlers/logger");
 const _envutils = require("./utils/env.utils");
 const _errorutils = require("./utils/error.utils");
 const _fsutils = require("./utils/fs.utils");
+const _promclient = require("prom-client");
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
     var cacheBabelInterop = new WeakMap();
@@ -106,9 +107,7 @@ function ensureNodeEnvSet() {
 }
 function ensurePackageVersionSet() {
     const packageJsonVersion = require(packageJsonPath).version;
-    if (!process.env[_serverconstants.AppConstants.VERSION_KEY]) {
-        process.env[_serverconstants.AppConstants.VERSION_KEY] = packageJsonVersion;
-    }
+    process.env[_serverconstants.AppConstants.VERSION_KEY] ??= packageJsonVersion;
     logger.log(`✓ Running server version ${process.env[_serverconstants.AppConstants.VERSION_KEY]}`);
 }
 function printInstructionsURL() {
@@ -130,8 +129,8 @@ function fetchServerPort() {
     }
     return port;
 }
-function ensureMongoDBConnectionStringSet() {
-    let dbConnectionString = process.env[_serverconstants.AppConstants.MONGO_KEY];
+function ensureMongoDbConnectionStringSet() {
+    const dbConnectionString = process.env[_serverconstants.AppConstants.MONGO_KEY];
     if (!dbConnectionString) {
         fetchMongoDBConnectionString();
     } else {
@@ -171,8 +170,14 @@ function setupEnvConfig(skipDotEnv = false) {
     ensureNodeEnvSet();
     ensurePackageVersionSet();
     setupSentry();
-    ensureMongoDBConnectionStringSet();
+    ensureMongoDbConnectionStringSet();
     ensurePortSet();
+    if (process.env[_serverconstants.AppConstants.ENABLE_PROMETHEUS_METRICS] === "true") {
+        (0, _promclient.collectDefaultMetrics)({
+            register: _promclient.register
+        });
+        _promclient.register.removeSingleMetric("nodejs_version_info");
+    }
 }
 async function runMigrations(db, client) {
     const migrationsStatus = await (0, _migratemongo.status)(db);

package/dist/server.env.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.env.ts"],"names":["ensureMongoDBConnectionStringSet","ensurePortSet","fetchMongoDBConnectionString","fetchServerPort","isEnvProd","runMigrations","setupEnvConfig","setupSentry","logger","Logger","instructionsReferralURL","packageJsonPath","join","superRootPath","dotEnvPath","isEnvTest","process","env","AppConstants","NODE_ENV_KEY","defaultTestEnv","defaultProductionEnv","ensureNodeEnvSet","environment","knownEnvNames","includes","newEnvName","warn","log","ensurePackageVersionSet","packageJsonVersion","require","version","VERSION_KEY","printInstructionsURL","MONGO_KEY","debug","defaultMongoStringUnauthenticated","port","SERVER_PORT_KEY","Number","isNaN","parseInt","defaultServerPort","toString","dbConnectionString","sentryDsnToken","getEnvOrDefault","sentryCustomDsnToken","sentryCustomDsnDefault","Sentry","init","dsn","NODE_ENV","release","npm_package_version","enabled","tracesSampleRate","isProductionEnvironment","on","e","message","errorSummary","error","captureException","skipDotEnv","config","path","db","client","migrationsStatus","status","pendingMigrations","filter","m","appliedAt","length","migrationResult","up"],"mappings":"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"}
+{"version":3,"sources":["../src/server.env.ts"],"names":["ensureMongoDbConnectionStringSet","ensurePortSet","fetchMongoDBConnectionString","fetchServerPort","isEnvProd","runMigrations","setupEnvConfig","setupSentry","logger","Logger","instructionsReferralURL","packageJsonPath","join","superRootPath","dotEnvPath","isEnvTest","process","env","AppConstants","NODE_ENV_KEY","defaultTestEnv","defaultProductionEnv","ensureNodeEnvSet","environment","knownEnvNames","includes","newEnvName","warn","log","ensurePackageVersionSet","packageJsonVersion","require","version","VERSION_KEY","printInstructionsURL","MONGO_KEY","debug","defaultMongoStringUnauthenticated","port","SERVER_PORT_KEY","Number","isNaN","parseInt","defaultServerPort","toString","dbConnectionString","sentryDsnToken","getEnvOrDefault","sentryCustomDsnToken","sentryCustomDsnDefault","Sentry","init","dsn","NODE_ENV","release","npm_package_version","enabled","tracesSampleRate","isProductionEnvironment","on","e","message","errorSummary","error","captureException","skipDotEnv","config","path","ENABLE_PROMETHEUS_METRICS","collectDefaultMetrics","register","removeSingleMetric","db","client","migrationsStatus","status","pendingMigrations","filter","m","appliedAt","length","migrationResult","up"],"mappings":";;;;;;;;;;;IAmEgBA,gCAAgC;eAAhCA;;IA6BAC,aAAa;eAAbA;;IAhDAC,4BAA4B;eAA5BA;;IASAC,eAAe;eAAfA;;IAnCAC,SAAS;eAATA;;IAwGMC,aAAa;eAAbA;;IApBNC,cAAc;eAAdA;;IA9BAC,WAAW;eAAXA;;;8BA5EW;sBACN;8DACG;wBACD;iCACM;wBACW;0BACiB;4BAC5B;yBACC;4BACkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEhD,MAAMC,SAAS,IAAIC,qBAAM,CAAC,mBAAmB;AAG7C,MAAMC,0BAA0B;AAChC,MAAMC,kBAAkBC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAI;AAC9C,MAAMC,aAAaF,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAI;AAEzC,SAASE;IACP,OAAOC,QAAQC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC,KAAKD,6BAAY,CAACE,cAAc;AAC/E;AAEO,SAAShB;IACd,OAAOY,QAAQC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC,KAAKD,6BAAY,CAACG,oBAAoB;AACrF;AAEA,SAASC;IACP,MAAMC,cAAcP,QAAQC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC;IAC1D,IAAI,CAACI,eAAe,CAACL,6BAAY,CAACM,aAAa,CAACC,QAAQ,CAACF,cAAc;QACrE,MAAMG,aAAaR,6BAAY,CAACG,oBAAoB;QACpDL,QAAQC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC,GAAGO;QACzClB,OAAOmB,IAAI,CAAC,CAAC,SAAS,EAAEJ,YAAY,mDAAmD,EAAEG,YAAY;IACvG,OAAO;QACLlB,OAAOoB,GAAG,CAAC,CAAC,mCAAmC,EAAEL,YAAY,EAAE,CAAC;IAClE;AACF;AAEA,SAASM;IACP,MAAMC,qBAAqBC,QAAQpB,iBAAiBqB,OAAO;IAC3DhB,QAAQC,GAAG,CAACC,6BAAY,CAACe,WAAW,CAAC,KAAKH;IAE1CtB,OAAOoB,GAAG,CAAC,CAAC,yBAAyB,EAAEZ,QAAQC,GAAG,CAACC,6BAAY,CAACe,WAAW,CAAC,EAAE;AAChF;AAEA,SAASC;IACP1B,OAAOoB,GAAG,CAAC,CAAC,yBAAyB,EAAElB,wBAAwB,sBAAsB,CAAC;AACxF;AAEO,SAASR;IACd,IAAI,CAACc,QAAQC,GAAG,CAACC,6BAAY,CAACiB,SAAS,CAAC,EAAE;QACxC3B,OAAO4B,KAAK,CAAC,CAAC,EAAE,EAAElB,6BAAY,CAACiB,SAAS,CAAC,kDAAkD,CAAC;QAC5FD;QACAlB,QAAQC,GAAG,CAACC,6BAAY,CAACiB,SAAS,CAAC,GAAGjB,6BAAY,CAACmB,iCAAiC;IACtF;IACA,OAAOrB,QAAQC,GAAG,CAACC,6BAAY,CAACiB,SAAS,CAAC;AAC5C;AAEO,SAAShC;IACd,IAAImC,OAAOtB,QAAQC,GAAG,CAACC,6BAAY,CAACqB,eAAe,CAAC;IACpD,IAAIC,OAAOC,KAAK,CAACC,SAASJ,QAAS;QAEjCtB,QAAQC,GAAG,CAACC,6BAAY,CAACqB,eAAe,CAAC,GAAGrB,6BAAY,CAACyB,iBAAiB,CAACC,QAAQ;QACnFN,OAAOtB,QAAQC,GAAG,CAACC,6BAAY,CAACqB,eAAe,CAAC;IAClD;IACA,OAAOD;AACT;AAEO,SAAStC;IACd,MAAM6C,qBAAqB7B,QAAQC,GAAG,CAACC,6BAAY,CAACiB,SAAS,CAAC;IAC9D,IAAI,CAACU,oBAAoB;QACvB3C;IACF,OAAO;QACLM,OAAOoB,GAAG,CAAC,CAAC,EAAE,EAAEV,6BAAY,CAACiB,SAAS,CAAC,0BAA0B,CAAC;IACpE;AACF;AAEO,SAAS5B;IACd,MAAMuC,iBAAiBC,IAAAA,yBAAe,EAAC7B,6BAAY,CAAC8B,oBAAoB,EAAE9B,6BAAY,CAAC+B,sBAAsB;IAE7GC,MAAOC,IAAI,CAAC;QACVC,KAAKN;QACLvB,aAAaP,QAAQC,GAAG,CAACoC,QAAQ;QACjCC,SAAStC,QAAQC,GAAG,CAACsC,mBAAmB;QACxCC,SAAS,CAACzC;QACV0C,kBAAkBC,IAAAA,iCAAuB,MAAK,OAAO;IACvD;IAEA1C,QAAQ2C,EAAE,CAAC,sBAAsB,CAACC;QAChC,MAAMC,UAAU,CAAC,4BAA4B,EAAEC,IAAAA,wBAAY,EAACF,IAAI;QAChEpD,OAAOuD,KAAK,CAACF;QAGbX,MAAOc,gBAAgB,CAACJ;IAC1B;AACF;AAEO,SAAS3D;IACdE;IAEA,IAAI,CAACa,QAAQC,GAAG,CAACC,6BAAY,CAACqB,eAAe,CAAC,EAAE;QAC9C/B,OAAOoB,GAAG,CAAC,CAAC,EAAE,EAAEV,6BAAY,CAACqB,eAAe,CAAC,gCAAgC,CAAC;QAC9EL;QACAlB,QAAQC,GAAG,CAACC,6BAAY,CAACqB,eAAe,CAAC,GAAGrB,6BAAY,CAACyB,iBAAiB,CAACC,QAAQ;IACrF;AACF;AAEO,SAAStC,eAAe2D,aAAa,KAAK;IAC/C,IAAI,CAACA,YAAY;QAEfC,IAAAA,cAAM,EAAC;YAAEC,MAAMrD;QAAW;QAC1BN,OAAOoB,GAAG,CAAC;IACb;IAEAN;IACAO;IACAtB;IACAP;IACAC;IAGA,IAAIe,QAAQC,GAAG,CAACC,6BAAY,CAACkD,yBAAyB,CAAC,KAAK,QAAQ;QAClEC,IAAAA,iCAAqB,EAAC;YAAEC,UAAAA,oBAAQ;QAAC;QACjCA,oBAAQ,CAACC,kBAAkB,CAAC;IAC9B;AACF;AAEO,eAAelE,cAAcmE,EAAO,EAAEC,MAAW;IACtD,MAAMC,mBAAmB,MAAMC,IAAAA,oBAAM,EAACH;IACtC,MAAMI,oBAAoBF,iBAAiBG,MAAM,CAAC,CAACC,IAAMA,EAAEC,SAAS,KAAK;IAEzE,IAAIH,kBAAkBI,MAAM,EAAE;QAC5BxE,OAAOoB,GAAG,CACR,CAAC,cAAc,EAAEgD,kBAAkBI,MAAM,CAAC,yBAAyB,EAAEN,iBAAiBM,MAAM,CAAC,qBAAqB,CAAC;IAEvH,OAAO;QACLxE,OAAOoB,GAAG,CAAC,CAAC,gCAAgC,EAAE8C,iBAAiBM,MAAM,CAAC,mBAAmB,CAAC;IAC5F;IAEA,MAAMC,kBAAkB,MAAMC,IAAAA,gBAAE,EAACV,IAAIC;IACrC,IAAIQ,iBAAiBD,SAAS,GAAG;QAC/BxE,OAAOoB,GAAG,CAAC,CAAC,QAAQ,EAAEqD,gBAAgBD,MAAM,CAAC,wBAAwB,CAAC,EAAEC;IAC1E,OAAO;QACLzE,OAAOoB,GAAG,CAAC;IACb;AACF"}

package/dist/server.host.js

@@ -11,7 +11,6 @@ Object.defineProperty(exports, "ServerHost", {
 const _express = /*#__PURE__*/ _interop_require_default(require("express"));
 const _mongoose = /*#__PURE__*/ _interop_require_default(require("mongoose"));
 const _connecthistoryapifallback = /*#__PURE__*/ _interop_require_default(require("connect-history-api-fallback"));
-const _awilixexpress = require("awilix-express");
 const _path = require("path");
 const _exceptionfilter = require("./middleware/exception.filter");
 const _serverenv = require("./server.env");
@@ -19,41 +18,38 @@ const _runtimeexceptions = require("./exceptions/runtime.exceptions");
 const _serverconstants = require("./server.constants");
 const _fsutils = require("./utils/fs.utils");
 const _envutils = require("./utils/env.utils");
+const _loadcontrollers = require("./shared/load-controllers");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
 class ServerHost {
+    configService;
+    isTypeormMode;
+    settingsStore;
     bootTask;
-    taskManagerService;
     socketIoGateway;
-    appInstance = null;
-    configService;
     typeormService;
-    settingsStore;
-    isTypeormMode;
     logger;
-    constructor({ loggerFactory, bootTask, taskManagerService, socketIoGateway, configService, typeormService, isTypeormMode, settingsStore }){
-        this.logger = loggerFactory(ServerHost.name);
+    constructor(loggerFactory, configService, isTypeormMode, settingsStore, bootTask, socketIoGateway, typeormService){
+        this.configService = configService;
+        this.isTypeormMode = isTypeormMode;
+        this.settingsStore = settingsStore;
         this.bootTask = bootTask;
-        this.taskManagerService = taskManagerService;
         this.socketIoGateway = socketIoGateway;
-        this.configService = configService;
         this.typeormService = typeormService;
-        this.settingsStore = settingsStore;
-        this.isTypeormMode = isTypeormMode;
+        this.logger = loggerFactory(ServerHost.name);
     }
     async boot(app, quick_boot = false, listenRequests = true) {
         if (!this.isTypeormMode) {
             _mongoose.default.set("strictQuery", true);
         }
-        this.appInstance = app;
-        this.serveControllerRoutes(this.appInstance);
+        this.serveControllerRoutes(app);
         if (!quick_boot) {
             await this.bootTask.runOnce();
         }
-        if (listenRequests) return this.httpListen();
+        if (listenRequests) return this.httpListen(app);
     }
     hasConnected() {
         if (this.isTypeormMode) {
@@ -63,17 +59,13 @@ class ServerHost {
         }
     }
     serveControllerRoutes(app) {
-        const routePath = "./controllers";
         app.use((req, res, next)=>{
-            if (!req.originalUrl.startsWith("/api") && !req.originalUrl.startsWith("/socket.io")) {
+            if (!req.originalUrl.startsWith("/metrics") && !req.originalUrl.startsWith("/api") && !req.originalUrl.startsWith("/socket.io")) {
                 (0, _connecthistoryapifallback.default)()(req, res, next);
             } else {
                 next();
             }
-        }).use((0, _awilixexpress.loadControllers)(`${routePath}/*.controller.*`, {
-            cwd: __dirname,
-            ignore: "**/*.map"
-        })).use(_exceptionfilter.exceptionFilter);
+        }).use((0, _loadcontrollers.loadControllersFunc)());
         const nextClientPath = (0, _path.join)((0, _fsutils.superRootPath)(), "node_modules", _serverconstants.AppConstants.clientNextPackageName, "dist");
         const bundleDistPath = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultClientBundleStorage, "dist");
         const backupClientPath = (0, _path.join)((0, _fsutils.superRootPath)(), "node_modules", _serverconstants.AppConstants.clientPackageName, "dist");
@@ -86,10 +78,10 @@ class ServerHost {
         });
         app.use(_express.default.static(bundleDistPath));
         app.use(_express.default.static(backupClientPath));
-        app.get("*", (req, res)=>{
+        app.get("*", (req, _)=>{
             const path = req.originalUrl;
             let resource = "MVC";
-            if (path.startsWith("/socket.io") || path.startsWith("/api") || path.startsWith("/plugins")) {
+            if (path.startsWith("/socket.io") || path.startsWith("/api") || path.startsWith("/metrics")) {
                 resource = "API";
             } else if (path.endsWith(".min.js")) {
                 resource = "client-bundle";
@@ -98,17 +90,14 @@ class ServerHost {
             if (!path.startsWith("/socket.io")) {
                 throw new _runtimeexceptions.NotFoundException(`${resource} resource was not found`, path);
             }
-        }).use(_exceptionfilter.exceptionFilter);
-    }
-    isClientNextEnabled() {
-        const settings = this.settingsStore.getServerSettings();
-        return settings.experimentalClientSupport;
+        });
+        app.use(_exceptionfilter.exceptionFilter);
     }
-    async httpListen() {
+    async httpListen(app) {
         const port = (0, _serverenv.fetchServerPort)();
         if (!(0, _envutils.isProductionEnvironment)() && this.configService.get(_serverconstants.AppConstants.debugRoutesKey, "false") === "true") {
             const expressListRoutes = require("express-list-routes");
-            expressListRoutes(this.appInstance, {
+            expressListRoutes(app, {
                 prefix: "/"
             });
         }
@@ -116,11 +105,15 @@ class ServerHost {
             throw new Error("The FDM Server requires a numeric port input argument to run");
         }
         const hostOrFqdn = "0.0.0.0";
-        const server = this.appInstance.listen(parseInt(port), hostOrFqdn, ()=>{
+        const server = app.listen(parseInt(port), hostOrFqdn, ()=>{
             this.logger.log(`Server started... open it at http://127.0.0.1:${port}`);
         });
         this.socketIoGateway.attachServer(server);
     }
+    isClientNextEnabled() {
+        const settings = this.settingsStore.getServerSettings();
+        return settings.experimentalClientSupport;
+    }
 }
 
 //# sourceMappingURL=server.host.js.map

package/dist/server.host.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.host.ts"],"names":["ServerHost","bootTask","taskManagerService","socketIoGateway","appInstance","configService","typeormService","settingsStore","isTypeormMode","logger","constructor","loggerFactory","name","boot","app","quick_boot","listenRequests","mongoose","set","serveControllerRoutes","runOnce","httpListen","hasConnected","connections","readyState","routePath","use","req","res","next","originalUrl","startsWith","history","loadControllers","cwd","__dirname","ignore","exceptionFilter","nextClientPath","join","superRootPath","AppConstants","clientNextPackageName","bundleDistPath","defaultClientBundleStorage","backupClientPath","clientPackageName","isClientNextEnabled","express","static","get","path","resource","endsWith","error","NotFoundException","settings","getServerSettings","experimentalClientSupport","port","fetchServerPort","isProductionEnvironment","debugRoutesKey","expressListRoutes","require","prefix","Number","isNaN","parseInt","Error","hostOrFqdn","server","listen","log","attachServer"],"mappings":"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"}
+{"version":3,"sources":["../src/server.host.ts"],"names":["ServerHost","logger","constructor","loggerFactory","configService","isTypeormMode","settingsStore","bootTask","socketIoGateway","typeormService","name","boot","app","quick_boot","listenRequests","mongoose","set","serveControllerRoutes","runOnce","httpListen","hasConnected","connections","readyState","use","req","res","next","originalUrl","startsWith","history","loadControllersFunc","nextClientPath","join","superRootPath","AppConstants","clientNextPackageName","bundleDistPath","defaultClientBundleStorage","backupClientPath","clientPackageName","isClientNextEnabled","express","static","get","_","path","resource","endsWith","error","NotFoundException","exceptionFilter","port","fetchServerPort","isProductionEnvironment","debugRoutesKey","expressListRoutes","require","prefix","Number","isNaN","parseInt","Error","hostOrFqdn","server","listen","log","attachServer","settings","getServerSettings","experimentalClientSupport"],"mappings":"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"}

package/dist/services/authentication/auth.service.js

@@ -13,18 +13,19 @@ const _cryptoutils = require("../../utils/crypto.utils");
 const _authorizationconstants = require("../../constants/authorization.constants");
 const _node = require("@sentry/node");
 class AuthService {
-    logger;
     userService;
     jwtService;
     settingsStore;
     refreshTokenService;
-    blacklistedJwtCache = {};
-    constructor({ userService, jwtService, loggerFactory, settingsStore, refreshTokenService }){
+    logger;
+    blacklistedJwtCache;
+    constructor(loggerFactory, userService, jwtService, settingsStore, refreshTokenService){
         this.userService = userService;
         this.jwtService = jwtService;
-        this.logger = loggerFactory(AuthService.name);
         this.settingsStore = settingsStore;
         this.refreshTokenService = refreshTokenService;
+        this.blacklistedJwtCache = {};
+        this.logger = loggerFactory(AuthService.name);
     }
     async loginUser(username, password) {
         const userDoc = await this.userService.findRawByUsername(username);
@@ -35,7 +36,7 @@ class AuthService {
         if (!result) {
             throw new _runtimeexceptions.AuthenticationError("Login incorrect", _authorizationconstants.AUTH_ERROR_REASON.IncorrectCredentials);
         }
-        const userId = userDoc.id.toString();
+        const userId = userDoc.id;
         const token = await this.signJwtToken(userId);
         await this.refreshTokenService.purgeOutdatedRefreshTokensByUserId(userId);
         await this.purgeOutdatedBlacklistedJwtCache();
@@ -73,15 +74,12 @@ class AuthService {
     }
     async logoutUserRefreshToken(refreshToken) {
         const userRefreshToken = await this.getValidRefreshToken(refreshToken);
-        await this.refreshTokenService.deleteRefreshTokenByUserId(userRefreshToken.userId.toString());
+        await this.refreshTokenService.deleteRefreshTokenByUserId(userRefreshToken.userId);
     }
     async renewLoginByRefreshToken(refreshToken) {
-        const userRefreshToken = await this.getValidRefreshToken(refreshToken, false);
-        if (!userRefreshToken) {
-            throw new _runtimeexceptions.AuthenticationError("The refresh token was invalid or expired, could not refresh user token", _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredRefreshToken);
-        }
-        const userId = userRefreshToken.userId.toString();
-        const user = await this.userService.getUser(userId, false);
+        const userRefreshToken = await this.getValidRefreshToken(refreshToken);
+        const userId = userRefreshToken.userId;
+        const user = await this.userService.getUser(userId);
         if (!user) {
             await this.refreshTokenService.deleteRefreshToken(refreshToken);
             throw new _runtimeexceptions.AuthenticationError("User not found", _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredRefreshToken);
@@ -93,13 +91,10 @@ class AuthService {
     isJwtTokenBlacklisted(jwtToken) {
         return this.blacklistedJwtCache[jwtToken];
     }
-    async getValidRefreshToken(refreshToken, throwNotFoundError = true) {
-        const userRefreshToken = await this.refreshTokenService.getRefreshToken(refreshToken, throwNotFoundError);
-        if (!userRefreshToken) {
-            return null;
-        }
+    async getValidRefreshToken(refreshToken) {
+        const userRefreshToken = await this.refreshTokenService.getRefreshToken(refreshToken);
         if (Date.now() > userRefreshToken.expiresAt) {
-            await this.refreshTokenService.deleteRefreshTokenByUserId(userRefreshToken.userId.toString());
+            await this.refreshTokenService.deleteRefreshTokenByUserId(userRefreshToken.userId);
             throw new _runtimeexceptions.AuthenticationError("Refresh token expired, login required", _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredRefreshToken);
         }
         return userRefreshToken;
@@ -110,14 +105,14 @@ class AuthService {
         const attemptsUsed = userRefreshToken.refreshAttemptsUsed;
         if (refreshTokenAttempts !== -1) {
             if (attemptsUsed >= refreshTokenAttempts) {
-                await this.refreshTokenService.deleteRefreshTokenByUserId(userRefreshToken.userId.toString());
+                await this.refreshTokenService.deleteRefreshTokenByUserId(userRefreshToken.userId);
                 throw new _runtimeexceptions.AuthenticationError("Refresh token attempts exceeded, login required", _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredRefreshToken);
             }
         }
         await this.refreshTokenService.updateRefreshTokenAttempts(refreshToken, attemptsUsed + 1);
     }
     async signJwtToken(userId) {
-        const user = await this.userService.getUser(userId, false);
+        const user = await this.userService.getUser(userId);
         if (!user) {
             throw new _runtimeexceptions.AuthenticationError("User not found", _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredRefreshToken);
         }

package/dist/services/authentication/auth.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/authentication/auth.service.ts"],"names":["AuthService","logger","userService","jwtService","settingsStore","refreshTokenService","blacklistedJwtCache","constructor","loggerFactory","name","loginUser","username","password","userDoc","findRawByUsername","AuthenticationError","AUTH_ERROR_REASON","IncorrectCredentials","result","comparePasswordHash","passwordHash","userId","id","toString","token","signJwtToken","purgeOutdatedRefreshTokensByUserId","purgeOutdatedBlacklistedJwtCache","refreshToken","createRefreshTokenForUserId","logoutUserId","jwtToken","deleteRefreshTokenByUserId","length","createdAt","Date","now","jwtExpiresIn","getCredentialSettings","keys","Object","key","err","error","captureException","logoutUserRefreshToken","userRefreshToken","getValidRefreshToken","renewLoginByRefreshToken","InvalidOrExpiredRefreshToken","user","getUser","deleteRefreshToken","increaseRefreshTokenAttemptsUsed","isJwtTokenBlacklisted","throwNotFoundError","getRefreshToken","expiresAt","refreshTokenAttempts","attemptsUsed","refreshAttemptsUsed","updateRefreshTokenAttempts","needsPasswordChange","PasswordChangeRequired","isVerified","AccountNotVerified"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/authentication/auth.service.ts"],"names":["AuthService","logger","blacklistedJwtCache","constructor","loggerFactory","userService","jwtService","settingsStore","refreshTokenService","name","loginUser","username","password","userDoc","findRawByUsername","AuthenticationError","AUTH_ERROR_REASON","IncorrectCredentials","result","comparePasswordHash","passwordHash","userId","id","token","signJwtToken","purgeOutdatedRefreshTokensByUserId","purgeOutdatedBlacklistedJwtCache","refreshToken","createRefreshTokenForUserId","logoutUserId","jwtToken","deleteRefreshTokenByUserId","length","createdAt","Date","now","jwtExpiresIn","getCredentialSettings","keys","Object","key","err","error","captureException","logoutUserRefreshToken","userRefreshToken","getValidRefreshToken","renewLoginByRefreshToken","user","getUser","deleteRefreshToken","InvalidOrExpiredRefreshToken","increaseRefreshTokenAttemptsUsed","isJwtTokenBlacklisted","getRefreshToken","expiresAt","refreshTokenAttempts","attemptsUsed","refreshAttemptsUsed","updateRefreshTokenAttempts","needsPasswordChange","PasswordChangeRequired","isVerified","AccountNotVerified"],"mappings":"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"}

package/dist/services/authentication/jwt.service.js

@@ -13,7 +13,7 @@ const _serverconstants = require("../../server.constants");
 class JwtService {
     settingsStore;
     configService;
-    constructor({ settingsStore, configService }){
+    constructor(settingsStore, configService){
         this.settingsStore = settingsStore;
         this.configService = configService;
     }

package/dist/services/authentication/jwt.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/authentication/jwt.service.ts"],"names":["JwtService","settingsStore","configService","constructor","signJwtToken","userId","username","jwtSecret","jwtExpiresIn","getCredentialSettings","sign","expiresIn","subject","toString","audience","get","AppConstants","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","issuer","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER"],"mappings":";;;;+BAOaA;;;eAAAA;;;8BAPQ;iCACQ;AAMtB,MAAMA;IACXC,cAA6B;IAC7BC,cAA8B;IAE9BC,YAAY,EAAEF,aAAa,EAAEC,aAAa,EAAmE,CAAE;QAC7G,IAAI,CAACD,aAAa,GAAGA;QACrB,IAAI,CAACC,aAAa,GAAGA;IACvB;IAEA,MAAME,aAAaC,MAAc,EAAEC,QAAgB,EAAE;QACnD,MAAM,EAAEC,SAAS,EAAEC,YAAY,EAAE,GAAG,MAAM,IAAI,CAACP,aAAa,CAACQ,qBAAqB;QAElF,OAAOC,IAAAA,kBAAI,EAAC;YAAEL;YAAQC;QAAS,GAAGC,WAAW;YAC3CI,WAAWH;YACXI,SAASP,OAAOQ,QAAQ;YACxBC,UAAU,IAAI,CAACZ,aAAa,CAACa,GAAG,CAACC,6BAAY,CAACC,qBAAqB,EAAED,6BAAY,CAACE,oBAAoB;YACtGC,QAAQ,IAAI,CAACjB,aAAa,CAACa,GAAG,CAACC,6BAAY,CAACI,mBAAmB,EAAEJ,6BAAY,CAACK,kBAAkB;QAClG;IACF;AACF"}
+{"version":3,"sources":["../../../src/services/authentication/jwt.service.ts"],"names":["JwtService","constructor","settingsStore","configService","signJwtToken","userId","username","jwtSecret","jwtExpiresIn","getCredentialSettings","sign","expiresIn","subject","toString","audience","get","AppConstants","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","issuer","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER"],"mappings":";;;;+BAOaA;;;eAAAA;;;8BAPQ;iCACQ;AAMtB,MAAMA;;;IACXC,YACE,AAAiBC,aAA4B,EAC7C,AAAiBC,aAA6B,CAC9C;aAFiBD,gBAAAA;aACAC,gBAAAA;IAChB;IAEH,MAAMC,aAAaC,MAAc,EAAEC,QAAgB,EAAE;QACnD,MAAM,EAAEC,SAAS,EAAEC,YAAY,EAAE,GAAG,MAAM,IAAI,CAACN,aAAa,CAACO,qBAAqB;QAElF,OAAOC,IAAAA,kBAAI,EAAC;YAAEL;YAAQC;QAAS,GAAGC,WAAW;YAC3CI,WAAWH;YACXI,SAASP,OAAOQ,QAAQ;YACxBC,UAAU,IAAI,CAACX,aAAa,CAACY,GAAG,CAACC,6BAAY,CAACC,qBAAqB,EAAED,6BAAY,CAACE,oBAAoB;YACtGC,QAAQ,IAAI,CAAChB,aAAa,CAACY,GAAG,CAACC,6BAAY,CAACI,mBAAmB,EAAEJ,6BAAY,CAACK,kBAAkB;QAClG;IACF;AACF"}

package/dist/services/core/batch-call.service.js

@@ -13,18 +13,14 @@ const _errorutils = require("../../utils/error.utils");
 const _printerapiinterface = require("../printer-api.interface");
 class BatchCallService {
     printerApiFactory;
-    printerSocketStore;
     printerCache;
-    printerEventsCache;
-    printerFilesStore;
+    printerSocketStore;
     printerService;
     logger;
-    constructor({ printerApiFactory, printerCache, printerEventsCache, printerSocketStore, printerFilesStore, printerService, loggerFactory }){
+    constructor(loggerFactory, printerApiFactory, printerCache, printerSocketStore, printerService){
         this.printerApiFactory = printerApiFactory;
         this.printerCache = printerCache;
-        this.printerEventsCache = printerEventsCache;
         this.printerSocketStore = printerSocketStore;
-        this.printerFilesStore = printerFilesStore;
         this.printerService = printerService;
         this.logger = loggerFactory(BatchCallService.name);
     }
@@ -34,7 +30,7 @@ class BatchCallService {
     async batchTogglePrintersEnabled(printerIds, enabled) {
         const promises = [];
         for (const printerId of printerIds){
-            let promise;
+            let promise = undefined;
             const printerDto = await this.printerCache.getValue(printerId);
             if (!printerDto) continue;
             const time = Date.now();
@@ -55,32 +51,34 @@ class BatchCallService {
                         };
                     });
                 }
+            } else if (printerDto.enabled) {
+                promise = this.printerService.updateEnabled(printerId, false).then(()=>{
+                    return {
+                        success: true,
+                        printerId,
+                        time: Date.now() - time
+                    };
+                }).catch((e)=>{
+                    return {
+                        failure: true,
+                        error: e.message,
+                        printerId,
+                        time: Date.now() - time
+                    };
+                });
             } else {
-                if (printerDto.enabled) {
-                    promise = this.printerService.updateEnabled(printerId, false).then(()=>{
-                        return {
-                            success: true,
-                            printerId,
-                            time: Date.now() - time
-                        };
-                    }).catch((e)=>{
-                        return {
-                            failure: true,
-                            error: e.message,
-                            printerId,
-                            time: Date.now() - time
-                        };
-                    });
-                }
+                this.logger.warn("Did not toggle printer enabled, its in maintenance");
+            }
+            if (promise) {
+                promises.push(promise);
             }
-            promises.push(promise);
         }
         return await Promise.all(promises);
     }
     batchConnectSocket(printerIds) {
         for (const printerId of printerIds){
             try {
-                this.printerSocketStore.reconnectOctoPrint(printerId);
+                this.printerSocketStore.reconnectPrinterAdapter(printerId);
             } catch (e) {
                 (0, _node.captureException)(e);
                 this.logger.error(`Error setting socket to reconnect ${(0, _errorutils.errorSummary)(e)}`);

package/dist/services/core/batch-call.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/batch-call.service.ts"],"names":["BatchCallService","printerApiFactory","printerSocketStore","printerCache","printerEventsCache","printerFilesStore","printerService","logger","constructor","loggerFactory","name","getPrinter","login","getScopedPrinter","batchTogglePrintersEnabled","printerIds","enabled","promises","printerId","promise","printerDto","getValue","time","Date","now","disabledReason","length","updateEnabled","then","success","catch","e","failure","error","message","push","Promise","all","batchConnectSocket","reconnectOctoPrint","captureException","errorSummary","batchSettingsGet","getLoginDtoAsync","client","getSettings","r","value","batchConnectUsb","connect","getBatchPrinterReprintFile","resolve","_","partialReprintState","getReprintState","connectionState","reprintState","ReprintState","PrinterNotAvailable","batchReprintCalls","printerIdFileList","printerIdFile","path","startPrint"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/batch-call.service.ts"],"names":["BatchCallService","logger","constructor","loggerFactory","printerApiFactory","printerCache","printerSocketStore","printerService","name","getPrinter","login","getScopedPrinter","batchTogglePrintersEnabled","printerIds","enabled","promises","printerId","promise","undefined","printerDto","getValue","time","Date","now","disabledReason","length","updateEnabled","then","success","catch","e","failure","error","message","warn","push","Promise","all","batchConnectSocket","reconnectPrinterAdapter","captureException","errorSummary","batchSettingsGet","getLoginDtoAsync","client","getSettings","r","value","batchConnectUsb","connect","getBatchPrinterReprintFile","resolve","_","partialReprintState","getReprintState","connectionState","reprintState","ReprintState","PrinterNotAvailable","batchReprintCalls","printerIdFileList","printerIdFile","path","startPrint"],"mappings":"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"}