@fdm-monster/server 1.8.3 → 1.9.0-rc1

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 (439) hide show
  1. package/.env.template +5 -3
  2. package/.gitattributes +4 -2
  3. package/.yarn/install-state.gz +0 -0
  4. package/.yarn/releases/yarn-4.9.1.cjs +948 -0
  5. package/.yarnrc.yml +1 -1
  6. package/README.md +25 -26
  7. package/RELEASE_NOTES.MD +50 -1
  8. package/biome.json +33 -0
  9. package/dist/consoles/download-github-releases.js.map +1 -1
  10. package/dist/consoles/launch-http-servers.js +31 -0
  11. package/dist/consoles/launch-http-servers.js.map +1 -0
  12. package/dist/consoles/mock-octoprint.server.js +291 -0
  13. package/dist/consoles/mock-octoprint.server.js.map +1 -0
  14. package/dist/consoles/mock-prusalink.server.js +57 -0
  15. package/dist/consoles/mock-prusalink.server.js.map +1 -0
  16. package/dist/consoles/utils/api-messages.js +856 -0
  17. package/dist/consoles/utils/api-messages.js.map +1 -0
  18. package/dist/consoles/utils/delayed-memory.storage.js +42 -0
  19. package/dist/consoles/utils/delayed-memory.storage.js.map +1 -0
  20. package/dist/consoles/utils/ws-messages.js +88 -0
  21. package/dist/consoles/utils/ws-messages.js.map +1 -0
  22. package/dist/constants/event.constants.js +5 -21
  23. package/dist/constants/event.constants.js.map +1 -1
  24. package/dist/constants/server-settings.constants.js +6 -11
  25. package/dist/constants/server-settings.constants.js.map +1 -1
  26. package/dist/container.js +13 -14
  27. package/dist/container.js.map +1 -1
  28. package/dist/container.tokens.js +3 -4
  29. package/dist/container.tokens.js.map +1 -1
  30. package/dist/controllers/auth.controller.js +114 -24
  31. package/dist/controllers/auth.controller.js.map +1 -1
  32. package/dist/controllers/batch-call.controller.js +95 -24
  33. package/dist/controllers/batch-call.controller.js.map +1 -1
  34. package/dist/controllers/camera-stream.controller.js +16 -12
  35. package/dist/controllers/camera-stream.controller.js.map +1 -1
  36. package/dist/controllers/custom-gcode.controller.js +116 -40
  37. package/dist/controllers/custom-gcode.controller.js.map +1 -1
  38. package/dist/controllers/dto/update-client-dist.dto.js +0 -21
  39. package/dist/controllers/dto/update-client-dist.dto.js.map +1 -1
  40. package/dist/controllers/first-time-setup.controller.js +54 -18
  41. package/dist/controllers/first-time-setup.controller.js.map +1 -1
  42. package/dist/controllers/floor.controller.js +154 -43
  43. package/dist/controllers/floor.controller.js.map +1 -1
  44. package/dist/controllers/metrics.controller.js +56 -0
  45. package/dist/controllers/metrics.controller.js.map +1 -0
  46. package/dist/controllers/print-completion.controller.js +81 -18
  47. package/dist/controllers/print-completion.controller.js.map +1 -1
  48. package/dist/controllers/printer-files.controller.js +42 -28
  49. package/dist/controllers/printer-files.controller.js.map +1 -1
  50. package/dist/controllers/printer-group.controller.js +123 -33
  51. package/dist/controllers/printer-group.controller.js.map +1 -1
  52. package/dist/controllers/printer-settings.controller.js +73 -26
  53. package/dist/controllers/printer-settings.controller.js.map +1 -1
  54. package/dist/controllers/printer.controller.js +57 -198
  55. package/dist/controllers/printer.controller.js.map +1 -1
  56. package/dist/controllers/server-private.controller.js +153 -39
  57. package/dist/controllers/server-private.controller.js.map +1 -1
  58. package/dist/controllers/server-public.controller.js +79 -84
  59. package/dist/controllers/server-public.controller.js.map +1 -1
  60. package/dist/controllers/settings.controller.js +222 -79
  61. package/dist/controllers/settings.controller.js.map +1 -1
  62. package/dist/controllers/user.controller.js +67 -57
  63. package/dist/controllers/user.controller.js.map +1 -1
  64. package/dist/controllers/validation/auth-controller.validation.js +6 -5
  65. package/dist/controllers/validation/auth-controller.validation.js.map +1 -1
  66. package/dist/controllers/validation/batch-controller.validation.js +17 -18
  67. package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
  68. package/dist/controllers/validation/generic.validation.js +8 -3
  69. package/dist/controllers/validation/generic.validation.js.map +1 -1
  70. package/dist/controllers/validation/printer-completion-controller.validation.js +16 -0
  71. package/dist/controllers/validation/printer-completion-controller.validation.js.map +1 -0
  72. package/dist/controllers/validation/printer-controller.validation.js +31 -50
  73. package/dist/controllers/validation/printer-controller.validation.js.map +1 -1
  74. package/dist/controllers/validation/printer-files-controller.validation.js +16 -15
  75. package/dist/controllers/validation/printer-files-controller.validation.js.map +1 -1
  76. package/dist/controllers/validation/printer-settings-controller.validation.js +6 -5
  77. package/dist/controllers/validation/printer-settings-controller.validation.js.map +1 -1
  78. package/dist/controllers/validation/server-private.validation.js +17 -0
  79. package/dist/controllers/validation/server-private.validation.js.map +1 -0
  80. package/dist/controllers/validation/setting.validation.js +28 -10
  81. package/dist/controllers/validation/setting.validation.js.map +1 -1
  82. package/dist/controllers/validation/user-controller.validation.js +44 -13
  83. package/dist/controllers/validation/user-controller.validation.js.map +1 -1
  84. package/dist/data-source.js +10 -6
  85. package/dist/data-source.js.map +1 -1
  86. package/dist/entities/camera-stream.entity.js +2 -3
  87. package/dist/entities/camera-stream.entity.js.map +1 -1
  88. package/dist/entities/custom-gcode.entity.js +1 -2
  89. package/dist/entities/custom-gcode.entity.js.map +1 -1
  90. package/dist/entities/floor-position.entity.js.map +1 -1
  91. package/dist/entities/floor.entity.js +1 -2
  92. package/dist/entities/floor.entity.js.map +1 -1
  93. package/dist/entities/group.entity.js +6 -2
  94. package/dist/entities/group.entity.js.map +1 -1
  95. package/dist/entities/permission.entity.js +1 -2
  96. package/dist/entities/permission.entity.js.map +1 -1
  97. package/dist/entities/print-completion.entity.js +1 -2
  98. package/dist/entities/print-completion.entity.js.map +1 -1
  99. package/dist/entities/printer-group.entity.js +6 -2
  100. package/dist/entities/printer-group.entity.js.map +1 -1
  101. package/dist/entities/printer.entity.js +22 -4
  102. package/dist/entities/printer.entity.js.map +1 -1
  103. package/dist/entities/refresh-token.entity.js +1 -2
  104. package/dist/entities/refresh-token.entity.js.map +1 -1
  105. package/dist/entities/role.entity.js +1 -2
  106. package/dist/entities/role.entity.js.map +1 -1
  107. package/dist/entities/settings.entity.js +1 -2
  108. package/dist/entities/settings.entity.js.map +1 -1
  109. package/dist/entities/user-role.entity.js +1 -2
  110. package/dist/entities/user-role.entity.js.map +1 -1
  111. package/dist/entities/user.entity.js +1 -2
  112. package/dist/entities/user.entity.js.map +1 -1
  113. package/dist/exceptions/runtime.exceptions.js.map +1 -1
  114. package/dist/handlers/logger.js +131 -36
  115. package/dist/handlers/logger.js.map +1 -1
  116. package/dist/handlers/validators.js +7 -116
  117. package/dist/handlers/validators.js.map +1 -1
  118. package/dist/index.js.map +1 -1
  119. package/dist/middleware/authenticate.js +11 -22
  120. package/dist/middleware/authenticate.js.map +1 -1
  121. package/dist/middleware/database.js.map +1 -1
  122. package/dist/middleware/demo.middleware.js +4 -17
  123. package/dist/middleware/demo.middleware.js.map +1 -1
  124. package/dist/middleware/exception.filter.js +23 -23
  125. package/dist/middleware/exception.filter.js.map +1 -1
  126. package/dist/middleware/global.middleware.js +4 -4
  127. package/dist/middleware/global.middleware.js.map +1 -1
  128. package/dist/middleware/param-converter.middleware.js +81 -0
  129. package/dist/middleware/param-converter.middleware.js.map +1 -0
  130. package/dist/middleware/passport.js +3 -5
  131. package/dist/middleware/passport.js.map +1 -1
  132. package/dist/middleware/printer-resolver.js +37 -0
  133. package/dist/middleware/printer-resolver.js.map +1 -0
  134. package/dist/middleware/printer.js +22 -10
  135. package/dist/middleware/printer.js.map +1 -1
  136. package/dist/middleware/socketio.middleware.js +27 -0
  137. package/dist/middleware/socketio.middleware.js.map +1 -0
  138. package/dist/migrations/1706829146617-InitSqlite.js +1 -1
  139. package/dist/migrations/1706829146617-InitSqlite.js.map +1 -1
  140. package/dist/migrations/1707494762198-PrinterGroup.js +1 -1
  141. package/dist/migrations/1707494762198-PrinterGroup.js.map +1 -1
  142. package/dist/migrations/1708465930665-ChangePrintCompletionDeletePrinterCascade.js +1 -1
  143. package/dist/migrations/1708465930665-ChangePrintCompletionDeletePrinterCascade.js.map +1 -1
  144. package/dist/migrations/1713897879622-AddPrinterType.js +1 -1
  145. package/dist/migrations/1713897879622-AddPrinterType.js.map +1 -1
  146. package/dist/migrations/1745141688926-AddPrinterUsernamePassword.js +229 -0
  147. package/dist/migrations/1745141688926-AddPrinterUsernamePassword.js.map +1 -0
  148. package/dist/models/Auth/Permission.js.map +1 -1
  149. package/dist/models/Auth/RefreshToken.js +1 -1
  150. package/dist/models/Auth/RefreshToken.js.map +1 -1
  151. package/dist/models/Auth/Role.js.map +1 -1
  152. package/dist/models/Auth/User.js.map +1 -1
  153. package/dist/models/CameraStream.js +20 -0
  154. package/dist/models/CameraStream.js.map +1 -1
  155. package/dist/models/CustomGcode.js.map +1 -1
  156. package/dist/models/Floor.js.map +1 -1
  157. package/dist/models/FloorPrinter.js +10 -1
  158. package/dist/models/FloorPrinter.js.map +1 -1
  159. package/dist/models/PrintCompletion.js.map +1 -1
  160. package/dist/models/Printer.js +12 -5
  161. package/dist/models/Printer.js.map +1 -1
  162. package/dist/models/Settings.js +5 -42
  163. package/dist/models/Settings.js.map +1 -1
  164. package/dist/models/index.js +0 -4
  165. package/dist/models/index.js.map +1 -1
  166. package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js.map +1 -1
  167. package/dist/mongo-migrations/20210907173950-printers-enabled.js.map +1 -1
  168. package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js.map +1 -1
  169. package/dist/mongo-migrations/20230414141005-floor-remove-groupinfloor.js.map +1 -1
  170. package/dist/mongo-migrations/20230427202911-printer-remove-sortindex.js.map +1 -1
  171. package/dist/mongo-migrations/20230716065316-user-remove-name.js.map +1 -1
  172. package/dist/mongo-migrations/20231111081809-printer-flatten-name.js.map +1 -1
  173. package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js.map +1 -1
  174. package/dist/mongo-migrations/20231202183902-printer-files-simpler.js.map +1 -1
  175. package/dist/server.constants.js +7 -4
  176. package/dist/server.constants.js.map +1 -1
  177. package/dist/server.core.js +29 -2
  178. package/dist/server.core.js.map +1 -1
  179. package/dist/server.env.js +13 -8
  180. package/dist/server.env.js.map +1 -1
  181. package/dist/server.host.js +24 -33
  182. package/dist/server.host.js.map +1 -1
  183. package/dist/services/authentication/auth.service.js +15 -20
  184. package/dist/services/authentication/auth.service.js.map +1 -1
  185. package/dist/services/authentication/jwt.service.js +1 -1
  186. package/dist/services/authentication/jwt.service.js.map +1 -1
  187. package/dist/services/core/batch-call.service.js +23 -25
  188. package/dist/services/core/batch-call.service.js.map +1 -1
  189. package/dist/services/core/client-bundle.service.js +78 -136
  190. package/dist/services/core/client-bundle.service.js.map +1 -1
  191. package/dist/services/core/config.service.js.map +1 -1
  192. package/dist/services/core/cradle.service.js +21 -0
  193. package/dist/services/core/cradle.service.js.map +1 -0
  194. package/dist/services/core/github.service.js +2 -2
  195. package/dist/services/core/github.service.js.map +1 -1
  196. package/dist/services/core/http-client.factory.js +1 -1
  197. package/dist/services/core/http-client.factory.js.map +1 -1
  198. package/dist/services/core/logs-manager.service.js +3 -3
  199. package/dist/services/core/logs-manager.service.js.map +1 -1
  200. package/dist/services/core/monsterpi.service.js +1 -1
  201. package/dist/services/core/monsterpi.service.js.map +1 -1
  202. package/dist/services/core/multer.service.js +8 -7
  203. package/dist/services/core/multer.service.js.map +1 -1
  204. package/dist/services/core/server-release.service.js +14 -8
  205. package/dist/services/core/server-release.service.js.map +1 -1
  206. package/dist/services/core/yaml.service.js +16 -17
  207. package/dist/services/core/yaml.service.js.map +1 -1
  208. package/dist/services/interfaces/camera-stream.dto.js +4 -34
  209. package/dist/services/interfaces/camera-stream.dto.js.map +1 -1
  210. package/dist/services/interfaces/custom-gcode.dto.js.map +1 -1
  211. package/dist/services/interfaces/floor.dto.js +5 -47
  212. package/dist/services/interfaces/floor.dto.js.map +1 -1
  213. package/dist/services/interfaces/login.dto.js +2 -0
  214. package/dist/services/interfaces/login.dto.js.map +1 -1
  215. package/dist/services/interfaces/print-completion.dto.js.map +1 -1
  216. package/dist/services/interfaces/printer-group.dto.js +0 -14
  217. package/dist/services/interfaces/printer-group.dto.js.map +1 -1
  218. package/dist/services/interfaces/printer.dto.js +11 -11
  219. package/dist/services/interfaces/printer.dto.js.map +1 -1
  220. package/dist/services/interfaces/settings.dto.js.map +1 -1
  221. package/dist/services/interfaces/task.interfaces.js +6 -0
  222. package/dist/services/interfaces/task.interfaces.js.map +1 -0
  223. package/dist/services/mongoose/camera-stream.service.js +17 -15
  224. package/dist/services/mongoose/camera-stream.service.js.map +1 -1
  225. package/dist/services/mongoose/custom-gcode.service.js +4 -2
  226. package/dist/services/mongoose/custom-gcode.service.js.map +1 -1
  227. package/dist/services/mongoose/floor.service.js +37 -30
  228. package/dist/services/mongoose/floor.service.js.map +1 -1
  229. package/dist/services/mongoose/permission.service.js +1 -1
  230. package/dist/services/mongoose/permission.service.js.map +1 -1
  231. package/dist/services/mongoose/print-completion.service.js +2 -2
  232. package/dist/services/mongoose/print-completion.service.js.map +1 -1
  233. package/dist/services/mongoose/print-completion.shared.js +2 -2
  234. package/dist/services/mongoose/print-completion.shared.js.map +1 -1
  235. package/dist/services/mongoose/printer.service.js +33 -45
  236. package/dist/services/mongoose/printer.service.js.map +1 -1
  237. package/dist/services/mongoose/refresh-token.service.js +5 -8
  238. package/dist/services/mongoose/refresh-token.service.js.map +1 -1
  239. package/dist/services/mongoose/role.service.js +14 -5
  240. package/dist/services/mongoose/role.service.js.map +1 -1
  241. package/dist/services/mongoose/settings.service.js +35 -62
  242. package/dist/services/mongoose/settings.service.js.map +1 -1
  243. package/dist/services/mongoose/user.service.js +8 -7
  244. package/dist/services/mongoose/user.service.js.map +1 -1
  245. package/dist/services/moonraker/constants/{websocket.constants.js → moonraker.constants.js} +1 -1
  246. package/dist/services/moonraker/constants/{websocket.constants.js.map → moonraker.constants.js.map} +1 -1
  247. package/dist/services/moonraker/moonraker-websocket.adapter.js +102 -94
  248. package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
  249. package/dist/services/moonraker/moonraker.client.js +19 -14
  250. package/dist/services/moonraker/moonraker.client.js.map +1 -1
  251. package/dist/services/moonraker.api.js +3 -5
  252. package/dist/services/moonraker.api.js.map +1 -1
  253. package/dist/services/octoprint/constants/octoprint-service.constants.js +7 -36
  254. package/dist/services/octoprint/constants/octoprint-service.constants.js.map +1 -1
  255. package/dist/services/octoprint/constants/octoprint-websocket.constants.js +12 -3
  256. package/dist/services/octoprint/constants/octoprint-websocket.constants.js.map +1 -1
  257. package/dist/services/octoprint/dto/octoprint-event.dto.js +2 -1
  258. package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -1
  259. package/dist/services/octoprint/octoprint-api.routes.js +0 -37
  260. package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
  261. package/dist/services/octoprint/octoprint-websocket.adapter.js +66 -72
  262. package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -1
  263. package/dist/services/octoprint/octoprint.client.js +12 -185
  264. package/dist/services/octoprint/octoprint.client.js.map +1 -1
  265. package/dist/services/octoprint/utils/octoprint-http-client.builder.js.map +1 -1
  266. package/dist/services/octoprint.api.js +8 -14
  267. package/dist/services/octoprint.api.js.map +1 -1
  268. package/dist/services/orm/base.service.js +11 -12
  269. package/dist/services/orm/base.service.js.map +1 -1
  270. package/dist/services/orm/camera-stream.service.js +5 -1
  271. package/dist/services/orm/camera-stream.service.js.map +1 -1
  272. package/dist/services/orm/custom-gcode.service.js +2 -2
  273. package/dist/services/orm/custom-gcode.service.js.map +1 -1
  274. package/dist/services/orm/floor-position.service.js +0 -5
  275. package/dist/services/orm/floor-position.service.js.map +1 -1
  276. package/dist/services/orm/floor.service.js +43 -39
  277. package/dist/services/orm/floor.service.js.map +1 -1
  278. package/dist/services/orm/permission.service.js +3 -4
  279. package/dist/services/orm/permission.service.js.map +1 -1
  280. package/dist/services/orm/print-completion.service.js +2 -4
  281. package/dist/services/orm/print-completion.service.js.map +1 -1
  282. package/dist/services/orm/printer-group.service.js +2 -7
  283. package/dist/services/orm/printer-group.service.js.map +1 -1
  284. package/dist/services/orm/printer.service.js +21 -36
  285. package/dist/services/orm/printer.service.js.map +1 -1
  286. package/dist/services/orm/refresh-token.service.js +5 -11
  287. package/dist/services/orm/refresh-token.service.js.map +1 -1
  288. package/dist/services/orm/role.service.js +11 -10
  289. package/dist/services/orm/role.service.js.map +1 -1
  290. package/dist/services/orm/settings.service.js +37 -133
  291. package/dist/services/orm/settings.service.js.map +1 -1
  292. package/dist/services/orm/user.service.js +13 -15
  293. package/dist/services/orm/user.service.js.map +1 -1
  294. package/dist/services/printer-api.factory.js +9 -6
  295. package/dist/services/printer-api.factory.js.map +1 -1
  296. package/dist/services/printer-api.interface.js +13 -6
  297. package/dist/services/printer-api.interface.js.map +1 -1
  298. package/dist/services/prusa-link/constants/prusalink-event.dto.js +18 -0
  299. package/dist/services/prusa-link/constants/prusalink-event.dto.js.map +1 -0
  300. package/dist/services/prusa-link/constants/prusalink.constants.js +13 -0
  301. package/dist/services/prusa-link/constants/prusalink.constants.js.map +1 -0
  302. package/dist/services/prusa-link/dto/file-response.dto.js +6 -0
  303. package/dist/services/prusa-link/dto/file-response.dto.js.map +1 -0
  304. package/dist/services/{octoprint/dto/plugin.dto.js → prusa-link/dto/file.dto.js} +1 -1
  305. package/dist/services/prusa-link/dto/file.dto.js.map +1 -0
  306. package/dist/services/prusa-link/dto/job-state.dto.js +6 -0
  307. package/dist/services/prusa-link/dto/job-state.dto.js.map +1 -0
  308. package/dist/services/prusa-link/dto/printer-state.dto.js +6 -0
  309. package/dist/services/prusa-link/dto/printer-state.dto.js.map +1 -0
  310. package/dist/services/prusa-link/dto/status.dto.js +6 -0
  311. package/dist/services/prusa-link/dto/status.dto.js.map +1 -0
  312. package/dist/services/prusa-link/dto/version.dto.js +6 -0
  313. package/dist/services/prusa-link/dto/version.dto.js.map +1 -0
  314. package/dist/services/prusa-link/prusa-link-http-polling.adapter.js +142 -0
  315. package/dist/services/prusa-link/prusa-link-http-polling.adapter.js.map +1 -0
  316. package/dist/services/prusa-link/prusa-link.api.js +233 -0
  317. package/dist/services/prusa-link/prusa-link.api.js.map +1 -0
  318. package/dist/services/prusa-link/utils/digest-auth.params.js +6 -0
  319. package/dist/services/prusa-link/utils/digest-auth.params.js.map +1 -0
  320. package/dist/services/prusa-link/utils/digest-auth.util.js +28 -0
  321. package/dist/services/prusa-link/utils/digest-auth.util.js.map +1 -0
  322. package/dist/services/prusa-link/utils/prusa-link-http-client.builder.js +131 -0
  323. package/dist/services/prusa-link/utils/prusa-link-http-client.builder.js.map +1 -0
  324. package/dist/services/socket.factory.js +9 -6
  325. package/dist/services/socket.factory.js.map +1 -1
  326. package/dist/services/{core/task-manager.service.js → task-manager.service.js} +72 -78
  327. package/dist/services/task-manager.service.js.map +1 -0
  328. package/dist/services/validators/camera-service.validation.js +19 -0
  329. package/dist/services/validators/camera-service.validation.js.map +1 -0
  330. package/dist/services/validators/floor-service.validation.js +47 -36
  331. package/dist/services/validators/floor-service.validation.js.map +1 -1
  332. package/dist/services/validators/print-completion-service.validation.js +22 -9
  333. package/dist/services/validators/print-completion-service.validation.js.map +1 -1
  334. package/dist/services/validators/printer-service.validation.js +112 -29
  335. package/dist/services/validators/printer-service.validation.js.map +1 -1
  336. package/dist/services/validators/settings-service.validation.js +78 -66
  337. package/dist/services/validators/settings-service.validation.js.map +1 -1
  338. package/dist/services/validators/user-service.validation.js +17 -16
  339. package/dist/services/validators/user-service.validation.js.map +1 -1
  340. package/dist/services/validators/yaml-service.validation.js +94 -51
  341. package/dist/services/validators/yaml-service.validation.js.map +1 -1
  342. package/dist/shared/default-http-client.builder.js.map +1 -1
  343. package/dist/shared/load-controllers.js +20 -0
  344. package/dist/shared/load-controllers.js.map +1 -0
  345. package/dist/shared/runtime-settings.migration.js +46 -0
  346. package/dist/shared/runtime-settings.migration.js.map +1 -0
  347. package/dist/shared/websocket-rpc-extended.adapter.js +15 -14
  348. package/dist/shared/websocket-rpc-extended.adapter.js.map +1 -1
  349. package/dist/shared/websocket.adapter.js +4 -5
  350. package/dist/shared/websocket.adapter.js.map +1 -1
  351. package/dist/state/file-upload-tracker.cache.js +5 -4
  352. package/dist/state/file-upload-tracker.cache.js.map +1 -1
  353. package/dist/state/file.cache.js +1 -1
  354. package/dist/state/file.cache.js.map +1 -1
  355. package/dist/state/floor.store.js +6 -6
  356. package/dist/state/floor.store.js.map +1 -1
  357. package/dist/state/printer-events.cache.js +21 -22
  358. package/dist/state/printer-events.cache.js.map +1 -1
  359. package/dist/state/printer-files.store.js +6 -8
  360. package/dist/state/printer-files.store.js.map +1 -1
  361. package/dist/state/printer-socket.store.js +27 -50
  362. package/dist/state/printer-socket.store.js.map +1 -1
  363. package/dist/state/printer-thumbnail.cache.js +5 -9
  364. package/dist/state/printer-thumbnail.cache.js.map +1 -1
  365. package/dist/state/printer.cache.js +14 -12
  366. package/dist/state/printer.cache.js.map +1 -1
  367. package/dist/state/settings.store.js +74 -50
  368. package/dist/state/settings.store.js.map +1 -1
  369. package/dist/state/socket-io.gateway.js +39 -36
  370. package/dist/state/socket-io.gateway.js.map +1 -1
  371. package/dist/state/test-printer-socket.store.js +20 -15
  372. package/dist/state/test-printer-socket.store.js.map +1 -1
  373. package/dist/state/validation/create-test-printer.validation.js +13 -11
  374. package/dist/state/validation/create-test-printer.validation.js.map +1 -1
  375. package/dist/task.presets.js.map +1 -1
  376. package/dist/tasks/boot.task.js +14 -19
  377. package/dist/tasks/boot.task.js.map +1 -1
  378. package/dist/tasks/client-bundle.task.js +1 -3
  379. package/dist/tasks/client-bundle.task.js.map +1 -1
  380. package/dist/tasks/print-completion.socketio.task.js +27 -28
  381. package/dist/tasks/print-completion.socketio.task.js.map +1 -1
  382. package/dist/tasks/printer-file-clean.task.js +6 -10
  383. package/dist/tasks/printer-file-clean.task.js.map +1 -1
  384. package/dist/tasks/printer-websocket-restore.task.js +3 -14
  385. package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
  386. package/dist/tasks/printer-websocket.task.js +2 -14
  387. package/dist/tasks/printer-websocket.task.js.map +1 -1
  388. package/dist/tasks/socketio.task.js +6 -33
  389. package/dist/tasks/socketio.task.js.map +1 -1
  390. package/dist/tasks/software-update.task.js +1 -1
  391. package/dist/tasks/software-update.task.js.map +1 -1
  392. package/dist/tasks.js +3 -3
  393. package/dist/tasks.js.map +1 -1
  394. package/dist/utils/array.util.js.map +1 -1
  395. package/dist/utils/cache/key-diff.cache.js.map +1 -1
  396. package/dist/utils/env.utils.js +0 -2
  397. package/dist/utils/env.utils.js.map +1 -1
  398. package/dist/utils/normalize-url.js +3 -2
  399. package/dist/utils/normalize-url.js.map +1 -1
  400. package/dist/utils/printer-type.utils.js.map +1 -1
  401. package/dist/utils/time.utils.js +7 -17
  402. package/dist/utils/time.utils.js.map +1 -1
  403. package/dist/utils/url.utils.js +3 -4
  404. package/dist/utils/url.utils.js.map +1 -1
  405. package/package.json +44 -47
  406. package/tsconfig.json +2 -1
  407. package/.yarn/releases/yarn-4.7.0.cjs +0 -935
  408. package/dist/consoles/check-ports.js +0 -170
  409. package/dist/consoles/check-ports.js.map +0 -1
  410. package/dist/consoles/http-file-receiver.console.js +0 -81
  411. package/dist/consoles/http-file-receiver.console.js.map +0 -1
  412. package/dist/consoles/sqlite-torm.js +0 -31
  413. package/dist/consoles/sqlite-torm.js.map +0 -1
  414. package/dist/consoles/upload-test.js +0 -52
  415. package/dist/consoles/upload-test.js.map +0 -1
  416. package/dist/controllers/plugin-firmware-update.controller.js +0 -234
  417. package/dist/controllers/plugin-firmware-update.controller.js.map +0 -1
  418. package/dist/entities/base.entity.js +0 -29
  419. package/dist/entities/base.entity.js.map +0 -1
  420. package/dist/entities/printer-file.entity.js +0 -140
  421. package/dist/entities/printer-file.entity.js.map +0 -1
  422. package/dist/handlers/cache-manager.js +0 -18
  423. package/dist/handlers/cache-manager.js.map +0 -1
  424. package/dist/models/PrinterFile.js +0 -44
  425. package/dist/models/PrinterFile.js.map +0 -1
  426. package/dist/services/core/task-manager.service.js.map +0 -1
  427. package/dist/services/octoprint/dto/plugin.dto.js.map +0 -1
  428. package/dist/services/octoprint/plugin-base.service.js +0 -101
  429. package/dist/services/octoprint/plugin-base.service.js.map +0 -1
  430. package/dist/services/octoprint/plugin-firmware-update.service.js +0 -100
  431. package/dist/services/octoprint/plugin-firmware-update.service.js.map +0 -1
  432. package/dist/services/octoprint/plugin-repository.cache.js +0 -46
  433. package/dist/services/octoprint/plugin-repository.cache.js.map +0 -1
  434. package/dist/utils/benchmark.util.js +0 -39
  435. package/dist/utils/benchmark.util.js.map +0 -1
  436. package/dist/utils/is-docker.js +0 -40
  437. package/dist/utils/is-docker.js.map +0 -1
  438. package/dist/utils/metric.utils.js +0 -35
  439. package/dist/utils/metric.utils.js.map +0 -1
@@ -2,69 +2,159 @@
2
2
  Object.defineProperty(exports, "__esModule", {
3
3
  value: true
4
4
  });
5
- function _export(target, all) {
6
- for(var name in all)Object.defineProperty(target, name, {
7
- enumerable: true,
8
- get: all[name]
9
- });
10
- }
11
- _export(exports, {
12
- PrinterGroupController: function() {
5
+ Object.defineProperty(exports, "PrinterGroupController", {
6
+ enumerable: true,
7
+ get: function() {
13
8
  return PrinterGroupController;
14
- },
15
- default: function() {
16
- return _default;
17
9
  }
18
10
  });
19
- const _awilixexpress = require("awilix-express");
11
+ const _printergroupserviceinterface = require("../services/interfaces/printer-group.service.interface");
20
12
  const _serverconstants = require("../server.constants");
21
13
  const _authenticate = require("../middleware/authenticate");
22
14
  const _authorizationconstants = require("../constants/authorization.constants");
23
- const _validators = require("../handlers/validators");
24
- const _genericvalidation = require("./validation/generic.validation");
15
+ const _express = require("express");
16
+ const _awilixexpress = require("awilix-express");
17
+ const _paramconvertermiddleware = require("../middleware/param-converter.middleware");
18
+ function _ts_decorate(decorators, target, key, desc) {
19
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
20
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
21
+ else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
22
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
23
+ }
24
+ function _ts_metadata(k, v) {
25
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
26
+ }
25
27
  class PrinterGroupController {
26
28
  printerGroupService;
27
- isTypeormMode;
28
- constructor({ printerGroupService, isTypeormMode }){
29
+ constructor(printerGroupService){
29
30
  this.printerGroupService = printerGroupService;
30
- this.isTypeormMode = isTypeormMode;
31
31
  }
32
32
  async listGroups(req, res) {
33
33
  res.send(await this.printerGroupService.listGroups());
34
34
  }
35
35
  async getGroup(req, res) {
36
- const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
37
- res.send(await this.printerGroupService.getGroupWithPrinters(id));
36
+ res.send(await this.printerGroupService.getGroupWithPrinters(req.local.id));
38
37
  }
39
38
  async createGroup(req, res) {
39
+ if (req.body.id) {
40
+ delete req.body.id;
41
+ }
40
42
  const entity = await this.printerGroupService.createGroup(req.body);
41
43
  res.send(entity);
42
44
  }
43
45
  async updateGroupName(req, res) {
44
- const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
45
- const entity = await this.printerGroupService.updateGroupName(id, req.body.name);
46
+ const entity = await this.printerGroupService.updateGroupName(req.local.id, req.body.name);
46
47
  res.send(entity);
47
48
  }
48
49
  async deleteGroup(req, res) {
49
- const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
50
- res.send(await this.printerGroupService.deleteGroup(id));
50
+ res.send(await this.printerGroupService.deleteGroup(req.local.id));
51
51
  }
52
52
  async addPrinterToGroup(req, res) {
53
- const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
54
- const entity = await this.printerGroupService.addPrinterToGroup(id, req.body.printerId);
53
+ const entity = await this.printerGroupService.addPrinterToGroup(req.local.id, req.body.printerId);
55
54
  res.send(this.printerGroupService.toDto(entity));
56
55
  }
57
56
  async removePrinterFromGroup(req, res) {
58
- const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
59
- res.send(await this.printerGroupService.removePrinterFromGroup(id, req.body.printerId));
57
+ res.send(await this.printerGroupService.removePrinterFromGroup(req.local.id, req.body.printerId));
60
58
  }
61
59
  }
62
- const _default = (0, _awilixexpress.createController)(PrinterGroupController).prefix(_serverconstants.AppConstants.apiRoute + "/printer-group").before([
63
- (0, _authenticate.authenticate)(),
64
- (0, _authenticate.authorizeRoles)([
65
- _authorizationconstants.ROLES.OPERATOR,
66
- _authorizationconstants.ROLES.ADMIN
60
+ _ts_decorate([
61
+ (0, _awilixexpress.GET)(),
62
+ (0, _awilixexpress.route)("/"),
63
+ _ts_metadata("design:type", Function),
64
+ _ts_metadata("design:paramtypes", [
65
+ typeof _express.Request === "undefined" ? Object : _express.Request,
66
+ typeof _express.Response === "undefined" ? Object : _express.Response
67
+ ]),
68
+ _ts_metadata("design:returntype", Promise)
69
+ ], PrinterGroupController.prototype, "listGroups", null);
70
+ _ts_decorate([
71
+ (0, _awilixexpress.GET)(),
72
+ (0, _awilixexpress.route)("/:id"),
73
+ (0, _awilixexpress.before)([
74
+ (0, _paramconvertermiddleware.ParamId)("id")
75
+ ]),
76
+ _ts_metadata("design:type", Function),
77
+ _ts_metadata("design:paramtypes", [
78
+ typeof _express.Request === "undefined" ? Object : _express.Request,
79
+ typeof _express.Response === "undefined" ? Object : _express.Response
80
+ ]),
81
+ _ts_metadata("design:returntype", Promise)
82
+ ], PrinterGroupController.prototype, "getGroup", null);
83
+ _ts_decorate([
84
+ (0, _awilixexpress.POST)(),
85
+ (0, _awilixexpress.route)("/"),
86
+ _ts_metadata("design:type", Function),
87
+ _ts_metadata("design:paramtypes", [
88
+ typeof _express.Request === "undefined" ? Object : _express.Request,
89
+ typeof _express.Response === "undefined" ? Object : _express.Response
90
+ ]),
91
+ _ts_metadata("design:returntype", Promise)
92
+ ], PrinterGroupController.prototype, "createGroup", null);
93
+ _ts_decorate([
94
+ (0, _awilixexpress.PATCH)(),
95
+ (0, _awilixexpress.route)("/:id/name"),
96
+ (0, _awilixexpress.before)([
97
+ (0, _paramconvertermiddleware.ParamId)("id")
98
+ ]),
99
+ _ts_metadata("design:type", Function),
100
+ _ts_metadata("design:paramtypes", [
101
+ typeof _express.Request === "undefined" ? Object : _express.Request,
102
+ typeof _express.Response === "undefined" ? Object : _express.Response
103
+ ]),
104
+ _ts_metadata("design:returntype", Promise)
105
+ ], PrinterGroupController.prototype, "updateGroupName", null);
106
+ _ts_decorate([
107
+ (0, _awilixexpress.DELETE)(),
108
+ (0, _awilixexpress.route)("/:id"),
109
+ (0, _awilixexpress.before)([
110
+ (0, _paramconvertermiddleware.ParamId)("id")
111
+ ]),
112
+ _ts_metadata("design:type", Function),
113
+ _ts_metadata("design:paramtypes", [
114
+ typeof _express.Request === "undefined" ? Object : _express.Request,
115
+ typeof _express.Response === "undefined" ? Object : _express.Response
116
+ ]),
117
+ _ts_metadata("design:returntype", Promise)
118
+ ], PrinterGroupController.prototype, "deleteGroup", null);
119
+ _ts_decorate([
120
+ (0, _awilixexpress.POST)(),
121
+ (0, _awilixexpress.route)("/:id/printer"),
122
+ (0, _awilixexpress.before)([
123
+ (0, _paramconvertermiddleware.ParamId)("id")
124
+ ]),
125
+ _ts_metadata("design:type", Function),
126
+ _ts_metadata("design:paramtypes", [
127
+ typeof _express.Request === "undefined" ? Object : _express.Request,
128
+ typeof _express.Response === "undefined" ? Object : _express.Response
129
+ ]),
130
+ _ts_metadata("design:returntype", Promise)
131
+ ], PrinterGroupController.prototype, "addPrinterToGroup", null);
132
+ _ts_decorate([
133
+ (0, _awilixexpress.DELETE)(),
134
+ (0, _awilixexpress.route)("/:id/printer"),
135
+ (0, _awilixexpress.before)([
136
+ (0, _paramconvertermiddleware.ParamId)("id")
137
+ ]),
138
+ _ts_metadata("design:type", Function),
139
+ _ts_metadata("design:paramtypes", [
140
+ typeof _express.Request === "undefined" ? Object : _express.Request,
141
+ typeof _express.Response === "undefined" ? Object : _express.Response
142
+ ]),
143
+ _ts_metadata("design:returntype", Promise)
144
+ ], PrinterGroupController.prototype, "removePrinterFromGroup", null);
145
+ PrinterGroupController = _ts_decorate([
146
+ (0, _awilixexpress.route)(_serverconstants.AppConstants.apiRoute + "/printer-group"),
147
+ (0, _awilixexpress.before)([
148
+ (0, _authenticate.authenticate)(),
149
+ (0, _authenticate.authorizeRoles)([
150
+ _authorizationconstants.ROLES.OPERATOR,
151
+ _authorizationconstants.ROLES.ADMIN
152
+ ])
153
+ ]),
154
+ _ts_metadata("design:type", Function),
155
+ _ts_metadata("design:paramtypes", [
156
+ typeof _printergroupserviceinterface.IPrinterGroupService === "undefined" ? Object : _printergroupserviceinterface.IPrinterGroupService
67
157
  ])
68
- ]).get("/", "listGroups").post("/", "createGroup").get("/:id", "getGroup").delete("/:id", "deleteGroup").patch("/:id/name", "updateGroupName").post("/:id/printer", "addPrinterToGroup").delete("/:id/printer", "removePrinterFromGroup");
158
+ ], PrinterGroupController);
69
159
 
70
160
  //# sourceMappingURL=printer-group.controller.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/controllers/printer-group.controller.ts"],"names":["PrinterGroupController","printerGroupService","isTypeormMode","constructor","listGroups","req","res","send","getGroup","id","validateInput","params","idRulesV2","getGroupWithPrinters","createGroup","entity","body","updateGroupName","name","deleteGroup","addPrinterToGroup","printerId","toDto","removePrinterFromGroup","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","get","post","delete","patch"],"mappings":";;;;;;;;;;;IASaA,sBAAsB;eAAtBA;;IA8Cb,OASoD;eATpD;;;+BAtDiC;iCACJ;8BACgB;wCACvB;4BACQ;mCACJ;AAGnB,MAAMA;IACXC,oBAA0C;IAC1CC,cAAuB;IAEvBC,YAAY,EAAEF,mBAAmB,EAAEC,aAAa,EAAyE,CAAE;QACzH,IAAI,CAACD,mBAAmB,GAAGA;QAC3B,IAAI,CAACC,aAAa,GAAGA;IACvB;IAEA,MAAME,WAAWC,GAAY,EAAEC,GAAa,EAAE;QAC5CA,IAAIC,IAAI,CAAC,MAAM,IAAI,CAACN,mBAAmB,CAACG,UAAU;IACpD;IAEA,MAAMI,SAASH,GAAY,EAAEC,GAAa,EAAE;QAC1C,MAAM,EAAEG,EAAE,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACL,IAAIM,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACV,aAAa;QAC3EI,IAAIC,IAAI,CAAC,MAAM,IAAI,CAACN,mBAAmB,CAACY,oBAAoB,CAACJ;IAC/D;IAEA,MAAMK,YAAYT,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAMS,SAAS,MAAM,IAAI,CAACd,mBAAmB,CAACa,WAAW,CAACT,IAAIW,IAAI;QAClEV,IAAIC,IAAI,CAACQ;IACX;IAEA,MAAME,gBAAgBZ,GAAY,EAAEC,GAAa,EAAE;QACjD,MAAM,EAAEG,EAAE,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACL,IAAIM,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACV,aAAa;QAC3E,MAAMa,SAAS,MAAM,IAAI,CAACd,mBAAmB,CAACgB,eAAe,CAACR,IAAIJ,IAAIW,IAAI,CAACE,IAAI;QAC/EZ,IAAIC,IAAI,CAACQ;IACX;IAEA,MAAMI,YAAYd,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAM,EAAEG,EAAE,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACL,IAAIM,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACV,aAAa;QAC3EI,IAAIC,IAAI,CAAC,MAAM,IAAI,CAACN,mBAAmB,CAACkB,WAAW,CAACV;IACtD;IAEA,MAAMW,kBAAkBf,GAAY,EAAEC,GAAa,EAAE;QACnD,MAAM,EAAEG,EAAE,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACL,IAAIM,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACV,aAAa;QAC3E,MAAMa,SAAS,MAAM,IAAI,CAACd,mBAAmB,CAACmB,iBAAiB,CAACX,IAAIJ,IAAIW,IAAI,CAACK,SAAS;QACtFf,IAAIC,IAAI,CAAC,IAAI,CAACN,mBAAmB,CAACqB,KAAK,CAACP;IAC1C;IAEA,MAAMQ,uBAAuBlB,GAAY,EAAEC,GAAa,EAAE;QACxD,MAAM,EAAEG,EAAE,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACL,IAAIM,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACV,aAAa;QAC3EI,IAAIC,IAAI,CAAC,MAAM,IAAI,CAACN,mBAAmB,CAACsB,sBAAsB,CAACd,IAAIJ,IAAIW,IAAI,CAACK,SAAS;IACvF;AACF;MAEA,WAAeG,IAAAA,+BAAgB,EAACxB,wBAC7ByB,MAAM,CAACC,6BAAY,CAACC,QAAQ,GAAG,kBAC/BC,MAAM,CAAC;IAACC,IAAAA,0BAAY;IAAIC,IAAAA,4BAAc,EAAC;QAACC,6BAAK,CAACC,QAAQ;QAAED,6BAAK,CAACE,KAAK;KAAC;CAAE,EACtEC,GAAG,CAAC,KAAK,cACTC,IAAI,CAAC,KAAK,eACVD,GAAG,CAAC,QAAQ,YACZE,MAAM,CAAC,QAAQ,eACfC,KAAK,CAAC,aAAa,mBACnBF,IAAI,CAAC,gBAAgB,qBACrBC,MAAM,CAAC,gBAAgB"}
1
+ {"version":3,"sources":["../../src/controllers/printer-group.controller.ts"],"names":["PrinterGroupController","constructor","printerGroupService","listGroups","req","res","send","getGroup","getGroupWithPrinters","local","id","createGroup","body","entity","updateGroupName","name","deleteGroup","addPrinterToGroup","printerId","toDto","removePrinterFromGroup","ParamId","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN"],"mappings":";;;;+BAUaA;;;eAAAA;;;8CAVwB;iCACR;8BACgB;wCACvB;yBACY;+BACsB;0CAChC;;;;;;;;;;AAIjB,MAAMA;;IACXC,YAAY,AAAiBC,mBAAyC,CAAE;aAA3CA,sBAAAA;IAA4C;IAEzE,MAEMC,WAAWC,GAAY,EAAEC,GAAa,EAAE;QAC5CA,IAAIC,IAAI,CAAC,MAAM,IAAI,CAACJ,mBAAmB,CAACC,UAAU;IACpD;IAEA,MAGMI,SAASH,GAAY,EAAEC,GAAa,EAAE;QAC1CA,IAAIC,IAAI,CAAC,MAAM,IAAI,CAACJ,mBAAmB,CAACM,oBAAoB,CAACJ,IAAIK,KAAK,CAACC,EAAE;IAC3E;IAEA,MAEMC,YAAYP,GAAY,EAAEC,GAAa,EAAE;QAE7C,IAAID,IAAIQ,IAAI,CAACF,EAAE,EAAE;YACf,OAAON,IAAIQ,IAAI,CAACF,EAAE;QACpB;QACA,MAAMG,SAAS,MAAM,IAAI,CAACX,mBAAmB,CAACS,WAAW,CAACP,IAAIQ,IAAI;QAClEP,IAAIC,IAAI,CAACO;IACX;IAEA,MAGMC,gBAAgBV,GAAY,EAAEC,GAAa,EAAE;QACjD,MAAMQ,SAAS,MAAM,IAAI,CAACX,mBAAmB,CAACY,eAAe,CAACV,IAAIK,KAAK,CAACC,EAAE,EAAEN,IAAIQ,IAAI,CAACG,IAAI;QACzFV,IAAIC,IAAI,CAACO;IACX;IAEA,MAGMG,YAAYZ,GAAY,EAAEC,GAAa,EAAE;QAC7CA,IAAIC,IAAI,CAAC,MAAM,IAAI,CAACJ,mBAAmB,CAACc,WAAW,CAACZ,IAAIK,KAAK,CAACC,EAAE;IAClE;IAEA,MAGMO,kBAAkBb,GAAY,EAAEC,GAAa,EAAE;QACnD,MAAMQ,SAAS,MAAM,IAAI,CAACX,mBAAmB,CAACe,iBAAiB,CAACb,IAAIK,KAAK,CAACC,EAAE,EAAEN,IAAIQ,IAAI,CAACM,SAAS;QAChGb,IAAIC,IAAI,CAAC,IAAI,CAACJ,mBAAmB,CAACiB,KAAK,CAACN;IAC1C;IAEA,MAGMO,uBAAuBhB,GAAY,EAAEC,GAAa,EAAE;QACxDA,IAAIC,IAAI,CAAC,MAAM,IAAI,CAACJ,mBAAmB,CAACkB,sBAAsB,CAAChB,IAAIK,KAAK,CAACC,EAAE,EAAEN,IAAIQ,IAAI,CAACM,SAAS;IACjG;AACF;;;;;;;;;;;;;;;QA7CWG,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;;;;;;;;;;;QAkBRA,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QAQRA,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QAORA,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QAQRA,IAAAA,iCAAO,EAAC;;;;;;;;;;8BAtDZC,6BAAY,CAACC,QAAQ,GAAG;;QACtBC,IAAAA,0BAAY;QAAIC,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,QAAQ;YAAED,6BAAK,CAACE,KAAK;SAAC"}
@@ -2,59 +2,106 @@
2
2
  Object.defineProperty(exports, "__esModule", {
3
3
  value: true
4
4
  });
5
- function _export(target, all) {
6
- for(var name in all)Object.defineProperty(target, name, {
7
- enumerable: true,
8
- get: all[name]
9
- });
10
- }
11
- _export(exports, {
12
- PrinterSettingsController: function() {
5
+ Object.defineProperty(exports, "PrinterSettingsController", {
6
+ enumerable: true,
7
+ get: function() {
13
8
  return PrinterSettingsController;
14
- },
15
- default: function() {
16
- return _default;
17
9
  }
18
10
  });
19
11
  const _awilixexpress = require("awilix-express");
20
12
  const _authenticate = require("../middleware/authenticate");
21
13
  const _validators = require("../handlers/validators");
22
14
  const _serverconstants = require("../server.constants");
23
- const _genericvalidation = require("./validation/generic.validation");
24
15
  const _printersettingscontrollervalidation = require("./validation/printer-settings-controller.validation");
25
16
  const _authorizationconstants = require("../constants/authorization.constants");
17
+ const _octoprintclient = require("../services/octoprint/octoprint.client");
18
+ const _printercache = require("../state/printer.cache");
19
+ const _express = require("express");
20
+ const _paramconvertermiddleware = require("../middleware/param-converter.middleware");
21
+ function _ts_decorate(decorators, target, key, desc) {
22
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
23
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
24
+ else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
25
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
26
+ }
27
+ function _ts_metadata(k, v) {
28
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
29
+ }
26
30
  class PrinterSettingsController {
27
31
  printerCache;
28
32
  octoprintClient;
29
- isTypeormMode;
30
- constructor({ printerCache, octoprintClient, isTypeormMode }){
33
+ constructor(printerCache, octoprintClient){
31
34
  this.printerCache = printerCache;
32
35
  this.octoprintClient = octoprintClient;
33
- this.isTypeormMode = isTypeormMode;
34
36
  }
35
37
  async get(req, res) {
36
- const { id: printerId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
37
- const loginDto = await this.printerCache.getLoginDtoAsync(printerId);
38
+ const loginDto = await this.printerCache.getLoginDtoAsync(req.local.id);
38
39
  const settings = await this.octoprintClient.getSettings(loginDto);
39
40
  res.send(settings.data);
40
41
  }
41
42
  async setGCodeAnalysis(req, res) {
42
- const { id: printerId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
43
- const { enabled } = await (0, _validators.validateMiddleware)(req, _printersettingscontrollervalidation.setGcodeAnalysis);
44
- const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
43
+ const { enabled } = await (0, _validators.validateMiddleware)(req, _printersettingscontrollervalidation.setGcodeAnalysisSchema);
44
+ const printerLogin = await this.printerCache.getLoginDtoAsync(req.local.id);
45
45
  const settings = await this.octoprintClient.setGCodeAnalysis(printerLogin, enabled);
46
46
  res.send(settings.data);
47
47
  }
48
48
  async syncPrinterName(req, res) {
49
- const { id: printerId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
50
- const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
51
- const name = await this.printerCache.getNameAsync(printerId);
49
+ const printerLogin = await this.printerCache.getLoginDtoAsync(req.local.id);
50
+ const name = await this.printerCache.getNameAsync(req.local.id);
52
51
  const settings = await this.octoprintClient.updatePrinterNameSetting(printerLogin, name);
53
52
  res.send(settings.data);
54
53
  }
55
54
  }
56
- const _default = (0, _awilixexpress.createController)(PrinterSettingsController).prefix(_serverconstants.AppConstants.apiRoute + "/printer-settings").before([
57
- (0, _authenticate.authenticate)()
58
- ]).get("/:id", "get", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterSettings.Get)).post("/:id/gcode-analysis", "setGCodeAnalysis").post("/:id/sync-printername", "syncPrinterName");
55
+ _ts_decorate([
56
+ (0, _awilixexpress.GET)(),
57
+ (0, _awilixexpress.route)("/:id"),
58
+ (0, _awilixexpress.before)([
59
+ (0, _authenticate.permission)(_authorizationconstants.PERMS.PrinterSettings.Get),
60
+ (0, _paramconvertermiddleware.ParamId)("id")
61
+ ]),
62
+ _ts_metadata("design:type", Function),
63
+ _ts_metadata("design:paramtypes", [
64
+ typeof _express.Request === "undefined" ? Object : _express.Request,
65
+ typeof _express.Response === "undefined" ? Object : _express.Response
66
+ ]),
67
+ _ts_metadata("design:returntype", Promise)
68
+ ], PrinterSettingsController.prototype, "get", null);
69
+ _ts_decorate([
70
+ (0, _awilixexpress.POST)(),
71
+ (0, _awilixexpress.route)("/:id/gcode-analysis"),
72
+ (0, _awilixexpress.before)([
73
+ (0, _paramconvertermiddleware.ParamId)("id")
74
+ ]),
75
+ _ts_metadata("design:type", Function),
76
+ _ts_metadata("design:paramtypes", [
77
+ typeof _express.Request === "undefined" ? Object : _express.Request,
78
+ typeof _express.Response === "undefined" ? Object : _express.Response
79
+ ]),
80
+ _ts_metadata("design:returntype", Promise)
81
+ ], PrinterSettingsController.prototype, "setGCodeAnalysis", null);
82
+ _ts_decorate([
83
+ (0, _awilixexpress.POST)(),
84
+ (0, _awilixexpress.route)("/:id/sync-printername"),
85
+ (0, _awilixexpress.before)([
86
+ (0, _paramconvertermiddleware.ParamId)("id")
87
+ ]),
88
+ _ts_metadata("design:type", Function),
89
+ _ts_metadata("design:paramtypes", [
90
+ typeof _express.Request === "undefined" ? Object : _express.Request,
91
+ typeof _express.Response === "undefined" ? Object : _express.Response
92
+ ]),
93
+ _ts_metadata("design:returntype", Promise)
94
+ ], PrinterSettingsController.prototype, "syncPrinterName", null);
95
+ PrinterSettingsController = _ts_decorate([
96
+ (0, _awilixexpress.route)(_serverconstants.AppConstants.apiRoute + "/printer-settings"),
97
+ (0, _awilixexpress.before)([
98
+ (0, _authenticate.authenticate)()
99
+ ]),
100
+ _ts_metadata("design:type", Function),
101
+ _ts_metadata("design:paramtypes", [
102
+ typeof _printercache.PrinterCache === "undefined" ? Object : _printercache.PrinterCache,
103
+ typeof _octoprintclient.OctoprintClient === "undefined" ? Object : _octoprintclient.OctoprintClient
104
+ ])
105
+ ], PrinterSettingsController);
59
106
 
60
107
  //# sourceMappingURL=printer-settings.controller.js.map
@@ -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","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"}
1
+ {"version":3,"sources":["../../src/controllers/printer-settings.controller.ts"],"names":["PrinterSettingsController","constructor","printerCache","octoprintClient","get","req","res","loginDto","getLoginDtoAsync","local","id","settings","getSettings","send","data","setGCodeAnalysis","enabled","validateMiddleware","setGcodeAnalysisSchema","printerLogin","syncPrinterName","name","getNameAsync","updatePrinterNameSetting","permission","PERMS","PrinterSettings","Get","ParamId","AppConstants","apiRoute","authenticate"],"mappings":";;;;+BAaaA;;;eAAAA;;;+BAb4B;8BACA;4BACN;iCACN;qDACU;wCACjB;iCACU;8BACH;yBACK;0CACV;;;;;;;;;;AAIjB,MAAMA;;;IACXC,YACE,AAAiBC,YAA0B,EAC3C,AAAiBC,eAAgC,CACjD;aAFiBD,eAAAA;aACAC,kBAAAA;IAChB;IAEH,MAGMC,IAAIC,GAAY,EAAEC,GAAa,EAAE;QACrC,MAAMC,WAAW,MAAM,IAAI,CAACL,YAAY,CAACM,gBAAgB,CAACH,IAAII,KAAK,CAACC,EAAE;QACtE,MAAMC,WAAW,MAAM,IAAI,CAACR,eAAe,CAACS,WAAW,CAACL;QACxDD,IAAIO,IAAI,CAACF,SAASG,IAAI;IACxB;IAEA,MAGMC,iBAAiBV,GAAY,EAAEC,GAAa,EAAE;QAClD,MAAM,EAAEU,OAAO,EAAE,GAAG,MAAMC,IAAAA,8BAAkB,EAACZ,KAAKa,2DAAsB;QAExE,MAAMC,eAAe,MAAM,IAAI,CAACjB,YAAY,CAACM,gBAAgB,CAACH,IAAII,KAAK,CAACC,EAAE;QAC1E,MAAMC,WAAW,MAAM,IAAI,CAACR,eAAe,CAACY,gBAAgB,CAACI,cAAcH;QAC3EV,IAAIO,IAAI,CAACF,SAASG,IAAI;IACxB;IAEA,MAGMM,gBAAgBf,GAAY,EAAEC,GAAa,EAAE;QACjD,MAAMa,eAAe,MAAM,IAAI,CAACjB,YAAY,CAACM,gBAAgB,CAACH,IAAII,KAAK,CAACC,EAAE;QAC1E,MAAMW,OAAO,MAAM,IAAI,CAACnB,YAAY,CAACoB,YAAY,CAACjB,IAAII,KAAK,CAACC,EAAE;QAC9D,MAAMC,WAAW,MAAM,IAAI,CAACR,eAAe,CAACoB,wBAAwB,CAACJ,cAAcE;QACnFf,IAAIO,IAAI,CAACF,SAASG,IAAI;IACxB;AACF;;;;;QA3BWU,IAAAA,wBAAU,EAACC,6BAAK,CAACC,eAAe,CAACC,GAAG;QAAGC,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QAS/CA,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QAWRA,IAAAA,iCAAO,EAAC;;;;;;;;;;8BA9BZC,6BAAY,CAACC,QAAQ,GAAG;;QACtBC,IAAAA,0BAAY"}