@fdm-monster/server 1.8.3 → 1.9.0-rc1

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"}

package/dist/tasks/socketio.task.js

@@ -10,31 +10,24 @@ Object.defineProperty(exports, "SocketIoTask", {
 });
 const _socketiogateway = require("../state/socket-io.gateway");
 const _eventconstants = require("../constants/event.constants");
-const _metricutils = require("../utils/metric.utils");
 class SocketIoTask {
     socketIoGateway;
+    floorStore;
     printerSocketStore;
     printerEventsCache;
-    floorStore;
+    printerCache;
     fileUploadTrackerCache;
     eventEmitter2;
-    printerCache;
     logger;
-    settingsStore;
-    aggregateSizeCounter = 0;
-    aggregateWindowLength = 100;
-    aggregateSizes = [];
-    rounding = 2;
-    constructor({ socketIoGateway, floorStore, printerSocketStore, printerEventsCache, printerCache, loggerFactory, fileUploadTrackerCache, settingsStore, eventEmitter2 }){
+    constructor(loggerFactory, socketIoGateway, floorStore, printerSocketStore, printerEventsCache, printerCache, fileUploadTrackerCache, eventEmitter2){
         this.socketIoGateway = socketIoGateway;
+        this.floorStore = floorStore;
         this.printerSocketStore = printerSocketStore;
         this.printerEventsCache = printerEventsCache;
+        this.printerCache = printerCache;
         this.fileUploadTrackerCache = fileUploadTrackerCache;
-        this.floorStore = floorStore;
-        this.logger = loggerFactory(SocketIoTask.name);
         this.eventEmitter2 = eventEmitter2;
-        this.printerCache = printerCache;
-        this.settingsStore = settingsStore;
+        this.logger = loggerFactory(SocketIoTask.name);
         this.eventEmitter2.on(_eventconstants.socketIoConnectedEvent, async ()=>{
             await this.sendUpdate();
         });
@@ -55,28 +48,8 @@ class SocketIoTask {
             printerEvents,
             trackedUploads
         };
-        if (this.settingsStore.getDebugSettingsSensitive()?.debugSocketIoBandwidth) {
-            const kbDataString = Object.entries(socketIoData).map(([id, state])=>{
-                return `${id} ${(0, _metricutils.formatKB)(state)}`;
-            }).join(" ");
-            this.logger.log(kbDataString);
-        }
-        const serializedData = JSON.stringify(socketIoData);
-        const transportDataSize = (0, _metricutils.sizeKB)(serializedData);
-        this.updateAggregator(transportDataSize);
         this.socketIoGateway.send(_socketiogateway.IO_MESSAGES.LegacyUpdate, socketIoData);
     }
-    updateAggregator(transportDataLength) {
-        if (this.aggregateSizeCounter >= this.aggregateWindowLength) {
-            const summedPayloadSize = this.aggregateSizes.reduce((t, n)=>t += n);
-            const averagePayloadSize = summedPayloadSize / this.aggregateWindowLength;
-            this.logger.log(`Printer SocketIO metrics ${averagePayloadSize.toFixed(this.rounding)}kB [${this.aggregateWindowLength} TX avg].`);
-            this.aggregateSizeCounter = 0;
-            this.aggregateSizes = [];
-        }
-        this.aggregateSizes.push(transportDataLength);
-        ++this.aggregateSizeCounter;
-    }
 }
 
 //# sourceMappingURL=socketio.task.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/tasks/socketio.task.ts"],"names":["SocketIoTask","socketIoGateway","printerSocketStore","printerEventsCache","floorStore","fileUploadTrackerCache","eventEmitter2","printerCache","logger","settingsStore","aggregateSizeCounter","aggregateWindowLength","aggregateSizes","rounding","constructor","loggerFactory","name","on","socketIoConnectedEvent","sendUpdate","run","floors","listCache","printers","listCachedPrinters","socketStates","getSocketStatesById","printerEvents","getAllKeyValues","trackedUploads","getUploads","socketIoData","getDebugSettingsSensitive","debugSocketIoBandwidth","kbDataString","Object","entries","map","id","state","formatKB","join","log","serializedData","JSON","stringify","transportDataSize","sizeKB","updateAggregator","send","IO_MESSAGES","LegacyUpdate","transportDataLength","summedPayloadSize","reduce","t","n","averagePayloadSize","toFixed","push"],"mappings":"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"}
+{"version":3,"sources":["../../src/tasks/socketio.task.ts"],"names":["SocketIoTask","logger","constructor","loggerFactory","socketIoGateway","floorStore","printerSocketStore","printerEventsCache","printerCache","fileUploadTrackerCache","eventEmitter2","name","on","socketIoConnectedEvent","sendUpdate","run","floors","listCache","printers","listCachedPrinters","socketStates","getSocketStatesById","printerEvents","getAllKeyValues","trackedUploads","getUploads","socketIoData","send","IO_MESSAGES","LegacyUpdate"],"mappings":";;;;+BAWaA;;;eAAAA;;;iCAXgC;gCACN;AAUhC,MAAMA;;;;;;;;IACXC,OAAsB;IAEtBC,YACEC,aAA6B,EAC7B,AAAiBC,eAAgC,EACjD,AAAiBC,UAAsB,EACvC,AAAiBC,kBAAsC,EACvD,AAAiBC,kBAAsC,EACvD,AAAiBC,YAA0B,EAC3C,AAAiBC,sBAA8C,EAC/D,AAAiBC,aAA4B,CAC7C;aAPiBN,kBAAAA;aACAC,aAAAA;aACAC,qBAAAA;aACAC,qBAAAA;aACAC,eAAAA;aACAC,yBAAAA;aACAC,gBAAAA;QAEjB,IAAI,CAACT,MAAM,GAAGE,cAAcH,aAAaW,IAAI;QAE7C,IAAI,CAACD,aAAa,CAACE,EAAE,CAACC,sCAAsB,EAAE;YAC5C,MAAM,IAAI,CAACC,UAAU;QACvB;IACF;IAEA,MAAMC,MAAM;QACV,MAAM,IAAI,CAACD,UAAU;IACvB;IAEA,MAAMA,aAAa;QACjB,MAAME,SAAS,MAAM,IAAI,CAACX,UAAU,CAACY,SAAS;QAC9C,MAAMC,WAAW,MAAM,IAAI,CAACV,YAAY,CAACW,kBAAkB,CAAC;QAC5D,MAAMC,eAAe,IAAI,CAACd,kBAAkB,CAACe,mBAAmB;QAChE,MAAMC,gBAAgB,MAAM,IAAI,CAACf,kBAAkB,CAACgB,eAAe;QACnE,MAAMC,iBAAiB,IAAI,CAACf,sBAAsB,CAACgB,UAAU;QAE7D,MAAMC,eAAe;YACnBR;YACAF;YACAI;YACAE;YACAE;QACF;QAEA,IAAI,CAACpB,eAAe,CAACuB,IAAI,CAACC,4BAAW,CAACC,YAAY,EAAEH;IACtD;AACF"}

package/dist/tasks/software-update.task.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "SoftwareUpdateTask", {
 });
 class SoftwareUpdateTask {
     serverReleaseService;
-    constructor({ serverReleaseService }){
+    constructor(serverReleaseService){
         this.serverReleaseService = serverReleaseService;
     }
     async run() {

package/dist/tasks/software-update.task.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/tasks/software-update.task.ts"],"names":["SoftwareUpdateTask","serverReleaseService","constructor","run","syncLatestRelease","logServerVersionState"],"mappings":";;;;+BAEaA;;;eAAAA;;;AAAN,MAAMA;IACXC,qBAA2C;IAE3CC,YAAY,EAAED,oBAAoB,EAAkD,CAAE;QACpF,IAAI,CAACA,oBAAoB,GAAGA;IAC9B;IAEA,MAAME,MAAM;QACV,MAAM,IAAI,CAACF,oBAAoB,CAACG,iBAAiB;QACjD,IAAI,CAACH,oBAAoB,CAACI,qBAAqB;IACjD;AACF"}
+{"version":3,"sources":["../../src/tasks/software-update.task.ts"],"names":["SoftwareUpdateTask","constructor","serverReleaseService","run","syncLatestRelease","logServerVersionState"],"mappings":";;;;+BAEaA;;;eAAAA;;;AAAN,MAAMA;;IACXC,YAAY,AAAiBC,oBAA0C,CAAE;aAA5CA,uBAAAA;IAA6C;IAE1E,MAAMC,MAAM;QACV,MAAM,IAAI,CAACD,oBAAoB,CAACE,iBAAiB;QACjD,IAAI,CAACF,oBAAoB,CAACG,qBAAqB;IACjD;AACF"}

package/dist/tasks.js

@@ -22,10 +22,10 @@ function registerTask(task, preset, milliseconds = 0, runImmediately = false) {
     let timingPreset = {
         ...preset
     };
-    timingPreset.milliseconds = preset.milliseconds || milliseconds;
-    timingPreset.runImmediately = runImmediately || false;
+    timingPreset.milliseconds = preset.milliseconds ?? milliseconds;
+    timingPreset.runImmediately = runImmediately ?? false;
     return {
-        id: task.name || task,
+        id: task.name ?? task,
         task,
         preset: timingPreset
     };

package/dist/tasks.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/tasks.ts"],"names":["ServerTasks","registerTask","task","preset","milliseconds","runImmediately","timingPreset","id","name","SERVER_BOOT_TASK","DITokens","bootTask","TaskPresets","PERIODIC_DISABLED","BOOT_TASKS","softwareUpdateTask","RUNDELAYED","clientDistDownloadTask","RUNONCE","socketIoTask","PERIODIC","printerFileCleanTask","printerWebsocketTask","printerWebsocketRestoreTask"],"mappings":";;;;;;;;;;;IAiBaA,WAAW;eAAXA;;IAXGC,YAAY;eAAZA;;;6BAN0C;iCACjC;AAKlB,SAASA,aAAaC,IAAS,EAAEC,MAAoB,EAAEC,eAAe,CAAC,EAAEC,iBAAiB,KAAK;IACpG,IAAIC,eAAe;QAAE,GAAGH,MAAM;IAAC;IAC/BG,aAAaF,YAAY,GAAGD,OAAOC,YAAY,IAAIA;IACnDE,aAAaD,cAAc,GAAGA,kBAAkB;IAChD,OAAO;QACLE,IAAIL,KAAKM,IAAI,IAAIN;QACjBA;QACAC,QAAQG;IACV;AACF;AAEO,MAAMN;IACX,OAAOS,mBAAmBR,aAAaS,yBAAQ,CAACC,QAAQ,EAAEC,yBAAW,CAACC,iBAAiB,EAAE,MAAM,OAAO;IACtG,OAAOC,aAAa;QAClBb,aAAaS,yBAAQ,CAACK,kBAAkB,EAAEH,yBAAW,CAACI,UAAU,EAAE;QAClEf,aAAaS,yBAAQ,CAACO,sBAAsB,EAAEL,yBAAW,CAACM,OAAO;QACjEjB,aAAaS,yBAAQ,CAACS,YAAY,EAAEP,yBAAW,CAACQ,QAAQ,EAAE;QAE1DnB,aAAaS,yBAAQ,CAACW,oBAAoB,EAAET,yBAAW,CAACM,OAAO,EAAE,KAAK,MAAM;QAE5EjB,aAAaS,yBAAQ,CAACY,oBAAoB,EAAEV,yBAAW,CAACQ,QAAQ,EAAE,MAAM;QAExEnB,aAAaS,yBAAQ,CAACa,2BAA2B,EAAEX,yBAAW,CAACQ,QAAQ,EAAE,KAAK,MAAM;KACrF,CAAC;AACJ"}
+{"version":3,"sources":["../src/tasks.ts"],"names":["ServerTasks","registerTask","task","preset","milliseconds","runImmediately","timingPreset","id","name","SERVER_BOOT_TASK","DITokens","bootTask","TaskPresets","PERIODIC_DISABLED","BOOT_TASKS","softwareUpdateTask","RUNDELAYED","clientDistDownloadTask","RUNONCE","socketIoTask","PERIODIC","printerFileCleanTask","printerWebsocketTask","printerWebsocketRestoreTask"],"mappings":";;;;;;;;;;;IAkBaA,WAAW;eAAXA;;IAXGC,YAAY;eAAZA;;;6BAP4B;iCACnB;AAMlB,SAASA,aAAaC,IAAS,EAAEC,MAAoB,EAAEC,eAAe,CAAC,EAAEC,iBAAiB,KAAK;IACpG,IAAIC,eAAe;QAAE,GAAGH,MAAM;IAAC;IAC/BG,aAAaF,YAAY,GAAGD,OAAOC,YAAY,IAAIA;IACnDE,aAAaD,cAAc,GAAGA,kBAAkB;IAChD,OAAO;QACLE,IAAIL,KAAKM,IAAI,IAAIN;QACjBA;QACAC,QAAQG;IACV;AACF;AAEO,MAAMN;IACX,OAAcS,mBAAmBR,aAAaS,yBAAQ,CAACC,QAAQ,EAAEC,yBAAW,CAACC,iBAAiB,EAAE,MAAM,OAAO;IAC7G,OAAcC,aAAa;QACzBb,aAAaS,yBAAQ,CAACK,kBAAkB,EAAEH,yBAAW,CAACI,UAAU,EAAE;QAClEf,aAAaS,yBAAQ,CAACO,sBAAsB,EAAEL,yBAAW,CAACM,OAAO;QACjEjB,aAAaS,yBAAQ,CAACS,YAAY,EAAEP,yBAAW,CAACQ,QAAQ,EAAE;QAC1DnB,aAAaS,yBAAQ,CAACW,oBAAoB,EAAET,yBAAW,CAACM,OAAO,EAAE,KAAK,MAAM;QAE5EjB,aAAaS,yBAAQ,CAACY,oBAAoB,EAAEV,yBAAW,CAACQ,QAAQ,EAAE,MAAM;QAExEnB,aAAaS,yBAAQ,CAACa,2BAA2B,EAAEX,yBAAW,CAACQ,QAAQ,EAAE,KAAK,MAAM;KACrF,CAAC;AACJ"}

package/dist/utils/array.util.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/array.util.ts"],"names":["distinct","groupArrayBy","array","predicate","reduce","acc","value","index","push","self","indexOf"],"mappings":";;;;;;;;;;;IAMaA,QAAQ;eAARA;;IANAC,YAAY;eAAZA;;;AAAN,MAAMA,eAAe,CAAIC,OAAYC,YAC1CD,MAAME,MAAM,CAAC,CAACC,KAAKC,OAAOC,OAAOL;QAC9BG,CAAAA,GAAG,CAACF,UAAUG,OAAOC,OAAOL,OAAO,KAAK,EAAE,AAAD,EAAGM,IAAI,CAACF;QAClD,OAAOD;IACT,GAAG,CAAC;AAEC,MAAML,WAAW,CAACM,OAAYC,OAAeE;IAClD,OAAOA,KAAKC,OAAO,CAACJ,WAAWC;AACjC"}
+{"version":3,"sources":["../../src/utils/array.util.ts"],"names":["distinct","groupArrayBy","array","predicate","reduce","acc","value","index","push","self","indexOf"],"mappings":";;;;;;;;;;;IASaA,QAAQ;eAARA;;IATAC,YAAY;eAAZA;;;AAAN,MAAMA,eAAe,CAAIC,OAAYC,YAC1CD,MAAME,MAAM,CACV,CAACC,KAAKC,OAAOC,OAAOL;QACjBG,CAAAA,GAAG,CAACF,UAAUG,OAAOC,OAAOL,OAAO,KAAK,EAAE,AAAD,EAAGM,IAAI,CAACF;QAClD,OAAOD;IACT,GACA,CAAC;AAGE,MAAML,WAAW,CAACM,OAAYC,OAAeE;IAClD,OAAOA,KAAKC,OAAO,CAACJ,WAAWC;AACjC"}

package/dist/utils/cache/key-diff.cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/utils/cache/key-diff.cache.ts"],"names":["KeyDiffCache","deletedKeys","updatedKeys","keyValueStore","getAllValues","keys","Object","getValuesBatch","getAllKeyValues","getValue","key","keyString","toString","length","Error","processStateDiffs","updatedValues","resetDiffs","setKeyValuesBatch","keyValues","markUpdated","forEach","value","setKeyValue","map","batchMarkUpdated","deleteKeysBatch","markDeleted","deleteKeyValue","batchMarkDeleted","keyStrings","some","values","push","convertToKeyString","includes","splice","indexOf"],"mappings":"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"}
+{"version":3,"sources":["../../../src/utils/cache/key-diff.cache.ts"],"names":["KeyDiffCache","deletedKeys","updatedKeys","keyValueStore","getAllValues","keys","Object","getValuesBatch","getAllKeyValues","getValue","key","keyString","toString","length","Error","processStateDiffs","updatedValues","resetDiffs","setKeyValuesBatch","keyValues","markUpdated","forEach","value","setKeyValue","map","batchMarkUpdated","deleteKeysBatch","markDeleted","deleteKeyValue","batchMarkDeleted","keyStrings","some","values","push","convertToKeyString","includes","splice","indexOf"],"mappings":"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"}

package/dist/utils/env.utils.js

@@ -25,9 +25,7 @@ _export(exports, {
         return isTestEnvironment;
     }
 });
-const _logger = require("../handlers/logger");
 const _serverconstants = require("../server.constants");
-const logger = new _logger.LoggerService("Utils-Env", false);
 function getEnvOrDefault(key, defaultVal) {
     const val = process.env[key];
     if (!val?.length) return defaultVal;

package/dist/utils/env.utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/env.utils.ts"],"names":["getEnvOrDefault","isDevelopmentEnvironment","isNode","isProductionEnvironment","isTestEnvironment","logger","LoggerService","key","defaultVal","val","process","env","length","NODE_ENV","AppConstants","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv"],"mappings":";;;;;;;;;;;IAOgBA,eAAe;eAAfA;;IAMAC,wBAAwB;eAAxBA;;IAYAC,MAAM;eAANA;;IAJAC,uBAAuB;eAAvBA;;IAJAC,iBAAiB;eAAjBA;;;wBAhBc;iCACD;AAG7B,MAAMC,SAAS,IAAIC,qBAAa,CAAC,aAAa;AAEvC,SAASN,gBAAgBO,GAAQ,EAAEC,UAAe;IACvD,MAAMC,MAAMC,QAAQC,GAAG,CAACJ,IAAI;IAC5B,IAAI,CAACE,KAAKG,QAAQ,OAAOJ;IACzB,OAAOC;AACT;AAEO,SAASR;IACd,OAAOS,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACC,qBAAqB;AACpE;AAEO,SAASX;IACd,OAAOM,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACE,cAAc;AAC7D;AAEO,SAASb;IACd,OAAOO,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACG,oBAAoB;AACnE;AAEO,SAASf;IACd,OAAO,UAAUQ,QAAQC,GAAG;AAC9B"}
+{"version":3,"sources":["../../src/utils/env.utils.ts"],"names":["getEnvOrDefault","isDevelopmentEnvironment","isNode","isProductionEnvironment","isTestEnvironment","key","defaultVal","val","process","env","length","NODE_ENV","AppConstants","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv"],"mappings":";;;;;;;;;;;IAEgBA,eAAe;eAAfA;;IAMAC,wBAAwB;eAAxBA;;IAYAC,MAAM;eAANA;;IAJAC,uBAAuB;eAAvBA;;IAJAC,iBAAiB;eAAjBA;;;iCAZa;AAEtB,SAASJ,gBAAgBK,GAAQ,EAAEC,UAAe;IACvD,MAAMC,MAAMC,QAAQC,GAAG,CAACJ,IAAI;IAC5B,IAAI,CAACE,KAAKG,QAAQ,OAAOJ;IACzB,OAAOC;AACT;AAEO,SAASN;IACd,OAAOO,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACC,qBAAqB;AACpE;AAEO,SAAST;IACd,OAAOI,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACE,cAAc;AAC7D;AAEO,SAASX;IACd,OAAOK,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACG,oBAAoB;AACnE;AAEO,SAASb;IACd,OAAO,UAAUM,QAAQC,GAAG;AAC9B"}

package/dist/utils/normalize-url.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "normalizeUrl", {
         return normalizeUrl;
     }
 });
+const _urlutils = require("./url.utils");
 const DATA_URL_DEFAULT_MIME_TYPE = "text/plain";
 const DATA_URL_DEFAULT_CHARSET = "us-ascii";
 const testParameter = (name, filters)=>filters.some((filter)=>filter instanceof RegExp ? filter.test(name) : filter === name);
@@ -26,7 +27,7 @@ const hasCustomProtocol = (urlString)=>{
 };
 const normalizeDataURL = (urlString, { stripHash })=>{
     const match = /^data:(?<type>[^,]*?),(?<data>[^#]*?)(?:#(?<hash>.*))?$/.exec(urlString);
-    if (!match) {
+    if (!match?.groups) {
         throw new Error(`Invalid URL: ${urlString}`);
     }
     let { type, data, hash } = match.groups;
@@ -94,7 +95,7 @@ function normalizeUrl(urlString, options) {
     const hasRelativeProtocol = urlString.startsWith("//");
     const isRelativeUrl = !hasRelativeProtocol && /^\.*\//.test(urlString);
     if (!isRelativeUrl) {
-        urlString = urlString.replace(/^(?!(?:\w+:)?\/\/)|^\/\//, options.defaultProtocol);
+        urlString = urlString.replace(/^(?!(?:\w+:)?\/\/)|^\/\//, options.defaultProtocol ?? _urlutils.defaultHttpProtocol);
     }
     const urlObject = new URL(urlString);
     if (options.forceHttp && options.forceHttps) {

package/dist/utils/normalize-url.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/normalize-url.ts"],"names":["normalizeUrl","DATA_URL_DEFAULT_MIME_TYPE","DATA_URL_DEFAULT_CHARSET","testParameter","name","filters","some","filter","RegExp","test","supportedProtocols","Set","hasCustomProtocol","urlString","protocol","URL","endsWith","includes","has","normalizeDataURL","stripHash","match","exec","Error","type","data","hash","groups","mediaType","split","isBase64","length","pop","mimeType","shift","toLowerCase","attributes","map","attribute","key","value","string","trim","Boolean","normalizedMediaType","push","unshift","join","options","defaultProtocol","normalizeProtocol","forceHttp","forceHttps","stripAuthentication","stripTextFragment","stripWWW","removeQueryParameters","removeTrailingSlash","removeSingleSlash","removeDirectoryIndex","removeExplicitPort","sortQueryParameters","hasRelativeProtocol","startsWith","isRelativeUrl","replace","urlObject","username","password","pathname","protocolRegex","lastIndex","result","protocolAtIndex","index","intermediate","slice","remnant","decodeURI","Array","isArray","pathComponents","lastComponent","hostname","searchParams","keys","delete","keepQueryParameters","search","sort","decodeURIComponent","port","oldUrlString","toString","stripProtocol"],"mappings":"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"}
+{"version":3,"sources":["../../src/utils/normalize-url.ts"],"names":["normalizeUrl","DATA_URL_DEFAULT_MIME_TYPE","DATA_URL_DEFAULT_CHARSET","testParameter","name","filters","some","filter","RegExp","test","supportedProtocols","Set","hasCustomProtocol","urlString","protocol","URL","endsWith","includes","has","normalizeDataURL","stripHash","match","exec","groups","Error","type","data","hash","mediaType","split","isBase64","length","pop","mimeType","shift","toLowerCase","attributes","map","attribute","key","value","string","trim","Boolean","normalizedMediaType","push","unshift","join","options","defaultProtocol","normalizeProtocol","forceHttp","forceHttps","stripAuthentication","stripTextFragment","stripWWW","removeQueryParameters","removeTrailingSlash","removeSingleSlash","removeDirectoryIndex","removeExplicitPort","sortQueryParameters","hasRelativeProtocol","startsWith","isRelativeUrl","replace","defaultHttpProtocol","urlObject","username","password","pathname","protocolRegex","lastIndex","result","protocolAtIndex","index","intermediate","slice","remnant","decodeURI","Array","isArray","pathComponents","lastComponent","hostname","searchParams","keys","delete","keepQueryParameters","search","sort","decodeURIComponent","port","oldUrlString","toString","stripProtocol"],"mappings":"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"}

package/dist/utils/printer-type.utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/printer-type.utils.ts"],"names":["getServiceName","isMoonrakerType","isOctoPrintType","printerType"],"mappings":";;;;;;;;;;;IAQgBA,cAAc;eAAdA;;IAJAC,eAAe;eAAfA;;IAJAC,eAAe;eAAfA;;;AAAT,SAASA,gBAAgBC,WAAoB;IAClD,OAAOA,gBAAgB;AACzB;AAEO,SAASF,gBAAgBE,WAAoB;IAClD,OAAOA,gBAAgB;AACzB;AAEO,SAASH,eAAeG,WAAoB;IACjD,OAAOD,gBAAgBC,eACnB,cACAF,gBAAgBE,eAChB,cACA;AACN"}
+{"version":3,"sources":["../../src/utils/printer-type.utils.ts"],"names":["getServiceName","isMoonrakerType","isOctoPrintType","printerType"],"mappings":";;;;;;;;;;;IAQgBA,cAAc;eAAdA;;IAJAC,eAAe;eAAfA;;IAJAC,eAAe;eAAfA;;;AAAT,SAASA,gBAAgBC,WAAoB;IAClD,OAAOA,gBAAgB;AACzB;AAEO,SAASF,gBAAgBE,WAAoB;IAClD,OAAOA,gBAAgB;AACzB;AAEO,SAASH,eAAeG,WAAoB;IACjD,OAAOD,gBAAgBC,eAAe,cAAcF,gBAAgBE,eAAe,cAAc;AACnG"}

package/dist/utils/time.utils.js

@@ -2,25 +2,15 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    isValidDate: function() {
-        return isValidDate;
-    },
-    sleep: function() {
-        return sleep;
+Object.defineProperty(exports, "isParsableDate", {
+    enumerable: true,
+    get: function() {
+        return isParsableDate;
     }
 });
-async function sleep(ms = 2000) {
-    return new Promise((resolve)=>setTimeout(resolve, ms));
-}
-function isValidDate(date) {
-    return date instanceof Date && !isNaN(date);
+function isParsableDate(value) {
+    const timestamp = Date.parse(value);
+    return !isNaN(timestamp);
 }
 
 //# sourceMappingURL=time.utils.js.map

package/dist/utils/time.utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/time.utils.ts"],"names":["isValidDate","sleep","ms","Promise","resolve","setTimeout","date","Date","isNaN"],"mappings":";;;;;;;;;;;IAIgBA,WAAW;eAAXA;;IAJMC,KAAK;eAALA;;;AAAf,eAAeA,MAAMC,KAAK,IAAI;IACnC,OAAO,IAAIC,QAAQ,CAACC,UAAYC,WAAWD,SAASF;AACtD;AAEO,SAASF,YAAYM,IAAI;IAC9B,OAAOA,gBAAgBC,QAAQ,CAACC,MAAMF;AACxC"}
+{"version":3,"sources":["../../src/utils/time.utils.ts"],"names":["isParsableDate","value","timestamp","Date","parse","isNaN"],"mappings":";;;;+BAAgBA;;;eAAAA;;;AAAT,SAASA,eAAeC,KAAa;IAC1C,MAAMC,YAAYC,KAAKC,KAAK,CAACH;IAC7B,OAAO,CAACI,MAAMH;AAChB"}