@fdm-monster/server 1.6.4 → 1.7.1

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

@@ -16,6 +16,7 @@ const _serverconstants = require("../server.constants");
 const _errorutils = require("../utils/error.utils");
 const _node = require("@sentry/node");
 const _socketstatetype = require("../shared/dtos/socket-state.type");
+const _websocketconstants = require("../services/moonraker/constants/websocket.constants");
 class TestPrinterSocketStore {
     testSocket;
     socketIoGateway;
@@ -41,7 +42,8 @@ class TestPrinterSocketStore {
             printerId: correlationToken,
             loginDto: {
                 apiKey: printer.apiKey,
-                printerURL: printer.printerURL
+                printerURL: printer.printerURL,
+                printerType: printer.printerType
             },
             protocol: "ws"
         });
@@ -50,7 +52,12 @@ class TestPrinterSocketStore {
             (0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.API_STATE_UPDATED),
             (0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.WS_CLOSED),
             (0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.WS_OPENED),
-            (0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.WS_ERROR)
+            (0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.WS_ERROR),
+            (0, _websocketconstants.moonrakerEvent)(_octoprintwebsocketadapter.WsMessage.WS_STATE_UPDATED),
+            (0, _websocketconstants.moonrakerEvent)(_octoprintwebsocketadapter.WsMessage.API_STATE_UPDATED),
+            (0, _websocketconstants.moonrakerEvent)(_octoprintwebsocketadapter.WsMessage.WS_CLOSED),
+            (0, _websocketconstants.moonrakerEvent)(_octoprintwebsocketadapter.WsMessage.WS_OPENED),
+            (0, _websocketconstants.moonrakerEvent)(_octoprintwebsocketadapter.WsMessage.WS_ERROR)
         ];
         const listener = ({ event, payload, printerId })=>{
             if (printerId !== correlationToken) {

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

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

@@ -9,9 +9,11 @@ Object.defineProperty(exports, "createTestPrinterRules", {
     }
 });
 const _serviceconstants = require("../../constants/service.constants");
+const _printerapiinterface = require("../../services/printer-api.interface");
 const createTestPrinterRules = {
+    printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
     correlationToken: "required|string",
-    apiKey: `required|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
+    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
     printerURL: "required|httpurl"
 };
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/state/validation/create-test-printer.validation.ts"],"names":["createTestPrinterRules","correlationToken","apiKey","UUID_LENGTH","printerURL"],"mappings":";;;;+BAEaA;;;eAAAA;;;kCAFe;AAErB,MAAMA,yBAAyB;IACpCC,kBAAkB;IAClBC,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;AACd"}
+{"version":3,"sources":["../../../src/state/validation/create-test-printer.validation.ts"],"names":["createTestPrinterRules","printerType","OctoprintType","MoonrakerType","correlationToken","apiKey","UUID_LENGTH","printerURL"],"mappings":";;;;+BAGaA;;;eAAAA;;;kCAHe;qCACiB;AAEtC,MAAMA,yBAAyB;IACpCC,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,kBAAkB;IAClBC,QAAQ,CAAC,uBAAuB,EAAEH,kCAAa,CAAC,QAAQ,EAAEI,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACnGC,YAAY;AACd"}

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

@@ -11,6 +11,7 @@ Object.defineProperty(exports, "PrinterWebsocketRestoreTask", {
 const _errorutils = require("../utils/error.utils");
 const _node = require("@sentry/node");
 const _apistatetype = require("../shared/dtos/api-state.type");
+const _printerapiinterface = require("../services/printer-api.interface");
 class PrinterWebsocketRestoreTask {
     settingsStore;
     printerSocketStore;
@@ -28,6 +29,9 @@ class PrinterWebsocketRestoreTask {
         const resetAdapterIds = [];
         const silentSocketIds = [];
         for (const socket of existingSockets){
+            if (socket.printerType !== _printerapiinterface.OctoprintType) {
+                continue;
+            }
             try {
                 if (socket.isClosedOrAborted()) {
                     socket.close();

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","isClosedOrAborted","close","resetSocketState","warn","push","printerId","e","captureException","error","errorSummary","stack","apiState","API_STATE","unset","lastMessageReceivedTimestamp","result","getConnection","login","current","state","duration","getSettingsSensitive","server","debugSettings","debugSocketRetries","log","length"],"mappings":";;;;+BASaA;;;eAAAA;;;4BATgB;sBAMI;8BACP;AAEnB,MAAMA;IACXC,cAA6B;IAC7BC,mBAAuC;IACvCC,gBAAiC;IACjCC,OAAsB;IAEtBC,YAAY,EACVH,kBAAkB,EAClBC,eAAe,EACfF,aAAa,EACbK,aAAa,EAMd,CAAE;QACD,IAAI,CAACJ,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,eAAe,GAAGA;QACvB,IAAI,CAACF,aAAa,GAAGA;QACrB,IAAI,CAACG,MAAM,GAAGE,cAAcN,4BAA4BO,IAAI;IAC9D;IAEA,MAAMC,MAAM;QACV,MAAMC,YAAYC,KAAKC,GAAG;QAE1B,MAAMC,kBAAkB,IAAI,CAACV,kBAAkB,CAACW,kBAAkB;QAClE,MAAMC,kBAAkB,EAAE;QAC1B,MAAMC,kBAAkB,EAAE;QAC1B,KAAK,MAAMC,UAAUJ,gBAAiB;YACpC,IAAI;gBACF,IAAII,OAAOC,iBAAiB,IAAI;oBAC9BD,OAAOE,KAAK;oBACZF,OAAOG,gBAAgB;oBACvB,IAAI,CAACf,MAAM,CAACgB,IAAI,CAAC;oBACjBN,gBAAgBO,IAAI,CAACL,OAAOM,SAAS;oBACrC;gBACF;YACF,EAAE,OAAOC,GAAQ;gBACfC,IAAAA,sBAAgB,EAACD;gBACjB,IAAI,CAACnB,MAAM,CAACqB,KAAK,CAAC,CAAC,0DAA0D,EAAEC,IAAAA,wBAAY,EAACH,GAAG,CAAC,CAAC,EAAEA,EAAEI,KAAK;gBAC1G;YACF;YAGA,IACE,AAACX,OAAOY,QAAQ,KAAKC,uBAAS,CAACC,KAAK,IAAI,CAACd,OAAOe,4BAA4B,IAC5ErB,KAAKC,GAAG,KAAKK,OAAOe,4BAA4B,GAAG,KAAK,MACxD;gBACA,MAAMC,SAAS,MAAM,IAAI,CAAC7B,eAAe,CAAC8B,aAAa,CAACjB,OAAOkB,KAAK;gBAEpEnB,gBAAgBM,IAAI,CAACL,OAAOM,SAAS;gBAErC,IAAI;oBACF,IAAIU,QAAQG,SAASC,UAAU,UAAU;wBACvC,IAAI,CAAChC,MAAM,CAACgB,IAAI,CACd,CAAC,4FAA4F,EAAEY,QAAQG,SAASC,OAAO;oBAE3H;gBACF,EAAE,OAAOb,GAAG;oBACV,IAAI,CAACnB,MAAM,CAACqB,KAAK,CAAC,CAAC,sFAAsF,CAAC;gBAC5G;YACF;QACF;QAEA,MAAMY,WAAW3B,KAAKC,GAAG,KAAKF;QAC9B,IAAI,IAAI,CAACR,aAAa,CAACqC,oBAAoB,IAAIC,QAAQC,cAAcC,oBAAoB;YACvF,IAAI,CAACrC,MAAM,CAACsC,GAAG,CACb,CAAC,MAAM,EAAE5B,gBAAgB6B,MAAM,CAAC,qCAAqC,EAAE5B,gBAAgB4B,MAAM,CAAC,0BAA0B,EAAEN,SAAS,GAAG,CAAC;QAE3I;IACF;AACF"}
+{"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","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,QAAQG,SAASC,UAAU,UAAU;wBACvC,IAAI,CAAClC,MAAM,CAACkB,IAAI,CACd,CAAC,4FAA4F,EAAEY,QAAQG,SAASC,OAAO;oBAE3H;gBACF,EAAE,OAAOb,GAAG;oBACV,IAAI,CAACrB,MAAM,CAACuB,KAAK,CAAC,CAAC,sFAAsF,CAAC;gBAC5G;YACF;QACF;QAEA,MAAMY,WAAW7B,KAAKC,GAAG,KAAKF;QAC9B,IAAI,IAAI,CAACR,aAAa,CAACuC,oBAAoB,IAAIC,QAAQC,cAAcC,oBAAoB;YACvF,IAAI,CAACvC,MAAM,CAACwC,GAAG,CACb,CAAC,MAAM,EAAE9B,gBAAgB+B,MAAM,CAAC,qCAAqC,EAAE9B,gBAAgB8B,MAAM,CAAC,0BAA0B,EAAEN,SAAS,GAAG,CAAC;QAE3I;IACF;AACF"}

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":";;;;;;;;;;;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;QAE1DnB,aAAaS,yBAAQ,CAACW,oBAAoB,EAAET,yBAAW,CAACM,OAAO,EAAE,KAAK,MAAM;QAE5EjB,aAAaS,yBAAQ,CAACY,oBAAoB,EAAEV,yBAAW,CAACQ,QAAQ,EAAE,MAAM;QAIxEnB,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":";;;;;;;;;;;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;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"}

package/package.json

@@ -6,7 +6,7 @@
   },
   "author": "David Zwart",
   "license": "AGPL-3.0-or-later",
-  "version": "1.6.4",
+  "version": "1.7.1",
   "bin": {
     "fdm-monster": "dist/index.js",
     "fdmm": "dist/index.js"
@@ -17,9 +17,10 @@
     "console:upload": "yarn build && cross-env NODE_ENV=development node ./dist/consoles/upload-test.js",
     "dev": "concurrently \"yarn build:watch\" \"yarn watch-dev\"",
     "watch-dev": "cross-env NODE_ENV=development nodemon --enable-source-maps --watch \"dist/**/*\" -e js ./dist/index.js",
+    "console:github-releases": "yarn build && cross-env NODE_ENV=development nodemon --watch \"dist/**/*\" -e js ./dist/consoles/download-github-releases.js",
+    "console:generate": "yarn build && cross-env NODE_ENV=development node ./dist/consoles/typeorm-generate.js",
     "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 --strip-leading-paths",
     "build:watch": "swc src -w -d dist --strip-leading-paths",
     "start:dev": "ts-node src/index.ts",
@@ -52,17 +53,18 @@
     "vue"
   ],
   "dependencies": {
-    "@fdm-monster/client": "1.6.1",
+    "@fdm-monster/client": "1.6.7",
+    "@fdm-monster/client-next": "0.0.4",
     "@influxdata/influxdb-client": "1.35.0",
     "@octokit/plugin-throttling": "8.2.0",
-    "@sentry/node": "8.35.0",
+    "@sentry/node": "8.36.0",
     "adm-zip": "0.5.16",
     "awilix": "12.0.3",
     "awilix-express": "9.0.1",
     "axios": "1.7.7",
     "bcryptjs": "2.4.3",
     "better-sqlite3": "11.5.0",
-    "cache-manager": "4.1.0",
+    "cache-manager": "6.1.2",
     "class-validator": "0.14.1",
     "connect-history-api-fallback": "2.0.0",
     "cookie-parser": "1.4.7",
@@ -93,17 +95,17 @@
     "socket.io": "4.8.1",
     "toad-scheduler": "3.0.1",
     "typeorm": "0.3.20",
-    "uuid": "10.0.0",
-    "winston": "3.15.0",
+    "uuid": "11.0.2",
+    "winston": "3.16.0",
     "ws": "8.18.0"
   },
   "devDependencies": {
     "@lcov-viewer/cli": "1.3.0",
     "@lcov-viewer/istanbul-report": "1.4.0",
-    "@swc/cli": "0.4.0",
-    "@swc/core": "1.7.40",
-    "@swc/jest": "0.2.36",
-    "@types/adm-zip": "0.5.5",
+    "@swc/cli": "0.5.0",
+    "@swc/core": "1.8.0",
+    "@swc/jest": "0.2.37",
+    "@types/adm-zip": "0.5.6",
     "@types/bcryptjs": "2.4.6",
     "@types/cache-manager": "4.0.6",
     "@types/connect-history-api-fallback": "1.5.4",
@@ -112,25 +114,25 @@
     "@types/ip": "1.1.3",
     "@types/jest": "29.5.14",
     "@types/js-yaml": "4.0.9",
-    "@types/lodash": "4.17.12",
+    "@types/lodash": "4.17.13",
     "@types/luxon": "3.4.2",
     "@types/migrate-mongo": "10.0.5",
     "@types/multer": "1.4.12",
-    "@types/node": "20.17.1",
+    "@types/node": "22.8.7",
     "@types/passport-anonymous": "1.0.5",
     "@types/passport-jwt": "4.0.1",
     "@types/semver": "7.5.8",
     "@types/supertest": "6.0.2",
     "@types/uuid": "10.0.0",
-    "@types/ws": "8.5.12",
+    "@types/ws": "8.5.13",
     "chokidar": "4.0.1",
-    "concurrently": "9.0.1",
-    "eslint": "9.13.0",
+    "concurrently": "9.1.0",
+    "eslint": "9.14.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-config-standard": "17.1.0",
     "eslint-plugin-import": "2.31.0",
-    "eslint-plugin-n": "17.11.1",
+    "eslint-plugin-n": "17.12.0",
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-promise": "7.1.0",
     "express-list-routes": "1.2.4",

package/requests/moonraker/api_job.http

@@ -0,0 +1,5 @@
+### GET request to example server
+GET {{moonraker}}
+    /api/job?generated-in=WebStorm
+
+###

package/requests/moonraker/api_printer.http

@@ -0,0 +1,5 @@
+### GET request to example server
+GET {{moonraker}}
+    /api/printer?generated-in=WebStorm
+
+###

package/requests/moonraker/api_settings.http

@@ -0,0 +1,5 @@
+### GET request to example server
+GET {{moonraker}}
+    /api/settings?generated-in=WebStorm
+
+###

package/requests/moonraker/printer_info.http

@@ -0,0 +1,5 @@
+### GET request to example server
+GET {{moonraker}}
+    /printer/info?generated-in=WebStorm
+
+###

package/requests/moonraker/printer_objects_list.http

@@ -0,0 +1,6 @@
+### GET request to example server
+GET {{moonraker}}
+    /printer/objects/list
+
+###
+

package/requests/moonraker/printer_objects_pause_resume.http

@@ -0,0 +1,6 @@
+### GET request to example server
+GET {{moonraker}}
+    /printer/objects/query?pause_resume
+
+###
+

package/requests/moonraker/printer_objects_print_stats.http

@@ -0,0 +1,6 @@
+### GET request to example server
+GET {{moonraker}}
+    /printer/objects/query?print_stats
+
+###
+

package/requests/moonraker/printer_objects_webhooks.http

@@ -0,0 +1,6 @@
+### GET request to example server
+GET {{moonraker}}
+    /printer/objects/query?webhooks
+
+###
+

package/requests/moonraker/server_info.http

@@ -0,0 +1,5 @@
+### GET request to example server
+GET {{moonraker}}
+    /server/info?generated-in=WebStorm
+
+###

package/requests/octoprint/octoprint-api-printer-current.http

@@ -0,0 +1,7 @@
+### GET request to OctoPrint plugins
+
+GET http://{{env-op}}/api/printer
+    ?history=false
+x-api-key: {{api-key}}
+
+###

package/requests/octoprint/octoprint-pluginmanager-plugins.http

@@ -0,0 +1,7 @@
+### GET request to OctoPrint plugins
+
+GET http://{{env-op}}/plugin/pluginmanager/plugins
+    ?generated-in=WebStorm
+x-api-key: {{api-key}}
+
+###

package/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es2021",
+    "target": "es2022",
     "module": "commonjs",
     "allowJs": true,
     "removeComments": true,
@@ -9,7 +9,7 @@
     "sourceMap": true,
     "outDir": "dist",
     "strict": true,
-    "lib": ["es2021"],
+    "lib": ["es2022"],
     "baseUrl": "./src",
     "forceConsistentCasingInFileNames": true,
     "esModuleInterop": true,

package/dist/services/octoprint/dto/connection/connection-state.dto.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "ConnectionStateDto", {
-    enumerable: true,
-    get: function() {
-        return ConnectionStateDto;
-    }
-});
-class ConnectionStateDto {
-    correlationId;
-    socketState;
-    apiState;
-    apiStateUpdateTimestamp;
-    stateUpdateTimestamp;
-    lastMessageReceivedTimestamp;
-    reauthRequiredTimestamp;
-}
-
-//# sourceMappingURL=connection-state.dto.js.map

package/dist/services/octoprint/dto/connection/connection-state.dto.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../../../src/services/octoprint/dto/connection/connection-state.dto.ts"],"names":["ConnectionStateDto","correlationId","socketState","apiState","apiStateUpdateTimestamp","stateUpdateTimestamp","lastMessageReceivedTimestamp","reauthRequiredTimestamp"],"mappings":";;;;+BAEaA;;;eAAAA;;;AAAN,MAAMA;IACXC,cAAsB;IACtBC,YAAyB;IACzBC,SAAmB;IACnBC,wBAAgC;IAChCC,qBAA6B;IAC7BC,6BAAqC;IACrCC,wBAAgC;AAClC"}

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

@@ -1,65 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "PrinterStateUpdatePollTask", {
-    enumerable: true,
-    get: function() {
-        return PrinterStateUpdatePollTask;
-    }
-});
-const _serverconstants = require("../server.constants");
-const _printerapiinterface = require("../services/printer-api.interface");
-class PrinterStateUpdatePollTask {
-    printerCache;
-    printerEventsCache;
-    settingsStore;
-    configService;
-    octoprintClient;
-    moonrakerClient;
-    taskManagerService;
-    logger;
-    constructor({ printerCache, printerEventsCache, octoprintClient, moonrakerClient, settingsStore, configService, taskManagerService, loggerFactory }){
-        this.printerCache = printerCache;
-        this.printerEventsCache = printerEventsCache;
-        this.settingsStore = settingsStore;
-        this.configService = configService;
-        this.octoprintClient = octoprintClient;
-        this.moonrakerClient = moonrakerClient;
-        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);
-            if (login.printerType === _printerapiinterface.MoonrakerType) {
-                const promise = this.verifyMoonrakerState(login).then((r)=>{
-                    operational += r.state === "ready" ? 1 : 0;
-                }).catch((e)=>{
-                    failures++;
-                });
-                promisesStateUpdate.push(promise);
-            } else {}
-        }
-    }
-    async verifyMoonrakerState(login) {
-        return await this.moonrakerClient.getPrinterInfo(login).then((r)=>{
-            return r.data.result;
-        });
-    }
-    _isDebugMode() {
-        return this.configService.get(_serverconstants.AppConstants.debugFileWritePrinterStatesKey, _serverconstants.AppConstants.defaultDebugFileWritePrinterStates) === "true";
-    }
-}
-
-//# sourceMappingURL=printer-state-update-poll.task.js.map

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

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