@fdm-monster/server 1.5.1 → 1.5.4

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 (220) hide show
  1. package/README.md +1 -1
  2. package/dist/constants/authorization.constants.js +1 -2
  3. package/dist/constants/authorization.constants.js.map +1 -1
  4. package/dist/constants/http-status-codes.constants.js +62 -255
  5. package/dist/constants/http-status-codes.constants.js.map +1 -1
  6. package/dist/constants/server-settings.constants.js +0 -4
  7. package/dist/constants/server-settings.constants.js.map +1 -1
  8. package/dist/constants/service.constants.js +3 -10
  9. package/dist/constants/service.constants.js.map +1 -1
  10. package/dist/container.js +66 -69
  11. package/dist/container.js.map +1 -1
  12. package/dist/container.tokens.js +2 -7
  13. package/dist/container.tokens.js.map +1 -1
  14. package/dist/controllers/auth.controller.js +0 -2
  15. package/dist/controllers/auth.controller.js.map +1 -1
  16. package/dist/controllers/batch-call.controller.js +7 -5
  17. package/dist/controllers/batch-call.controller.js.map +1 -1
  18. package/dist/controllers/camera-stream.controller.js +6 -4
  19. package/dist/controllers/camera-stream.controller.js.map +1 -1
  20. package/dist/controllers/custom-gcode.controller.js +11 -11
  21. package/dist/controllers/custom-gcode.controller.js.map +1 -1
  22. package/dist/controllers/floor.controller.js +9 -12
  23. package/dist/controllers/floor.controller.js.map +1 -1
  24. package/dist/controllers/plugin-firmware-update.controller.js +1 -3
  25. package/dist/controllers/plugin-firmware-update.controller.js.map +1 -1
  26. package/dist/controllers/print-completion.controller.js +1 -4
  27. package/dist/controllers/print-completion.controller.js.map +1 -1
  28. package/dist/controllers/printer-files.controller.js +22 -39
  29. package/dist/controllers/printer-files.controller.js.map +1 -1
  30. package/dist/controllers/printer-settings.controller.js +8 -6
  31. package/dist/controllers/printer-settings.controller.js.map +1 -1
  32. package/dist/controllers/printer.controller.js +7 -37
  33. package/dist/controllers/printer.controller.js.map +1 -1
  34. package/dist/controllers/server-private.controller.js +0 -1
  35. package/dist/controllers/server-private.controller.js.map +1 -1
  36. package/dist/controllers/server-public.controller.js +0 -1
  37. package/dist/controllers/server-public.controller.js.map +1 -1
  38. package/dist/controllers/settings.controller.js +0 -2
  39. package/dist/controllers/settings.controller.js.map +1 -1
  40. package/dist/controllers/user.controller.js +10 -17
  41. package/dist/controllers/user.controller.js.map +1 -1
  42. package/dist/controllers/validation/batch-controller.validation.js +10 -9
  43. package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
  44. package/dist/controllers/validation/generic.validation.js +16 -7
  45. package/dist/controllers/validation/generic.validation.js.map +1 -1
  46. package/dist/controllers/validation/setting.validation.js +0 -1
  47. package/dist/controllers/validation/setting.validation.js.map +1 -1
  48. package/dist/handlers/cache-manager.js +1 -1
  49. package/dist/handlers/cache-manager.js.map +1 -1
  50. package/dist/handlers/event-emitter.js +0 -7
  51. package/dist/handlers/event-emitter.js.map +1 -1
  52. package/dist/handlers/logger.js +1 -1
  53. package/dist/handlers/logger.js.map +1 -1
  54. package/dist/handlers/validators.js +1 -1
  55. package/dist/handlers/validators.js.map +1 -1
  56. package/dist/middleware/authenticate.js +23 -23
  57. package/dist/middleware/authenticate.js.map +1 -1
  58. package/dist/middleware/exception.filter.js +0 -1
  59. package/dist/middleware/exception.filter.js.map +1 -1
  60. package/dist/middleware/global.middleware.js +6 -6
  61. package/dist/middleware/global.middleware.js.map +1 -1
  62. package/dist/models/Auth/User.js +0 -2
  63. package/dist/models/Auth/User.js.map +1 -1
  64. package/dist/models/FloorPrinter.js.map +1 -1
  65. package/dist/models/PrintCompletion.js.map +1 -1
  66. package/dist/models/Printer.js +2 -11
  67. package/dist/models/Printer.js.map +1 -1
  68. package/dist/models/Settings.js +0 -1
  69. package/dist/models/Settings.js.map +1 -1
  70. package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js +0 -4
  71. package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js.map +1 -1
  72. package/dist/mongo-migrations/20210907173950-printers-enabled.js +0 -4
  73. package/dist/mongo-migrations/20210907173950-printers-enabled.js.map +1 -1
  74. package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js +0 -4
  75. package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js.map +1 -1
  76. package/dist/mongo-migrations/20231111081809-printer-flatten-name.js +35 -0
  77. package/dist/mongo-migrations/20231111081809-printer-flatten-name.js.map +1 -0
  78. package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js +41 -0
  79. package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js.map +1 -0
  80. package/dist/server.constants.js +1 -19
  81. package/dist/server.constants.js.map +1 -1
  82. package/dist/server.core.js +6 -7
  83. package/dist/server.core.js.map +1 -1
  84. package/dist/server.env.js +6 -18
  85. package/dist/server.env.js.map +1 -1
  86. package/dist/server.host.js +6 -8
  87. package/dist/server.host.js.map +1 -1
  88. package/dist/services/authentication/auth.service.js +2 -20
  89. package/dist/services/authentication/auth.service.js.map +1 -1
  90. package/dist/services/authentication/jwt.service.js +1 -1
  91. package/dist/services/authentication/jwt.service.js.map +1 -1
  92. package/dist/services/authentication/permission.service.js.map +1 -1
  93. package/dist/services/authentication/refresh-token.service.js +8 -1
  94. package/dist/services/authentication/refresh-token.service.js.map +1 -1
  95. package/dist/services/authentication/role.service.js +1 -1
  96. package/dist/services/authentication/role.service.js.map +1 -1
  97. package/dist/services/authentication/user.service.js +1 -5
  98. package/dist/services/authentication/user.service.js.map +1 -1
  99. package/dist/services/batch-call.service.js +4 -8
  100. package/dist/services/batch-call.service.js.map +1 -1
  101. package/dist/services/camera-stream.service.js +1 -2
  102. package/dist/services/camera-stream.service.js.map +1 -1
  103. package/dist/services/core/client-bundle.service.js +1 -4
  104. package/dist/services/core/client-bundle.service.js.map +1 -1
  105. package/dist/services/core/logs-manager.service.js +1 -2
  106. package/dist/services/core/logs-manager.service.js.map +1 -1
  107. package/dist/services/core/multer.service.js +3 -6
  108. package/dist/services/core/multer.service.js.map +1 -1
  109. package/dist/services/core/server-release.service.js +4 -13
  110. package/dist/services/core/server-release.service.js.map +1 -1
  111. package/dist/services/core/server-update.service.js +0 -2
  112. package/dist/services/core/server-update.service.js.map +1 -1
  113. package/dist/services/core/task-manager.service.js +9 -22
  114. package/dist/services/core/task-manager.service.js.map +1 -1
  115. package/dist/services/core/yaml.service.js +28 -22
  116. package/dist/services/core/yaml.service.js.map +1 -1
  117. package/dist/services/custom-gcode.service.js +2 -2
  118. package/dist/services/custom-gcode.service.js.map +1 -1
  119. package/dist/services/floor.service.js +4 -45
  120. package/dist/services/floor.service.js.map +1 -1
  121. package/dist/services/interfaces/floor.dto.js +38 -0
  122. package/dist/services/interfaces/floor.dto.js.map +1 -1
  123. package/dist/services/interfaces/print-completion-context.dto.js +6 -0
  124. package/dist/services/interfaces/print-completion-context.dto.js.map +1 -0
  125. package/dist/services/interfaces/print-completion.dto.js +40 -0
  126. package/dist/services/interfaces/print-completion.dto.js.map +1 -0
  127. package/dist/services/interfaces/print-completion.service.js +6 -0
  128. package/dist/services/interfaces/print-completion.service.js.map +1 -0
  129. package/dist/services/interfaces/printer.dto.js +16 -3
  130. package/dist/services/interfaces/printer.dto.js.map +1 -1
  131. package/dist/services/interfaces/refresh-token.dto.js +0 -2
  132. package/dist/services/interfaces/refresh-token.dto.js.map +1 -1
  133. package/dist/services/interfaces/settings.dto.js +0 -1
  134. package/dist/services/interfaces/settings.dto.js.map +1 -1
  135. package/dist/services/interfaces/user-role.dto.js +18 -0
  136. package/dist/services/interfaces/user-role.dto.js.map +1 -0
  137. package/dist/services/octoprint/constants/octoprint-service.constants.js +0 -3
  138. package/dist/services/octoprint/constants/octoprint-service.constants.js.map +1 -1
  139. package/dist/services/octoprint/octoprint-api.routes.js +2 -4
  140. package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
  141. package/dist/services/octoprint/octoprint-api.service.js +10 -27
  142. package/dist/services/octoprint/octoprint-api.service.js.map +1 -1
  143. package/dist/services/octoprint/octoprint-sockio.adapter.js +10 -43
  144. package/dist/services/octoprint/octoprint-sockio.adapter.js.map +1 -1
  145. package/dist/services/octoprint/plugin-base.service.js +0 -1
  146. package/dist/services/octoprint/plugin-base.service.js.map +1 -1
  147. package/dist/services/octoprint/plugin-firmware-update.service.js +0 -3
  148. package/dist/services/octoprint/plugin-firmware-update.service.js.map +1 -1
  149. package/dist/services/print-completion.service.js +14 -45
  150. package/dist/services/print-completion.service.js.map +1 -1
  151. package/dist/services/print-completion.shared.js +59 -0
  152. package/dist/services/print-completion.shared.js.map +1 -0
  153. package/dist/services/printer-files.service.js +1 -5
  154. package/dist/services/printer-files.service.js.map +1 -1
  155. package/dist/services/printer.service.js +20 -15
  156. package/dist/services/printer.service.js.map +1 -1
  157. package/dist/services/settings.service.js +2 -8
  158. package/dist/services/settings.service.js.map +1 -1
  159. package/dist/services/validators/floor-service.validation.js +13 -11
  160. package/dist/services/validators/floor-service.validation.js.map +1 -1
  161. package/dist/services/validators/printer-service.validation.js +1 -2
  162. package/dist/services/validators/printer-service.validation.js.map +1 -1
  163. package/dist/services/validators/user-service.validation.js +10 -10
  164. package/dist/services/validators/user-service.validation.js.map +1 -1
  165. package/dist/services/validators/yaml-service.validation.js +13 -14
  166. package/dist/services/validators/yaml-service.validation.js.map +1 -1
  167. package/dist/state/file-upload-tracker.cache.js +0 -1
  168. package/dist/state/file-upload-tracker.cache.js.map +1 -1
  169. package/dist/state/file.cache.js +25 -33
  170. package/dist/state/file.cache.js.map +1 -1
  171. package/dist/state/floor.store.js +0 -1
  172. package/dist/state/floor.store.js.map +1 -1
  173. package/dist/state/printer-events.cache.js +1 -3
  174. package/dist/state/printer-events.cache.js.map +1 -1
  175. package/dist/state/{files.store.js → printer-files.store.js} +12 -26
  176. package/dist/state/printer-files.store.js.map +1 -0
  177. package/dist/state/printer-socket.store.js +7 -32
  178. package/dist/state/printer-socket.store.js.map +1 -1
  179. package/dist/state/printer.cache.js +4 -9
  180. package/dist/state/printer.cache.js.map +1 -1
  181. package/dist/state/settings.store.js +0 -2
  182. package/dist/state/settings.store.js.map +1 -1
  183. package/dist/state/socket-io.gateway.js +0 -2
  184. package/dist/state/socket-io.gateway.js.map +1 -1
  185. package/dist/state/test-printer-socket.store.js +1 -7
  186. package/dist/state/test-printer-socket.store.js.map +1 -1
  187. package/dist/task.presets.js +0 -11
  188. package/dist/task.presets.js.map +1 -1
  189. package/dist/tasks/boot.task.js +6 -10
  190. package/dist/tasks/boot.task.js.map +1 -1
  191. package/dist/tasks/print-completion.socketio.task.js +10 -11
  192. package/dist/tasks/print-completion.socketio.task.js.map +1 -1
  193. package/dist/tasks/printer-file-clean.task.js +13 -21
  194. package/dist/tasks/printer-file-clean.task.js.map +1 -1
  195. package/dist/tasks/printer-websocket-restore.task.js +1 -5
  196. package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
  197. package/dist/tasks/printer-websocket.task.js +5 -15
  198. package/dist/tasks/printer-websocket.task.js.map +1 -1
  199. package/dist/tasks/socketio.task.js +0 -1
  200. package/dist/tasks/socketio.task.js.map +1 -1
  201. package/dist/tasks.js +0 -2
  202. package/dist/tasks.js.map +1 -1
  203. package/dist/types/express/index.d.js +0 -1
  204. package/dist/types/express/index.d.js.map +1 -1
  205. package/dist/utils/env.utils.js +2 -5
  206. package/dist/utils/env.utils.js.map +1 -1
  207. package/dist/utils/is-docker.js +1 -1
  208. package/dist/utils/is-docker.js.map +1 -1
  209. package/dist/utils/normalize-url.js +0 -35
  210. package/dist/utils/normalize-url.js.map +1 -1
  211. package/dist/utils/semver.utils.js +0 -1
  212. package/dist/utils/semver.utils.js.map +1 -1
  213. package/dist/utils/url.utils.js +1 -0
  214. package/dist/utils/url.utils.js.map +1 -1
  215. package/dist/utils/websocket.adapter.js +8 -54
  216. package/dist/utils/websocket.adapter.js.map +1 -1
  217. package/package.json +37 -37
  218. package/dist/state/files.store.js.map +0 -1
  219. package/dist/utils/mapper.utils.js +0 -33
  220. package/dist/utils/mapper.utils.js.map +0 -1
@@ -38,9 +38,7 @@ class PluginFirmwareUpdateController {
38
38
  const result = await this.performScanOnPrinters();
39
39
  res.send(result);
40
40
  }
41
- /**
42
- * Explicit query, use with care (to prevent Github rate limit)
43
- */ async syncFirmwareReleasesCache(req, res) {
41
+ async syncFirmwareReleasesCache(req, res) {
44
42
  const releases = await this.pluginFirmwareUpdateService.queryGithubPrusaFirmwareReleasesCache();
45
43
  res.send(releases);
46
44
  }
@@ -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","log","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","warn","error","firmwareStates","failures","set","ttl","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware","get","post"],"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","log","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","warn","error","firmwareStates","failures","set","ttl","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware","get","post"],"mappings":"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"}
@@ -12,7 +12,6 @@ _export(exports, {
12
12
  PrintCompletionController: function() {
13
13
  return PrintCompletionController;
14
14
  },
15
- // prettier-ignore
16
15
  default: function() {
17
16
  return _default;
18
17
  }
@@ -29,9 +28,7 @@ class PrintCompletionController {
29
28
  this.printCompletionService = printCompletionService;
30
29
  this.printCompletionSocketIoTask = printCompletionSocketIoTask;
31
30
  }
32
- /**
33
- * Not a production ready call, just for testing.
34
- */ async test(req, res) {
31
+ async test(req, res) {
35
32
  const result = await this.printCompletionService.loadPrintContexts();
36
33
  res.send(result);
37
34
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/controllers/print-completion.controller.ts"],"names":["PrintCompletionController","printCompletionService","printCompletionSocketIoTask","constructor","test","req","res","result","loadPrintContexts","send","contexts","findCorrelatedEntries","correlationId","validateInput","params","findPrintCompletion","list","completions","listGroupByPrinterStatus","createController","prefix","AppConstants","apiRoute","before","authenticate","get","withPermission","PERMS","PrintCompletion","List","Default"],"mappings":";;;;;;;;;;;IASaA,yBAAyB;eAAzBA;;IAwCb,kBAAkB;IAClB,OAMkG;eANlG;;;8BAlD6C;+BACZ;iCACJ;wCACP;4BACQ;AAKvB,MAAMA;IACHC,uBAA+C;IAC/CC,4BAAyD;IAEjEC,YAAY,EACVF,sBAAsB,EACtBC,2BAA2B,EAI5B,CAAE;QACD,IAAI,CAACD,sBAAsB,GAAGA;QAC9B,IAAI,CAACC,2BAA2B,GAAGA;IACrC;IAEA;;GAEC,GACD,MAAME,KAAKC,GAAY,EAAEC,GAAa,EAAE;QACtC,MAAMC,SAAS,MAAM,IAAI,CAACN,sBAAsB,CAACO,iBAAiB;QAClEF,IAAIG,IAAI,CAACF;IACX;IAEAG,SAASL,GAAY,EAAEC,GAAa,EAAE;QACpC,MAAMI,WAAW,IAAI,CAACR,2BAA2B,CAACQ,QAAQ;QAC1DJ,IAAIG,IAAI,CAACC;IACX;IAEA,MAAMC,sBAAsBN,GAAY,EAAEC,GAAa,EAAE;QACvD,MAAM,EAAEM,aAAa,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACR,IAAIS,MAAM,EAAE;YAAEF,eAAe;QAAkB;QAC7F,MAAML,SAAS,MAAM,IAAI,CAACN,sBAAsB,CAACc,mBAAmB,CAACH;QACrEN,IAAIG,IAAI,CAACF;IACX;IAEA,MAAMS,KAAKX,GAAY,EAAEC,GAAa,EAAE;QACtC,MAAMW,cAAc,MAAM,IAAI,CAAChB,sBAAsB,CAACiB,wBAAwB;QAC9EZ,IAAIG,IAAI,CAACQ;IACX;AACF;MAGA,WAAeE,IAAAA,+BAAgB,EAACnB,2BAC7BoB,MAAM,CAACC,6BAAY,CAACC,QAAQ,GAAG,qBAC/BC,MAAM,CAAC;IAACC,IAAAA,0BAAY;CAAG,EACvBC,GAAG,CAAC,KAAK,QAAQC,IAAAA,4BAAc,EAACC,6BAAK,CAACC,eAAe,CAACC,IAAI,GAC1DJ,GAAG,CAAC,SAAS,QAAQC,IAAAA,4BAAc,EAACC,6BAAK,CAACC,eAAe,CAACC,IAAI,GAC9DJ,GAAG,CAAC,aAAa,YAAYC,IAAAA,4BAAc,EAACC,6BAAK,CAACC,eAAe,CAACC,IAAI,GACtEJ,GAAG,CAAC,mBAAmB,yBAAyBC,IAAAA,4BAAc,EAACC,6BAAK,CAACC,eAAe,CAACE,OAAO"}
1
+ {"version":3,"sources":["../../src/controllers/print-completion.controller.ts"],"names":["PrintCompletionController","printCompletionService","printCompletionSocketIoTask","constructor","test","req","res","result","loadPrintContexts","send","contexts","findCorrelatedEntries","correlationId","validateInput","params","findPrintCompletion","list","completions","listGroupByPrinterStatus","createController","prefix","AppConstants","apiRoute","before","authenticate","get","withPermission","PERMS","PrintCompletion","List","Default"],"mappings":";;;;;;;;;;;IASaA,yBAAyB;eAAzBA;;IAwCb,OAMkG;eANlG;;;8BAjD6C;+BACZ;iCACJ;wCACP;4BACQ;AAKvB,MAAMA;IACHC,uBAAgD;IAChDC,4BAAyD;IAEjEC,YAAY,EACVF,sBAAsB,EACtBC,2BAA2B,EAI5B,CAAE;QACD,IAAI,CAACD,sBAAsB,GAAGA;QAC9B,IAAI,CAACC,2BAA2B,GAAGA;IACrC;IAKA,MAAME,KAAKC,GAAY,EAAEC,GAAa,EAAE;QACtC,MAAMC,SAAS,MAAM,IAAI,CAACN,sBAAsB,CAACO,iBAAiB;QAClEF,IAAIG,IAAI,CAACF;IACX;IAEAG,SAASL,GAAY,EAAEC,GAAa,EAAE;QACpC,MAAMI,WAAW,IAAI,CAACR,2BAA2B,CAACQ,QAAQ;QAC1DJ,IAAIG,IAAI,CAACC;IACX;IAEA,MAAMC,sBAAsBN,GAAY,EAAEC,GAAa,EAAE;QACvD,MAAM,EAAEM,aAAa,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACR,IAAIS,MAAM,EAAE;YAAEF,eAAe;QAAkB;QAC7F,MAAML,SAAS,MAAM,IAAI,CAACN,sBAAsB,CAACc,mBAAmB,CAACH;QACrEN,IAAIG,IAAI,CAACF;IACX;IAEA,MAAMS,KAAKX,GAAY,EAAEC,GAAa,EAAE;QACtC,MAAMW,cAAc,MAAM,IAAI,CAAChB,sBAAsB,CAACiB,wBAAwB;QAC9EZ,IAAIG,IAAI,CAACQ;IACX;AACF;MAEA,WAAeE,IAAAA,+BAAgB,EAACnB,2BAC7BoB,MAAM,CAACC,6BAAY,CAACC,QAAQ,GAAG,qBAC/BC,MAAM,CAAC;IAACC,IAAAA,0BAAY;CAAG,EACvBC,GAAG,CAAC,KAAK,QAAQC,IAAAA,4BAAc,EAACC,6BAAK,CAACC,eAAe,CAACC,IAAI,GAC1DJ,GAAG,CAAC,SAAS,QAAQC,IAAAA,4BAAc,EAACC,6BAAK,CAACC,eAAe,CAACC,IAAI,GAC9DJ,GAAG,CAAC,aAAa,YAAYC,IAAAA,4BAAc,EAACC,6BAAK,CAACC,eAAe,CAACC,IAAI,GACtEJ,GAAG,CAAC,mBAAmB,yBAAyBC,IAAAA,4BAAc,EAACC,6BAAK,CAACC,eAAe,CAACE,OAAO"}
@@ -12,12 +12,10 @@ _export(exports, {
12
12
  PrinterFilesController: function() {
13
13
  return PrinterFilesController;
14
14
  },
15
- // prettier-ignore
16
15
  default: function() {
17
16
  return _default;
18
17
  }
19
18
  });
20
- const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
21
19
  const _awilixexpress = require("awilix-express");
22
20
  const _authenticate = require("../middleware/authenticate");
23
21
  const _validators = require("../handlers/validators");
@@ -27,26 +25,24 @@ const _batchcontrollervalidation = require("./validation/batch-controller.valida
27
25
  const _runtimeexceptions = require("../exceptions/runtime.exceptions");
28
26
  const _printer = require("../middleware/printer");
29
27
  const _authorizationconstants = require("../constants/authorization.constants");
30
- function _interop_require_default(obj) {
31
- return obj && obj.__esModule ? obj : {
32
- default: obj
33
- };
34
- }
28
+ const _nodefs = require("node:fs");
35
29
  class PrinterFilesController {
36
- filesStore;
30
+ printerFilesStore;
37
31
  settingsStore;
38
32
  octoPrintApiService;
39
33
  batchCallService;
40
34
  multerService;
41
35
  printerFileCleanTask;
42
36
  logger;
43
- constructor({ filesStore, octoPrintApiService, batchCallService, printerFileCleanTask, settingsStore, loggerFactory, multerService }){
44
- this.filesStore = filesStore;
37
+ isTypeormMode;
38
+ constructor({ printerFilesStore, octoPrintApiService, batchCallService, printerFileCleanTask, settingsStore, loggerFactory, multerService, isTypeormMode }){
39
+ this.printerFilesStore = printerFilesStore;
45
40
  this.settingsStore = settingsStore;
46
41
  this.printerFileCleanTask = printerFileCleanTask;
47
42
  this.octoPrintApiService = octoPrintApiService;
48
43
  this.batchCallService = batchCallService;
49
44
  this.multerService = multerService;
45
+ this.isTypeormMode = isTypeormMode;
50
46
  this.logger = loggerFactory(PrinterFilesController.name);
51
47
  }
52
48
  getTrackedUploads(req, res) {
@@ -57,14 +53,12 @@ class PrinterFilesController {
57
53
  const { currentPrinterId } = (0, _validators.getScopedPrinter)(req);
58
54
  const { recursive } = await (0, _validators.validateInput)(req.query, _printerfilescontrollervalidation.getFilesRules);
59
55
  this.logger.log("Refreshing file storage by eager load");
60
- const response = await this.filesStore.eagerLoadPrinterFiles(currentPrinterId, recursive);
56
+ const response = await this.printerFilesStore.eagerLoadPrinterFiles(currentPrinterId, recursive);
61
57
  this.statusResponse(res, response);
62
58
  }
63
- /**
64
- * When the printer host is not reachable or is disabled the cache is still accessible
65
- */ async getFilesCache(req, res) {
59
+ async getFilesCache(req, res) {
66
60
  const { currentPrinter } = (0, _validators.getScopedPrinter)(req);
67
- const filesCache = await this.filesStore.getFiles(currentPrinter.id);
61
+ const filesCache = await this.printerFilesStore.getFiles(currentPrinter.id);
68
62
  res.send(filesCache);
69
63
  }
70
64
  async clearPrinterFiles(req, res) {
@@ -80,42 +74,38 @@ class PrinterFilesController {
80
74
  failedFiles.push(file);
81
75
  }
82
76
  }
83
- await this.filesStore.purgePrinterFiles(currentPrinterId);
77
+ await this.printerFilesStore.purgePrinterFiles(currentPrinterId);
84
78
  res.send({
85
79
  failedFiles,
86
80
  succeededFiles
87
81
  });
88
82
  }
89
83
  async purgeIndexedFiles(req, res) {
90
- await this.filesStore.purgeFiles();
84
+ await this.printerFilesStore.purgeFiles();
91
85
  res.send();
92
86
  }
93
87
  async moveFileOrFolder(req, res) {
94
88
  const { printerLogin } = (0, _validators.getScopedPrinter)(req);
95
89
  const { filePath: path, destination } = await (0, _validators.validateMiddleware)(req, _printerfilescontrollervalidation.moveFileOrFolderRules);
96
90
  const result = await this.octoPrintApiService.moveFileOrFolder(printerLogin, path, destination);
97
- // TODO Update file storage
98
91
  res.send(result);
99
92
  }
100
93
  async createFolder(req, res) {
101
94
  const { printerLogin } = (0, _validators.getScopedPrinter)(req);
102
95
  const { path, foldername } = await (0, _validators.validateMiddleware)(req, _printerfilescontrollervalidation.createFolderRules);
103
96
  const result = await this.octoPrintApiService.createFolder(printerLogin, path, foldername);
104
- // TODO Update file storage
105
97
  res.send(result);
106
98
  }
107
99
  async deleteFileOrFolder(req, res) {
108
100
  const { currentPrinterId, printerLogin } = (0, _validators.getScopedPrinter)(req);
109
101
  const { path } = await (0, _validators.validateInput)(req.query, _printerfilescontrollervalidation.getFileRules);
110
102
  const result = await this.octoPrintApiService.deleteFileOrFolder(printerLogin, path);
111
- await this.filesStore.deleteFile(currentPrinterId, path, false);
103
+ await this.printerFilesStore.deleteFile(currentPrinterId, path, false);
112
104
  this.logger.log(`File reference removed, printerId ${currentPrinterId}`, path);
113
105
  res.send(result);
114
106
  }
115
- /**
116
- * @deprecated this API endpoint will be moved to /batch from BatchCallController in 1.6.0
117
- */ async batchReprintFiles(req, res) {
118
- const { printerIds } = await (0, _validators.validateInput)(req.body, _batchcontrollervalidation.batchPrinterRules);
107
+ async batchReprintFiles(req, res) {
108
+ const { printerIds } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.batchPrinterRules)(this.isTypeormMode));
119
109
  const results = await this.batchCallService.batchReprintCalls(printerIds);
120
110
  res.send(results);
121
111
  }
@@ -123,7 +113,7 @@ class PrinterFilesController {
123
113
  const { currentPrinterId, printerLogin } = (0, _validators.getScopedPrinter)(req);
124
114
  const { filePath: path, print } = await (0, _validators.validateInput)(req.body, _printerfilescontrollervalidation.selectAndPrintFileRules);
125
115
  const result = await this.octoPrintApiService.selectPrintFile(printerLogin, path, print);
126
- await this.filesStore.setExistingFileForPrint(currentPrinterId, path);
116
+ await this.printerFilesStore.setExistingFileForPrint(currentPrinterId, path);
127
117
  res.send(result);
128
118
  }
129
119
  async uploadFile(req, res) {
@@ -140,10 +130,8 @@ class PrinterFilesController {
140
130
  error: "Only 1 .gcode file can be uploaded at a time due to bandwidth restrictions"
141
131
  });
142
132
  }
143
- // Multer has processed the remaining multipart data into the body as json
144
133
  const { print, select } = await (0, _validators.validateInput)(req.body, _printerfilescontrollervalidation.fileUploadCommandsRules);
145
134
  const uploadedFile = files[0];
146
- // Perform specific file clean if configured
147
135
  const fileCleanEnabled = this.settingsStore.isPreUploadFileCleanEnabled();
148
136
  if (fileCleanEnabled) {
149
137
  await this.printerFileCleanTask.cleanPrinterFiles(currentPrinterId);
@@ -155,13 +143,11 @@ class PrinterFilesController {
155
143
  }, token);
156
144
  if (response.success !== false) {
157
145
  const newOrUpdatedFile = response.files.local;
158
- await this.filesStore.appendOrSetPrinterFile(currentPrinterId, newOrUpdatedFile);
146
+ await this.printerFilesStore.appendOrSetPrinterFile(currentPrinterId, newOrUpdatedFile);
159
147
  }
160
148
  res.send(response);
161
149
  }
162
- /**
163
- * This endpoint is not actively used. Its better to introduce a virtual file system (VFS) to be able to manage centralized uploads.
164
- */ async localUploadFile(req, res) {
150
+ async localUploadFile(req, res) {
165
151
  const { currentPrinterId, printerLogin } = (0, _validators.getScopedPrinter)(req);
166
152
  const { select, print, localLocation } = await (0, _validators.validateInput)(req.body, _printerfilescontrollervalidation.localFileUploadRules);
167
153
  if (!localLocation.endsWith(".gcode")) {
@@ -169,23 +155,22 @@ class PrinterFilesController {
169
155
  localLocation: "The indicated file extension did not match '.gcode'"
170
156
  });
171
157
  }
172
- if (!_fs.default.existsSync(localLocation)) {
158
+ if (!(0, _nodefs.existsSync)(localLocation)) {
173
159
  throw new _runtimeexceptions.NotFoundException("The indicated file was not found.");
174
160
  }
175
- if (_fs.default.lstatSync(localLocation).isDirectory()) {
161
+ if ((0, _nodefs.lstatSync)(localLocation).isDirectory()) {
176
162
  throw new _runtimeexceptions.ValidationException({
177
163
  localLocation: "The indicated file was not correctly found."
178
164
  });
179
165
  }
180
- const stream = _fs.default.createReadStream(localLocation);
166
+ const stream = (0, _nodefs.createReadStream)(localLocation);
181
167
  const response = await this.octoPrintApiService.uploadFileAsMultiPart(printerLogin, stream, {
182
168
  select,
183
169
  print
184
170
  });
185
- // TODO update file cache with files store
186
171
  if (response.success !== false) {
187
172
  const newOrUpdatedFile = response.files.local;
188
- await this.filesStore.appendOrSetPrinterFile(currentPrinterId, newOrUpdatedFile);
173
+ await this.printerFilesStore.appendOrSetPrinterFile(currentPrinterId, newOrUpdatedFile);
189
174
  }
190
175
  res.send(response);
191
176
  }
@@ -201,8 +186,6 @@ const _default = (0, _awilixexpress.createController)(PrinterFilesController).pr
201
186
  _authorizationconstants.ROLES.OPERATOR
202
187
  ]),
203
188
  (0, _printer.printerResolveMiddleware)()
204
- ]).post("/purge", "purgeIndexedFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Clear)).get("/tracked-uploads", "getTrackedUploads", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Upload))/**
205
- * @deprecated will be moved to /batch in 1.6.0
206
- */ .post("/batch/reprint-files", "batchReprintFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).get("/:id", "getFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Get)).get("/:id/cache", "getFilesCache", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Get)).post("/:id/local-upload", "localUploadFile", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Upload)).post("/:id/upload", "uploadFile", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Upload)).post("/:id/create-folder", "createFolder", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).post("/:id/select", "selectAndPrintFile", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).post("/:id/move", "moveFileOrFolder", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).delete("/:id", "deleteFileOrFolder", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Delete)).delete("/:id/clear", "clearPrinterFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Clear));
189
+ ]).post("/purge", "purgeIndexedFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Clear)).get("/tracked-uploads", "getTrackedUploads", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Upload)).post("/batch/reprint-files", "batchReprintFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).get("/:id", "getFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Get)).get("/:id/cache", "getFilesCache", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Get)).post("/:id/local-upload", "localUploadFile", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Upload)).post("/:id/upload", "uploadFile", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Upload)).post("/:id/create-folder", "createFolder", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).post("/:id/select", "selectAndPrintFile", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).post("/:id/move", "moveFileOrFolder", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).delete("/:id", "deleteFileOrFolder", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Delete)).delete("/:id/clear", "clearPrinterFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Clear));
207
190
 
208
191
  //# sourceMappingURL=printer-files.controller.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/controllers/printer-files.controller.ts"],"names":["PrinterFilesController","filesStore","settingsStore","octoPrintApiService","batchCallService","multerService","printerFileCleanTask","logger","constructor","loggerFactory","name","getTrackedUploads","req","res","sessions","getSessions","send","getFiles","currentPrinterId","getScopedPrinter","recursive","validateInput","query","getFilesRules","log","response","eagerLoadPrinterFiles","statusResponse","getFilesCache","currentPrinter","filesCache","id","clearPrinterFiles","printerLogin","nonRecursiveFiles","failedFiles","succeededFiles","file","files","deleteFileOrFolder","path","push","e","purgePrinterFiles","purgeIndexedFiles","purgeFiles","moveFileOrFolder","filePath","destination","validateMiddleware","moveFileOrFolderRules","result","createFolder","foldername","createFolderRules","getFileRules","deleteFile","batchReprintFiles","printerIds","body","batchPrinterRules","results","batchReprintCalls","selectAndPrintFile","print","selectAndPrintFileRules","selectPrintFile","setExistingFileForPrint","uploadFile","uploadFileRules","multerLoadFileAsync","length","ValidationException","error","select","fileUploadCommandsRules","uploadedFile","fileCleanEnabled","isPreUploadFileCleanEnabled","cleanPrinterFiles","token","startTrackingSession","uploadFileAsMultiPart","success","newOrUpdatedFile","local","appendOrSetPrinterFile","localUploadFile","localLocation","localFileUploadRules","endsWith","fs","existsSync","NotFoundException","lstatSync","isDirectory","stream","createReadStream","statusCode","status","data","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","printerResolveMiddleware","post","withPermission","PERMS","PrinterFiles","Clear","get","Upload","Actions","Get","delete","Delete"],"mappings":"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"}
1
+ {"version":3,"sources":["../../src/controllers/printer-files.controller.ts"],"names":["PrinterFilesController","printerFilesStore","settingsStore","octoPrintApiService","batchCallService","multerService","printerFileCleanTask","logger","isTypeormMode","constructor","loggerFactory","name","getTrackedUploads","req","res","sessions","getSessions","send","getFiles","currentPrinterId","getScopedPrinter","recursive","validateInput","query","getFilesRules","log","response","eagerLoadPrinterFiles","statusResponse","getFilesCache","currentPrinter","filesCache","id","clearPrinterFiles","printerLogin","nonRecursiveFiles","failedFiles","succeededFiles","file","files","deleteFileOrFolder","path","push","e","purgePrinterFiles","purgeIndexedFiles","purgeFiles","moveFileOrFolder","filePath","destination","validateMiddleware","moveFileOrFolderRules","result","createFolder","foldername","createFolderRules","getFileRules","deleteFile","batchReprintFiles","printerIds","body","batchPrinterRules","results","batchReprintCalls","selectAndPrintFile","print","selectAndPrintFileRules","selectPrintFile","setExistingFileForPrint","uploadFile","uploadFileRules","multerLoadFileAsync","length","ValidationException","error","select","fileUploadCommandsRules","uploadedFile","fileCleanEnabled","isPreUploadFileCleanEnabled","cleanPrinterFiles","token","startTrackingSession","uploadFileAsMultiPart","success","newOrUpdatedFile","local","appendOrSetPrinterFile","localUploadFile","localLocation","localFileUploadRules","endsWith","existsSync","NotFoundException","lstatSync","isDirectory","stream","createReadStream","statusCode","status","data","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","printerResolveMiddleware","post","withPermission","PERMS","PrinterFiles","Clear","get","Upload","Actions","Get","delete","Delete"],"mappings":"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"}
@@ -26,28 +26,30 @@ const _authorizationconstants = require("../constants/authorization.constants");
26
26
  class PrinterSettingsController {
27
27
  printerCache;
28
28
  octoPrintApiService;
29
- constructor({ printerCache, octoPrintApiService }){
29
+ isTypeormMode;
30
+ constructor({ printerCache, octoPrintApiService, isTypeormMode }){
30
31
  this.printerCache = printerCache;
31
32
  this.octoPrintApiService = octoPrintApiService;
33
+ this.isTypeormMode = isTypeormMode;
32
34
  }
33
35
  async get(req, res) {
34
- const { id: printerId } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
36
+ const { id: printerId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
35
37
  const loginDto = await this.printerCache.getLoginDtoAsync(printerId);
36
38
  const settings = await this.octoPrintApiService.getSettings(loginDto);
37
39
  res.send(settings);
38
40
  }
39
41
  async setGCodeAnalysis(req, res) {
40
- const { id: printerId } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
42
+ const { id: printerId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
41
43
  const { enabled } = await (0, _validators.validateMiddleware)(req, _printersettingscontrollervalidation.setGcodeAnalysis);
42
44
  const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
43
45
  const settings = await this.octoPrintApiService.setGCodeAnalysis(printerLogin, enabled);
44
46
  res.send(settings);
45
47
  }
46
48
  async syncPrinterName(req, res) {
47
- const { id: printerId } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
49
+ const { id: printerId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
48
50
  const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
49
- const printerName = await this.printerCache.getNameAsync(printerId);
50
- const settings = await this.octoPrintApiService.updatePrinterNameSetting(printerLogin, printerName);
51
+ const name = await this.printerCache.getNameAsync(printerId);
52
+ const settings = await this.octoPrintApiService.updatePrinterNameSetting(printerLogin, name);
51
53
  res.send(settings);
52
54
  }
53
55
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/controllers/printer-settings.controller.ts"],"names":["PrinterSettingsController","printerCache","octoPrintApiService","constructor","get","req","res","id","printerId","validateInput","params","idRules","loginDto","getLoginDtoAsync","settings","getSettings","send","setGCodeAnalysis","enabled","validateMiddleware","setGcodeAnalysis","printerLogin","syncPrinterName","printerName","getNameAsync","updatePrinterNameSetting","createController","prefix","AppConstants","apiRoute","before","authenticate","withPermission","PERMS","PrinterSettings","Get","post"],"mappings":";;;;;;;;;;;IAWaA,yBAAyB;eAAzBA;;IAoCb,OAKoD;eALpD;;;+BA/CiC;8BACY;4BACK;iCACrB;mCACL;qDACS;wCACX;AAKf,MAAMA;IACXC,aAA2B;IAC3BC,oBAAyC;IAEzCC,YAAY,EAAEF,YAAY,EAAEC,mBAAmB,EAA4E,CAAE;QAC3H,IAAI,CAACD,YAAY,GAAGA;QACpB,IAAI,CAACC,mBAAmB,GAAGA;IAC7B;IAEA,MAAME,IAAIC,GAAY,EAAEC,GAAa,EAAE;QACrC,MAAM,EAAEC,IAAIC,SAAS,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACJ,IAAIK,MAAM,EAAEC,0BAAO;QAEjE,MAAMC,WAAW,MAAM,IAAI,CAACX,YAAY,CAACY,gBAAgB,CAACL;QAC1D,MAAMM,WAAW,MAAM,IAAI,CAACZ,mBAAmB,CAACa,WAAW,CAACH;QAC5DN,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,0BAAO;QACjE,MAAM,EAAEO,OAAO,EAAE,GAAG,MAAMC,IAAAA,8BAAkB,EAACd,KAAKe,qDAAgB;QAElE,MAAMC,eAAe,MAAM,IAAI,CAACpB,YAAY,CAACY,gBAAgB,CAACL;QAC9D,MAAMM,WAAW,MAAM,IAAI,CAACZ,mBAAmB,CAACe,gBAAgB,CAACI,cAAcH;QAC/EZ,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,0BAAO;QAEjE,MAAMU,eAAe,MAAM,IAAI,CAACpB,YAAY,CAACY,gBAAgB,CAACL;QAC9D,MAAMe,cAAc,MAAM,IAAI,CAACtB,YAAY,CAACuB,YAAY,CAAChB;QACzD,MAAMM,WAAW,MAAM,IAAI,CAACZ,mBAAmB,CAACuB,wBAAwB,CAACJ,cAAcE;QACvFjB,IAAIU,IAAI,CAACF;IACX;AACF;MAEA,WAAeY,IAAAA,+BAAgB,EAAC1B,2BAC7B2B,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","octoPrintApiService","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,oBAAyC;IACzCC,cAAuB;IAEvBC,YAAY,EACVH,YAAY,EACZC,mBAAmB,EACnBC,aAAa,EAKd,CAAE;QACD,IAAI,CAACF,YAAY,GAAGA;QACpB,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,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,mBAAmB,CAACc,WAAW,CAACH;QAC5DN,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,mBAAmB,CAACgB,gBAAgB,CAACI,cAAcH;QAC/EZ,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,mBAAmB,CAACwB,wBAAwB,CAACJ,cAAcE;QACvFjB,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"}
@@ -12,7 +12,6 @@ _export(exports, {
12
12
  PrinterController: function() {
13
13
  return PrinterController;
14
14
  },
15
- // prettier-ignore
16
15
  default: function() {
17
16
  return _default;
18
17
  }
@@ -23,7 +22,6 @@ const _authenticate = require("../middleware/authenticate");
23
22
  const _validators = require("../handlers/validators");
24
23
  const _printercontrollervalidation = require("./validation/printer-controller.validation");
25
24
  const _serverconstants = require("../server.constants");
26
- const _serviceconstants = require("../constants/service.constants");
27
25
  const _printer = require("../middleware/printer");
28
26
  const _correlationtokenutil = require("../utils/correlation-token.util");
29
27
  const _authorizationconstants = require("../constants/authorization.constants");
@@ -59,7 +57,6 @@ class PrinterController {
59
57
  }
60
58
  async listPrinterFloors(req, res) {
61
59
  const { currentPrinterId } = (0, _validators.getScopedPrinter)(req);
62
- // TODO move to service?
63
60
  const results = await _models.Floor.find({
64
61
  "printers.printerId": currentPrinterId
65
62
  });
@@ -101,25 +98,19 @@ class PrinterController {
101
98
  await this.octoPrintApiService.sendConnectionCommand(printerLogin, command);
102
99
  res.send({});
103
100
  }
104
- /**
105
- * Pauses the current job
106
- */ async pausePrintJob(req, res) {
101
+ async pausePrintJob(req, res) {
107
102
  const { printerLogin } = (0, _validators.getScopedPrinter)(req);
108
103
  const command = this.octoPrintApiService.pauseJobCommand;
109
104
  await this.octoPrintApiService.sendJobCommand(printerLogin, command);
110
105
  res.send({});
111
106
  }
112
- /**
113
- * Pauses the current job
114
- */ async resumePrintJob(req, res) {
107
+ async resumePrintJob(req, res) {
115
108
  const { printerLogin } = (0, _validators.getScopedPrinter)(req);
116
109
  const command = this.octoPrintApiService.resumeJobCommand;
117
110
  await this.octoPrintApiService.sendJobCommand(printerLogin, command);
118
111
  res.send({});
119
112
  }
120
- /**
121
- * Cancels the current job irrespective of file
122
- */ async stopPrintJob(req, res) {
113
+ async stopPrintJob(req, res) {
123
114
  const { printerLogin } = (0, _validators.getScopedPrinter)(req);
124
115
  const command = this.octoPrintApiService.cancelJobCommand;
125
116
  await this.octoPrintApiService.sendJobCommand(printerLogin, command);
@@ -127,8 +118,6 @@ class PrinterController {
127
118
  }
128
119
  async create(req, res) {
129
120
  let newPrinter = req.body;
130
- newPrinter = this.#adjustPrinterObject(newPrinter);
131
- // Has internal validation, but might add some here above as well
132
121
  const createdPrinter = await this.printerService.create(newPrinter);
133
122
  const printer = await this.printerCache.getCachedPrinterOrThrowAsync(createdPrinter.id);
134
123
  this.logger.log(`Created printer with ID ${printer.id || printer.correlationToken}`);
@@ -144,19 +133,14 @@ class PrinterController {
144
133
  await this.floorStore.removePrinterFromAnyFloor(currentPrinterId);
145
134
  res.send(result);
146
135
  }
147
- /**
148
- * Update the printer entity, does not adjust everything
149
- */ async update(req, res) {
136
+ async update(req, res) {
150
137
  const { currentPrinterId } = (0, _validators.getScopedPrinter)(req);
151
138
  let updatedPrinter = req.body;
152
- updatedPrinter = this.#adjustPrinterObject(updatedPrinter);
153
139
  await this.printerService.update(currentPrinterId, updatedPrinter);
154
140
  const result = await this.printerCache.getCachedPrinterOrThrowAsync(currentPrinterId);
155
141
  res.send(result);
156
142
  }
157
- /**
158
- * Update the printer network connection settings like URL or apiKey - nothing else
159
- */ async updateConnectionSettings(req, res) {
143
+ async updateConnectionSettings(req, res) {
160
144
  const { currentPrinterId } = (0, _validators.getScopedPrinter)(req);
161
145
  const inputData = await (0, _validators.validateMiddleware)(req, _printercontrollervalidation.updatePrinterConnectionSettingRules);
162
146
  const newEntity = await this.printerService.updateConnectionSettings(currentPrinterId, inputData);
@@ -191,15 +175,11 @@ class PrinterController {
191
175
  await this.printerService.updateFlowRate(currentPrinterId, data.flowRate);
192
176
  res.send({});
193
177
  }
194
- /**
195
- * This list should move to generic controller
196
- */ async getPluginList(req, res) {
178
+ async getPluginList(req, res) {
197
179
  let pluginList = await this.pluginRepositoryCache.getCache();
198
180
  res.send(pluginList);
199
181
  }
200
- /**
201
- * List installed plugins (OP 1.6.0+)
202
- */ async getPrinterPluginList(req, res) {
182
+ async getPrinterPluginList(req, res) {
203
183
  const { printerLogin } = (0, _validators.getScopedPrinter)(req);
204
184
  let pluginList = await this.octoPrintApiService.getPluginManagerPlugins(printerLogin);
205
185
  res.send(pluginList);
@@ -211,7 +191,6 @@ class PrinterController {
211
191
  const newPrinter = await (0, _validators.validateMiddleware)(req, _printercontrollervalidation.testPrinterApiRules);
212
192
  newPrinter.correlationToken = (0, _correlationtokenutil.generateCorrelationToken)();
213
193
  this.logger.log(`Testing printer with correlation token ${newPrinter.correlationToken}`);
214
- // Add printer with test=true
215
194
  try {
216
195
  await this.testPrinterSocketStore.setupTestPrinter(newPrinter);
217
196
  } catch (e) {
@@ -265,15 +244,6 @@ class PrinterController {
265
244
  const response = await this.octoPrintApiService.deleteBackup(printerLogin, fileName);
266
245
  res.send(response);
267
246
  }
268
- #adjustPrinterObject(printer) {
269
- // TODO move to service
270
- printer.settingsAppearance = (0, _serviceconstants.getSettingsAppearanceDefault)();
271
- if (printer.printerName) {
272
- printer.settingsAppearance.name = printer.printerName;
273
- delete printer.printerName;
274
- }
275
- return printer;
276
- }
277
247
  }
278
248
  const _default = (0, _awilixexpress.createController)(PrinterController).prefix(_serverconstants.AppConstants.apiRoute + "/printer").before([
279
249
  (0, _authenticate.authenticate)(),
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/controllers/printer.controller.ts"],"names":["PrinterController","printerSocketStore","testPrinterSocketStore","printerService","printerCache","printerEventsCache","taskManagerService","octoPrintApiService","pluginRepositoryCache","floorStore","multerService","logger","constructor","loggerFactory","name","list","req","res","printers","listCachedPrinters","send","listPrinterFloors","currentPrinterId","getScopedPrinter","results","Floor","find","getPrinter","foundPrinter","getCachedPrinterOrThrowAsync","getPrinterSocketInfo","getPrinterSocketEvents","getPrinterLoginDetails","printerLogin","octoPrintListCommands","commands","getSystemCommands","octoPrintSystemRestart","result","postSystemRestartCommand","sendSerialConnectCommand","command","connectCommand","sendConnectionCommand","sendSerialDisconnectCommand","disconnectCommand","pausePrintJob","pauseJobCommand","sendJobCommand","resumePrintJob","resumeJobCommand","stopPrintJob","cancelJobCommand","create","newPrinter","body","adjustPrinterObject","createdPrinter","printer","id","log","correlationToken","importBatch","importResult","batchImport","delete","removePrinterFromAnyFloor","update","updatedPrinter","updateConnectionSettings","inputData","validateMiddleware","updatePrinterConnectionSettingRules","newEntity","printerURL","apiKey","updateEnabled","data","updatePrinterEnabledRule","JSON","stringify","enabled","updatePrinterDisabledReason","updatePrinterDisabledReasonRules","updateDisabledReason","disabledReason","setFeedRate","feedRateRules","updateFeedRate","feedRate","setFlowRate","flowRateRules","updateFlowRate","flowRate","getPluginList","pluginList","getCache","getPrinterPluginList","getPluginManagerPlugins","testConnection","length","normalizeURLWithProtocol","testPrinterApiRules","generateCorrelationToken","setupTestPrinter","e","failure","error","toString","refreshPrinterSocket","reconnectOctoPrint","getOctoPrintBackupOverview","backupOverview","getBackupOverview","listOctoPrintBackups","getBackups","createOctoPrintBackup","exclude","createOctoPrintBackupRules","response","createBackup","downloadOctoPrintBackup","fileName","getOctoPrintBackupRules","dataStream","getDownloadBackupStream","pipe","restoreOctoPrintBackup","files","multerLoadFileAsync","forwardRestoreBackupFileStream","buffer","deleteOctoPrintBackup","deleteBackup","settingsAppearance","getSettingsAppearanceDefault","printerName","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware","get","post","patch"],"mappings":"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"}
1
+ {"version":3,"sources":["../../src/controllers/printer.controller.ts"],"names":["PrinterController","printerSocketStore","testPrinterSocketStore","printerService","printerCache","printerEventsCache","taskManagerService","octoPrintApiService","pluginRepositoryCache","floorStore","multerService","logger","constructor","loggerFactory","name","list","req","res","printers","listCachedPrinters","send","listPrinterFloors","currentPrinterId","getScopedPrinter","results","Floor","find","getPrinter","foundPrinter","getCachedPrinterOrThrowAsync","getPrinterSocketInfo","getPrinterSocketEvents","getPrinterLoginDetails","printerLogin","octoPrintListCommands","commands","getSystemCommands","octoPrintSystemRestart","result","postSystemRestartCommand","sendSerialConnectCommand","command","connectCommand","sendConnectionCommand","sendSerialDisconnectCommand","disconnectCommand","pausePrintJob","pauseJobCommand","sendJobCommand","resumePrintJob","resumeJobCommand","stopPrintJob","cancelJobCommand","create","newPrinter","body","createdPrinter","printer","id","log","correlationToken","importBatch","importResult","batchImport","delete","removePrinterFromAnyFloor","update","updatedPrinter","updateConnectionSettings","inputData","validateMiddleware","updatePrinterConnectionSettingRules","newEntity","printerURL","apiKey","updateEnabled","data","updatePrinterEnabledRule","JSON","stringify","enabled","updatePrinterDisabledReason","updatePrinterDisabledReasonRules","updateDisabledReason","disabledReason","setFeedRate","feedRateRules","updateFeedRate","feedRate","setFlowRate","flowRateRules","updateFlowRate","flowRate","getPluginList","pluginList","getCache","getPrinterPluginList","getPluginManagerPlugins","testConnection","length","normalizeURLWithProtocol","testPrinterApiRules","generateCorrelationToken","setupTestPrinter","e","failure","error","toString","refreshPrinterSocket","reconnectOctoPrint","getOctoPrintBackupOverview","backupOverview","getBackupOverview","listOctoPrintBackups","getBackups","createOctoPrintBackup","exclude","createOctoPrintBackupRules","response","createBackup","downloadOctoPrintBackup","fileName","getOctoPrintBackupRules","dataStream","getDownloadBackupStream","pipe","restoreOctoPrintBackup","files","multerLoadFileAsync","forwardRestoreBackupFileStream","buffer","deleteOctoPrintBackup","deleteBackup","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware","get","post","patch"],"mappings":"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"}
@@ -12,7 +12,6 @@ _export(exports, {
12
12
  ServerPrivateController: function() {
13
13
  return ServerPrivateController;
14
14
  },
15
- // prettier-ignore
16
15
  default: function() {
17
16
  return _default;
18
17
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/controllers/server-private.controller.ts"],"names":["ServerPrivateController","clientBundleService","printerCache","printerService","printerSocketStore","yamlService","multerService","logDumpService","logger","Logger","name","serverUpdateService","serverReleaseService","constructor","getClientReleases","req","res","releaseSpec","getReleases","send","updateClientBundleGithub","inputRules","tag_name","validateMiddleware","downloadClientUpdate","executed","installed","getReleaseStateInfo","syncLatestRelease","updateState","getState","pullGitUpdates","result","checkGitUpdates","restartServer","isTestEnvironment","warn","importPrintersAndFloorsYaml","files","multerLoadFileAsync","firstFile","spec","importPrintersAndFloors","buffer","toString","success","exportPrintersAndFloorsYaml","yaml","exportPrintersAndFloors","body","fileContents","Buffer","from","readStream","PassThrough","end","fileName","AppConstants","serverRepoName","Date","now","set","pipe","deleteAllPrinters","printers","listCachedPrinters","printerIds","map","p","id","deleteMany","clearLogs","counts","deleteOlderThanWeekAndMismatchingLogFiles","dumpLogZips","filePath","dumpZip","sendFile","createController","prefix","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","get","post","delete"],"mappings":"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"}
1
+ {"version":3,"sources":["../../src/controllers/server-private.controller.ts"],"names":["ServerPrivateController","clientBundleService","printerCache","printerService","printerSocketStore","yamlService","multerService","logDumpService","logger","Logger","name","serverUpdateService","serverReleaseService","constructor","getClientReleases","req","res","releaseSpec","getReleases","send","updateClientBundleGithub","inputRules","tag_name","validateMiddleware","downloadClientUpdate","executed","installed","getReleaseStateInfo","syncLatestRelease","updateState","getState","pullGitUpdates","result","checkGitUpdates","restartServer","isTestEnvironment","warn","importPrintersAndFloorsYaml","files","multerLoadFileAsync","firstFile","spec","importPrintersAndFloors","buffer","toString","success","exportPrintersAndFloorsYaml","yaml","exportPrintersAndFloors","body","fileContents","Buffer","from","readStream","PassThrough","end","fileName","AppConstants","serverRepoName","Date","now","set","pipe","deleteAllPrinters","printers","listCachedPrinters","printerIds","map","p","id","deleteMany","clearLogs","counts","deleteOlderThanWeekAndMismatchingLogFiles","dumpLogZips","filePath","dumpZip","sendFile","createController","prefix","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","get","post","delete"],"mappings":"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"}
@@ -54,7 +54,6 @@ class ServerPublicController {
54
54
  res.send({
55
55
  batchReprintCalls: {
56
56
  available: true,
57
- // API duplicated at /batch/reprint (deprecated but backwards compatible)
58
57
  version: 2
59
58
  },
60
59
  batchConnectSocketCalls: {