@fdm-monster/server 1.8.3 → 1.9.0

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 (448) hide show
  1. package/.env.template +6 -4
  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 +27 -28
  7. package/RELEASE_NOTES.MD +69 -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 +8 -12
  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 +45 -29
  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 +87 -88
  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 +25 -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-factory.js +2 -2
  115. package/dist/handlers/logger-factory.js.map +1 -1
  116. package/dist/handlers/logger.js +11 -58
  117. package/dist/handlers/logger.js.map +1 -1
  118. package/dist/handlers/logging/file-logging.transport.js +35 -0
  119. package/dist/handlers/logging/file-logging.transport.js.map +1 -0
  120. package/dist/handlers/logging/loki-logging.transport.js +55 -0
  121. package/dist/handlers/logging/loki-logging.transport.js.map +1 -0
  122. package/dist/handlers/logging/static.logger.js +134 -0
  123. package/dist/handlers/logging/static.logger.js.map +1 -0
  124. package/dist/handlers/validators.js +7 -116
  125. package/dist/handlers/validators.js.map +1 -1
  126. package/dist/index.js +13 -0
  127. package/dist/index.js.map +1 -1
  128. package/dist/middleware/authenticate.js +11 -22
  129. package/dist/middleware/authenticate.js.map +1 -1
  130. package/dist/middleware/database.js.map +1 -1
  131. package/dist/middleware/demo.middleware.js +4 -17
  132. package/dist/middleware/demo.middleware.js.map +1 -1
  133. package/dist/middleware/exception.filter.js +23 -23
  134. package/dist/middleware/exception.filter.js.map +1 -1
  135. package/dist/middleware/global.middleware.js +4 -4
  136. package/dist/middleware/global.middleware.js.map +1 -1
  137. package/dist/middleware/param-converter.middleware.js +81 -0
  138. package/dist/middleware/param-converter.middleware.js.map +1 -0
  139. package/dist/middleware/passport.js +3 -5
  140. package/dist/middleware/passport.js.map +1 -1
  141. package/dist/middleware/printer-resolver.js +37 -0
  142. package/dist/middleware/printer-resolver.js.map +1 -0
  143. package/dist/middleware/printer.js +22 -10
  144. package/dist/middleware/printer.js.map +1 -1
  145. package/dist/middleware/socketio.middleware.js +35 -0
  146. package/dist/middleware/socketio.middleware.js.map +1 -0
  147. package/dist/migrations/1706829146617-InitSqlite.js +1 -1
  148. package/dist/migrations/1706829146617-InitSqlite.js.map +1 -1
  149. package/dist/migrations/1707494762198-PrinterGroup.js +1 -1
  150. package/dist/migrations/1707494762198-PrinterGroup.js.map +1 -1
  151. package/dist/migrations/1708465930665-ChangePrintCompletionDeletePrinterCascade.js +1 -1
  152. package/dist/migrations/1708465930665-ChangePrintCompletionDeletePrinterCascade.js.map +1 -1
  153. package/dist/migrations/1713897879622-AddPrinterType.js +1 -1
  154. package/dist/migrations/1713897879622-AddPrinterType.js.map +1 -1
  155. package/dist/migrations/1745141688926-AddPrinterUsernamePassword.js +229 -0
  156. package/dist/migrations/1745141688926-AddPrinterUsernamePassword.js.map +1 -0
  157. package/dist/models/Auth/Permission.js.map +1 -1
  158. package/dist/models/Auth/RefreshToken.js +1 -1
  159. package/dist/models/Auth/RefreshToken.js.map +1 -1
  160. package/dist/models/Auth/Role.js.map +1 -1
  161. package/dist/models/Auth/User.js.map +1 -1
  162. package/dist/models/CameraStream.js +20 -0
  163. package/dist/models/CameraStream.js.map +1 -1
  164. package/dist/models/CustomGcode.js.map +1 -1
  165. package/dist/models/Floor.js.map +1 -1
  166. package/dist/models/FloorPrinter.js +10 -1
  167. package/dist/models/FloorPrinter.js.map +1 -1
  168. package/dist/models/PrintCompletion.js.map +1 -1
  169. package/dist/models/Printer.js +12 -5
  170. package/dist/models/Printer.js.map +1 -1
  171. package/dist/models/Settings.js +11 -43
  172. package/dist/models/Settings.js.map +1 -1
  173. package/dist/models/index.js +0 -4
  174. package/dist/models/index.js.map +1 -1
  175. package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js.map +1 -1
  176. package/dist/mongo-migrations/20210907173950-printers-enabled.js.map +1 -1
  177. package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js.map +1 -1
  178. package/dist/mongo-migrations/20230414141005-floor-remove-groupinfloor.js.map +1 -1
  179. package/dist/mongo-migrations/20230427202911-printer-remove-sortindex.js.map +1 -1
  180. package/dist/mongo-migrations/20230716065316-user-remove-name.js.map +1 -1
  181. package/dist/mongo-migrations/20231111081809-printer-flatten-name.js.map +1 -1
  182. package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js.map +1 -1
  183. package/dist/mongo-migrations/20231202183902-printer-files-simpler.js.map +1 -1
  184. package/dist/server.constants.js +8 -4
  185. package/dist/server.constants.js.map +1 -1
  186. package/dist/server.core.js +29 -2
  187. package/dist/server.core.js.map +1 -1
  188. package/dist/server.env.js +22 -18
  189. package/dist/server.env.js.map +1 -1
  190. package/dist/server.host.js +24 -33
  191. package/dist/server.host.js.map +1 -1
  192. package/dist/services/authentication/auth.service.js +15 -20
  193. package/dist/services/authentication/auth.service.js.map +1 -1
  194. package/dist/services/authentication/jwt.service.js +1 -1
  195. package/dist/services/authentication/jwt.service.js.map +1 -1
  196. package/dist/services/core/batch-call.service.js +23 -25
  197. package/dist/services/core/batch-call.service.js.map +1 -1
  198. package/dist/services/core/client-bundle.service.js +78 -136
  199. package/dist/services/core/client-bundle.service.js.map +1 -1
  200. package/dist/services/core/config.service.js.map +1 -1
  201. package/dist/services/core/cradle.service.js +21 -0
  202. package/dist/services/core/cradle.service.js.map +1 -0
  203. package/dist/services/core/github.service.js +2 -2
  204. package/dist/services/core/github.service.js.map +1 -1
  205. package/dist/services/core/http-client.factory.js +1 -1
  206. package/dist/services/core/http-client.factory.js.map +1 -1
  207. package/dist/services/core/logs-manager.service.js +3 -3
  208. package/dist/services/core/logs-manager.service.js.map +1 -1
  209. package/dist/services/core/monsterpi.service.js +1 -1
  210. package/dist/services/core/monsterpi.service.js.map +1 -1
  211. package/dist/services/core/multer.service.js +8 -7
  212. package/dist/services/core/multer.service.js.map +1 -1
  213. package/dist/services/core/server-release.service.js +14 -8
  214. package/dist/services/core/server-release.service.js.map +1 -1
  215. package/dist/services/core/yaml.service.js +16 -17
  216. package/dist/services/core/yaml.service.js.map +1 -1
  217. package/dist/services/interfaces/camera-stream.dto.js +4 -34
  218. package/dist/services/interfaces/camera-stream.dto.js.map +1 -1
  219. package/dist/services/interfaces/custom-gcode.dto.js.map +1 -1
  220. package/dist/services/interfaces/floor.dto.js +5 -47
  221. package/dist/services/interfaces/floor.dto.js.map +1 -1
  222. package/dist/services/interfaces/login.dto.js +2 -0
  223. package/dist/services/interfaces/login.dto.js.map +1 -1
  224. package/dist/services/interfaces/print-completion.dto.js.map +1 -1
  225. package/dist/services/interfaces/printer-group.dto.js +0 -14
  226. package/dist/services/interfaces/printer-group.dto.js.map +1 -1
  227. package/dist/services/interfaces/printer.dto.js +11 -11
  228. package/dist/services/interfaces/printer.dto.js.map +1 -1
  229. package/dist/services/interfaces/settings.dto.js.map +1 -1
  230. package/dist/services/interfaces/task.interfaces.js +6 -0
  231. package/dist/services/interfaces/task.interfaces.js.map +1 -0
  232. package/dist/services/mongoose/camera-stream.service.js +17 -15
  233. package/dist/services/mongoose/camera-stream.service.js.map +1 -1
  234. package/dist/services/mongoose/custom-gcode.service.js +4 -2
  235. package/dist/services/mongoose/custom-gcode.service.js.map +1 -1
  236. package/dist/services/mongoose/floor.service.js +37 -30
  237. package/dist/services/mongoose/floor.service.js.map +1 -1
  238. package/dist/services/mongoose/permission.service.js +1 -1
  239. package/dist/services/mongoose/permission.service.js.map +1 -1
  240. package/dist/services/mongoose/print-completion.service.js +2 -2
  241. package/dist/services/mongoose/print-completion.service.js.map +1 -1
  242. package/dist/services/mongoose/print-completion.shared.js +2 -2
  243. package/dist/services/mongoose/print-completion.shared.js.map +1 -1
  244. package/dist/services/mongoose/printer.service.js +33 -45
  245. package/dist/services/mongoose/printer.service.js.map +1 -1
  246. package/dist/services/mongoose/refresh-token.service.js +5 -8
  247. package/dist/services/mongoose/refresh-token.service.js.map +1 -1
  248. package/dist/services/mongoose/role.service.js +14 -5
  249. package/dist/services/mongoose/role.service.js.map +1 -1
  250. package/dist/services/mongoose/settings.service.js +35 -62
  251. package/dist/services/mongoose/settings.service.js.map +1 -1
  252. package/dist/services/mongoose/user.service.js +8 -7
  253. package/dist/services/mongoose/user.service.js.map +1 -1
  254. package/dist/services/moonraker/constants/{websocket.constants.js → moonraker.constants.js} +1 -1
  255. package/dist/services/moonraker/constants/{websocket.constants.js.map → moonraker.constants.js.map} +1 -1
  256. package/dist/services/moonraker/moonraker-websocket.adapter.js +109 -96
  257. package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
  258. package/dist/services/moonraker/moonraker.client.js +25 -16
  259. package/dist/services/moonraker/moonraker.client.js.map +1 -1
  260. package/dist/services/moonraker.api.js +5 -7
  261. package/dist/services/moonraker.api.js.map +1 -1
  262. package/dist/services/octoprint/constants/octoprint-service.constants.js +7 -36
  263. package/dist/services/octoprint/constants/octoprint-service.constants.js.map +1 -1
  264. package/dist/services/octoprint/constants/octoprint-websocket.constants.js +12 -3
  265. package/dist/services/octoprint/constants/octoprint-websocket.constants.js.map +1 -1
  266. package/dist/services/octoprint/dto/octoprint-event.dto.js +2 -1
  267. package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -1
  268. package/dist/services/octoprint/octoprint-api.routes.js +1 -38
  269. package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
  270. package/dist/services/octoprint/octoprint-websocket.adapter.js +66 -72
  271. package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -1
  272. package/dist/services/octoprint/octoprint.client.js +19 -192
  273. package/dist/services/octoprint/octoprint.client.js.map +1 -1
  274. package/dist/services/octoprint/utils/octoprint-http-client.builder.js.map +1 -1
  275. package/dist/services/octoprint.api.js +10 -19
  276. package/dist/services/octoprint.api.js.map +1 -1
  277. package/dist/services/orm/base.service.js +11 -12
  278. package/dist/services/orm/base.service.js.map +1 -1
  279. package/dist/services/orm/camera-stream.service.js +5 -1
  280. package/dist/services/orm/camera-stream.service.js.map +1 -1
  281. package/dist/services/orm/custom-gcode.service.js +2 -2
  282. package/dist/services/orm/custom-gcode.service.js.map +1 -1
  283. package/dist/services/orm/floor-position.service.js +0 -5
  284. package/dist/services/orm/floor-position.service.js.map +1 -1
  285. package/dist/services/orm/floor.service.js +43 -39
  286. package/dist/services/orm/floor.service.js.map +1 -1
  287. package/dist/services/orm/permission.service.js +3 -4
  288. package/dist/services/orm/permission.service.js.map +1 -1
  289. package/dist/services/orm/print-completion.service.js +2 -4
  290. package/dist/services/orm/print-completion.service.js.map +1 -1
  291. package/dist/services/orm/printer-group.service.js +2 -7
  292. package/dist/services/orm/printer-group.service.js.map +1 -1
  293. package/dist/services/orm/printer.service.js +21 -36
  294. package/dist/services/orm/printer.service.js.map +1 -1
  295. package/dist/services/orm/refresh-token.service.js +5 -11
  296. package/dist/services/orm/refresh-token.service.js.map +1 -1
  297. package/dist/services/orm/role.service.js +11 -10
  298. package/dist/services/orm/role.service.js.map +1 -1
  299. package/dist/services/orm/settings.service.js +37 -133
  300. package/dist/services/orm/settings.service.js.map +1 -1
  301. package/dist/services/orm/user.service.js +13 -15
  302. package/dist/services/orm/user.service.js.map +1 -1
  303. package/dist/services/printer-api.factory.js +9 -6
  304. package/dist/services/printer-api.factory.js.map +1 -1
  305. package/dist/services/printer-api.interface.js +13 -6
  306. package/dist/services/printer-api.interface.js.map +1 -1
  307. package/dist/services/prusa-link/constants/prusalink-event.dto.js +18 -0
  308. package/dist/services/prusa-link/constants/prusalink-event.dto.js.map +1 -0
  309. package/dist/services/prusa-link/constants/prusalink.constants.js +13 -0
  310. package/dist/services/prusa-link/constants/prusalink.constants.js.map +1 -0
  311. package/dist/services/prusa-link/dto/file-response.dto.js +6 -0
  312. package/dist/services/prusa-link/dto/file-response.dto.js.map +1 -0
  313. package/dist/services/{octoprint/dto/plugin.dto.js → prusa-link/dto/file.dto.js} +1 -1
  314. package/dist/services/prusa-link/dto/file.dto.js.map +1 -0
  315. package/dist/services/prusa-link/dto/job-state.dto.js +6 -0
  316. package/dist/services/prusa-link/dto/job-state.dto.js.map +1 -0
  317. package/dist/services/prusa-link/dto/printer-state.dto.js +6 -0
  318. package/dist/services/prusa-link/dto/printer-state.dto.js.map +1 -0
  319. package/dist/services/prusa-link/dto/status.dto.js +6 -0
  320. package/dist/services/prusa-link/dto/status.dto.js.map +1 -0
  321. package/dist/services/prusa-link/dto/version.dto.js +6 -0
  322. package/dist/services/prusa-link/dto/version.dto.js.map +1 -0
  323. package/dist/services/prusa-link/prusa-link-http-polling.adapter.js +142 -0
  324. package/dist/services/prusa-link/prusa-link-http-polling.adapter.js.map +1 -0
  325. package/dist/services/prusa-link/prusa-link.api.js +235 -0
  326. package/dist/services/prusa-link/prusa-link.api.js.map +1 -0
  327. package/dist/services/prusa-link/utils/digest-auth.params.js +6 -0
  328. package/dist/services/prusa-link/utils/digest-auth.params.js.map +1 -0
  329. package/dist/services/prusa-link/utils/digest-auth.util.js +28 -0
  330. package/dist/services/prusa-link/utils/digest-auth.util.js.map +1 -0
  331. package/dist/services/prusa-link/utils/prusa-link-http-client.builder.js +131 -0
  332. package/dist/services/prusa-link/utils/prusa-link-http-client.builder.js.map +1 -0
  333. package/dist/services/socket.factory.js +9 -6
  334. package/dist/services/socket.factory.js.map +1 -1
  335. package/dist/services/{core/task-manager.service.js → task-manager.service.js} +72 -78
  336. package/dist/services/task-manager.service.js.map +1 -0
  337. package/dist/services/validators/camera-service.validation.js +19 -0
  338. package/dist/services/validators/camera-service.validation.js.map +1 -0
  339. package/dist/services/validators/floor-service.validation.js +47 -36
  340. package/dist/services/validators/floor-service.validation.js.map +1 -1
  341. package/dist/services/validators/print-completion-service.validation.js +22 -9
  342. package/dist/services/validators/print-completion-service.validation.js.map +1 -1
  343. package/dist/services/validators/printer-service.validation.js +112 -29
  344. package/dist/services/validators/printer-service.validation.js.map +1 -1
  345. package/dist/services/validators/settings-service.validation.js +79 -66
  346. package/dist/services/validators/settings-service.validation.js.map +1 -1
  347. package/dist/services/validators/user-service.validation.js +17 -16
  348. package/dist/services/validators/user-service.validation.js.map +1 -1
  349. package/dist/services/validators/yaml-service.validation.js +94 -51
  350. package/dist/services/validators/yaml-service.validation.js.map +1 -1
  351. package/dist/shared/default-http-client.builder.js.map +1 -1
  352. package/dist/shared/load-controllers.js +20 -0
  353. package/dist/shared/load-controllers.js.map +1 -0
  354. package/dist/shared/runtime-settings.migration.js +53 -0
  355. package/dist/shared/runtime-settings.migration.js.map +1 -0
  356. package/dist/shared/websocket-rpc-extended.adapter.js +15 -14
  357. package/dist/shared/websocket-rpc-extended.adapter.js.map +1 -1
  358. package/dist/shared/websocket.adapter.js +4 -5
  359. package/dist/shared/websocket.adapter.js.map +1 -1
  360. package/dist/state/file-upload-tracker.cache.js +5 -4
  361. package/dist/state/file-upload-tracker.cache.js.map +1 -1
  362. package/dist/state/file.cache.js +1 -1
  363. package/dist/state/file.cache.js.map +1 -1
  364. package/dist/state/floor.store.js +6 -6
  365. package/dist/state/floor.store.js.map +1 -1
  366. package/dist/state/printer-events.cache.js +21 -22
  367. package/dist/state/printer-events.cache.js.map +1 -1
  368. package/dist/state/printer-files.store.js +6 -8
  369. package/dist/state/printer-files.store.js.map +1 -1
  370. package/dist/state/printer-socket.store.js +27 -50
  371. package/dist/state/printer-socket.store.js.map +1 -1
  372. package/dist/state/printer-thumbnail.cache.js +5 -9
  373. package/dist/state/printer-thumbnail.cache.js.map +1 -1
  374. package/dist/state/printer.cache.js +14 -12
  375. package/dist/state/printer.cache.js.map +1 -1
  376. package/dist/state/settings.store.js +74 -50
  377. package/dist/state/settings.store.js.map +1 -1
  378. package/dist/state/socket-io.gateway.js +39 -36
  379. package/dist/state/socket-io.gateway.js.map +1 -1
  380. package/dist/state/test-printer-socket.store.js +20 -15
  381. package/dist/state/test-printer-socket.store.js.map +1 -1
  382. package/dist/state/validation/create-test-printer.validation.js +13 -11
  383. package/dist/state/validation/create-test-printer.validation.js.map +1 -1
  384. package/dist/task.presets.js.map +1 -1
  385. package/dist/tasks/boot.task.js +14 -19
  386. package/dist/tasks/boot.task.js.map +1 -1
  387. package/dist/tasks/client-bundle.task.js +1 -3
  388. package/dist/tasks/client-bundle.task.js.map +1 -1
  389. package/dist/tasks/print-completion.socketio.task.js +27 -28
  390. package/dist/tasks/print-completion.socketio.task.js.map +1 -1
  391. package/dist/tasks/printer-file-clean.task.js +6 -10
  392. package/dist/tasks/printer-file-clean.task.js.map +1 -1
  393. package/dist/tasks/printer-websocket-restore.task.js +3 -14
  394. package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
  395. package/dist/tasks/printer-websocket.task.js +2 -14
  396. package/dist/tasks/printer-websocket.task.js.map +1 -1
  397. package/dist/tasks/socketio.task.js +6 -33
  398. package/dist/tasks/socketio.task.js.map +1 -1
  399. package/dist/tasks/software-update.task.js +1 -1
  400. package/dist/tasks/software-update.task.js.map +1 -1
  401. package/dist/tasks.js +3 -3
  402. package/dist/tasks.js.map +1 -1
  403. package/dist/utils/array.util.js.map +1 -1
  404. package/dist/utils/cache/key-diff.cache.js.map +1 -1
  405. package/dist/utils/env.utils.js +0 -2
  406. package/dist/utils/env.utils.js.map +1 -1
  407. package/dist/utils/normalize-url.js +3 -2
  408. package/dist/utils/normalize-url.js.map +1 -1
  409. package/dist/utils/printer-type.utils.js.map +1 -1
  410. package/dist/utils/time.utils.js +7 -17
  411. package/dist/utils/time.utils.js.map +1 -1
  412. package/dist/utils/url.utils.js +3 -4
  413. package/dist/utils/url.utils.js.map +1 -1
  414. package/package.json +46 -48
  415. package/tsconfig.json +2 -1
  416. package/.yarn/releases/yarn-4.7.0.cjs +0 -935
  417. package/dist/consoles/check-ports.js +0 -170
  418. package/dist/consoles/check-ports.js.map +0 -1
  419. package/dist/consoles/http-file-receiver.console.js +0 -81
  420. package/dist/consoles/http-file-receiver.console.js.map +0 -1
  421. package/dist/consoles/sqlite-torm.js +0 -31
  422. package/dist/consoles/sqlite-torm.js.map +0 -1
  423. package/dist/consoles/upload-test.js +0 -52
  424. package/dist/consoles/upload-test.js.map +0 -1
  425. package/dist/controllers/plugin-firmware-update.controller.js +0 -234
  426. package/dist/controllers/plugin-firmware-update.controller.js.map +0 -1
  427. package/dist/entities/base.entity.js +0 -29
  428. package/dist/entities/base.entity.js.map +0 -1
  429. package/dist/entities/printer-file.entity.js +0 -140
  430. package/dist/entities/printer-file.entity.js.map +0 -1
  431. package/dist/handlers/cache-manager.js +0 -18
  432. package/dist/handlers/cache-manager.js.map +0 -1
  433. package/dist/models/PrinterFile.js +0 -44
  434. package/dist/models/PrinterFile.js.map +0 -1
  435. package/dist/services/core/task-manager.service.js.map +0 -1
  436. package/dist/services/octoprint/dto/plugin.dto.js.map +0 -1
  437. package/dist/services/octoprint/plugin-base.service.js +0 -101
  438. package/dist/services/octoprint/plugin-base.service.js.map +0 -1
  439. package/dist/services/octoprint/plugin-firmware-update.service.js +0 -100
  440. package/dist/services/octoprint/plugin-firmware-update.service.js.map +0 -1
  441. package/dist/services/octoprint/plugin-repository.cache.js +0 -46
  442. package/dist/services/octoprint/plugin-repository.cache.js.map +0 -1
  443. package/dist/utils/benchmark.util.js +0 -39
  444. package/dist/utils/benchmark.util.js.map +0 -1
  445. package/dist/utils/is-docker.js +0 -40
  446. package/dist/utils/is-docker.js.map +0 -1
  447. package/dist/utils/metric.utils.js +0 -35
  448. package/dist/utils/metric.utils.js.map +0 -1
@@ -8,70 +8,25 @@ Object.defineProperty(exports, "OctoprintClient", {
8
8
  return OctoprintClient;
9
9
  }
10
10
  });
11
- const _fs = /*#__PURE__*/ _interop_require_wildcard(require("fs"));
12
- const _path = /*#__PURE__*/ _interop_require_default(require("path"));
11
+ const _fs = require("fs");
13
12
  const _formdata = /*#__PURE__*/ _interop_require_default(require("form-data"));
14
- const _octoprintserviceconstants = require("./constants/octoprint-service.constants");
15
13
  const _eventconstants = require("../../constants/event.constants");
16
14
  const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
17
15
  const _octoprintapiroutes = require("./octoprint-api.routes");
18
16
  const _fileutils = require("./utils/file.utils");
19
- const _node = require("@sentry/node");
20
17
  const _octoprinthttpclientbuilder = require("./utils/octoprint-http-client.builder");
21
18
  function _interop_require_default(obj) {
22
19
  return obj && obj.__esModule ? obj : {
23
20
  default: obj
24
21
  };
25
22
  }
26
- function _getRequireWildcardCache(nodeInterop) {
27
- if (typeof WeakMap !== "function") return null;
28
- var cacheBabelInterop = new WeakMap();
29
- var cacheNodeInterop = new WeakMap();
30
- return (_getRequireWildcardCache = function(nodeInterop) {
31
- return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
32
- })(nodeInterop);
33
- }
34
- function _interop_require_wildcard(obj, nodeInterop) {
35
- if (!nodeInterop && obj && obj.__esModule) {
36
- return obj;
37
- }
38
- if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
39
- return {
40
- default: obj
41
- };
42
- }
43
- var cache = _getRequireWildcardCache(nodeInterop);
44
- if (cache && cache.has(obj)) {
45
- return cache.get(obj);
46
- }
47
- var newObj = {
48
- __proto__: null
49
- };
50
- var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
51
- for(var key in obj){
52
- if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
53
- var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
54
- if (desc && (desc.get || desc.set)) {
55
- Object.defineProperty(newObj, key, desc);
56
- } else {
57
- newObj[key] = obj[key];
58
- }
59
- }
60
- }
61
- newObj.default = obj;
62
- if (cache) {
63
- cache.set(obj, newObj);
64
- }
65
- return newObj;
66
- }
67
23
  class OctoprintClient extends _octoprintapiroutes.OctoprintRoutes {
68
- eventEmitter2;
69
24
  httpClientFactory;
25
+ eventEmitter2;
26
+ settingsStore;
70
27
  logger;
71
- constructor({ httpClientFactory, loggerFactory, eventEmitter2 }){
72
- super();
73
- this.httpClientFactory = httpClientFactory;
74
- this.eventEmitter2 = eventEmitter2;
28
+ constructor(loggerFactory, httpClientFactory, eventEmitter2, settingsStore){
29
+ super(), this.httpClientFactory = httpClientFactory, this.eventEmitter2 = eventEmitter2, this.settingsStore = settingsStore;
75
30
  this.logger = loggerFactory(OctoprintClient.name);
76
31
  }
77
32
  async getApiVersion(login) {
@@ -81,7 +36,9 @@ class OctoprintClient extends _octoprintapiroutes.OctoprintRoutes {
81
36
  return await this.createClient(login).get(this.apiServer);
82
37
  }
83
38
  async login(login) {
84
- return await this.createClient(login).post(this.apiLogin);
39
+ return await this.createClient(login).post(this.apiLogin, {
40
+ passive: true
41
+ });
85
42
  }
86
43
  async sendConnectionCommand(login, commandData) {
87
44
  await this.createClient(login).post(this.apiConnection, commandData);
@@ -141,10 +98,6 @@ class OctoprintClient extends _octoprintapiroutes.OctoprintRoutes {
141
98
  const settingPatch = this.printerNameSetting(printerName);
142
99
  return await this.createClient(login).post(this.apiSettingsPart, settingPatch);
143
100
  }
144
- async updateFirmwareUpdaterSettings(login, firmwareUpdateConfig) {
145
- const settingPatch = this.pluginFirmwareUpdaterSettings(firmwareUpdateConfig);
146
- return await this.createClient(login).post(this.apiSettingsPart, settingPatch);
147
- }
148
101
  async setGCodeAnalysis(login, enabled) {
149
102
  const settingPatch = this.gcodeAnalysisSetting(enabled);
150
103
  return await this.createClient(login).post(this.apiSettingsPart, settingPatch);
@@ -168,13 +121,7 @@ class OctoprintClient extends _octoprintapiroutes.OctoprintRoutes {
168
121
  async getFile(login, path) {
169
122
  const urlPath = this.apiFile(path);
170
123
  const response = await this.createClient(login).get(urlPath);
171
- try {
172
- return (0, _fileutils.normalizePrinterFile)(response?.data);
173
- } catch (e) {
174
- (0, _node.captureException)(e);
175
- this.logger.error("File was empty or normalization failed");
176
- return;
177
- }
124
+ return (0, _fileutils.normalizePrinterFile)(response?.data);
178
125
  }
179
126
  async downloadFile(login, path) {
180
127
  const urlPath = this.downloadFileLocal(path);
@@ -206,13 +153,10 @@ class OctoprintClient extends _octoprintapiroutes.OctoprintRoutes {
206
153
  const command = this.selectCommand(print);
207
154
  await this.createClient(login).post(this.apiFile(path), command);
208
155
  }
209
- async uploadFileAsMultiPart(login, multerFileOrBuffer, commands, progressToken) {
156
+ async uploadFileAsMultiPart(login, multerFileOrBuffer, startPrint, progressToken) {
210
157
  const urlPath = this.apiFilesLocal;
211
158
  const formData = new _formdata.default();
212
- if (commands.select) {
213
- formData.append("select", "true");
214
- }
215
- if (commands.print) {
159
+ if (startPrint) {
216
160
  formData.append("print", "true");
217
161
  }
218
162
  let fileBuffer = multerFileOrBuffer.buffer;
@@ -232,12 +176,12 @@ class OctoprintClient extends _octoprintapiroutes.OctoprintRoutes {
232
176
  }
233
177
  const result = await new Promise((resolve, reject)=>{
234
178
  return formData.getLength((err, length)=>{
235
- if (err) resolve(null);
179
+ if (err) reject(new Error("Could not retrieve formData length"));
236
180
  resolve(length);
237
181
  });
238
182
  });
239
183
  try {
240
- const response = await this.createClient(login, (builder)=>builder.withMultiPartFormData().withHeaders({
184
+ const response = await this.createClient(login, (builder)=>builder.withMultiPartFormData().withTimeout(this.settingsStore.getTimeoutSettings().apiUploadTimeout).withHeaders({
241
185
  ...formData.getHeaders(),
242
186
  "Content-Length": result.toString()
243
187
  }).withOnUploadProgress((p)=>{
@@ -245,10 +189,14 @@ class OctoprintClient extends _octoprintapiroutes.OctoprintRoutes {
245
189
  this.eventEmitter2.emit(`${(0, _eventconstants.uploadProgressEvent)(progressToken)}`, progressToken, p);
246
190
  }
247
191
  })).post(urlPath, formData);
248
- this.eventEmitter2.emit(`${(0, _eventconstants.uploadDoneEvent)(progressToken)}`, progressToken);
192
+ if (progressToken) {
193
+ this.eventEmitter2.emit(`${(0, _eventconstants.uploadDoneEvent)(progressToken)}`, progressToken);
194
+ }
249
195
  return response.data;
250
196
  } catch (e) {
251
- this.eventEmitter2.emit(`${(0, _eventconstants.uploadFailedEvent)(progressToken)}`, progressToken, e?.message);
197
+ if (progressToken) {
198
+ this.eventEmitter2.emit(`${(0, _eventconstants.uploadFailedEvent)(progressToken)}`, progressToken, e?.message);
199
+ }
252
200
  let data;
253
201
  try {
254
202
  data = JSON.parse(e.response?.body);
@@ -277,66 +225,6 @@ class OctoprintClient extends _octoprintapiroutes.OctoprintRoutes {
277
225
  async getPrinterProfiles(login) {
278
226
  return await this.createClient(login).get(this.apiPrinterProfiles);
279
227
  }
280
- async postSoftwareUpdate(login, targets) {
281
- return await this.createClient(login).post(this.pluginSoftwareUpdateUpdate, {
282
- targets
283
- });
284
- }
285
- async getPluginManagerPlugins(login) {
286
- return await this.createClient(login).get(this.pluginManagerPlugins);
287
- }
288
- async getPluginManagerPlugin(login, pluginName) {
289
- const urlPath = this.pluginManagerPlugin(pluginName);
290
- return await this.createClient(login).get(urlPath);
291
- }
292
- async postApiPluginManagerCommand(login, pluginCommand, pluginUrl) {
293
- const command = this.pluginManagerCommand(pluginCommand, pluginUrl);
294
- return await this.createClient(login).post(this.apiPluginManager, command);
295
- }
296
- async postPluginFirmwareUpdateFlash(currentPrinterId, login, firmwarePath) {
297
- const urlPath = this.pluginFirmwareUpdaterFlash;
298
- const formData = new _formdata.default();
299
- formData.append("port", "/dev/op2");
300
- formData.append("profile", "default");
301
- const filename = _path.default.basename(firmwarePath);
302
- const fileReadStream = _fs.default.createReadStream(firmwarePath);
303
- formData.append("file", fileReadStream, {
304
- filename
305
- });
306
- try {
307
- const response = await this.createClient(login, (builder)=>builder.withMultiPartFormData().withHeaders({
308
- ...formData.getHeaders()
309
- }).withOnUploadProgress((p)=>{
310
- if (currentPrinterId) {
311
- this.eventEmitter2.emit(`${(0, _eventconstants.firmwareFlashUploadEvent)(currentPrinterId)}`, currentPrinterId, p);
312
- }
313
- })).post(urlPath, formData);
314
- return response?.data;
315
- } catch (e) {
316
- this.eventEmitter2.emit(`${(0, _eventconstants.uploadProgressEvent)(currentPrinterId.toString())}`, currentPrinterId, {
317
- failed: true
318
- }, e);
319
- let data;
320
- try {
321
- data = JSON.parse(e.response?.body);
322
- } catch {
323
- data = e.response?.body;
324
- }
325
- throw new _runtimeexceptions.ExternalServiceError({
326
- error: e.message,
327
- statusCode: e.response?.statusCode,
328
- data,
329
- success: false,
330
- stack: e.stack
331
- }, "OctoPrint");
332
- }
333
- }
334
- async getPluginFirmwareUpdateStatus(login) {
335
- return await this.createClient(login).get(this.pluginFirmwareUpdaterStatus);
336
- }
337
- async fetchOctoPrintPlugins() {
338
- return await this.createAnonymousClient(_octoprintserviceconstants.pluginRepositoryUrl).get("");
339
- }
340
228
  async getSystemInfo(login) {
341
229
  return await this.createClient(login).get(this.apiSystemInfo);
342
230
  }
@@ -346,67 +234,6 @@ class OctoprintClient extends _octoprintapiroutes.OctoprintRoutes {
346
234
  async postServerRestartCommand(login) {
347
235
  await this.createClient(login).post(this.apiServerRestartCommand);
348
236
  }
349
- async getSoftwareUpdateCheck(login, force) {
350
- return await this.createClient(login).get(this.apiSoftwareUpdateCheck(force));
351
- }
352
- async getPluginPiSupport(login) {
353
- return await this.createClient(login).get(this.apiPluginPiSupport);
354
- }
355
- async deleteTimeLapse(login, fileName) {
356
- const urlPath = `${this.apiTimelapse}/${fileName}`;
357
- await this.createClient(login).delete(urlPath);
358
- }
359
- async listUnrenderedTimeLapses(login) {
360
- const urlPath = `${this.apiTimelapse}?unrendered=true`;
361
- return await this.createClient(login).get(urlPath);
362
- }
363
- async listProfiles(login) {
364
- return await this.createClient(login).get(this.apiProfiles);
365
- }
366
- async getBackupOverview(login) {
367
- return await this.createClient(login).get(this.pluginBackupIndex);
368
- }
369
- async getBackups(login) {
370
- return await this.createClient(login).get(this.pluginBackupEndpoint);
371
- }
372
- async createBackup(login, excludeArray) {
373
- return await this.createClient(login).post(this.pluginBackupEndpoint, {
374
- exclude: excludeArray
375
- });
376
- }
377
- async getDownloadBackupStream(login, filename) {
378
- const response = await this.createClient(login, (builder)=>{
379
- builder.withStreamResponse();
380
- }).get(this.pluginBackupFileDownload(filename)).catch((e)=>{
381
- throw new _runtimeexceptions.ExternalServiceError({
382
- error: e.message,
383
- statusCode: e.response?.statusCode,
384
- success: false,
385
- stack: e.stack
386
- }, "OctoPrint");
387
- });
388
- return response?.data;
389
- }
390
- async forwardRestoreBackupFileStream(login, buffer) {
391
- const formData = new _formdata.default();
392
- formData.append("file", buffer, {
393
- filename: "op-fdmm-restore.zip"
394
- });
395
- const response = await this.createClient(login, (builder)=>builder.withMultiPartFormData().withHeaders({
396
- ...formData.getHeaders()
397
- })).post(this.pluginBackupFileRestore, formData).catch((e)=>{
398
- throw new _runtimeexceptions.ExternalServiceError({
399
- error: e.message,
400
- statusCode: e.response?.statusCode,
401
- success: false,
402
- stack: e.stack
403
- }, "OctoPrint");
404
- });
405
- return response?.data;
406
- }
407
- async deleteBackup(login, filename) {
408
- return await this.createClient(login).delete(this.pluginBackupFile(filename));
409
- }
410
237
  createClient(login, buildFluentOptions) {
411
238
  const baseAddress = login.printerURL;
412
239
  return this.createAnonymousClient(baseAddress, (o)=>{
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/services/octoprint/octoprint.client.ts"],"names":["OctoprintClient","OctoprintRoutes","eventEmitter2","httpClientFactory","logger","constructor","loggerFactory","name","getApiVersion","login","createClient","get","apiVersion","getServer","apiServer","post","apiLogin","sendConnectionCommand","commandData","apiConnection","sendPrintHeadJogCommand","amounts","axesToHome","x","y","z","command","sendPrintHeadCommand","sendPrintHeadHomeCommand","axes","apiPrinterHead","sendCustomGCodeCommand","commandString","apiPrinterCustomCommand","getJob","apiJob","sendJobCommand","sendBedTempCommand","targetTemp","data","getBedTargetCommand","apiPrinterBed","getSettings","apiSettingsPart","updatePrinterNameSetting","printerName","settingPatch","printerNameSetting","updateFirmwareUpdaterSettings","firmwareUpdateConfig","pluginFirmwareUpdaterSettings","setGCodeAnalysis","enabled","gcodeAnalysisSetting","getCurrentUser","apiCurrentUser","getAdminUserOrDefault","currentUserResponse","getUsers","apiUsers","getLocalFiles","recursive","response","apiGetFiles","files","filter","f","date","type","map","normalizePrinterFile","getFile","path","urlPath","apiFile","e","captureException","error","downloadFile","downloadFileLocal","responseType","getFileChunk","filePath","startBytes","endBytes","pathUrl","o","withHeaders","Range","createFolder","foldername","formData","FormData","append","headers","getHeaders","getLengthSync","toString","apiFilesLocal","moveFileOrFolder","destination","moveFileCommand","postSelectPrintFile","print","selectCommand","uploadFileAsMultiPart","multerFileOrBuffer","commands","progressToken","select","fileBuffer","buffer","filename","originalname","log","fileStream","createReadStream","result","Promise","resolve","reject","getLength","err","length","builder","withMultiPartFormData","withOnUploadProgress","p","emit","uploadProgressEvent","uploadDoneEvent","uploadFailedEvent","message","JSON","parse","body","ExternalServiceError","statusCode","success","stack","deleteFileOrFolder","delete","getPrinterCurrent","history","limit","exclude","apiPrinterCurrent","getConnection","getPrinterProfiles","apiPrinterProfiles","postSoftwareUpdate","targets","pluginSoftwareUpdateUpdate","getPluginManagerPlugins","pluginManagerPlugins","getPluginManagerPlugin","pluginName","pluginManagerPlugin","postApiPluginManagerCommand","pluginCommand","pluginUrl","pluginManagerCommand","apiPluginManager","postPluginFirmwareUpdateFlash","currentPrinterId","firmwarePath","pluginFirmwareUpdaterFlash","basename","fileReadStream","fs","firmwareFlashUploadEvent","failed","getPluginFirmwareUpdateStatus","pluginFirmwareUpdaterStatus","fetchOctoPrintPlugins","createAnonymousClient","pluginRepositoryUrl","getSystemInfo","apiSystemInfo","getSystemCommands","apiSystemCommands","postServerRestartCommand","apiServerRestartCommand","getSoftwareUpdateCheck","force","apiSoftwareUpdateCheck","getPluginPiSupport","apiPluginPiSupport","deleteTimeLapse","fileName","apiTimelapse","listUnrenderedTimeLapses","listProfiles","apiProfiles","getBackupOverview","pluginBackupIndex","getBackups","pluginBackupEndpoint","createBackup","excludeArray","getDownloadBackupStream","withStreamResponse","pluginBackupFileDownload","catch","forwardRestoreBackupFileStream","pluginBackupFileRestore","deleteBackup","pluginBackupFile","buildFluentOptions","baseAddress","printerURL","withXApiKeyHeader","apiKey","OctoprintHttpClientBuilder","createClientWithBaseUrl","b"],"mappings":"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"}
1
+ {"version":3,"sources":["../../../src/services/octoprint/octoprint.client.ts"],"names":["OctoprintClient","OctoprintRoutes","logger","constructor","loggerFactory","httpClientFactory","eventEmitter2","settingsStore","name","getApiVersion","login","createClient","get","apiVersion","getServer","apiServer","post","apiLogin","passive","sendConnectionCommand","commandData","apiConnection","sendPrintHeadJogCommand","amounts","axesToHome","x","y","z","command","sendPrintHeadCommand","sendPrintHeadHomeCommand","axes","apiPrinterHead","sendCustomGCodeCommand","commandString","apiPrinterCustomCommand","getJob","apiJob","sendJobCommand","sendBedTempCommand","targetTemp","data","getBedTargetCommand","apiPrinterBed","getSettings","apiSettingsPart","updatePrinterNameSetting","printerName","settingPatch","printerNameSetting","setGCodeAnalysis","enabled","gcodeAnalysisSetting","getCurrentUser","apiCurrentUser","getAdminUserOrDefault","currentUserResponse","getUsers","apiUsers","getLocalFiles","recursive","response","apiGetFiles","files","filter","f","date","type","map","normalizePrinterFile","getFile","path","urlPath","apiFile","downloadFile","downloadFileLocal","responseType","getFileChunk","filePath","startBytes","endBytes","pathUrl","o","withHeaders","Range","createFolder","foldername","formData","FormData","append","headers","getHeaders","getLengthSync","toString","apiFilesLocal","moveFileOrFolder","destination","moveFileCommand","postSelectPrintFile","print","selectCommand","uploadFileAsMultiPart","multerFileOrBuffer","startPrint","progressToken","fileBuffer","buffer","filename","originalname","log","fileStream","createReadStream","result","Promise","resolve","reject","getLength","err","length","Error","builder","withMultiPartFormData","withTimeout","getTimeoutSettings","apiUploadTimeout","withOnUploadProgress","p","emit","uploadProgressEvent","uploadDoneEvent","e","uploadFailedEvent","message","JSON","parse","body","ExternalServiceError","error","statusCode","success","stack","deleteFileOrFolder","delete","getPrinterCurrent","history","limit","exclude","apiPrinterCurrent","getConnection","getPrinterProfiles","apiPrinterProfiles","getSystemInfo","apiSystemInfo","getSystemCommands","apiSystemCommands","postServerRestartCommand","apiServerRestartCommand","buildFluentOptions","baseAddress","printerURL","createAnonymousClient","withXApiKeyHeader","apiKey","OctoprintHttpClientBuilder","createClientWithBaseUrl","b"],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/services/octoprint/utils/octoprint-http-client.builder.ts"],"names":["OctoprintHttpClientBuilder","DefaultHttpClientBuilder","build","axiosOptions","baseURL","Error","withXApiKeyHeader","apiKey","length","withHeaders","apiKeyHeaderKey"],"mappings":";;;;+BAIaA;;;eAAAA;;;0CAJ4B;2CACT;AAGzB,MAAMA,mCAAmCC,kDAAwB;IACtDC,QAAgC;QAC9C,IAAI,CAAC,IAAI,CAACC,YAAY,CAACC,OAAO,EAAE;YAC9B,MAAM,IAAIC,MAAM;QAClB;QAEA,OAAO,KAAK,CAACH;IACf;IAEOI,kBAAkBC,MAAc,EAA8B;QACnE,IAAI,CAACA,QAAQC,QAAQ;YACnB,MAAM,IAAIH,MAAM;QAClB;QAEA,IAAI,CAACI,WAAW,CAAC;YAAE,CAACC,0CAAe,CAAC,EAAEH;QAAO;QAE7C,OAAO,IAAI;IACb;AACF"}
1
+ {"version":3,"sources":["../../../../src/services/octoprint/utils/octoprint-http-client.builder.ts"],"names":["OctoprintHttpClientBuilder","DefaultHttpClientBuilder","build","axiosOptions","baseURL","Error","withXApiKeyHeader","apiKey","length","withHeaders","apiKeyHeaderKey"],"mappings":";;;;+BAIaA;;;eAAAA;;;0CAJ4B;2CACT;AAGzB,MAAMA,mCAAmCC,kDAAwB;IACtDC,QAAgC;QAC9C,IAAI,CAAC,IAAI,CAACC,YAAY,CAACC,OAAO,EAAE;YAC9B,MAAM,IAAIC,MAAM;QAClB;QAEA,OAAO,KAAK,CAACH;IACf;IAEOI,kBAAkBC,MAAe,EAAQ;QAC9C,IAAI,CAACA,QAAQC,QAAQ;YACnB,MAAM,IAAIH,MAAM;QAClB;QAEA,IAAI,CAACI,WAAW,CAAC;YAAE,CAACC,0CAAe,CAAC,EAAEH;QAAO;QAE7C,OAAO,IAAI;IACb;AACF"}
@@ -11,21 +11,21 @@ Object.defineProperty(exports, "OctoprintApi", {
11
11
  const _printerapiinterface = require("./printer-api.interface");
12
12
  const _runtimeexceptions = require("../exceptions/runtime.exceptions");
13
13
  class OctoprintApi {
14
- client;
15
14
  printerLogin;
16
- constructor({ octoprintClient, printerLogin }){
17
- this.client = octoprintClient;
15
+ client;
16
+ constructor(octoprintClient, printerLogin){
18
17
  this.printerLogin = printerLogin;
18
+ this.client = octoprintClient;
19
19
  }
20
20
  get type() {
21
21
  return _printerapiinterface.OctoprintType;
22
22
  }
23
- set login(login) {
24
- this.printerLogin = login;
25
- }
26
23
  get login() {
27
24
  return this.printerLogin;
28
25
  }
26
+ set login(login) {
27
+ this.printerLogin = login;
28
+ }
29
29
  async getVersion() {
30
30
  const result = await this.client.getApiVersion(this.login);
31
31
  return result.data?.server;
@@ -70,12 +70,7 @@ class OctoprintApi {
70
70
  await this.client.sendPrintHeadHomeCommand(this.login, axes);
71
71
  }
72
72
  async getFile(path) {
73
- const file = await this.client.getFile(this.login, path);
74
- return {
75
- path: file.path,
76
- size: file.size,
77
- date: file.date
78
- };
73
+ return this.client.getFile(this.login, path);
79
74
  }
80
75
  async getFiles() {
81
76
  const files = await this.client.getLocalFiles(this.login, false);
@@ -91,11 +86,8 @@ class OctoprintApi {
91
86
  async getFileChunk(path, startBytes, endBytes) {
92
87
  return await this.client.getFileChunk(this.login, path, startBytes, endBytes);
93
88
  }
94
- async uploadFile(fileOrBuffer, uploadToken) {
95
- await this.client.uploadFileAsMultiPart(this.login, fileOrBuffer, {
96
- select: true,
97
- print: true
98
- }, uploadToken);
89
+ async uploadFile(fileOrBuffer, startPrint, uploadToken) {
90
+ await this.client.uploadFileAsMultiPart(this.login, fileOrBuffer, startPrint, uploadToken);
99
91
  }
100
92
  async deleteFile(path) {
101
93
  await this.client.deleteFileOrFolder(this.login, path);
@@ -113,7 +105,7 @@ class OctoprintApi {
113
105
  const selectedJobResponse = await this.client.getJob(this.login);
114
106
  const selectedJob = selectedJobResponse.data;
115
107
  const currentJobFile = selectedJob?.job?.file;
116
- if (!currentJobFile?.name) {
108
+ if (!currentJobFile?.path) {
117
109
  return {
118
110
  connectionState,
119
111
  reprintState: _printerapiinterface.ReprintState.NoLastPrint
@@ -125,7 +117,6 @@ class OctoprintApi {
125
117
  reprintState: _printerapiinterface.ReprintState.LastPrintReady
126
118
  };
127
119
  }
128
- async getThumbnail() {}
129
120
  }
130
121
 
131
122
  //# sourceMappingURL=octoprint.api.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/services/octoprint.api.ts"],"names":["OctoprintApi","client","printerLogin","constructor","octoprintClient","type","OctoprintType","login","getVersion","result","getApiVersion","data","server","connect","sendConnectionCommand","connectCommand","disconnect","disconnectCommand","restartServer","postServerRestartCommand","restartHost","NotImplementedException","restartPrinterFirmware","startPrint","filePath","postSelectPrintFile","pausePrint","sendJobCommand","pauseJobCommand","resumePrint","resumeJobCommand","cancelPrint","cancelJobCommand","sendGcode","script","sendCustomGCodeCommand","quickStop","movePrintHead","amounts","sendPrintHeadJogCommand","homeAxes","axes","sendPrintHeadHomeCommand","getFile","path","file","size","date","getFiles","files","getLocalFiles","map","f","downloadFile","getFileChunk","startBytes","endBytes","uploadFile","fileOrBuffer","uploadToken","uploadFileAsMultiPart","select","print","deleteFile","deleteFileOrFolder","deleteFolder","getSettings","response","getReprintState","connectedResponse","getConnection","connectionState","current","state","selectedJobResponse","getJob","selectedJob","currentJobFile","job","name","reprintState","ReprintState","NoLastPrint","LastPrintReady","getThumbnail"],"mappings":"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"}
1
+ {"version":3,"sources":["../../src/services/octoprint.api.ts"],"names":["OctoprintApi","client","constructor","octoprintClient","printerLogin","type","OctoprintType","login","getVersion","result","getApiVersion","data","server","connect","sendConnectionCommand","connectCommand","disconnect","disconnectCommand","restartServer","postServerRestartCommand","restartHost","NotImplementedException","restartPrinterFirmware","startPrint","filePath","postSelectPrintFile","pausePrint","sendJobCommand","pauseJobCommand","resumePrint","resumeJobCommand","cancelPrint","cancelJobCommand","sendGcode","script","sendCustomGCodeCommand","quickStop","movePrintHead","amounts","sendPrintHeadJogCommand","homeAxes","axes","sendPrintHeadHomeCommand","getFile","path","getFiles","files","getLocalFiles","map","f","size","date","downloadFile","getFileChunk","startBytes","endBytes","uploadFile","fileOrBuffer","uploadToken","uploadFileAsMultiPart","deleteFile","deleteFileOrFolder","deleteFolder","getSettings","response","getReprintState","connectedResponse","getConnection","connectionState","current","state","selectedJobResponse","getJob","selectedJob","currentJobFile","job","file","reprintState","ReprintState","NoLastPrint","LastPrintReady"],"mappings":"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"}
@@ -16,11 +16,11 @@ function BaseService(entity, dto, createDTO, updateDto) {
16
16
  class BaseServiceHost {
17
17
  typeormService;
18
18
  repository;
19
- constructor({ typeormService }){
19
+ constructor(typeormService){
20
20
  this.typeormService = typeormService;
21
21
  this.repository = typeormService.getDataSource().getRepository(entity);
22
22
  }
23
- async get(id, throwIfNotFound = true, options) {
23
+ async get(id, options) {
24
24
  try {
25
25
  if (id === null || id === undefined) {
26
26
  throw new _typeorm.EntityNotFoundError(entity, "Id was not provided");
@@ -32,10 +32,10 @@ function BaseService(entity, dto, createDTO, updateDto) {
32
32
  }
33
33
  });
34
34
  } catch (e) {
35
- if (throwIfNotFound && e instanceof _typeorm.EntityNotFoundError) {
35
+ if (e instanceof _typeorm.EntityNotFoundError) {
36
36
  throw new _runtimeexceptions.NotFoundException(`The entity ${entity} with the provided id was not found`);
37
37
  }
38
- return undefined;
38
+ throw e;
39
39
  }
40
40
  }
41
41
  async list(options) {
@@ -56,20 +56,19 @@ function BaseService(entity, dto, createDTO, updateDto) {
56
56
  return await this.get(id);
57
57
  }
58
58
  async create(dto) {
59
- if (dto.id) {
60
- delete dto.id;
59
+ if ("id" in dto && dto.id !== undefined && dto.id !== null) {
60
+ throw new Error("Cannot create entity with an existing ID. Use update method instead.");
61
61
  }
62
- await (0, _classvalidator.validate)(dto);
63
62
  const entity = this.repository.create(dto);
64
63
  await (0, _classvalidator.validate)(entity);
65
64
  return await this.repository.save(entity);
66
65
  }
67
- async delete(id, throwIfNotFound = true) {
68
- const entity = await this.get(id, throwIfNotFound);
69
- return await this.repository.delete(entity.id);
66
+ async delete(id) {
67
+ const entity = await this.get(id);
68
+ await this.repository.delete(entity.id);
70
69
  }
71
- async deleteMany(ids, emitEvent = true) {
72
- return await this.repository.delete(ids);
70
+ async deleteMany(ids) {
71
+ await this.repository.delete(ids);
73
72
  }
74
73
  }
75
74
  return BaseServiceHost;
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/services/orm/base.service.ts"],"names":["BaseService","entity","dto","createDTO","updateDto","BaseServiceHost","typeormService","repository","constructor","getDataSource","getRepository","get","id","throwIfNotFound","options","undefined","EntityNotFoundError","findOneOrFail","where","e","NotFoundException","list","find","listPaged","page","DEFAULT_PAGE","take","pageSize","skip","update","validate","Object","assign","create","save","delete","deleteMany","ids","emitEvent"],"mappings":";;;;+BAkBgBA;;;eAAAA;;;yBAPT;gCACkB;mCAGS;+BACQ;AAEnC,SAASA,YAKdC,MAAuB,EAAEC,GAAc,EAAEC,SAA2B,EAAEC,SAA2B;IACjG,MAAeC;QACbC,eAA+B;QAC/BC,WAA0B;QAE1BC,YAAY,EAAEF,cAAc,EAAsC,CAAE;YAClE,IAAI,CAACA,cAAc,GAAGA;YACtB,IAAI,CAACC,UAAU,GAAGD,eAAeG,aAAa,GAAGC,aAAa,CAACT;QACjE;QAIA,MAAMU,IAAIC,EAAgB,EAAEC,kBAAkB,IAAI,EAAEC,OAA2B,EAAE;YAC/E,IAAI;gBACF,IAAIF,OAAO,QAAQA,OAAOG,WAAW;oBACnC,MAAM,IAAIC,4BAAmB,CAACf,QAAQ;gBACxC;gBACA,OAAO,IAAI,CAACM,UAAU,CAACU,aAAa,CAAC;oBAAE,GAAGH,OAAO;oBAAEI,OAAO;wBAAEN;oBAAG;gBAAE;YACnE,EAAE,OAAOO,GAAG;gBACV,IAAIN,mBAAmBM,aAAaH,4BAAmB,EAAE;oBACvD,MAAM,IAAII,oCAAiB,CAAC,CAAC,WAAW,EAAEnB,OAAO,mCAAmC,CAAC;gBACvF;gBACA,OAAOc;YACT;QACF;QAEA,MAAMM,KAAKP,OAA4B,EAAE;YACvC,OAAO,IAAI,CAACP,UAAU,CAACe,IAAI,CAACR;QAC9B;QAEA,MAAMS,UAAUC,OAAoBC,2BAAY,EAAEX,OAA4B,EAAE;YAC9E,OAAO,IAAI,CAACP,UAAU,CAACe,IAAI,CAAC;gBAAEI,MAAMF,KAAKG,QAAQ;gBAAEC,MAAMJ,KAAKG,QAAQ,GAAGH,KAAKA,IAAI;gBAAE,GAAGV,OAAO;YAAC;QACjG;QAEA,MAAMe,OAAOjB,EAAgB,EAAER,SAAoB,EAAE;YACnD,MAAMH,SAAS,MAAM,IAAI,CAACU,GAAG,CAACC;YAC9B,MAAMkB,IAAAA,wBAAQ,EAAC1B;YACf,MAAM0B,IAAAA,wBAAQ,EAACC,OAAOC,MAAM,CAAC/B,QAAQG;YACrC,MAAM,IAAI,CAACG,UAAU,CAACsB,MAAM,CAAC5B,OAAOW,EAAE,EAAER;YACxC,OAAO,MAAM,IAAI,CAACO,GAAG,CAACC;QACxB;QAEA,MAAMqB,OAAO/B,GAAc,EAAE;YAE3B,IAAIA,IAAIU,EAAE,EAAE;gBACV,OAAOV,IAAIU,EAAE;YACf;YACA,MAAMkB,IAAAA,wBAAQ,EAAC5B;YACf,MAAMD,SAAS,IAAI,CAACM,UAAU,CAAC0B,MAAM,CAAC/B;YACtC,MAAM4B,IAAAA,wBAAQ,EAAC7B;YAEf,OAAO,MAAM,IAAI,CAACM,UAAU,CAAC2B,IAAI,CAACjC;QACpC;QAEA,MAAMkC,OAAOvB,EAAgB,EAAEC,kBAAkB,IAAI,EAAE;YACrD,MAAMZ,SAAS,MAAM,IAAI,CAACU,GAAG,CAACC,IAAIC;YAClC,OAAO,MAAM,IAAI,CAACN,UAAU,CAAC4B,MAAM,CAAClC,OAAOW,EAAE;QAC/C;QAEA,MAAMwB,WAAWC,GAAmB,EAAEC,YAAY,IAAI,EAAyB;YAC7E,OAAO,MAAM,IAAI,CAAC/B,UAAU,CAAC4B,MAAM,CAACE;QACtC;IACF;IAEA,OAAOhC;AACT"}
1
+ {"version":3,"sources":["../../../src/services/orm/base.service.ts"],"names":["BaseService","entity","dto","createDTO","updateDto","BaseServiceHost","repository","constructor","typeormService","getDataSource","getRepository","get","id","options","undefined","EntityNotFoundError","findOneOrFail","where","e","NotFoundException","list","find","listPaged","page","DEFAULT_PAGE","take","pageSize","skip","update","validate","Object","assign","create","Error","save","delete","deleteMany","ids"],"mappings":";;;;+BASgBA;;;eAAAA;;;yBAN4F;gCACnF;mCAES;+BACQ;AAEnC,SAASA,YAKdC,MAAuB,EAAEC,GAAc,EAAEC,SAA2B,EAAEC,SAA2B;IACjG,MAAeC;;QACbC,WAA0B;QAE1BC,YAAY,AAAmBC,cAA8B,CAAE;iBAAhCA,iBAAAA;YAC7B,IAAI,CAACF,UAAU,GAAGE,eAAeC,aAAa,GAAGC,aAAa,CAACT;QACjE;QAIA,MAAMU,IAAIC,EAAgB,EAAEC,OAA2B,EAAE;YACvD,IAAI;gBACF,IAAID,OAAO,QAAQA,OAAOE,WAAW;oBACnC,MAAM,IAAIC,4BAAmB,CAACd,QAAQ;gBACxC;gBACA,OAAO,IAAI,CAACK,UAAU,CAACU,aAAa,CAAC;oBAAE,GAAGH,OAAO;oBAAEI,OAAO;wBAAEL;oBAAG;gBAAE;YACnE,EAAE,OAAOM,GAAG;gBACV,IAAIA,aAAaH,4BAAmB,EAAE;oBACpC,MAAM,IAAII,oCAAiB,CAAC,CAAC,WAAW,EAAElB,OAAO,mCAAmC,CAAC;gBACvF;gBACA,MAAMiB;YACR;QACF;QAEA,MAAME,KAAKP,OAA4B,EAAE;YACvC,OAAO,IAAI,CAACP,UAAU,CAACe,IAAI,CAACR;QAC9B;QAEA,MAAMS,UAAUC,OAAoBC,2BAAY,EAAEX,OAA4B,EAAE;YAC9E,OAAO,IAAI,CAACP,UAAU,CAACe,IAAI,CAAC;gBAAEI,MAAMF,KAAKG,QAAQ;gBAAEC,MAAMJ,KAAKG,QAAQ,GAAGH,KAAKA,IAAI;gBAAE,GAAGV,OAAO;YAAC;QACjG;QAEA,MAAMe,OAAOhB,EAAgB,EAAER,SAAoB,EAAE;YACnD,MAAMH,SAAS,MAAM,IAAI,CAACU,GAAG,CAACC;YAC9B,MAAMiB,IAAAA,wBAAQ,EAACzB;YACf,MAAMyB,IAAAA,wBAAQ,EAACC,OAAOC,MAAM,CAAC9B,QAAQG;YACrC,MAAM,IAAI,CAACE,UAAU,CAACsB,MAAM,CAAC3B,OAAOW,EAAE,EAAER;YACxC,OAAO,MAAM,IAAI,CAACO,GAAG,CAACC;QACxB;QAEA,MAAMoB,OAAO9B,GAAc,EAAE;YAE3B,IAAI,QAAQA,OAAOA,IAAIU,EAAE,KAAKE,aAAaZ,IAAIU,EAAE,KAAK,MAAM;gBAC1D,MAAM,IAAIqB,MAAM;YAClB;YAEA,MAAMhC,SAAS,IAAI,CAACK,UAAU,CAAC0B,MAAM,CAAC9B;YACtC,MAAM2B,IAAAA,wBAAQ,EAAC5B;YAEf,OAAO,MAAM,IAAI,CAACK,UAAU,CAAC4B,IAAI,CAACjC;QACpC;QAEA,MAAMkC,OAAOvB,EAAgB,EAAE;YAC7B,MAAMX,SAAS,MAAM,IAAI,CAACU,GAAG,CAACC;YAC9B,MAAM,IAAI,CAACN,UAAU,CAAC6B,MAAM,CAAClC,OAAOW,EAAE;QACxC;QAEA,MAAMwB,WAAWC,GAAmB,EAAE;YACpC,MAAM,IAAI,CAAC/B,UAAU,CAAC6B,MAAM,CAACE;QAC/B;IACF;IAEA,OAAOhC;AACT"}
@@ -17,7 +17,11 @@ class CameraStreamService extends (0, _baseservice.BaseService)(_entities.Camera
17
17
  id: entity.id,
18
18
  streamURL: entity.streamURL,
19
19
  name: entity.name,
20
- printerId: entity.printerId
20
+ printerId: entity.printerId,
21
+ aspectRatio: entity.aspectRatio,
22
+ rotationClockwise: entity.rotationClockwise,
23
+ flipHorizontal: entity.flipHorizontal,
24
+ flipVertical: entity.flipVertical
21
25
  };
22
26
  }
23
27
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/services/orm/camera-stream.service.ts"],"names":["CameraStreamService","BaseService","CameraStream","CameraStreamDto","CreateCameraStreamDto","toDto","entity","id","streamURL","name","printerId"],"mappings":";;;;+BAMaA;;;eAAAA;;;6BANe;0BACC;iCAC0B;AAIhD,MAAMA,4BACHC,IAAAA,wBAAW,EAACC,sBAAY,EAAEC,gCAAe,EAAEC,sCAAqB;IAGxEC,MAAMC,MAAoB,EAAiC;QAEzD,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,WAAWF,OAAOE,SAAS;YAC3BC,MAAMH,OAAOG,IAAI;YACjBC,WAAWJ,OAAOI,SAAS;QAO7B;IACF;AACF"}
1
+ {"version":3,"sources":["../../../src/services/orm/camera-stream.service.ts"],"names":["CameraStreamService","BaseService","CameraStream","CameraStreamDto","CreateCameraStreamDto","toDto","entity","id","streamURL","name","printerId","aspectRatio","rotationClockwise","flipHorizontal","flipVertical"],"mappings":";;;;+BAMaA;;;eAAAA;;;6BANe;0BACC;iCAC0B;AAIhD,MAAMA,4BACHC,IAAAA,wBAAW,EAACC,sBAAY,EAAEC,gCAAe,EAAEC,sCAAqB;IAGxEC,MAAMC,MAAoB,EAAiC;QAEzD,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,WAAWF,OAAOE,SAAS;YAC3BC,MAAMH,OAAOG,IAAI;YACjBC,WAAWJ,OAAOI,SAAS;YAC3BC,aAAaL,OAAOK,WAAW;YAC/BC,mBAAmBN,OAAOM,iBAAiB;YAC3CC,gBAAgBP,OAAOO,cAAc;YACrCC,cAAcR,OAAOQ,YAAY;QACnC;IACF;AACF"}
@@ -25,8 +25,8 @@ class CustomGcodeService extends (0, _baseservice.BaseService)(_entities.CustomG
25
25
  async create(gcodeScript) {
26
26
  return await super.create(gcodeScript);
27
27
  }
28
- async delete(gcodeScriptId, throwIfNotFound) {
29
- return await super.delete(gcodeScriptId, throwIfNotFound);
28
+ async delete(gcodeScriptId) {
29
+ await super.delete(gcodeScriptId);
30
30
  }
31
31
  async get(gcodeScriptId) {
32
32
  return await super.get(gcodeScriptId);
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/services/orm/custom-gcode.service.ts"],"names":["CustomGcodeService","BaseService","CustomGcode","CustomGcodeDto","toDto","entity","id","name","description","gcode","create","gcodeScript","delete","gcodeScriptId","throwIfNotFound","get","list","update","updatedData"],"mappings":";;;;+BAMaA;;;eAAAA;;;0BALe;gCAEG;6BACH;AAErB,MAAMA,2BACHC,IAAAA,wBAAW,EAACC,qBAAW,EAAEC,8BAAc,EAAgBA,8BAAc;IAG7EC,MAAMC,MAAmB,EAAkB;QACzC,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,MAAMF,OAAOE,IAAI;YACjBC,aAAaH,OAAOG,WAAW;YAC/BC,OAAO;mBAAIJ,OAAOI,KAAK;aAAC;QAC1B;IACF;IAEA,MAAMC,OAAOC,WAAyC,EAAwB;QAC5E,OAAO,MAAM,KAAK,CAACD,OAAOC;IAC5B;IAEA,MAAMC,OAAOC,aAA2B,EAAEC,eAAyB,EAAE;QACnE,OAAO,MAAM,KAAK,CAACF,OAAOC,eAAeC;IAC3C;IAEA,MAAMC,IAAIF,aAA2B,EAAwB;QAC3D,OAAO,MAAM,KAAK,CAACE,IAAIF;IACzB;IAEA,MAAMG,OAA+B;QACnC,OAAO,MAAM,KAAK,CAACA;IACrB;IAEA,MAAMC,OAAOJ,aAA2B,EAAEK,WAAyC,EAAwB;QACzG,OAAO,MAAM,KAAK,CAACD,OAAOJ,eAAeK;IAC3C;AACF"}
1
+ {"version":3,"sources":["../../../src/services/orm/custom-gcode.service.ts"],"names":["CustomGcodeService","BaseService","CustomGcode","CustomGcodeDto","toDto","entity","id","name","description","gcode","create","gcodeScript","delete","gcodeScriptId","get","list","update","updatedData"],"mappings":";;;;+BAMaA;;;eAAAA;;;0BALe;gCAEG;6BACH;AAErB,MAAMA,2BACHC,IAAAA,wBAAW,EAACC,qBAAW,EAAEC,8BAAc,EAAgBA,8BAAc;IAG7EC,MAAMC,MAAmB,EAAgC;QACvD,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,MAAMF,OAAOE,IAAI;YACjBC,aAAaH,OAAOG,WAAW;YAC/BC,OAAO;mBAAIJ,OAAOI,KAAK;aAAC;QAC1B;IACF;IAEA,MAAMC,OAAOC,WAAyC,EAAwB;QAC5E,OAAO,MAAM,KAAK,CAACD,OAAOC;IAC5B;IAEA,MAAMC,OAAOC,aAA2B,EAAE;QACxC,MAAM,KAAK,CAACD,OAAOC;IACrB;IAEA,MAAMC,IAAID,aAA2B,EAAwB;QAC3D,OAAO,MAAM,KAAK,CAACC,IAAID;IACzB;IAEA,MAAME,OAA+B;QACnC,OAAO,MAAM,KAAK,CAACA;IACrB;IAEA,MAAMC,OAAOH,aAA2B,EAAEI,WAAyC,EAAwB;QACzG,OAAO,MAAM,KAAK,CAACD,OAAOH,eAAeI;IAC3C;AACF"}
@@ -12,11 +12,6 @@ const _floorpositionentity = require("../../entities/floor-position.entity");
12
12
  const _baseservice = require("./base.service");
13
13
  const _floordto = require("../interfaces/floor.dto");
14
14
  class FloorPositionService extends (0, _baseservice.BaseService)(_floorpositionentity.FloorPosition, _floordto.PositionDto) {
15
- constructor({ typeormService }){
16
- super({
17
- typeormService
18
- });
19
- }
20
15
  async create(dto) {
21
16
  return super.create(dto);
22
17
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/services/orm/floor-position.service.ts"],"names":["FloorPositionService","BaseService","FloorPosition","PositionDto","constructor","typeormService","create","dto","findPosition","floorId","x","y","repository","findOneBy","findPrinterPosition","printerId","deletePrinterPositionsByPrinterId","delete","findPrinterPositionOnFloor","toDto","entity"],"mappings":";;;;+BAMaA;;;eAAAA;;;qCANiB;6BACF;0BAGA;AAErB,MAAMA,6BAA6BC,IAAAA,wBAAW,EAACC,kCAAa,EAAEC,qBAAW;IAC9EC,YAAY,EAAEC,cAAc,EAAsC,CAAE;QAClE,KAAK,CAAC;YAAEA;QAAe;IACzB;IAEA,MAAMC,OAAOC,GAA8B,EAA0B;QACnE,OAAO,KAAK,CAACD,OAAOC;IACtB;IAEAC,aAAaC,OAAqB,EAAEC,CAAS,EAAEC,CAAS,EAAE;QACxD,OAAO,IAAI,CAACC,UAAU,CAACC,SAAS,CAAC;YAAEJ;YAASC;YAAGC;QAAE;IACnD;IAMAG,oBAAoBC,SAAuB,EAAE;QAC3C,OAAO,IAAI,CAACH,UAAU,CAACC,SAAS,CAAC;YAAEE;QAAU;IAC/C;IAEAC,kCAAkCD,SAAuB,EAAE;QACzD,OAAO,IAAI,CAACH,UAAU,CAACK,MAAM,CAAC;YAAEF;QAAU;IAC5C;IAEAG,2BAA2BT,OAAqB,EAAEM,SAAuB,EAAE;QACzE,OAAO,IAAI,CAACH,UAAU,CAACC,SAAS,CAAC;YAAEJ;YAASM;QAAU;IACxD;IAEAI,MAAMC,MAAqB,EAA6B;QACtD,OAAO;YACLV,GAAGU,OAAOV,CAAC;YACXC,GAAGS,OAAOT,CAAC;YACXI,WAAWK,OAAOL,SAAS;YAC3BN,SAASW,OAAOX,OAAO;QACzB;IACF;AACF"}
1
+ {"version":3,"sources":["../../../src/services/orm/floor-position.service.ts"],"names":["FloorPositionService","BaseService","FloorPosition","PositionDto","create","dto","findPosition","floorId","x","y","repository","findOneBy","findPrinterPosition","printerId","deletePrinterPositionsByPrinterId","delete","findPrinterPositionOnFloor","toDto","entity"],"mappings":";;;;+BAKaA;;;eAAAA;;;qCALiB;6BACF;0BAEA;AAErB,MAAMA,6BAA6BC,IAAAA,wBAAW,EAACC,kCAAa,EAAEC,qBAAW;IAC9E,MAAMC,OAAOC,GAA8B,EAA0B;QACnE,OAAO,KAAK,CAACD,OAAOC;IACtB;IAEAC,aAAaC,OAAqB,EAAEC,CAAS,EAAEC,CAAS,EAAE;QACxD,OAAO,IAAI,CAACC,UAAU,CAACC,SAAS,CAAC;YAAEJ;YAASC;YAAGC;QAAE;IACnD;IAMAG,oBAAoBC,SAAuB,EAAE;QAC3C,OAAO,IAAI,CAACH,UAAU,CAACC,SAAS,CAAC;YAAEE;QAAU;IAC/C;IAEAC,kCAAkCD,SAAuB,EAAE;QACzD,OAAO,IAAI,CAACH,UAAU,CAACK,MAAM,CAAC;YAAEF;QAAU;IAC5C;IAEAG,2BAA2BT,OAAqB,EAAEM,SAAuB,EAAE;QACzE,OAAO,IAAI,CAACH,UAAU,CAACC,SAAS,CAAC;YAAEJ;YAASM;QAAU;IACxD;IAEAI,MAAMC,MAAqB,EAA6B;QACtD,OAAO;YACLV,GAAGU,OAAOV,CAAC;YACXC,GAAGS,OAAOT,CAAC;YACXI,WAAWK,OAAOL,SAAS;YAC3BN,SAASW,OAAOX,OAAO;QACzB;IACF;AACF"}