@fdm-monster/server 1.8.1 → 1.8.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (115) hide show
  1. package/.yarn/install-state.gz +0 -0
  2. package/.yarn/releases/{yarn-4.5.3.cjs → yarn-4.7.0.cjs} +256 -255
  3. package/.yarnrc.yml +1 -1
  4. package/README.md +14 -4
  5. package/RELEASE_NOTES.MD +35 -4
  6. package/dist/consoles/http-file-receiver.console.js +81 -0
  7. package/dist/consoles/http-file-receiver.console.js.map +1 -0
  8. package/dist/constants/event.constants.js +8 -0
  9. package/dist/constants/event.constants.js.map +1 -1
  10. package/dist/container.js +2 -14
  11. package/dist/container.js.map +1 -1
  12. package/dist/container.tokens.js +1 -3
  13. package/dist/container.tokens.js.map +1 -1
  14. package/dist/controllers/plugin-firmware-update.controller.js +4 -6
  15. package/dist/controllers/plugin-firmware-update.controller.js.map +1 -1
  16. package/dist/controllers/printer-files.controller.js +19 -22
  17. package/dist/controllers/printer-files.controller.js.map +1 -1
  18. package/dist/controllers/printer-settings.controller.js +3 -3
  19. package/dist/controllers/printer-settings.controller.js.map +1 -1
  20. package/dist/controllers/printer.controller.js +14 -8
  21. package/dist/controllers/printer.controller.js.map +1 -1
  22. package/dist/controllers/server-private.controller.js +2 -16
  23. package/dist/controllers/server-private.controller.js.map +1 -1
  24. package/dist/controllers/server-public.controller.js +0 -2
  25. package/dist/controllers/server-public.controller.js.map +1 -1
  26. package/dist/handlers/validators.js +9 -6
  27. package/dist/handlers/validators.js.map +1 -1
  28. package/dist/server.constants.js +1 -2
  29. package/dist/server.constants.js.map +1 -1
  30. package/dist/server.env.js +3 -25
  31. package/dist/server.env.js.map +1 -1
  32. package/dist/server.host.js +3 -1
  33. package/dist/server.host.js.map +1 -1
  34. package/dist/services/core/http-client.factory.js +40 -0
  35. package/dist/services/core/http-client.factory.js.map +1 -0
  36. package/dist/services/core/logs-manager.service.js +4 -3
  37. package/dist/services/core/logs-manager.service.js.map +1 -1
  38. package/dist/services/core/multer.service.js +72 -22
  39. package/dist/services/core/multer.service.js.map +1 -1
  40. package/dist/services/interfaces/file-upload-tracker.interface.js +6 -0
  41. package/dist/services/interfaces/file-upload-tracker.interface.js.map +1 -0
  42. package/dist/services/interfaces/printer.dto.js +6 -0
  43. package/dist/services/interfaces/printer.dto.js.map +1 -1
  44. package/dist/services/mongoose/printer.service.js +10 -3
  45. package/dist/services/mongoose/printer.service.js.map +1 -1
  46. package/dist/services/moonraker/moonraker-websocket.adapter.js +6 -2
  47. package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
  48. package/dist/services/moonraker/moonraker.client.js +196 -156
  49. package/dist/services/moonraker/moonraker.client.js.map +1 -1
  50. package/dist/services/octoprint/dto/plugin.dto.js +6 -0
  51. package/dist/services/octoprint/dto/plugin.dto.js.map +1 -0
  52. package/dist/services/octoprint/octoprint-api.routes.js +0 -61
  53. package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
  54. package/dist/services/octoprint/octoprint-websocket.adapter.js +11 -5
  55. package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -1
  56. package/dist/services/octoprint/octoprint.client.js +118 -201
  57. package/dist/services/octoprint/octoprint.client.js.map +1 -1
  58. package/dist/services/octoprint/plugin-base.service.js +15 -15
  59. package/dist/services/octoprint/plugin-base.service.js.map +1 -1
  60. package/dist/services/octoprint/plugin-firmware-update.service.js +1 -1
  61. package/dist/services/octoprint/plugin-firmware-update.service.js.map +1 -1
  62. package/dist/services/octoprint/plugin-repository.cache.js +2 -1
  63. package/dist/services/octoprint/plugin-repository.cache.js.map +1 -1
  64. package/dist/services/octoprint/utils/octoprint-http-client.builder.js +31 -0
  65. package/dist/services/octoprint/utils/octoprint-http-client.builder.js.map +1 -0
  66. package/dist/services/octoprint.api.js +6 -4
  67. package/dist/services/octoprint.api.js.map +1 -1
  68. package/dist/services/orm/printer.service.js +8 -3
  69. package/dist/services/orm/printer.service.js.map +1 -1
  70. package/dist/shared/default-http-client.builder.js +94 -0
  71. package/dist/shared/default-http-client.builder.js.map +1 -0
  72. package/dist/shared/websocket.adapter.js.map +1 -1
  73. package/dist/state/file-upload-tracker.cache.js +30 -40
  74. package/dist/state/file-upload-tracker.cache.js.map +1 -1
  75. package/dist/state/settings.store.js +4 -1
  76. package/dist/state/settings.store.js.map +1 -1
  77. package/dist/state/test-printer-socket.store.js.map +1 -1
  78. package/dist/state/validation/create-test-printer.validation.js +1 -0
  79. package/dist/state/validation/create-test-printer.validation.js.map +1 -1
  80. package/dist/tasks/boot.task.js +1 -2
  81. package/dist/tasks/boot.task.js.map +1 -1
  82. package/dist/tasks/printer-websocket-restore.task.js +1 -1
  83. package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
  84. package/dist/tasks/socketio.task.js +2 -2
  85. package/dist/tasks/socketio.task.js.map +1 -1
  86. package/dist/tasks.js.map +1 -1
  87. package/dist/utils/env.utils.js +0 -42
  88. package/dist/utils/env.utils.js.map +1 -1
  89. package/dist/utils/normalize-url.js +3 -1
  90. package/dist/utils/normalize-url.js.map +1 -1
  91. package/dist/utils/pretty-print.utils.js +1 -1
  92. package/dist/utils/pretty-print.utils.js.map +1 -1
  93. package/dist/utils/url.utils.js +12 -14
  94. package/dist/utils/url.utils.js.map +1 -1
  95. package/package.json +40 -55
  96. package/dist/services/core/server-update.service.js +0 -71
  97. package/dist/services/core/server-update.service.js.map +0 -1
  98. package/requests/moonraker/api_job.http +0 -5
  99. package/requests/moonraker/api_printer.http +0 -5
  100. package/requests/moonraker/api_settings.http +0 -5
  101. package/requests/moonraker/printer_info.http +0 -5
  102. package/requests/moonraker/printer_objects_list.http +0 -6
  103. package/requests/moonraker/printer_objects_pause_resume.http +0 -6
  104. package/requests/moonraker/printer_objects_print_stats.http +0 -6
  105. package/requests/moonraker/printer_objects_webhooks.http +0 -6
  106. package/requests/moonraker/server_info.http +0 -5
  107. package/requests/octoprint/octoprint-api-printer-current.http +0 -7
  108. package/requests/octoprint/octoprint-pluginmanager-plugins.http +0 -7
  109. package/requests/printer-file/get-partial-file-moonraker.http +0 -5
  110. package/requests/printer-file/get-thumbnails.http +0 -5
  111. package/requests/printer-file/reload-printer-thumbnails.http +0 -10
  112. package/requests/printer-file/testfile.gcode +0 -5665
  113. package/requests/printer-file/upload-file.http +0 -11
  114. package/requests/printer-file/upload-slicer-file.http +0 -11
  115. package/requests/printers/list.http +0 -5
package/.yarnrc.yml CHANGED
@@ -1,4 +1,4 @@
1
1
  nodeLinker: node-modules
2
2
 
3
- yarnPath: .yarn/releases/yarn-4.5.3.cjs
3
+ yarnPath: .yarn/releases/yarn-4.7.0.cjs
4
4
  httpTimeout: 1000000
package/README.md CHANGED
@@ -5,7 +5,7 @@
5
5
  </p>
6
6
  <h1 align="center" style="padding-top: 0; margin-top: 10px">FDM Monster</h1>
7
7
  <p align="center">
8
- <a href="https://discord.gg/mwA8uP8CMc"><img src="https://img.shields.io/discord/864835453773807686?label=Discord"/></a>
8
+ <a href="https://discord.gg/mwA8uP8CMc"><img src="https://img.shields.io/discord/864835453773807686?label=Discord&logo=discord"/></a>
9
9
  <a href="https://github.com/fdm-monster/fdm-monster/releases/latest">
10
10
  <img src="https://img.shields.io/github/release/fdm-monster/fdm-monster"/></a>
11
11
  <a href="https://github.com/fdm-monster/fdm-monster/stargazers">
@@ -36,11 +36,18 @@ Here is a list of features that make FDM Monster stand out:
36
36
  - Marking printers as 'under maintenance'
37
37
  - Import printers from software like OctoFarm
38
38
  - YAML backup and import
39
- - [Raspberry Pi image MonsterPi](https://docs.fdm-monster.net/guides/monsterpi)
40
39
  - Thumbnail support
41
40
  - SQLite as well as MongoDB support
42
41
 
43
- ## Getting started 🔌
42
+ ## Installation methods ⚙️
43
+
44
+ - [Docker image](https://hub.docker.com/r/fdmmonster/fdm-monster)
45
+ - [Raspberry Pi image MonsterPi](https://docs.fdm-monster.net/guides/monsterpi)
46
+ - [Unraid Community App](https://unraid.net/community/apps?q=fdm+monster)
47
+
48
+ Would you like to add a method of running FDM Monster? Please reach out or create an issue/pull-request!
49
+
50
+ ## Getting started 😎
44
51
 
45
52
  Check out the [documentation](https://docs.fdm-monster.net) to install or deploy FDM Monster for your farm. Are you interested in running the Raspberry Pi image?
46
53
  Please jump ahead [MonsterPi Section](https://docs.fdm-monster.net/guides/monsterpi).
@@ -75,7 +82,7 @@ Thanks to the following parties for their financial support:
75
82
  These are the people involved in the project. Find the meaning of the emoji keys [here](https://allcontributors.org/docs/en/emoji-key).
76
83
 
77
84
  <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
78
- [![All Contributors](https://img.shields.io/badge/all_contributors-20-orange.svg?style=flat-square)](#contributors-)
85
+ [![All Contributors](https://img.shields.io/badge/all_contributors-22-orange.svg?style=flat-square)](#contributors-)
79
86
  <!-- ALL-CONTRIBUTORS-BADGE:END -->
80
87
 
81
88
  <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
@@ -110,6 +117,9 @@ These are the people involved in the project. Find the meaning of the emoji keys
110
117
  <td align="center" valign="top" width="14.28%"><a href="https://github.com/julien-printerbox"><img src="https://avatars.githubusercontent.com/u/134132189?v=4?s=80" width="80px;" alt="julien-printerbox"/><br /><sub><b>julien-printerbox</b></sub></a><br /><a href="#ideas-julien-printerbox" title="Ideas, Planning, & Feedback">🤔</a></td>
111
118
  <td align="center" valign="top" width="14.28%"><a href="https://github.com/Tbwan"><img src="https://avatars.githubusercontent.com/u/44231748?v=4?s=80" width="80px;" alt="Tbwan"/><br /><sub><b>Tbwan</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3ATbwan" title="Bug reports">🐛</a></td>
112
119
  </tr>
120
+ <tr>
121
+ <td align="center" valign="top" width="14.28%"><a href="https://github.com/nuvious"><img src="https://avatars.githubusercontent.com/u/5287736?v=4?s=80" width="80px;" alt="David Cheeseman"/><br /><sub><b>David Cheeseman</b></sub></a><br /><a href="#ideas-nuvious" title="Ideas, Planning, & Feedback">🤔</a> <a href="#platform-nuvious" title="Packaging/porting to new platform">📦</a> <a href="#infra-nuvious" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
122
+ </tr>
113
123
  </tbody>
114
124
  </table>
115
125
 
package/RELEASE_NOTES.MD CHANGED
@@ -1,12 +1,43 @@
1
1
  # Develop
2
2
 
3
+ # FDM Monster 19/03/2025 1.8.3
4
+
5
+ ## Fixes
6
+
7
+ - Introduce HttpClientBuilder pattern for Octoprint client
8
+ - Fix Sentry usage has updated
9
+ - Fix upload progress was not updated properly
10
+ - Fix failures and completions in file upload to OctoPrint/Moonraker were not consistently pushed over SocketIO
11
+ - Fix Moonraker file upload did not track upload, failure or completion
12
+ - Fix Moonraker file upload did not try-catch failures
13
+ - Fix thumbnail is now parsed after file upload instead of before, preventing premature thumbnail switch in case of upload failure.
14
+ - Fix file uploads were never unlinked, except for server startup.
15
+
16
+ # FDM Monster 03/01/2025 1.8.2
17
+
18
+ ## Changes
19
+
20
+ - Update client to 1.8.8
21
+
22
+ ## Chore
23
+
24
+ - Change developer setup to be node based only (remove concurrently and nodemon packages)
25
+ - Replace server restart with NotImplementedException
26
+ - Remove simple-git package
27
+ - Remove git-pull-based server update mechanic
28
+ - Remove unnecessary environment utilities
29
+
30
+ ## Fixes
31
+
32
+ - OctoPrint client: filter folders on calling getLocalFiles for OctoPrint
33
+
3
34
  # FDM Monster 13/12/2024 1.8.1
4
35
 
5
36
  ## Changes
6
37
 
7
38
  - Update to client 1.8.4
8
39
 
9
- ## Fixes
40
+ ## Fixes
10
41
 
11
42
  - YAML import: regression caused all imports to fail validation
12
43
  - YAML import: a bug caused all import with printers without api key to fail validation
@@ -34,7 +65,7 @@
34
65
 
35
66
  ## Fixes
36
67
 
37
- - UserService: MongoDB had incorrect root user checks and SQLite user service missed the check altogether. Now root user checks are robust.
68
+ - UserService: MongoDB had incorrect root user checks and SQLite user service missed the check altogether. Now root user checks are robust.
38
69
  - Camera API: GUEST should not have access to change cameras
39
70
  - YAML import validation: new API keys are not accepted by outdated YAML validation
40
71
 
@@ -55,7 +86,7 @@
55
86
 
56
87
  - User API: new endpoint which registers user directly with roles and without verification step
57
88
 
58
- ## Fixes:
89
+ ## Fixes:
59
90
 
60
91
  - PrinterEventsCache: when printers and test printers are deleted, the printer events cache should not be allowed to be filled by late update events
61
92
 
@@ -72,7 +103,7 @@
72
103
  ## Fixes:
73
104
 
74
105
  - API & Service validators: adjust max length of apiKey property validation to 43 to allow new `secrets` based OctoPrint api keys
75
-
106
+
76
107
  # FDM Monster 04/11/2024 1.7.1
77
108
 
78
109
  ## Changes:
@@ -0,0 +1,81 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", {
3
+ value: true
4
+ });
5
+ const _express = /*#__PURE__*/ _interop_require_default(require("express"));
6
+ const _multer = /*#__PURE__*/ _interop_require_default(require("multer"));
7
+ function _interop_require_default(obj) {
8
+ return obj && obj.__esModule ? obj : {
9
+ default: obj
10
+ };
11
+ }
12
+ const delayedMemoryStorage = ()=>{
13
+ return {
14
+ _handleFile (req, file, cb) {
15
+ let chunks = [];
16
+ let processingComplete = Promise.resolve();
17
+ console.log(`Processing file upload name ${file.originalname} field ${file.fieldname} size ${file.size}`);
18
+ file.stream.on("data", (chunk)=>{
19
+ chunks.push(chunk);
20
+ });
21
+ file.stream.on("end", ()=>{
22
+ cb(null, {
23
+ buffer: Buffer.concat(chunks),
24
+ size: Buffer.concat(chunks).length
25
+ });
26
+ });
27
+ file.stream.on("error", (err)=>{
28
+ cb(err);
29
+ });
30
+ },
31
+ _removeFile (req, file, cb) {
32
+ cb(null);
33
+ }
34
+ };
35
+ };
36
+ const upload = (0, _multer.default)({
37
+ storage: delayedMemoryStorage()
38
+ });
39
+ const app = (0, _express.default)();
40
+ app.post("/api/files/local", upload.single("file"), (req, res)=>{
41
+ const { select, print } = req.body;
42
+ const file = req.file;
43
+ if (!file) {
44
+ return res.status(400).json({
45
+ error: "Missing file"
46
+ });
47
+ }
48
+ if (typeof select === "undefined" || typeof print === "undefined") {
49
+ return res.status(400).json({
50
+ error: "Missing required fields: select, print"
51
+ });
52
+ }
53
+ if (Object.keys(req.body).length !== 2) {
54
+ return res.status(400).json({
55
+ error: "Only fields 'select' and 'print' are allowed"
56
+ });
57
+ }
58
+ if (![
59
+ "true",
60
+ "false"
61
+ ].includes(select) || ![
62
+ "true",
63
+ "false"
64
+ ].includes(print)) {
65
+ return res.status(400).json({
66
+ error: "Fields 'select' and 'print' must be boolean values (true/false)"
67
+ });
68
+ }
69
+ console.log("Received file:", file.originalname);
70
+ console.log("File size:", file.size);
71
+ console.log("MIME type:", file.mimetype);
72
+ console.log("select:", select, "\nprint:", print, "\n-----");
73
+ res.json({
74
+ message: "File received successfully"
75
+ });
76
+ });
77
+ app.listen(1234, ()=>{
78
+ console.log("Server is running on http://localhost:1234");
79
+ });
80
+
81
+ //# sourceMappingURL=http-file-receiver.console.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../src/consoles/http-file-receiver.console.ts"],"names":["delayedMemoryStorage","_handleFile","req","file","cb","chunks","processingComplete","Promise","resolve","console","log","originalname","fieldname","size","stream","on","chunk","push","buffer","Buffer","concat","length","err","_removeFile","upload","multer","storage","app","express","post","single","res","select","print","body","status","json","error","Object","keys","includes","mimetype","message","listen"],"mappings":";;;;gEAAoB;+DACD;;;;;;AAInB,MAAMA,uBAAuB;IAC3B,OAAO;QACLC,aAAYC,GAAG,EAAEC,IAAI,EAAEC,EAAE;YACvB,IAAIC,SAAmB,EAAE;YACzB,IAAIC,qBAAqBC,QAAQC,OAAO;YAExCC,QAAQC,GAAG,CAAC,CAAC,4BAA4B,EAAEP,KAAKQ,YAAY,CAAC,OAAO,EAAER,KAAKS,SAAS,CAAC,MAAM,EAAET,KAAKU,IAAI,EAAE;YAExGV,KAAKW,MAAM,CAACC,EAAE,CAAC,QAAQ,CAACC;gBACtBX,OAAOY,IAAI,CAACD;YAUd;YAEAb,KAAKW,MAAM,CAACC,EAAE,CAAC,OAAO;gBACpBX,GAAG,MAAM;oBAAEc,QAAQC,OAAOC,MAAM,CAACf;oBAASQ,MAAMM,OAAOC,MAAM,CAACf,QAAQgB,MAAM;gBAAC;YAG/E;YAEAlB,KAAKW,MAAM,CAACC,EAAE,CAAC,SAAS,CAACO;gBACvBlB,GAAGkB;YACL;QACF;QACAC,aAAYrB,GAAG,EAAEC,IAAI,EAAEC,EAAE;YACvBA,GAAG;QACL;IACF;AACF;AAEA,MAAMoB,SAASC,IAAAA,eAAM,EAAC;IAAEC,SAAS1B;AAAuB;AAExD,MAAM2B,MAAMC,IAAAA,gBAAO;AAEnBD,IAAIE,IAAI,CAAC,oBAAoBL,OAAOM,MAAM,CAAC,SAAS,CAAC5B,KAAc6B;IACjE,MAAM,EAAEC,MAAM,EAAEC,KAAK,EAAE,GAAG/B,IAAIgC,IAAI;IAClC,MAAM/B,OAAOD,IAAIC,IAAI;IAErB,IAAI,CAACA,MAAM;QACT,OAAO4B,IAAII,MAAM,CAAC,KAAKC,IAAI,CAAC;YAAEC,OAAO;QAAe;IACtD;IACA,IAAI,OAAOL,WAAW,eAAe,OAAOC,UAAU,aAAa;QACjE,OAAOF,IAAII,MAAM,CAAC,KAAKC,IAAI,CAAC;YAAEC,OAAO;QAAyC;IAChF;IACA,IAAIC,OAAOC,IAAI,CAACrC,IAAIgC,IAAI,EAAEb,MAAM,KAAK,GAAG;QACtC,OAAOU,IAAII,MAAM,CAAC,KAAKC,IAAI,CAAC;YAAEC,OAAO;QAA+C;IACtF;IACA,IAAI,CAAC;QAAC;QAAQ;KAAQ,CAACG,QAAQ,CAACR,WAAW,CAAC;QAAC;QAAQ;KAAQ,CAACQ,QAAQ,CAACP,QAAQ;QAC7E,OAAOF,IAAII,MAAM,CAAC,KAAKC,IAAI,CAAC;YAAEC,OAAO;QAAkE;IACzG;IAEA5B,QAAQC,GAAG,CAAC,kBAAkBP,KAAKQ,YAAY;IAC/CF,QAAQC,GAAG,CAAC,cAAcP,KAAKU,IAAI;IACnCJ,QAAQC,GAAG,CAAC,cAAcP,KAAKsC,QAAQ;IACvChC,QAAQC,GAAG,CAAC,WAAWsB,QAAQ,YAAYC,OAAO;IAElDF,IAAIK,IAAI,CAAC;QAAEM,SAAS;IAA6B;AACnD;AAEAf,IAAIgB,MAAM,CAAC,MAAM;IACflC,QAAQC,GAAG,CAAC;AACd"}
@@ -33,6 +33,12 @@ _export(exports, {
33
33
  socketIoConnectedEvent: function() {
34
34
  return socketIoConnectedEvent;
35
35
  },
36
+ uploadDoneEvent: function() {
37
+ return uploadDoneEvent;
38
+ },
39
+ uploadFailedEvent: function() {
40
+ return uploadFailedEvent;
41
+ },
36
42
  uploadProgressEvent: function() {
37
43
  return uploadProgressEvent;
38
44
  }
@@ -47,6 +53,8 @@ const printerEvents = {
47
53
  const octoPrintWebsocketEvent = (printerId)=>`octoprint.${printerId}`;
48
54
  const octoPrintWebsocketCurrentEvent = (printerId)=>`octoprint.${printerId}.current`;
49
55
  const uploadProgressEvent = (token)=>`upload.progress.${token}`;
56
+ const uploadDoneEvent = (token)=>`upload.done.${token}`;
57
+ const uploadFailedEvent = (token)=>`upload.failed.${token}`;
50
58
  const firmwareFlashUploadEvent = (printerId)=>`firmware-upload.${printerId}`;
51
59
  const prefix = "fdm-monster";
52
60
  const fdmMonsterPrinterStoppedEvent = (printerId)=>`${prefix}.${printerId}.printer-stopped`;
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/constants/event.constants.ts"],"names":["fdmMonsterPrinterStoppedEvent","fdmPrinterEventToPrinterId","firmwareFlashUploadEvent","octoPrintWebsocketCurrentEvent","octoPrintWebsocketEvent","prefix","printerEvents","socketIoConnectedEvent","uploadProgressEvent","printersDeleted","printerUpdated","printerCreated","batchPrinterCreated","printerId","token","event","split"],"mappings":";;;;;;;;;;;IAiBaA,6BAA6B;eAA7BA;;IACAC,0BAA0B;eAA1BA;;IAJAC,wBAAwB;eAAxBA;;IAFAC,8BAA8B;eAA9BA;;IADAC,uBAAuB;eAAvBA;;IAKAC,MAAM;eAANA;;IAZAC,aAAa;eAAbA;;IAFAC,sBAAsB;eAAtBA;;IAWAC,mBAAmB;eAAnBA;;;AAXN,MAAMD,yBAAyB;AAE/B,MAAMD,gBAAgB;IAC3BG,iBAAiB;IACjBC,gBAAgB;IAChBC,gBAAgB;IAChBC,qBAAqB;AACvB;AAEO,MAAMR,0BAA0B,CAACS,YAAsB,CAAC,UAAU,EAAEA,WAAW;AAC/E,MAAMV,iCAAiC,CAACU,YAAsB,CAAC,UAAU,EAAEA,UAAU,QAAQ,CAAC;AAC9F,MAAML,sBAAsB,CAACM,QAAkB,CAAC,gBAAgB,EAAEA,OAAO;AACzE,MAAMZ,2BAA2B,CAACW,YAAsB,CAAC,gBAAgB,EAAEA,WAAW;AAEtF,MAAMR,SAAS;AACf,MAAML,gCAAgC,CAACa,YAAsB,GAAGR,OAAO,CAAC,EAAEQ,UAAU,gBAAgB,CAAC;AACrG,MAAMZ,6BAA6B,CAACc,QAAkBA,MAAMC,KAAK,CAAC,IAAI,CAAC,EAAE"}
1
+ {"version":3,"sources":["../../src/constants/event.constants.ts"],"names":["fdmMonsterPrinterStoppedEvent","fdmPrinterEventToPrinterId","firmwareFlashUploadEvent","octoPrintWebsocketCurrentEvent","octoPrintWebsocketEvent","prefix","printerEvents","socketIoConnectedEvent","uploadDoneEvent","uploadFailedEvent","uploadProgressEvent","printersDeleted","printerUpdated","printerCreated","batchPrinterCreated","printerId","token","event","split"],"mappings":";;;;;;;;;;;IAmBaA,6BAA6B;eAA7BA;;IACAC,0BAA0B;eAA1BA;;IAJAC,wBAAwB;eAAxBA;;IAJAC,8BAA8B;eAA9BA;;IADAC,uBAAuB;eAAvBA;;IAOAC,MAAM;eAANA;;IAdAC,aAAa;eAAbA;;IAFAC,sBAAsB;eAAtBA;;IAYAC,eAAe;eAAfA;;IACAC,iBAAiB;eAAjBA;;IAFAC,mBAAmB;eAAnBA;;;AAXN,MAAMH,yBAAyB;AAE/B,MAAMD,gBAAgB;IAC3BK,iBAAiB;IACjBC,gBAAgB;IAChBC,gBAAgB;IAChBC,qBAAqB;AACvB;AAEO,MAAMV,0BAA0B,CAACW,YAAsB,CAAC,UAAU,EAAEA,WAAW;AAC/E,MAAMZ,iCAAiC,CAACY,YAAsB,CAAC,UAAU,EAAEA,UAAU,QAAQ,CAAC;AAC9F,MAAML,sBAAsB,CAACM,QAAkB,CAAC,gBAAgB,EAAEA,OAAO;AACzE,MAAMR,kBAAkB,CAACQ,QAAkB,CAAC,YAAY,EAAEA,OAAO;AACjE,MAAMP,oBAAoB,CAACO,QAAkB,CAAC,cAAc,EAAEA,OAAO;AACrE,MAAMd,2BAA2B,CAACa,YAAsB,CAAC,gBAAgB,EAAEA,WAAW;AAEtF,MAAMV,SAAS;AACf,MAAML,gCAAgC,CAACe,YAAsB,GAAGV,OAAO,CAAC,EAAEU,UAAU,gBAAgB,CAAC;AACrG,MAAMd,6BAA6B,CAACgB,QAAkBA,MAAMC,KAAK,CAAC,IAAI,CAAC,EAAE"}
package/dist/container.js CHANGED
@@ -16,8 +16,6 @@ _export(exports, {
16
16
  return configureContainer;
17
17
  }
18
18
  });
19
- const _axios = /*#__PURE__*/ _interop_require_default(require("axios"));
20
- const _simplegit = /*#__PURE__*/ _interop_require_default(require("simple-git"));
21
19
  const _octokit = require("octokit");
22
20
  const _awilix = require("awilix");
23
21
  const _toadscheduler = require("toad-scheduler");
@@ -28,7 +26,6 @@ const _settingsstore = require("./state/settings.store");
28
26
  const _settingsservice = require("./services/mongoose/settings.service");
29
27
  const _serverreleaseservice = require("./services/core/server-release.service");
30
28
  const _taskmanagerservice = require("./services/core/task-manager.service");
31
- const _serverupdateservice = require("./services/core/server-update.service");
32
29
  const _githubservice = require("./services/core/github.service");
33
30
  const _filecache = require("./state/file.cache");
34
31
  const _printerwebsockettask = require("./tasks/printer-websocket.task");
@@ -96,11 +93,7 @@ const _octoprintclient = require("./services/octoprint/octoprint.client");
96
93
  const _moonrakerapi = require("./services/moonraker.api");
97
94
  const _printerapifactory = require("./services/printer-api.factory");
98
95
  const _printerthumbnailcache = require("./state/printer-thumbnail.cache");
99
- function _interop_require_default(obj) {
100
- return obj && obj.__esModule ? obj : {
101
- default: obj
102
- };
103
- }
96
+ const _httpclientfactory = require("./services/core/http-client.factory");
104
97
  function config(key, experimentalMode, serviceTypeorm, serviceMongoose) {
105
98
  return {
106
99
  [key]: experimentalMode ? serviceTypeorm : serviceMongoose
@@ -146,7 +139,6 @@ function configureContainer(isSqlite = false) {
146
139
  [di.cacheManager]: (0, _awilix.asFunction)(_cachemanager.configureCacheManager).singleton(),
147
140
  [di.serverReleaseService]: (0, _awilix.asClass)(_serverreleaseservice.ServerReleaseService).singleton(),
148
141
  [di.monsterPiService]: (0, _awilix.asClass)(_monsterpiservice.MonsterPiService).singleton(),
149
- [di.serverUpdateService]: (0, _awilix.asClass)(_serverupdateservice.ServerUpdateService).singleton(),
150
142
  [di.githubService]: (0, _awilix.asClass)(_githubservice.GithubService),
151
143
  [di.octokitService]: (0, _awilix.asFunction)((cradle)=>{
152
144
  const config = cradle.configService;
@@ -167,11 +159,7 @@ function configureContainer(isSqlite = false) {
167
159
  }),
168
160
  [di.clientBundleService]: (0, _awilix.asClass)(_clientbundleservice.ClientBundleService),
169
161
  [di.logDumpService]: (0, _awilix.asClass)(_logsmanagerservice.LogDumpService),
170
- [di.simpleGitService]: (0, _awilix.asValue)((0, _simplegit.default)()),
171
- [di.httpClient]: (0, _awilix.asValue)(_axios.default.create({
172
- maxBodyLength: 1000 * 1000 * 1000,
173
- maxContentLength: 1000 * 1000 * 1000
174
- })),
162
+ [di.httpClientFactory]: (0, _awilix.asClass)(_httpclientfactory.HttpClientFactory),
175
163
  [di.socketIoGateway]: (0, _awilix.asClass)(_socketiogateway.SocketIoGateway).singleton(),
176
164
  [di.multerService]: (0, _awilix.asClass)(_multerservice.MulterService).singleton(),
177
165
  [di.yamlService]: (0, _awilix.asClass)(_yamlservice.YamlService),
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/container.ts"],"names":["config","configureContainer","key","experimentalMode","serviceTypeorm","serviceMongoose","isSqlite","container","createContainer","injectionMode","InjectionMode","PROXY","di","DITokens","register","serverTasks","asValue","ServerTasks","isTypeormMode","appDefaultRole","ROLES","GUEST","appDefaultRoleNoLogin","ADMIN","serverVersion","asFunction","process","env","AppConstants","VERSION_KEY","socketFactory","asClass","SocketFactory","transient","typeormService","TypeormService","singleton","settingsService","SettingsService2","SettingsService","floorService","FloorService2","FloorService","floorPositionService","FloorPositionService","cameraStreamService","CameraService2","CameraService","printerService","PrinterService2","PrinterService","printerGroupService","PrinterGroupService","refreshTokenService","RefreshToken2","RefreshTokenService","userService","UserService2","UserService","userRoleService","UserRoleService","roleService","RoleService2","RoleService","permissionService","PermissionService2","PermissionService","customGCodeService","CustomGcodeService2","CustomGcodeService","printCompletionService","PrintCompletionService2","PrintCompletionService","serverHost","ServerHost","settingsStore","SettingsStore","configService","ConfigService","authService","AuthService","jwtService","JwtService","loggerFactory","LoggerFactory","taskManagerService","TaskManagerService","toadScheduler","ToadScheduler","eventEmitter2","configureEventEmitter","cacheManager","configureCacheManager","serverReleaseService","ServerReleaseService","monsterPiService","MonsterPiService","serverUpdateService","ServerUpdateService","githubService","GithubService","octokitService","cradle","CustomOctoKit","Octokit","plugin","throttling","auth","get","GITHUB_PAT","throttle","onRateLimit","retryAfter","options","octokit","retryCount","logger","warn","method","url","onSecondaryRateLimit","clientBundleService","ClientBundleService","logDumpService","LogDumpService","simpleGitService","simpleGit","httpClient","axios","create","maxBodyLength","maxContentLength","socketIoGateway","SocketIoGateway","multerService","MulterService","yamlService","YamlService","printerLogin","printerApiFactory","PrinterApiFactory","octoprintApi","OctoprintApi","octoprintClient","OctoprintClient","octoPrintSockIoAdapter","OctoprintWebsocketAdapter","moonrakerApi","MoonrakerApi","moonrakerClient","MoonrakerClient","moonrakerWebsocketAdapter","MoonrakerWebsocketAdapter","batchCallService","BatchCallService","pluginFirmwareUpdateService","PluginFirmwareUpdateService","floorStore","FloorStore","pluginRepositoryCache","PluginRepositoryCache","printerThumbnailCache","PrinterThumbnailCache","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","printerFilesStore","PrinterFilesStore","printerCache","PrinterCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","bootTask","BootTask","softwareUpdateTask","SoftwareUpdateTask","socketIoTask","SocketIoTask","clientDistDownloadTask","ClientDistDownloadTask","printCompletionSocketIoTask","PrintCompletionSocketIoTask","printerWebsocketTask","PrinterWebsocketTask","printerWebsocketRestoreTask","PrinterWebsocketRestoreTask","printerFileCleanTask","PrinterFileCleanTask"],"mappings":"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"}
1
+ {"version":3,"sources":["../src/container.ts"],"names":["config","configureContainer","key","experimentalMode","serviceTypeorm","serviceMongoose","isSqlite","container","createContainer","injectionMode","InjectionMode","PROXY","di","DITokens","register","serverTasks","asValue","ServerTasks","isTypeormMode","appDefaultRole","ROLES","GUEST","appDefaultRoleNoLogin","ADMIN","serverVersion","asFunction","process","env","AppConstants","VERSION_KEY","socketFactory","asClass","SocketFactory","transient","typeormService","TypeormService","singleton","settingsService","SettingsService2","SettingsService","floorService","FloorService2","FloorService","floorPositionService","FloorPositionService","cameraStreamService","CameraService2","CameraService","printerService","PrinterService2","PrinterService","printerGroupService","PrinterGroupService","refreshTokenService","RefreshToken2","RefreshTokenService","userService","UserService2","UserService","userRoleService","UserRoleService","roleService","RoleService2","RoleService","permissionService","PermissionService2","PermissionService","customGCodeService","CustomGcodeService2","CustomGcodeService","printCompletionService","PrintCompletionService2","PrintCompletionService","serverHost","ServerHost","settingsStore","SettingsStore","configService","ConfigService","authService","AuthService","jwtService","JwtService","loggerFactory","LoggerFactory","taskManagerService","TaskManagerService","toadScheduler","ToadScheduler","eventEmitter2","configureEventEmitter","cacheManager","configureCacheManager","serverReleaseService","ServerReleaseService","monsterPiService","MonsterPiService","githubService","GithubService","octokitService","cradle","CustomOctoKit","Octokit","plugin","throttling","auth","get","GITHUB_PAT","throttle","onRateLimit","retryAfter","options","octokit","retryCount","logger","warn","method","url","onSecondaryRateLimit","clientBundleService","ClientBundleService","logDumpService","LogDumpService","httpClientFactory","HttpClientFactory","socketIoGateway","SocketIoGateway","multerService","MulterService","yamlService","YamlService","printerLogin","printerApiFactory","PrinterApiFactory","octoprintApi","OctoprintApi","octoprintClient","OctoprintClient","octoPrintSockIoAdapter","OctoprintWebsocketAdapter","moonrakerApi","MoonrakerApi","moonrakerClient","MoonrakerClient","moonrakerWebsocketAdapter","MoonrakerWebsocketAdapter","batchCallService","BatchCallService","pluginFirmwareUpdateService","PluginFirmwareUpdateService","floorStore","FloorStore","pluginRepositoryCache","PluginRepositoryCache","printerThumbnailCache","PrinterThumbnailCache","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","printerFilesStore","PrinterFilesStore","printerCache","PrinterCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","bootTask","BootTask","softwareUpdateTask","SoftwareUpdateTask","socketIoTask","SocketIoTask","clientDistDownloadTask","ClientDistDownloadTask","printCompletionSocketIoTask","PrintCompletionSocketIoTask","printerWebsocketTask","PrinterWebsocketTask","printerWebsocketRestoreTask","PrinterWebsocketRestoreTask","printerFileCleanTask","PrinterFileCleanTask"],"mappings":"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"}
@@ -16,9 +16,8 @@ const DITokens = {
16
16
  typeormService: "typeormService",
17
17
  serverHost: "serverHost",
18
18
  loggerFactory: "loggerFactory",
19
- httpClient: "httpClient",
19
+ httpClientFactory: "httpClientFactory",
20
20
  socketIoGateway: "socketIoGateway",
21
- simpleGitService: "simpleGitService",
22
21
  multerService: "multerService",
23
22
  configService: "configService",
24
23
  taskManagerService: "taskManagerService",
@@ -34,7 +33,6 @@ const DITokens = {
34
33
  settingsService: "settingsService",
35
34
  serverReleaseService: "serverReleaseService",
36
35
  monsterPiService: "monsterPiService",
37
- serverUpdateService: "serverUpdateService",
38
36
  githubService: "githubService",
39
37
  octokitService: "octokitService",
40
38
  clientBundleService: "clientBundleService",
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/container.tokens.ts"],"names":["DITokens","serverVersion","isTypeormMode","appDefaultRole","appDefaultRoleNoLogin","typeormService","serverHost","loggerFactory","httpClient","socketIoGateway","simpleGitService","multerService","configService","taskManagerService","toadScheduler","eventEmitter2","cacheManager","printerService","printerGroupService","floorPositionService","printCompletionService","floorService","yamlService","settingsService","serverReleaseService","monsterPiService","serverUpdateService","githubService","octokitService","clientBundleService","logDumpService","userTokenService","authService","refreshTokenService","userService","userRoleService","permissionService","jwtService","roleService","octoprintApi","octoprintClient","moonrakerApi","moonrakerClient","cameraStreamService","socketFactory","printerApiFactory","printerLogin","batchCallService","pluginRepositoryCache","pluginFirmwareUpdateService","influxDbV2BaseService","systemInfoBundleService","customGCodeService","floorStore","settingsStore","printerSocketStore","testPrinterSocketStore","printerFilesStore","octoPrintSockIoAdapter","moonrakerWebsocketAdapter","printerCache","printerEventsCache","printerThumbnailCache","fileCache","fileUploadTrackerCache","serverTasks","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printCompletionSocketIoTask","printerWebsocketTask","printerWebsocketRestoreTask","printerFileCleanTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IAEtBC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAEhBC,YAAY;IACZC,eAAe;IACfC,YAAY;IACZC,iBAAiB;IACjBC,kBAAkB;IAClBC,eAAe;IACfC,eAAe;IACfC,oBAAoB;IACpBC,eAAe;IACfC,eAAe;IACfC,cAAc;IACdC,gBAAgB;IAChBC,qBAAqB;IACrBC,sBAAsB;IACtBC,wBAAwB;IACxBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,sBAAsB;IACtBC,kBAAkB;IAClBC,qBAAqB;IACrBC,eAAe;IACfC,gBAAgB;IAChBC,qBAAqB;IACrBC,gBAAgB;IAChBC,kBAAkB;IAClBC,aAAa;IACbC,qBAAqB;IACrBC,aAAa;IACbC,iBAAiB;IACjBC,mBAAmB;IACnBC,YAAY;IACZC,aAAa;IACbC,cAAc;IACdC,iBAAiB;IACjBC,cAAc;IACdC,iBAAiB;IACjBC,qBAAqB;IACrBC,eAAe;IACfC,mBAAmB;IACnBC,cAAc;IACdC,kBAAkB;IAClBC,uBAAuB;IACvBC,6BAA6B;IAC7BC,uBAAuB;IACvBC,yBAAyB;IACzBC,oBAAoB;IAEpBC,YAAY;IACZC,eAAe;IACfC,oBAAoB;IACpBC,wBAAwB;IACxBC,mBAAmB;IACnBC,wBAAwB;IACxBC,2BAA2B;IAE3BC,cAAc;IACdC,oBAAoB;IACpBC,uBAAuB;IACvBC,WAAW;IACXC,wBAAwB;IAExBC,aAAa;IACbC,UAAU;IACVC,oBAAoB;IACpBC,wBAAwB;IACxBC,cAAc;IACdC,6BAA6B;IAC7BC,sBAAsB;IACtBC,6BAA6B;IAC7BC,sBAAsB;AACxB"}
1
+ {"version":3,"sources":["../src/container.tokens.ts"],"names":["DITokens","serverVersion","isTypeormMode","appDefaultRole","appDefaultRoleNoLogin","typeormService","serverHost","loggerFactory","httpClientFactory","socketIoGateway","multerService","configService","taskManagerService","toadScheduler","eventEmitter2","cacheManager","printerService","printerGroupService","floorPositionService","printCompletionService","floorService","yamlService","settingsService","serverReleaseService","monsterPiService","githubService","octokitService","clientBundleService","logDumpService","userTokenService","authService","refreshTokenService","userService","userRoleService","permissionService","jwtService","roleService","octoprintApi","octoprintClient","moonrakerApi","moonrakerClient","cameraStreamService","socketFactory","printerApiFactory","printerLogin","batchCallService","pluginRepositoryCache","pluginFirmwareUpdateService","influxDbV2BaseService","systemInfoBundleService","customGCodeService","floorStore","settingsStore","printerSocketStore","testPrinterSocketStore","printerFilesStore","octoPrintSockIoAdapter","moonrakerWebsocketAdapter","printerCache","printerEventsCache","printerThumbnailCache","fileCache","fileUploadTrackerCache","serverTasks","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printCompletionSocketIoTask","printerWebsocketTask","printerWebsocketRestoreTask","printerFileCleanTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IAEtBC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAEhBC,YAAY;IACZC,eAAe;IACfC,mBAAmB;IACnBC,iBAAiB;IACjBC,eAAe;IACfC,eAAe;IACfC,oBAAoB;IACpBC,eAAe;IACfC,eAAe;IACfC,cAAc;IACdC,gBAAgB;IAChBC,qBAAqB;IACrBC,sBAAsB;IACtBC,wBAAwB;IACxBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,sBAAsB;IACtBC,kBAAkB;IAClBC,eAAe;IACfC,gBAAgB;IAChBC,qBAAqB;IACrBC,gBAAgB;IAChBC,kBAAkB;IAClBC,aAAa;IACbC,qBAAqB;IACrBC,aAAa;IACbC,iBAAiB;IACjBC,mBAAmB;IACnBC,YAAY;IACZC,aAAa;IACbC,cAAc;IACdC,iBAAiB;IACjBC,cAAc;IACdC,iBAAiB;IACjBC,qBAAqB;IACrBC,eAAe;IACfC,mBAAmB;IACnBC,cAAc;IACdC,kBAAkB;IAClBC,uBAAuB;IACvBC,6BAA6B;IAC7BC,uBAAuB;IACvBC,yBAAyB;IACzBC,oBAAoB;IAEpBC,YAAY;IACZC,eAAe;IACfC,oBAAoB;IACpBC,wBAAwB;IACxBC,mBAAmB;IACnBC,wBAAwB;IACxBC,2BAA2B;IAE3BC,cAAc;IACdC,oBAAoB;IACpBC,uBAAuB;IACvBC,WAAW;IACXC,wBAAwB;IAExBC,aAAa;IACbC,UAAU;IACVC,oBAAoB;IACpBC,wBAAwB;IACxBC,cAAc;IACdC,6BAA6B;IAC7BC,sBAAsB;IACtBC,6BAA6B;IAC7BC,sBAAsB;AACxB"}
@@ -78,12 +78,12 @@ class PluginFirmwareUpdateController {
78
78
  async getFirmwareUpdaterStatus(req, res) {
79
79
  const { printerLogin } = (0, _validators.getScopedPrinter)(req);
80
80
  const status = await this.pluginFirmwareUpdateService.getPluginFirmwareStatus(printerLogin);
81
- res.send(status);
81
+ res.send(status.data);
82
82
  }
83
83
  async configurePluginSettings(req, res) {
84
84
  const { printerLogin } = (0, _validators.getScopedPrinter)(req);
85
85
  const response = await this.pluginFirmwareUpdateService.configureFirmwareUpdaterSettings(printerLogin);
86
- res.send(response);
86
+ res.send(response.data);
87
87
  }
88
88
  async flashFirmware(req, res) {
89
89
  const { printerLogin, currentPrinterId } = (0, _validators.getScopedPrinter)(req);
@@ -94,7 +94,7 @@ class PluginFirmwareUpdateController {
94
94
  const printers = await this.printerCache.listCachedPrinters();
95
95
  const printerFirmwareStates = [];
96
96
  const failureStates = [];
97
- for (let printer of printers){
97
+ for (const printer of printers){
98
98
  try {
99
99
  const loginDto = await this.printerCache.getLoginDtoAsync(printer.id);
100
100
  const isInstalled = await this.pluginFirmwareUpdateService.isPluginInstalled(loginDto);
@@ -121,9 +121,7 @@ class PluginFirmwareUpdateController {
121
121
  firmwareStates: printerFirmwareStates,
122
122
  failures: failureStates
123
123
  };
124
- await this.cacheManager.set(cacheKey, result, {
125
- ttl: 3600 * 4
126
- });
124
+ await this.cacheManager.set(cacheKey, result, 3600 * 4);
127
125
  return result;
128
126
  }
129
127
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/controllers/plugin-firmware-update.controller.ts"],"names":["PluginFirmwareUpdateController","cacheKey","cacheManager","printerCache","pluginFirmwareUpdateService","logger","constructor","loggerFactory","name","listUpdateState","req","res","result","performScanOnPrinters","send","syncFirmwareReleasesCache","releases","queryGithubPrusaFirmwareReleasesCache","downloadFirmware","scanPrinterFirmwareVersions","isPluginInstalled","printerLogin","getScopedPrinter","isInstalled","installFirmwareUpdatePlugin","installPlugin","installing","getFirmwareUpdaterStatus","status","getPluginFirmwareStatus","configurePluginSettings","response","configureFirmwareUpdaterSettings","flashFirmware","currentPrinterId","flashPrusaFirmware","printers","listCachedPrinters","printerFirmwareStates","failureStates","printer","loginDto","getLoginDtoAsync","id","version","getPrinterFirmwareVersion","push","firmware","printerName","pluginInstalled","e","error","firmwareStates","failures","set","ttl","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware"],"mappings":"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"}
1
+ {"version":3,"sources":["../../src/controllers/plugin-firmware-update.controller.ts"],"names":["PluginFirmwareUpdateController","cacheKey","cacheManager","printerCache","pluginFirmwareUpdateService","logger","constructor","loggerFactory","name","listUpdateState","req","res","result","performScanOnPrinters","send","syncFirmwareReleasesCache","releases","queryGithubPrusaFirmwareReleasesCache","downloadFirmware","scanPrinterFirmwareVersions","isPluginInstalled","printerLogin","getScopedPrinter","isInstalled","installFirmwareUpdatePlugin","installPlugin","installing","getFirmwareUpdaterStatus","status","getPluginFirmwareStatus","data","configurePluginSettings","response","configureFirmwareUpdaterSettings","flashFirmware","currentPrinterId","flashPrusaFirmware","printers","listCachedPrinters","printerFirmwareStates","failureStates","printer","loginDto","getLoginDtoAsync","id","version","getPrinterFirmwareVersion","push","firmware","printerName","pluginInstalled","e","error","firmwareStates","failures","set","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware"],"mappings":"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"}
@@ -49,10 +49,6 @@ class PrinterFilesController {
49
49
  this.printerThumbnailCache = printerThumbnailCache;
50
50
  this.logger = loggerFactory(PrinterFilesController.name);
51
51
  }
52
- getTrackedUploads(req, res) {
53
- const sessions = this.multerService.getSessions();
54
- res.send(sessions);
55
- }
56
52
  async purgeIndexedFiles(req, res) {
57
53
  await this.printerFilesStore.purgeFiles();
58
54
  res.send();
@@ -156,6 +152,21 @@ class PrinterFilesController {
156
152
  error: "Only 1 .gcode file can be uploaded at a time"
157
153
  });
158
154
  }
155
+ const fileCleanEnabled = this.settingsStore.isPreUploadFileCleanEnabled();
156
+ if (fileCleanEnabled) {
157
+ await this.printerFileCleanTask.cleanPrinterFiles(currentPrinterId);
158
+ }
159
+ const uploadedFile = files[0];
160
+ const token = this.multerService.startTrackingSession(uploadedFile, currentPrinterId);
161
+ await this.printerApi.uploadFile(uploadedFile, token).catch((e)=>{
162
+ try {
163
+ this.multerService.clearUploadedFile(uploadedFile);
164
+ } catch (e) {
165
+ this.logger.error(`Could not remove uploaded file from temporary storage ${(0, _errorutils.errorSummary)(e)}`);
166
+ }
167
+ throw e;
168
+ });
169
+ await this.printerFilesStore.loadFiles(currentPrinterId);
159
170
  try {
160
171
  if (this.settingsStore.isThumbnailSupportEnabled()) {
161
172
  await this.printerThumbnailCache.loadPrinterThumbnailLocal(currentPrinterId, files[0].path);
@@ -164,28 +175,14 @@ class PrinterFilesController {
164
175
  this.logger.error(`Unexpected error processing thumbnail ${(0, _errorutils.errorSummary)(e)}`);
165
176
  (0, _node.captureException)(e);
166
177
  }
167
- const fileCleanEnabled = this.settingsStore.isPreUploadFileCleanEnabled();
168
- if (fileCleanEnabled) {
169
- await this.printerFileCleanTask.cleanPrinterFiles(currentPrinterId);
178
+ try {
179
+ this.multerService.clearUploadedFile(uploadedFile);
180
+ } catch (e) {
181
+ this.logger.error(`Could not remove uploaded file from temporary storage ${(0, _errorutils.errorSummary)(e)}`);
170
182
  }
171
- const uploadedFile = files[0];
172
- const token = this.multerService.startTrackingSession(uploadedFile);
173
- await this.printerApi.uploadFile(uploadedFile, token);
174
- await this.printerFilesStore.loadFiles(currentPrinterId);
175
183
  res.send();
176
184
  }
177
185
  }
178
- _ts_decorate([
179
- (0, _awilixexpress.GET)(),
180
- (0, _awilixexpress.route)("/tracked-uploads"),
181
- (0, _awilixexpress.before)((0, _authenticate.authorizePermission)(_authorizationconstants.PERMS.PrinterFiles.Upload)),
182
- _ts_metadata("design:type", Function),
183
- _ts_metadata("design:paramtypes", [
184
- typeof _express.Request === "undefined" ? Object : _express.Request,
185
- typeof _express.Response === "undefined" ? Object : _express.Response
186
- ]),
187
- _ts_metadata("design:returntype", void 0)
188
- ], PrinterFilesController.prototype, "getTrackedUploads", null);
189
186
  _ts_decorate([
190
187
  (0, _awilixexpress.POST)(),
191
188
  (0, _awilixexpress.route)("/purge"),
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/controllers/printer-files.controller.ts"],"names":["PrinterFilesController","printerApi","printerLogin","printerThumbnailCache","printerFilesStore","settingsStore","batchCallService","multerService","printerFileCleanTask","logger","constructor","loggerFactory","name","getTrackedUploads","req","res","sessions","getSessions","send","purgeIndexedFiles","purgeFiles","getThumbnails","thumbnails","getAllValues","getFiles","currentPrinterId","getScopedPrinter","log","files","loadFiles","reloadThumbnail","filePath","validateInput","body","startPrintFileRules","isThumbnailSupportEnabled","loadPrinterThumbnailRemote","params","id","e","error","errorSummary","captureException","startPrintFile","encodedFilePath","encodeURIComponent","startPrint","getFilesCache","currentPrinter","downloadFile","path","downloadFileRules","response","setHeader","headers","length","data","pipe","deleteFileOrFolder","query","getFileRules","result","deleteFile","clearPrinterFiles","failedFiles","succeededFiles","nonRecursiveFiles","file","push","purgePrinterFiles","getPrinterThumbnail","printerThumbnail","getValue","toString","uploadPrinterFile","multerLoadFileAsync","AppConstants","defaultAcceptedGcodeExtensions","ValidationException","join","loadPrinterThumbnailLocal","fileCleanEnabled","isPreUploadFileCleanEnabled","cleanPrinterFiles","uploadedFile","token","startTrackingSession","uploadFile","PrinterFiles","Upload","Clear","Get","Actions","Delete","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","printerResolveMiddleware"],"mappings":"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"}
1
+ {"version":3,"sources":["../../src/controllers/printer-files.controller.ts"],"names":["PrinterFilesController","printerApi","printerLogin","printerThumbnailCache","printerFilesStore","settingsStore","batchCallService","multerService","printerFileCleanTask","logger","constructor","loggerFactory","name","purgeIndexedFiles","req","res","purgeFiles","send","getThumbnails","thumbnails","getAllValues","getFiles","currentPrinterId","getScopedPrinter","log","files","loadFiles","reloadThumbnail","filePath","validateInput","body","startPrintFileRules","isThumbnailSupportEnabled","loadPrinterThumbnailRemote","params","id","e","error","errorSummary","captureException","startPrintFile","encodedFilePath","encodeURIComponent","startPrint","getFilesCache","currentPrinter","downloadFile","path","downloadFileRules","response","setHeader","headers","length","data","pipe","deleteFileOrFolder","query","getFileRules","result","deleteFile","clearPrinterFiles","failedFiles","succeededFiles","nonRecursiveFiles","file","push","purgePrinterFiles","getPrinterThumbnail","printerThumbnail","getValue","toString","uploadPrinterFile","multerLoadFileAsync","AppConstants","defaultAcceptedGcodeExtensions","ValidationException","join","fileCleanEnabled","isPreUploadFileCleanEnabled","cleanPrinterFiles","uploadedFile","token","startTrackingSession","uploadFile","catch","clearUploadedFile","loadPrinterThumbnailLocal","PrinterFiles","Clear","Get","Actions","Delete","Upload","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","printerResolveMiddleware"],"mappings":"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"}
@@ -36,21 +36,21 @@ class PrinterSettingsController {
36
36
  const { id: printerId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
37
37
  const loginDto = await this.printerCache.getLoginDtoAsync(printerId);
38
38
  const settings = await this.octoprintClient.getSettings(loginDto);
39
- res.send(settings);
39
+ res.send(settings.data);
40
40
  }
41
41
  async setGCodeAnalysis(req, res) {
42
42
  const { id: printerId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
43
43
  const { enabled } = await (0, _validators.validateMiddleware)(req, _printersettingscontrollervalidation.setGcodeAnalysis);
44
44
  const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
45
45
  const settings = await this.octoprintClient.setGCodeAnalysis(printerLogin, enabled);
46
- res.send(settings);
46
+ res.send(settings.data);
47
47
  }
48
48
  async syncPrinterName(req, res) {
49
49
  const { id: printerId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
50
50
  const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
51
51
  const name = await this.printerCache.getNameAsync(printerId);
52
52
  const settings = await this.octoprintClient.updatePrinterNameSetting(printerLogin, name);
53
- res.send(settings);
53
+ res.send(settings.data);
54
54
  }
55
55
  }
56
56
  const _default = (0, _awilixexpress.createController)(PrinterSettingsController).prefix(_serverconstants.AppConstants.apiRoute + "/printer-settings").before([
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/controllers/printer-settings.controller.ts"],"names":["PrinterSettingsController","printerCache","octoprintClient","isTypeormMode","constructor","get","req","res","id","printerId","validateInput","params","idRulesV2","loginDto","getLoginDtoAsync","settings","getSettings","send","setGCodeAnalysis","enabled","validateMiddleware","setGcodeAnalysis","printerLogin","syncPrinterName","name","getNameAsync","updatePrinterNameSetting","createController","prefix","AppConstants","apiRoute","before","authenticate","withPermission","PERMS","PrinterSettings","Get","post"],"mappings":";;;;;;;;;;;IAWaA,yBAAyB;eAAzBA;;IA8Cb,OAKoD;eALpD;;;+BAzDiC;8BACY;4BACK;iCACrB;mCACH;qDACO;wCACX;AAKf,MAAMA;IACXC,aAA2B;IAC3BC,gBAAiC;IACjCC,cAAuB;IAEvBC,YAAY,EACVH,YAAY,EACZC,eAAe,EACfC,aAAa,EAKd,CAAE;QACD,IAAI,CAACF,YAAY,GAAGA;QACpB,IAAI,CAACC,eAAe,GAAGA;QACvB,IAAI,CAACC,aAAa,GAAGA;IACvB;IAEA,MAAME,IAAIC,GAAY,EAAEC,GAAa,EAAE;QACrC,MAAM,EAAEC,IAAIC,SAAS,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACJ,IAAIK,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACT,aAAa;QAEtF,MAAMU,WAAW,MAAM,IAAI,CAACZ,YAAY,CAACa,gBAAgB,CAACL;QAC1D,MAAMM,WAAW,MAAM,IAAI,CAACb,eAAe,CAACc,WAAW,CAACH;QACxDN,IAAIU,IAAI,CAACF;IACX;IAEA,MAAMG,iBAAiBZ,GAAY,EAAEC,GAAa,EAAE;QAClD,MAAM,EAAEC,IAAIC,SAAS,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACJ,IAAIK,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACT,aAAa;QACtF,MAAM,EAAEgB,OAAO,EAAE,GAAG,MAAMC,IAAAA,8BAAkB,EAACd,KAAKe,qDAAgB;QAElE,MAAMC,eAAe,MAAM,IAAI,CAACrB,YAAY,CAACa,gBAAgB,CAACL;QAC9D,MAAMM,WAAW,MAAM,IAAI,CAACb,eAAe,CAACgB,gBAAgB,CAACI,cAAcH;QAC3EZ,IAAIU,IAAI,CAACF;IACX;IAEA,MAAMQ,gBAAgBjB,GAAY,EAAEC,GAAa,EAAE;QACjD,MAAM,EAAEC,IAAIC,SAAS,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACJ,IAAIK,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACT,aAAa;QAEtF,MAAMmB,eAAe,MAAM,IAAI,CAACrB,YAAY,CAACa,gBAAgB,CAACL;QAC9D,MAAMe,OAAO,MAAM,IAAI,CAACvB,YAAY,CAACwB,YAAY,CAAChB;QAClD,MAAMM,WAAW,MAAM,IAAI,CAACb,eAAe,CAACwB,wBAAwB,CAACJ,cAAcE;QACnFjB,IAAIU,IAAI,CAACF;IACX;AACF;MAEA,WAAeY,IAAAA,+BAAgB,EAAC3B,2BAC7B4B,MAAM,CAACC,6BAAY,CAACC,QAAQ,GAAG,qBAC/BC,MAAM,CAAC;IAACC,IAAAA,0BAAY;CAAG,EACvB3B,GAAG,CAAC,QAAQ,OAAO4B,IAAAA,4BAAc,EAACC,6BAAK,CAACC,eAAe,CAACC,GAAG,GAC3DC,IAAI,CAAC,uBAAuB,oBAC5BA,IAAI,CAAC,yBAAyB"}
1
+ {"version":3,"sources":["../../src/controllers/printer-settings.controller.ts"],"names":["PrinterSettingsController","printerCache","octoprintClient","isTypeormMode","constructor","get","req","res","id","printerId","validateInput","params","idRulesV2","loginDto","getLoginDtoAsync","settings","getSettings","send","data","setGCodeAnalysis","enabled","validateMiddleware","setGcodeAnalysis","printerLogin","syncPrinterName","name","getNameAsync","updatePrinterNameSetting","createController","prefix","AppConstants","apiRoute","before","authenticate","withPermission","PERMS","PrinterSettings","Get","post"],"mappings":";;;;;;;;;;;IAWaA,yBAAyB;eAAzBA;;IA8Cb,OAKoD;eALpD;;;+BAzDiC;8BACY;4BACK;iCACrB;mCACH;qDACO;wCACX;AAKf,MAAMA;IACXC,aAA2B;IAC3BC,gBAAiC;IACjCC,cAAuB;IAEvBC,YAAY,EACVH,YAAY,EACZC,eAAe,EACfC,aAAa,EAKd,CAAE;QACD,IAAI,CAACF,YAAY,GAAGA;QACpB,IAAI,CAACC,eAAe,GAAGA;QACvB,IAAI,CAACC,aAAa,GAAGA;IACvB;IAEA,MAAME,IAAIC,GAAY,EAAEC,GAAa,EAAE;QACrC,MAAM,EAAEC,IAAIC,SAAS,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACJ,IAAIK,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACT,aAAa;QAEtF,MAAMU,WAAW,MAAM,IAAI,CAACZ,YAAY,CAACa,gBAAgB,CAACL;QAC1D,MAAMM,WAAW,MAAM,IAAI,CAACb,eAAe,CAACc,WAAW,CAACH;QACxDN,IAAIU,IAAI,CAACF,SAASG,IAAI;IACxB;IAEA,MAAMC,iBAAiBb,GAAY,EAAEC,GAAa,EAAE;QAClD,MAAM,EAAEC,IAAIC,SAAS,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACJ,IAAIK,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACT,aAAa;QACtF,MAAM,EAAEiB,OAAO,EAAE,GAAG,MAAMC,IAAAA,8BAAkB,EAACf,KAAKgB,qDAAgB;QAElE,MAAMC,eAAe,MAAM,IAAI,CAACtB,YAAY,CAACa,gBAAgB,CAACL;QAC9D,MAAMM,WAAW,MAAM,IAAI,CAACb,eAAe,CAACiB,gBAAgB,CAACI,cAAcH;QAC3Eb,IAAIU,IAAI,CAACF,SAASG,IAAI;IACxB;IAEA,MAAMM,gBAAgBlB,GAAY,EAAEC,GAAa,EAAE;QACjD,MAAM,EAAEC,IAAIC,SAAS,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACJ,IAAIK,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACT,aAAa;QAEtF,MAAMoB,eAAe,MAAM,IAAI,CAACtB,YAAY,CAACa,gBAAgB,CAACL;QAC9D,MAAMgB,OAAO,MAAM,IAAI,CAACxB,YAAY,CAACyB,YAAY,CAACjB;QAClD,MAAMM,WAAW,MAAM,IAAI,CAACb,eAAe,CAACyB,wBAAwB,CAACJ,cAAcE;QACnFlB,IAAIU,IAAI,CAACF,SAASG,IAAI;IACxB;AACF;MAEA,WAAeU,IAAAA,+BAAgB,EAAC5B,2BAC7B6B,MAAM,CAACC,6BAAY,CAACC,QAAQ,GAAG,qBAC/BC,MAAM,CAAC;IAACC,IAAAA,0BAAY;CAAG,EACvB5B,GAAG,CAAC,QAAQ,OAAO6B,IAAAA,4BAAc,EAACC,6BAAK,CAACC,eAAe,CAACC,GAAG,GAC3DC,IAAI,CAAC,uBAAuB,oBAC5BA,IAAI,CAAC,yBAAyB"}