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

package/dist/state/printer-events.cache.js

@@ -23,7 +23,7 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
         this.subscribeToEvents();
     }
     get _debugMode() {
-        return this.settingsStore.getServerSettings().debugSettings?.debugSocketMessages;
+        return this.settingsStore.getSettingsSensitive()?.server?.debugSettings?.debugSocketMessages;
     }
     async getPrinterSocketEvents(id) {
         return this.keyValueStore[id];
@@ -32,6 +32,9 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
         let ref = await this.getValue(printerId);
         if (!ref) {
             ref = {
+                connected: null,
+                reauthRequired: null,
+                slicingProgress: null,
                 current: null,
                 history: null,
                 timelapse: null,
@@ -42,7 +45,7 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
         }
         return ref;
     }
-    async setEvent(printerId, label, eventName, payload) {
+    async setEvent(printerId, label, payload) {
         const ref = await this.getOrCreateEvents(printerId);
         ref[label] = {
             payload,
@@ -50,9 +53,12 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
         };
         await this.setKeyValue(printerId, ref);
     }
-    async setSubEvent(printerId, label, eventName, payload) {
+    async setSubstate(printerId, label, substateName, payload) {
         const ref = await this.getOrCreateEvents(printerId);
-        ref[label][eventName] = {
+        if (!ref[label]) {
+            ref[label] = {};
+        }
+        ref[label][substateName] = {
             payload,
             receivedAt: Date.now()
         };
@@ -68,15 +74,15 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
     async onPrinterSocketMessage(e) {
         const printerId = e.printerId;
         if (e.event !== "plugin" && e.event !== "event") {
-            await this.setEvent(printerId, e.event, null, e.event === "history" ? this.pruneHistoryPayload(e.payload) : e.payload);
+            await this.setEvent(printerId, e.event, e.event === "history" ? this.pruneHistoryPayload(e.payload) : e.payload);
             if (this._debugMode) {
                 this.logger.log(`Message '${e.event}' received, size ${(0, _metricutils.formatKB)(e.payload)}`, e.printerId);
             }
         } else if (e.event === "plugin") {
-            await this.setSubEvent(printerId, "plugin", e.payload.plugin, e.payload);
+            await this.setSubstate(printerId, "plugin", e.payload.plugin, e.payload);
         } else if (e.event === "event") {
             const eventType = e.payload.type;
-            await this.setSubEvent(printerId, "event", eventType, e.payload.payload);
+            await this.setSubstate(printerId, "event", eventType, e.payload.payload);
             if (this._debugMode) {
                 this.logger.log(`Event '${eventType}' received`, e.printerId);
             }

package/dist/state/printer-events.cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer-events.cache.ts"],"names":["PrinterEventsCache","KeyDiffCache","logger","eventEmitter2","settingsStore","constructor","loggerFactory","name","subscribeToEvents","_debugMode","getServerSettings","debugSettings","debugSocketMessages","getPrinterSocketEvents","id","keyValueStore","getOrCreateEvents","printerId","ref","getValue","current","history","timelapse","event","plugin","setKeyValue","setEvent","label","eventName","payload","receivedAt","Date","now","setSubEvent","handlePrintersDeleted","printerIds","deleteKeysBatch","on","e","onPrinterSocketMessage","printerEvents","printersDeleted","bind","pruneHistoryPayload","log","formatKB","eventType","type","logs","temps","messages"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer-events.cache.ts"],"names":["PrinterEventsCache","KeyDiffCache","logger","eventEmitter2","settingsStore","constructor","loggerFactory","name","subscribeToEvents","_debugMode","getSettingsSensitive","server","debugSettings","debugSocketMessages","getPrinterSocketEvents","id","keyValueStore","getOrCreateEvents","printerId","ref","getValue","connected","reauthRequired","slicingProgress","current","history","timelapse","event","plugin","setKeyValue","setEvent","label","payload","receivedAt","Date","now","setSubstate","substateName","handlePrintersDeleted","printerIds","deleteKeysBatch","on","e","onPrinterSocketMessage","printerEvents","printersDeleted","bind","pruneHistoryPayload","log","formatKB","eventType","type","logs","temps","messages"],"mappings":"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"}

package/dist/state/printer-files.store.js

@@ -36,10 +36,9 @@ class PrinterFilesStore {
     }
     async eagerLoadPrinterFiles(printerId, recursive) {
         const loginDto = await this.printerCache.getLoginDtoAsync(printerId);
-        const response = await this.octoPrintApiService.getLocalFiles(loginDto, recursive);
-        const files = response?.files;
-        await this.updatePrinterFiles(printerId, files);
-        return files;
+        const normalizedFiles = await this.octoPrintApiService.getLocalFiles(loginDto, recursive);
+        await this.updatePrinterFiles(printerId, normalizedFiles);
+        return normalizedFiles;
     }
     getFiles(printerId) {
         return this.fileCache.getPrinterFiles(printerId);

package/dist/state/printer-files.store.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer-files.store.ts"],"names":["PrinterFilesStore","printerCache","printerFilesService","fileCache","octoPrintApiService","logger","constructor","loggerFactory","name","loadFilesStore","printers","listCachedPrinters","printer","printerFiles","getPrinterFiles","id","cachePrinterFiles","e","error","errorSummary","eagerLoadPrinterFiles","printerId","recursive","loginDto","getLoginDtoAsync","response","getLocalFiles","files","updatePrinterFiles","getFiles","getOutdatedFiles","ageDaysMax","ValidationException","length","nowTimestampSeconds","Date","now","filter","file","date","deleteOutdatedFiles","failedFiles","succeededFiles","nonRecursiveFiles","printerLogin","getCachedPrinterOrThrowAsync","deleteFileOrFolder","path","push","log","purgePrinterFiles","printerState","clearFiles","purgePrinterId","purgeFiles","allPrinters","printerFileList","updateFiles","appendOrSetPrinterFile","addedFile","appendOrReplaceFile","deleteFile","filePath","throwError","serviceActionResult","deletePrinterFiles","purgeFile","service"],"mappings":";;;;+BAWaA;;;eAAAA;;;mCAXuB;4BAQP;AAGtB,MAAMA;IACXC,aAA2B;IAC3BC,oBAA0C;IAC1CC,UAAqB;IACrBC,oBAAyC;IACjCC,OAAsB;IAE9BC,YAAY,EACVL,YAAY,EACZC,mBAAmB,EACnBC,SAAS,EACTC,mBAAmB,EACnBG,aAAa,EAOd,CAAE;QACD,IAAI,CAACN,YAAY,GAAGA;QACpB,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACC,SAAS,GAAGA;QACjB,IAAI,CAACC,mBAAmB,GAAGA;QAE3B,IAAI,CAACC,MAAM,GAAGE,cAAcP,kBAAkBQ,IAAI;IACpD;IAEA,MAAMC,iBAAgC;QACpC,MAAMC,WAAW,MAAM,IAAI,CAACT,YAAY,CAACU,kBAAkB,CAAC;QAC5D,KAAK,IAAIC,WAAWF,SAAU;YAC5B,IAAI;gBACF,MAAMG,eAAe,MAAM,IAAI,CAACX,mBAAmB,CAACY,eAAe,CAACF,QAAQG,EAAE;gBAC9E,IAAI,CAACZ,SAAS,CAACa,iBAAiB,CAACJ,QAAQG,EAAE,EAAEF;YAC/C,EAAE,OAAOI,GAAG;gBACV,IAAI,CAACZ,MAAM,CAACa,KAAK,CAAC,0DAA0DC,IAAAA,wBAAY,EAACF;YAC3F;QACF;IACF;IAEA,MAAMG,sBAAsBC,SAAiB,EAAEC,SAAkB,EAAgB;QAC/E,MAAMC,WAAW,MAAM,IAAI,CAACtB,YAAY,CAACuB,gBAAgB,CAACH;QAC1D,MAAMI,WAAW,MAAM,IAAI,CAACrB,mBAAmB,CAACsB,aAAa,CAACH,UAAUD;QAExE,MAAMK,QAAQF,UAAUE;QACxB,MAAM,IAAI,CAACC,kBAAkB,CAACP,WAAWM;QACzC,OAAOA;IACT;IAEAE,SAASR,SAAiB,EAAE;QAE1B,OAAO,IAAI,CAAClB,SAAS,CAACW,eAAe,CAACO;IACxC;IAEAS,iBAAiBT,SAAiB,EAAEU,UAAkB,EAAE;QACtD,IAAI,CAACA,YAAY,MAAM,IAAIC,sCAAmB,CAAC;QAC/C,MAAMnB,eAAe,IAAI,CAACgB,QAAQ,CAACR;QACnC,IAAI,CAACR,cAAcoB,QAAQ,OAAO,EAAE;QACpC,MAAMC,sBAAsBC,KAAKC,GAAG,KAAK;QACzC,OAAOvB,aAAawB,MAAM,CAAC,CAACC,OAAS,CAAC,CAACA,KAAKC,IAAI,IAAID,KAAKC,IAAI,GAAGR,aAAa,QAAQG;IACvF;IAEA,MAAMM,oBAAoBnB,SAAiB,EAAEU,UAAkB,EAAE;QAC/D,MAAMU,cAAc,EAAE;QACtB,MAAMC,iBAAiB,EAAE;QAEzB,MAAMC,oBAAoB,IAAI,CAACb,gBAAgB,CAACT,WAAWU;QAC3D,MAAMa,eAAe,MAAM,IAAI,CAAC3C,YAAY,CAACuB,gBAAgB,CAACH;QAC9D,MAAMb,OAAO,AAAC,CAAA,MAAM,IAAI,CAACP,YAAY,CAAC4C,4BAA4B,CAACxB,UAAS,EAAGb,IAAI;QAEnF,KAAK,IAAI8B,QAAQK,kBAAmB;YAClC,IAAI;gBACF,MAAM,IAAI,CAACvC,mBAAmB,CAAC0C,kBAAkB,CAACF,cAAcN,KAAKS,IAAI;gBACzEL,eAAeM,IAAI,CAACV;YACtB,EAAE,OAAOrB,GAAG;gBACVwB,YAAYO,IAAI,CAACV;YACnB;QACF;QAEA,IAAI,CAACjC,MAAM,CAAC4C,GAAG,CAAC,CAAC,QAAQ,EAAEP,eAAeT,MAAM,CAAC,kBAAkB,EAAEQ,YAAYR,MAAM,CAAC,0BAA0B,EAAEzB,KAAK,CAAC,CAAC;QAC3H,OAAO;YACLiC;YACAC;QACF;IACF;IAEA,MAAMQ,kBAAkB7B,SAAiB,EAAE;QACzC,MAAM8B,eAAe,MAAM,IAAI,CAAClD,YAAY,CAAC4C,4BAA4B,CAACxB;QAE1E,IAAI,CAAChB,MAAM,CAAC4C,GAAG,CAAC,CAAC,2BAA2B,EAAE5B,UAAU,CAAC;QACzD,MAAM,IAAI,CAACnB,mBAAmB,CAACkD,UAAU,CAACD,aAAapC,EAAE;QAEzD,IAAI,CAACV,MAAM,CAAC4C,GAAG,CAAC,CAAC,gCAAgC,EAAE5B,UAAU,CAAC;QAC9D,IAAI,CAAClB,SAAS,CAACkD,cAAc,CAACF,aAAapC,EAAE;QAE7C,IAAI,CAACV,MAAM,CAAC4C,GAAG,CAAC,CAAC,kCAAkC,CAAC;IACtD;IAEA,MAAMK,aAAa;QACjB,MAAMC,cAAc,MAAM,IAAI,CAACtD,YAAY,CAACU,kBAAkB;QAE9D,IAAI,CAACN,MAAM,CAAC4C,GAAG,CAAC,CAAC,mBAAmB,EAAEM,YAAYtB,MAAM,CAAC,SAAS,CAAC;QACnE,KAAK,IAAIrB,WAAW2C,YAAa;YAC/B,MAAM,IAAI,CAACrD,mBAAmB,CAACkD,UAAU,CAACxC,QAAQG,EAAE;QACtD;QAEA,IAAI,CAACV,MAAM,CAAC4C,GAAG,CAAC,CAAC,mCAAmC,CAAC;QACrD,KAAK,IAAIrC,WAAW2C,YAAa;YAC/B,IAAI,CAACpD,SAAS,CAACkD,cAAc,CAACzC,QAAQG,EAAE;QAC1C;QACA,IAAI,CAACV,MAAM,CAAC4C,GAAG,CAAC,CAAC,2BAA2B,CAAC;IAC/C;IAEA,MAAMrB,mBAAmBP,SAAiB,EAAEM,KAAuB,EAAE;QACnE,MAAMf,UAAU,MAAM,IAAI,CAACX,YAAY,CAAC4C,4BAA4B,CAACxB;QACrE,MAAMmC,kBAAkB,MAAM,IAAI,CAACtD,mBAAmB,CAACuD,WAAW,CAAC7C,QAAQG,EAAE,EAAEY;QAC/E,MAAM,IAAI,CAACxB,SAAS,CAACa,iBAAiB,CAACJ,QAAQG,EAAE,EAAEyC;IACrD;IAEA,MAAME,uBAAuBrC,SAAiB,EAAEsC,SAAyB,EAAE;QACzE,MAAM/C,UAAU,MAAM,IAAI,CAACX,YAAY,CAAC4C,4BAA4B,CAACxB;QAGrE,MAAMM,QAAQ,MAAM,IAAI,CAACzB,mBAAmB,CAAC0D,mBAAmB,CAAChD,QAAQG,EAAE,EAAE4C;QAC7E,MAAM,IAAI,CAACxD,SAAS,CAACa,iBAAiB,CAACJ,QAAQG,EAAE,EAAEY;IACrD;IAEA,MAAMkC,WACJxC,SAAiB,EACjByC,QAAgB,EAChBC,UAAmB,EAGlB;QACD,MAAMC,sBAAsB,MAAM,IAAI,CAAC9D,mBAAmB,CAAC+D,kBAAkB,CAAC5C,WAAW;YAACyC;SAAS,EAAEC;QAGrG,IAAI,CAAC5D,SAAS,CAAC+D,SAAS,CAAC7C,WAAWyC;QACpC,OAAO;YAAEK,SAASH;QAAoB;IACxC;AACF"}
+{"version":3,"sources":["../../src/state/printer-files.store.ts"],"names":["PrinterFilesStore","printerCache","printerFilesService","fileCache","octoPrintApiService","logger","constructor","loggerFactory","name","loadFilesStore","printers","listCachedPrinters","printer","printerFiles","getPrinterFiles","id","cachePrinterFiles","e","error","errorSummary","eagerLoadPrinterFiles","printerId","recursive","loginDto","getLoginDtoAsync","normalizedFiles","getLocalFiles","updatePrinterFiles","getFiles","getOutdatedFiles","ageDaysMax","ValidationException","length","nowTimestampSeconds","Date","now","filter","file","date","deleteOutdatedFiles","failedFiles","succeededFiles","nonRecursiveFiles","printerLogin","getCachedPrinterOrThrowAsync","deleteFileOrFolder","path","push","log","purgePrinterFiles","printerState","clearFiles","purgePrinterId","purgeFiles","allPrinters","files","printerFileList","updateFiles","appendOrSetPrinterFile","addedFile","appendOrReplaceFile","deleteFile","filePath","throwError","serviceActionResult","deletePrinterFiles","purgeFile","service"],"mappings":"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"}

package/dist/state/printer-socket.store.js

@@ -84,7 +84,7 @@ class PrinterSocketStore {
                     promisesReauth.push(promise);
                 }
             } catch (e) {
-                if (this.settingsStore.getServerSettings().debugSettings?.debugSocketSetup) {
+                if (this.settingsStore.getDebugSettingsSensitive()?.debugSocketSetup) {
                     this.logger.log("Failed to reauth printer socket", (0, _errorutils.errorSummary)(e));
                 }
                 (0, _node.captureException)(e);
@@ -96,7 +96,7 @@ class PrinterSocketStore {
         for (const socket of Object.values(this.printerSocketAdaptersById)){
             try {
                 if (socket.needsSetup() || socket.needsReopen()) {
-                    if (this.settingsStore.getServerSettings().debugSettings?.debugSocketSetup) {
+                    if (this.settingsStore.getDebugSettingsSensitive()?.debugSocketSetup) {
                         this.logger.log(`Reopening socket for printerId '${socket.printerId}' (setup: ${socket.needsSetup()}, reopen: ${socket.needsReopen()})`);
                     }
                     socketSetupRequested++;
@@ -108,7 +108,7 @@ class PrinterSocketStore {
                     promisesOpenSocket.push(promise);
                 }
             } catch (e) {
-                if (this.settingsStore.getServerSettings().debugSettings?.debugSocketSetup) {
+                if (this.settingsStore.getDebugSettingsSensitive()?.debugSocketSetup) {
                     this.logger.log(`Failed to setup printer socket ${(0, _errorutils.errorSummary)(e)}`);
                 }
                 (0, _node.captureException)(e);

package/dist/state/printer-socket.store.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer-socket.store.ts"],"names":["PrinterSocketStore","socketIoGateway","socketFactory","eventEmitter2","printerCache","printerSocketAdaptersById","logger","configService","settingsStore","constructor","loggerFactory","name","subscribeToEvents","getSocketStatesById","socketStatesById","Object","values","forEach","s","printerId","socket","socketState","api","apiState","loadPrinterSockets","loadCache","printerDocs","listCachedPrinters","doc","handlePrinterCreated","printer","e","error","errorSummary","log","keys","length","listPrinterSockets","reconnectOctoPrint","id","getPrinterSocket","close","resetSocketState","reconnectPrinterSockets","reauthRequested","socketSetupRequested","socketStates","apiStates","promisesReauth","failedSocketsReauth","needsReauth","promise","reauthSession","catch","_","push","getServerSettings","debugSettings","debugSocketSetup","captureException","Promise","all","promisesOpenSocket","failedSocketReopened","needsSetup","needsReopen","setupSocketSession","then","open","keySocket","valSocket","keyApi","valApi","reauth","socketSetup","handleBatchPrinterCreated","printers","p","createOrUpdateSocket","handlePrinterUpdated","enabled","foundAdapter","toString","deleteSocket","createInstance","registerCredentials","loginDto","apiKey","printerURL","protocol","handlePrintersDeleted","printerIds","on","printerEvents","printerCreated","bind","printersDeleted","printerUpdated","batchPrinterCreated"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer-socket.store.ts"],"names":["PrinterSocketStore","socketIoGateway","socketFactory","eventEmitter2","printerCache","printerSocketAdaptersById","logger","configService","settingsStore","constructor","loggerFactory","name","subscribeToEvents","getSocketStatesById","socketStatesById","Object","values","forEach","s","printerId","socket","socketState","api","apiState","loadPrinterSockets","loadCache","printerDocs","listCachedPrinters","doc","handlePrinterCreated","printer","e","error","errorSummary","log","keys","length","listPrinterSockets","reconnectOctoPrint","id","getPrinterSocket","close","resetSocketState","reconnectPrinterSockets","reauthRequested","socketSetupRequested","socketStates","apiStates","promisesReauth","failedSocketsReauth","needsReauth","promise","reauthSession","catch","_","push","getDebugSettingsSensitive","debugSocketSetup","captureException","Promise","all","promisesOpenSocket","failedSocketReopened","needsSetup","needsReopen","setupSocketSession","then","open","keySocket","valSocket","keyApi","valApi","reauth","socketSetup","handleBatchPrinterCreated","printers","p","createOrUpdateSocket","handlePrinterUpdated","enabled","foundAdapter","toString","deleteSocket","createInstance","registerCredentials","loginDto","apiKey","printerURL","protocol","handlePrintersDeleted","printerIds","on","printerEvents","printerCreated","bind","printersDeleted","printerUpdated","batchPrinterCreated"],"mappings":"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"}

package/dist/state/printer.cache.js

@@ -33,6 +33,9 @@ class PrinterCache extends _keydiffcache.KeyDiffCache {
         await this.setKeyValuesBatch(keyValues, true);
         return dtos;
     }
+    async countDisabledPrinters() {
+        return (await this.getAllValues()).filter((p)=>!p.enabled).length;
+    }
     async listCachedPrinters(includeDisabled = false) {
         const printers = await this.getAllValues();
         if (!includeDisabled) {

package/dist/state/printer.cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer.cache.ts"],"names":["PrinterCache","KeyDiffCache","printerService","eventEmitter2","constructor","on","printerEvents","batchPrinterCreated","handleBatchPrinterCreated","bind","printerCreated","handlePrinterCreatedOrUpdated","printerUpdated","printersDeleted","handlePrintersDeleted","loadCache","printerDocs","list","dtos","mapArray","keyValues","map","p","key","getId","value","setKeyValuesBatch","listCachedPrinters","includeDisabled","printers","getAllValues","filter","enabled","getCachedPrinterOrThrowAsync","id","printer","getValue","NotFoundException","getCachedPrinterOrThrow","keyValueStore","getNameAsync","name","getName","getLoginDtoAsync","printerURL","apiKey","getLoginDto","mappedPrinters","printerDto","setKeyValue","printerIds","deleteKeysBatch","toString","entities","entity","toUnsafeDto"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer.cache.ts"],"names":["PrinterCache","KeyDiffCache","printerService","eventEmitter2","constructor","on","printerEvents","batchPrinterCreated","handleBatchPrinterCreated","bind","printerCreated","handlePrinterCreatedOrUpdated","printerUpdated","printersDeleted","handlePrintersDeleted","loadCache","printerDocs","list","dtos","mapArray","keyValues","map","p","key","getId","value","setKeyValuesBatch","countDisabledPrinters","getAllValues","filter","enabled","length","listCachedPrinters","includeDisabled","printers","getCachedPrinterOrThrowAsync","id","printer","getValue","NotFoundException","getCachedPrinterOrThrow","keyValueStore","getNameAsync","name","getName","getLoginDtoAsync","printerURL","apiKey","getLoginDto","mappedPrinters","printerDto","setKeyValue","printerIds","deleteKeysBatch","toString","entities","entity","toUnsafeDto"],"mappings":"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"}

package/dist/state/settings.store.js

@@ -52,6 +52,9 @@ class SettingsStore {
             }
         });
     }
+    getDebugSettingsSensitive() {
+        return this.getSettingsSensitive()[_serversettingsconstants.serverSettingsKey].debugSettings;
+    }
     async loadSettings() {
         this.settings = await this.settingsService.getOrCreate();
         await this.processSentryEnabled();

package/dist/state/settings.store.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","settingsService","logger","settings","constructor","loggerFactory","name","getSettings","InternalServerException","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","debugSettings","whitelistEnabled","whitelistedIpAddresses","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","updateCredentialSettings","jwtSecret","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","getServerSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","patchWizardSettings","wizardCompletedAt","Date","setRegistrationEnabled","patchServerSettings","getLoginRequired","setLoginRequired","setWhitelist","updateServerSettings","serverSettings","updateTimeoutSettings","timeoutSettings","patchFileCleanSettings","fileClean","credentialSettings","patchCredentialSettings","setSentryDiagnosticsEnabled","updateFrontendSettings","frontendSettings","sentryEnabled","log","isTestEnvironment","client","getCurrentHub","getClient","warn","getOptions","enabled"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","settingsService","logger","settings","constructor","loggerFactory","name","getSettings","InternalServerException","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","debugSettings","whitelistEnabled","whitelistedIpAddresses","getDebugSettingsSensitive","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","updateCredentialSettings","jwtSecret","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","getServerSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","patchWizardSettings","wizardCompletedAt","Date","setRegistrationEnabled","patchServerSettings","getLoginRequired","setLoginRequired","setWhitelist","updateServerSettings","serverSettings","updateTimeoutSettings","timeoutSettings","patchFileCleanSettings","fileClean","credentialSettings","patchCredentialSettings","setSentryDiagnosticsEnabled","updateFrontendSettings","frontendSettings","sentryEnabled","log","isTestEnvironment","client","getCurrentHub","getClient","warn","getOptions","enabled"],"mappings":"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"}

package/dist/state/test-printer-socket.store.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "TestPrinterSocketStore", {
         return TestPrinterSocketStore;
     }
 });
-const _promises = require("timers/promises");
+const _promises = require("node:timers/promises");
 const _validators = require("../handlers/validators");
 const _createtestprintervalidation = require("./validation/create-test-printer.validation");
 const _octoprintsockioadapter = require("../services/octoprint/octoprint-sockio.adapter");

package/dist/task.presets.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/task.presets.ts"],"names":["TASK_PRESETS","PERIODIC","periodic","logFirstCompletion","runImmediately","PERIODIC_DISABLED","disabled","PERIODIC_2500MS","milliseconds","RUNONCE","runOnce","RUNDELAYED","runDelayed","seconds"],"mappings":";;;;+BAYaA;;;eAAAA;;;AAAN,MAAMA;IACX,OAAOC,WAAW;QAChBC,UAAU;QACVC,oBAAoB;QACpBC,gBAAgB;IAClB,EAAE;IAEF,OAAOC,oBAAoB;QACzB,GAAG,IAAI,CAACJ,QAAQ;QAChBG,gBAAgB;QAChBE,UAAU;IACZ,EAAE;IAEF,OAAOC,kBAAkB;QACvB,GAAG,IAAI,CAACN,QAAQ;QAChBO,cAAc;IAChB,EAAE;IAEF,OAAOC,UAAU;QACfC,SAAS;QACTP,oBAAoB;QACpBC,gBAAgB;IAClB,EAAE;IAEF,OAAOO,aAAa;QAClBC,YAAY;QACZT,oBAAoB;QACpBC,gBAAgB;QAChBS,SAAS;IACX,EAAE;AACJ"}
+{"version":3,"sources":["../src/task.presets.ts"],"names":["TASK_PRESETS","PERIODIC","periodic","logFirstCompletion","runImmediately","PERIODIC_DISABLED","disabled","PERIODIC_2500MS","milliseconds","RUNONCE","runOnce","RUNDELAYED","runDelayed","seconds"],"mappings":";;;;+BAuBaA;;;eAAAA;;;AAAN,MAAMA;IACX,OAAOC,WAAyB;QAC9BC,UAAU;QACVC,oBAAoB;QACpBC,gBAAgB;IAClB,EAAE;IAEF,OAAOC,oBAAkC;QACvC,GAAG,IAAI,CAACJ,QAAQ;QAChBG,gBAAgB;QAChBE,UAAU;IACZ,EAAE;IAEF,OAAOC,kBAAgC;QACrC,GAAG,IAAI,CAACN,QAAQ;QAChBO,cAAc;IAChB,EAAE;IAEF,OAAOC,UAAwB;QAC7BC,SAAS;QACTP,oBAAoB;QACpBC,gBAAgB;IAClB,EAAE;IAEF,OAAOO,aAA2B;QAChCC,YAAY;QACZT,oBAAoB;QACpBC,gBAAgB;QAChBS,SAAS;IACX,EAAE;AACJ"}

package/dist/tasks/boot.task.js

@@ -70,7 +70,10 @@ class BootTask {
     pluginFirmwareUpdateService;
     clientBundleService;
     configService;
-    constructor({ loggerFactory, serverTasks, settingsService, settingsStore, multerService, printerSocketStore, printerFilesStore, permissionService, roleService, userService, taskManagerService, pluginRepositoryCache, floorStore, pluginFirmwareUpdateService, clientBundleService, configService }){
+    isTypeormMode;
+    typeormService;
+    constructor({ loggerFactory, serverTasks, settingsService, settingsStore, multerService, printerSocketStore, printerFilesStore, permissionService, roleService, userService, taskManagerService, pluginRepositoryCache, floorStore, pluginFirmwareUpdateService, clientBundleService, configService, typeormService, isTypeormMode }){
+        this.isTypeormMode = isTypeormMode;
         this.logger = loggerFactory(BootTask.name);
         this.serverTasks = serverTasks;
         this.settingsService = settingsService;
@@ -87,6 +90,7 @@ class BootTask {
         this.pluginFirmwareUpdateService = pluginFirmwareUpdateService;
         this.clientBundleService = clientBundleService;
         this.configService = configService;
+        this.typeormService = typeormService;
     }
     async runOnce() {
         this.taskManagerService.registerJobOrTask(this.serverTasks.SERVER_BOOT_TASK);
@@ -94,19 +98,23 @@ class BootTask {
         await this.run();
     }
     async run() {
-        try {
-            await this.createConnection();
-            await this.migrateDatabase();
-        } catch (e) {
-            if (e instanceof _mongoose.default.Error) {
-                if (!e.message.includes("Can't call `openUri()` on an active connection with different connection strings.")) {
-                    if (e.message.includes("ECONNREFUSED")) {
-                        this.logger.error("Database connection timed-out. Retrying in 5000.");
-                    } else {
-                        this.logger.error(`Database connection error: ${e.message}`);
+        if (this.isTypeormMode) {
+            await this.typeormService.createConnection();
+        } else {
+            try {
+                await this.createConnection();
+                await this.migrateDatabase();
+            } catch (e) {
+                if (e instanceof _mongoose.default.Error) {
+                    if (!e.message.includes("Can't call `openUri()` on an active connection with different connection strings.")) {
+                        if (e.message.includes("ECONNREFUSED")) {
+                            this.logger.error("Database connection timed-out. Retrying in 5000.");
+                        } else {
+                            this.logger.error(`Database connection error: ${e.message}`);
+                        }
+                        this.taskManagerService.scheduleDisabledJob(_containertokens.DITokens.bootTask, false);
+                        return;
                     }
-                    this.taskManagerService.scheduleDisabledJob(_containertokens.DITokens.bootTask, false);
-                    return;
                 }
             }
         }
@@ -185,13 +193,17 @@ class BootTask {
         await this.settingsStore.setWizardCompleted(1);
     }
     async createConnection() {
-        await (0, _mongoose.connect)((0, _serverenv.fetchMongoDBConnectionString)(), {
-            serverSelectionTimeoutMS: 1500
-        });
-        await (0, _mongoose.syncIndexes)();
+        if (this.isTypeormMode) {
+            await (0, _mongoose.connect)((0, _serverenv.fetchMongoDBConnectionString)(), {
+                serverSelectionTimeoutMS: 1500
+            });
+            await (0, _mongoose.syncIndexes)();
+        }
     }
     async migrateDatabase() {
-        await (0, _serverenv.runMigrations)(_mongoose.default.connection.db, _mongoose.default.connection.getClient());
+        if (this.isTypeormMode) {
+            await (0, _serverenv.runMigrations)(_mongoose.default.connection.db, _mongoose.default.connection.getClient());
+        }
     }
 }
 

package/dist/tasks/boot.task.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","taskManagerService","serverTasks","settingsStore","settingsService","multerService","printerSocketStore","printerFilesStore","permissionService","roleService","userService","pluginRepositoryCache","floorStore","pluginFirmwareUpdateService","clientBundleService","configService","constructor","loggerFactory","name","runOnce","registerJobOrTask","SERVER_BOOT_TASK","log","run","createConnection","migrateDatabase","e","mongoose","Error","message","includes","error","scheduleDisabledJob","DITokens","bootTask","loadSettings","syncPermissions","syncRoles","isDemoMode","warn","AppConstants","OVERRIDE_IS_DEMO_MODE","createOrUpdateDemoAccount","setLoginRequired","setRegistrationEnabled","loginRequired","get","OVERRIDE_LOGIN_REQUIRED","registrationEnabled","OVERRIDE_REGISTRATION_ENABLED","overrideJwtSecret","OVERRIDE_JWT_SECRET","undefined","overrideJwtExpiresIn","OVERRIDE_JWT_EXPIRES_IN","persistOptionalCredentialSettings","clearUploadsFolder","loadPrinterSockets","loadFilesStore","loadStore","process","env","SAFEMODE_ENABLED","BOOT_TASKS","forEach","task","disableJob","demoUsername","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","demoPassword","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","demoRole","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","adminRole","getRoleByName","demoUserId","getDemoUserId","register","username","password","isDemoUser","isVerified","isRootUser","needsPasswordChange","roles","id","setVerifiedById","setIsRootUserById","updatePasswordUnsafeByUsername","setUserRoleIds","setWizardCompleted","connect","fetchMongoDBConnectionString","serverSelectionTimeoutMS","syncIndexes","runMigrations","connection","db","getClient"],"mappings":"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"}
+{"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","taskManagerService","serverTasks","settingsStore","settingsService","multerService","printerSocketStore","printerFilesStore","permissionService","roleService","userService","pluginRepositoryCache","floorStore","pluginFirmwareUpdateService","clientBundleService","configService","isTypeormMode","typeormService","constructor","loggerFactory","name","runOnce","registerJobOrTask","SERVER_BOOT_TASK","log","run","createConnection","migrateDatabase","e","mongoose","Error","message","includes","error","scheduleDisabledJob","DITokens","bootTask","loadSettings","syncPermissions","syncRoles","isDemoMode","warn","AppConstants","OVERRIDE_IS_DEMO_MODE","createOrUpdateDemoAccount","setLoginRequired","setRegistrationEnabled","loginRequired","get","OVERRIDE_LOGIN_REQUIRED","registrationEnabled","OVERRIDE_REGISTRATION_ENABLED","overrideJwtSecret","OVERRIDE_JWT_SECRET","undefined","overrideJwtExpiresIn","OVERRIDE_JWT_EXPIRES_IN","persistOptionalCredentialSettings","clearUploadsFolder","loadPrinterSockets","loadFilesStore","loadStore","process","env","SAFEMODE_ENABLED","BOOT_TASKS","forEach","task","disableJob","demoUsername","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","demoPassword","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","demoRole","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","adminRole","getRoleByName","demoUserId","getDemoUserId","register","username","password","isDemoUser","isVerified","isRootUser","needsPasswordChange","roles","id","setVerifiedById","setIsRootUserById","updatePasswordUnsafeByUsername","setUserRoleIds","setWizardCompleted","connect","fetchMongoDBConnectionString","serverSelectionTimeoutMS","syncIndexes","runMigrations","connection","db","getClient"],"mappings":"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"}

package/dist/tasks/print-completion.socketio.task.js

@@ -15,11 +15,13 @@ class PrintCompletionSocketIoTask {
     eventEmitter2;
     socketIoGateway;
     logger;
+    printerEventsCache;
     printCompletionService;
     contextCache = {};
-    constructor({ eventEmitter2, socketIoGateway, printCompletionService, loggerFactory }){
+    constructor({ eventEmitter2, socketIoGateway, printCompletionService, printerEventsCache, loggerFactory }){
         this.eventEmitter2 = eventEmitter2;
         this.socketIoGateway = socketIoGateway;
+        this.printerEventsCache = printerEventsCache;
         this.printCompletionService = printCompletionService;
         this.logger = loggerFactory(PrintCompletionSocketIoTask.name);
         let that = this;
@@ -53,6 +55,18 @@ class PrintCompletionSocketIoTask {
                 ...this.contextCache[printerId],
                 [data.payload.type]: completion
             };
+            if (data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.Disconnecting || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.Disconnected) {
+                await this.printerEventsCache.setSubstate(printerId, "current", "state", {
+                    text: data.payload.type,
+                    flags: {
+                        operational: false,
+                        printing: false,
+                        ready: false,
+                        closedOrError: true,
+                        error: false
+                    }
+                });
+            }
             const corrId = this.contextCache[printerId].correlationId;
             await this.printCompletionService.updateContext(corrId, this.contextCache[printerId]);
             return;

package/dist/tasks/print-completion.socketio.task.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/tasks/print-completion.socketio.task.ts"],"names":["PrintCompletionSocketIoTask","eventEmitter2","socketIoGateway","logger","printCompletionService","contextCache","constructor","loggerFactory","name","that","on","octoPrintWebsocketEvent","octoPrintEvent","data","handleMessage","event","contexts","fdmEvent","printerId","log","completion","status","payload","type","fileName","createdAt","Date","now","completionLog","error","context","correlationId","EVENT_TYPES","EStop","PrintCancelling","PrintCancelled","Home","TransferStarted","TransferDone","Disconnecting","Disconnected","MetadataAnalysisStarted","MetadataAnalysisFinished","Error","corrId","updateContext","PrintStarted","token","generateCorrelationToken","create","PrintFailed","PrintDone","emit","fdmMonsterPrinterStoppedEvent","run","loadPrintContexts"],"mappings":";;;;+BAYaA;;;eAAAA;;;gCAZ0D;6CAC3C;sCACa;AAUlC,MAAMA;IACXC,cAA6B;IAC7BC,gBAAiC;IACjCC,OAAsB;IACtBC,uBAA+C;IAE/CC,eAAuD,CAAC,EAAE;IAE1DC,YAAY,EACVL,aAAa,EACbC,eAAe,EACfE,sBAAsB,EACtBG,aAAa,EAMd,CAAE;QACD,IAAI,CAACN,aAAa,GAAGA;QACrB,IAAI,CAACC,eAAe,GAAGA;QACvB,IAAI,CAACE,sBAAsB,GAAGA;QAC9B,IAAI,CAACD,MAAM,GAAGI,cAAcP,4BAA4BQ,IAAI;QAE5D,IAAIC,OAAO,IAAI;QACf,IAAI,CAACR,aAAa,CAACS,EAAE,CAACC,IAAAA,uCAAuB,EAAC,MAAM,eAAgBC,cAAc,EAAEC,IAAI;YACtF,MAAMJ,KAAKK,aAAa,CAAC,IAAI,CAACC,KAAK,EAAEH,gBAAgBC;QACvD;IACF;IAEA,IAAIG,WAAW;QACb,OAAO,IAAI,CAACX,YAAY;IAC1B;IAEA,MAAMS,cAAcG,QAAgB,EAAEJ,IAAuB,EAAE;QAE7D,MAAMK,YAAYL,KAAKK,SAAS;QAChC,IAAI,CAACA,WAAW;YACd,IAAI,CAACf,MAAM,CAACgB,GAAG,CAAC,CAAC,4CAA4C,EAAEF,SAAS,CAAC;QAC3E;QAEA,IAAIJ,KAAKE,KAAK,KAAK,SAAS;YAC1B;QACF;QAKA,MAAMK,aAAa;YACjBC,QAAQR,KAAKS,OAAO,CAACC,IAAI;YACzBC,UAAUX,KAAKS,OAAO,EAAEA,SAASd;YACjCiB,WAAWC,KAAKC,GAAG;YACnBC,eAAef,KAAKS,OAAO,EAAEO;YAC7BX;YACAY,SAAS;gBACPC,eAAe;YACjB;QACF;QACA,IACElB,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACC,KAAK,IACvCpB,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACE,eAAe,IACjDrB,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACG,cAAc,IAChDtB,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACI,IAAI,IACtCvB,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACK,eAAe,IACjDxB,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACM,YAAY,IAC9CzB,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACO,aAAa,IAC/C1B,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACQ,YAAY,IAC9C3B,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACS,uBAAuB,IACzD5B,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACU,wBAAwB,IAC1D7B,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACW,KAAK,EACvC;YACA,IAAI,CAACtC,YAAY,CAACa,UAAU,GAAG;gBAC7B,GAAG,IAAI,CAACb,YAAY,CAACa,UAAU;gBAC/B,CAACL,KAAKS,OAAO,CAACC,IAAI,CAAC,EAAEH;YACvB;YAEA,MAAMwB,SAAS,IAAI,CAACvC,YAAY,CAACa,UAAU,CAACa,aAAa;YACzD,MAAM,IAAI,CAAC3B,sBAAsB,CAACyC,aAAa,CAACD,QAAQ,IAAI,CAACvC,YAAY,CAACa,UAAU;YACpF;QACF;QAEA,IAAIL,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACc,YAAY,EAAE;YAElD,MAAMC,QAAQC,IAAAA,8CAAwB;YACtC,IAAI,CAAC3C,YAAY,CAACa,UAAU,GAAG;gBAC7Ba,eAAegB;YACjB;YACA3B,WAAWU,OAAO,GAAG,IAAI,CAACzB,YAAY,CAACa,UAAU;YACjD,MAAM,IAAI,CAACd,sBAAsB,CAAC6C,MAAM,CAAC7B;QAC3C,OAAO,IAAIP,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACkB,WAAW,IAAIrC,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACmB,SAAS,EAAE;YAEvG/B,WAAWU,OAAO,GAAG,IAAI,CAACzB,YAAY,CAACa,UAAU;YACjD,MAAM,IAAI,CAACd,sBAAsB,CAAC6C,MAAM,CAAC7B;YAEzC,IAAI,CAACnB,aAAa,CAACmD,IAAI,CAACC,IAAAA,6CAA6B,EAACnC;YAGtD,IAAI,CAACb,YAAY,CAACa,UAAU,GAAG,CAAC;QAClC;IACF;IAEA,MAAMoC,MAAM;QAEV,IAAI,CAACjD,YAAY,GAAG,MAAM,IAAI,CAACD,sBAAsB,CAACmD,iBAAiB;IACzE;AACF"}
+{"version":3,"sources":["../../src/tasks/print-completion.socketio.task.ts"],"names":["PrintCompletionSocketIoTask","eventEmitter2","socketIoGateway","logger","printerEventsCache","printCompletionService","contextCache","constructor","loggerFactory","name","that","on","octoPrintWebsocketEvent","octoPrintEvent","data","handleMessage","event","contexts","fdmEvent","printerId","log","completion","status","payload","type","fileName","createdAt","Date","now","completionLog","error","context","correlationId","EVENT_TYPES","EStop","PrintCancelling","PrintCancelled","Home","TransferStarted","TransferDone","Disconnecting","Disconnected","MetadataAnalysisStarted","MetadataAnalysisFinished","Error","setSubstate","text","flags","operational","printing","ready","closedOrError","corrId","updateContext","PrintStarted","token","generateCorrelationToken","create","PrintFailed","PrintDone","emit","fdmMonsterPrinterStoppedEvent","run","loadPrintContexts"],"mappings":";;;;+BAaaA;;;eAAAA;;;gCAb0D;6CAC3C;sCACa;AAWlC,MAAMA;IACXC,cAA6B;IAC7BC,gBAAiC;IACjCC,OAAsB;IACtBC,mBAAuC;IACvCC,uBAA+C;IAE/CC,eAAuD,CAAC,EAAE;IAE1DC,YAAY,EACVN,aAAa,EACbC,eAAe,EACfG,sBAAsB,EACtBD,kBAAkB,EAClBI,aAAa,EAOd,CAAE;QACD,IAAI,CAACP,aAAa,GAAGA;QACrB,IAAI,CAACC,eAAe,GAAGA;QACvB,IAAI,CAACE,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,sBAAsB,GAAGA;QAC9B,IAAI,CAACF,MAAM,GAAGK,cAAcR,4BAA4BS,IAAI;QAE5D,IAAIC,OAAO,IAAI;QACf,IAAI,CAACT,aAAa,CAACU,EAAE,CAACC,IAAAA,uCAAuB,EAAC,MAAM,eAAgBC,cAAc,EAAEC,IAAI;YACtF,MAAMJ,KAAKK,aAAa,CAAC,IAAI,CAACC,KAAK,EAAEH,gBAAgBC;QACvD;IACF;IAEA,IAAIG,WAAW;QACb,OAAO,IAAI,CAACX,YAAY;IAC1B;IAEA,MAAMS,cAAcG,QAAgB,EAAEJ,IAAuB,EAAE;QAE7D,MAAMK,YAAYL,KAAKK,SAAS;QAChC,IAAI,CAACA,WAAW;YACd,IAAI,CAAChB,MAAM,CAACiB,GAAG,CAAC,CAAC,4CAA4C,EAAEF,SAAS,CAAC;QAC3E;QAEA,IAAIJ,KAAKE,KAAK,KAAK,SAAS;YAC1B;QACF;QAKA,MAAMK,aAAa;YACjBC,QAAQR,KAAKS,OAAO,CAACC,IAAI;YACzBC,UAAUX,KAAKS,OAAO,EAAEA,SAASd;YACjCiB,WAAWC,KAAKC,GAAG;YACnBC,eAAef,KAAKS,OAAO,EAAEO;YAC7BX;YACAY,SAAS;gBACPC,eAAe;YACjB;QACF;QACA,IACElB,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACC,KAAK,IACvCpB,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACE,eAAe,IACjDrB,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACG,cAAc,IAChDtB,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACI,IAAI,IACtCvB,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACK,eAAe,IACjDxB,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACM,YAAY,IAC9CzB,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACO,aAAa,IAC/C1B,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACQ,YAAY,IAC9C3B,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACS,uBAAuB,IACzD5B,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACU,wBAAwB,IAC1D7B,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACW,KAAK,EACvC;YACA,IAAI,CAACtC,YAAY,CAACa,UAAU,GAAG;gBAC7B,GAAG,IAAI,CAACb,YAAY,CAACa,UAAU;gBAC/B,CAACL,KAAKS,OAAO,CAACC,IAAI,CAAC,EAAEH;YACvB;YAEA,IAAIP,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACO,aAAa,IAAI1B,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACQ,YAAY,EAAE;gBACrG,MAAM,IAAI,CAACrC,kBAAkB,CAACyC,WAAW,CAAC1B,WAAW,WAAW,SAAS;oBACvE2B,MAAMhC,KAAKS,OAAO,CAACC,IAAI;oBACvBuB,OAAO;wBACLC,aAAa;wBACbC,UAAU;wBACVC,OAAO;wBACPC,eAAe;wBACfrB,OAAO;oBACT;gBACF;YACF;YAEA,MAAMsB,SAAS,IAAI,CAAC9C,YAAY,CAACa,UAAU,CAACa,aAAa;YACzD,MAAM,IAAI,CAAC3B,sBAAsB,CAACgD,aAAa,CAACD,QAAQ,IAAI,CAAC9C,YAAY,CAACa,UAAU;YACpF;QACF;QAEA,IAAIL,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACqB,YAAY,EAAE;YAElD,MAAMC,QAAQC,IAAAA,8CAAwB;YACtC,IAAI,CAAClD,YAAY,CAACa,UAAU,GAAG;gBAC7Ba,eAAeuB;YACjB;YACAlC,WAAWU,OAAO,GAAG,IAAI,CAACzB,YAAY,CAACa,UAAU;YACjD,MAAM,IAAI,CAACd,sBAAsB,CAACoD,MAAM,CAACpC;QAC3C,OAAO,IAAIP,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAACyB,WAAW,IAAI5C,KAAKS,OAAO,CAACC,IAAI,KAAKS,wCAAW,CAAC0B,SAAS,EAAE;YAEvGtC,WAAWU,OAAO,GAAG,IAAI,CAACzB,YAAY,CAACa,UAAU;YACjD,MAAM,IAAI,CAACd,sBAAsB,CAACoD,MAAM,CAACpC;YAEzC,IAAI,CAACpB,aAAa,CAAC2D,IAAI,CAACC,IAAAA,6CAA6B,EAAC1C;YAGtD,IAAI,CAACb,YAAY,CAACa,UAAU,GAAG,CAAC;QAClC;IACF;IAEA,MAAM2C,MAAM;QAEV,IAAI,CAACxD,YAAY,GAAG,MAAM,IAAI,CAACD,sBAAsB,CAAC0D,iBAAiB;IACzE;AACF"}

package/dist/tasks/printer-file-clean.task.js

@@ -36,6 +36,20 @@ class PrinterFileCleanTask {
             } else {
                 this.logger.log(`Reporting about old files of ${printers.length} printers.`);
             }
+            const errorPrinters = [];
+            for (let printer of printers){
+                try {
+                    await this.printerFilesStore.eagerLoadPrinterFiles(printer.id, false);
+                } catch (e) {
+                    errorPrinters.push({
+                        e,
+                        printer
+                    });
+                }
+            }
+            if (errorPrinters.length > 0) {
+                this.logger.error(`Error loading some files, ${errorPrinters.length} printer(s) (${errorPrinters.map((ep)=>`${ep.printer.name} ${ep.e.toString()}`)}) did not respond or returned an unexpected status code. Those will depend on previously cached files.`);
+            }
             for (let printer of printers){
                 const outdatedFiles = this.getPrinterOutdatedFiles(printer);
                 if (!outdatedFiles?.length) continue;

package/dist/tasks/printer-file-clean.task.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/tasks/printer-file-clean.task.ts"],"names":["PrinterFileCleanTask","logger","printerFilesStore","printerCache","settingsStore","taskManagerService","octoPrintApiService","constructor","loggerFactory","name","ageDaysMaxSetting","getSettings","autoRemoveOldFilesCriteriumDays","run","printers","listCachedPrinters","fileCleanSettings","autoCleanAtBootEnabled","autoRemoveOldFilesAtBoot","log","length","printer","outdatedFiles","getPrinterOutdatedFiles","cleanPrinterFiles","id","printerId","deleteOutdatedFiles","eagerLoadPrinterFiles","ageDaysMax","getOutdatedFiles","getFileCleanSettings"],"mappings":";;;;+BAcaA;;;eAAAA;;;AAAN,MAAMA;IACXC,OAAsB;IACtBC,kBAAqC;IACrCC,aAA2B;IAC3BC,cAA6B;IAC7BC,mBAAuC;IACvCC,oBAAyC;IAEzCC,YAAY,EACVJ,YAAY,EACZD,iBAAiB,EACjBI,mBAAmB,EACnBD,kBAAkB,EAClBD,aAAa,EACbI,aAAa,EAQd,CAAE;QACD,IAAI,CAACL,YAAY,GAAGA;QACpB,IAAI,CAACD,iBAAiB,GAAGA;QACzB,IAAI,CAACG,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACF,aAAa,GAAGA;QACrB,IAAI,CAACH,MAAM,GAAGO,cAAcR,qBAAqBS,IAAI;IACvD;IAEA,IAAYC,oBAAoB;QAC9B,OAAO,IAAI,CAACC,WAAW,GAAGC,+BAA+B;IAC3D;IAEA,MAAMC,MAAM;QAEV,MAAMC,WAAW,MAAM,IAAI,CAACX,YAAY,CAACY,kBAAkB,CAAC;QAC5D,MAAMC,oBAAoB,IAAI,CAACL,WAAW;QAC1C,MAAMM,yBAAyBD,kBAAkBE,wBAAwB;QAEzE,IAAI;YACF,IAAID,wBAAwB;gBAC1B,IAAI,CAAChB,MAAM,CAACkB,GAAG,CAAC,CAAC,kBAAkB,EAAEL,SAASM,MAAM,CAAC,6DAA6D,CAAC;YACrH,OAAO;gBACL,IAAI,CAACnB,MAAM,CAACkB,GAAG,CAAC,CAAC,6BAA6B,EAAEL,SAASM,MAAM,CAAC,UAAU,CAAC;YAC7E;YAGA,KAAK,IAAIC,WAAWP,SAAU;gBAC5B,MAAMQ,gBAAgB,IAAI,CAACC,uBAAuB,CAACF;gBACnD,IAAI,CAACC,eAAeF,QAAQ;gBAG5B,IAAI,CAACnB,MAAM,CAACkB,GAAG,CAAC,CAAC,MAAM,EAAEG,eAAeF,OAAO,cAAc,EAAEC,QAAQZ,IAAI,CAAC,CAAC;gBAE7E,IAAIQ,wBAAwB;oBAC1B,MAAM,IAAI,CAACO,iBAAiB,CAACH,QAAQI,EAAE;gBACzC;YACF;QACF,SAAU;YACR,IAAI,CAACxB,MAAM,CAACkB,GAAG,CAAC,CAAC,mCAAmC,CAAC;QACvD;IACF;IAEA,MAAMK,kBAAkBE,SAAiB,EAAE;QAEzC,MAAM,IAAI,CAACxB,iBAAiB,CAACyB,mBAAmB,CAACD,WAAW,IAAI,CAAChB,iBAAiB;QAGlF,MAAM,IAAI,CAACR,iBAAiB,CAAC0B,qBAAqB,CAACF,WAAW;IAChE;IAMAH,wBAAwBF,OAA2B,EAAE;QACnD,MAAMQ,aAAa,IAAI,CAACnB,iBAAiB;QACzC,OAAO,IAAI,CAACR,iBAAiB,CAAC4B,gBAAgB,CAACT,QAAQI,EAAE,EAAEI;IAC7D;IAEQlB,cAAc;QACpB,OAAO,IAAI,CAACP,aAAa,CAAC2B,oBAAoB;IAChD;AACF"}
+{"version":3,"sources":["../../src/tasks/printer-file-clean.task.ts"],"names":["PrinterFileCleanTask","logger","printerFilesStore","printerCache","settingsStore","taskManagerService","octoPrintApiService","constructor","loggerFactory","name","ageDaysMaxSetting","getSettings","autoRemoveOldFilesCriteriumDays","run","printers","listCachedPrinters","fileCleanSettings","autoCleanAtBootEnabled","autoRemoveOldFilesAtBoot","log","length","errorPrinters","printer","eagerLoadPrinterFiles","id","e","push","error","map","ep","toString","outdatedFiles","getPrinterOutdatedFiles","cleanPrinterFiles","printerId","deleteOutdatedFiles","ageDaysMax","getOutdatedFiles","getFileCleanSettings"],"mappings":"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"}