@fdm-monster/server 1.8.3 → 1.9.0

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","printerType","registerCredentials","printerId","loginDto","apiKey","printerURL","testEvents","octoPrintEvent","WsMessage","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","moonrakerEvent","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","disallowEmittingEvents","emit","printerEvents","printersDeleted","printerIds","off"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","logger","constructor","loggerFactory","socketFactory","socketIoGateway","eventEmitter2","name","setupTestPrinter","correlationToken","printer","close","validatedData","validateInput","createTestPrinterSchema","enabled","createInstance","printerType","registerCredentials","printerId","loginDto","apiKey","username","password","printerURL","testEvents","octoPrintEvent","WsMessage","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","moonrakerEvent","listener","event","payload","send","forEach","te","on","log","setupSocketSession","promise","Promise","resolve","reject","error","open","_startTime","setInterval","warn","Error","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","e","errorSummary","captureException","disallowEmittingEvents","emit","printerEvents","printersDeleted","printerIds","off"],"mappings":"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"}

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

@@ -2,20 +2,22 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "createTestPrinterRules", {
+Object.defineProperty(exports, "createTestPrinterSchema", {
     enumerable: true,
     get: function() {
-        return createTestPrinterRules;
+        return createTestPrinterSchema;
     }
 });
-const _serviceconstants = require("../../constants/service.constants");
-const _printerapiinterface = require("../../services/printer-api.interface");
-const createTestPrinterRules = {
-    enabled: "boolean",
-    printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
-    correlationToken: "required|string",
-    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.apiKeyLengthMaxDefault},${_serviceconstants.apiKeyLengthMinDefault}|alphaDash`,
-    printerURL: "required|httpurl"
-};
+const _zod = require("zod");
+const _printerservicevalidation = require("../../services/validators/printer-service.validation");
+const createTestPrinterSchema = _zod.z.object({
+    printerURL: _printerservicevalidation.printerUrlValidator,
+    printerType: _printerservicevalidation.printerTypeValidator,
+    apiKey: _printerservicevalidation.printerApiKeyValidator,
+    enabled: _printerservicevalidation.printerEnabledValidator.optional(),
+    name: _printerservicevalidation.printerNameValidator.optional(),
+    username: _printerservicevalidation.printerUsernameValidator.optional(),
+    password: _printerservicevalidation.printerPasswordValidator.optional()
+}).strict().superRefine(_printerservicevalidation.refineApiKeyValidator);
 
 //# sourceMappingURL=create-test-printer.validation.js.map

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","enabled","printerType","OctoprintType","MoonrakerType","correlationToken","apiKey","apiKeyLengthMaxDefault","apiKeyLengthMinDefault","printerURL"],"mappings":";;;;+BAGaA;;;eAAAA;;;kCAHkD;qCAClB;AAEtC,MAAMA,yBAAyB;IACpCC,SAAS;IACTC,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,kBAAkB;IAClBC,QAAQ,CAAC,uBAAuB,EAAEH,kCAAa,CAAC,QAAQ,EAAEI,wCAAsB,CAAC,CAAC,EAAEC,wCAAsB,CAAC,UAAU,CAAC;IACtHC,YAAY;AACd"}
+{"version":3,"sources":["../../../src/state/validation/create-test-printer.validation.ts"],"names":["createTestPrinterSchema","z","object","printerURL","printerUrlValidator","printerType","printerTypeValidator","apiKey","printerApiKeyValidator","enabled","printerEnabledValidator","optional","name","printerNameValidator","username","printerUsernameValidator","password","printerPasswordValidator","strict","superRefine","refineApiKeyValidator"],"mappings":";;;;+BAYaA;;;eAAAA;;;qBAZK;0CAUX;AAEA,MAAMA,0BAA0BC,MAAC,CACrCC,MAAM,CAAC;IACNC,YAAYC,6CAAmB;IAC/BC,aAAaC,8CAAoB;IACjCC,QAAQC,gDAAsB;IAC9BC,SAASC,iDAAuB,CAACC,QAAQ;IACzCC,MAAMC,8CAAoB,CAACF,QAAQ;IACnCG,UAAUC,kDAAwB,CAACJ,QAAQ;IAC3CK,UAAUC,kDAAwB,CAACN,QAAQ;AAC7C,GACCO,MAAM,GACNC,WAAW,CAACC,+CAAqB"}

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":";;;;+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":";;;;+BAEaA;;;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

@@ -12,6 +12,7 @@ const _mongoose = /*#__PURE__*/ _interop_require_wildcard(require("mongoose"));
 const _serverenv = require("../server.env");
 const _containertokens = require("../container.tokens");
 const _serverconstants = require("../server.constants");
+const _tasks = require("../tasks");
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
     var cacheBabelInterop = new WeakMap();
@@ -54,30 +55,22 @@ function _interop_require_wildcard(obj, nodeInterop) {
     return newObj;
 }
 class BootTask {
-    logger;
     taskManagerService;
-    serverTasks;
     settingsStore;
-    settingsService;
     multerService;
     printerSocketStore;
     printerFilesStore;
     permissionService;
     roleService;
     userService;
-    pluginRepositoryCache;
     floorStore;
-    pluginFirmwareUpdateService;
-    clientBundleService;
     configService;
-    isTypeormMode;
     typeormService;
+    isTypeormMode;
     printerThumbnailCache;
-    constructor({ loggerFactory, serverTasks, settingsService, settingsStore, multerService, printerSocketStore, printerFilesStore, permissionService, roleService, userService, taskManagerService, pluginRepositoryCache, floorStore, clientBundleService, configService, typeormService, isTypeormMode, printerThumbnailCache }){
-        this.isTypeormMode = isTypeormMode;
-        this.logger = loggerFactory(BootTask.name);
-        this.serverTasks = serverTasks;
-        this.settingsService = settingsService;
+    logger;
+    constructor(loggerFactory, taskManagerService, settingsStore, multerService, printerSocketStore, printerFilesStore, permissionService, roleService, userService, floorStore, configService, typeormService, isTypeormMode, printerThumbnailCache){
+        this.taskManagerService = taskManagerService;
         this.settingsStore = settingsStore;
         this.multerService = multerService;
         this.printerSocketStore = printerSocketStore;
@@ -85,16 +78,15 @@ class BootTask {
         this.permissionService = permissionService;
         this.roleService = roleService;
         this.userService = userService;
-        this.taskManagerService = taskManagerService;
-        this.pluginRepositoryCache = pluginRepositoryCache;
         this.floorStore = floorStore;
-        this.clientBundleService = clientBundleService;
         this.configService = configService;
         this.typeormService = typeormService;
+        this.isTypeormMode = isTypeormMode;
         this.printerThumbnailCache = printerThumbnailCache;
+        this.logger = loggerFactory(BootTask.name);
     }
     async runOnce() {
-        this.taskManagerService.registerJobOrTask(this.serverTasks.SERVER_BOOT_TASK);
+        this.taskManagerService.registerJobOrTask(_tasks.ServerTasks.SERVER_BOOT_TASK);
         this.logger.log("Running boot task once.");
         await this.run();
     }
@@ -143,8 +135,8 @@ class BootTask {
                 await this.settingsStore.setRegistrationEnabled(registrationEnabled === "true");
             }
         }
-        const overrideJwtSecret = this.configService.get(_serverconstants.AppConstants.OVERRIDE_JWT_SECRET, undefined);
-        const overrideJwtExpiresIn = this.configService.get(_serverconstants.AppConstants.OVERRIDE_JWT_EXPIRES_IN, undefined);
+        const overrideJwtSecret = this.configService.get(_serverconstants.AppConstants.OVERRIDE_JWT_SECRET);
+        const overrideJwtExpiresIn = this.configService.get(_serverconstants.AppConstants.OVERRIDE_JWT_EXPIRES_IN);
         await this.settingsStore.persistOptionalCredentialSettings(overrideJwtSecret, overrideJwtExpiresIn);
         this.logger.log("Clearing upload folder");
         this.multerService.clearUploadsFolder();
@@ -161,7 +153,7 @@ class BootTask {
         if (process.env.SAFEMODE_ENABLED === "true") {
             this.logger.warn("Starting in safe mode due to SAFEMODE_ENABLED");
         } else {
-            this.serverTasks.BOOT_TASKS.forEach((task)=>{
+            _tasks.ServerTasks.BOOT_TASKS.forEach((task)=>{
                 this.taskManagerService.registerJobOrTask(task);
             });
         }
@@ -199,6 +191,9 @@ class BootTask {
     async createConnection() {
         if (!this.isTypeormMode) {
             const envUrl = (0, _serverenv.fetchMongoDBConnectionString)();
+            if (!envUrl?.length) {
+                throw new Error("Mongodb connection string not set");
+            }
             await (0, _mongoose.connect)(envUrl, {
                 serverSelectionTimeoutMS: 1500
             });

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","printerThumbnailCache","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","loadCache","length","getAllValues","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":"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"}
+{"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","constructor","loggerFactory","taskManagerService","settingsStore","multerService","printerSocketStore","printerFilesStore","permissionService","roleService","userService","floorStore","configService","typeormService","isTypeormMode","printerThumbnailCache","name","runOnce","registerJobOrTask","ServerTasks","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","overrideJwtExpiresIn","OVERRIDE_JWT_EXPIRES_IN","persistOptionalCredentialSettings","clearUploadsFolder","loadPrinterSockets","loadFilesStore","loadStore","loadCache","length","getAllValues","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":"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"}

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

@@ -11,10 +11,8 @@ Object.defineProperty(exports, "ClientDistDownloadTask", {
 const _serverconstants = require("../server.constants");
 class ClientDistDownloadTask {
     clientBundleService;
-    githubService;
     logger;
-    constructor({ clientBundleService, loggerFactory, githubService }){
-        this.githubService = githubService;
+    constructor(loggerFactory, clientBundleService){
         this.clientBundleService = clientBundleService;
         this.logger = loggerFactory(ClientDistDownloadTask.name);
     }

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"],"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"}
+{"version":3,"sources":["../../src/tasks/client-bundle.task.ts"],"names":["ClientDistDownloadTask","logger","constructor","loggerFactory","clientBundleService","name","run","result","shouldUpdateWithReason","AppConstants","defaultClientMinimum","shouldUpdate","log","reason","downloadClientUpdate"],"mappings":";;;;+BAKaA;;;eAAAA;;;iCALgB;AAKtB,MAAMA;;IACMC,OAAsB;IAEvCC,YACEC,aAA6B,EAC7B,AAAiBC,mBAAwC,CACzD;aADiBA,sBAAAA;QAEjB,IAAI,CAACH,MAAM,GAAGE,cAAcH,uBAAuBK,IAAI;IACzD;IAEA,MAAMC,MAAM;QACV,MAAMC,SAAS,MAAM,IAAI,CAACH,mBAAmB,CAACI,sBAAsB,CAAC,OAAOC,6BAAY,CAACC,oBAAoB;QAC7G,IAAI,CAACH,OAAOI,YAAY,EAAE;YACxB,IAAI,CAACV,MAAM,CAACW,GAAG,CAAC,CAAC,sCAAsC,EAAEL,OAAOM,MAAM,EAAE;YACxE;QACF;QAEA,IAAI,CAACZ,MAAM,CAACW,GAAG,CAAC,CAAC,oDAAoD,EAAEL,OAAOM,MAAM,EAAE;QAEtF,MAAM,IAAI,CAACT,mBAAmB,CAACU,oBAAoB,CAACL,6BAAY,CAACC,oBAAoB;IACvF;AACF"}

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

@@ -11,53 +11,53 @@ Object.defineProperty(exports, "PrintCompletionSocketIoTask", {
 const _eventconstants = require("../constants/event.constants");
 const _octoprintwebsocketconstants = require("../services/octoprint/constants/octoprint-websocket.constants");
 const _correlationtokenutil = require("../utils/correlation-token.util");
+const _octoprintwebsocketadapter = require("../services/octoprint/octoprint-websocket.adapter");
 class PrintCompletionSocketIoTask {
     eventEmitter2;
-    socketIoGateway;
-    logger;
-    printerEventsCache;
     printCompletionService;
-    contextCache = {};
-    constructor({ eventEmitter2, socketIoGateway, printCompletionService, printerEventsCache, loggerFactory }){
+    printerEventsCache;
+    contextCache;
+    logger;
+    constructor(loggerFactory, eventEmitter2, printCompletionService, printerEventsCache){
         this.eventEmitter2 = eventEmitter2;
-        this.socketIoGateway = socketIoGateway;
-        this.printerEventsCache = printerEventsCache;
         this.printCompletionService = printCompletionService;
+        this.printerEventsCache = printerEventsCache;
+        this.contextCache = {};
         this.logger = loggerFactory(PrintCompletionSocketIoTask.name);
-        let that = this;
-        this.eventEmitter2.on((0, _eventconstants.octoPrintWebsocketEvent)("*"), async function(octoPrintEvent, data) {
-            await that.handleMessage(this.event, octoPrintEvent, data);
+        this.eventEmitter2.on((0, _octoprintwebsocketadapter.octoPrintWebsocketEvent)("*"), async (octoPrintEvent)=>{
+            await this.handleMessage(octoPrintEvent);
         });
     }
     get contexts() {
         return this.contextCache;
     }
-    async handleMessage(fdmEvent, data) {
-        const printerId = data.printerId;
+    async handleMessage(event) {
+        const printerId = event.printerId;
         if (!printerId) {
-            this.logger.log(`Skipping print completion log for FDM event ${fdmEvent}`);
+            this.logger.log(`Skipping print completion log as PrinterId is unset`);
+            return;
         }
-        if (data.event !== "event") {
+        if (event.event !== "event") {
             return;
         }
         const completion = {
-            status: data.payload.type,
-            fileName: data.payload?.payload?.name,
+            status: event.payload.type,
+            fileName: event.payload?.payload?.name,
             createdAt: Date.now(),
-            completionLog: data.payload?.error,
+            completionLog: event.payload?.error,
             printerId,
             context: {
                 correlationId: null
             }
         };
-        if (data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.EStop || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintCancelling || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintCancelled || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.Home || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.TransferStarted || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.TransferDone || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.Disconnecting || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.Disconnected || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.MetadataAnalysisStarted || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.MetadataAnalysisFinished || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.Error) {
+        if (event.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.EStop || event.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintCancelling || event.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintCancelled || event.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.Home || event.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.TransferStarted || event.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.TransferDone || event.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.Disconnecting || event.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.Disconnected || event.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.MetadataAnalysisStarted || event.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.MetadataAnalysisFinished || event.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.Error) {
             this.contextCache[printerId] = {
                 ...this.contextCache[printerId],
-                [data.payload.type]: completion
+                [event.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,
+            if (event.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.Disconnecting || event.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.Disconnected) {
+                await this.printerEventsCache.setSubState(printerId, "current", "state", {
+                    text: event.payload.type,
                     flags: {
                         operational: false,
                         printing: false,
@@ -71,23 +71,22 @@ class PrintCompletionSocketIoTask {
             await this.printCompletionService.updateContext(corrId, this.contextCache[printerId]);
             return;
         }
-        if (data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintStarted) {
+        if (event.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintStarted) {
             const token = (0, _correlationtokenutil.generateCorrelationToken)();
             this.contextCache[printerId] = {
                 correlationId: token
             };
             completion.context = this.contextCache[printerId];
             await this.printCompletionService.create(completion);
-        } else if (data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintFailed || data.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintDone) {
+        } else if (event.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintFailed || event.payload.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintDone) {
             completion.context = this.contextCache[printerId];
             await this.printCompletionService.create(completion);
             this.eventEmitter2.emit((0, _eventconstants.fdmMonsterPrinterStoppedEvent)(printerId));
-            this.contextCache[printerId] = {};
+            this.contextCache[printerId] = {
+                correlationId: undefined
+            };
         }
     }
-    async run() {
-        this.contextCache = await this.printCompletionService.loadPrintContexts();
-    }
 }
 
 //# sourceMappingURL=print-completion.socketio.task.js.map

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"],"mappings":"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"}
+{"version":3,"sources":["../../src/tasks/print-completion.socketio.task.ts"],"names":["PrintCompletionSocketIoTask","contextCache","logger","constructor","loggerFactory","eventEmitter2","printCompletionService","printerEventsCache","name","on","octoPrintWebsocketEvent","octoPrintEvent","handleMessage","contexts","event","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","undefined"],"mappings":"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"}

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

@@ -9,17 +9,13 @@ Object.defineProperty(exports, "PrinterFileCleanTask", {
     }
 });
 class PrinterFileCleanTask {
-    logger;
-    printerFilesStore;
     printerCache;
+    printerFilesStore;
     settingsStore;
-    taskManagerService;
-    octoprintClient;
-    constructor({ printerCache, printerFilesStore, octoprintClient, taskManagerService, settingsStore, loggerFactory }){
+    logger;
+    constructor(loggerFactory, printerCache, printerFilesStore, settingsStore){
         this.printerCache = printerCache;
         this.printerFilesStore = printerFilesStore;
-        this.taskManagerService = taskManagerService;
-        this.octoprintClient = octoprintClient;
         this.settingsStore = settingsStore;
         this.logger = loggerFactory(PrinterFileCleanTask.name);
     }
@@ -39,7 +35,7 @@ class PrinterFileCleanTask {
             const errorPrinters = [];
             for (let printer of printers){
                 try {
-                    await this.printerFilesStore.loadFiles(printer.id, false);
+                    await this.printerFilesStore.loadFiles(printer.id);
                 } catch (e) {
                     errorPrinters.push({
                         e,
@@ -48,7 +44,7 @@ class PrinterFileCleanTask {
                 }
             }
             if (errorPrinters.length > 0) {
-                this.logger.error(`Error loading some files, ${errorPrinters.length} printer(s) did not respond or returned an unexpected status code. Those will depend on previously cached files.`);
+                this.logger.error(`Error loading some files, ${errorPrinters.length} printer(s) did not respond or returned an unexpected status code.`);
             }
             for (let printer of printers){
                 const outdatedFiles = this.getPrinterOutdatedFiles(printer);
@@ -64,7 +60,7 @@ class PrinterFileCleanTask {
     }
     async cleanPrinterFiles(printerId) {
         await this.printerFilesStore.deleteOutdatedFiles(printerId, this.ageDaysMaxSetting);
-        await this.printerFilesStore.loadFiles(printerId, false);
+        await this.printerFilesStore.loadFiles(printerId);
     }
     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","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"}
+{"version":3,"sources":["../../src/tasks/printer-file-clean.task.ts"],"names":["PrinterFileCleanTask","logger","constructor","loggerFactory","printerCache","printerFilesStore","settingsStore","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":";;;;+BAYaA;;;eAAAA;;;AAAN,MAAMA;;;;IACXC,OAAsB;IAEtBC,YACEC,aAA6B,EAC7B,AAAiBC,YAA0B,EAC3C,AAAiBC,iBAAoC,EACrD,AAAiBC,aAA4B,CAC7C;aAHiBF,eAAAA;aACAC,oBAAAA;aACAC,gBAAAA;QAEjB,IAAI,CAACL,MAAM,GAAGE,cAAcH,qBAAqBO,IAAI;IACvD;IAEA,IAAYC,oBAAoB;QAC9B,OAAO,IAAI,CAACC,WAAW,GAAGC,+BAA+B;IAC3D;IAEA,MAAMC,MAAM;QACV,MAAMC,WAAW,MAAM,IAAI,CAACR,YAAY,CAACS,kBAAkB,CAAC;QAC5D,MAAMC,oBAAoB,IAAI,CAACL,WAAW;QAC1C,MAAMM,yBAAyBD,kBAAkBE,wBAAwB;QAEzE,IAAI;YACF,IAAID,wBAAwB;gBAC1B,IAAI,CAACd,MAAM,CAACgB,GAAG,CACb,CAAC,kBAAkB,EAAEL,SAASM,MAAM,CAAC,6DAA6D,CAAC;YAEvG,OAAO;gBACL,IAAI,CAACjB,MAAM,CAACgB,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,CAACP,iBAAiB,CAACgB,SAAS,CAACD,QAAQE,EAAE;gBACnD,EAAE,OAAOC,GAAG;oBACVJ,cAAcK,IAAI,CAAC;wBAAED;wBAAGH;oBAAQ;gBAClC;YACF;YACA,IAAID,cAAcD,MAAM,GAAG,GAAG;gBAC5B,IAAI,CAACjB,MAAM,CAACwB,KAAK,CACf,CAAC,0BAA0B,EAAEN,cAAcD,MAAM,CAAC,kEAAkE,CAAC;YAEzH;YAGA,KAAK,IAAIE,WAAWR,SAAU;gBAC5B,MAAMc,gBAAgB,IAAI,CAACC,uBAAuB,CAACP;gBACnD,IAAI,CAACM,eAAeR,QAAQ;gBAG5B,IAAI,CAACjB,MAAM,CAACgB,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,CAACrB,MAAM,CAACgB,GAAG,CAAC,CAAC,mCAAmC,CAAC;QACvD;IACF;IAEA,MAAMW,kBAAkBC,SAAiB,EAAE;QACzC,MAAM,IAAI,CAACxB,iBAAiB,CAACyB,mBAAmB,CAACD,WAAW,IAAI,CAACrB,iBAAiB;QAClF,MAAM,IAAI,CAACH,iBAAiB,CAACgB,SAAS,CAACQ;IACzC;IAEAF,wBAAwBP,OAA2B,EAAE;QACnD,MAAMW,aAAa,IAAI,CAACvB,iBAAiB;QACzC,OAAO,IAAI,CAACH,iBAAiB,CAAC2B,gBAAgB,CAACZ,QAAQE,EAAE,EAAES;IAC7D;IAEQtB,cAAc;QACpB,OAAO,IAAI,CAACH,aAAa,CAAC2B,oBAAoB;IAChD;AACF"}

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

@@ -13,21 +13,16 @@ const _node = require("@sentry/node");
 const _apistatetype = require("../shared/dtos/api-state.type");
 const _printerapiinterface = require("../services/printer-api.interface");
 class PrinterWebsocketRestoreTask {
-    settingsStore;
     printerSocketStore;
     octoprintClient;
     logger;
-    constructor({ printerSocketStore, octoprintClient, settingsStore, loggerFactory }){
+    constructor(loggerFactory, printerSocketStore, octoprintClient){
         this.printerSocketStore = printerSocketStore;
         this.octoprintClient = octoprintClient;
-        this.settingsStore = settingsStore;
         this.logger = loggerFactory(PrinterWebsocketRestoreTask.name);
     }
     async run() {
-        const startTime = Date.now();
         const existingSockets = this.printerSocketStore.listPrinterSockets();
-        const resetAdapterIds = [];
-        const silentSocketIds = [];
         for (const socket of existingSockets){
             if (socket.printerType !== _printerapiinterface.OctoprintType) {
                 continue;
@@ -37,7 +32,6 @@ class PrinterWebsocketRestoreTask {
                     socket.close();
                     socket.resetSocketState();
                     this.logger.warn("Socket was closed or aborted, manually removing it");
-                    resetAdapterIds.push(socket.printerId);
                     continue;
                 }
             } catch (e) {
@@ -45,22 +39,17 @@ class PrinterWebsocketRestoreTask {
                 this.logger.error(`Resetting WebSocket socket failed for printer with error '${(0, _errorutils.errorSummary)(e)}'`, e.stack);
                 continue;
             }
-            if (socket.apiState !== _apistatetype.API_STATE.unset && !socket.lastMessageReceivedTimestamp || Date.now() - socket.lastMessageReceivedTimestamp > 10 * 1000) {
+            if (socket.apiState !== _apistatetype.API_STATE.unset && !socket.lastMessageReceivedTimestamp || socket.lastMessageReceivedTimestamp && Date.now() - socket.lastMessageReceivedTimestamp > 10 * 1000) {
                 const result = await this.octoprintClient.getConnection(socket.login);
-                silentSocketIds.push(socket.printerId);
                 try {
                     if (result.data?.current?.state !== "Closed") {
-                        this.logger.warn(`Silence was detected, but the OctoPrint current connection was not closed. Connection state ${result?.current?.state}`);
+                        this.logger.warn(`Silence was detected, but the OctoPrint current connection was not closed. Connection state ${result.data?.current?.state}`);
                     }
                 } catch (e) {
                     this.logger.error(`Silence was detected, but Websocket was not closed/aborted and API could not be called`);
                 }
             }
         }
-        const duration = Date.now() - startTime;
-        if (this.settingsStore.getSettingsSensitive()?.server?.debugSettings.debugSocketRetries) {
-            this.logger.log(`Reset ${resetAdapterIds.length} closed/aborted sockets and detected ${silentSocketIds.length} silent sockets (duration ${duration}ms)`);
-        }
     }
 }
 

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","octoprintClient","logger","constructor","loggerFactory","name","run","startTime","Date","now","existingSockets","listPrinterSockets","resetAdapterIds","silentSocketIds","socket","printerType","OctoprintType","isClosedOrAborted","close","resetSocketState","warn","push","printerId","e","captureException","error","errorSummary","stack","apiState","API_STATE","unset","lastMessageReceivedTimestamp","result","getConnection","login","data","current","state","duration","getSettingsSensitive","server","debugSettings","debugSocketRetries","log","length"],"mappings":";;;;+BAUaA;;;eAAAA;;;4BAVgB;sBAMI;8BACP;qCACI;AAEvB,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,IAAII,OAAOC,WAAW,KAAKC,kCAAa,EAAE;gBACxC;YACF;YAEA,IAAI;gBACF,IAAIF,OAAOG,iBAAiB,IAAI;oBAC9BH,OAAOI,KAAK;oBACZJ,OAAOK,gBAAgB;oBACvB,IAAI,CAACjB,MAAM,CAACkB,IAAI,CAAC;oBACjBR,gBAAgBS,IAAI,CAACP,OAAOQ,SAAS;oBACrC;gBACF;YACF,EAAE,OAAOC,GAAQ;gBACfC,IAAAA,sBAAgB,EAACD;gBACjB,IAAI,CAACrB,MAAM,CAACuB,KAAK,CAAC,CAAC,0DAA0D,EAAEC,IAAAA,wBAAY,EAACH,GAAG,CAAC,CAAC,EAAEA,EAAEI,KAAK;gBAC1G;YACF;YAGA,IACE,AAACb,OAAOc,QAAQ,KAAKC,uBAAS,CAACC,KAAK,IAAI,CAAChB,OAAOiB,4BAA4B,IAC5EvB,KAAKC,GAAG,KAAKK,OAAOiB,4BAA4B,GAAG,KAAK,MACxD;gBACA,MAAMC,SAAS,MAAM,IAAI,CAAC/B,eAAe,CAACgC,aAAa,CAACnB,OAAOoB,KAAK;gBAEpErB,gBAAgBQ,IAAI,CAACP,OAAOQ,SAAS;gBAErC,IAAI;oBACF,IAAIU,OAAOG,IAAI,EAAEC,SAASC,UAAU,UAAU;wBAC5C,IAAI,CAACnC,MAAM,CAACkB,IAAI,CACd,CAAC,4FAA4F,EAAEY,QAAQI,SAASC,OAAO;oBAE3H;gBACF,EAAE,OAAOd,GAAG;oBACV,IAAI,CAACrB,MAAM,CAACuB,KAAK,CAAC,CAAC,sFAAsF,CAAC;gBAC5G;YACF;QACF;QAEA,MAAMa,WAAW9B,KAAKC,GAAG,KAAKF;QAC9B,IAAI,IAAI,CAACR,aAAa,CAACwC,oBAAoB,IAAIC,QAAQC,cAAcC,oBAAoB;YACvF,IAAI,CAACxC,MAAM,CAACyC,GAAG,CACb,CAAC,MAAM,EAAE/B,gBAAgBgC,MAAM,CAAC,qCAAqC,EAAE/B,gBAAgB+B,MAAM,CAAC,0BAA0B,EAAEN,SAAS,GAAG,CAAC;QAE3I;IACF;AACF"}
+{"version":3,"sources":["../../src/tasks/printer-websocket-restore.task.ts"],"names":["PrinterWebsocketRestoreTask","logger","constructor","loggerFactory","printerSocketStore","octoprintClient","name","run","existingSockets","listPrinterSockets","socket","printerType","OctoprintType","isClosedOrAborted","close","resetSocketState","warn","e","captureException","error","errorSummary","stack","apiState","API_STATE","unset","lastMessageReceivedTimestamp","Date","now","result","getConnection","login","data","current","state"],"mappings":";;;;+BASaA;;;eAAAA;;;4BATgB;sBAKI;8BACP;qCACI;AAEvB,MAAMA;;;IACMC,OAAsB;IAEvCC,YACEC,aAA6B,EAC7B,AAAiBC,kBAAsC,EACvD,AAAiBC,eAAgC,CACjD;aAFiBD,qBAAAA;aACAC,kBAAAA;QAEjB,IAAI,CAACJ,MAAM,GAAGE,cAAcH,4BAA4BM,IAAI;IAC9D;IAEA,MAAMC,MAAM;QACV,MAAMC,kBAAkB,IAAI,CAACJ,kBAAkB,CAACK,kBAAkB;QAClE,KAAK,MAAMC,UAAUF,gBAAiB;YACpC,IAAIE,OAAOC,WAAW,KAAKC,kCAAa,EAAE;gBACxC;YACF;YAEA,IAAI;gBACF,IAAIF,OAAOG,iBAAiB,IAAI;oBAC9BH,OAAOI,KAAK;oBACZJ,OAAOK,gBAAgB;oBACvB,IAAI,CAACd,MAAM,CAACe,IAAI,CAAC;oBACjB;gBACF;YACF,EAAE,OAAOC,GAAQ;gBACfC,IAAAA,sBAAgB,EAACD;gBACjB,IAAI,CAAChB,MAAM,CAACkB,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,IAC3Ef,OAAOe,4BAA4B,IAAIC,KAAKC,GAAG,KAAKjB,OAAOe,4BAA4B,GAAG,KAAK,MAChG;gBACA,MAAMG,SAAS,MAAM,IAAI,CAACvB,eAAe,CAACwB,aAAa,CAACnB,OAAOoB,KAAK;gBAEpE,IAAI;oBACF,IAAIF,OAAOG,IAAI,EAAEC,SAASC,UAAU,UAAU;wBAC5C,IAAI,CAAChC,MAAM,CAACe,IAAI,CACd,CAAC,4FAA4F,EAAEY,OAAOG,IAAI,EAAEC,SAASC,OAAO;oBAEhI;gBACF,EAAE,OAAOhB,GAAG;oBACV,IAAI,CAAChB,MAAM,CAACkB,KAAK,CAAC,CAAC,sFAAsF,CAAC;gBAC5G;YACF;QACF;IACF;AACF"}

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

@@ -10,23 +10,11 @@ Object.defineProperty(exports, "PrinterWebsocketTask", {
 });
 class PrinterWebsocketTask {
     printerSocketStore;
-    settingsStore;
-    octoprintClient;
-    taskManagerService;
-    logger;
-    constructor({ printerSocketStore, octoprintClient, settingsStore, taskManagerService, loggerFactory }){
+    constructor(printerSocketStore){
         this.printerSocketStore = printerSocketStore;
-        this.settingsStore = settingsStore;
-        this.octoprintClient = octoprintClient;
-        this.taskManagerService = taskManagerService;
-        this.logger = loggerFactory(PrinterWebsocketTask.name);
     }
     async run() {
-        const startTime = Date.now();
-        const result = await this.printerSocketStore.reconnectPrinterSockets();
-        if (this.settingsStore.getDebugSettingsSensitive()?.debugSocketReconnect) {
-            this.logger.log(`Socket reconnect (${Date.now() - startTime}ms)`, result);
-        }
+        await this.printerSocketStore.reconnectPrinterSockets();
     }
 }
 

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"sources":["../../src/tasks/printer-websocket.task.ts"],"names":["PrinterWebsocketTask","constructor","printerSocketStore","run","reconnectPrinterSockets"],"mappings":";;;;+BAEaA;;;eAAAA;;;AAAN,MAAMA;;IACXC,YAAY,AAAiBC,kBAAsC,CAAE;aAAxCA,qBAAAA;IAAyC;IAEtE,MAAMC,MAAM;QACV,MAAM,IAAI,CAACD,kBAAkB,CAACE,uBAAuB;IACvD;AACF"}