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

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

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "PrinterStateUpdatePollTask", {
+    enumerable: true,
+    get: function() {
+        return PrinterStateUpdatePollTask;
+    }
+});
+const _nodefs = require("node:fs");
+const _serverconstants = require("../server.constants");
+class PrinterStateUpdatePollTask {
+    printerCache;
+    printerConnectionCache;
+    printerEventsCache;
+    settingsStore;
+    configService;
+    octoPrintApiService;
+    taskManagerService;
+    logger;
+    constructor({ printerCache, printerConnectionCache, printerEventsCache, octoPrintApiService, settingsStore, configService, taskManagerService, loggerFactory }){
+        this.printerCache = printerCache;
+        this.printerConnectionCache = printerConnectionCache;
+        this.printerEventsCache = printerEventsCache;
+        this.settingsStore = settingsStore;
+        this.configService = configService;
+        this.octoPrintApiService = octoPrintApiService;
+        this.taskManagerService = taskManagerService;
+        this.logger = loggerFactory(PrinterStateUpdatePollTask.name);
+    }
+    async run() {
+        const startTime = Date.now();
+        const disabledPrintersCount = await this.printerCache.countDisabledPrinters();
+        const printers = await this.printerCache.listCachedPrinters(false);
+        const promisesStateUpdate = [];
+        let failures = 0;
+        let operational = 0;
+        let disconnected = 0;
+        let offlineAfterError = 0;
+        let printing = 0;
+        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);
+                });
+                promisesStateUpdate.push(promise);
+            } catch (e) {
+                failures++;
+            }
+        }
+        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)`);
+    }
+    _isDebugMode() {
+        return this.configService.get(_serverconstants.AppConstants.debugFileWritePrinterStatesKey, _serverconstants.AppConstants.defaultDebugFileWritePrinterStates) === "true";
+    }
+}
+
+//# sourceMappingURL=printer-state-update-poll.task.js.map

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

@@ -0,0 +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"],"mappings":"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"}

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

@@ -31,17 +31,18 @@ class PrinterWebsocketRestoreTask {
                 if (socket.isClosedOrAborted()) {
                     socket.close();
                     socket.resetSocketState();
+                    this.logger.warn("Socket was closed or aborted, manually removing it");
                     resetAdapterIds.push(socket.printerId);
                     continue;
                 }
             } catch (e) {
-                this.logger.error(`WebSocket authentication command failed for '${socket.printerId}' with error '${(0, _errorutils.errorSummary)(e)}'`, e.stack);
+                this.logger.error(`Resetting WebSocket socket failed for '${socket.printerId}' 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);
                 silentSocketIds.push(socket.printerId);
                 try {
-                    const result = await this.octoPrintApiService.getConnection(socket.loginDto);
                     if (result?.current?.state !== "Closed") {
                         this.logger.warn(`Silence was detected, but the OctoPrint current connection was not closed. Connection state ${result?.current?.state}, printerId: ${socket.printerId}.`);
                     }
@@ -51,7 +52,7 @@ class PrinterWebsocketRestoreTask {
             }
         }
         const duration = Date.now() - startTime;
-        if (this.settingsStore.getServerSettings()?.debugSettings?.debugSocketRetries) {
+        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","octoPrintApiService","logger","constructor","loggerFactory","name","run","startTime","Date","now","existingSockets","listPrinterSockets","resetAdapterIds","silentSocketIds","socket","isClosedOrAborted","close","resetSocketState","push","printerId","e","error","errorSummary","stack","apiState","API_STATE","unset","lastMessageReceivedTimestamp","result","getConnection","loginDto","current","state","warn","duration","getServerSettings","debugSettings","debugSocketRetries","log","length"],"mappings":";;;;+BAQaA;;;eAAAA;;;4BARgB;wCACH;AAOnB,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;QAK1B,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;oBACvBL,gBAAgBM,IAAI,CAACJ,OAAOK,SAAS;oBACrC;gBACF;YACF,EAAE,OAAOC,GAAG;gBACV,IAAI,CAAClB,MAAM,CAACmB,KAAK,CACf,CAAC,6CAA6C,EAAEP,OAAOK,SAAS,CAAC,cAAc,EAAEG,IAAAA,wBAAY,EAACF,GAAG,CAAC,CAAC,EACnGA,EAAEG,KAAK;gBAET;YACF;YAGA,IACE,AAACT,OAAOU,QAAQ,KAAKC,iCAAS,CAACC,KAAK,IAAI,CAACZ,OAAOa,4BAA4B,IAC5EnB,KAAKC,GAAG,KAAKK,OAAOa,4BAA4B,GAAG,KAAK,MACxD;gBACAd,gBAAgBK,IAAI,CAACJ,OAAOK,SAAS;gBAErC,IAAI;oBACF,MAAMS,SAAS,MAAM,IAAI,CAAC3B,mBAAmB,CAAC4B,aAAa,CAACf,OAAOgB,QAAQ;oBAC3E,IAAIF,QAAQG,SAASC,UAAU,UAAU;wBACvC,IAAI,CAAC9B,MAAM,CAAC+B,IAAI,CACd,CAAC,4FAA4F,EAAEL,QAAQG,SAASC,MAAM,aAAa,EAAElB,OAAOK,SAAS,CAAC,CAAC,CAAC;oBAE5J;gBACF,EAAE,OAAOC,GAAG;oBACV,IAAI,CAAClB,MAAM,CAACmB,KAAK,CACf,CAAC,uFAAuF,EAAEP,OAAOK,SAAS,CAAC,CAAC,CAAC;gBAEjH;YACF;QACF;QAEA,MAAMe,WAAW1B,KAAKC,GAAG,KAAKF;QAC9B,IAAI,IAAI,CAACR,aAAa,CAACoC,iBAAiB,IAAIC,eAAeC,oBAAoB;YAC7E,IAAI,CAACnC,MAAM,CAACoC,GAAG,CACb,CAAC,MAAM,EAAE1B,gBAAgB2B,MAAM,CAAC,qCAAqC,EAAE1B,gBAAgB0B,MAAM,CAAC,0BAA0B,EAAEL,SAAS,GAAG,CAAC;QAE3I;IACF;AACF"}
+{"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","error","errorSummary","stack","apiState","API_STATE","unset","lastMessageReceivedTimestamp","result","getConnection","loginDto","current","state","duration","getSettingsSensitive","server","debugSettings","debugSocketRetries","log","length"],"mappings":";;;;+BAQaA;;;eAAAA;;;4BARgB;wCACH;AAOnB,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;gBACf,IAAI,CAACnB,MAAM,CAACoB,KAAK,CAAC,CAAC,uCAAuC,EAAER,OAAOM,SAAS,CAAC,cAAc,EAAEG,IAAAA,wBAAY,EAACF,GAAG,CAAC,CAAC,EAAEA,EAAEG,KAAK;gBACxH;YACF;YAGA,IACE,AAACV,OAAOW,QAAQ,KAAKC,iCAAS,CAACC,KAAK,IAAI,CAACb,OAAOc,4BAA4B,IAC5EpB,KAAKC,GAAG,KAAKK,OAAOc,4BAA4B,GAAG,KAAK,MACxD;gBACA,MAAMC,SAAS,MAAM,IAAI,CAAC5B,mBAAmB,CAAC6B,aAAa,CAAChB,OAAOiB,QAAQ;gBAE3ElB,gBAAgBM,IAAI,CAACL,OAAOM,SAAS;gBAErC,IAAI;oBACF,IAAIS,QAAQG,SAASC,UAAU,UAAU;wBACvC,IAAI,CAAC/B,MAAM,CAACgB,IAAI,CACd,CAAC,4FAA4F,EAAEW,QAAQG,SAASC,MAAM,aAAa,EAAEnB,OAAOM,SAAS,CAAC,CAAC,CAAC;oBAE5J;gBACF,EAAE,OAAOC,GAAG;oBACV,IAAI,CAACnB,MAAM,CAACoB,KAAK,CACf,CAAC,uFAAuF,EAAER,OAAOM,SAAS,CAAC,CAAC,CAAC;gBAEjH;YACF;QACF;QAEA,MAAMc,WAAW1B,KAAKC,GAAG,KAAKF;QAC9B,IAAI,IAAI,CAACR,aAAa,CAACoC,oBAAoB,IAAIC,QAAQC,cAAcC,oBAAoB;YACvF,IAAI,CAACpC,MAAM,CAACqC,GAAG,CACb,CAAC,MAAM,EAAE3B,gBAAgB4B,MAAM,CAAC,qCAAqC,EAAE3B,gBAAgB2B,MAAM,CAAC,0BAA0B,EAAEN,SAAS,GAAG,CAAC;QAE3I;IACF;AACF"}

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

@@ -24,7 +24,7 @@ class PrinterWebsocketTask {
     async run() {
         const startTime = Date.now();
         const result = await this.printerSocketStore.reconnectPrinterSockets();
-        if (this.settingsStore.getServerSettings().debugSettings?.debugSocketReconnect) {
+        if (this.settingsStore.getDebugSettingsSensitive()?.debugSocketReconnect) {
             this.logger.log(`Socket reconnect (${Date.now() - startTime}ms)`, result);
         }
     }

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","getServerSettings","debugSettings","debugSocketReconnect","log"],"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,iBAAiB,GAAGC,aAAa,EAAEC,sBAAsB;YAC9E,IAAI,CAACZ,MAAM,CAACa,GAAG,CAAC,CAAC,kBAAkB,EAAEP,KAAKC,GAAG,KAAKF,UAAU,GAAG,CAAC,EAAEG;QACpE;IACF;AACF"}
+{"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"],"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"}

package/dist/tasks.js

@@ -23,7 +23,7 @@ function registerTask(task, preset, milliseconds = 0, runImmediately = false) {
         ...preset
     };
     timingPreset.milliseconds = preset.milliseconds || milliseconds;
-    timingPreset.runImmediately = runImmediately | false;
+    timingPreset.runImmediately = runImmediately || false;
     return {
         id: task.name || task,
         task,
@@ -39,6 +39,7 @@ class ServerTasks {
         registerTask(_containertokens.DITokens.printCompletionSocketIoTask, _taskpresets.TASK_PRESETS.RUNONCE),
         registerTask(_containertokens.DITokens.printerFileCleanTask, _taskpresets.TASK_PRESETS.RUNONCE, 60 * 1000, true),
         registerTask(_containertokens.DITokens.printerWebsocketTask, _taskpresets.TASK_PRESETS.PERIODIC, 2000, true),
+        registerTask(_containertokens.DITokens.printerStateUpdatePollTask, _taskpresets.TASK_PRESETS.PERIODIC, 10 * 1000, true),
         registerTask(_containertokens.DITokens.printerWebsocketRestoreTask, _taskpresets.TASK_PRESETS.PERIODIC, 15 * 1000, false)
     ];
 }

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","printCompletionSocketIoTask","printerFileCleanTask","printerWebsocketTask","printerWebsocketRestoreTask"],"mappings":";;;;;;;;;;;IAsBaA,WAAW;eAAXA;;IAXGC,YAAY;eAAZA;;;6BAX4B;iCACnB;AAUlB,SAASA,aAAaC,IAAI,EAAEC,MAAM,EAAEC,eAAe,CAAC,EAAEC,iBAAiB,KAAK;IACjF,IAAIC,eAAe;QAAE,GAAGH,MAAM;IAAC;IAC/BG,aAAaF,YAAY,GAAGD,OAAOC,YAAY,IAAIA;IACnDE,aAAaD,cAAc,GAAGA,iBAAiB;IAC/C,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;QAC1DnB,aAAaS,yBAAQ,CAACW,2BAA2B,EAAET,yBAAW,CAACM,OAAO;QACtEjB,aAAaS,yBAAQ,CAACY,oBAAoB,EAAEV,yBAAW,CAACM,OAAO,EAAE,KAAK,MAAM;QAE5EjB,aAAaS,yBAAQ,CAACa,oBAAoB,EAAEX,yBAAW,CAACQ,QAAQ,EAAE,MAAM;QAExEnB,aAAaS,yBAAQ,CAACc,2BAA2B,EAAEZ,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","printCompletionSocketIoTask","printerFileCleanTask","printerWebsocketTask","printerStateUpdatePollTask","printerWebsocketRestoreTask"],"mappings":";;;;;;;;;;;IAsBaA,WAAW;eAAXA;;IAXGC,YAAY;eAAZA;;;6BAX0C;iCACjC;AAUlB,SAASA,aAAaC,IAAI,EAAEC,MAAoB,EAAEC,eAAe,CAAC,EAAEC,iBAAiB,KAAK;IAC/F,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;QAC1DnB,aAAaS,yBAAQ,CAACW,2BAA2B,EAAET,yBAAW,CAACM,OAAO;QACtEjB,aAAaS,yBAAQ,CAACY,oBAAoB,EAAEV,yBAAW,CAACM,OAAO,EAAE,KAAK,MAAM;QAE5EjB,aAAaS,yBAAQ,CAACa,oBAAoB,EAAEX,yBAAW,CAACQ,QAAQ,EAAE,MAAM;QAExEnB,aAAaS,yBAAQ,CAACc,0BAA0B,EAAEZ,yBAAW,CAACQ,QAAQ,EAAE,KAAK,MAAM;QAEnFnB,aAAaS,yBAAQ,CAACe,2BAA2B,EAAEb,yBAAW,CAACQ,QAAQ,EAAE,KAAK,MAAM;KACrF,CAAC;AACJ"}

package/dist/utils/semver.utils.js

@@ -2,16 +2,31 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "checkVersionSatisfiesMinimum", {
-    enumerable: true,
-    get: function() {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    checkVersionSatisfiesMinimum: function() {
         return checkVersionSatisfiesMinimum;
+    },
+    getMaximumOfVersionsSafe: function() {
+        return getMaximumOfVersionsSafe;
     }
 });
 const _semver = require("semver");
 function checkVersionSatisfiesMinimum(newVersion, minimumVersion) {
     const comparison = (0, _semver.compare)(newVersion, minimumVersion);
-    return comparison > -1;
+    return comparison !== -1;
+}
+function getMaximumOfVersionsSafe(v1, v2) {
+    if (!v2) return v1;
+    const comparison = (0, _semver.compare)(v1, v2);
+    if (comparison === 0) return v1;
+    if (comparison === -1) return v2;
+    return v1;
 }
 
 //# sourceMappingURL=semver.utils.js.map

package/dist/utils/semver.utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/semver.utils.ts"],"names":["checkVersionSatisfiesMinimum","newVersion","minimumVersion","comparison","compare"],"mappings":";;;;+BAEgBA;;;eAAAA;;;wBAFQ;AAEjB,SAASA,6BAA6BC,UAAkB,EAAEC,cAAsB;IACrF,MAAMC,aAAaC,IAAAA,eAAO,EAACH,YAAYC;IAEvC,OAAOC,aAAa,CAAC;AACvB"}
+{"version":3,"sources":["../../src/utils/semver.utils.ts"],"names":["checkVersionSatisfiesMinimum","getMaximumOfVersionsSafe","newVersion","minimumVersion","comparison","compare","v1","v2"],"mappings":";;;;;;;;;;;IAEgBA,4BAA4B;eAA5BA;;IAQAC,wBAAwB;eAAxBA;;;wBAVQ;AAEjB,SAASD,6BAA6BE,UAAkB,EAAEC,cAAsB;IACrF,MAAMC,aAAaC,IAAAA,eAAO,EAACH,YAAYC;IAIvC,OAAOC,eAAe,CAAC;AACzB;AAEO,SAASH,yBAAyBK,EAAU,EAAEC,EAAW;IAC9D,IAAI,CAACA,IAAI,OAAOD;IAChB,MAAMF,aAAaC,IAAAA,eAAO,EAACC,IAAIC;IAC/B,IAAIH,eAAe,GAAG,OAAOE;IAC7B,IAAIF,eAAe,CAAC,GAAG,OAAOG;IAC9B,OAAOD;AACT"}

package/package.json

@@ -6,8 +6,7 @@
   },
   "author": "David Zwart",
   "license": "AGPL-3.0-or-later",
-  "private": false,
-  "version": "1.6.0-rc1",
+  "version": "1.6.0-rc2",
   "bin": {
     "fdm-monster": "dist/index.js",
     "fdmm": "dist/index.js"
@@ -21,8 +20,8 @@
     "console:torm": "yarn build && cross-env NODE_ENV=development nodemon --watch \"dist/**/*\" -e js ./dist/consoles/sqlite-torm.js",
     "console:migrate": "yarn build && cross-env NODE_ENV=development nodemon --watch \"dist/**/*\" -e js ./dist/consoles/typeorm-migrate.js",
     "console:generate": "yarn build && cross-env NODE_ENV=development node ./dist/consoles/typeorm-generate.js",
-    "build": "swc src -d dist",
-    "build:watch": "swc src -w -d dist",
+    "build": "swc src -d dist --strip-leading-paths",
+    "build:watch": "swc src -w -d dist --strip-leading-paths",
     "start:dev": "ts-node src/index.ts",
     "start": "cross-env NODE_ENV=production node dist/index.js",
     "migration:create": "migrate-mongo create printer-files-simpler",
@@ -32,8 +31,10 @@
     "format": "prettier --write \"src/**/*.js\" \"test/**/*.js\"",
     "swc": "swc",
     "tsc": "tsc --noEmit",
-    "test": "jest --forceExit  --maxConcurrency=8 --runInBand ",
-    "test:cov": "jest --forceExit --coverage  --maxConcurrency=8 --runInBand ",
+    "test": "cross-env SQLITE_MODE=false jest --forceExit  --maxConcurrency=8 --runInBand ",
+    "test:sqlite": "cross-env SQLITE_MODE=true jest --forceExit  --maxConcurrency=8 --runInBand ",
+    "test:cov": "cross-env SQLITE_MODE=false jest --forceExit --coverage  --maxConcurrency=8 --runInBand ",
+    "test:cov-sqlite": "cross-env SQLITE_MODE=true jest --forceExit --coverage  --maxConcurrency=8 --runInBand ",
     "cov:show": "./coverage/lcov-report/index.html",
     "torm": "ts-node --swc -r tsconfig-paths/register ./node_modules/typeorm/cli.js",
     "typeorm:generate": "yarn torm migration:generate -d src/data-source.ts --pretty src/migrations/CustomGCode",
@@ -51,22 +52,23 @@
     "vue"
   ],
   "dependencies": {
-    "@fdm-monster/client": "1.5.0-rc3",
+    "@fdm-monster/client": "1.5.0-rc5",
     "@influxdata/influxdb-client": "1.33.2",
-    "@sentry/node": "7.93.0",
+    "@octokit/plugin-throttling": "8.1.3",
+    "@sentry/node": "7.99.0",
     "adm-zip": "0.5.10",
     "awilix": "10.0.1",
     "awilix-express": "9.0.1",
-    "axios": "1.6.5",
+    "axios": "1.6.7",
     "bcryptjs": "2.4.3",
-    "better-sqlite3": "9.2.2",
+    "better-sqlite3": "9.3.0",
     "cache-manager": "4.1.0",
     "class-validator": "0.14.1",
     "connect-history-api-fallback": "2.0.0",
     "cookie-parser": "1.4.6",
     "cors": "2.8.5",
     "cross-env": "7.0.3",
-    "dotenv": "16.3.1",
+    "dotenv": "16.4.1",
     "eventemitter2": "6.4.9",
     "express": "4.18.2",
     "form-data": "4.0.0",
@@ -77,11 +79,10 @@
     "lodash": "4.17.21",
     "luxon": "3.4.4",
     "migrate-mongo": "11.0.0",
-    "mongoose": "6.12.5",
-    "mqtt": "5.3.4",
+    "mongoose": "6.12.6",
     "multer": "1.4.5-lts.1",
     "node-input-validator": "4.5.1",
-    "nodemon": "3.0.2",
+    "nodemon": "3.0.3",
     "octokit": "3.1.2",
     "passport": "0.7.0",
     "passport-anonymous": "1.0.1",
@@ -90,8 +91,8 @@
     "semver": "7.5.4",
     "simple-git": "3.22.0",
     "socket.io": "4.7.4",
-    "toad-scheduler": "3.0.0",
-    "typeorm": "0.3.19",
+    "toad-scheduler": "3.0.1",
+    "typeorm": "0.3.20",
     "uuid": "9.0.1",
     "winston": "3.11.0",
     "ws": "8.16.0"
@@ -99,29 +100,28 @@
   "devDependencies": {
     "@lcov-viewer/cli": "1.3.0",
     "@lcov-viewer/istanbul-report": "1.4.0",
-    "@swc/cli": "0.1.63",
-    "@swc/core": "1.3.102",
-    "@swc/jest": "0.2.29",
+    "@swc/cli": "0.3.6",
+    "@swc/core": "1.3.107",
+    "@swc/jest": "0.2.34",
     "@types/adm-zip": "0.5.5",
     "@types/bcryptjs": "2.4.6",
     "@types/cache-manager": "4.0.6",
     "@types/connect-history-api-fallback": "1.5.4",
     "@types/cookie-parser": "1.4.6",
     "@types/express": "4.17.21",
-    "@types/express-session": "1.17.10",
     "@types/ip": "1.1.3",
-    "@types/jest": "29.5.11",
+    "@types/jest": "29.5.12",
     "@types/js-yaml": "4.0.9",
     "@types/lodash": "4.14.202",
-    "@types/luxon": "3.4.0",
+    "@types/luxon": "3.4.2",
     "@types/migrate-mongo": "10.0.4",
     "@types/multer": "1.4.11",
-    "@types/node": "20.11.0",
+    "@types/node": "20.11.16",
     "@types/passport-anonymous": "1.0.5",
-    "@types/passport-jwt": "4.0.0",
+    "@types/passport-jwt": "4.0.1",
     "@types/semver": "7.5.6",
     "@types/supertest": "6.0.2",
-    "@types/uuid": "9.0.7",
+    "@types/uuid": "9.0.8",
     "chokidar": "3.5.3",
     "concurrently": "8.2.2",
     "eslint": "8.56.0",
@@ -135,10 +135,10 @@
     "express-list-routes": "1.1.9",
     "jest": "29.7.0",
     "jest-27-expect-message": "1.1.0",
-    "mongodb-memory-server": "9.1.4",
-    "nock": "13.4.0",
+    "mongodb-memory-server": "9.1.6",
+    "nock": "13.5.1",
     "prettier": "2.8.8",
-    "supertest": "6.3.3",
+    "supertest": "6.3.4",
     "ts-node": "10.9.2",
     "typescript": "5.3.3"
   },
@@ -160,5 +160,6 @@
       "docker/*"
     ],
     "delay": 100
-  }
+  },
+  "packageManager": "yarn@4.1.0"
 }