@fdm-monster/server 1.6.2 → 1.6.4

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

@@ -11,6 +11,7 @@ Object.defineProperty(exports, "PrinterSocketStore", {
 const _node = require("@sentry/node");
 const _errorutils = require("../utils/error.utils");
 const _eventconstants = require("../constants/event.constants");
+const _printerapiinterface = require("../services/printer-api.interface");
 class PrinterSocketStore {
     socketIoGateway;
     socketFactory;
@@ -35,6 +36,7 @@ class PrinterSocketStore {
         Object.values(this.printerSocketAdaptersById).forEach((s)=>{
             socketStatesById[s.printerId] = {
                 printerId: s.printerId,
+                printerType: s.printerType,
                 socket: s.socketState,
                 api: s.apiState
             };
@@ -78,7 +80,7 @@ class PrinterSocketStore {
         const failedSocketsReauth = [];
         for (const socket of Object.values(this.printerSocketAdaptersById)){
             try {
-                if (socket.needsReauth()) {
+                if (socket.printerType === _printerapiinterface.OctoprintType && socket.needsReauth()) {
                     reauthRequested++;
                     const promise = socket.reauthSession().catch((_)=>{
                         failedSocketsReauth.push(socket.printerId);
@@ -141,7 +143,7 @@ class PrinterSocketStore {
             return;
         }
         if (!foundAdapter) {
-            foundAdapter = this.socketFactory.createInstance();
+            foundAdapter = this.socketFactory.createInstance(printer.printerType);
             this.printerSocketAdaptersById[id] = foundAdapter;
         } else {
             foundAdapter.close();
@@ -151,7 +153,8 @@ class PrinterSocketStore {
             printerId: printer.id.toString(),
             loginDto: {
                 apiKey: printer.apiKey,
-                printerURL: printer.printerURL
+                printerURL: printer.printerURL,
+                printerType: printer.printerType
             },
             protocol: "ws"
         });

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","captureException","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","Promise","all","promisesOpenSocket","failedSocketReopened","needsSetup","needsReopen","setupSocketSession","then","open","keySocket","valSocket","keyApi","valApi","reauth","socketSetup","createOrUpdateSocket","enabled","foundAdapter","toString","deleteSocket","createInstance","registerCredentials","loginDto","apiKey","printerURL","protocol","handleBatchPrinterCreated","printers","p","handlePrinterUpdated","handlePrintersDeleted","printerIds","on","printerEvents","printerCreated","bind","printersDeleted","printerUpdated","batchPrinterCreated"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","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","printerType","socket","socketState","api","apiState","loadPrinterSockets","loadCache","printerDocs","listCachedPrinters","doc","handlePrinterCreated","printer","e","captureException","error","errorSummary","log","keys","length","listPrinterSockets","reconnectOctoPrint","id","getPrinterSocket","close","resetSocketState","reconnectPrinterSockets","reauthRequested","socketSetupRequested","socketStates","apiStates","promisesReauth","failedSocketsReauth","OctoprintType","needsReauth","promise","reauthSession","catch","_","push","getDebugSettingsSensitive","debugSocketSetup","Promise","all","promisesOpenSocket","failedSocketReopened","needsSetup","needsReopen","setupSocketSession","then","open","keySocket","valSocket","keyApi","valApi","reauth","socketSetup","createOrUpdateSocket","enabled","foundAdapter","toString","deleteSocket","createInstance","registerCredentials","loginDto","apiKey","printerURL","protocol","handleBatchPrinterCreated","printers","p","handlePrinterUpdated","handlePrintersDeleted","printerIds","on","printerEvents","printerCreated","bind","printersDeleted","printerUpdated","batchPrinterCreated"],"mappings":"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"}

package/dist/state/printer.cache.js

@@ -69,14 +69,16 @@ class PrinterCache extends _keydiffcache.KeyDiffCache {
         const printer = await this.getCachedPrinterOrThrowAsync(id);
         return {
             printerURL: printer.printerURL,
-            apiKey: printer.apiKey
+            apiKey: printer.apiKey,
+            printerType: printer.printerType
         };
     }
     getLoginDto(id) {
         const printer = this.getCachedPrinterOrThrow(id);
         return {
             printerURL: printer.printerURL,
-            apiKey: printer.apiKey
+            apiKey: printer.apiKey,
+            printerType: printer.printerType
         };
     }
     async handleBatchPrinterCreated({ printers }) {

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","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"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","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","printerType","getLoginDto","mappedPrinters","printerDto","setKeyValue","printerIds","deleteKeysBatch","toString","entities","entity","toUnsafeDto"],"mappings":"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"}

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","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"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","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/socket-io.gateway.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/socket-io.gateway.ts"],"names":["IO_MESSAGES","SocketIoGateway","authorize","settingsStore","options","verify","strategy","JwtStrategy","authorizeCallback","socket","next","getLoginRequired","success","user","handshake","fail","info","Error","error","authenticate","logger","eventEmitter2","io","authService","configService","userService","constructor","loggerFactory","name","attachServer","httpServer","Server","cors","origin","opts","getPassportJwtOptions","value","auth","token","verifyUserCallback","use","on","onConnect","bind","debug","id","emit","socketIoConnectedEvent","send","event","data","getServerSettings","debugSettings","debugSocketIoEvents","log","LegacyUpdate","LegacyPrinterTest","CompletionEvent","HostState","ApiAccessibility"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;;;;;;;;IA0GaA,WAAW;eAAXA;;IAhEAC,eAAe;eAAfA;;;0BA1CkB;gCACQ;0BAOmB;6BAEiB;AAK3E,MAAMC,YAAY,CAChBC,eACAC,SACAC;IAEA,MAAMC,WAAW,IAAIC,qBAAW,CAACH,SAASC;IAE1C,OAAO,eAAeG,kBACpBC,MAAyE,EACzEC,IAAmC;QAEnC,IAAI,CAAE,MAAMP,cAAcQ,gBAAgB,IAAK;YAE7C,OAAOD;QACT;QAEAJ,SAASM,OAAO,GAAG,SAASA,QAAQC,IAAI;YACtCJ,OAAOK,SAAS,CAACD,IAAI,GAAGA;YACxBH;QACF;QACAJ,SAASS,IAAI,GAAG,CAACC,OAASN,KAAK,IAAIO,MAAMD;QACzCV,SAASY,KAAK,GAAG,CAACA,QAAUR,KAAKQ;QAEjCZ,SAASa,YAAY,CAACV,QAAQ,CAAC;IACjC;AACF;AAEO,MAAMR;IACXmB,OAAsB;IACtBC,cAA6B;IAC7BC,GAAW;IAEXC,YAAyB;IACzBpB,cAA6B;IAC7BqB,cAA8B;IAC9BC,YAA0B;IAE1BC,YAAY,EACVC,aAAa,EACbN,aAAa,EACblB,aAAa,EACboB,WAAW,EACXC,aAAa,EACbC,WAAW,EAQZ,CAAE;QACD,IAAI,CAACL,MAAM,GAAGO,cAAc1B,gBAAgB2B,IAAI;QAChD,IAAI,CAACP,aAAa,GAAGA;QACrB,IAAI,CAAClB,aAAa,GAAGA;QACrB,IAAI,CAACoB,WAAW,GAAGA;QACnB,IAAI,CAACE,WAAW,GAAGA;QACnB,IAAI,CAACD,aAAa,GAAGA;IACvB;IAEAK,aAAaC,UAAuB,EAAE;QACpC,IAAI,CAACR,EAAE,GAAG,IAAIS,gBAAM,CAACD,YAAY;YAAEE,MAAM;gBAAEC,QAAQ;YAAI;QAAE;QACzD,MAAMC,OAAOC,IAAAA,+BAAqB,EAAC,IAAI,CAAChC,aAAa,EAAE,IAAI,CAACqB,aAAa,EAAE,CAACY,QAAkBA,MAAMtB,SAAS,CAACuB,IAAI,CAACC,KAAK;QACxH,MAAMjC,SAASkC,IAAAA,4BAAkB,EAAC,IAAI,CAACd,WAAW;QAClD,IAAI,CAACH,EAAE,CAACkB,GAAG,CAACtC,UAAU,IAAI,CAACC,aAAa,EAAE+B,MAAM7B;QAChD,IAAI,CAACiB,EAAE,CAACmB,EAAE,CAAC,cAAc,CAAChC,SAAW,IAAI,CAACiC,SAAS,CAACC,IAAI,CAAC,IAAI,EAAElC;IACjE;IAEAiC,UAAUjC,MAAc,EAAE;QACxB,IAAI,CAACW,MAAM,CAACwB,KAAK,CAAC,6BAA6BnC,OAAOoC,EAAE;QAExD,IAAI,CAACxB,aAAa,CAACyB,IAAI,CAACC,sCAAsB,EAAEtC,OAAOoC,EAAE;QAEzDpC,OAAOgC,EAAE,CAAC,cAAc;YACtB,IAAI,CAACrB,MAAM,CAACwB,KAAK,CAAC,gCAAgCnC,OAAOoC,EAAE;QAC7D;IACF;IAEAG,KAAQC,KAAa,EAAEC,IAAO,EAAE;QAC9B,IAAI,CAAC,IAAI,CAAC5B,EAAE,EAAE;YACZ,IAAI,CAACF,MAAM,CAACwB,KAAK,CAAC;YAClB;QACF;QAEA,IAAI,IAAI,CAACzC,aAAa,CAACgD,iBAAiB,GAAGC,aAAa,EAAEC,qBAAqB;YAC7E,IAAI,CAACjC,MAAM,CAACkC,GAAG,CAAC,CAAC,cAAc,EAAEL,MAAM,CAAC;QAC1C;QACA,IAAI,CAAC3B,EAAE,CAACwB,IAAI,CAACG,OAAOC;IACtB;AACF;AAEO,MAAMlD,cAAc;IACzBuD,cAAc;IACdC,mBAAmB;IACnBC,iBAAiB;IACjBC,WAAW;IACXC,kBAAkB;AACpB"}
+{"version":3,"sources":["../../src/state/socket-io.gateway.ts"],"names":["IO_MESSAGES","SocketIoGateway","authorize","settingsStore","options","verify","strategy","JwtStrategy","authorizeCallback","socket","next","getLoginRequired","success","user","handshake","fail","info","Error","error","authenticate","logger","eventEmitter2","io","authService","configService","userService","constructor","loggerFactory","name","attachServer","httpServer","Server","cors","origin","opts","getPassportJwtOptions","value","auth","token","verifyUserCallback","use","on","onConnect","bind","debug","id","emit","socketIoConnectedEvent","send","event","data","getServerSettings","debugSettings","debugSocketIoEvents","log","LegacyUpdate","LegacyPrinterTest","CompletionEvent","HostState","ApiAccessibility"],"mappings":";;;;;;;;;;;IA0GaA,WAAW;eAAXA;;IAhEAC,eAAe;eAAfA;;;0BA1CkB;gCACQ;0BAOmB;6BAEiB;AAK3E,MAAMC,YAAY,CAChBC,eACAC,SACAC;IAEA,MAAMC,WAAW,IAAIC,qBAAW,CAACH,SAASC;IAE1C,OAAO,eAAeG,kBACpBC,MAAyE,EACzEC,IAAmC;QAEnC,IAAI,CAAE,MAAMP,cAAcQ,gBAAgB,IAAK;YAE7C,OAAOD;QACT;QAEAJ,SAASM,OAAO,GAAG,SAASA,QAAQC,IAAI;YACtCJ,OAAOK,SAAS,CAACD,IAAI,GAAGA;YACxBH;QACF;QACAJ,SAASS,IAAI,GAAG,CAACC,OAASN,KAAK,IAAIO,MAAMD;QACzCV,SAASY,KAAK,GAAG,CAACA,QAAUR,KAAKQ;QAEjCZ,SAASa,YAAY,CAACV,QAAQ,CAAC;IACjC;AACF;AAEO,MAAMR;IACXmB,OAAsB;IACtBC,cAA6B;IAC7BC,GAAW;IAEXC,YAAyB;IACzBpB,cAA6B;IAC7BqB,cAA8B;IAC9BC,YAA0B;IAE1BC,YAAY,EACVC,aAAa,EACbN,aAAa,EACblB,aAAa,EACboB,WAAW,EACXC,aAAa,EACbC,WAAW,EAQZ,CAAE;QACD,IAAI,CAACL,MAAM,GAAGO,cAAc1B,gBAAgB2B,IAAI;QAChD,IAAI,CAACP,aAAa,GAAGA;QACrB,IAAI,CAAClB,aAAa,GAAGA;QACrB,IAAI,CAACoB,WAAW,GAAGA;QACnB,IAAI,CAACE,WAAW,GAAGA;QACnB,IAAI,CAACD,aAAa,GAAGA;IACvB;IAEAK,aAAaC,UAAuB,EAAE;QACpC,IAAI,CAACR,EAAE,GAAG,IAAIS,gBAAM,CAACD,YAAY;YAAEE,MAAM;gBAAEC,QAAQ;YAAI;QAAE;QACzD,MAAMC,OAAOC,IAAAA,+BAAqB,EAAC,IAAI,CAAChC,aAAa,EAAE,IAAI,CAACqB,aAAa,EAAE,CAACY,QAAkBA,MAAMtB,SAAS,CAACuB,IAAI,CAACC,KAAK;QACxH,MAAMjC,SAASkC,IAAAA,4BAAkB,EAAC,IAAI,CAACd,WAAW;QAClD,IAAI,CAACH,EAAE,CAACkB,GAAG,CAACtC,UAAU,IAAI,CAACC,aAAa,EAAE+B,MAAM7B;QAChD,IAAI,CAACiB,EAAE,CAACmB,EAAE,CAAC,cAAc,CAAChC,SAAW,IAAI,CAACiC,SAAS,CAACC,IAAI,CAAC,IAAI,EAAElC;IACjE;IAEAiC,UAAUjC,MAAc,EAAE;QACxB,IAAI,CAACW,MAAM,CAACwB,KAAK,CAAC,6BAA6BnC,OAAOoC,EAAE;QAExD,IAAI,CAACxB,aAAa,CAACyB,IAAI,CAACC,sCAAsB,EAAEtC,OAAOoC,EAAE;QAEzDpC,OAAOgC,EAAE,CAAC,cAAc;YACtB,IAAI,CAACrB,MAAM,CAACwB,KAAK,CAAC,gCAAgCnC,OAAOoC,EAAE;QAC7D;IACF;IAEAG,KAAQC,KAAa,EAAEC,IAAO,EAAE;QAC9B,IAAI,CAAC,IAAI,CAAC5B,EAAE,EAAE;YACZ,IAAI,CAACF,MAAM,CAACwB,KAAK,CAAC;YAClB;QACF;QAEA,IAAI,IAAI,CAACzC,aAAa,CAACgD,iBAAiB,GAAGC,aAAa,EAAEC,qBAAqB;YAC7E,IAAI,CAACjC,MAAM,CAACkC,GAAG,CAAC,CAAC,cAAc,EAAEL,OAAO;QAC1C;QACA,IAAI,CAAC3B,EAAE,CAACwB,IAAI,CAACG,OAAOC;IACtB;AACF;AAEO,MAAMlD,cAAc;IACzBuD,cAAc;IACdC,mBAAmB;IACnBC,iBAAiB;IACjBC,WAAW;IACXC,kBAAkB;AACpB"}

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

@@ -11,10 +11,11 @@ Object.defineProperty(exports, "TestPrinterSocketStore", {
 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");
+const _octoprintwebsocketadapter = require("../services/octoprint/octoprint-websocket.adapter");
 const _serverconstants = require("../server.constants");
 const _errorutils = require("../utils/error.utils");
 const _node = require("@sentry/node");
+const _socketstatetype = require("../shared/dtos/socket-state.type");
 class TestPrinterSocketStore {
     testSocket;
     socketIoGateway;
@@ -35,7 +36,7 @@ class TestPrinterSocketStore {
         const validatedData = await (0, _validators.validateInput)(printer, _createtestprintervalidation.createTestPrinterRules);
         validatedData.enabled = true;
         const { correlationToken } = printer;
-        this.testSocket = this.socketFactory.createInstance();
+        this.testSocket = this.socketFactory.createInstance(printer.printerType);
         this.testSocket.registerCredentials({
             printerId: correlationToken,
             loginDto: {
@@ -45,11 +46,11 @@ class TestPrinterSocketStore {
             protocol: "ws"
         });
         const testEvents = [
-            (0, _octoprintsockioadapter.octoPrintEvent)(_octoprintsockioadapter.Message.WS_STATE_UPDATED),
-            (0, _octoprintsockioadapter.octoPrintEvent)(_octoprintsockioadapter.Message.API_STATE_UPDATED),
-            (0, _octoprintsockioadapter.octoPrintEvent)(_octoprintsockioadapter.Message.WS_CLOSED),
-            (0, _octoprintsockioadapter.octoPrintEvent)(_octoprintsockioadapter.Message.WS_OPENED),
-            (0, _octoprintsockioadapter.octoPrintEvent)(_octoprintsockioadapter.Message.WS_ERROR)
+            (0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.WS_STATE_UPDATED),
+            (0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.API_STATE_UPDATED),
+            (0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.WS_CLOSED),
+            (0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.WS_OPENED),
+            (0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.WS_ERROR)
         ];
         const listener = ({ event, payload, printerId })=>{
             if (printerId !== correlationToken) {
@@ -76,7 +77,7 @@ class TestPrinterSocketStore {
                         reject();
                         return;
                     }
-                    if (this.testSocket.socketState === _octoprintsockioadapter.SOCKET_STATE.authenticated) {
+                    if (this.testSocket.socketState === _socketstatetype.SOCKET_STATE.authenticated) {
                         this.logger.log("Test completed successfully, resolving");
                         resolve(true);
                         break;

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","socketIoGateway","socketFactory","eventEmitter2","logger","constructor","loggerFactory","name","setupTestPrinter","printer","close","validatedData","validateInput","createTestPrinterRules","enabled","correlationToken","createInstance","registerCredentials","printerId","loginDto","apiKey","printerURL","protocol","testEvents","octoPrintEvent","Message","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","listener","event","payload","send","forEach","te","on","log","setupSocketSession","promise","Promise","resolve","reject","open","startTime","setInterval","warn","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","e","error","errorSummary","captureException","off"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAaaA;;;eAAAA;;;0BAb2B;4BACV;6CACS;wCACuC;iCACjD;4BAMA;sBACI;AAE1B,MAAMA;IACXC,WAAmC;IACnCC,gBAAiC;IACjCC,cAA6B;IAC7BC,cAA6B;IAC7BC,OAAsB;IACtBC,YAAY,EACVH,aAAa,EACbD,eAAe,EACfE,aAAa,EACbG,aAAa,EAMd,CAAE;QACD,IAAI,CAACJ,aAAa,GAAGA;QACrB,IAAI,CAACD,eAAe,GAAGA;QACvB,IAAI,CAACE,aAAa,GAAGA;QACrB,IAAI,CAACC,MAAM,GAAGE,cAAcP,uBAAuBQ,IAAI;IACzD;IAEA,MAAMC,iBAAiBC,OAAO,EAAiB;QAC7C,IAAI,IAAI,CAACT,UAAU,EAAE;YACnB,IAAI,CAACA,UAAU,CAACU,KAAK;YACrB,IAAI,CAACV,UAAU,GAAG;QACpB;QAEA,MAAMW,gBAAgB,MAAMC,IAAAA,yBAAa,EAACH,SAASI,mDAAsB;QACzEF,cAAcG,OAAO,GAAG;QAGxB,MAAM,EAAEC,gBAAgB,EAAE,GAAGN;QAC7B,IAAI,CAACT,UAAU,GAAG,IAAI,CAACE,aAAa,CAACc,cAAc;QAGnD,IAAI,CAAChB,UAAU,CAACiB,mBAAmB,CAAC;YAClCC,WAAWH;YACXI,UAAU;gBACRC,QAAQX,QAAQW,MAAM;gBACtBC,YAAYZ,QAAQY,UAAU;YAChC;YACAC,UAAU;QACZ;QAEA,MAAMC,aAAa;YACjBC,IAAAA,sCAAc,EAACC,+BAAO,CAACC,gBAAgB;YACvCF,IAAAA,sCAAc,EAACC,+BAAO,CAACE,iBAAiB;YACxCH,IAAAA,sCAAc,EAACC,+BAAO,CAACG,SAAS;YAChCJ,IAAAA,sCAAc,EAACC,+BAAO,CAACI,SAAS;YAChCL,IAAAA,sCAAc,EAACC,+BAAO,CAACK,QAAQ;SAChC;QACD,MAAMC,WAAW,CAAC,EAAEC,KAAK,EAAEC,OAAO,EAAEf,SAAS,EAAE;YAC7C,IAAIA,cAAcH,kBAAkB;gBAClC;YACF;YACA,IAAI,CAACd,eAAe,CAACiC,IAAI,CAAC,sBAAsB;gBAC9CF;gBACAC;gBACAlB;YACF;QACF;QACAQ,WAAWY,OAAO,CAAC,CAACC;YAClB,IAAI,CAACjC,aAAa,CAACkC,EAAE,CAACD,IAAIL;QAC5B;QAEA,IAAI;YACF,IAAI,CAAC3B,MAAM,CAACkC,GAAG,CAAC;YAChB,MAAM,IAAI,CAACtC,UAAU,CAACuC,kBAAkB;YAExC,IAAI,CAACnC,MAAM,CAACkC,GAAG,CAAC;YAChB,MAAME,UAAU,IAAIC,QAAQ,OAAOC,SAASC;gBAC1C,IAAI,CAAC3C,UAAU,CAAC4C,IAAI;gBACpB,WAAW,MAAMC,aAAaC,IAAAA,qBAAW,EAAC,KAAM;oBAC9C,IAAI,CAAC,IAAI,CAAC9C,UAAU,EAAE;wBACpB,IAAI,CAACI,MAAM,CAAC2C,IAAI,CAAC;wBACjBJ;wBACA;oBACF;oBACA,IAAI,IAAI,CAAC3C,UAAU,CAACgD,WAAW,KAAKC,oCAAY,CAACC,aAAa,EAAE;wBAC9D,IAAI,CAAC9C,MAAM,CAACkC,GAAG,CAAC;wBAChBI,QAAQ;wBACR;oBACF;gBACF;YACF;YAEA,MAAMD,QAAQU,IAAI,CAAC;gBAACX;gBAASY,IAAAA,oBAAU,EAACC,6BAAY,CAACC,gCAAgC;aAAE;YAEvF,IAAI,CAAClD,MAAM,CAACkC,GAAG,CAAC;QAClB,EAAE,OAAOiB,GAAG;YACV,IAAI,CAACnD,MAAM,CAACoD,KAAK,CAAC,CAAC,mBAAmB,EAAEC,IAAAA,wBAAY,EAACF,GAAG,CAAC;YACzDG,IAAAA,sBAAgB,EAACH;QACnB,SAAU;YACR,IAAI,IAAI,CAACvD,UAAU,EAAE;gBACnB,IAAI,CAACA,UAAU,CAACU,KAAK;YACvB;YACA,OAAO,IAAI,CAACV,UAAU;YACtBuB,WAAWY,OAAO,CAAC,CAACC;gBAClB,IAAI,CAACjC,aAAa,CAACwD,GAAG,CAACvB,IAAIL;YAC7B;QACF;IACF;AACF"}
+{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","socketIoGateway","socketFactory","eventEmitter2","logger","constructor","loggerFactory","name","setupTestPrinter","printer","close","validatedData","validateInput","createTestPrinterRules","enabled","correlationToken","createInstance","printerType","registerCredentials","printerId","loginDto","apiKey","printerURL","protocol","testEvents","octoPrintEvent","WsMessage","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","listener","event","payload","send","forEach","te","on","log","setupSocketSession","promise","Promise","resolve","reject","open","startTime","setInterval","warn","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","e","error","errorSummary","captureException","off"],"mappings":"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"}

package/dist/state/validation/create-test-printer.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/state/validation/create-test-printer.validation.ts"],"names":["createTestPrinterRules","correlationToken","apiKey","UUID_LENGTH","printerURL"],"rangeMappings":";;;;;;;;;;;;;;;","mappings":";;;;+BAEaA;;;eAAAA;;;kCAFe;AAErB,MAAMA,yBAAyB;IACpCC,kBAAkB;IAClBC,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;AACd"}
+{"version":3,"sources":["../../../src/state/validation/create-test-printer.validation.ts"],"names":["createTestPrinterRules","correlationToken","apiKey","UUID_LENGTH","printerURL"],"mappings":";;;;+BAEaA;;;eAAAA;;;kCAFe;AAErB,MAAMA,yBAAyB;IACpCC,kBAAkB;IAClBC,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;AACd"}

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"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAWaA;;;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"}
+{"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":";;;;+BAWaA;;;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

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "BootTask", {
         return BootTask;
     }
 });
-const _mongoose = _interop_require_wildcard(require("mongoose"));
+const _mongoose = /*#__PURE__*/ _interop_require_wildcard(require("mongoose"));
 const _serverenv = require("../server.env");
 const _containertokens = require("../container.tokens");
 const _serverconstants = require("../server.constants");

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","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","envUrl","fetchMongoDBConnectionString","connect","serverSelectionTimeoutMS","syncIndexes","runMigrations","connection","db","getClient"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","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","envUrl","fetchMongoDBConnectionString","connect","serverSelectionTimeoutMS","syncIndexes","runMigrations","connection","db","getClient"],"mappings":";;;;+BAuBaA;;;eAAAA;;;kEAvBkC;2BACa;iCACnC;iCACI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoBtB,MAAMA;IACXC,OAAsB;IACtBC,mBAAuC;IACvCC,YAAyB;IACzBC,cAA6B;IAC7BC,gBAAkC;IAClCC,cAA6B;IAC7BC,mBAAuC;IACvCC,kBAAqC;IACrCC,kBAAqC;IACrCC,YAAyB;IACzBC,YAAyB;IACzBC,sBAA6C;IAC7CC,WAAuB;IACvBC,4BAAyD;IACzDC,oBAAyC;IACzCC,cAA6B;IAC7BC,cAAuB;IACvBC,eAA+B;IAE/BC,YAAY,EACVC,aAAa,EACbjB,WAAW,EACXE,eAAe,EACfD,aAAa,EACbE,aAAa,EACbC,kBAAkB,EAClBC,iBAAiB,EACjBC,iBAAiB,EACjBC,WAAW,EACXC,WAAW,EACXT,kBAAkB,EAClBU,qBAAqB,EACrBC,UAAU,EACVC,2BAA2B,EAC3BC,mBAAmB,EACnBC,aAAa,EACbE,cAAc,EACdD,aAAa,EAoBd,CAAE;QACD,IAAI,CAACA,aAAa,GAAGA;QACrB,IAAI,CAAChB,MAAM,GAAGmB,cAAcpB,SAASqB,IAAI;QACzC,IAAI,CAAClB,WAAW,GAAGA;QACnB,IAAI,CAACE,eAAe,GAAGA;QACvB,IAAI,CAACD,aAAa,GAAGA;QACrB,IAAI,CAACE,aAAa,GAAGA;QACrB,IAAI,CAACC,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,iBAAiB,GAAGA;QACzB,IAAI,CAACC,iBAAiB,GAAGA;QACzB,IAAI,CAACC,WAAW,GAAGA;QACnB,IAAI,CAACC,WAAW,GAAGA;QACnB,IAAI,CAACT,kBAAkB,GAAGA;QAC1B,IAAI,CAACU,qBAAqB,GAAGA;QAC7B,IAAI,CAACC,UAAU,GAAGA;QAClB,IAAI,CAACC,2BAA2B,GAAGA;QACnC,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACC,aAAa,GAAGA;QACrB,IAAI,CAACE,cAAc,GAAGA;IACxB;IAEA,MAAMI,UAAU;QAEd,IAAI,CAACpB,kBAAkB,CAACqB,iBAAiB,CAAC,IAAI,CAACpB,WAAW,CAACqB,gBAAgB;QAE3E,IAAI,CAACvB,MAAM,CAACwB,GAAG,CAAC;QAChB,MAAM,IAAI,CAACC,GAAG;IAChB;IAEA,MAAMA,MAAM;QACV,IAAI,IAAI,CAACT,aAAa,EAAE;YACtB,MAAM,IAAI,CAACC,cAAc,CAACS,gBAAgB;QAC5C,OAAO;YACL,IAAI;gBACF,MAAM,IAAI,CAACA,gBAAgB;gBAC3B,MAAM,IAAI,CAACC,eAAe;YAC5B,EAAE,OAAOC,GAAG;gBACV,IAAIA,aAAaC,iBAAQ,CAACC,KAAK,EAAE;oBAE/B,IAAI,CAACF,EAAEG,OAAO,CAACC,QAAQ,CAAC,sFAAsF;wBAE5G,IAAIJ,EAAEG,OAAO,CAACC,QAAQ,CAAC,iBAAiB;4BACtC,IAAI,CAAChC,MAAM,CAACiC,KAAK,CAAC;wBACpB,OAAO;4BACL,IAAI,CAACjC,MAAM,CAACiC,KAAK,CAAC,CAAC,2BAA2B,EAAEL,EAAEG,OAAO,EAAE;wBAC7D;wBACA,IAAI,CAAC9B,kBAAkB,CAACiC,mBAAmB,CAACC,yBAAQ,CAACC,QAAQ,EAAE;wBAC/D;oBACF;gBACF;YACF;QACF;QAEA,IAAI,CAACpC,MAAM,CAACwB,GAAG,CAAC;QAChB,MAAM,IAAI,CAACrB,aAAa,CAACkC,YAAY;QAErC,IAAI,CAACrC,MAAM,CAACwB,GAAG,CAAC;QAChB,MAAM,IAAI,CAAChB,iBAAiB,CAAC8B,eAAe;QAC5C,MAAM,IAAI,CAAC7B,WAAW,CAAC8B,SAAS;QAEhC,MAAMC,aAAa,IAAI,CAACzB,aAAa,CAACyB,UAAU;QAChD,IAAIA,YAAY;YACd,IAAI,CAACxC,MAAM,CAACyC,IAAI,CAAC,CAAC,6BAA6B,EAAEC,6BAAY,CAACC,qBAAqB,EAAE;YACrF,MAAM,IAAI,CAACC,yBAAyB;YACpC,IAAI,CAAC5C,MAAM,CAACyC,IAAI,CAAC,CAAC,yDAAyD,EAAEC,6BAAY,CAACC,qBAAqB,EAAE;YACjH,MAAM,IAAI,CAACxC,aAAa,CAAC0C,gBAAgB,CAAC;YAC1C,MAAM,IAAI,CAAC1C,aAAa,CAAC2C,sBAAsB,CAAC;QAClD,OAAO;YACL,MAAMC,gBAAgB,IAAI,CAAChC,aAAa,CAACiC,GAAG,CAACN,6BAAY,CAACO,uBAAuB,EAAE;YACnF,IAAIF,kBAAkB,MAAM;gBAC1B,IAAI,CAAC/C,MAAM,CAACyC,IAAI,CAAC,CAAC,8BAA8B,EAAEC,6BAAY,CAACO,uBAAuB,EAAE;gBACxF,MAAM,IAAI,CAAC9C,aAAa,CAAC0C,gBAAgB,CAACE,kBAAkB;YAC9D;YAEA,MAAMG,sBAAsB,IAAI,CAACnC,aAAa,CAACiC,GAAG,CAACN,6BAAY,CAACS,6BAA6B,EAAE;YAC/F,IAAID,wBAAwB,MAAM;gBAChC,IAAI,CAAClD,MAAM,CAACyC,IAAI,CAAC,CAAC,oCAAoC,EAAEC,6BAAY,CAACS,6BAA6B,EAAE;gBACpG,MAAM,IAAI,CAAChD,aAAa,CAAC2C,sBAAsB,CAACI,wBAAwB;YAC1E;QACF;QAEA,MAAME,oBAAoB,IAAI,CAACrC,aAAa,CAACiC,GAAG,CAACN,6BAAY,CAACW,mBAAmB,EAAEC;QACnF,MAAMC,uBAAuB,IAAI,CAACxC,aAAa,CAACiC,GAAG,CAACN,6BAAY,CAACc,uBAAuB,EAAEF;QAC1F,MAAM,IAAI,CAACnD,aAAa,CAACsD,iCAAiC,CAACL,mBAAmBG;QAE9E,IAAI,CAACvD,MAAM,CAACwB,GAAG,CAAC;QAChB,IAAI,CAACnB,aAAa,CAACqD,kBAAkB;QACrC,IAAI,CAAC1D,MAAM,CAACwB,GAAG,CAAC;QAChB,MAAM,IAAI,CAAClB,kBAAkB,CAACqD,kBAAkB;QAChD,IAAI,CAAC3D,MAAM,CAACwB,GAAG,CAAC;QAChB,MAAM,IAAI,CAACjB,iBAAiB,CAACqD,cAAc;QAC3C,IAAI,CAAC5D,MAAM,CAACwB,GAAG,CAAC;QAChB,MAAM,IAAI,CAACZ,UAAU,CAACiD,SAAS;QAE/B,IAAIC,QAAQC,GAAG,CAACC,gBAAgB,KAAK,QAAQ;YAC3C,IAAI,CAAChE,MAAM,CAACyC,IAAI,CAAC;QACnB,OAAO;YACL,IAAI,CAACvC,WAAW,CAAC+D,UAAU,CAACC,OAAO,CAAC,CAACC;gBACnC,IAAI,CAAClE,kBAAkB,CAACqB,iBAAiB,CAAC6C;YAC5C;QACF;QAGA,IAAI,CAAClE,kBAAkB,CAACmE,UAAU,CAACjC,yBAAQ,CAACC,QAAQ,EAAE;IACxD;IAEA,MAAMQ,4BAA4B;QAChC,MAAMyB,eAAe,IAAI,CAACtD,aAAa,CAACiC,GAAG,CAACN,6BAAY,CAAC4B,sBAAsB,EAAE5B,6BAAY,CAAC6B,qBAAqB;QACnH,MAAMC,eAAe,IAAI,CAACzD,aAAa,CAACiC,GAAG,CAACN,6BAAY,CAAC+B,sBAAsB,EAAE/B,6BAAY,CAACgC,qBAAqB;QACnH,MAAMC,WAAW,IAAI,CAAC5D,aAAa,CAACiC,GAAG,CAACN,6BAAY,CAACkC,kBAAkB,EAAElC,6BAAY,CAACmC,iBAAiB;QACvG,MAAMC,YAAY,IAAI,CAACrE,WAAW,CAACsE,aAAa,CAACJ;QAEjD,MAAMK,aAAa,MAAM,IAAI,CAACtE,WAAW,CAACuE,aAAa;QACvD,IAAI,CAACD,YAAY;YACf,MAAM,IAAI,CAACtE,WAAW,CAACwE,QAAQ,CAAC;gBAC9BC,UAAUd;gBACVe,UAAUZ;gBACVa,YAAY;gBACZC,YAAY;gBACZC,YAAY;gBACZC,qBAAqB;gBACrBC,OAAO;oBAACX,UAAUY,EAAE;iBAAC;YACvB;YACA,IAAI,CAAC1F,MAAM,CAACwB,GAAG,CAAC;QAClB,OAAO;YACL,MAAM,IAAI,CAACd,WAAW,CAACiF,eAAe,CAACX,YAAY;YACnD,MAAM,IAAI,CAACtE,WAAW,CAACkF,iBAAiB,CAACZ,YAAY;YACrD,MAAM,IAAI,CAACtE,WAAW,CAACmF,8BAA8B,CAACxB,cAAcG;YACpE,MAAM,IAAI,CAAC9D,WAAW,CAACoF,cAAc,CAACd,YAAY;gBAACF,UAAUY,EAAE;aAAC;YAChE,IAAI,CAAC1F,MAAM,CAACwB,GAAG,CAAC;QAClB;IACF;IAEA,MAAME,mBAAmB;QACvB,IAAI,CAAC,IAAI,CAACV,aAAa,EAAE;YACvB,MAAM+E,SAASC,IAAAA,uCAA4B;YAC3C,MAAMC,IAAAA,iBAAO,EAACF,QAAQ;gBACpBG,0BAA0B;YAC5B;YACA,MAAMC,IAAAA,qBAAW;QACnB;IACF;IAEA,MAAMxE,kBAAkB;QACtB,IAAI,CAAC,IAAI,CAACX,aAAa,EAAE;YACvB,MAAMoF,IAAAA,wBAAa,EAACvE,iBAAQ,CAACwE,UAAU,CAACC,EAAE,EAAEzE,iBAAQ,CAACwE,UAAU,CAACE,SAAS;QAC3E;IACF;AACF"}

package/dist/tasks/client-bundle.task.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/tasks/client-bundle.task.ts"],"names":["ClientDistDownloadTask","clientBundleService","githubService","logger","constructor","loggerFactory","name","run","result","shouldUpdateWithReason","AppConstants","defaultClientMinimum","shouldUpdate","log","reason","downloadClientUpdate"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAMaA;;;eAAAA;;;iCANgB;AAMtB,MAAMA;IACXC,oBAAyC;IACzCC,cAA6B;IAC7BC,OAAsB;IAEtBC,YAAY,EACVH,mBAAmB,EACnBI,aAAa,EACbH,aAAa,EAKd,CAAE;QACD,IAAI,CAACA,aAAa,GAAGA;QACrB,IAAI,CAACD,mBAAmB,GAAGA;QAC3B,IAAI,CAACE,MAAM,GAAGE,cAAcL,uBAAuBM,IAAI;IACzD;IAEA,MAAMC,MAAM;QACV,MAAMC,SAAS,MAAM,IAAI,CAACP,mBAAmB,CAACQ,sBAAsB,CAAC,OAAOC,6BAAY,CAACC,oBAAoB;QAC7G,IAAI,CAACH,OAAOI,YAAY,EAAE;YACxB,IAAI,CAACT,MAAM,CAACU,GAAG,CAAC,CAAC,sCAAsC,EAAEL,OAAOM,MAAM,CAAC,CAAC;YACxE;QACF;QAEA,IAAI,CAACX,MAAM,CAACU,GAAG,CAAC,CAAC,oDAAoD,EAAEL,OAAOM,MAAM,CAAC,CAAC;QAEtF,MAAM,IAAI,CAACb,mBAAmB,CAACc,oBAAoB,CAACL,6BAAY,CAACC,oBAAoB;IACvF;AACF"}
+{"version":3,"sources":["../../src/tasks/client-bundle.task.ts"],"names":["ClientDistDownloadTask","clientBundleService","githubService","logger","constructor","loggerFactory","name","run","result","shouldUpdateWithReason","AppConstants","defaultClientMinimum","shouldUpdate","log","reason","downloadClientUpdate"],"mappings":";;;;+BAMaA;;;eAAAA;;;iCANgB;AAMtB,MAAMA;IACXC,oBAAyC;IACzCC,cAA6B;IAC7BC,OAAsB;IAEtBC,YAAY,EACVH,mBAAmB,EACnBI,aAAa,EACbH,aAAa,EAKd,CAAE;QACD,IAAI,CAACA,aAAa,GAAGA;QACrB,IAAI,CAACD,mBAAmB,GAAGA;QAC3B,IAAI,CAACE,MAAM,GAAGE,cAAcL,uBAAuBM,IAAI;IACzD;IAEA,MAAMC,MAAM;QACV,MAAMC,SAAS,MAAM,IAAI,CAACP,mBAAmB,CAACQ,sBAAsB,CAAC,OAAOC,6BAAY,CAACC,oBAAoB;QAC7G,IAAI,CAACH,OAAOI,YAAY,EAAE;YACxB,IAAI,CAACT,MAAM,CAACU,GAAG,CAAC,CAAC,sCAAsC,EAAEL,OAAOM,MAAM,EAAE;YACxE;QACF;QAEA,IAAI,CAACX,MAAM,CAACU,GAAG,CAAC,CAAC,oDAAoD,EAAEL,OAAOM,MAAM,EAAE;QAEtF,MAAM,IAAI,CAACb,mBAAmB,CAACc,oBAAoB,CAACL,6BAAY,CAACC,oBAAoB;IACvF;AACF"}

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","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"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"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,uBAAgD;IAEhDC,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,UAAU;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

@@ -14,12 +14,12 @@ class PrinterFileCleanTask {
     printerCache;
     settingsStore;
     taskManagerService;
-    octoPrintApiService;
-    constructor({ printerCache, printerFilesStore, octoPrintApiService, taskManagerService, settingsStore, loggerFactory }){
+    octoprintClient;
+    constructor({ printerCache, printerFilesStore, octoprintClient, taskManagerService, settingsStore, loggerFactory }){
         this.printerCache = printerCache;
         this.printerFilesStore = printerFilesStore;
         this.taskManagerService = taskManagerService;
-        this.octoPrintApiService = octoPrintApiService;
+        this.octoprintClient = octoprintClient;
         this.settingsStore = settingsStore;
         this.logger = loggerFactory(PrinterFileCleanTask.name);
     }
@@ -39,7 +39,7 @@ class PrinterFileCleanTask {
             const errorPrinters = [];
             for (let printer of printers){
                 try {
-                    await this.printerFilesStore.eagerLoadPrinterFiles(printer.id, false);
+                    await this.printerFilesStore.loadFiles(printer.id, false);
                 } catch (e) {
                     errorPrinters.push({
                         e,
@@ -64,7 +64,7 @@ class PrinterFileCleanTask {
     }
     async cleanPrinterFiles(printerId) {
         await this.printerFilesStore.deleteOutdatedFiles(printerId, this.ageDaysMaxSetting);
-        await this.printerFilesStore.eagerLoadPrinterFiles(printerId, false);
+        await this.printerFilesStore.loadFiles(printerId, false);
     }
     getPrinterOutdatedFiles(printer) {
         const ageDaysMax = this.ageDaysMaxSetting;

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","errorPrinters","printer","eagerLoadPrinterFiles","id","e","push","error","outdatedFiles","getPrinterOutdatedFiles","cleanPrinterFiles","printerId","deleteOutdatedFiles","ageDaysMax","getOutdatedFiles","getFileCleanSettings"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","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;QACV,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;YAEA,MAAMC,gBAAgB,EAAE;YACxB,KAAK,IAAIC,WAAWR,SAAU;gBAC5B,IAAI;oBACF,MAAM,IAAI,CAACZ,iBAAiB,CAACqB,qBAAqB,CAACD,QAAQE,EAAE,EAAE;gBACjE,EAAE,OAAOC,GAAG;oBACVJ,cAAcK,IAAI,CAAC;wBAAED;wBAAGH;oBAAQ;gBAClC;YACF;YACA,IAAID,cAAcD,MAAM,GAAG,GAAG;gBAC5B,IAAI,CAACnB,MAAM,CAAC0B,KAAK,CACf,CAAC,0BAA0B,EAAEN,cAAcD,MAAM,CAAC,gHAAgH,CAAC;YAEvK;YAGA,KAAK,IAAIE,WAAWR,SAAU;gBAC5B,MAAMc,gBAAgB,IAAI,CAACC,uBAAuB,CAACP;gBACnD,IAAI,CAACM,eAAeR,QAAQ;gBAG5B,IAAI,CAACnB,MAAM,CAACkB,GAAG,CAAC,CAAC,MAAM,EAAES,eAAeR,OAAO,qBAAqB,CAAC;gBAErE,IAAIH,wBAAwB;oBAC1B,MAAM,IAAI,CAACa,iBAAiB,CAACR,QAAQE,EAAE;gBACzC;YACF;QACF,SAAU;YACR,IAAI,CAACvB,MAAM,CAACkB,GAAG,CAAC,CAAC,mCAAmC,CAAC;QACvD;IACF;IAEA,MAAMW,kBAAkBC,SAAiB,EAAE;QACzC,MAAM,IAAI,CAAC7B,iBAAiB,CAAC8B,mBAAmB,CAACD,WAAW,IAAI,CAACrB,iBAAiB;QAClF,MAAM,IAAI,CAACR,iBAAiB,CAACqB,qBAAqB,CAACQ,WAAW;IAChE;IAEAF,wBAAwBP,OAA2B,EAAE;QACnD,MAAMW,aAAa,IAAI,CAACvB,iBAAiB;QACzC,OAAO,IAAI,CAACR,iBAAiB,CAACgC,gBAAgB,CAACZ,QAAQE,EAAE,EAAES;IAC7D;IAEQtB,cAAc;QACpB,OAAO,IAAI,CAACP,aAAa,CAAC+B,oBAAoB;IAChD;AACF"}
+{"version":3,"sources":["../../src/tasks/printer-file-clean.task.ts"],"names":["PrinterFileCleanTask","logger","printerFilesStore","printerCache","settingsStore","taskManagerService","octoprintClient","constructor","loggerFactory","name","ageDaysMaxSetting","getSettings","autoRemoveOldFilesCriteriumDays","run","printers","listCachedPrinters","fileCleanSettings","autoCleanAtBootEnabled","autoRemoveOldFilesAtBoot","log","length","errorPrinters","printer","loadFiles","id","e","push","error","outdatedFiles","getPrinterOutdatedFiles","cleanPrinterFiles","printerId","deleteOutdatedFiles","ageDaysMax","getOutdatedFiles","getFileCleanSettings"],"mappings":";;;;+BAcaA;;;eAAAA;;;AAAN,MAAMA;IACXC,OAAsB;IACtBC,kBAAqC;IACrCC,aAA2B;IAC3BC,cAA6B;IAC7BC,mBAAuC;IACvCC,gBAAiC;IAEjCC,YAAY,EACVJ,YAAY,EACZD,iBAAiB,EACjBI,eAAe,EACfD,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,eAAe,GAAGA;QACvB,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;QACV,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;YAEA,MAAMC,gBAAgB,EAAE;YACxB,KAAK,IAAIC,WAAWR,SAAU;gBAC5B,IAAI;oBACF,MAAM,IAAI,CAACZ,iBAAiB,CAACqB,SAAS,CAACD,QAAQE,EAAE,EAAE;gBACrD,EAAE,OAAOC,GAAG;oBACVJ,cAAcK,IAAI,CAAC;wBAAED;wBAAGH;oBAAQ;gBAClC;YACF;YACA,IAAID,cAAcD,MAAM,GAAG,GAAG;gBAC5B,IAAI,CAACnB,MAAM,CAAC0B,KAAK,CACf,CAAC,0BAA0B,EAAEN,cAAcD,MAAM,CAAC,gHAAgH,CAAC;YAEvK;YAGA,KAAK,IAAIE,WAAWR,SAAU;gBAC5B,MAAMc,gBAAgB,IAAI,CAACC,uBAAuB,CAACP;gBACnD,IAAI,CAACM,eAAeR,QAAQ;gBAG5B,IAAI,CAACnB,MAAM,CAACkB,GAAG,CAAC,CAAC,MAAM,EAAES,eAAeR,OAAO,qBAAqB,CAAC;gBAErE,IAAIH,wBAAwB;oBAC1B,MAAM,IAAI,CAACa,iBAAiB,CAACR,QAAQE,EAAE;gBACzC;YACF;QACF,SAAU;YACR,IAAI,CAACvB,MAAM,CAACkB,GAAG,CAAC,CAAC,mCAAmC,CAAC;QACvD;IACF;IAEA,MAAMW,kBAAkBC,SAAiB,EAAE;QACzC,MAAM,IAAI,CAAC7B,iBAAiB,CAAC8B,mBAAmB,CAACD,WAAW,IAAI,CAACrB,iBAAiB;QAClF,MAAM,IAAI,CAACR,iBAAiB,CAACqB,SAAS,CAACQ,WAAW;IACpD;IAEAF,wBAAwBP,OAA2B,EAAE;QACnD,MAAMW,aAAa,IAAI,CAACvB,iBAAiB;QACzC,OAAO,IAAI,CAACR,iBAAiB,CAACgC,gBAAgB,CAACZ,QAAQE,EAAE,EAAES;IAC7D;IAEQtB,cAAc;QACpB,OAAO,IAAI,CAACP,aAAa,CAAC+B,oBAAoB;IAChD;AACF"}

package/dist/tasks/printer-state-update-poll.task.js

@@ -8,24 +8,24 @@ Object.defineProperty(exports, "PrinterStateUpdatePollTask", {
         return PrinterStateUpdatePollTask;
     }
 });
-const _nodefs = require("node:fs");
 const _serverconstants = require("../server.constants");
+const _printerapiinterface = require("../services/printer-api.interface");
 class PrinterStateUpdatePollTask {
     printerCache;
-    printerConnectionCache;
     printerEventsCache;
     settingsStore;
     configService;
-    octoPrintApiService;
+    octoprintClient;
+    moonrakerClient;
     taskManagerService;
     logger;
-    constructor({ printerCache, printerConnectionCache, printerEventsCache, octoPrintApiService, settingsStore, configService, taskManagerService, loggerFactory }){
+    constructor({ printerCache, printerEventsCache, octoprintClient, moonrakerClient, settingsStore, configService, taskManagerService, loggerFactory }){
         this.printerCache = printerCache;
-        this.printerConnectionCache = printerConnectionCache;
         this.printerEventsCache = printerEventsCache;
         this.settingsStore = settingsStore;
         this.configService = configService;
-        this.octoPrintApiService = octoPrintApiService;
+        this.octoprintClient = octoprintClient;
+        this.moonrakerClient = moonrakerClient;
         this.taskManagerService = taskManagerService;
         this.logger = loggerFactory(PrinterStateUpdatePollTask.name);
     }
@@ -42,44 +42,20 @@ class PrinterStateUpdatePollTask {
         let paused = 0;
         for (const printer of printers){
             const login = this.printerCache.getLoginDto(printer.id);
-            try {
-                const promise = await this.octoPrintApiService.getConnection(login).then(async (connection)=>{
-                    await this.printerConnectionCache.setPrinterConnection(printer.id, connection);
-                    if (this._isDebugMode()) {
-                        (0, _nodefs.writeFileSync)(`printer_connection_${printer.id}.txt`, JSON.stringify(connection, null, 2));
-                    }
-                    const current = await this.octoPrintApiService.getPrinterCurrent(login, false, null, [
-                        "sd",
-                        "temperature"
-                    ]).catch(async (e)=>{
-                        if (e.isAxiosError) {
-                            const castError = e;
-                            if (castError?.response?.status == 409) {
-                                await this.printerEventsCache.setSubstate(printer.id, "current", "state", {});
-                                disconnected += 1;
-                                return null;
-                            }
-                        }
-                        throw e;
-                    });
-                    if (!current) return;
-                    if (this._isDebugMode()) {
-                        (0, _nodefs.writeFileSync)(`printer_current_${printer.id}.txt`, JSON.stringify(current, null, 2));
-                    }
-                    const currentState = current.state;
-                    operational += currentState?.flags.operational ? 1 : 0;
-                    disconnected += currentState?.flags.closedOrError ? 1 : 0;
-                    printing += currentState?.flags.printing ? 1 : 0;
-                    paused += currentState?.flags.paused ? 1 : 0;
-                    await this.printerEventsCache.setSubstate(printer.id, "current", "state", current);
+            if (login.printerType === _printerapiinterface.MoonrakerType) {
+                const promise = this.verifyMoonrakerState(login).then((r)=>{
+                    operational += r.state === "ready" ? 1 : 0;
+                }).catch((e)=>{
+                    failures++;
                 });
                 promisesStateUpdate.push(promise);
-            } catch (e) {
-                failures++;
-            }
+            } else {}
         }
-        await Promise.all(promisesStateUpdate);
-        this.logger.log(`Printer state updates (total: ${printers.length}, failed: ${failures}, disabled: ${disabledPrintersCount}, operational: ${operational}, disconnected: ${disconnected}, offlineAfterError: ${offlineAfterError}, printing: ${printing}, paused: ${paused}) completed (${Date.now() - startTime}ms)`);
+    }
+    async verifyMoonrakerState(login) {
+        return await this.moonrakerClient.getPrinterInfo(login).then((r)=>{
+            return r.data.result;
+        });
     }
     _isDebugMode() {
         return this.configService.get(_serverconstants.AppConstants.debugFileWritePrinterStatesKey, _serverconstants.AppConstants.defaultDebugFileWritePrinterStates) === "true";

package/dist/tasks/printer-state-update-poll.task.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/tasks/printer-state-update-poll.task.ts"],"names":["PrinterStateUpdatePollTask","printerCache","printerConnectionCache","printerEventsCache","settingsStore","configService","octoPrintApiService","taskManagerService","logger","constructor","loggerFactory","name","run","startTime","Date","now","disabledPrintersCount","countDisabledPrinters","printers","listCachedPrinters","promisesStateUpdate","failures","operational","disconnected","offlineAfterError","printing","paused","printer","login","getLoginDto","id","promise","getConnection","then","connection","setPrinterConnection","_isDebugMode","writeFileSync","JSON","stringify","current","getPrinterCurrent","catch","e","isAxiosError","castError","response","status","setSubstate","currentState","state","flags","closedOrError","push","Promise","all","log","length","get","AppConstants","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../src/tasks/printer-state-update-poll.task.ts"],"names":["PrinterStateUpdatePollTask","printerCache","printerEventsCache","settingsStore","configService","octoprintClient","moonrakerClient","taskManagerService","logger","constructor","loggerFactory","name","run","startTime","Date","now","disabledPrintersCount","countDisabledPrinters","printers","listCachedPrinters","promisesStateUpdate","failures","operational","disconnected","offlineAfterError","printing","paused","printer","login","getLoginDto","id","printerType","MoonrakerType","promise","verifyMoonrakerState","then","r","state","catch","e","push","getPrinterInfo","data","result","_isDebugMode","get","AppConstants","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates"],"mappings":";;;;+BAaaA;;;eAAAA;;;iCALgB;qCAGC;AAEvB,MAAMA;IACXC,aAA2B;IAC3BC,mBAAuC;IACvCC,cAA6B;IAC7BC,cAA6B;IAC7BC,gBAAiC;IACjCC,gBAAiC;IACjCC,mBAAuC;IACvCC,OAAsB;IAEtBC,YAAY,EACVR,YAAY,EACZC,kBAAkB,EAClBG,eAAe,EACfC,eAAe,EACfH,aAAa,EACbC,aAAa,EACbG,kBAAkB,EAClBG,aAAa,EAUd,CAAE;QACD,IAAI,CAACT,YAAY,GAAGA;QACpB,IAAI,CAACC,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,aAAa,GAAGA;QACrB,IAAI,CAACC,aAAa,GAAGA;QACrB,IAAI,CAACC,eAAe,GAAGA;QACvB,IAAI,CAACC,eAAe,GAAGA;QACvB,IAAI,CAACC,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,MAAM,GAAGE,cAAcV,2BAA2BW,IAAI;IAC7D;IAEA,MAAMC,MAAM;QACV,MAAMC,YAAYC,KAAKC,GAAG;QAE1B,MAAMC,wBAAwB,MAAM,IAAI,CAACf,YAAY,CAACgB,qBAAqB;QAE3E,MAAMC,WAAW,MAAM,IAAI,CAACjB,YAAY,CAACkB,kBAAkB,CAAC;QAC5D,MAAMC,sBAAsB,EAAE;QAC9B,IAAIC,WAAW;QACf,IAAIC,cAAc;QAClB,IAAIC,eAAe;QACnB,IAAIC,oBAAoB;QACxB,IAAIC,WAAW;QACf,IAAIC,SAAS;QACb,KAAK,MAAMC,WAAWT,SAAU;YAC9B,MAAMU,QAAQ,IAAI,CAAC3B,YAAY,CAAC4B,WAAW,CAACF,QAAQG,EAAE;YACtD,IAAIF,MAAMG,WAAW,KAAKC,kCAAa,EAAE;gBACvC,MAAMC,UAAU,IAAI,CAACC,oBAAoB,CAACN,OACvCO,IAAI,CAAC,CAACC;oBACLd,eAAec,EAAEC,KAAK,KAAK,UAAU,IAAI;gBAC3C,GACCC,KAAK,CAAC,CAACC;oBACNlB;gBACF;gBAEFD,oBAAoBoB,IAAI,CAACP;YAC3B,OAAO,CAuCP;QACF;IAWF;IAEA,MAAcC,qBAAqBN,KAAe,EAAE;QAClD,OAAO,MAAM,IAAI,CAACtB,eAAe,CAACmC,cAAc,CAACb,OAAOO,IAAI,CAAC,CAACC;YAC5D,OAAOA,EAAEM,IAAI,CAACC,MAAM;QACtB;IACF;IAEQC,eAAe;QACrB,OACE,IAAI,CAACxC,aAAa,CAACyC,GAAG,CAACC,6BAAY,CAACC,8BAA8B,EAAED,6BAAY,CAACE,kCAAkC,MACnH;IAEJ;AACF"}

package/dist/tasks/printer-websocket-restore.task.js

@@ -9,16 +9,16 @@ Object.defineProperty(exports, "PrinterWebsocketRestoreTask", {
     }
 });
 const _errorutils = require("../utils/error.utils");
-const _octoprintsockioadapter = require("../services/octoprint/octoprint-sockio.adapter");
 const _node = require("@sentry/node");
+const _apistatetype = require("../shared/dtos/api-state.type");
 class PrinterWebsocketRestoreTask {
     settingsStore;
     printerSocketStore;
-    octoPrintApiService;
+    octoprintClient;
     logger;
-    constructor({ printerSocketStore, octoPrintApiService, settingsStore, loggerFactory }){
+    constructor({ printerSocketStore, octoprintClient, settingsStore, loggerFactory }){
         this.printerSocketStore = printerSocketStore;
-        this.octoPrintApiService = octoPrintApiService;
+        this.octoprintClient = octoprintClient;
         this.settingsStore = settingsStore;
         this.logger = loggerFactory(PrinterWebsocketRestoreTask.name);
     }
@@ -41,8 +41,8 @@ class PrinterWebsocketRestoreTask {
                 this.logger.error(`Resetting WebSocket socket failed for printer with error '${(0, _errorutils.errorSummary)(e)}'`, e.stack);
                 continue;
             }
-            if (socket.apiState !== _octoprintsockioadapter.API_STATE.unset && !socket.lastMessageReceivedTimestamp || Date.now() - socket.lastMessageReceivedTimestamp > 10 * 1000) {
-                const result = await this.octoPrintApiService.getConnection(socket.loginDto);
+            if (socket.apiState !== _apistatetype.API_STATE.unset && !socket.lastMessageReceivedTimestamp || Date.now() - socket.lastMessageReceivedTimestamp > 10 * 1000) {
+                const result = await this.octoprintClient.getConnection(socket.login);
                 silentSocketIds.push(socket.printerId);
                 try {
                     if (result?.current?.state !== "Closed") {

package/dist/tasks/printer-websocket-restore.task.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/tasks/printer-websocket-restore.task.ts"],"names":["PrinterWebsocketRestoreTask","settingsStore","printerSocketStore","octoPrintApiService","logger","constructor","loggerFactory","name","run","startTime","Date","now","existingSockets","listPrinterSockets","resetAdapterIds","silentSocketIds","socket","isClosedOrAborted","close","resetSocketState","warn","push","printerId","e","captureException","error","errorSummary","stack","apiState","API_STATE","unset","lastMessageReceivedTimestamp","result","getConnection","loginDto","current","state","duration","getSettingsSensitive","server","debugSettings","debugSocketRetries","log","length"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BASaA;;;eAAAA;;;4BATgB;wCACH;sBAMO;AAE1B,MAAMA;IACXC,cAA6B;IAC7BC,mBAAuC;IACvCC,oBAAyC;IACzCC,OAAsB;IAEtBC,YAAY,EACVH,kBAAkB,EAClBC,mBAAmB,EACnBF,aAAa,EACbK,aAAa,EAMd,CAAE;QACD,IAAI,CAACJ,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACF,aAAa,GAAGA;QACrB,IAAI,CAACG,MAAM,GAAGE,cAAcN,4BAA4BO,IAAI;IAC9D;IAEA,MAAMC,MAAM;QACV,MAAMC,YAAYC,KAAKC,GAAG;QAE1B,MAAMC,kBAAkB,IAAI,CAACV,kBAAkB,CAACW,kBAAkB;QAClE,MAAMC,kBAAkB,EAAE;QAC1B,MAAMC,kBAAkB,EAAE;QAC1B,KAAK,MAAMC,UAAUJ,gBAAiB;YACpC,IAAI;gBACF,IAAII,OAAOC,iBAAiB,IAAI;oBAC9BD,OAAOE,KAAK;oBACZF,OAAOG,gBAAgB;oBACvB,IAAI,CAACf,MAAM,CAACgB,IAAI,CAAC;oBACjBN,gBAAgBO,IAAI,CAACL,OAAOM,SAAS;oBACrC;gBACF;YACF,EAAE,OAAOC,GAAQ;gBACfC,IAAAA,sBAAgB,EAACD;gBACjB,IAAI,CAACnB,MAAM,CAACqB,KAAK,CAAC,CAAC,0DAA0D,EAAEC,IAAAA,wBAAY,EAACH,GAAG,CAAC,CAAC,EAAEA,EAAEI,KAAK;gBAC1G;YACF;YAGA,IACE,AAACX,OAAOY,QAAQ,KAAKC,iCAAS,CAACC,KAAK,IAAI,CAACd,OAAOe,4BAA4B,IAC5ErB,KAAKC,GAAG,KAAKK,OAAOe,4BAA4B,GAAG,KAAK,MACxD;gBACA,MAAMC,SAAS,MAAM,IAAI,CAAC7B,mBAAmB,CAAC8B,aAAa,CAACjB,OAAOkB,QAAQ;gBAE3EnB,gBAAgBM,IAAI,CAACL,OAAOM,SAAS;gBAErC,IAAI;oBACF,IAAIU,QAAQG,SAASC,UAAU,UAAU;wBACvC,IAAI,CAAChC,MAAM,CAACgB,IAAI,CACd,CAAC,4FAA4F,EAAEY,QAAQG,SAASC,MAAM,CAAC;oBAE3H;gBACF,EAAE,OAAOb,GAAG;oBACV,IAAI,CAACnB,MAAM,CAACqB,KAAK,CAAC,CAAC,sFAAsF,CAAC;gBAC5G;YACF;QACF;QAEA,MAAMY,WAAW3B,KAAKC,GAAG,KAAKF;QAC9B,IAAI,IAAI,CAACR,aAAa,CAACqC,oBAAoB,IAAIC,QAAQC,cAAcC,oBAAoB;YACvF,IAAI,CAACrC,MAAM,CAACsC,GAAG,CACb,CAAC,MAAM,EAAE5B,gBAAgB6B,MAAM,CAAC,qCAAqC,EAAE5B,gBAAgB4B,MAAM,CAAC,0BAA0B,EAAEN,SAAS,GAAG,CAAC;QAE3I;IACF;AACF"}
+{"version":3,"sources":["../../src/tasks/printer-websocket-restore.task.ts"],"names":["PrinterWebsocketRestoreTask","settingsStore","printerSocketStore","octoprintClient","logger","constructor","loggerFactory","name","run","startTime","Date","now","existingSockets","listPrinterSockets","resetAdapterIds","silentSocketIds","socket","isClosedOrAborted","close","resetSocketState","warn","push","printerId","e","captureException","error","errorSummary","stack","apiState","API_STATE","unset","lastMessageReceivedTimestamp","result","getConnection","login","current","state","duration","getSettingsSensitive","server","debugSettings","debugSocketRetries","log","length"],"mappings":";;;;+BASaA;;;eAAAA;;;4BATgB;sBAMI;8BACP;AAEnB,MAAMA;IACXC,cAA6B;IAC7BC,mBAAuC;IACvCC,gBAAiC;IACjCC,OAAsB;IAEtBC,YAAY,EACVH,kBAAkB,EAClBC,eAAe,EACfF,aAAa,EACbK,aAAa,EAMd,CAAE;QACD,IAAI,CAACJ,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,eAAe,GAAGA;QACvB,IAAI,CAACF,aAAa,GAAGA;QACrB,IAAI,CAACG,MAAM,GAAGE,cAAcN,4BAA4BO,IAAI;IAC9D;IAEA,MAAMC,MAAM;QACV,MAAMC,YAAYC,KAAKC,GAAG;QAE1B,MAAMC,kBAAkB,IAAI,CAACV,kBAAkB,CAACW,kBAAkB;QAClE,MAAMC,kBAAkB,EAAE;QAC1B,MAAMC,kBAAkB,EAAE;QAC1B,KAAK,MAAMC,UAAUJ,gBAAiB;YACpC,IAAI;gBACF,IAAII,OAAOC,iBAAiB,IAAI;oBAC9BD,OAAOE,KAAK;oBACZF,OAAOG,gBAAgB;oBACvB,IAAI,CAACf,MAAM,CAACgB,IAAI,CAAC;oBACjBN,gBAAgBO,IAAI,CAACL,OAAOM,SAAS;oBACrC;gBACF;YACF,EAAE,OAAOC,GAAQ;gBACfC,IAAAA,sBAAgB,EAACD;gBACjB,IAAI,CAACnB,MAAM,CAACqB,KAAK,CAAC,CAAC,0DAA0D,EAAEC,IAAAA,wBAAY,EAACH,GAAG,CAAC,CAAC,EAAEA,EAAEI,KAAK;gBAC1G;YACF;YAGA,IACE,AAACX,OAAOY,QAAQ,KAAKC,uBAAS,CAACC,KAAK,IAAI,CAACd,OAAOe,4BAA4B,IAC5ErB,KAAKC,GAAG,KAAKK,OAAOe,4BAA4B,GAAG,KAAK,MACxD;gBACA,MAAMC,SAAS,MAAM,IAAI,CAAC7B,eAAe,CAAC8B,aAAa,CAACjB,OAAOkB,KAAK;gBAEpEnB,gBAAgBM,IAAI,CAACL,OAAOM,SAAS;gBAErC,IAAI;oBACF,IAAIU,QAAQG,SAASC,UAAU,UAAU;wBACvC,IAAI,CAAChC,MAAM,CAACgB,IAAI,CACd,CAAC,4FAA4F,EAAEY,QAAQG,SAASC,OAAO;oBAE3H;gBACF,EAAE,OAAOb,GAAG;oBACV,IAAI,CAACnB,MAAM,CAACqB,KAAK,CAAC,CAAC,sFAAsF,CAAC;gBAC5G;YACF;QACF;QAEA,MAAMY,WAAW3B,KAAKC,GAAG,KAAKF;QAC9B,IAAI,IAAI,CAACR,aAAa,CAACqC,oBAAoB,IAAIC,QAAQC,cAAcC,oBAAoB;YACvF,IAAI,CAACrC,MAAM,CAACsC,GAAG,CACb,CAAC,MAAM,EAAE5B,gBAAgB6B,MAAM,CAAC,qCAAqC,EAAE5B,gBAAgB4B,MAAM,CAAC,0BAA0B,EAAEN,SAAS,GAAG,CAAC;QAE3I;IACF;AACF"}

package/dist/tasks/printer-websocket.task.js

@@ -11,13 +11,13 @@ Object.defineProperty(exports, "PrinterWebsocketTask", {
 class PrinterWebsocketTask {
     printerSocketStore;
     settingsStore;
-    octoPrintApiService;
+    octoprintClient;
     taskManagerService;
     logger;
-    constructor({ printerSocketStore, octoPrintApiService, settingsStore, taskManagerService, loggerFactory }){
+    constructor({ printerSocketStore, octoprintClient, settingsStore, taskManagerService, loggerFactory }){
         this.printerSocketStore = printerSocketStore;
         this.settingsStore = settingsStore;
-        this.octoPrintApiService = octoPrintApiService;
+        this.octoprintClient = octoprintClient;
         this.taskManagerService = taskManagerService;
         this.logger = loggerFactory(PrinterWebsocketTask.name);
     }

package/dist/tasks/printer-websocket.task.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/tasks/printer-websocket.task.ts"],"names":["PrinterWebsocketTask","printerSocketStore","settingsStore","octoPrintApiService","taskManagerService","logger","constructor","loggerFactory","name","run","startTime","Date","now","result","reconnectPrinterSockets","getDebugSettingsSensitive","debugSocketReconnect","log"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAOaA;;;eAAAA;;;AAAN,MAAMA;IACXC,mBAAuC;IACvCC,cAA6B;IAC7BC,oBAAyC;IACzCC,mBAAuC;IAEvCC,OAAsB;IAEtBC,YAAY,EACVL,kBAAkB,EAClBE,mBAAmB,EACnBD,aAAa,EACbE,kBAAkB,EAClBG,aAAa,EAOd,CAAE;QACD,IAAI,CAACN,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,aAAa,GAAGA;QACrB,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACC,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,MAAM,GAAGE,cAAcP,qBAAqBQ,IAAI;IACvD;IAEA,MAAMC,MAAM;QACV,MAAMC,YAAYC,KAAKC,GAAG;QAC1B,MAAMC,SAAS,MAAM,IAAI,CAACZ,kBAAkB,CAACa,uBAAuB;QACpE,IAAI,IAAI,CAACZ,aAAa,CAACa,yBAAyB,IAAIC,sBAAsB;YACxE,IAAI,CAACX,MAAM,CAACY,GAAG,CAAC,CAAC,kBAAkB,EAAEN,KAAKC,GAAG,KAAKF,UAAU,GAAG,CAAC,EAAEG;QACpE;IACF;AACF"}
+{"version":3,"sources":["../../src/tasks/printer-websocket.task.ts"],"names":["PrinterWebsocketTask","printerSocketStore","settingsStore","octoprintClient","taskManagerService","logger","constructor","loggerFactory","name","run","startTime","Date","now","result","reconnectPrinterSockets","getDebugSettingsSensitive","debugSocketReconnect","log"],"mappings":";;;;+BAOaA;;;eAAAA;;;AAAN,MAAMA;IACXC,mBAAuC;IACvCC,cAA6B;IAC7BC,gBAAiC;IACjCC,mBAAuC;IAEvCC,OAAsB;IAEtBC,YAAY,EACVL,kBAAkB,EAClBE,eAAe,EACfD,aAAa,EACbE,kBAAkB,EAClBG,aAAa,EAOd,CAAE;QACD,IAAI,CAACN,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,aAAa,GAAGA;QACrB,IAAI,CAACC,eAAe,GAAGA;QACvB,IAAI,CAACC,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,MAAM,GAAGE,cAAcP,qBAAqBQ,IAAI;IACvD;IAEA,MAAMC,MAAM;QACV,MAAMC,YAAYC,KAAKC,GAAG;QAC1B,MAAMC,SAAS,MAAM,IAAI,CAACZ,kBAAkB,CAACa,uBAAuB;QACpE,IAAI,IAAI,CAACZ,aAAa,CAACa,yBAAyB,IAAIC,sBAAsB;YACxE,IAAI,CAACX,MAAM,CAACY,GAAG,CAAC,CAAC,kBAAkB,EAAEN,KAAKC,GAAG,KAAKF,UAAU,GAAG,CAAC,EAAEG;QACpE;IACF;AACF"}