@fdm-monster/server 1.6.2 → 1.6.3

package/dist/services/orm/printer-files.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/printer-files.service.ts"],"names":["PrinterFilesService","BaseService","PrinterFile","PrinterFileDto","printerService","logger","constructor","loggerFactory","typeormService","name","toDto","entity","id","printerId","date","display","gcodeAnalysis","hash","origin","path","prints","refs","size","statistics","type","typePath","getPrinterFiles","printer","get","listPrinterFiles","updateFiles","newFiles","savedFiles","newPaths","map","f","deletableSavedFiles","filter","includes","deletableSavedFilePaths","deletePrinterFiles","newFile","appendOrReplaceFile","e","captureException","error","addedFile","customData","foundFile","getPrinterFile","create","repository","update","clearFiles","delete","filePaths","throwError","length","Error","filePath","file","NotFoundException","warn","list","where","findOneBy"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../../src/services/orm/printer-files.service.ts"],"names":["PrinterFilesService","BaseService","PrinterFile","PrinterFileDto","printerService","logger","constructor","loggerFactory","typeormService","name","toDto","entity","id","printerId","date","display","gcodeAnalysis","hash","origin","path","prints","refs","size","statistics","type","typePath","getPrinterFiles","printer","get","listPrinterFiles","updateFiles","newFiles","savedFiles","newPaths","map","f","deletableSavedFiles","filter","includes","deletableSavedFilePaths","deletePrinterFiles","newFile","length","log","appendOrReplaceFile","e","captureException","error","addedFile","customData","Error","foundFile","getPrinterFile","create","repository","update","clearFiles","delete","filePaths","throwError","filePath","file","NotFoundException","warn","list","where","findOneBy"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

package/dist/services/print-completion.service.js

@@ -49,6 +49,10 @@ class PrintCompletionService {
         });
     }
     async updateContext(correlationId, context) {
+        if (!correlationId?.length) {
+            this.logger.warn("Ignoring undefined correlationId, cant update print completion context");
+            return;
+        }
         const completionEntry = await _models.PrintCompletion.findOne({
             "context.correlationId": correlationId,
             status: _octoprintwebsocketconstants.EVENT_TYPES.PrintStarted

package/dist/services/print-completion.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/print-completion.service.ts"],"names":["PrintCompletionService","logger","constructor","loggerFactory","name","toDto","entity","id","completionLog","context","fileName","createdAt","status","printerId","toString","create","input","validateInput","createPrintCompletionRules","PrintCompletion","Date","now","list","find","findPrintCompletion","correlationId","updateContext","completionEntry","findOne","EVENT_TYPES","PrintStarted","warn","save","loadPrintContexts","contexts","aggregate","$sort","$group","_id","$first","$match","$nin","PrintDone","PrintFailed","Object","fromEntries","map","c","listGroupByPrinterStatus","printCompletionsAggr","printEvents","$push","processCompletions"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAYaA;;;eAAAA;;;wBAZmB;kDACW;4BACb;6CACF;uCAOO;AAE5B,MAAMA;IACXC,OAAsB;IAEtBC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACF,MAAM,GAAGE,cAAcH,uBAAuBI,IAAI;IACzD;IAEAC,MAAMC,MAAwB,EAAmC;QAC/D,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,eAAeF,OAAOE,aAAa;YACnCC,SAASH,OAAOG,OAAO;YACvBC,UAAUJ,OAAOI,QAAQ;YACzBC,WAAWL,OAAOK,SAAS;YAC3BC,QAAQN,OAAOM,MAAM;YACrBC,WAAWP,OAAOO,SAAS,CAACC,QAAQ;QACtC;IACF;IAEA,MAAMC,OAAOC,KAA4C,EAAE;QACzD,MAAM,EAAEH,SAAS,EAAEH,QAAQ,EAAEF,aAAa,EAAEI,MAAM,EAAEH,OAAO,EAAE,GAAG,MAAMQ,IAAAA,yBAAa,EAACD,OAAOE,4DAA0B;QAErH,OAAOC,uBAAe,CAACJ,MAAM,CAAC;YAC5BF;YACAH;YACAF;YACAI;YACAD,WAAWS,KAAKC,GAAG;YACnBZ;QACF;IACF;IAEA,MAAMa,OAAO;QACX,OAAOH,uBAAe,CAACI,IAAI,CAAC,CAAC;IAC/B;IAEA,MAAMC,oBAAoBC,aAAqB,EAAE;QAC/C,OAAON,uBAAe,CAACI,IAAI,CAAC;YAC1B,yBAAyBE;QAC3B;IACF;IAEA,MAAMC,cAAcD,aAAqB,EAAEhB,OAA+B,EAAE;QAC1E,MAAMkB,kBAAkB,MAAMR,uBAAe,CAACS,OAAO,CAAC;YACpD,yBAAyBH;YACzBb,QAAQiB,wCAAW,CAACC,YAAY;QAClC;QAEA,IAAI,CAACH,iBAAiB;YACpB,IAAI,CAAC1B,MAAM,CAAC8B,IAAI,CAAC,CAAC,yBAAyB,EAAEN,cAAc,0DAA0D,CAAC;YACtH;QACF;QACAE,gBAAgBlB,OAAO,GAAGA;QAC1B,MAAMkB,gBAAgBK,IAAI;IAC5B;IAEA,MAAMC,oBAAoB;QACxB,MAAMC,WAAW,MAAMf,uBAAe,CAACgB,SAAS,CAAC;YAC/C;gBAAEC,OAAO;oBAAEvB,WAAW;oBAAGF,WAAW,CAAC;gBAAE;YAAE;YACzC;gBACE0B,QAAQ;oBACNC,KAAK;oBACL3B,WAAW;wBAAE4B,QAAQ;oBAAa;oBAClC9B,SAAS;wBAAE8B,QAAQ;oBAAW;oBAC9B3B,QAAQ;wBAAE2B,QAAQ;oBAAU;oBAC5B7B,UAAU;wBAAE6B,QAAQ;oBAAY;gBAClC;YACF;YACA;gBACEC,QAAQ;oBACN5B,QAAQ;wBACN6B,MAAM;4BAACZ,wCAAW,CAACa,SAAS;4BAAEb,wCAAW,CAACc,WAAW;yBAAC;oBACxD;gBACF;YACF;SACD;QAED,OAAOC,OAAOC,WAAW,CACvBX,SAASY,GAAG,CAAC,CAACC;YACZA,EAAElC,SAAS,GAAGkC,EAAET,GAAG;YACnB,OAAOS,EAAET,GAAG;YACZ,OAAO;gBAACS,EAAElC,SAAS;gBAAEkC;aAAE;QACzB;IAEJ;IAEA,MAAMC,2BAA2B;QAC/B,MAAMC,uBAAuB,MAAM9B,uBAAe,CAACgB,SAAS,CAAC;YAC3D;gBACEE,QAAQ;oBACNC,KAAK;oBACLY,aAAa;wBACXC,OAAO;4BACLtC,WAAW;4BACXJ,SAAS;4BACTD,eAAe;4BACfE,UAAU;4BACVE,QAAQ;4BACRD,WAAW;wBACb;oBACF;gBACF;YACF;SACD;QAED,OAAOyC,IAAAA,yCAAkB,EAACH;IAC5B;AACF"}
+{"version":3,"sources":["../../src/services/print-completion.service.ts"],"names":["PrintCompletionService","logger","constructor","loggerFactory","name","toDto","entity","id","completionLog","context","fileName","createdAt","status","printerId","toString","create","input","validateInput","createPrintCompletionRules","PrintCompletion","Date","now","list","find","findPrintCompletion","correlationId","updateContext","length","warn","completionEntry","findOne","EVENT_TYPES","PrintStarted","save","loadPrintContexts","contexts","aggregate","$sort","$group","_id","$first","$match","$nin","PrintDone","PrintFailed","Object","fromEntries","map","c","listGroupByPrinterStatus","printCompletionsAggr","printEvents","$push","processCompletions"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

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

@@ -45,11 +45,11 @@ class TestPrinterSocketStore {
             protocol: "ws"
         });
         const testEvents = [
-            (0, _octoprintsockioadapter.octoPrintEvent)(_octoprintsockioadapter.Message.WS_STATE_UPDATED),
-            (0, _octoprintsockioadapter.octoPrintEvent)(_octoprintsockioadapter.Message.API_STATE_UPDATED),
-            (0, _octoprintsockioadapter.octoPrintEvent)(_octoprintsockioadapter.Message.WS_CLOSED),
-            (0, _octoprintsockioadapter.octoPrintEvent)(_octoprintsockioadapter.Message.WS_OPENED),
-            (0, _octoprintsockioadapter.octoPrintEvent)(_octoprintsockioadapter.Message.WS_ERROR)
+            (0, _octoprintsockioadapter.octoPrintEvent)(_octoprintsockioadapter.WsMessage.WS_STATE_UPDATED),
+            (0, _octoprintsockioadapter.octoPrintEvent)(_octoprintsockioadapter.WsMessage.API_STATE_UPDATED),
+            (0, _octoprintsockioadapter.octoPrintEvent)(_octoprintsockioadapter.WsMessage.WS_CLOSED),
+            (0, _octoprintsockioadapter.octoPrintEvent)(_octoprintsockioadapter.WsMessage.WS_OPENED),
+            (0, _octoprintsockioadapter.octoPrintEvent)(_octoprintsockioadapter.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","registerCredentials","printerId","loginDto","apiKey","printerURL","protocol","testEvents","octoPrintEvent","Message","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","listener","event","payload","send","forEach","te","on","log","setupSocketSession","promise","Promise","resolve","reject","open","startTime","setInterval","warn","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","e","error","errorSummary","captureException","off"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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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","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"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

package/package.json

@@ -6,7 +6,7 @@
   },
   "author": "David Zwart",
   "license": "AGPL-3.0-or-later",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "bin": {
     "fdm-monster": "dist/index.js",
     "fdmm": "dist/index.js"
@@ -52,16 +52,16 @@
     "vue"
   ],
   "dependencies": {
-    "@fdm-monster/client": "1.5.14",
+    "@fdm-monster/client": "1.5.16",
     "@influxdata/influxdb-client": "1.33.2",
     "@octokit/plugin-throttling": "8.2.0",
-    "@sentry/node": "7.111.0",
-    "adm-zip": "0.5.12",
+    "@sentry/node": "8.9.2",
+    "adm-zip": "0.5.14",
     "awilix": "10.0.2",
     "awilix-express": "9.0.1",
-    "axios": "1.6.8",
+    "axios": "1.7.2",
     "bcryptjs": "2.4.3",
-    "better-sqlite3": "9.5.0",
+    "better-sqlite3": "11.0.0",
     "cache-manager": "4.1.0",
     "class-validator": "0.14.1",
     "connect-history-api-fallback": "2.0.0",
@@ -79,29 +79,29 @@
     "lodash": "4.17.21",
     "luxon": "3.4.4",
     "migrate-mongo": "11.0.0",
-    "mongoose": "6.12.8",
+    "mongoose": "6.13.0",
     "multer": "1.4.5-lts.1",
     "node-input-validator": "4.5.1",
-    "nodemon": "3.1.0",
-    "octokit": "3.2.0",
+    "nodemon": "3.1.3",
+    "octokit": "3.2.1",
     "passport": "0.7.0",
     "passport-anonymous": "1.0.1",
     "passport-jwt": "4.0.1",
     "reflect-metadata": "0.2.2",
-    "semver": "7.6.0",
-    "simple-git": "3.24.0",
+    "semver": "7.6.2",
+    "simple-git": "3.25.0",
     "socket.io": "4.7.5",
     "toad-scheduler": "3.0.1",
     "typeorm": "0.3.20",
-    "uuid": "9.0.1",
+    "uuid": "10.0.0",
     "winston": "3.13.0",
-    "ws": "8.16.0"
+    "ws": "8.17.0"
   },
   "devDependencies": {
     "@lcov-viewer/cli": "1.3.0",
     "@lcov-viewer/istanbul-report": "1.4.0",
     "@swc/cli": "0.3.12",
-    "@swc/core": "1.4.16",
+    "@swc/core": "1.5.29",
     "@swc/jest": "0.2.36",
     "@types/adm-zip": "0.5.5",
     "@types/bcryptjs": "2.4.6",
@@ -112,11 +112,11 @@
     "@types/ip": "1.1.3",
     "@types/jest": "29.5.12",
     "@types/js-yaml": "4.0.9",
-    "@types/lodash": "4.17.0",
+    "@types/lodash": "4.17.5",
     "@types/luxon": "3.4.2",
     "@types/migrate-mongo": "10.0.4",
     "@types/multer": "1.4.11",
-    "@types/node": "20.12.7",
+    "@types/node": "20.14.2",
     "@types/passport-anonymous": "1.0.5",
     "@types/passport-jwt": "4.0.1",
     "@types/semver": "7.5.8",
@@ -125,21 +125,21 @@
     "@types/ws": "8.5.10",
     "chokidar": "3.6.0",
     "concurrently": "8.2.2",
-    "eslint": "9.0.0",
+    "eslint": "9.4.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-config-standard": "17.1.0",
     "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-n": "17.2.1",
+    "eslint-plugin-n": "17.9.0",
     "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-promise": "6.1.1",
+    "eslint-plugin-promise": "6.2.0",
     "express-list-routes": "1.2.1",
     "jest": "29.7.0",
     "jest-27-expect-message": "1.1.0",
-    "mongodb-memory-server": "9.1.8",
+    "mongodb-memory-server": "9.3.0",
     "nock": "13.5.4",
     "prettier": "2.8.8",
-    "supertest": "6.3.4",
+    "supertest": "7.0.0",
     "ts-node": "10.9.2",
     "typescript": "5.4.5"
   },
@@ -154,13 +154,14 @@
     "verbose": false,
     "ignore": [
       ".github/*",
+      "database/*",
       "docs/*",
+      "docker/*",
+      "installations/*",
       "media",
-      "test/*",
-      "views/*",
-      "docker/*"
+      "test/*"
     ],
     "delay": 100
   },
-  "packageManager": "yarn@4.1.1"
+  "packageManager": "yarn@4.3.0"
 }