@fdm-monster/server 1.5.1 → 1.5.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (220) hide show
  1. package/README.md +1 -1
  2. package/dist/constants/authorization.constants.js +1 -2
  3. package/dist/constants/authorization.constants.js.map +1 -1
  4. package/dist/constants/http-status-codes.constants.js +62 -255
  5. package/dist/constants/http-status-codes.constants.js.map +1 -1
  6. package/dist/constants/server-settings.constants.js +0 -4
  7. package/dist/constants/server-settings.constants.js.map +1 -1
  8. package/dist/constants/service.constants.js +3 -10
  9. package/dist/constants/service.constants.js.map +1 -1
  10. package/dist/container.js +66 -69
  11. package/dist/container.js.map +1 -1
  12. package/dist/container.tokens.js +2 -7
  13. package/dist/container.tokens.js.map +1 -1
  14. package/dist/controllers/auth.controller.js +0 -2
  15. package/dist/controllers/auth.controller.js.map +1 -1
  16. package/dist/controllers/batch-call.controller.js +7 -5
  17. package/dist/controllers/batch-call.controller.js.map +1 -1
  18. package/dist/controllers/camera-stream.controller.js +6 -4
  19. package/dist/controllers/camera-stream.controller.js.map +1 -1
  20. package/dist/controllers/custom-gcode.controller.js +11 -11
  21. package/dist/controllers/custom-gcode.controller.js.map +1 -1
  22. package/dist/controllers/floor.controller.js +9 -12
  23. package/dist/controllers/floor.controller.js.map +1 -1
  24. package/dist/controllers/plugin-firmware-update.controller.js +1 -3
  25. package/dist/controllers/plugin-firmware-update.controller.js.map +1 -1
  26. package/dist/controllers/print-completion.controller.js +1 -4
  27. package/dist/controllers/print-completion.controller.js.map +1 -1
  28. package/dist/controllers/printer-files.controller.js +22 -39
  29. package/dist/controllers/printer-files.controller.js.map +1 -1
  30. package/dist/controllers/printer-settings.controller.js +8 -6
  31. package/dist/controllers/printer-settings.controller.js.map +1 -1
  32. package/dist/controllers/printer.controller.js +7 -37
  33. package/dist/controllers/printer.controller.js.map +1 -1
  34. package/dist/controllers/server-private.controller.js +0 -1
  35. package/dist/controllers/server-private.controller.js.map +1 -1
  36. package/dist/controllers/server-public.controller.js +0 -1
  37. package/dist/controllers/server-public.controller.js.map +1 -1
  38. package/dist/controllers/settings.controller.js +0 -2
  39. package/dist/controllers/settings.controller.js.map +1 -1
  40. package/dist/controllers/user.controller.js +10 -17
  41. package/dist/controllers/user.controller.js.map +1 -1
  42. package/dist/controllers/validation/batch-controller.validation.js +10 -9
  43. package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
  44. package/dist/controllers/validation/generic.validation.js +16 -7
  45. package/dist/controllers/validation/generic.validation.js.map +1 -1
  46. package/dist/controllers/validation/setting.validation.js +0 -1
  47. package/dist/controllers/validation/setting.validation.js.map +1 -1
  48. package/dist/handlers/cache-manager.js +1 -1
  49. package/dist/handlers/cache-manager.js.map +1 -1
  50. package/dist/handlers/event-emitter.js +0 -7
  51. package/dist/handlers/event-emitter.js.map +1 -1
  52. package/dist/handlers/logger.js +1 -1
  53. package/dist/handlers/logger.js.map +1 -1
  54. package/dist/handlers/validators.js +1 -1
  55. package/dist/handlers/validators.js.map +1 -1
  56. package/dist/middleware/authenticate.js +23 -23
  57. package/dist/middleware/authenticate.js.map +1 -1
  58. package/dist/middleware/exception.filter.js +0 -1
  59. package/dist/middleware/exception.filter.js.map +1 -1
  60. package/dist/middleware/global.middleware.js +6 -6
  61. package/dist/middleware/global.middleware.js.map +1 -1
  62. package/dist/models/Auth/User.js +0 -2
  63. package/dist/models/Auth/User.js.map +1 -1
  64. package/dist/models/FloorPrinter.js.map +1 -1
  65. package/dist/models/PrintCompletion.js.map +1 -1
  66. package/dist/models/Printer.js +2 -11
  67. package/dist/models/Printer.js.map +1 -1
  68. package/dist/models/Settings.js +0 -1
  69. package/dist/models/Settings.js.map +1 -1
  70. package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js +0 -4
  71. package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js.map +1 -1
  72. package/dist/mongo-migrations/20210907173950-printers-enabled.js +0 -4
  73. package/dist/mongo-migrations/20210907173950-printers-enabled.js.map +1 -1
  74. package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js +0 -4
  75. package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js.map +1 -1
  76. package/dist/mongo-migrations/20231111081809-printer-flatten-name.js +35 -0
  77. package/dist/mongo-migrations/20231111081809-printer-flatten-name.js.map +1 -0
  78. package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js +41 -0
  79. package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js.map +1 -0
  80. package/dist/server.constants.js +1 -19
  81. package/dist/server.constants.js.map +1 -1
  82. package/dist/server.core.js +6 -7
  83. package/dist/server.core.js.map +1 -1
  84. package/dist/server.env.js +6 -18
  85. package/dist/server.env.js.map +1 -1
  86. package/dist/server.host.js +6 -8
  87. package/dist/server.host.js.map +1 -1
  88. package/dist/services/authentication/auth.service.js +2 -20
  89. package/dist/services/authentication/auth.service.js.map +1 -1
  90. package/dist/services/authentication/jwt.service.js +1 -1
  91. package/dist/services/authentication/jwt.service.js.map +1 -1
  92. package/dist/services/authentication/permission.service.js.map +1 -1
  93. package/dist/services/authentication/refresh-token.service.js +8 -1
  94. package/dist/services/authentication/refresh-token.service.js.map +1 -1
  95. package/dist/services/authentication/role.service.js +1 -1
  96. package/dist/services/authentication/role.service.js.map +1 -1
  97. package/dist/services/authentication/user.service.js +1 -5
  98. package/dist/services/authentication/user.service.js.map +1 -1
  99. package/dist/services/batch-call.service.js +4 -8
  100. package/dist/services/batch-call.service.js.map +1 -1
  101. package/dist/services/camera-stream.service.js +1 -2
  102. package/dist/services/camera-stream.service.js.map +1 -1
  103. package/dist/services/core/client-bundle.service.js +1 -4
  104. package/dist/services/core/client-bundle.service.js.map +1 -1
  105. package/dist/services/core/logs-manager.service.js +1 -2
  106. package/dist/services/core/logs-manager.service.js.map +1 -1
  107. package/dist/services/core/multer.service.js +3 -6
  108. package/dist/services/core/multer.service.js.map +1 -1
  109. package/dist/services/core/server-release.service.js +4 -13
  110. package/dist/services/core/server-release.service.js.map +1 -1
  111. package/dist/services/core/server-update.service.js +0 -2
  112. package/dist/services/core/server-update.service.js.map +1 -1
  113. package/dist/services/core/task-manager.service.js +9 -22
  114. package/dist/services/core/task-manager.service.js.map +1 -1
  115. package/dist/services/core/yaml.service.js +28 -22
  116. package/dist/services/core/yaml.service.js.map +1 -1
  117. package/dist/services/custom-gcode.service.js +2 -2
  118. package/dist/services/custom-gcode.service.js.map +1 -1
  119. package/dist/services/floor.service.js +4 -45
  120. package/dist/services/floor.service.js.map +1 -1
  121. package/dist/services/interfaces/floor.dto.js +38 -0
  122. package/dist/services/interfaces/floor.dto.js.map +1 -1
  123. package/dist/services/interfaces/print-completion-context.dto.js +6 -0
  124. package/dist/services/interfaces/print-completion-context.dto.js.map +1 -0
  125. package/dist/services/interfaces/print-completion.dto.js +40 -0
  126. package/dist/services/interfaces/print-completion.dto.js.map +1 -0
  127. package/dist/services/interfaces/print-completion.service.js +6 -0
  128. package/dist/services/interfaces/print-completion.service.js.map +1 -0
  129. package/dist/services/interfaces/printer.dto.js +16 -3
  130. package/dist/services/interfaces/printer.dto.js.map +1 -1
  131. package/dist/services/interfaces/refresh-token.dto.js +0 -2
  132. package/dist/services/interfaces/refresh-token.dto.js.map +1 -1
  133. package/dist/services/interfaces/settings.dto.js +0 -1
  134. package/dist/services/interfaces/settings.dto.js.map +1 -1
  135. package/dist/services/interfaces/user-role.dto.js +18 -0
  136. package/dist/services/interfaces/user-role.dto.js.map +1 -0
  137. package/dist/services/octoprint/constants/octoprint-service.constants.js +0 -3
  138. package/dist/services/octoprint/constants/octoprint-service.constants.js.map +1 -1
  139. package/dist/services/octoprint/octoprint-api.routes.js +2 -4
  140. package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
  141. package/dist/services/octoprint/octoprint-api.service.js +10 -27
  142. package/dist/services/octoprint/octoprint-api.service.js.map +1 -1
  143. package/dist/services/octoprint/octoprint-sockio.adapter.js +10 -43
  144. package/dist/services/octoprint/octoprint-sockio.adapter.js.map +1 -1
  145. package/dist/services/octoprint/plugin-base.service.js +0 -1
  146. package/dist/services/octoprint/plugin-base.service.js.map +1 -1
  147. package/dist/services/octoprint/plugin-firmware-update.service.js +0 -3
  148. package/dist/services/octoprint/plugin-firmware-update.service.js.map +1 -1
  149. package/dist/services/print-completion.service.js +14 -45
  150. package/dist/services/print-completion.service.js.map +1 -1
  151. package/dist/services/print-completion.shared.js +59 -0
  152. package/dist/services/print-completion.shared.js.map +1 -0
  153. package/dist/services/printer-files.service.js +1 -5
  154. package/dist/services/printer-files.service.js.map +1 -1
  155. package/dist/services/printer.service.js +20 -15
  156. package/dist/services/printer.service.js.map +1 -1
  157. package/dist/services/settings.service.js +2 -8
  158. package/dist/services/settings.service.js.map +1 -1
  159. package/dist/services/validators/floor-service.validation.js +13 -11
  160. package/dist/services/validators/floor-service.validation.js.map +1 -1
  161. package/dist/services/validators/printer-service.validation.js +1 -2
  162. package/dist/services/validators/printer-service.validation.js.map +1 -1
  163. package/dist/services/validators/user-service.validation.js +10 -10
  164. package/dist/services/validators/user-service.validation.js.map +1 -1
  165. package/dist/services/validators/yaml-service.validation.js +13 -14
  166. package/dist/services/validators/yaml-service.validation.js.map +1 -1
  167. package/dist/state/file-upload-tracker.cache.js +0 -1
  168. package/dist/state/file-upload-tracker.cache.js.map +1 -1
  169. package/dist/state/file.cache.js +25 -33
  170. package/dist/state/file.cache.js.map +1 -1
  171. package/dist/state/floor.store.js +0 -1
  172. package/dist/state/floor.store.js.map +1 -1
  173. package/dist/state/printer-events.cache.js +1 -3
  174. package/dist/state/printer-events.cache.js.map +1 -1
  175. package/dist/state/{files.store.js → printer-files.store.js} +12 -26
  176. package/dist/state/printer-files.store.js.map +1 -0
  177. package/dist/state/printer-socket.store.js +7 -32
  178. package/dist/state/printer-socket.store.js.map +1 -1
  179. package/dist/state/printer.cache.js +4 -9
  180. package/dist/state/printer.cache.js.map +1 -1
  181. package/dist/state/settings.store.js +0 -2
  182. package/dist/state/settings.store.js.map +1 -1
  183. package/dist/state/socket-io.gateway.js +0 -2
  184. package/dist/state/socket-io.gateway.js.map +1 -1
  185. package/dist/state/test-printer-socket.store.js +1 -7
  186. package/dist/state/test-printer-socket.store.js.map +1 -1
  187. package/dist/task.presets.js +0 -11
  188. package/dist/task.presets.js.map +1 -1
  189. package/dist/tasks/boot.task.js +6 -10
  190. package/dist/tasks/boot.task.js.map +1 -1
  191. package/dist/tasks/print-completion.socketio.task.js +10 -11
  192. package/dist/tasks/print-completion.socketio.task.js.map +1 -1
  193. package/dist/tasks/printer-file-clean.task.js +13 -21
  194. package/dist/tasks/printer-file-clean.task.js.map +1 -1
  195. package/dist/tasks/printer-websocket-restore.task.js +1 -5
  196. package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
  197. package/dist/tasks/printer-websocket.task.js +5 -15
  198. package/dist/tasks/printer-websocket.task.js.map +1 -1
  199. package/dist/tasks/socketio.task.js +0 -1
  200. package/dist/tasks/socketio.task.js.map +1 -1
  201. package/dist/tasks.js +0 -2
  202. package/dist/tasks.js.map +1 -1
  203. package/dist/types/express/index.d.js +0 -1
  204. package/dist/types/express/index.d.js.map +1 -1
  205. package/dist/utils/env.utils.js +2 -5
  206. package/dist/utils/env.utils.js.map +1 -1
  207. package/dist/utils/is-docker.js +1 -1
  208. package/dist/utils/is-docker.js.map +1 -1
  209. package/dist/utils/normalize-url.js +0 -35
  210. package/dist/utils/normalize-url.js.map +1 -1
  211. package/dist/utils/semver.utils.js +0 -1
  212. package/dist/utils/semver.utils.js.map +1 -1
  213. package/dist/utils/url.utils.js +1 -0
  214. package/dist/utils/url.utils.js.map +1 -1
  215. package/dist/utils/websocket.adapter.js +8 -54
  216. package/dist/utils/websocket.adapter.js.map +1 -1
  217. package/package.json +37 -37
  218. package/dist/state/files.store.js.map +0 -1
  219. package/dist/utils/mapper.utils.js +0 -33
  220. package/dist/utils/mapper.utils.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","socketIoGateway","socketFactory","eventEmitter2","constructor","setupTestPrinter","printer","close","validatedData","validateInput","createTestPrinterRules","enabled","correlationToken","createInstance","registerCredentials","printerId","loginDto","apiKey","printerURL","protocol","testEvents","octoPrintEvent","Message","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","listener","event","payload","send","forEach","te","on","setupSocketSession","promise","Promise","resolve","reject","open","startTime","setInterval","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","off"],"mappings":";;;;+BASaA;;;eAAAA;;;0BAT2B;4BACV;6CACS;wCACuC;iCACjD;AAKtB,MAAMA;IACXC,WAAmC;IACnCC,gBAAiC;IACjCC,cAA6B;IAC7BC,cAA6B;IAC7BC,YAAY,EACVF,aAAa,EACbD,eAAe,EACfE,aAAa,EAKd,CAAE;QACD,IAAI,CAACD,aAAa,GAAGA;QACrB,IAAI,CAACD,eAAe,GAAGA;QACvB,IAAI,CAACE,aAAa,GAAGA;IACvB;IAEA;;;;GAIC,GACD,MAAME,iBAAiBC,OAAO,EAAE;QAC9B,IAAI,IAAI,CAACN,UAAU,EAAE;YACnB,IAAI,CAACA,UAAU,CAACO,KAAK;YACrB,IAAI,CAACP,UAAU,GAAG;QACpB;QAEA,MAAMQ,gBAAgB,MAAMC,IAAAA,yBAAa,EAACH,SAASI,mDAAsB;QACzEF,cAAcG,OAAO,GAAG;QAExB,0CAA0C;QAC1C,MAAM,EAAEC,gBAAgB,EAAE,GAAGN;QAC7B,IAAI,CAACN,UAAU,GAAG,IAAI,CAACE,aAAa,CAACW,cAAc;QAEnD,sDAAsD;QACtD,IAAI,CAACb,UAAU,CAACc,mBAAmB,CAAC;YAClCC,WAAWH;YACXI,UAAU;gBACRC,QAAQX,QAAQW,MAAM;gBACtBC,YAAYZ,QAAQY,UAAU;YAChC;YACAC,UAAU;QACZ;QAEA,MAAMC,aAAa;YACjBC,IAAAA,sCAAc,EAACC,+BAAO,CAACC,gBAAgB;YACvCF,IAAAA,sCAAc,EAACC,+BAAO,CAACE,iBAAiB;YACxCH,IAAAA,sCAAc,EAACC,+BAAO,CAACG,SAAS;YAChCJ,IAAAA,sCAAc,EAACC,+BAAO,CAACI,SAAS;YAChCL,IAAAA,sCAAc,EAACC,+BAAO,CAACK,QAAQ;SAChC;QACD,MAAMC,WAAW,CAAC,EAAEC,KAAK,EAAEC,OAAO,EAAEf,SAAS,EAAE;YAC7C,IAAIA,cAAcH,kBAAkB;gBAClC;YACF;YACA,IAAI,CAACX,eAAe,CAAC8B,IAAI,CAAC,sBAAsB;gBAC9CF;gBACAC;gBACAlB;YACF;QACF;QACAQ,WAAWY,OAAO,CAAC,CAACC;YAClB,IAAI,CAAC9B,aAAa,CAAC+B,EAAE,CAACD,IAAIL;QAC5B;QACA,MAAM,IAAI,CAAC5B,UAAU,CAACmC,kBAAkB;QAExC,MAAMC,UAAU,IAAIC,QAAQ,OAAOC,SAASC;YAC1C,IAAI,CAACvC,UAAU,CAACwC,IAAI;YACpB,WAAW,MAAMC,aAAaC,IAAAA,qBAAW,EAAC,KAAM;gBAC9C,IAAI,CAAC,IAAI,CAAC1C,UAAU,EAAE;oBACpB;gBACF;gBACA,IAAI,IAAI,CAACA,UAAU,CAAC2C,WAAW,KAAKC,oCAAY,CAACC,aAAa,EAAE;oBAC9DP;oBACA;gBACF;YACF;QACF;QAEA,MAAMD,QAAQS,IAAI,CAAC;YAACV;YAASW,IAAAA,oBAAU,EAACC,6BAAY,CAACC,gCAAgC;SAAE;QACvF,IAAI,CAACjD,UAAU,CAACO,KAAK;QACrB,OAAO,IAAI,CAACP,UAAU;QACtBoB,WAAWY,OAAO,CAAC,CAACC;YAClB,IAAI,CAAC9B,aAAa,CAAC+C,GAAG,CAACjB,IAAIL;QAC7B;IACF;AACF"}
1
+ {"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","socketIoGateway","socketFactory","eventEmitter2","constructor","setupTestPrinter","printer","close","validatedData","validateInput","createTestPrinterRules","enabled","correlationToken","createInstance","registerCredentials","printerId","loginDto","apiKey","printerURL","protocol","testEvents","octoPrintEvent","Message","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","listener","event","payload","send","forEach","te","on","setupSocketSession","promise","Promise","resolve","reject","open","startTime","setInterval","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","off"],"mappings":";;;;+BASaA;;;eAAAA;;;0BAT2B;4BACV;6CACS;wCACuC;iCACjD;AAKtB,MAAMA;IACXC,WAAmC;IACnCC,gBAAiC;IACjCC,cAA6B;IAC7BC,cAA6B;IAC7BC,YAAY,EACVF,aAAa,EACbD,eAAe,EACfE,aAAa,EAKd,CAAE;QACD,IAAI,CAACD,aAAa,GAAGA;QACrB,IAAI,CAACD,eAAe,GAAGA;QACvB,IAAI,CAACE,aAAa,GAAGA;IACvB;IAOA,MAAME,iBAAiBC,OAAO,EAAE;QAC9B,IAAI,IAAI,CAACN,UAAU,EAAE;YACnB,IAAI,CAACA,UAAU,CAACO,KAAK;YACrB,IAAI,CAACP,UAAU,GAAG;QACpB;QAEA,MAAMQ,gBAAgB,MAAMC,IAAAA,yBAAa,EAACH,SAASI,mDAAsB;QACzEF,cAAcG,OAAO,GAAG;QAGxB,MAAM,EAAEC,gBAAgB,EAAE,GAAGN;QAC7B,IAAI,CAACN,UAAU,GAAG,IAAI,CAACE,aAAa,CAACW,cAAc;QAGnD,IAAI,CAACb,UAAU,CAACc,mBAAmB,CAAC;YAClCC,WAAWH;YACXI,UAAU;gBACRC,QAAQX,QAAQW,MAAM;gBACtBC,YAAYZ,QAAQY,UAAU;YAChC;YACAC,UAAU;QACZ;QAEA,MAAMC,aAAa;YACjBC,IAAAA,sCAAc,EAACC,+BAAO,CAACC,gBAAgB;YACvCF,IAAAA,sCAAc,EAACC,+BAAO,CAACE,iBAAiB;YACxCH,IAAAA,sCAAc,EAACC,+BAAO,CAACG,SAAS;YAChCJ,IAAAA,sCAAc,EAACC,+BAAO,CAACI,SAAS;YAChCL,IAAAA,sCAAc,EAACC,+BAAO,CAACK,QAAQ;SAChC;QACD,MAAMC,WAAW,CAAC,EAAEC,KAAK,EAAEC,OAAO,EAAEf,SAAS,EAAE;YAC7C,IAAIA,cAAcH,kBAAkB;gBAClC;YACF;YACA,IAAI,CAACX,eAAe,CAAC8B,IAAI,CAAC,sBAAsB;gBAC9CF;gBACAC;gBACAlB;YACF;QACF;QACAQ,WAAWY,OAAO,CAAC,CAACC;YAClB,IAAI,CAAC9B,aAAa,CAAC+B,EAAE,CAACD,IAAIL;QAC5B;QACA,MAAM,IAAI,CAAC5B,UAAU,CAACmC,kBAAkB;QAExC,MAAMC,UAAU,IAAIC,QAAQ,OAAOC,SAASC;YAC1C,IAAI,CAACvC,UAAU,CAACwC,IAAI;YACpB,WAAW,MAAMC,aAAaC,IAAAA,qBAAW,EAAC,KAAM;gBAC9C,IAAI,CAAC,IAAI,CAAC1C,UAAU,EAAE;oBACpB;gBACF;gBACA,IAAI,IAAI,CAACA,UAAU,CAAC2C,WAAW,KAAKC,oCAAY,CAACC,aAAa,EAAE;oBAC9DP;oBACA;gBACF;YACF;QACF;QAEA,MAAMD,QAAQS,IAAI,CAAC;YAACV;YAASW,IAAAA,oBAAU,EAACC,6BAAY,CAACC,gCAAgC;SAAE;QACvF,IAAI,CAACjD,UAAU,CAACO,KAAK;QACrB,OAAO,IAAI,CAACP,UAAU;QACtBoB,WAAWY,OAAO,CAAC,CAACC;YAClB,IAAI,CAAC9B,aAAa,CAAC+C,GAAG,CAACjB,IAAIL;QAC7B;IACF;AACF"}
@@ -1,14 +1,3 @@
1
- // Test or example task
2
- // TaskManager.registerPeriodicJob(
3
- // "unique_test_task1",
4
- // async () => {
5
- // await new Promise((resolve) => {
6
- // setTimeout(() => resolve(), 9000);
7
- // });
8
- // },
9
- // {
10
- // PERIODIC_TASK_PRESET_2500MS
11
- // );
12
1
  "use strict";
13
2
  Object.defineProperty(exports, "__esModule", {
14
3
  value: true
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/task.presets.ts"],"names":["TASK_PRESETS","PERIODIC","periodic","logFirstCompletion","runImmediately","PERIODIC_DISABLED","disabled","PERIODIC_2500MS","milliseconds","RUNONCE","runOnce","RUNDELAYED","runDelayed","seconds"],"mappings":"AAAA,uBAAuB;AACvB,mCAAmC;AACnC,yBAAyB;AACzB,kBAAkB;AAClB,uCAAuC;AACvC,2CAA2C;AAC3C,UAAU;AACV,OAAO;AACP,MAAM;AACN,gCAAgC;AAChC,KAAK;;;;;+BAEQA;;;eAAAA;;;AAAN,MAAMA;IACX,OAAOC,WAAW;QAChBC,UAAU;QACVC,oBAAoB;QACpBC,gBAAgB;IAClB,EAAE;IAEF,OAAOC,oBAAoB;QACzB,GAAG,IAAI,CAACJ,QAAQ;QAChBG,gBAAgB;QAChBE,UAAU;IACZ,EAAE;IAEF,OAAOC,kBAAkB;QACvB,GAAG,IAAI,CAACN,QAAQ;QAChBO,cAAc;IAChB,EAAE;IAEF,OAAOC,UAAU;QACfC,SAAS;QACTP,oBAAoB;QACpBC,gBAAgB;IAClB,EAAE;IAEF,OAAOO,aAAa;QAClBC,YAAY;QACZT,oBAAoB;QACpBC,gBAAgB;QAChBS,SAAS;IACX,EAAE;AACJ"}
1
+ {"version":3,"sources":["../src/task.presets.ts"],"names":["TASK_PRESETS","PERIODIC","periodic","logFirstCompletion","runImmediately","PERIODIC_DISABLED","disabled","PERIODIC_2500MS","milliseconds","RUNONCE","runOnce","RUNDELAYED","runDelayed","seconds"],"mappings":";;;;+BAYaA;;;eAAAA;;;AAAN,MAAMA;IACX,OAAOC,WAAW;QAChBC,UAAU;QACVC,oBAAoB;QACpBC,gBAAgB;IAClB,EAAE;IAEF,OAAOC,oBAAoB;QACzB,GAAG,IAAI,CAACJ,QAAQ;QAChBG,gBAAgB;QAChBE,UAAU;IACZ,EAAE;IAEF,OAAOC,kBAAkB;QACvB,GAAG,IAAI,CAACN,QAAQ;QAChBO,cAAc;IAChB,EAAE;IAEF,OAAOC,UAAU;QACfC,SAAS;QACTP,oBAAoB;QACpBC,gBAAgB;IAClB,EAAE;IAEF,OAAOO,aAAa;QAClBC,YAAY;QACZT,oBAAoB;QACpBC,gBAAgB;QAChBS,SAAS;IACX,EAAE;AACJ"}
@@ -8,7 +8,7 @@ Object.defineProperty(exports, "BootTask", {
8
8
  return BootTask;
9
9
  }
10
10
  });
11
- const _mongoose = /*#__PURE__*/ _interop_require_wildcard(require("mongoose"));
11
+ const _mongoose = _interop_require_wildcard(require("mongoose"));
12
12
  const _serverenv = require("../server.env");
13
13
  const _containertokens = require("../container.tokens");
14
14
  const _serverconstants = require("../server.constants");
@@ -61,7 +61,7 @@ class BootTask {
61
61
  settingsService;
62
62
  multerService;
63
63
  printerSocketStore;
64
- filesStore;
64
+ printerFilesStore;
65
65
  permissionService;
66
66
  roleService;
67
67
  userService;
@@ -70,14 +70,14 @@ class BootTask {
70
70
  pluginFirmwareUpdateService;
71
71
  clientBundleService;
72
72
  configService;
73
- constructor({ loggerFactory, serverTasks, settingsService, settingsStore, multerService, printerSocketStore, filesStore, permissionService, roleService, userService, taskManagerService, pluginRepositoryCache, floorStore, pluginFirmwareUpdateService, clientBundleService, configService }){
73
+ constructor({ loggerFactory, serverTasks, settingsService, settingsStore, multerService, printerSocketStore, printerFilesStore, permissionService, roleService, userService, taskManagerService, pluginRepositoryCache, floorStore, pluginFirmwareUpdateService, clientBundleService, configService }){
74
74
  this.logger = loggerFactory(BootTask.name);
75
75
  this.serverTasks = serverTasks;
76
76
  this.settingsService = settingsService;
77
77
  this.settingsStore = settingsStore;
78
78
  this.multerService = multerService;
79
79
  this.printerSocketStore = printerSocketStore;
80
- this.filesStore = filesStore;
80
+ this.printerFilesStore = printerFilesStore;
81
81
  this.permissionService = permissionService;
82
82
  this.roleService = roleService;
83
83
  this.userService = userService;
@@ -89,7 +89,6 @@ class BootTask {
89
89
  this.configService = configService;
90
90
  }
91
91
  async runOnce() {
92
- // To cope with retries after failures we register this task - disabled
93
92
  this.taskManagerService.registerJobOrTask(this.serverTasks.SERVER_BOOT_TASK);
94
93
  this.logger.log("Running boot task once.");
95
94
  await this.run();
@@ -100,9 +99,7 @@ class BootTask {
100
99
  await this.migrateDatabase();
101
100
  } catch (e) {
102
101
  if (e instanceof _mongoose.default.Error) {
103
- // Tests should just continue
104
102
  if (!e.message.includes("Can't call `openUri()` on an active connection with different connection strings.")) {
105
- // We are not in a test
106
103
  if (e.message.includes("ECONNREFUSED")) {
107
104
  this.logger.error("Database connection timed-out. Retrying in 5000.");
108
105
  } else {
@@ -143,9 +140,9 @@ class BootTask {
143
140
  this.logger.log("Clearing upload folder");
144
141
  this.multerService.clearUploadsFolder();
145
142
  this.logger.log("Loading printer sockets");
146
- await this.printerSocketStore.loadPrinterSockets(); // New sockets
143
+ await this.printerSocketStore.loadPrinterSockets();
147
144
  this.logger.log("Loading files store");
148
- await this.filesStore.loadFilesStore();
145
+ await this.printerFilesStore.loadFilesStore();
149
146
  this.logger.log("Loading floor store");
150
147
  await this.floorStore.loadStore();
151
148
  if (process.env.SAFEMODE_ENABLED === "true") {
@@ -155,7 +152,6 @@ class BootTask {
155
152
  this.taskManagerService.registerJobOrTask(task);
156
153
  });
157
154
  }
158
- // Success so we disable this task
159
155
  this.taskManagerService.disableJob(_containertokens.DITokens.bootTask, false);
160
156
  }
161
157
  async createOrUpdateDemoAccount() {
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","taskManagerService","serverTasks","settingsStore","settingsService","multerService","printerSocketStore","filesStore","permissionService","roleService","userService","pluginRepositoryCache","floorStore","pluginFirmwareUpdateService","clientBundleService","configService","constructor","loggerFactory","name","runOnce","registerJobOrTask","SERVER_BOOT_TASK","log","run","createConnection","migrateDatabase","e","mongoose","Error","message","includes","error","scheduleDisabledJob","DITokens","bootTask","loadSettings","syncPermissions","syncRoles","isDemoMode","warn","AppConstants","OVERRIDE_IS_DEMO_MODE","createOrUpdateDemoAccount","setLoginRequired","setRegistrationEnabled","loginRequired","get","OVERRIDE_LOGIN_REQUIRED","registrationEnabled","OVERRIDE_REGISTRATION_ENABLED","overrideJwtSecret","OVERRIDE_JWT_SECRET","undefined","overrideJwtExpiresIn","OVERRIDE_JWT_EXPIRES_IN","persistOptionalCredentialSettings","clearUploadsFolder","loadPrinterSockets","loadFilesStore","loadStore","process","env","SAFEMODE_ENABLED","BOOT_TASKS","forEach","task","disableJob","demoUsername","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","demoPassword","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","demoRole","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","adminRole","getRoleByName","demoUserId","getDemoUserId","register","username","password","isDemoUser","isVerified","isRootUser","needsPasswordChange","roles","id","setVerifiedById","setIsRootUserById","updatePasswordUnsafeByUsername","setUserRoleIds","setWizardCompleted","connect","fetchMongoDBConnectionString","serverSelectionTimeoutMS","syncIndexes","runMigrations","connection","db","getClient"],"mappings":"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"}
1
+ {"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","taskManagerService","serverTasks","settingsStore","settingsService","multerService","printerSocketStore","printerFilesStore","permissionService","roleService","userService","pluginRepositoryCache","floorStore","pluginFirmwareUpdateService","clientBundleService","configService","constructor","loggerFactory","name","runOnce","registerJobOrTask","SERVER_BOOT_TASK","log","run","createConnection","migrateDatabase","e","mongoose","Error","message","includes","error","scheduleDisabledJob","DITokens","bootTask","loadSettings","syncPermissions","syncRoles","isDemoMode","warn","AppConstants","OVERRIDE_IS_DEMO_MODE","createOrUpdateDemoAccount","setLoginRequired","setRegistrationEnabled","loginRequired","get","OVERRIDE_LOGIN_REQUIRED","registrationEnabled","OVERRIDE_REGISTRATION_ENABLED","overrideJwtSecret","OVERRIDE_JWT_SECRET","undefined","overrideJwtExpiresIn","OVERRIDE_JWT_EXPIRES_IN","persistOptionalCredentialSettings","clearUploadsFolder","loadPrinterSockets","loadFilesStore","loadStore","process","env","SAFEMODE_ENABLED","BOOT_TASKS","forEach","task","disableJob","demoUsername","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","demoPassword","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","demoRole","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","adminRole","getRoleByName","demoUserId","getDemoUserId","register","username","password","isDemoUser","isVerified","isRootUser","needsPasswordChange","roles","id","setVerifiedById","setIsRootUserById","updatePasswordUnsafeByUsername","setUserRoleIds","setWizardCompleted","connect","fetchMongoDBConnectionString","serverSelectionTimeoutMS","syncIndexes","runMigrations","connection","db","getClient"],"mappings":"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"}
@@ -32,7 +32,6 @@ class PrintCompletionSocketIoTask {
32
32
  return this.contextCache;
33
33
  }
34
34
  async handleMessage(fdmEvent, octoPrintEvent, data) {
35
- // If not parsed well, skip log
36
35
  const printerId = fdmEvent.replace("octoprint.", "");
37
36
  if (!printerId) {
38
37
  this.logger.log(`Skipping print completion log for FDM event ${fdmEvent}`);
@@ -40,18 +39,19 @@ class PrintCompletionSocketIoTask {
40
39
  if (octoPrintEvent !== "event") {
41
40
  return;
42
41
  }
42
+ this.socketIoGateway.send(_socketiogateway.IO_MESSAGES.CompletionEvent, JSON.stringify({
43
+ fdmEvent,
44
+ octoPrintEvent,
45
+ data
46
+ }));
43
47
  const completion = {
44
48
  status: data.type,
45
49
  fileName: data.payload?.name,
46
50
  createdAt: Date.now(),
47
51
  completionLog: data.payload?.error,
48
- printerId: printerId
52
+ printerId,
53
+ context: {}
49
54
  };
50
- this.socketIoGateway.send(_socketiogateway.IO_MESSAGES.CompletionEvent, JSON.stringify({
51
- fdmEvent,
52
- octoPrintEvent,
53
- data
54
- }));
55
55
  if (data.type === _octoprintwebsocketconstants.EVENT_TYPES.EStop || data.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintCancelling || data.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintCancelled || data.type === _octoprintwebsocketconstants.EVENT_TYPES.Home || data.type === _octoprintwebsocketconstants.EVENT_TYPES.TransferStarted || data.type === _octoprintwebsocketconstants.EVENT_TYPES.TransferDone || data.type === _octoprintwebsocketconstants.EVENT_TYPES.Disconnecting || data.type === _octoprintwebsocketconstants.EVENT_TYPES.Disconnected || data.type === _octoprintwebsocketconstants.EVENT_TYPES.MetadataAnalysisStarted || data.type === _octoprintwebsocketconstants.EVENT_TYPES.MetadataAnalysisFinished || data.type === _octoprintwebsocketconstants.EVENT_TYPES.Error) {
56
56
  this.contextCache[printerId] = {
57
57
  ...this.contextCache[printerId],
@@ -62,22 +62,21 @@ class PrintCompletionSocketIoTask {
62
62
  return;
63
63
  }
64
64
  if (data.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintStarted) {
65
- // Clear the context now with association id
65
+ const token = (0, _correlationtokenutil.generateCorrelationToken)();
66
66
  this.contextCache[printerId] = {
67
- correlationId: (0, _correlationtokenutil.generateCorrelationToken)()
67
+ correlationId: token
68
68
  };
69
+ completion.correlationId = token;
69
70
  completion.context = this.contextCache[printerId];
70
71
  await this.printCompletionService.create(completion);
71
72
  } else if (data.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintFailed || data.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintDone) {
72
73
  completion.context = this.contextCache[printerId] || {};
73
74
  await this.printCompletionService.create(completion);
74
75
  this.eventEmitter2.emit((0, _eventconstants.fdmMonsterPrinterStoppedEvent)(printerId));
75
- // Clear the context now
76
76
  this.contextCache[printerId] = {};
77
77
  }
78
78
  }
79
79
  async run() {
80
- // Run once to bind event handler and reload the cache
81
80
  this.contextCache = await this.printCompletionService.loadPrintContexts();
82
81
  }
83
82
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/tasks/print-completion.socketio.task.ts"],"names":["PrintCompletionSocketIoTask","eventEmitter2","socketIoGateway","logger","printCompletionService","contextCache","constructor","loggerFactory","name","that","on","octoPrintWebsocketEvent","octoPrintEvent","data","handleMessage","event","contexts","fdmEvent","printerId","replace","log","completion","status","type","fileName","payload","createdAt","Date","now","completionLog","error","send","IO_MESSAGES","CompletionEvent","JSON","stringify","EVENT_TYPES","EStop","PrintCancelling","PrintCancelled","Home","TransferStarted","TransferDone","Disconnecting","Disconnected","MetadataAnalysisStarted","MetadataAnalysisFinished","Error","corrId","correlationId","updateContext","PrintStarted","generateCorrelationToken","context","create","PrintFailed","PrintDone","emit","fdmMonsterPrinterStoppedEvent","run","loadPrintContexts"],"mappings":"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"}
1
+ {"version":3,"sources":["../../src/tasks/print-completion.socketio.task.ts"],"names":["PrintCompletionSocketIoTask","eventEmitter2","socketIoGateway","logger","printCompletionService","contextCache","constructor","loggerFactory","name","that","on","octoPrintWebsocketEvent","octoPrintEvent","data","handleMessage","event","contexts","fdmEvent","printerId","replace","log","send","IO_MESSAGES","CompletionEvent","JSON","stringify","completion","status","type","fileName","payload","createdAt","Date","now","completionLog","error","context","EVENT_TYPES","EStop","PrintCancelling","PrintCancelled","Home","TransferStarted","TransferDone","Disconnecting","Disconnected","MetadataAnalysisStarted","MetadataAnalysisFinished","Error","corrId","correlationId","updateContext","PrintStarted","token","generateCorrelationToken","create","PrintFailed","PrintDone","emit","fdmMonsterPrinterStoppedEvent","run","loadPrintContexts"],"mappings":"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"}
@@ -10,26 +10,25 @@ Object.defineProperty(exports, "PrinterFileCleanTask", {
10
10
  });
11
11
  class PrinterFileCleanTask {
12
12
  logger;
13
- filesStore;
13
+ printerFilesStore;
14
14
  printerCache;
15
15
  settingsStore;
16
16
  taskManagerService;
17
17
  octoPrintApiService;
18
- constructor({ printerCache, filesStore, octoPrintApiService, taskManagerService, settingsStore, loggerFactory }){
18
+ constructor({ printerCache, printerFilesStore, octoPrintApiService, taskManagerService, settingsStore, loggerFactory }){
19
19
  this.printerCache = printerCache;
20
- this.filesStore = filesStore;
20
+ this.printerFilesStore = printerFilesStore;
21
21
  this.taskManagerService = taskManagerService;
22
22
  this.octoPrintApiService = octoPrintApiService;
23
23
  this.settingsStore = settingsStore;
24
24
  this.logger = loggerFactory(PrinterFileCleanTask.name);
25
25
  }
26
- get #ageDaysMaxSetting() {
27
- return this.#getSettings().autoRemoveOldFilesCriteriumDays;
26
+ get ageDaysMaxSetting() {
27
+ return this.getSettings().autoRemoveOldFilesCriteriumDays;
28
28
  }
29
29
  async run() {
30
- // TODO filter disconnected printers
31
30
  const printers = await this.printerCache.listCachedPrinters(false);
32
- const fileCleanSettings = this.#getSettings();
31
+ const fileCleanSettings = this.getSettings();
33
32
  const autoCleanAtBootEnabled = fileCleanSettings.autoRemoveOldFilesAtBoot;
34
33
  try {
35
34
  if (autoCleanAtBootEnabled) {
@@ -37,12 +36,10 @@ class PrinterFileCleanTask {
37
36
  } else {
38
37
  this.logger.log(`Reporting about old files of ${printers.length} printers.`);
39
38
  }
40
- // Filter printer states - cant clean unconnected OctoPrint instances
41
39
  for (let printer of printers){
42
40
  const outdatedFiles = this.getPrinterOutdatedFiles(printer);
43
41
  if (!outdatedFiles?.length) continue;
44
- // Report
45
- this.logger.log(`Found ${outdatedFiles?.length} old files of ${printer.printerName}`);
42
+ this.logger.log(`Found ${outdatedFiles?.length} old files of ${printer.name}`);
46
43
  if (autoCleanAtBootEnabled) {
47
44
  await this.cleanPrinterFiles(printer.id);
48
45
  }
@@ -52,19 +49,14 @@ class PrinterFileCleanTask {
52
49
  }
53
50
  }
54
51
  async cleanPrinterFiles(printerId) {
55
- // Act
56
- await this.filesStore.deleteOutdatedFiles(printerId, this.#ageDaysMaxSetting);
57
- // Update printer files
58
- await this.filesStore.eagerLoadPrinterFiles(printerId, false);
52
+ await this.printerFilesStore.deleteOutdatedFiles(printerId, this.ageDaysMaxSetting);
53
+ await this.printerFilesStore.eagerLoadPrinterFiles(printerId, false);
59
54
  }
60
- /**
61
- * Scans the printers files and checks the outdated ones based on settings
62
- * @param printer
63
- */ getPrinterOutdatedFiles(printer) {
64
- const ageDaysMax = this.#ageDaysMaxSetting;
65
- return this.filesStore.getOutdatedFiles(printer.id, ageDaysMax);
55
+ getPrinterOutdatedFiles(printer) {
56
+ const ageDaysMax = this.ageDaysMaxSetting;
57
+ return this.printerFilesStore.getOutdatedFiles(printer.id, ageDaysMax);
66
58
  }
67
- #getSettings() {
59
+ getSettings() {
68
60
  return this.settingsStore.getFileCleanSettings();
69
61
  }
70
62
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/tasks/printer-file-clean.task.ts"],"names":["PrinterFileCleanTask","logger","filesStore","printerCache","settingsStore","taskManagerService","octoPrintApiService","constructor","loggerFactory","name","ageDaysMaxSetting","getSettings","autoRemoveOldFilesCriteriumDays","run","printers","listCachedPrinters","fileCleanSettings","autoCleanAtBootEnabled","autoRemoveOldFilesAtBoot","log","length","printer","outdatedFiles","getPrinterOutdatedFiles","printerName","cleanPrinterFiles","id","printerId","deleteOutdatedFiles","eagerLoadPrinterFiles","ageDaysMax","getOutdatedFiles","getFileCleanSettings"],"mappings":";;;;+BAYaA;;;eAAAA;;;AAAN,MAAMA;IACXC,OAAsB;IACtBC,WAAuB;IACvBC,aAA2B;IAC3BC,cAA6B;IAC7BC,mBAAuC;IACvCC,oBAAyC;IAEzCC,YAAY,EACVJ,YAAY,EACZD,UAAU,EACVI,mBAAmB,EACnBD,kBAAkB,EAClBD,aAAa,EACbI,aAAa,EAQd,CAAE;QACD,IAAI,CAACL,YAAY,GAAGA;QACpB,IAAI,CAACD,UAAU,GAAGA;QAClB,IAAI,CAACG,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACF,aAAa,GAAGA;QACrB,IAAI,CAACH,MAAM,GAAGO,cAAcR,qBAAqBS,IAAI;IACvD;IAEA,IAAI,CAACC,iBAAiB;QACpB,OAAO,IAAI,CAAC,CAACC,WAAW,GAAGC,+BAA+B;IAC5D;IAEA,MAAMC,MAAM;QACV,oCAAoC;QACpC,MAAMC,WAAW,MAAM,IAAI,CAACX,YAAY,CAACY,kBAAkB,CAAC;QAC5D,MAAMC,oBAAoB,IAAI,CAAC,CAACL,WAAW;QAC3C,MAAMM,yBAAyBD,kBAAkBE,wBAAwB;QAEzE,IAAI;YACF,IAAID,wBAAwB;gBAC1B,IAAI,CAAChB,MAAM,CAACkB,GAAG,CAAC,CAAC,kBAAkB,EAAEL,SAASM,MAAM,CAAC,6DAA6D,CAAC;YACrH,OAAO;gBACL,IAAI,CAACnB,MAAM,CAACkB,GAAG,CAAC,CAAC,6BAA6B,EAAEL,SAASM,MAAM,CAAC,UAAU,CAAC;YAC7E;YAEA,qEAAqE;YACrE,KAAK,IAAIC,WAAWP,SAAU;gBAC5B,MAAMQ,gBAAgB,IAAI,CAACC,uBAAuB,CAACF;gBACnD,IAAI,CAACC,eAAeF,QAAQ;gBAE5B,SAAS;gBACT,IAAI,CAACnB,MAAM,CAACkB,GAAG,CAAC,CAAC,MAAM,EAAEG,eAAeF,OAAO,cAAc,EAAEC,QAAQG,WAAW,CAAC,CAAC;gBAEpF,IAAIP,wBAAwB;oBAC1B,MAAM,IAAI,CAACQ,iBAAiB,CAACJ,QAAQK,EAAE;gBACzC;YACF;QACF,SAAU;YACR,IAAI,CAACzB,MAAM,CAACkB,GAAG,CAAC,CAAC,mCAAmC,CAAC;QACvD;IACF;IAEA,MAAMM,kBAAkBE,SAAS,EAAE;QACjC,MAAM;QACN,MAAM,IAAI,CAACzB,UAAU,CAAC0B,mBAAmB,CAACD,WAAW,IAAI,CAAC,CAACjB,iBAAiB;QAE5E,uBAAuB;QACvB,MAAM,IAAI,CAACR,UAAU,CAAC2B,qBAAqB,CAACF,WAAW;IACzD;IAEA;;;GAGC,GACDJ,wBAAwBF,OAAO,EAAE;QAC/B,MAAMS,aAAa,IAAI,CAAC,CAACpB,iBAAiB;QAC1C,OAAO,IAAI,CAACR,UAAU,CAAC6B,gBAAgB,CAACV,QAAQK,EAAE,EAAEI;IACtD;IAEA,CAACnB,WAAW;QACV,OAAO,IAAI,CAACP,aAAa,CAAC4B,oBAAoB;IAChD;AACF"}
1
+ {"version":3,"sources":["../../src/tasks/printer-file-clean.task.ts"],"names":["PrinterFileCleanTask","logger","printerFilesStore","printerCache","settingsStore","taskManagerService","octoPrintApiService","constructor","loggerFactory","name","ageDaysMaxSetting","getSettings","autoRemoveOldFilesCriteriumDays","run","printers","listCachedPrinters","fileCleanSettings","autoCleanAtBootEnabled","autoRemoveOldFilesAtBoot","log","length","printer","outdatedFiles","getPrinterOutdatedFiles","cleanPrinterFiles","id","printerId","deleteOutdatedFiles","eagerLoadPrinterFiles","ageDaysMax","getOutdatedFiles","getFileCleanSettings"],"mappings":";;;;+BAcaA;;;eAAAA;;;AAAN,MAAMA;IACXC,OAAsB;IACtBC,kBAAqC;IACrCC,aAA2B;IAC3BC,cAA6B;IAC7BC,mBAAuC;IACvCC,oBAAyC;IAEzCC,YAAY,EACVJ,YAAY,EACZD,iBAAiB,EACjBI,mBAAmB,EACnBD,kBAAkB,EAClBD,aAAa,EACbI,aAAa,EAQd,CAAE;QACD,IAAI,CAACL,YAAY,GAAGA;QACpB,IAAI,CAACD,iBAAiB,GAAGA;QACzB,IAAI,CAACG,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACF,aAAa,GAAGA;QACrB,IAAI,CAACH,MAAM,GAAGO,cAAcR,qBAAqBS,IAAI;IACvD;IAEA,IAAYC,oBAAoB;QAC9B,OAAO,IAAI,CAACC,WAAW,GAAGC,+BAA+B;IAC3D;IAEA,MAAMC,MAAM;QAEV,MAAMC,WAAW,MAAM,IAAI,CAACX,YAAY,CAACY,kBAAkB,CAAC;QAC5D,MAAMC,oBAAoB,IAAI,CAACL,WAAW;QAC1C,MAAMM,yBAAyBD,kBAAkBE,wBAAwB;QAEzE,IAAI;YACF,IAAID,wBAAwB;gBAC1B,IAAI,CAAChB,MAAM,CAACkB,GAAG,CAAC,CAAC,kBAAkB,EAAEL,SAASM,MAAM,CAAC,6DAA6D,CAAC;YACrH,OAAO;gBACL,IAAI,CAACnB,MAAM,CAACkB,GAAG,CAAC,CAAC,6BAA6B,EAAEL,SAASM,MAAM,CAAC,UAAU,CAAC;YAC7E;YAGA,KAAK,IAAIC,WAAWP,SAAU;gBAC5B,MAAMQ,gBAAgB,IAAI,CAACC,uBAAuB,CAACF;gBACnD,IAAI,CAACC,eAAeF,QAAQ;gBAG5B,IAAI,CAACnB,MAAM,CAACkB,GAAG,CAAC,CAAC,MAAM,EAAEG,eAAeF,OAAO,cAAc,EAAEC,QAAQZ,IAAI,CAAC,CAAC;gBAE7E,IAAIQ,wBAAwB;oBAC1B,MAAM,IAAI,CAACO,iBAAiB,CAACH,QAAQI,EAAE;gBACzC;YACF;QACF,SAAU;YACR,IAAI,CAACxB,MAAM,CAACkB,GAAG,CAAC,CAAC,mCAAmC,CAAC;QACvD;IACF;IAEA,MAAMK,kBAAkBE,SAAiB,EAAE;QAEzC,MAAM,IAAI,CAACxB,iBAAiB,CAACyB,mBAAmB,CAACD,WAAW,IAAI,CAAChB,iBAAiB;QAGlF,MAAM,IAAI,CAACR,iBAAiB,CAAC0B,qBAAqB,CAACF,WAAW;IAChE;IAMAH,wBAAwBF,OAA2B,EAAE;QACnD,MAAMQ,aAAa,IAAI,CAACnB,iBAAiB;QACzC,OAAO,IAAI,CAACR,iBAAiB,CAAC4B,gBAAgB,CAACT,QAAQI,EAAE,EAAEI;IAC7D;IAEQlB,cAAc;QACpB,OAAO,IAAI,CAACP,aAAa,CAAC2B,oBAAoB;IAChD;AACF"}
@@ -23,9 +23,7 @@ class PrinterWebsocketRestoreTask {
23
23
  }
24
24
  async run() {
25
25
  const startTime = Date.now();
26
- /**
27
- * @type {OctoPrintSockIoAdapter[]}
28
- */ const existingSockets = this.printerSocketStore.listPrinterSockets();
26
+ const existingSockets = this.printerSocketStore.listPrinterSockets();
29
27
  const resetAdapterIds = [];
30
28
  const silentSocketIds = [];
31
29
  for (const socket of existingSockets){
@@ -40,10 +38,8 @@ class PrinterWebsocketRestoreTask {
40
38
  this.logger.error(`WebSocket authentication command failed for '${socket.printerId}' with error '${(0, _errorutils.errorSummary)(e)}'`, e.stack);
41
39
  continue;
42
40
  }
43
- // Often due to USB disconnect, not interesting to reconnect unless we perform an API call for verification
44
41
  if (socket.apiState !== _octoprintsockioadapter.API_STATE.unset && !socket.lastMessageReceivedTimestamp || Date.now() - socket.lastMessageReceivedTimestamp > 10 * 1000) {
45
42
  silentSocketIds.push(socket.printerId);
46
- // Produce logs for silent sockets
47
43
  try {
48
44
  const result = await this.octoPrintApiService.getConnection(socket.loginDto);
49
45
  if (result?.current?.state !== "Closed") {
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/tasks/printer-websocket-restore.task.ts"],"names":["PrinterWebsocketRestoreTask","settingsStore","printerSocketStore","octoPrintApiService","logger","constructor","loggerFactory","name","run","startTime","Date","now","existingSockets","listPrinterSockets","resetAdapterIds","silentSocketIds","socket","isClosedOrAborted","close","resetSocketState","push","printerId","e","error","errorSummary","stack","apiState","API_STATE","unset","lastMessageReceivedTimestamp","result","getConnection","loginDto","current","state","warn","duration","getServerSettings","debugSettings","debugSocketRetries","log","length"],"mappings":";;;;+BAQaA;;;eAAAA;;;4BARgB;wCACH;AAOnB,MAAMA;IACXC,cAA6B;IAC7BC,mBAAuC;IACvCC,oBAAyC;IACzCC,OAAsB;IAEtBC,YAAY,EACVH,kBAAkB,EAClBC,mBAAmB,EACnBF,aAAa,EACbK,aAAa,EAMd,CAAE;QACD,IAAI,CAACJ,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACF,aAAa,GAAGA;QACrB,IAAI,CAACG,MAAM,GAAGE,cAAcN,4BAA4BO,IAAI;IAC9D;IAEA,MAAMC,MAAM;QACV,MAAMC,YAAYC,KAAKC,GAAG;QAE1B;;KAEC,GACD,MAAMC,kBAAkB,IAAI,CAACV,kBAAkB,CAACW,kBAAkB;QAClE,MAAMC,kBAAkB,EAAE;QAC1B,MAAMC,kBAAkB,EAAE;QAC1B,KAAK,MAAMC,UAAUJ,gBAAiB;YACpC,IAAI;gBACF,IAAII,OAAOC,iBAAiB,IAAI;oBAC9BD,OAAOE,KAAK;oBACZF,OAAOG,gBAAgB;oBACvBL,gBAAgBM,IAAI,CAACJ,OAAOK,SAAS;oBACrC;gBACF;YACF,EAAE,OAAOC,GAAG;gBACV,IAAI,CAAClB,MAAM,CAACmB,KAAK,CACf,CAAC,6CAA6C,EAAEP,OAAOK,SAAS,CAAC,cAAc,EAAEG,IAAAA,wBAAY,EAACF,GAAG,CAAC,CAAC,EACnGA,EAAEG,KAAK;gBAET;YACF;YAEA,2GAA2G;YAC3G,IACE,AAACT,OAAOU,QAAQ,KAAKC,iCAAS,CAACC,KAAK,IAAI,CAACZ,OAAOa,4BAA4B,IAC5EnB,KAAKC,GAAG,KAAKK,OAAOa,4BAA4B,GAAG,KAAK,MACxD;gBACAd,gBAAgBK,IAAI,CAACJ,OAAOK,SAAS;gBACrC,kCAAkC;gBAClC,IAAI;oBACF,MAAMS,SAAS,MAAM,IAAI,CAAC3B,mBAAmB,CAAC4B,aAAa,CAACf,OAAOgB,QAAQ;oBAC3E,IAAIF,QAAQG,SAASC,UAAU,UAAU;wBACvC,IAAI,CAAC9B,MAAM,CAAC+B,IAAI,CACd,CAAC,4FAA4F,EAAEL,QAAQG,SAASC,MAAM,aAAa,EAAElB,OAAOK,SAAS,CAAC,CAAC,CAAC;oBAE5J;gBACF,EAAE,OAAOC,GAAG;oBACV,IAAI,CAAClB,MAAM,CAACmB,KAAK,CACf,CAAC,uFAAuF,EAAEP,OAAOK,SAAS,CAAC,CAAC,CAAC;gBAEjH;YACF;QACF;QAEA,MAAMe,WAAW1B,KAAKC,GAAG,KAAKF;QAC9B,IAAI,IAAI,CAACR,aAAa,CAACoC,iBAAiB,IAAIC,eAAeC,oBAAoB;YAC7E,IAAI,CAACnC,MAAM,CAACoC,GAAG,CACb,CAAC,MAAM,EAAE1B,gBAAgB2B,MAAM,CAAC,qCAAqC,EAAE1B,gBAAgB0B,MAAM,CAAC,0BAA0B,EAAEL,SAAS,GAAG,CAAC;QAE3I;IACF;AACF"}
1
+ {"version":3,"sources":["../../src/tasks/printer-websocket-restore.task.ts"],"names":["PrinterWebsocketRestoreTask","settingsStore","printerSocketStore","octoPrintApiService","logger","constructor","loggerFactory","name","run","startTime","Date","now","existingSockets","listPrinterSockets","resetAdapterIds","silentSocketIds","socket","isClosedOrAborted","close","resetSocketState","push","printerId","e","error","errorSummary","stack","apiState","API_STATE","unset","lastMessageReceivedTimestamp","result","getConnection","loginDto","current","state","warn","duration","getServerSettings","debugSettings","debugSocketRetries","log","length"],"mappings":";;;;+BAQaA;;;eAAAA;;;4BARgB;wCACH;AAOnB,MAAMA;IACXC,cAA6B;IAC7BC,mBAAuC;IACvCC,oBAAyC;IACzCC,OAAsB;IAEtBC,YAAY,EACVH,kBAAkB,EAClBC,mBAAmB,EACnBF,aAAa,EACbK,aAAa,EAMd,CAAE;QACD,IAAI,CAACJ,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACF,aAAa,GAAGA;QACrB,IAAI,CAACG,MAAM,GAAGE,cAAcN,4BAA4BO,IAAI;IAC9D;IAEA,MAAMC,MAAM;QACV,MAAMC,YAAYC,KAAKC,GAAG;QAK1B,MAAMC,kBAAkB,IAAI,CAACV,kBAAkB,CAACW,kBAAkB;QAClE,MAAMC,kBAAkB,EAAE;QAC1B,MAAMC,kBAAkB,EAAE;QAC1B,KAAK,MAAMC,UAAUJ,gBAAiB;YACpC,IAAI;gBACF,IAAII,OAAOC,iBAAiB,IAAI;oBAC9BD,OAAOE,KAAK;oBACZF,OAAOG,gBAAgB;oBACvBL,gBAAgBM,IAAI,CAACJ,OAAOK,SAAS;oBACrC;gBACF;YACF,EAAE,OAAOC,GAAG;gBACV,IAAI,CAAClB,MAAM,CAACmB,KAAK,CACf,CAAC,6CAA6C,EAAEP,OAAOK,SAAS,CAAC,cAAc,EAAEG,IAAAA,wBAAY,EAACF,GAAG,CAAC,CAAC,EACnGA,EAAEG,KAAK;gBAET;YACF;YAGA,IACE,AAACT,OAAOU,QAAQ,KAAKC,iCAAS,CAACC,KAAK,IAAI,CAACZ,OAAOa,4BAA4B,IAC5EnB,KAAKC,GAAG,KAAKK,OAAOa,4BAA4B,GAAG,KAAK,MACxD;gBACAd,gBAAgBK,IAAI,CAACJ,OAAOK,SAAS;gBAErC,IAAI;oBACF,MAAMS,SAAS,MAAM,IAAI,CAAC3B,mBAAmB,CAAC4B,aAAa,CAACf,OAAOgB,QAAQ;oBAC3E,IAAIF,QAAQG,SAASC,UAAU,UAAU;wBACvC,IAAI,CAAC9B,MAAM,CAAC+B,IAAI,CACd,CAAC,4FAA4F,EAAEL,QAAQG,SAASC,MAAM,aAAa,EAAElB,OAAOK,SAAS,CAAC,CAAC,CAAC;oBAE5J;gBACF,EAAE,OAAOC,GAAG;oBACV,IAAI,CAAClB,MAAM,CAACmB,KAAK,CACf,CAAC,uFAAuF,EAAEP,OAAOK,SAAS,CAAC,CAAC,CAAC;gBAEjH;YACF;QACF;QAEA,MAAMe,WAAW1B,KAAKC,GAAG,KAAKF;QAC9B,IAAI,IAAI,CAACR,aAAa,CAACoC,iBAAiB,IAAIC,eAAeC,oBAAoB;YAC7E,IAAI,CAACnC,MAAM,CAACoC,GAAG,CACb,CAAC,MAAM,EAAE1B,gBAAgB2B,MAAM,CAAC,qCAAqC,EAAE1B,gBAAgB0B,MAAM,CAAC,0BAA0B,EAAEL,SAAS,GAAG,CAAC;QAE3I;IACF;AACF"}
@@ -9,21 +9,11 @@ Object.defineProperty(exports, "PrinterWebsocketTask", {
9
9
  }
10
10
  });
11
11
  class PrinterWebsocketTask {
12
- /**
13
- * @type {PrinterSocketStore}
14
- */ printerSocketStore;
15
- /**
16
- * @type {SettingsStore}
17
- */ settingsStore;
18
- /**
19
- * @type {OctoPrintApiService}
20
- */ octoPrintApiService;
21
- /**
22
- * @type {TaskManagerService}
23
- */ taskManagerService;
24
- /**
25
- * @type {LoggerService}
26
- */ logger;
12
+ printerSocketStore;
13
+ settingsStore;
14
+ octoPrintApiService;
15
+ taskManagerService;
16
+ logger;
27
17
  constructor({ printerSocketStore, octoPrintApiService, settingsStore, taskManagerService, loggerFactory }){
28
18
  this.printerSocketStore = printerSocketStore;
29
19
  this.settingsStore = settingsStore;
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/tasks/printer-websocket.task.ts"],"names":["PrinterWebsocketTask","printerSocketStore","settingsStore","octoPrintApiService","taskManagerService","logger","constructor","loggerFactory","name","run","startTime","Date","now","result","reconnectPrinterSockets","getServerSettings","debugSettings","debugSocketReconnect","log"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA;IACX;;GAEC,GACDC,mBAAmB;IACnB;;GAEC,GACDC,cAAc;IACd;;GAEC,GACDC,oBAAoB;IACpB;;GAEC,GACDC,mBAAmB;IAEnB;;GAEC,GACDC,OAAO;IAEPC,YAAY,EAAEL,kBAAkB,EAAEE,mBAAmB,EAAED,aAAa,EAAEE,kBAAkB,EAAEG,aAAa,EAAE,CAAE;QACzG,IAAI,CAACN,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,aAAa,GAAGA;QACrB,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACC,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,MAAM,GAAGE,cAAcP,qBAAqBQ,IAAI;IACvD;IAEA,MAAMC,MAAM;QACV,MAAMC,YAAYC,KAAKC,GAAG;QAC1B,MAAMC,SAAS,MAAM,IAAI,CAACZ,kBAAkB,CAACa,uBAAuB;QACpE,IAAI,IAAI,CAACZ,aAAa,CAACa,iBAAiB,GAAGC,aAAa,EAAEC,sBAAsB;YAC9E,IAAI,CAACZ,MAAM,CAACa,GAAG,CAAC,CAAC,kBAAkB,EAAEP,KAAKC,GAAG,KAAKF,UAAU,GAAG,CAAC,EAAEG;QACpE;IACF;AACF"}
1
+ {"version":3,"sources":["../../src/tasks/printer-websocket.task.ts"],"names":["PrinterWebsocketTask","printerSocketStore","settingsStore","octoPrintApiService","taskManagerService","logger","constructor","loggerFactory","name","run","startTime","Date","now","result","reconnectPrinterSockets","getServerSettings","debugSettings","debugSocketReconnect","log"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA;IAIXC,mBAAmB;IAInBC,cAAc;IAIdC,oBAAoB;IAIpBC,mBAAmB;IAKnBC,OAAO;IAEPC,YAAY,EAAEL,kBAAkB,EAAEE,mBAAmB,EAAED,aAAa,EAAEE,kBAAkB,EAAEG,aAAa,EAAE,CAAE;QACzG,IAAI,CAACN,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,aAAa,GAAGA;QACrB,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACC,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,MAAM,GAAGE,cAAcP,qBAAqBQ,IAAI;IACvD;IAEA,MAAMC,MAAM;QACV,MAAMC,YAAYC,KAAKC,GAAG;QAC1B,MAAMC,SAAS,MAAM,IAAI,CAACZ,kBAAkB,CAACa,uBAAuB;QACpE,IAAI,IAAI,CAACZ,aAAa,CAACa,iBAAiB,GAAGC,aAAa,EAAEC,sBAAsB;YAC9E,IAAI,CAACZ,MAAM,CAACa,GAAG,CAAC,CAAC,kBAAkB,EAAEP,KAAKC,GAAG,KAAKF,UAAU,GAAG,CAAC,EAAEG;QACpE;IACF;AACF"}
@@ -55,7 +55,6 @@ class SocketIoTask {
55
55
  printerEvents,
56
56
  trackedUploads
57
57
  };
58
- // Precise debugging
59
58
  if (this.settingsStore.getServerSettings().debugSettings?.debugSocketIoBandwidth) {
60
59
  const kbDataString = Object.entries(socketIoData).map(([id, state])=>{
61
60
  return `${id} ${(0, _metricutils.formatKB)(state)}`;
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/tasks/socketio.task.ts"],"names":["SocketIoTask","socketIoGateway","printerSocketStore","printerEventsCache","floorStore","fileUploadTrackerCache","eventEmitter2","printerCache","logger","settingsStore","aggregateSizeCounter","aggregateWindowLength","aggregateSizes","rounding","constructor","loggerFactory","name","on","socketIoConnectedEvent","sendUpdate","run","floors","listCache","printers","listCachedPrinters","socketStates","getSocketStatesById","printerEvents","getAllKeyValues","trackedUploads","getUploads","socketIoData","getServerSettings","debugSettings","debugSocketIoBandwidth","kbDataString","Object","entries","map","id","state","formatKB","join","log","serializedData","JSON","stringify","transportDataSize","sizeKB","updateAggregator","send","IO_MESSAGES","LegacyUpdate","transportDataLength","summedPayloadSize","reduce","t","n","averagePayloadSize","toFixed","push"],"mappings":"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"}
1
+ {"version":3,"sources":["../../src/tasks/socketio.task.ts"],"names":["SocketIoTask","socketIoGateway","printerSocketStore","printerEventsCache","floorStore","fileUploadTrackerCache","eventEmitter2","printerCache","logger","settingsStore","aggregateSizeCounter","aggregateWindowLength","aggregateSizes","rounding","constructor","loggerFactory","name","on","socketIoConnectedEvent","sendUpdate","run","floors","listCache","printers","listCachedPrinters","socketStates","getSocketStatesById","printerEvents","getAllKeyValues","trackedUploads","getUploads","socketIoData","getServerSettings","debugSettings","debugSocketIoBandwidth","kbDataString","Object","entries","map","id","state","formatKB","join","log","serializedData","JSON","stringify","transportDataSize","sizeKB","updateAggregator","send","IO_MESSAGES","LegacyUpdate","transportDataLength","summedPayloadSize","reduce","t","n","averagePayloadSize","toFixed","push"],"mappings":"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"}
package/dist/tasks.js CHANGED
@@ -38,9 +38,7 @@ class ServerTasks {
38
38
  registerTask(_containertokens.DITokens.socketIoTask, _taskpresets.TASK_PRESETS.PERIODIC, 500),
39
39
  registerTask(_containertokens.DITokens.printCompletionSocketIoTask, _taskpresets.TASK_PRESETS.RUNONCE),
40
40
  registerTask(_containertokens.DITokens.printerFileCleanTask, _taskpresets.TASK_PRESETS.RUNONCE, 60 * 1000, true),
41
- // Every 2 seconds
42
41
  registerTask(_containertokens.DITokens.printerWebsocketTask, _taskpresets.TASK_PRESETS.PERIODIC, 2000, true),
43
- // Every 15 seconds
44
42
  registerTask(_containertokens.DITokens.printerWebsocketRestoreTask, _taskpresets.TASK_PRESETS.PERIODIC, 15 * 1000, false)
45
43
  ];
46
44
  }
package/dist/tasks.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/tasks.ts"],"names":["ServerTasks","registerTask","task","preset","milliseconds","runImmediately","timingPreset","id","name","SERVER_BOOT_TASK","DITokens","bootTask","TaskPresets","PERIODIC_DISABLED","BOOT_TASKS","softwareUpdateTask","RUNDELAYED","clientDistDownloadTask","RUNONCE","socketIoTask","PERIODIC","printCompletionSocketIoTask","printerFileCleanTask","printerWebsocketTask","printerWebsocketRestoreTask"],"mappings":";;;;;;;;;;;IAsBaA,WAAW;eAAXA;;IAXGC,YAAY;eAAZA;;;6BAX4B;iCACnB;AAUlB,SAASA,aAAaC,IAAI,EAAEC,MAAM,EAAEC,eAAe,CAAC,EAAEC,iBAAiB,KAAK;IACjF,IAAIC,eAAe;QAAE,GAAGH,MAAM;IAAC;IAC/BG,aAAaF,YAAY,GAAGD,OAAOC,YAAY,IAAIA;IACnDE,aAAaD,cAAc,GAAGA,iBAAiB;IAC/C,OAAO;QACLE,IAAIL,KAAKM,IAAI,IAAIN;QACjBA;QACAC,QAAQG;IACV;AACF;AAEO,MAAMN;IACX,OAAOS,mBAAmBR,aAAaS,yBAAQ,CAACC,QAAQ,EAAEC,yBAAW,CAACC,iBAAiB,EAAE,MAAM,OAAO;IACtG,OAAOC,aAAa;QAClBb,aAAaS,yBAAQ,CAACK,kBAAkB,EAAEH,yBAAW,CAACI,UAAU,EAAE;QAClEf,aAAaS,yBAAQ,CAACO,sBAAsB,EAAEL,yBAAW,CAACM,OAAO;QACjEjB,aAAaS,yBAAQ,CAACS,YAAY,EAAEP,yBAAW,CAACQ,QAAQ,EAAE;QAC1DnB,aAAaS,yBAAQ,CAACW,2BAA2B,EAAET,yBAAW,CAACM,OAAO;QACtEjB,aAAaS,yBAAQ,CAACY,oBAAoB,EAAEV,yBAAW,CAACM,OAAO,EAAE,KAAK,MAAM;QAC5E,kBAAkB;QAClBjB,aAAaS,yBAAQ,CAACa,oBAAoB,EAAEX,yBAAW,CAACQ,QAAQ,EAAE,MAAM;QACxE,mBAAmB;QACnBnB,aAAaS,yBAAQ,CAACc,2BAA2B,EAAEZ,yBAAW,CAACQ,QAAQ,EAAE,KAAK,MAAM;KACrF,CAAC;AACJ"}
1
+ {"version":3,"sources":["../src/tasks.ts"],"names":["ServerTasks","registerTask","task","preset","milliseconds","runImmediately","timingPreset","id","name","SERVER_BOOT_TASK","DITokens","bootTask","TaskPresets","PERIODIC_DISABLED","BOOT_TASKS","softwareUpdateTask","RUNDELAYED","clientDistDownloadTask","RUNONCE","socketIoTask","PERIODIC","printCompletionSocketIoTask","printerFileCleanTask","printerWebsocketTask","printerWebsocketRestoreTask"],"mappings":";;;;;;;;;;;IAsBaA,WAAW;eAAXA;;IAXGC,YAAY;eAAZA;;;6BAX4B;iCACnB;AAUlB,SAASA,aAAaC,IAAI,EAAEC,MAAM,EAAEC,eAAe,CAAC,EAAEC,iBAAiB,KAAK;IACjF,IAAIC,eAAe;QAAE,GAAGH,MAAM;IAAC;IAC/BG,aAAaF,YAAY,GAAGD,OAAOC,YAAY,IAAIA;IACnDE,aAAaD,cAAc,GAAGA,iBAAiB;IAC/C,OAAO;QACLE,IAAIL,KAAKM,IAAI,IAAIN;QACjBA;QACAC,QAAQG;IACV;AACF;AAEO,MAAMN;IACX,OAAOS,mBAAmBR,aAAaS,yBAAQ,CAACC,QAAQ,EAAEC,yBAAW,CAACC,iBAAiB,EAAE,MAAM,OAAO;IACtG,OAAOC,aAAa;QAClBb,aAAaS,yBAAQ,CAACK,kBAAkB,EAAEH,yBAAW,CAACI,UAAU,EAAE;QAClEf,aAAaS,yBAAQ,CAACO,sBAAsB,EAAEL,yBAAW,CAACM,OAAO;QACjEjB,aAAaS,yBAAQ,CAACS,YAAY,EAAEP,yBAAW,CAACQ,QAAQ,EAAE;QAC1DnB,aAAaS,yBAAQ,CAACW,2BAA2B,EAAET,yBAAW,CAACM,OAAO;QACtEjB,aAAaS,yBAAQ,CAACY,oBAAoB,EAAEV,yBAAW,CAACM,OAAO,EAAE,KAAK,MAAM;QAE5EjB,aAAaS,yBAAQ,CAACa,oBAAoB,EAAEX,yBAAW,CAACQ,QAAQ,EAAE,MAAM;QAExEnB,aAAaS,yBAAQ,CAACc,2BAA2B,EAAEZ,yBAAW,CAACQ,QAAQ,EAAE,KAAK,MAAM;KACrF,CAAC;AACJ"}
@@ -1,4 +1,3 @@
1
- // to make the file a module and avoid the TypeScript error
2
1
  "use strict";
3
2
  Object.defineProperty(exports, "__esModule", {
4
3
  value: true
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/types/express/index.d.ts"],"names":[],"mappings":"AAAA,2DAA2D"}
1
+ {"version":3,"sources":["../../../src/types/express/index.d.ts"],"names":[],"mappings":""}
@@ -34,7 +34,7 @@ _export(exports, {
34
34
  return verifyPackageJsonRequirements;
35
35
  }
36
36
  });
37
- const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
37
+ const _fs = _interop_require_default(require("fs"));
38
38
  const _logger = require("../handlers/logger");
39
39
  const _serverconstants = require("../server.constants");
40
40
  const _path = require("path");
@@ -67,10 +67,7 @@ function isNodemon() {
67
67
  function isNode() {
68
68
  return "NODE" in process.env;
69
69
  }
70
- /**
71
- * Turn an object into an envfile string
72
- * Copied from https://github.com/bevry/envfile
73
- */ function stringifyDotEnv(obj) {
70
+ function stringifyDotEnv(obj) {
74
71
  let result = "";
75
72
  for (const [key, value] of Object.entries(obj)){
76
73
  if (key) {
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/utils/env.utils.ts"],"names":["getEnvOrDefault","isDevelopmentEnvironment","isNode","isNodemon","isPm2","isProductionEnvironment","isTestEnvironment","verifyPackageJsonRequirements","logger","LoggerService","key","defaultVal","val","process","env","length","NODE_ENV","AppConstants","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","npm_lifecycle_script","includes","stringifyDotEnv","obj","result","value","Object","entries","line","String","rootPath","dirConts","fs","readdirSync","hasPackageJson","error","debug","packageName","require","join","name","toLowerCase","serverPackageName"],"mappings":";;;;;;;;;;;IAOgBA,eAAe;eAAfA;;IAMAC,wBAAwB;eAAxBA;;IAoBAC,MAAM;eAANA;;IAJAC,SAAS;eAATA;;IAJAC,KAAK;eAALA;;IAJAC,uBAAuB;eAAvBA;;IAJAC,iBAAiB;eAAjBA;;IAmCAC,6BAA6B;eAA7BA;;;2DApDD;wBACe;iCACD;sBACR;;;;;;AAErB,MAAMC,SAAS,IAAIC,qBAAa,CAAC,aAAa;AAEvC,SAAST,gBAAgBU,GAAQ,EAAEC,UAAe;IACvD,MAAMC,MAAMC,QAAQC,GAAG,CAACJ,IAAI;IAC5B,IAAI,CAACE,KAAKG,QAAQ,OAAOJ;IACzB,OAAOC;AACT;AAEO,SAASX;IACd,OAAOY,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACC,qBAAqB;AACpE;AAEO,SAASZ;IACd,OAAOO,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACE,cAAc;AAC7D;AAEO,SAASd;IACd,OAAOQ,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACG,oBAAoB;AACnE;AAEO,SAAShB;IACd,OAAO,cAAcS,QAAQC,GAAG,IAAI,yBAAyBD,QAAQC,GAAG,IAAI,aAAaD,QAAQC,GAAG;AACtG;AAEO,SAASX;IACd,OAAO,0BAA0BU,QAAQC,GAAG,IAAID,QAAQC,GAAG,CAACO,oBAAoB,CAAEC,QAAQ,CAAC;AAC7F;AAEO,SAASpB;IACd,OAAO,UAAUW,QAAQC,GAAG;AAC9B;AAEA;;;CAGC,GACD,SAASS,gBAAgBC,GAAQ;IAC/B,IAAIC,SAAS;IACb,KAAK,MAAM,CAACf,KAAKgB,MAAM,IAAIC,OAAOC,OAAO,CAACJ,KAAM;QAC9C,IAAId,KAAK;YACP,MAAMmB,OAAO,CAAC,EAAEnB,IAAI,CAAC,EAAEoB,OAAOJ,OAAO,CAAC;YACtCD,UAAUI,OAAO;QACnB;IACF;IACA,OAAOJ;AACT;AAEO,SAASlB,8BAA8BwB,QAAgB;IAC5D,MAAMC,WAAWC,WAAE,CAACC,WAAW,CAACH;IAChC,MAAMI,iBAAiBH,SAASV,QAAQ,CAAC;IACzC,IAAI,CAACa,gBAAgB;QACnB3B,OAAO4B,KAAK,CAAC,CAAC,sDAAsD,EAAEL,SAAS,CAAC;QAChF,OAAO;IACT;IAEAvB,OAAO6B,KAAK,CAAC;IACb,MAAMC,cAAcC,QAAQC,IAAAA,UAAI,EAACT,UAAU,iBAAiBU,IAAI;IAChE,IAAI,CAACH,aAAa;QAChB9B,OAAO4B,KAAK,CAAC;QACb,OAAO;IACT;IAEA,IAAIE,YAAYI,WAAW,OAAOzB,6BAAY,CAAC0B,iBAAiB,EAAE;QAChEnC,OAAO4B,KAAK,CACV,CAAC,yEAAyE,EAAEE,YAAYI,WAAW,GAAG,uBAAuB,CAAC;QAEhI,OAAO;IACT;IAEAlC,OAAO6B,KAAK,CAAC;IACb,OAAO;AACT"}
1
+ {"version":3,"sources":["../../src/utils/env.utils.ts"],"names":["getEnvOrDefault","isDevelopmentEnvironment","isNode","isNodemon","isPm2","isProductionEnvironment","isTestEnvironment","verifyPackageJsonRequirements","logger","LoggerService","key","defaultVal","val","process","env","length","NODE_ENV","AppConstants","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","npm_lifecycle_script","includes","stringifyDotEnv","obj","result","value","Object","entries","line","String","rootPath","dirConts","fs","readdirSync","hasPackageJson","error","debug","packageName","require","join","name","toLowerCase","serverPackageName"],"mappings":";;;;;;;;;;;IAOgBA,eAAe;eAAfA;;IAMAC,wBAAwB;eAAxBA;;IAoBAC,MAAM;eAANA;;IAJAC,SAAS;eAATA;;IAJAC,KAAK;eAALA;;IAJAC,uBAAuB;eAAvBA;;IAJAC,iBAAiB;eAAjBA;;IAmCAC,6BAA6B;eAA7BA;;;6CApDD;wBACe;iCACD;sBACR;;;;;;AAErB,MAAMC,SAAS,IAAIC,qBAAa,CAAC,aAAa;AAEvC,SAAST,gBAAgBU,GAAQ,EAAEC,UAAe;IACvD,MAAMC,MAAMC,QAAQC,GAAG,CAACJ,IAAI;IAC5B,IAAI,CAACE,KAAKG,QAAQ,OAAOJ;IACzB,OAAOC;AACT;AAEO,SAASX;IACd,OAAOY,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACC,qBAAqB;AACpE;AAEO,SAASZ;IACd,OAAOO,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACE,cAAc;AAC7D;AAEO,SAASd;IACd,OAAOQ,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACG,oBAAoB;AACnE;AAEO,SAAShB;IACd,OAAO,cAAcS,QAAQC,GAAG,IAAI,yBAAyBD,QAAQC,GAAG,IAAI,aAAaD,QAAQC,GAAG;AACtG;AAEO,SAASX;IACd,OAAO,0BAA0BU,QAAQC,GAAG,IAAID,QAAQC,GAAG,CAACO,oBAAoB,CAAEC,QAAQ,CAAC;AAC7F;AAEO,SAASpB;IACd,OAAO,UAAUW,QAAQC,GAAG;AAC9B;AAMA,SAASS,gBAAgBC,GAAQ;IAC/B,IAAIC,SAAS;IACb,KAAK,MAAM,CAACf,KAAKgB,MAAM,IAAIC,OAAOC,OAAO,CAACJ,KAAM;QAC9C,IAAId,KAAK;YACP,MAAMmB,OAAO,CAAC,EAAEnB,IAAI,CAAC,EAAEoB,OAAOJ,OAAO,CAAC;YACtCD,UAAUI,OAAO;QACnB;IACF;IACA,OAAOJ;AACT;AAEO,SAASlB,8BAA8BwB,QAAgB;IAC5D,MAAMC,WAAWC,WAAE,CAACC,WAAW,CAACH;IAChC,MAAMI,iBAAiBH,SAASV,QAAQ,CAAC;IACzC,IAAI,CAACa,gBAAgB;QACnB3B,OAAO4B,KAAK,CAAC,CAAC,sDAAsD,EAAEL,SAAS,CAAC;QAChF,OAAO;IACT;IAEAvB,OAAO6B,KAAK,CAAC;IACb,MAAMC,cAAcC,QAAQC,IAAAA,UAAI,EAACT,UAAU,iBAAiBU,IAAI;IAChE,IAAI,CAACH,aAAa;QAChB9B,OAAO4B,KAAK,CAAC;QACb,OAAO;IACT;IAEA,IAAIE,YAAYI,WAAW,OAAOzB,6BAAY,CAAC0B,iBAAiB,EAAE;QAChEnC,OAAO4B,KAAK,CACV,CAAC,yEAAyE,EAAEE,YAAYI,WAAW,GAAG,uBAAuB,CAAC;QAEhI,OAAO;IACT;IAEAlC,OAAO6B,KAAK,CAAC;IACb,OAAO;AACT"}
@@ -8,7 +8,7 @@ Object.defineProperty(exports, "isDocker", {
8
8
  return isDocker;
9
9
  }
10
10
  });
11
- const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
11
+ const _fs = _interop_require_default(require("fs"));
12
12
  function _interop_require_default(obj) {
13
13
  return obj && obj.__esModule ? obj : {
14
14
  default: obj
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/utils/is-docker.ts"],"names":["isDocker","isDockerCached","undefined","hasDockerEnv","fs","statSync","hasDockerCGroup","readFileSync","includes"],"mappings":";;;;+BAqBgBA;;;eAAAA;;;2DArBD;;;;;;AAEf,IAAIC,iBAAsCC;AAE1C,SAASC;IACP,IAAI;QACFC,WAAE,CAACC,QAAQ,CAAC;QACZ,OAAO;IACT,EAAE,OAAM;QACN,OAAO;IACT;AACF;AAEA,SAASC;IACP,IAAI;QACF,OAAOF,WAAE,CAACG,YAAY,CAAC,qBAAqB,QAAQC,QAAQ,CAAC;IAC/D,EAAE,OAAM;QACN,OAAO;IACT;AACF;AAEO,SAASR;IACd,IAAIC,mBAAmBC,WAAW;QAChCD,iBAAiBE,kBAAkBG;IACrC;IAEA,OAAOL;AACT"}
1
+ {"version":3,"sources":["../../src/utils/is-docker.ts"],"names":["isDocker","isDockerCached","undefined","hasDockerEnv","fs","statSync","hasDockerCGroup","readFileSync","includes"],"mappings":";;;;+BAqBgBA;;;eAAAA;;;6CArBD;;;;;;AAEf,IAAIC,iBAAsCC;AAE1C,SAASC;IACP,IAAI;QACFC,WAAE,CAACC,QAAQ,CAAC;QACZ,OAAO;IACT,EAAE,OAAM;QACN,OAAO;IACT;AACF;AAEA,SAASC;IACP,IAAI;QACF,OAAOF,WAAE,CAACG,YAAY,CAAC,qBAAqB,QAAQC,QAAQ,CAAC;IAC/D,EAAE,OAAM;QACN,OAAO;IACT;AACF;AAEO,SAASR;IACd,IAAIC,mBAAmBC,WAAW;QAChCD,iBAAiBE,kBAAkBG;IACrC;IAEA,OAAOL;AACT"}