@fdm-monster/server 1.6.0-rc1 → 1.6.0-rc2

package/dist/models/PrinterFile.js

@@ -74,6 +74,10 @@ const PrinterFileSchema = new _mongoose.Schema({
     typePath: {
         type: Array(String),
         required: false
+    },
+    customData: {
+        type: Object,
+        required: true
     }
 });
 const PrinterFile = (0, _mongoose.model)("PrinterFile", PrinterFileSchema);

package/dist/models/PrinterFile.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/models/PrinterFile.ts"],"names":["PrinterFile","PrinterFileSchema","Schema","printerId","type","Types","ObjectId","required","name","String","date","Number","display","gcodeAnalysis","Object","default","hash","origin","path","prints","refs","size","statistics","typePath","Array","model"],"mappings":";;;;;;;;;;;IAgFaA,WAAW;eAAXA;;IA5DAC,iBAAiB;eAAjBA;;;0BApBiB;AAoBvB,MAAMA,oBAAoB,IAAIC,gBAAM,CAAe;IACxDC,WAAW;QACTC,MAAMF,gBAAM,CAACG,KAAK,CAACC,QAAQ;QAC3BC,UAAU;IACZ;IACAC,MAAM;QACJJ,MAAMK;QACNF,UAAU;IACZ;IACAG,MAAM;QACJN,MAAMO;QACNJ,UAAU;IACZ;IACAK,SAAS;QACPR,MAAMK;QACNF,UAAU;IACZ;IACAM,eAAe;QACbT,MAAMU;QACNC,SAAS;QACTR,UAAU;IACZ;IACAS,MAAM;QACJZ,MAAMK;QACNF,UAAU;IACZ;IACAU,QAAQ;QACNb,MAAMK;QACNF,UAAU;IACZ;IACAW,MAAM;QACJd,MAAMK;QACNF,UAAU;IACZ;IACAY,QAAQ;QACNf,MAAMU;QACNP,UAAU;IACZ;IACAa,MAAM;QACJhB,MAAMU;QACNP,UAAU;IACZ;IACAc,MAAM;QACJjB,MAAMO;QACNJ,UAAU;IACZ;IACAe,YAAY;QACVlB,MAAMU;QACNP,UAAU;IACZ;IACAH,MAAM;QACJA,MAAMK;QACNF,UAAU;IACZ;IACAgB,UAAU;QACRnB,MAAMoB,MAAMf;QACZF,UAAU;IACZ;AACF;AAEO,MAAMP,cAAcyB,IAAAA,eAAK,EAAC,eAAexB"}
+{"version":3,"sources":["../../src/models/PrinterFile.ts"],"names":["PrinterFile","PrinterFileSchema","Schema","printerId","type","Types","ObjectId","required","name","String","date","Number","display","gcodeAnalysis","Object","default","hash","origin","path","prints","refs","size","statistics","typePath","Array","customData","model"],"mappings":";;;;;;;;;;;IAsFaA,WAAW;eAAXA;;IAhEAC,iBAAiB;eAAjBA;;;0BAtBiB;AAsBvB,MAAMA,oBAAoB,IAAIC,gBAAM,CAAe;IACxDC,WAAW;QACTC,MAAMF,gBAAM,CAACG,KAAK,CAACC,QAAQ;QAC3BC,UAAU;IACZ;IACAC,MAAM;QACJJ,MAAMK;QACNF,UAAU;IACZ;IACAG,MAAM;QACJN,MAAMO;QACNJ,UAAU;IACZ;IACAK,SAAS;QACPR,MAAMK;QACNF,UAAU;IACZ;IACAM,eAAe;QACbT,MAAMU;QACNC,SAAS;QACTR,UAAU;IACZ;IACAS,MAAM;QACJZ,MAAMK;QACNF,UAAU;IACZ;IACAU,QAAQ;QACNb,MAAMK;QACNF,UAAU;IACZ;IACAW,MAAM;QACJd,MAAMK;QACNF,UAAU;IACZ;IACAY,QAAQ;QACNf,MAAMU;QACNP,UAAU;IACZ;IACAa,MAAM;QACJhB,MAAMU;QACNP,UAAU;IACZ;IACAc,MAAM;QACJjB,MAAMO;QACNJ,UAAU;IACZ;IACAe,YAAY;QACVlB,MAAMU;QACNP,UAAU;IACZ;IACAH,MAAM;QACJA,MAAMK;QACNF,UAAU;IACZ;IACAgB,UAAU;QACRnB,MAAMoB,MAAMf;QACZF,UAAU;IACZ;IACAkB,YAAY;QACVrB,MAAMU;QACNP,UAAU;IACZ;AACF;AAEO,MAAMP,cAAc0B,IAAAA,eAAK,EAAC,eAAezB"}

package/dist/server.constants.js

@@ -63,7 +63,7 @@ const AppConstants = {
     serverRepoName: "fdm-monster",
     orgName: "fdm-monster",
     currentWizardVersion: 1,
-    defaultClientMinimum: "1.5.0-rc3",
+    defaultClientMinimum: "1.5.0-rc4",
     influxUrl: "INFLUX_URL",
     influxToken: "INFLUX_TOKEN",
     influxOrg: "INFLUX_ORG",
@@ -72,6 +72,8 @@ const AppConstants = {
     defaultSocketThrottleRate: 1,
     debugSocketStatesKey: "DEBUG_SOCKET_STATES",
     defaultDebugSocketStates: "false",
+    debugFileWritePrinterStatesKey: "DEBUG_FILE_WRITE_PRINTER_STATES",
+    defaultDebugFileWritePrinterStates: "false",
     enableMqttAutoDiscoveryToken: "ENABLE_MQTT_AUTODISCOVERY",
     enableMqttAutoDiscoveryDefault: "false",
     mqttUrlToken: "MQTT_HOST",
@@ -83,7 +85,7 @@ const AppConstants = {
     sentryCustomDsnToken: "SENTRY_CUSTOM_DSN",
     sentryCustomDsnDefault: "https://164b8028a8a745bba3dbcab991b84ae7@o4503975545733120.ingest.sentry.io/4505101598261248",
     debugRoutesKey: "DEBUG_ROUTES",
-    enableExperimentalTypeormKey: "ENABLE_EXPERIMENTAL_TYPEORM",
+    ENABLE_EXPERIMENTAL_TYPEORM: "ENABLE_EXPERIMENTAL_TYPEORM",
     enableExperimentalTypeormDefault: "false"
 };
 

package/dist/server.constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NON_NPM_MODE_KEY","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS","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","clientPackageName","clientRepoName","serverRepoName","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","enableExperimentalTypeormKey","enableExperimentalTypeormDefault"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,kBAAkB;IAClBC,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,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,wCAAwC;IAExCC,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,mBAAmB;IACnBC,gBAAgB;IAChBC,gBAAgB;IAChBC,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,wBAAwB;IAExBC,gBAAgB;IAEhBC,8BAA8B;IAC9BC,kCAAkC;AACpC"}
+{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NON_NPM_MODE_KEY","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS","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","clientPackageName","clientRepoName","serverRepoName","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,kBAAkB;IAClBC,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,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,wCAAwC;IAExCC,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,mBAAmB;IACnBC,gBAAgB;IAChBC,gBAAgB;IAChBC,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"}

package/dist/server.core.js

@@ -18,6 +18,10 @@ const _container = require("./container");
 const _database = require("./middleware/database");
 const _globalmiddleware = require("./middleware/global.middleware");
 const _passport1 = require("./middleware/passport");
+const _serverconstants = require("./server.constants");
+const _path = require("path");
+const _fsutils = require("./utils/fs.utils");
+const _envutils = require("./utils/env.utils");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -66,7 +70,12 @@ function _interop_require_wildcard(obj, nodeInterop) {
 }
 async function setupServer() {
     const httpServer = (0, _express.default)();
-    const container = (0, _container.configureContainer)();
+    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";
+        (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)({
         origin: "*",

package/dist/server.core.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.core.ts"],"names":["setupServer","httpServer","express","container","configureContainer","initializePassportStrategies","passport","use","cors","origin","methods","helmet","contentSecurityPolicy","json","limit","cookieParser","urlencoded","extended","initialize","authenticate","session","scopePerRequest","interceptDatabaseError","validateWhitelistedIp","validateWizardCompleted","interceptRoles"],"mappings":";;;;+BAWsBA;;;eAAAA;;;mDAXoB;uDACjB;mDACJ;+CACJ;iDACE;+BACa;2BACG;0BACI;kCACwC;2BAClC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEtC,eAAeA;IACpB,MAAMC,aAAaC,IAAAA,gBAAO;IAC1B,MAAMC,YAAYC,IAAAA,6BAAkB;IACpCC,IAAAA,uCAA4B,EAACC,iBAAQ,EAAEH;IAEvCF,WACGM,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,uCAAqB,EACzBhB,GAAG,CAACiB,yCAAuB,EAC3BjB,GAAG,CAACkB,gCAAc;IAErB,OAAO;QACLxB;QACAE;IACF;AACF"}
+{"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","validateWhitelistedIp","validateWizardCompleted","interceptRoles"],"mappings":";;;;+BAesBA;;;eAAAA;;;mDAfoB;uDACjB;mDACJ;+CACJ;iDACE;+BACa;2BACG;0BACI;kCACwC;2BAClC;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,uCAAqB,EACzBhB,GAAG,CAACiB,yCAAuB,EAC3BjB,GAAG,CAACkB,gCAAc;IAErB,OAAO;QACLpC;QACAc;IACF;AACF"}

package/dist/server.host.js

@@ -30,18 +30,22 @@ class ServerHost {
     socketIoGateway;
     appInstance = null;
     configService;
+    typeormService;
     isTypeormMode;
     logger;
-    constructor({ loggerFactory, bootTask, taskManagerService, socketIoGateway, configService, isTypeormMode }){
+    constructor({ loggerFactory, bootTask, taskManagerService, socketIoGateway, configService, typeormService, isTypeormMode }){
         this.logger = loggerFactory(ServerHost.name);
         this.bootTask = bootTask;
         this.taskManagerService = taskManagerService;
         this.socketIoGateway = socketIoGateway;
         this.configService = configService;
+        this.typeormService = typeormService;
         this.isTypeormMode = isTypeormMode;
     }
     async boot(app, quick_boot = false, listenRequests = true) {
-        _mongoose.default.set("strictQuery", true);
+        if (!this.isTypeormMode) {
+            _mongoose.default.set("strictQuery", true);
+        }
         this.appInstance = app;
         this.serveControllerRoutes(this.appInstance);
         if (!quick_boot) {
@@ -50,7 +54,11 @@ class ServerHost {
         if (listenRequests) return this.httpListen();
     }
     hasConnected() {
-        return _mongoose.default.connections[0].readyState;
+        if (this.isTypeormMode) {
+            return this.typeormService.hasConnected();
+        } else {
+            return _mongoose.default.connections[0].readyState;
+        }
     }
     serveControllerRoutes(app) {
         const routePath = "./controllers";

package/dist/server.host.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.host.ts"],"names":["ServerHost","bootTask","taskManagerService","socketIoGateway","appInstance","configService","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","bundleDistPath","join","superRootPath","AppConstants","defaultClientBundleStorage","express","static","backupClientPath","clientPackageName","get","path","resource","endsWith","error","NotFoundException","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","bootTask","taskManagerService","socketIoGateway","appInstance","configService","typeormService","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","bundleDistPath","join","superRootPath","AppConstants","defaultClientBundleStorage","express","static","backupClientPath","clientPackageName","get","path","resource","endsWith","error","NotFoundException","port","fetchServerPort","isProductionEnvironment","debugRoutesKey","expressListRoutes","require","prefix","Number","isNaN","parseInt","Error","hostOrFqdn","server","listen","log","attachServer"],"mappings":"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"}

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

@@ -8,6 +8,12 @@ Object.defineProperty(exports, "BatchCallService", {
         return BatchCallService;
     }
 });
+var ReprintState;
+(function(ReprintState) {
+    ReprintState[ReprintState["PrinterNotAvailable"] = 0] = "PrinterNotAvailable";
+    ReprintState[ReprintState["NoLastPrint"] = 1] = "NoLastPrint";
+    ReprintState[ReprintState["LastPrintReady"] = 2] = "LastPrintReady";
+})(ReprintState || (ReprintState = {}));
 class BatchCallService {
     octoPrintApiService;
     printerSocketStore;
@@ -26,7 +32,7 @@ class BatchCallService {
     async batchTogglePrintersEnabled(printerIds, enabled) {
         const promises = [];
         for (const printerId of printerIds){
-            let promise = Promise.resolve();
+            let promise;
             const printerDto = await this.printerCache.getValue(printerId);
             if (!printerDto) continue;
             const time = Date.now();
@@ -98,30 +104,47 @@ class BatchCallService {
         }
         return await Promise.all(promises);
     }
-    async batchReprintCalls(printerIds) {
+    async getBatchPrinterReprintFile(printerIds) {
         const promises = [];
         for (const printerId of printerIds){
-            const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
-            let reprintPath = await this.printerEventsCache.getPrinterSocketEvents(printerId)?.current?.job?.file?.path;
-            if (!reprintPath?.length) {
-                const files = await this.printerFilesStore.getFiles(printerId)?.files;
-                if (files?.length) {
-                    files.sort((f1, f2)=>{
-                        return f1.date < f2.date ? 1 : -1;
+            const promise = new Promise(async (resolve, _)=>{
+                try {
+                    const login = await this.printerCache.getLoginDtoAsync(printerId);
+                    const files = (await this.octoPrintApiService.getLocalFiles(login, true)).filter((f)=>f?.prints?.last?.date);
+                    const connected = await this.octoPrintApiService.getConnection(login);
+                    const connectionState = connected.current?.state;
+                    if (files?.length == 0) {
+                        return resolve({
+                            connectionState,
+                            printerId,
+                            reprintState: 1
+                        });
+                    }
+                    return resolve({
+                        connectionState,
+                        file: files[0],
+                        printerId,
+                        reprintState: 2
+                    });
+                } catch (e) {
+                    return resolve({
+                        connectionState: null,
+                        printerId,
+                        reprintState: 0
                     });
-                    reprintPath = files[0].path;
-                }
-                if (!files?.length) {
-                    promises.push(Promise.resolve({
-                        failure: true,
-                        error: "No file to reprint",
-                        printerId
-                    }));
-                    continue;
                 }
-            }
+            });
+            promises.push(promise);
+        }
+        return await Promise.all(promises);
+    }
+    async batchReprintCalls(printerIdFileList) {
+        const promises = [];
+        for (const printerIdFile of printerIdFileList){
+            const { printerId, path } = printerIdFile;
+            const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
             const time = Date.now();
-            const promise = this.octoPrintApiService.selectPrintFile(printerLogin, reprintPath, true).then(()=>{
+            const promise = this.octoPrintApiService.selectPrintFile(printerLogin, path, true).then(()=>{
                 return {
                     success: true,
                     printerId,

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/batch-call.service.ts"],"names":["BatchCallService","octoPrintApiService","printerSocketStore","printerCache","printerEventsCache","printerFilesStore","printerService","constructor","batchTogglePrintersEnabled","printerIds","enabled","promises","printerId","promise","Promise","resolve","printerDto","getValue","time","Date","now","disabledReason","length","updateEnabled","then","success","catch","e","failure","error","message","push","all","batchConnectSocket","reconnectOctoPrint","batchConnectUsb","printerLogin","getLoginDtoAsync","command","connectCommand","sendConnectionCommand","batchReprintCalls","reprintPath","getPrinterSocketEvents","current","job","file","path","files","getFiles","sort","f1","f2","date","selectPrintFile"],"mappings":"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"}
+{"version":3,"sources":["../../src/services/batch-call.service.ts"],"names":["BatchCallService","ReprintState","octoPrintApiService","printerSocketStore","printerCache","printerEventsCache","printerFilesStore","printerService","constructor","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","batchConnectUsb","printerLogin","getLoginDtoAsync","command","connectCommand","sendConnectionCommand","getBatchPrinterReprintFile","resolve","_","login","files","getLocalFiles","filter","f","prints","last","date","connected","getConnection","connectionState","current","state","reprintState","file","batchReprintCalls","printerIdFileList","printerIdFile","path","selectPrintFile"],"mappings":";;;;+BAiCaA;;;eAAAA;;;;UAvBRC;;;;GAAAA,iBAAAA;AAuBE,MAAMD;IACXE,oBAAyC;IACzCC,mBAAuC;IACvCC,aAA2B;IAC3BC,mBAAuC;IACvCC,kBAAqC;IACrCC,eAAgC;IAEhCC,YAAY,EACVN,mBAAmB,EACnBE,YAAY,EACZC,kBAAkB,EAClBF,kBAAkB,EAClBG,iBAAiB,EACjBC,cAAc,EAQf,CAAE;QACD,IAAI,CAACL,mBAAmB,GAAGA;QAC3B,IAAI,CAACE,YAAY,GAAGA;QACpB,IAAI,CAACC,kBAAkB,GAAGA;QAC1B,IAAI,CAACF,kBAAkB,GAAGA;QAC1B,IAAI,CAACG,iBAAiB,GAAGA;QACzB,IAAI,CAACC,cAAc,GAAGA;IACxB;IAEA,MAAME,2BACJC,UAAoB,EACpBC,OAAgB,EAShB;QACA,MAAMC,WAAW,EAAE;QACnB,KAAK,MAAMC,aAAaH,WAAY;YAClC,IAAII;YACJ,MAAMC,aAAa,MAAM,IAAI,CAACX,YAAY,CAACY,QAAQ,CAACH;YACpD,IAAI,CAACE,YAAY;YAEjB,MAAME,OAAOC,KAAKC,GAAG;YACrB,IAAIR,SAAS;gBAEX,IAAI,CAACI,WAAWJ,OAAO,IAAI,CAACI,WAAWK,cAAc,EAAEC,QAAQ;oBAC7DP,UAAU,IAAI,CAACP,cAAc,CAC1Be,aAAa,CAACT,WAAW,MACzBU,IAAI,CAAC;wBACJ,OAAO;4BAAEC,SAAS;4BAAMX;4BAAWI,MAAMC,KAAKC,GAAG,KAAKF;wBAAK;oBAC7D,GACCQ,KAAK,CAAC,CAACC;wBACN,OAAO;4BAAEC,SAAS;4BAAMC,OAAOF,EAAEG,OAAO;4BAAEhB;4BAAWI,MAAMC,KAAKC,GAAG,KAAKF;wBAAK;oBAC/E;gBACJ;YACF,OAAO;gBAEL,IAAIF,WAAWJ,OAAO,EAAE;oBACtBG,UAAU,IAAI,CAACP,cAAc,CAC1Be,aAAa,CAACT,WAAW,OACzBU,IAAI,CAAC;wBACJ,OAAO;4BAAEC,SAAS;4BAAMX;4BAAWI,MAAMC,KAAKC,GAAG,KAAKF;wBAAK;oBAC7D,GACCQ,KAAK,CAAC,CAACC;wBACN,OAAO;4BAAEC,SAAS;4BAAMC,OAAOF,EAAEG,OAAO;4BAAEhB;4BAAWI,MAAMC,KAAKC,GAAG,KAAKF;wBAAK;oBAC/E;gBACJ;YACF;YACAL,SAASkB,IAAI,CAAChB;QAChB;QAEA,OAAO,MAAMiB,QAAQC,GAAG,CAACpB;IAC3B;IAEAqB,mBAAmBvB,UAAoB,EAAQ;QAC7C,KAAK,MAAMG,aAAaH,WAAY;YAClC,IAAI,CAACP,kBAAkB,CAAC+B,kBAAkB,CAACrB;QAC7C;IACF;IAEA,MAAMsB,gBAAgBzB,UAAoB,EAAkC;QAC1E,MAAME,WAAW,EAAE;QACnB,KAAK,MAAMC,aAAaH,WAAY;YAClC,MAAM0B,eAAe,MAAM,IAAI,CAAChC,YAAY,CAACiC,gBAAgB,CAACxB;YAC9D,MAAMI,OAAOC,KAAKC,GAAG;YAErB,MAAMmB,UAAU,IAAI,CAACpC,mBAAmB,CAACqC,cAAc;YACvD,MAAMzB,UAAU,IAAI,CAACZ,mBAAmB,CACrCsC,qBAAqB,CAACJ,cAAcE,SACpCf,IAAI,CAAC;gBACJ,OAAO;oBAAEC,SAAS;oBAAMX;oBAAWI,MAAMC,KAAKC,GAAG,KAAKF;gBAAK;YAC7D,GACCQ,KAAK,CAAC,CAACC;gBACN,OAAO;oBAAEC,SAAS;oBAAMC,OAAOF,EAAEG,OAAO;oBAAEhB;oBAAWI,MAAMC,KAAKC,GAAG,KAAKF;gBAAK;YAC/E;YAEFL,SAASkB,IAAI,CAAChB;QAChB;QACA,OAAO,MAAMiB,QAAQC,GAAG,CAACpB;IAC3B;IAEA,MAAM6B,2BAA2B/B,UAAoB,EAA6B;QAChF,MAAME,WAAW,EAAE;QACnB,KAAK,MAAMC,aAAaH,WAAY;YAClC,MAAMI,UAAU,IAAIiB,QAAwB,OAAOW,SAASC;gBAC1D,IAAI;oBACF,MAAMC,QAAQ,MAAM,IAAI,CAACxC,YAAY,CAACiC,gBAAgB,CAACxB;oBACvD,MAAMgC,QAAQ,AAAC,CAAA,MAAM,IAAI,CAAC3C,mBAAmB,CAAC4C,aAAa,CAACF,OAAO,KAAI,EAAGG,MAAM,CAAC,CAACC,IAAMA,GAAGC,QAAQC,MAAMC;oBAEzG,MAAMC,YAAY,MAAM,IAAI,CAAClD,mBAAmB,CAACmD,aAAa,CAACT;oBAC/D,MAAMU,kBAAkBF,UAAUG,OAAO,EAAEC;oBAO3C,IAAIX,OAAOxB,UAAU,GAAG;wBACtB,OAAOqB,QAAQ;4BAAEY;4BAAiBzC;4BAAW4C,YAAY;wBAA2B;oBACtF;oBAEA,OAAOf,QAAQ;wBACbY;wBACAI,MAAMb,KAAK,CAAC,EAAE;wBACdhC;wBACA4C,YAAY;oBACd;gBACF,EAAE,OAAO/B,GAAG;oBACV,OAAOgB,QAAQ;wBACbY,iBAAiB;wBACjBzC;wBACA4C,YAAY;oBACd;gBACF;YACF;YACA7C,SAASkB,IAAI,CAAChB;QAChB;QAEA,OAAO,MAAMiB,QAAQC,GAAG,CAACpB;IAC3B;IAEA,MAAM+C,kBAAkBC,iBAAwD,EAAkC;QAChH,MAAMhD,WAAW,EAAE;QACnB,KAAK,MAAMiD,iBAAiBD,kBAAmB;YAC7C,MAAM,EAAE/C,SAAS,EAAEiD,IAAI,EAAE,GAAGD;YAC5B,MAAMzB,eAAe,MAAM,IAAI,CAAChC,YAAY,CAACiC,gBAAgB,CAACxB;YAE9D,MAAMI,OAAOC,KAAKC,GAAG;YACrB,MAAML,UAAU,IAAI,CAACZ,mBAAmB,CACrC6D,eAAe,CAAC3B,cAAc0B,MAAM,MACpCvC,IAAI,CAAC;gBACJ,OAAO;oBAAEC,SAAS;oBAAMX;oBAAWI,MAAMC,KAAKC,GAAG,KAAKF;gBAAK;YAC7D,GACCQ,KAAK,CAAC,CAACC;gBACN,OAAO;oBAAEC,SAAS;oBAAMC,OAAOF,EAAEG,OAAO;oBAAEhB;oBAAWI,MAAMC,KAAKC,GAAG,KAAKF;gBAAK;YAC/E;YAEFL,SAASkB,IAAI,CAAChB;QAChB;QACA,OAAO,MAAMiB,QAAQC,GAAG,CAACpB;IAC3B;AACF"}

package/dist/services/core/client-bundle.service.js

@@ -15,6 +15,9 @@ const _promises = require("node:fs/promises");
 const _fsutils = require("../../utils/fs.utils");
 const _semverutils = require("../../utils/semver.utils");
 const _serverconstants = require("../../server.constants");
+const _semver = require("semver");
+const _errorutils = require("../../utils/error.utils");
+const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -38,50 +41,113 @@ class ClientBundleService {
     async getReleases() {
         const githubOwner = _serverconstants.AppConstants.orgName;
         const githubRepo = _serverconstants.AppConstants.clientRepoName;
-        const result = await this.githubService.getReleases(githubOwner, githubRepo);
-        const latestResult = await this.githubService.getLatestRelease(githubOwner, githubRepo);
-        return {
-            minimum: {
-                tag_name: _serverconstants.AppConstants.defaultClientMinimum
-            },
-            current: {
-                tag_name: this.getClientVersion()
-            },
-            latest: latestResult.data,
-            releases: result.data
-        };
+        try {
+            const result = await this.githubService.getReleases(githubOwner, githubRepo);
+            const latestResult = await this.githubService.getLatestRelease(githubOwner, githubRepo);
+            return {
+                minimum: {
+                    tag_name: _serverconstants.AppConstants.defaultClientMinimum
+                },
+                current: {
+                    tag_name: this.getClientVersion()
+                },
+                latest: latestResult.data,
+                releases: result.data
+            };
+        } catch (e) {
+            this.logger.error(`Github OctoKit error ${(0, _errorutils.errorSummary)(e)}`);
+            throw new _runtimeexceptions.ExternalServiceError(e);
+        }
     }
-    async shouldUpdateWithReason(overrideAutoUpdate, minimumVersion) {
+    async shouldUpdateWithReason(overrideAutoUpdate, minimumVersion, requestedVersion, allowDowngrade) {
         const clientAutoUpdate = _serverconstants.AppConstants.enableClientDistAutoUpdateKey;
+        const existingClientVersion = this.getClientVersion();
         if (!clientAutoUpdate && !overrideAutoUpdate) {
             return {
                 shouldUpdate: false,
+                requestedVersion,
+                minimumVersion: _serverconstants.AppConstants.defaultClientMinimum,
+                currentVersion: existingClientVersion,
+                targetVersion: null,
                 reason: "Client auto-update disabled (ENABLE_CLIENT_DIST_AUTO_UPDATE), skipping"
             };
         }
-        const version = this.getClientVersion();
-        if (!version) {
+        if (!existingClientVersion) {
             return {
                 shouldUpdate: true,
+                requestedVersion,
+                currentVersion: existingClientVersion,
+                minimumVersion: _serverconstants.AppConstants.defaultClientMinimum,
+                targetVersion: (0, _semverutils.getMaximumOfVersionsSafe)(minimumVersion, requestedVersion),
                 reason: `Client package.json does not exist, downloading new release`
             };
         }
         if (!this.doesClientIndexHtmlExist()) {
             return {
                 shouldUpdate: true,
-                reason: `Client index.html does not exist, downloading new release`
+                requestedVersion,
+                currentVersion: existingClientVersion,
+                minimumVersion: _serverconstants.AppConstants.defaultClientMinimum,
+                targetVersion: (0, _semverutils.getMaximumOfVersionsSafe)(minimumVersion, requestedVersion),
+                reason: `Client index.html could not be found, downloading new release`
             };
         }
-        const satisfiesMinimumVersion = (0, _semverutils.checkVersionSatisfiesMinimum)(version, minimumVersion);
-        if (satisfiesMinimumVersion) {
-            return {
-                shouldUpdate: false,
-                reason: `Client satisfies minimum version ${minimumVersion}, skipping`
-            };
+        const satisfiesMinimumVersion = (0, _semverutils.checkVersionSatisfiesMinimum)(existingClientVersion, minimumVersion);
+        const clientOutdated = !satisfiesMinimumVersion;
+        const clientOutdatedResponse = {
+            shouldUpdate: true,
+            requestedVersion,
+            currentVersion: existingClientVersion,
+            minimumVersion: _serverconstants.AppConstants.defaultClientMinimum,
+            targetVersion: (0, _semverutils.getMaximumOfVersionsSafe)(minimumVersion, requestedVersion),
+            reason: `Client bundle release ${existingClientVersion} does not satisfy minimum version ${minimumVersion}, downloading new release`
+        };
+        if (!!requestedVersion) {
+            const minimumComparison = (0, _semver.compare)(requestedVersion, minimumVersion);
+            if (minimumComparison === -1) {
+                if (clientOutdated) return clientOutdatedResponse;
+                return {
+                    shouldUpdate: false,
+                    requestedVersion,
+                    currentVersion: existingClientVersion,
+                    minimumVersion: _serverconstants.AppConstants.defaultClientMinimum,
+                    targetVersion: requestedVersion,
+                    reason: `Requested version ${requestedVersion} is below minimum designed version ${minimumVersion}, skipping`
+                };
+            }
+            const newComparison = (0, _semver.compare)(requestedVersion, existingClientVersion);
+            const isDowngrade = newComparison === -1;
+            if (isDowngrade) {
+                if (!allowDowngrade && clientOutdated) return clientOutdatedResponse;
+                return {
+                    shouldUpdate: allowDowngrade,
+                    requestedVersion,
+                    currentVersion: existingClientVersion,
+                    minimumVersion: _serverconstants.AppConstants.defaultClientMinimum,
+                    targetVersion: requestedVersion,
+                    reason: allowDowngrade ? `Client bundle downgrade allowed (above ${minimumVersion}), downloading new release` : `Client bundle downgrade not allowed (even thought above ${minimumVersion}), skipping`
+                };
+            } else if (newComparison === 1) {
+                return {
+                    shouldUpdate: true,
+                    requestedVersion,
+                    currentVersion: existingClientVersion,
+                    minimumVersion: _serverconstants.AppConstants.defaultClientMinimum,
+                    targetVersion: (0, _semverutils.getMaximumOfVersionsSafe)(minimumVersion, requestedVersion),
+                    reason: `Client bundle release ${requestedVersion} is above existing version ${existingClientVersion}, downloading updated release`
+                };
+            }
+        }
+        if (!satisfiesMinimumVersion) {
+            return clientOutdatedResponse;
         }
         return {
-            shouldUpdate: true,
-            reason: `Client bundle release ${version} does not satisfy minimum version ${minimumVersion}, downloading new release`
+            shouldUpdate: false,
+            requestedVersion,
+            currentVersion: existingClientVersion,
+            minimumVersion: _serverconstants.AppConstants.defaultClientMinimum,
+            targetVersion: (0, _semverutils.getMaximumOfVersionsSafe)(minimumVersion, requestedVersion),
+            reason: `Client already satisfies minimum version ${minimumVersion} and requested version is not an upgrade, skipping`
         };
     }
     async downloadClientUpdate(releaseTag) {
@@ -91,6 +157,7 @@ class ClientBundleService {
         const assetId = asset.id;
         const downloadPath = await this.downloadClientBundleZip(assetId, asset.name);
         await this.extractClientBundleZip(downloadPath);
+        return release.tag_name;
     }
     async getClientBundleRelease(releaseTag) {
         const githubOwner = _serverconstants.AppConstants.orgName;
@@ -110,8 +177,8 @@ class ClientBundleService {
         return path;
     }
     async extractClientBundleZip(downloadedZipPath) {
-        const zip = new _admzip.default(downloadedZipPath);
         const distPath = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultClientBundleStorage);
+        const zip = new _admzip.default(downloadedZipPath);
         (0, _fsutils.ensureDirExists)(distPath);
         this.logger.debug(`Clearing contents of ${distPath}`);
         for (const fileOrDir of (await (0, _promises.readdir)(distPath))){

package/dist/services/core/client-bundle.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/client-bundle.service.ts"],"names":["ClientBundleService","githubService","configService","logger","constructor","loggerFactory","name","clientPackageJsonPath","join","superRootPath","AppConstants","defaultClientBundleStorage","clientIndexHtmlPath","getReleases","githubOwner","orgName","githubRepo","clientRepoName","result","latestResult","getLatestRelease","minimum","tag_name","defaultClientMinimum","current","getClientVersion","latest","data","releases","shouldUpdateWithReason","overrideAutoUpdate","minimumVersion","clientAutoUpdate","enableClientDistAutoUpdateKey","shouldUpdate","reason","version","doesClientIndexHtmlExist","satisfiesMinimumVersion","checkVersionSatisfiesMinimum","downloadClientUpdate","releaseTag","release","getClientBundleRelease","log","assets","length","map","a","asset","find","assetId","id","downloadPath","downloadClientBundleZip","extractClientBundleZip","getReleaseByTag","assetName","assetResult","requestAsset","dir","defaultClientBundleZipsStorage","ensureDirExists","path","writeFileSync","Buffer","from","downloadedZipPath","zip","AdmZip","distPath","debug","fileOrDir","readdir","rm","force","recursive","e","error","message","stack","extractAllTo","indexHtmlPath","existsSync","packageJsonPath","packageJsonFound","require","cache","undefined","json"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/client-bundle.service.ts"],"names":["ClientBundleService","githubService","configService","logger","constructor","loggerFactory","name","clientPackageJsonPath","join","superRootPath","AppConstants","defaultClientBundleStorage","clientIndexHtmlPath","getReleases","githubOwner","orgName","githubRepo","clientRepoName","result","latestResult","getLatestRelease","minimum","tag_name","defaultClientMinimum","current","getClientVersion","latest","data","releases","e","error","errorSummary","ExternalServiceError","shouldUpdateWithReason","overrideAutoUpdate","minimumVersion","requestedVersion","allowDowngrade","clientAutoUpdate","enableClientDistAutoUpdateKey","existingClientVersion","shouldUpdate","currentVersion","targetVersion","reason","getMaximumOfVersionsSafe","doesClientIndexHtmlExist","satisfiesMinimumVersion","checkVersionSatisfiesMinimum","clientOutdated","clientOutdatedResponse","minimumComparison","compare","newComparison","isDowngrade","downloadClientUpdate","releaseTag","release","getClientBundleRelease","log","assets","length","map","a","asset","find","assetId","id","downloadPath","downloadClientBundleZip","extractClientBundleZip","getReleaseByTag","assetName","assetResult","requestAsset","dir","defaultClientBundleZipsStorage","ensureDirExists","path","writeFileSync","Buffer","from","downloadedZipPath","distPath","zip","AdmZip","debug","fileOrDir","readdir","rm","force","recursive","message","stack","extractAllTo","indexHtmlPath","existsSync","packageJsonPath","packageJsonFound","require","cache","undefined","json","version"],"mappings":"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"}

package/dist/services/core/github.service.js

@@ -21,26 +21,30 @@ class GithubService {
         return result?.type === "token";
     }
     async getLatestRelease(owner, repo) {
-        return await this.octokitService.rest.repos.getLatestRelease({
-            owner,
-            repo
-        }).catch((e)=>{
-            if (e.name === "HttpError" && e.status == 404) {
-                throw new _runtimeexceptions.NotFoundException(`Could not retrieve latest release`);
+        try {
+            return await this.octokitService.rest.repos.getLatestRelease({
+                owner,
+                repo
+            });
+        } catch (e) {
+            if (e?.name === "HttpError" && e.status == 404) {
+                throw new _runtimeexceptions.NotFoundException(`Could not find latest release`);
             }
             throw e;
-        });
+        }
     }
     async getReleases(owner, repo) {
-        return await this.octokitService.rest.repos.listReleases({
-            owner,
-            repo
-        }).catch((e)=>{
-            if (e.name === "HttpError" && e.status == 404) {
-                throw new _runtimeexceptions.NotFoundException(`Could not retrieve releases`);
+        try {
+            return await this.octokitService.rest.repos.listReleases({
+                owner,
+                repo
+            });
+        } catch (e) {
+            if (e?.name === "HttpError" && e.status == 404) {
+                throw new _runtimeexceptions.NotFoundException(`Could not find releases`);
             }
             throw e;
-        });
+        }
     }
     async getReleaseByTag(owner, repo, tag) {
         return await this.octokitService.rest.repos.getReleaseByTag({

package/dist/services/core/github.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/github.service.ts"],"names":["GithubService","octokitService","logger","constructor","loggerFactory","name","wasAuthenticated","result","auth","type","getLatestRelease","owner","repo","rest","repos","catch","e","status","NotFoundException","getReleases","listReleases","getReleaseByTag","tag","requestAsset","assetId","request","headers","Accept","asset_id"],"mappings":";;;;+BAKaA;;;eAAAA;;;mCALqB;AAK3B,MAAMA;IACXC,eAAwB;IACxBC,OAAsB;IAEtBC,YAAY,EAAEC,aAAa,EAAEH,cAAc,EAA8D,CAAE;QACzG,IAAI,CAACC,MAAM,GAAGE,cAAcJ,cAAcK,IAAI,EAAE;QAChD,IAAI,CAACJ,cAAc,GAAGA;IACxB;IAEA,MAAMK,mBAAmB;QACvB,MAAMC,SAAS,MAAM,IAAI,CAACN,cAAc,CAACO,IAAI;QAC7C,OAAOD,QAAQE,SAAS;IAC1B;IAEA,MAAMC,iBAAiBC,KAAa,EAAEC,IAAY,EAAE;QAClD,OAAO,MAAM,IAAI,CAACX,cAAc,CAACY,IAAI,CAACC,KAAK,CACxCJ,gBAAgB,CAAC;YAChBC;YACAC;QACF,GACCG,KAAK,CAAC,CAACC;YACN,IAAIA,EAAEX,IAAI,KAAK,eAAeW,EAAEC,MAAM,IAAI,KAAK;gBAC7C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,iCAAiC,CAAC;YACjE;YAEA,MAAMF;QACR;IACJ;IAEA,MAAMG,YAAYR,KAAa,EAAEC,IAAY,EAAE;QAC7C,OAAO,MAAM,IAAI,CAACX,cAAc,CAACY,IAAI,CAACC,KAAK,CACxCM,YAAY,CAAC;YACZT;YACAC;QACF,GACCG,KAAK,CAAC,CAACC;YACN,IAAIA,EAAEX,IAAI,KAAK,eAAeW,EAAEC,MAAM,IAAI,KAAK;gBAC7C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,2BAA2B,CAAC;YAC3D;YAEA,MAAMF;QACR;IACJ;IAEA,MAAMK,gBAAgBV,KAAa,EAAEC,IAAY,EAAEU,GAAW,EAAE;QAC9D,OAAO,MAAM,IAAI,CAACrB,cAAc,CAACY,IAAI,CAACC,KAAK,CACxCO,eAAe,CAAC;YACfV;YACAC;YACAU;QACF,GACCP,KAAK,CAAC,CAACC;YACN,IAAIA,EAAEX,IAAI,KAAK,eAAeW,EAAEC,MAAM,IAAI,KAAK;gBAC7C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,gCAAgC,EAAEI,IAAI,CAAC;YACtE;YAEA,MAAMN;QACR;IACJ;IAEA,MAAMO,aAAaZ,KAAa,EAAEC,IAAY,EAAEY,OAAY,EAAE;QAC5D,OAAO,MAAM,IAAI,CAACvB,cAAc,CAC7BwB,OAAO,CAAC,qDAAqD;YAC5DC,SAAS;gBACPC,QAAQ;YACV;YACAhB;YACAC;YACAgB,UAAUJ;QACZ,GACCT,KAAK,CAAC,CAACC;YACN,IAAIA,EAAEX,IAAI,KAAK,eAAeW,EAAEC,MAAM,IAAI,KAAK;gBAC7C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,6BAA6B,EAAEM,QAAQ,CAAC;YACvE;YAEA,MAAMR;QACR;IACJ;AACF"}
+{"version":3,"sources":["../../../src/services/core/github.service.ts"],"names":["GithubService","octokitService","logger","constructor","loggerFactory","name","wasAuthenticated","result","auth","type","getLatestRelease","owner","repo","rest","repos","e","status","NotFoundException","getReleases","listReleases","getReleaseByTag","tag","catch","requestAsset","assetId","request","headers","Accept","asset_id"],"mappings":";;;;+BAMaA;;;eAAAA;;;mCANqB;AAM3B,MAAMA;IACXC,eAAwB;IACxBC,OAAsB;IAEtBC,YAAY,EAAEC,aAAa,EAAEH,cAAc,EAA8D,CAAE;QACzG,IAAI,CAACC,MAAM,GAAGE,cAAcJ,cAAcK,IAAI,EAAE;QAChD,IAAI,CAACJ,cAAc,GAAGA;IACxB;IAEA,MAAMK,mBAAmB;QACvB,MAAMC,SAAS,MAAM,IAAI,CAACN,cAAc,CAACO,IAAI;QAC7C,OAAOD,QAAQE,SAAS;IAC1B;IAEA,MAAMC,iBAAiBC,KAAa,EAAEC,IAAY,EAAE;QAClD,IAAI;YACF,OAAO,MAAM,IAAI,CAACX,cAAc,CAACY,IAAI,CAACC,KAAK,CAACJ,gBAAgB,CAAC;gBAC3DC;gBACAC;YACF;QACF,EAAE,OAAOG,GAAG;YACV,IAAIA,GAAGV,SAAS,eAAeU,EAAEC,MAAM,IAAI,KAAK;gBAC9C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,6BAA6B,CAAC;YAC7D;YAEA,MAAMF;QACR;IACF;IAEA,MAAMG,YAAYP,KAAa,EAAEC,IAAY,EAAE;QAC7C,IAAI;YACF,OAAO,MAAM,IAAI,CAACX,cAAc,CAACY,IAAI,CAACC,KAAK,CAACK,YAAY,CAAC;gBACvDR;gBACAC;YACF;QACF,EAAE,OAAOG,GAAG;YACV,IAAIA,GAAGV,SAAS,eAAeU,EAAEC,MAAM,IAAI,KAAK;gBAC9C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,uBAAuB,CAAC;YACvD;YAEA,MAAMF;QACR;IACF;IAEA,MAAMK,gBAAgBT,KAAa,EAAEC,IAAY,EAAES,GAAW,EAAE;QAC9D,OAAO,MAAM,IAAI,CAACpB,cAAc,CAACY,IAAI,CAACC,KAAK,CACxCM,eAAe,CAAC;YACfT;YACAC;YACAS;QACF,GACCC,KAAK,CAAC,CAACP;YACN,IAAIA,EAAEV,IAAI,KAAK,eAAeU,EAAEC,MAAM,IAAI,KAAK;gBAC7C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,gCAAgC,EAAEI,IAAI,CAAC;YACtE;YAEA,MAAMN;QACR;IACJ;IAEA,MAAMQ,aAAaZ,KAAa,EAAEC,IAAY,EAAEY,OAAY,EAAE;QAC5D,OAAO,MAAM,IAAI,CAACvB,cAAc,CAC7BwB,OAAO,CAAC,qDAAqD;YAC5DC,SAAS;gBACPC,QAAQ;YACV;YACAhB;YACAC;YACAgB,UAAUJ;QACZ,GACCF,KAAK,CAAC,CAACP;YACN,IAAIA,EAAEV,IAAI,KAAK,eAAeU,EAAEC,MAAM,IAAI,KAAK;gBAC7C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,6BAA6B,EAAEO,QAAQ,CAAC;YACvE;YAEA,MAAMT;QACR;IACJ;AACF"}

package/dist/services/core/task-manager.service.js

@@ -122,7 +122,7 @@ class TaskManagerService {
     }
     runTimeoutTaskInstance(taskId, timeoutMs) {
         const taskState = this.getTaskState(taskId);
-        this.logger.log(`Running delayed task ${taskId} in ${timeoutMs}ms`);
+        this.logger.log(`Running delayed task '${taskId}' in ${timeoutMs}ms`);
         setTimeout(()=>taskState.timedTask.execute(), timeoutMs, taskId);
     }
     getSafeTimedTask(taskId, handler) {

package/dist/services/core/task-manager.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/task-manager.service.ts"],"names":["TaskManagerService","jobScheduler","taskStates","cradle","logger","constructor","container","DITokens","loggerFactory","name","toadScheduler","validateInput","taskId","workload","schedulerOptions","JobValidationException","prefix","resolvedService","e","AwilixResolutionError","stack","run","periodic","runOnce","runDelayed","disabled","milliseconds","seconds","minutes","hours","days","registerJobOrTask","id","task","asyncTaskCallbackOrToken","preset","error","timedTask","getSafeTimedTask","options","execute","delay","runTimeoutTaskInstance","scheduleEnabledPeriodicJob","scheduleDisabledJob","failIfEnabled","taskState","getTaskState","disableJob","failIfDisabled","isTaskDisabled","job","stop","deregisterTask","removeById","timeoutMs","log","setTimeout","handler","asyncHandler","timeTask","AsyncTask","getErrorHandler","started","Date","now","taskService","duration","logFirstCompletion","firstCompletion","registration","lastError","erroredlastError","time","stopSchedulerTasks","runImmediately","SimpleIntervalJob","addSimpleIntervalJob"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/task-manager.service.ts"],"names":["TaskManagerService","jobScheduler","taskStates","cradle","logger","constructor","container","DITokens","loggerFactory","name","toadScheduler","validateInput","taskId","workload","schedulerOptions","JobValidationException","prefix","resolvedService","e","AwilixResolutionError","stack","run","periodic","runOnce","runDelayed","disabled","milliseconds","seconds","minutes","hours","days","registerJobOrTask","id","task","asyncTaskCallbackOrToken","preset","error","timedTask","getSafeTimedTask","options","execute","delay","runTimeoutTaskInstance","scheduleEnabledPeriodicJob","scheduleDisabledJob","failIfEnabled","taskState","getTaskState","disableJob","failIfDisabled","isTaskDisabled","job","stop","deregisterTask","removeById","timeoutMs","log","setTimeout","handler","asyncHandler","timeTask","AsyncTask","getErrorHandler","started","Date","now","taskService","duration","logFirstCompletion","firstCompletion","registration","lastError","erroredlastError","time","stopSchedulerTasks","runImmediately","SimpleIntervalJob","addSimpleIntervalJob"],"mappings":"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"}