@fdm-monster/server 1.9.0-rc1 → 1.9.1

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 (251) hide show
  1. package/.env.template +1 -1
  2. package/.yarn/install-state.gz +0 -0
  3. package/.yarn/releases/yarn-4.10.3.cjs +942 -0
  4. package/.yarnrc.yml +1 -1
  5. package/README.md +2 -2
  6. package/RELEASE_NOTES.MD +25 -0
  7. package/dist/consoles/utils/api-messages.js +5 -5
  8. package/dist/consoles/utils/api-messages.js.map +1 -1
  9. package/dist/constants/authorization.constants.js +9 -9
  10. package/dist/constants/authorization.constants.js.map +1 -1
  11. package/dist/constants/event.constants.js +8 -8
  12. package/dist/constants/event.constants.js.map +1 -1
  13. package/dist/constants/server-settings.constants.js +16 -15
  14. package/dist/constants/server-settings.constants.js.map +1 -1
  15. package/dist/constants/service.constants.js +4 -4
  16. package/dist/constants/service.constants.js.map +1 -1
  17. package/dist/container.js +3 -3
  18. package/dist/container.js.map +1 -1
  19. package/dist/controllers/auth.controller.js.map +1 -1
  20. package/dist/controllers/batch-call.controller.js.map +1 -1
  21. package/dist/controllers/camera-stream.controller.js.map +1 -1
  22. package/dist/controllers/custom-gcode.controller.js.map +1 -1
  23. package/dist/controllers/first-time-setup.controller.js.map +1 -1
  24. package/dist/controllers/floor.controller.js.map +1 -1
  25. package/dist/controllers/metrics.controller.js.map +1 -1
  26. package/dist/controllers/print-completion.controller.js.map +1 -1
  27. package/dist/controllers/printer-files.controller.js +3 -1
  28. package/dist/controllers/printer-files.controller.js.map +1 -1
  29. package/dist/controllers/printer-group.controller.js.map +1 -1
  30. package/dist/controllers/printer-settings.controller.js.map +1 -1
  31. package/dist/controllers/printer.controller.js.map +1 -1
  32. package/dist/controllers/server-private.controller.js.map +1 -1
  33. package/dist/controllers/server-public.controller.js +8 -4
  34. package/dist/controllers/server-public.controller.js.map +1 -1
  35. package/dist/controllers/settings.controller.js.map +1 -1
  36. package/dist/controllers/user.controller.js.map +1 -1
  37. package/dist/controllers/validation/batch-controller.validation.js +4 -4
  38. package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
  39. package/dist/controllers/validation/generic.validation.js +3 -3
  40. package/dist/controllers/validation/generic.validation.js.map +1 -1
  41. package/dist/controllers/validation/printer-controller.validation.js +6 -6
  42. package/dist/controllers/validation/printer-controller.validation.js.map +1 -1
  43. package/dist/controllers/validation/printer-files-controller.validation.js +13 -4
  44. package/dist/controllers/validation/printer-files-controller.validation.js.map +1 -1
  45. package/dist/controllers/validation/setting.validation.js +4 -4
  46. package/dist/controllers/validation/setting.validation.js.map +1 -1
  47. package/dist/controllers/validation/user-controller.validation.js +8 -8
  48. package/dist/controllers/validation/user-controller.validation.js.map +1 -1
  49. package/dist/entities/index.js +12 -12
  50. package/dist/entities/index.js.map +1 -1
  51. package/dist/entities/settings.entity.js.map +1 -1
  52. package/dist/exceptions/failed-dependency.exception.js.map +1 -1
  53. package/dist/exceptions/job.exceptions.js.map +1 -1
  54. package/dist/exceptions/runtime.exceptions.js +10 -10
  55. package/dist/exceptions/runtime.exceptions.js.map +1 -1
  56. package/dist/handlers/logger-factory.js +2 -2
  57. package/dist/handlers/logger-factory.js.map +1 -1
  58. package/dist/handlers/logger.js +9 -151
  59. package/dist/handlers/logger.js.map +1 -1
  60. package/dist/handlers/logging/file-logging.transport.js +35 -0
  61. package/dist/handlers/logging/file-logging.transport.js.map +1 -0
  62. package/dist/handlers/logging/loki-logging.transport.js +55 -0
  63. package/dist/handlers/logging/loki-logging.transport.js.map +1 -0
  64. package/dist/handlers/logging/static.logger.js +134 -0
  65. package/dist/handlers/logging/static.logger.js.map +1 -0
  66. package/dist/handlers/validators.js +3 -3
  67. package/dist/handlers/validators.js.map +1 -1
  68. package/dist/index.js +13 -0
  69. package/dist/index.js.map +1 -1
  70. package/dist/middleware/authenticate.js +4 -4
  71. package/dist/middleware/authenticate.js.map +1 -1
  72. package/dist/middleware/global.middleware.js +3 -3
  73. package/dist/middleware/global.middleware.js.map +1 -1
  74. package/dist/middleware/param-converter.middleware.js +5 -5
  75. package/dist/middleware/param-converter.middleware.js.map +1 -1
  76. package/dist/middleware/passport.js +4 -4
  77. package/dist/middleware/passport.js.map +1 -1
  78. package/dist/middleware/printer.js +6 -6
  79. package/dist/middleware/printer.js.map +1 -1
  80. package/dist/middleware/socketio.middleware.js +11 -3
  81. package/dist/middleware/socketio.middleware.js.map +1 -1
  82. package/dist/models/Printer.js +3 -3
  83. package/dist/models/Printer.js.map +1 -1
  84. package/dist/models/Settings.js +6 -1
  85. package/dist/models/Settings.js.map +1 -1
  86. package/dist/models/index.js +11 -11
  87. package/dist/models/index.js.map +1 -1
  88. package/dist/server.constants.js +2 -1
  89. package/dist/server.constants.js.map +1 -1
  90. package/dist/server.env.js +18 -19
  91. package/dist/server.env.js.map +1 -1
  92. package/dist/server.host.js.map +1 -1
  93. package/dist/services/authentication/auth.service.js +1 -2
  94. package/dist/services/authentication/auth.service.js.map +1 -1
  95. package/dist/services/authentication/jwt.service.js.map +1 -1
  96. package/dist/services/core/batch-call.service.js.map +1 -1
  97. package/dist/services/core/client-bundle.service.js +4 -8
  98. package/dist/services/core/client-bundle.service.js.map +1 -1
  99. package/dist/services/core/cradle.service.js.map +1 -1
  100. package/dist/services/core/github.service.js +1 -1
  101. package/dist/services/core/github.service.js.map +1 -1
  102. package/dist/services/core/http-client.factory.js.map +1 -1
  103. package/dist/services/core/logs-manager.service.js.map +1 -1
  104. package/dist/services/core/monsterpi.service.js.map +1 -1
  105. package/dist/services/core/multer.service.js +6 -7
  106. package/dist/services/core/multer.service.js.map +1 -1
  107. package/dist/services/core/server-release.service.js +6 -12
  108. package/dist/services/core/server-release.service.js.map +1 -1
  109. package/dist/services/core/yaml.service.js.map +1 -1
  110. package/dist/services/interfaces/camera-stream.dto.js +4 -4
  111. package/dist/services/interfaces/camera-stream.dto.js.map +1 -1
  112. package/dist/services/interfaces/floor.dto.js +6 -6
  113. package/dist/services/interfaces/floor.dto.js.map +1 -1
  114. package/dist/services/interfaces/print-completion.dto.js +3 -3
  115. package/dist/services/interfaces/print-completion.dto.js.map +1 -1
  116. package/dist/services/interfaces/printer-group.dto.js +3 -3
  117. package/dist/services/interfaces/printer-group.dto.js.map +1 -1
  118. package/dist/services/interfaces/printer.dto.js +3 -3
  119. package/dist/services/interfaces/printer.dto.js.map +1 -1
  120. package/dist/services/interfaces/user.dto.js +3 -3
  121. package/dist/services/interfaces/user.dto.js.map +1 -1
  122. package/dist/services/mongoose/camera-stream.service.js +1 -2
  123. package/dist/services/mongoose/camera-stream.service.js.map +1 -1
  124. package/dist/services/mongoose/floor.service.js.map +1 -1
  125. package/dist/services/mongoose/permission.service.js.map +1 -1
  126. package/dist/services/mongoose/print-completion.service.js.map +1 -1
  127. package/dist/services/mongoose/printer.service.js.map +1 -1
  128. package/dist/services/mongoose/refresh-token.service.js.map +1 -1
  129. package/dist/services/mongoose/role.service.js +1 -2
  130. package/dist/services/mongoose/role.service.js.map +1 -1
  131. package/dist/services/mongoose/user.service.js.map +1 -1
  132. package/dist/services/moonraker/constants/moonraker-event.dto.js +3 -3
  133. package/dist/services/moonraker/constants/moonraker-event.dto.js.map +1 -1
  134. package/dist/services/moonraker/dto/objects/idle-timeout.dto.js +3 -3
  135. package/dist/services/moonraker/dto/objects/idle-timeout.dto.js.map +1 -1
  136. package/dist/services/moonraker/dto/objects/print-stats.dto.js +3 -3
  137. package/dist/services/moonraker/dto/objects/print-stats.dto.js.map +1 -1
  138. package/dist/services/moonraker/dto/objects/printer-objects-list.dto.js +3 -3
  139. package/dist/services/moonraker/dto/objects/printer-objects-list.dto.js.map +1 -1
  140. package/dist/services/moonraker/dto/printer-info.dto.js +3 -3
  141. package/dist/services/moonraker/dto/printer-info.dto.js.map +1 -1
  142. package/dist/services/moonraker/dto/server-history/job.dto.js +3 -3
  143. package/dist/services/moonraker/dto/server-history/job.dto.js.map +1 -1
  144. package/dist/services/moonraker/dto/websocket/methods.js +3 -3
  145. package/dist/services/moonraker/dto/websocket/methods.js.map +1 -1
  146. package/dist/services/moonraker/dto/websocket/notify-update-response.params.js +3 -3
  147. package/dist/services/moonraker/dto/websocket/notify-update-response.params.js.map +1 -1
  148. package/dist/services/moonraker/moonraker-websocket.adapter.js +23 -18
  149. package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
  150. package/dist/services/moonraker/moonraker.client.js +8 -4
  151. package/dist/services/moonraker/moonraker.client.js.map +1 -1
  152. package/dist/services/moonraker.api.js +2 -2
  153. package/dist/services/moonraker.api.js.map +1 -1
  154. package/dist/services/octoprint/constants/octoprint-service.constants.js +7 -7
  155. package/dist/services/octoprint/constants/octoprint-service.constants.js.map +1 -1
  156. package/dist/services/octoprint/constants/octoprint-websocket.constants.js +3 -3
  157. package/dist/services/octoprint/constants/octoprint-websocket.constants.js.map +1 -1
  158. package/dist/services/octoprint/dto/octoprint-event.dto.js +4 -4
  159. package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -1
  160. package/dist/services/octoprint/octoprint-api.routes.js +1 -1
  161. package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
  162. package/dist/services/octoprint/octoprint-websocket.adapter.js +17 -17
  163. package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -1
  164. package/dist/services/octoprint/octoprint.client.js +9 -9
  165. package/dist/services/octoprint/octoprint.client.js.map +1 -1
  166. package/dist/services/octoprint/utils/api.utils.js +3 -3
  167. package/dist/services/octoprint/utils/api.utils.js.map +1 -1
  168. package/dist/services/octoprint/utils/octoprint-http-client.builder.js.map +1 -1
  169. package/dist/services/octoprint.api.js +2 -5
  170. package/dist/services/octoprint.api.js.map +1 -1
  171. package/dist/services/orm/base.service.js.map +1 -1
  172. package/dist/services/orm/floor.service.js.map +1 -1
  173. package/dist/services/orm/permission.service.js.map +1 -1
  174. package/dist/services/orm/print-completion.service.js.map +1 -1
  175. package/dist/services/orm/printer-group.service.js.map +1 -1
  176. package/dist/services/orm/printer.service.js.map +1 -1
  177. package/dist/services/orm/refresh-token.service.js.map +1 -1
  178. package/dist/services/orm/role.service.js +2 -2
  179. package/dist/services/orm/role.service.js.map +1 -1
  180. package/dist/services/orm/user.service.js.map +1 -1
  181. package/dist/services/printer-api.factory.js.map +1 -1
  182. package/dist/services/printer-api.interface.js +6 -6
  183. package/dist/services/printer-api.interface.js.map +1 -1
  184. package/dist/services/prusa-link/prusa-link-http-polling.adapter.js +2 -4
  185. package/dist/services/prusa-link/prusa-link-http-polling.adapter.js.map +1 -1
  186. package/dist/services/prusa-link/prusa-link.api.js +7 -6
  187. package/dist/services/prusa-link/prusa-link.api.js.map +1 -1
  188. package/dist/services/socket.factory.js.map +1 -1
  189. package/dist/services/task-manager.service.js +1 -2
  190. package/dist/services/task-manager.service.js.map +1 -1
  191. package/dist/services/validators/floor-service.validation.js +10 -10
  192. package/dist/services/validators/floor-service.validation.js.map +1 -1
  193. package/dist/services/validators/printer-service.validation.js +14 -14
  194. package/dist/services/validators/printer-service.validation.js.map +1 -1
  195. package/dist/services/validators/settings-service.validation.js +15 -14
  196. package/dist/services/validators/settings-service.validation.js.map +1 -1
  197. package/dist/services/validators/user-service.validation.js +3 -3
  198. package/dist/services/validators/user-service.validation.js.map +1 -1
  199. package/dist/services/validators/yaml-service.validation.js +6 -6
  200. package/dist/services/validators/yaml-service.validation.js.map +1 -1
  201. package/dist/shared/default-http-client.builder.js.map +1 -1
  202. package/dist/shared/runtime-settings.migration.js +7 -0
  203. package/dist/shared/runtime-settings.migration.js.map +1 -1
  204. package/dist/shared/websocket.adapter.js.map +1 -1
  205. package/dist/state/file-upload-tracker.cache.js +1 -2
  206. package/dist/state/file-upload-tracker.cache.js.map +1 -1
  207. package/dist/state/file.cache.js.map +1 -1
  208. package/dist/state/floor.store.js.map +1 -1
  209. package/dist/state/printer-events.cache.js.map +1 -1
  210. package/dist/state/printer-files.store.js.map +1 -1
  211. package/dist/state/printer-socket.store.js +1 -2
  212. package/dist/state/printer-socket.store.js.map +1 -1
  213. package/dist/state/printer-thumbnail.cache.js +3 -3
  214. package/dist/state/printer-thumbnail.cache.js.map +1 -1
  215. package/dist/state/printer.cache.js.map +1 -1
  216. package/dist/state/settings.store.js +1 -2
  217. package/dist/state/settings.store.js.map +1 -1
  218. package/dist/state/socket-io.gateway.js +4 -4
  219. package/dist/state/socket-io.gateway.js.map +1 -1
  220. package/dist/state/test-printer-socket.store.js.map +1 -1
  221. package/dist/tasks/boot.task.js.map +1 -1
  222. package/dist/tasks/client-bundle.task.js.map +1 -1
  223. package/dist/tasks/print-completion.socketio.task.js +1 -2
  224. package/dist/tasks/print-completion.socketio.task.js.map +1 -1
  225. package/dist/tasks/printer-file-clean.task.js.map +1 -1
  226. package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
  227. package/dist/tasks/printer-websocket.task.js.map +1 -1
  228. package/dist/tasks/socketio.task.js.map +1 -1
  229. package/dist/tasks/software-update.task.js.map +1 -1
  230. package/dist/tasks.js +3 -3
  231. package/dist/tasks.js.map +1 -1
  232. package/dist/utils/array.util.js +3 -3
  233. package/dist/utils/array.util.js.map +1 -1
  234. package/dist/utils/crypto.utils.js +3 -3
  235. package/dist/utils/crypto.utils.js.map +1 -1
  236. package/dist/utils/env.utils.js +6 -6
  237. package/dist/utils/env.utils.js.map +1 -1
  238. package/dist/utils/fs.utils.js +4 -4
  239. package/dist/utils/fs.utils.js.map +1 -1
  240. package/dist/utils/gcode.utils.js +3 -3
  241. package/dist/utils/gcode.utils.js.map +1 -1
  242. package/dist/utils/pretty-print.utils.js +3 -3
  243. package/dist/utils/pretty-print.utils.js.map +1 -1
  244. package/dist/utils/printer-type.utils.js +4 -4
  245. package/dist/utils/printer-type.utils.js.map +1 -1
  246. package/dist/utils/semver.utils.js +3 -3
  247. package/dist/utils/semver.utils.js.map +1 -1
  248. package/dist/utils/url.utils.js +3 -3
  249. package/dist/utils/url.utils.js.map +1 -1
  250. package/package.json +34 -33
  251. package/.yarn/releases/yarn-4.9.1.cjs +0 -948
@@ -5,14 +5,14 @@ Object.defineProperty(exports, "__esModule", {
5
5
  function _export(target, all) {
6
6
  for(var name in all)Object.defineProperty(target, name, {
7
7
  enumerable: true,
8
- get: all[name]
8
+ get: Object.getOwnPropertyDescriptor(all, name).get
9
9
  });
10
10
  }
11
11
  _export(exports, {
12
- interceptRoles: function() {
12
+ get interceptRoles () {
13
13
  return interceptRoles;
14
14
  },
15
- validateWizardCompleted: function() {
15
+ get validateWizardCompleted () {
16
16
  return validateWizardCompleted;
17
17
  }
18
18
  });
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/middleware/global.middleware.ts"],"names":["interceptRoles","validateWizardCompleted","inject","configService","settingsStore","loggerFactory","req","res","next","logger","name","isDemoMode","getWizardSettings","wizardCompleted","allowedPaths","includes","path","startsWith","error","ForbiddenError","join","roleService","isTypeormMode","serverSettings","getSettings","roles","user","map","r","roleId","roleName","getAppDefaultRole"],"mappings":";;;;;;;;;;;IAsCaA,cAAc;eAAdA;;IA5BAC,uBAAuB;eAAvBA;;;+BAVU;mCACQ;AASxB,MAAMA,0BAA0BC,IAAAA,qBAAM,EAC3C,CAACC,eAA+BC,eAA8BC,gBAC5D,OAAOC,KAAcC,KAAeC;QAClC,MAAMC,SAASJ,cAAcJ,wBAAwBS,IAAI;QACzD,MAAMC,aAAaR,cAAcQ,UAAU;QAC3C,IAAIA,cAAc,CAAC,CAACP,cAAcQ,iBAAiB,IAAIC,iBAAiB;YACtEL;YACA;QACF;QAEA,MAAMM,eAAe;YACnB;YACA;YACA;YACA;SACD;QACD,IAAIA,aAAaC,QAAQ,CAACT,IAAIU,IAAI,KAAK,CAACV,IAAIU,IAAI,CAACC,UAAU,CAAC,SAAS;YACnET;YACA;QACF,OAAO;YACLC,OAAOS,KAAK,CAAC,wBAAwBZ,IAAIU,IAAI;YAC7C,MAAM,IAAIG,iCAAc,CACtB,CAAC,6DAA6D,EAAEL,aAAaM,IAAI,CAAC,OAAO;QAE7F;IACF;AAGG,MAAMpB,iBAAiBE,IAAAA,qBAAM,EAClC,CAACE,eAA8BiB,aAA2BC,gBACxD,OAAOhB,KAAcC,KAAeC;QAClC,MAAMe,iBAAiBnB,cAAcoB,WAAW;QAEhD,IAAIF,eAAe;YACjBhB,IAAImB,KAAK,GAAG,AAACnB,CAAAA,IAAIoB,IAAI,EAAED,SAAuB,EAAE,AAAD,EAAGE,GAAG,CAAC,CAACC,IAAgBA,EAAEC,MAAM;QACjF,OAAO;YACLvB,IAAImB,KAAK,GAAGnB,IAAIoB,IAAI,EAAED;QACxB;QAGA,IAAIF,kBAAkB,CAACjB,IAAIoB,IAAI,EAAE;YAC/B,MAAMI,WAAW,MAAMT,YAAYU,iBAAiB;YACpDzB,IAAImB,KAAK,GAAG;gBAACK;aAAS;QACxB;QAEAtB;IACF"}
1
+ {"version":3,"sources":["../../src/middleware/global.middleware.ts"],"names":["interceptRoles","validateWizardCompleted","inject","configService","settingsStore","loggerFactory","req","res","next","logger","name","isDemoMode","getWizardSettings","wizardCompleted","allowedPaths","includes","path","startsWith","error","ForbiddenError","join","roleService","isTypeormMode","serverSettings","getSettings","roles","user","map","r","roleId","roleName","getAppDefaultRole"],"mappings":";;;;;;;;;;;QAsCaA;eAAAA;;QA5BAC;eAAAA;;;+BAVU;mCACQ;AASxB,MAAMA,0BAA0BC,IAAAA,qBAAM,EAC3C,CAACC,eAA+BC,eAA8BC,gBAC5D,OAAOC,KAAcC,KAAeC;QAClC,MAAMC,SAASJ,cAAcJ,wBAAwBS,IAAI;QACzD,MAAMC,aAAaR,cAAcQ,UAAU;QAC3C,IAAIA,cAAc,CAAC,CAACP,cAAcQ,iBAAiB,IAAIC,iBAAiB;YACtEL;YACA;QACF;QAEA,MAAMM,eAAe;YACnB;YACA;YACA;YACA;SACD;QACD,IAAIA,aAAaC,QAAQ,CAACT,IAAIU,IAAI,KAAK,CAACV,IAAIU,IAAI,CAACC,UAAU,CAAC,SAAS;YACnET;YACA;QACF,OAAO;YACLC,OAAOS,KAAK,CAAC,wBAAwBZ,IAAIU,IAAI;YAC7C,MAAM,IAAIG,iCAAc,CACtB,CAAC,6DAA6D,EAAEL,aAAaM,IAAI,CAAC,OAAO;QAE7F;IACF;AAGG,MAAMpB,iBAAiBE,IAAAA,qBAAM,EAClC,CAACE,eAA8BiB,aAA2BC,gBACxD,OAAOhB,KAAcC,KAAeC;QAClC,MAAMe,iBAAiBnB,cAAcoB,WAAW;QAEhD,IAAIF,eAAe;YACjBhB,IAAImB,KAAK,GAAG,AAACnB,CAAAA,IAAIoB,IAAI,EAAED,SAAuB,EAAE,AAAD,EAAGE,GAAG,CAAC,CAACC,IAAgBA,EAAEC,MAAM;QACjF,OAAO;YACLvB,IAAImB,KAAK,GAAGnB,IAAIoB,IAAI,EAAED;QACxB;QAGA,IAAIF,kBAAkB,CAACjB,IAAIoB,IAAI,EAAE;YAC/B,MAAMI,WAAW,MAAMT,YAAYU,iBAAiB;YACpDzB,IAAImB,KAAK,GAAG;gBAACK;aAAS;QACxB;QAEAtB;IACF"}
@@ -5,20 +5,20 @@ Object.defineProperty(exports, "__esModule", {
5
5
  function _export(target, all) {
6
6
  for(var name in all)Object.defineProperty(target, name, {
7
7
  enumerable: true,
8
- get: all[name]
8
+ get: Object.getOwnPropertyDescriptor(all, name).get
9
9
  });
10
10
  }
11
11
  _export(exports, {
12
- ParamBool: function() {
12
+ get ParamBool () {
13
13
  return ParamBool;
14
14
  },
15
- ParamId: function() {
15
+ get ParamId () {
16
16
  return ParamId;
17
17
  },
18
- ParamInt: function() {
18
+ get ParamInt () {
19
19
  return ParamInt;
20
20
  },
21
- ParamString: function() {
21
+ get ParamString () {
22
22
  return ParamString;
23
23
  }
24
24
  });
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/middleware/param-converter.middleware.ts"],"names":["ParamBool","ParamId","ParamInt","ParamString","paramName","createParamDecorator","Number","Boolean","String","type","req","res","next","paramValue","params","undefined","status","send","convertedValue","isTypeormMode","container","resolve","DITokens","validateIdAsType","toLowerCase","parseInt","isNaN","isString","validateInput","id","idRulesV2","e","local"],"mappings":";;;;;;;;;;;IAOaA,SAAS;eAATA;;IAEAC,OAAO;eAAPA;;IAHAC,QAAQ;eAARA;;IAEAC,WAAW;eAAXA;;;iCAPY;4BACK;mCACJ;wBACD;AAElB,MAAMD,WAAW,CAACE,YAAsBC,qBAAqBD,WAAWE;AACxE,MAAMN,YAAY,CAACI,YAAsBC,qBAAqBD,WAAWG;AACzE,MAAMJ,cAAc,CAACC,YAAsBC,qBAAqBD,WAAWI;AAC3E,MAAMP,UAAU,CAACG,YAAsBC,qBAAqBD,WAAW;AAE9E,SAASC,qBACPD,SAAiB,EACjBK,IAAuE;IAEvE,OAAO,OAAOC,KAAgDC,KAAeC;QAC3E,MAAMC,aAAaH,IAAII,MAAM,CAACV,UAAU;QAExC,IAAIS,eAAeE,WAAW;YAC5B,OAAOJ,IAAIK,MAAM,CAAC,KAAKC,IAAI,CAAC,CAAC,mBAAmB,EAAEb,WAAW;QAC/D;QAEA,IAAIc;QAGJ,MAAMC,gBAAgBT,IAAIU,SAAS,EAAEC,QAAQC,yBAAQ,CAACH,aAAa;QACnE,IAAII,mBAAmB;QACvB,IAAId,SAAS,MAAM;YACjBc,mBAAmBJ,gBAAgBb,SAASE;QAC9C;QAEA,IAAIC,SAASF,SAAS;YACpB,IAAIM,WAAWW,WAAW,OAAO,QAAQ;gBACvCN,iBAAiB;YACnB,OAAO,IAAIL,WAAWW,WAAW,OAAO,SAAS;gBAC/CN,iBAAiB;YACnB,OAAO;gBACL,OAAOP,IAAIK,MAAM,CAAC,KAAKC,IAAI,CAAC,CAAC,iBAAiB,EAAEb,WAAW;YAC7D;QACF,OAAO,IAAIK,SAASH,UAAUiB,qBAAqBjB,QAAQ;YACzDY,iBAAiBO,SAASZ,YAAY;YACtC,IAAIa,MAAMR,iBAAiB;gBACzB,OAAOP,IAAIK,MAAM,CAAC,KAAKC,IAAI,CAAC,CAAC,gBAAgB,EAAEb,WAAW;YAC5D;QACF,OAAO,IAAIK,SAASD,UAAUe,qBAAqBf,QAAQ;YACzDU,iBAAiBL;YACjB,IAAI,CAACc,IAAAA,gBAAQ,EAACT,iBAAiB;gBAC7B,OAAOP,IAAIK,MAAM,CAAC,KAAKC,IAAI,CAAC,CAAC,gBAAgB,EAAEb,WAAW;YAC5D;QACF,OAAO;YAEL,OAAOO,IAAIK,MAAM,CAAC,KAAKC,IAAI,CAAC,CAAC,iBAAiB,EAAEb,WAAW;QAC7D;QAGA,IAAImB,qBAAqBf,UAAUe,qBAAqBjB,QAAQ;YAC9D,IAAI;gBACF,MAAMsB,IAAAA,yBAAa,EAAC;oBAAEC,IAAIX;gBAAe,GAAGY,IAAAA,4BAAS,EAACX;YACxD,EAAE,OAAOY,GAAG;gBACV,OAAOnB,KAAKmB;YACd;QACF;QAEArB,IAAIsB,KAAK,GAAGtB,IAAIsB,KAAK,IAAI,CAAC;QAC1BtB,IAAIsB,KAAK,CAAC5B,UAAU,GAAGc;QAEvBN;IACF;AACF"}
1
+ {"version":3,"sources":["../../src/middleware/param-converter.middleware.ts"],"names":["ParamBool","ParamId","ParamInt","ParamString","paramName","createParamDecorator","Number","Boolean","String","type","req","res","next","paramValue","params","undefined","status","send","convertedValue","isTypeormMode","container","resolve","DITokens","validateIdAsType","toLowerCase","parseInt","isNaN","isString","validateInput","id","idRulesV2","e","local"],"mappings":";;;;;;;;;;;QAOaA;eAAAA;;QAEAC;eAAAA;;QAHAC;eAAAA;;QAEAC;eAAAA;;;iCAPY;4BACK;mCACJ;wBACD;AAElB,MAAMD,WAAW,CAACE,YAAsBC,qBAAqBD,WAAWE;AACxE,MAAMN,YAAY,CAACI,YAAsBC,qBAAqBD,WAAWG;AACzE,MAAMJ,cAAc,CAACC,YAAsBC,qBAAqBD,WAAWI;AAC3E,MAAMP,UAAU,CAACG,YAAsBC,qBAAqBD,WAAW;AAE9E,SAASC,qBACPD,SAAiB,EACjBK,IAAuE;IAEvE,OAAO,OAAOC,KAAgDC,KAAeC;QAC3E,MAAMC,aAAaH,IAAII,MAAM,CAACV,UAAU;QAExC,IAAIS,eAAeE,WAAW;YAC5B,OAAOJ,IAAIK,MAAM,CAAC,KAAKC,IAAI,CAAC,CAAC,mBAAmB,EAAEb,WAAW;QAC/D;QAEA,IAAIc;QAGJ,MAAMC,gBAAgBT,IAAIU,SAAS,EAAEC,QAAQC,yBAAQ,CAACH,aAAa;QACnE,IAAII,mBAAmB;QACvB,IAAId,SAAS,MAAM;YACjBc,mBAAmBJ,gBAAgBb,SAASE;QAC9C;QAEA,IAAIC,SAASF,SAAS;YACpB,IAAIM,WAAWW,WAAW,OAAO,QAAQ;gBACvCN,iBAAiB;YACnB,OAAO,IAAIL,WAAWW,WAAW,OAAO,SAAS;gBAC/CN,iBAAiB;YACnB,OAAO;gBACL,OAAOP,IAAIK,MAAM,CAAC,KAAKC,IAAI,CAAC,CAAC,iBAAiB,EAAEb,WAAW;YAC7D;QACF,OAAO,IAAIK,SAASH,UAAUiB,qBAAqBjB,QAAQ;YACzDY,iBAAiBO,SAASZ,YAAY;YACtC,IAAIa,MAAMR,iBAAiB;gBACzB,OAAOP,IAAIK,MAAM,CAAC,KAAKC,IAAI,CAAC,CAAC,gBAAgB,EAAEb,WAAW;YAC5D;QACF,OAAO,IAAIK,SAASD,UAAUe,qBAAqBf,QAAQ;YACzDU,iBAAiBL;YACjB,IAAI,CAACc,IAAAA,gBAAQ,EAACT,iBAAiB;gBAC7B,OAAOP,IAAIK,MAAM,CAAC,KAAKC,IAAI,CAAC,CAAC,gBAAgB,EAAEb,WAAW;YAC5D;QACF,OAAO;YAEL,OAAOO,IAAIK,MAAM,CAAC,KAAKC,IAAI,CAAC,CAAC,iBAAiB,EAAEb,WAAW;QAC7D;QAGA,IAAImB,qBAAqBf,UAAUe,qBAAqBjB,QAAQ;YAC9D,IAAI;gBACF,MAAMsB,IAAAA,yBAAa,EAAC;oBAAEC,IAAIX;gBAAe,GAAGY,IAAAA,4BAAS,EAACX;YACxD,EAAE,OAAOY,GAAG;gBACV,OAAOnB,KAAKmB;YACd;QACF;QAEArB,IAAIsB,KAAK,GAAGtB,IAAIsB,KAAK,IAAI,CAAC;QAC1BtB,IAAIsB,KAAK,CAAC5B,UAAU,GAAGc;QAEvBN;IACF;AACF"}
@@ -5,17 +5,17 @@ Object.defineProperty(exports, "__esModule", {
5
5
  function _export(target, all) {
6
6
  for(var name in all)Object.defineProperty(target, name, {
7
7
  enumerable: true,
8
- get: all[name]
8
+ get: Object.getOwnPropertyDescriptor(all, name).get
9
9
  });
10
10
  }
11
11
  _export(exports, {
12
- getPassportJwtOptions: function() {
12
+ get getPassportJwtOptions () {
13
13
  return getPassportJwtOptions;
14
14
  },
15
- initializePassportStrategies: function() {
15
+ get initializePassportStrategies () {
16
16
  return initializePassportStrategies;
17
17
  },
18
- verifyUserCallback: function() {
18
+ get verifyUserCallback () {
19
19
  return verifyUserCallback;
20
20
  }
21
21
  });
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/middleware/passport.ts"],"names":["getPassportJwtOptions","initializePassportStrategies","verifyUserCallback","settingsStore","configService","jwtFromRequest","ExtractJwt","fromAuthHeaderAsBearerToken","secretOrKeyProvider","_req","_token","done","jwtSecret","getCredentialSettings","audience","get","AppConstants","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","issuer","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","userService","jwt_payload","getUser","userId","then","user","isVerified","needsPasswordChange","AuthenticationError","AUTH_ERROR_REASON","PasswordChangeRequired","AccountNotVerified","catch","err","passport","container","resolve","DITokens","opts","use","JwtStrategy","AnonymousStrategy"],"mappings":";;;;;;;;;;;IAuBgBA,qBAAqB;eAArBA;;IA4CAC,4BAA4B;eAA5BA;;IA5BAC,kBAAkB;eAAlBA;;;6BAjCT;mCACuC;iCACrB;iCACI;mCAQO;wCACF;AAK3B,SAASF,sBACdG,aAA4B,EAC5BC,aAA4B,EAC5BC,iBAAiEC,uBAAU,CAACC,2BAA2B,EAAE;IAEzG,OAAO;QACLF,gBAAgBA;QAChBG,qBAAqB,OAAOC,MAAMC,QAAgBC;YAChD,MAAM,EAAEC,SAAS,EAAE,GAAG,MAAMT,cAAcU,qBAAqB;YAC/D,OAAOF,KAAK,MAAMC;QACpB;QACAE,UAAUV,cAAcW,GAAG,CAACC,6BAAY,CAACC,qBAAqB,EAAED,6BAAY,CAACE,oBAAoB;QACjGC,QAAQf,cAAcW,GAAG,CAACC,6BAAY,CAACI,mBAAmB,EAAEJ,6BAAY,CAACK,kBAAkB;IAC7F;AACF;AAEO,SAASnB,mBAAmBoB,WAAyB;IAC1D,OAAO,SAAUC,WAAgB,EAAEZ,IAAsB;QACvDW,YACGE,OAAO,CAACD,YAAYE,MAAM,EAC1BC,IAAI,CAAC,CAACC;YACL,IAAIA,QAAQA,KAAKC,UAAU,IAAI,CAACD,KAAKE,mBAAmB,EAAE;gBACxD,OAAOlB,KAAK,MAAMgB;YACpB;YACA,IAAIA,MAAME,qBAAqB;gBAC7B,OAAOlB,KACL,IAAImB,sCAAmB,CAAC,4BAA4BC,yCAAiB,CAACC,sBAAsB,GAC5F;YAEJ;YACA,IAAI,CAACL,MAAMC,YAAY;gBACrB,OAAOjB,KAAK,IAAImB,sCAAmB,CAAC,qBAAqBC,yCAAiB,CAACE,kBAAkB,GAAG;YAClG;YAEA,OAAOtB,KAAK,MAAM;QACpB,GACCuB,KAAK,CAAC,CAACC;YACN,IAAIA,KAAK;gBACP,OAAOxB,KAAKwB,KAAK;YACnB;QACF;IACJ;AACF;AAEO,SAASlC,6BAA6BmC,QAAwB,EAAEC,SAA0B;IAC/F,MAAMlC,gBAAgBkC,UAAUC,OAAO,CAAgBC,yBAAQ,CAACpC,aAAa;IAC7E,MAAMC,gBAAgBiC,UAAUC,OAAO,CAAgBC,yBAAQ,CAACnC,aAAa;IAC7E,MAAMkB,cAAce,UAAUC,OAAO,CAAeC,yBAAQ,CAACjB,WAAW;IAExE,MAAMkB,OAAOxC,sBAAsBG,eAAeC,eAAeE,uBAAU,CAACC,2BAA2B;IAEvG6B,SAASK,GAAG,CACV,IAAIC,qBAAW,CAACF,MAAM,SAAUjB,WAAgB,EAAEZ,IAAsB;QACtET,mBAAmBoB,aAAaC,aAAaZ;IAC/C;IAEFyB,SAASK,GAAG,CAAC,IAAIE,2BAAiB;IAClC,OAAOP;AACT"}
1
+ {"version":3,"sources":["../../src/middleware/passport.ts"],"names":["getPassportJwtOptions","initializePassportStrategies","verifyUserCallback","settingsStore","configService","jwtFromRequest","ExtractJwt","fromAuthHeaderAsBearerToken","secretOrKeyProvider","_req","_token","done","jwtSecret","getCredentialSettings","audience","get","AppConstants","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","issuer","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","userService","jwt_payload","getUser","userId","then","user","isVerified","needsPasswordChange","AuthenticationError","AUTH_ERROR_REASON","PasswordChangeRequired","AccountNotVerified","catch","err","passport","container","resolve","DITokens","opts","use","JwtStrategy","AnonymousStrategy"],"mappings":";;;;;;;;;;;QAuBgBA;eAAAA;;QA4CAC;eAAAA;;QA5BAC;eAAAA;;;6BAjCT;mCACuC;iCACrB;iCACI;mCAQO;wCACF;AAK3B,SAASF,sBACdG,aAA4B,EAC5BC,aAA4B,EAC5BC,iBAAiEC,uBAAU,CAACC,2BAA2B,EAAE;IAEzG,OAAO;QACLF,gBAAgBA;QAChBG,qBAAqB,OAAOC,MAAMC,QAAgBC;YAChD,MAAM,EAAEC,SAAS,EAAE,GAAG,MAAMT,cAAcU,qBAAqB;YAC/D,OAAOF,KAAK,MAAMC;QACpB;QACAE,UAAUV,cAAcW,GAAG,CAACC,6BAAY,CAACC,qBAAqB,EAAED,6BAAY,CAACE,oBAAoB;QACjGC,QAAQf,cAAcW,GAAG,CAACC,6BAAY,CAACI,mBAAmB,EAAEJ,6BAAY,CAACK,kBAAkB;IAC7F;AACF;AAEO,SAASnB,mBAAmBoB,WAAyB;IAC1D,OAAO,SAAUC,WAAgB,EAAEZ,IAAsB;QACvDW,YACGE,OAAO,CAACD,YAAYE,MAAM,EAC1BC,IAAI,CAAC,CAACC;YACL,IAAIA,QAAQA,KAAKC,UAAU,IAAI,CAACD,KAAKE,mBAAmB,EAAE;gBACxD,OAAOlB,KAAK,MAAMgB;YACpB;YACA,IAAIA,MAAME,qBAAqB;gBAC7B,OAAOlB,KACL,IAAImB,sCAAmB,CAAC,4BAA4BC,yCAAiB,CAACC,sBAAsB,GAC5F;YAEJ;YACA,IAAI,CAACL,MAAMC,YAAY;gBACrB,OAAOjB,KAAK,IAAImB,sCAAmB,CAAC,qBAAqBC,yCAAiB,CAACE,kBAAkB,GAAG;YAClG;YAEA,OAAOtB,KAAK,MAAM;QACpB,GACCuB,KAAK,CAAC,CAACC;YACN,IAAIA,KAAK;gBACP,OAAOxB,KAAKwB,KAAK;YACnB;QACF;IACJ;AACF;AAEO,SAASlC,6BAA6BmC,QAAwB,EAAEC,SAA0B;IAC/F,MAAMlC,gBAAgBkC,UAAUC,OAAO,CAAgBC,yBAAQ,CAACpC,aAAa;IAC7E,MAAMC,gBAAgBiC,UAAUC,OAAO,CAAgBC,yBAAQ,CAACnC,aAAa;IAC7E,MAAMkB,cAAce,UAAUC,OAAO,CAAeC,yBAAQ,CAACjB,WAAW;IAExE,MAAMkB,OAAOxC,sBAAsBG,eAAeC,eAAeE,uBAAU,CAACC,2BAA2B;IAEvG6B,SAASK,GAAG,CACV,IAAIC,qBAAW,CAACF,MAAM,SAAUjB,WAAgB,EAAEZ,IAAsB;QACtET,mBAAmBoB,aAAaC,aAAaZ;IAC/C;IAEFyB,SAASK,GAAG,CAAC,IAAIE,2BAAiB;IAClC,OAAOP;AACT"}
@@ -5,23 +5,23 @@ Object.defineProperty(exports, "__esModule", {
5
5
  function _export(target, all) {
6
6
  for(var name in all)Object.defineProperty(target, name, {
7
7
  enumerable: true,
8
- get: all[name]
8
+ get: Object.getOwnPropertyDescriptor(all, name).get
9
9
  });
10
10
  }
11
11
  _export(exports, {
12
- currentPrinterToken: function() {
12
+ get currentPrinterToken () {
13
13
  return currentPrinterToken;
14
14
  },
15
- printerApiToken: function() {
15
+ get printerApiToken () {
16
16
  return printerApiToken;
17
17
  },
18
- printerIdToken: function() {
18
+ get printerIdToken () {
19
19
  return printerIdToken;
20
20
  },
21
- printerLoginToken: function() {
21
+ get printerLoginToken () {
22
22
  return printerLoginToken;
23
23
  },
24
- printerResolveMiddleware: function() {
24
+ get printerResolveMiddleware () {
25
25
  return printerResolveMiddleware;
26
26
  }
27
27
  });
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/middleware/printer.ts"],"names":["currentPrinterToken","printerApiToken","printerIdToken","printerLoginToken","printerResolveMiddleware","key","req","res","next","printerCache","container","resolve","DITokens","settingsService","settingsStore","moonrakerEnabled","getServerSettings","experimentalMoonrakerSupport","prusaLinkEnabled","experimentalPrusaLinkSupport","scopedPrinter","undefined","loginDto","printerId","params","getCachedPrinterOrThrow","getLoginDto","register","asValue","printerType","OctoprintType","octoprintApiInstance","octoprintApi","MoonrakerType","moonrakerInstance","moonrakerApi","PrusaLinkType","prusaLinkInstance","prusaLinkApi"],"mappings":";;;;;;;;;;;IAYaA,mBAAmB;eAAnBA;;IADAC,eAAe;eAAfA;;IADAC,cAAc;eAAdA;;IAGAC,iBAAiB;eAAjBA;;IAEAC,wBAAwB;eAAxBA;;;wBAfW;iCACC;qCAImC;AAKrD,MAAMF,iBAAiB;AACvB,MAAMD,kBAAkB;AACxB,MAAMD,sBAAsB;AAC5B,MAAMG,oBAAoB;AAE1B,MAAMC,2BAA2B,CAACC,MAAM,IAAI;IACjD,OAAO,CAACC,KAAcC,KAAeC;QACnC,MAAMC,eAAeH,IAAII,SAAS,CAACC,OAAO,CAAeC,yBAAQ,CAACH,YAAY;QAC9E,MAAMI,kBAAkBP,IAAII,SAAS,CAACC,OAAO,CAAMC,yBAAQ,CAACE,aAAa;QACzE,MAAMC,mBAAmBF,gBAAgBG,iBAAiB,GAAGC,4BAA4B;QACzF,MAAMC,mBAAmBL,gBAAgBG,iBAAiB,GAAGG,4BAA4B;QAEzF,IAAIC,gBAAgBC;QACpB,IAAIC,WAAWD;QAEf,MAAME,YAAYjB,IAAIkB,MAAM,CAACnB,IAAI;QACjC,IAAIkB,WAAW;YACbH,gBAAgBX,aAAagB,uBAAuB,CAACF;YACrDD,WAAWb,aAAaiB,WAAW,CAACH;YAEpCjB,IAAII,SAAS,CAACiB,QAAQ,CAAC;gBACrB,CAAC3B,oBAAoB,EAAE4B,IAAAA,eAAO,EAACR;gBAC/B,CAACjB,kBAAkB,EAAEyB,IAAAA,eAAO,EAACN;gBAC7B,CAACpB,eAAe,EAAE0B,IAAAA,eAAO,EAACL;YAC5B;YAEA,OAAQH,cAAcS,WAAW;gBAC/B,KAAKC,kCAAa;oBAAE;wBAClB,MAAMC,uBAAuBzB,IAAII,SAAS,CAACC,OAAO,CAAeC,yBAAQ,CAACoB,YAAY;wBACtF1B,IAAII,SAAS,CAACiB,QAAQ,CAAC;4BACrB,CAAC1B,gBAAgB,EAAE2B,IAAAA,eAAO,EAACG;wBAC7B;wBACA;oBACF;gBACA,KAAKE,kCAAa;oBAAE;wBAClB,MAAMC,oBAAoB5B,IAAII,SAAS,CAACC,OAAO,CAAeC,yBAAQ,CAACuB,YAAY;wBACnF7B,IAAII,SAAS,CAACiB,QAAQ,CAAC;4BACrB,CAAC1B,gBAAgB,EAAEc,mBAAmBa,IAAAA,eAAO,EAACM,qBAAqBN,IAAAA,eAAO,EAACP;wBAC7E;wBACA;oBACF;gBACA,KAAKe,kCAAa;oBAAE;wBAClB,MAAMC,oBAAoB/B,IAAII,SAAS,CAACC,OAAO,CAAeC,yBAAQ,CAAC0B,YAAY;wBACnFhC,IAAII,SAAS,CAACiB,QAAQ,CAAC;4BACrB,CAAC1B,gBAAgB,EAAEiB,mBAAmBU,IAAAA,eAAO,EAACS,qBAAqBT,IAAAA,eAAO,EAACP;wBAC7E;oBACF;YACF;QACF,OAAO;YACLf,IAAII,SAAS,CAACiB,QAAQ,CAAC;gBACrB,CAAC3B,oBAAoB,EAAE4B,IAAAA,eAAO,EAACP;gBAC/B,CAAClB,kBAAkB,EAAEyB,IAAAA,eAAO,EAACP;gBAC7B,CAACnB,eAAe,EAAE0B,IAAAA,eAAO,EAACP;gBAC1B,CAACpB,gBAAgB,EAAE2B,IAAAA,eAAO,EAACP;YAC7B;QACF;QAEAb;IACF;AACF"}
1
+ {"version":3,"sources":["../../src/middleware/printer.ts"],"names":["currentPrinterToken","printerApiToken","printerIdToken","printerLoginToken","printerResolveMiddleware","key","req","res","next","printerCache","container","resolve","DITokens","settingsService","settingsStore","moonrakerEnabled","getServerSettings","experimentalMoonrakerSupport","prusaLinkEnabled","experimentalPrusaLinkSupport","scopedPrinter","undefined","loginDto","printerId","params","getCachedPrinterOrThrow","getLoginDto","register","asValue","printerType","OctoprintType","octoprintApiInstance","octoprintApi","MoonrakerType","moonrakerInstance","moonrakerApi","PrusaLinkType","prusaLinkInstance","prusaLinkApi"],"mappings":";;;;;;;;;;;QAYaA;eAAAA;;QADAC;eAAAA;;QADAC;eAAAA;;QAGAC;eAAAA;;QAEAC;eAAAA;;;wBAfW;iCACC;qCAImC;AAKrD,MAAMF,iBAAiB;AACvB,MAAMD,kBAAkB;AACxB,MAAMD,sBAAsB;AAC5B,MAAMG,oBAAoB;AAE1B,MAAMC,2BAA2B,CAACC,MAAM,IAAI;IACjD,OAAO,CAACC,KAAcC,KAAeC;QACnC,MAAMC,eAAeH,IAAII,SAAS,CAACC,OAAO,CAAeC,yBAAQ,CAACH,YAAY;QAC9E,MAAMI,kBAAkBP,IAAII,SAAS,CAACC,OAAO,CAAMC,yBAAQ,CAACE,aAAa;QACzE,MAAMC,mBAAmBF,gBAAgBG,iBAAiB,GAAGC,4BAA4B;QACzF,MAAMC,mBAAmBL,gBAAgBG,iBAAiB,GAAGG,4BAA4B;QAEzF,IAAIC,gBAAgBC;QACpB,IAAIC,WAAWD;QAEf,MAAME,YAAYjB,IAAIkB,MAAM,CAACnB,IAAI;QACjC,IAAIkB,WAAW;YACbH,gBAAgBX,aAAagB,uBAAuB,CAACF;YACrDD,WAAWb,aAAaiB,WAAW,CAACH;YAEpCjB,IAAII,SAAS,CAACiB,QAAQ,CAAC;gBACrB,CAAC3B,oBAAoB,EAAE4B,IAAAA,eAAO,EAACR;gBAC/B,CAACjB,kBAAkB,EAAEyB,IAAAA,eAAO,EAACN;gBAC7B,CAACpB,eAAe,EAAE0B,IAAAA,eAAO,EAACL;YAC5B;YAEA,OAAQH,cAAcS,WAAW;gBAC/B,KAAKC,kCAAa;oBAAE;wBAClB,MAAMC,uBAAuBzB,IAAII,SAAS,CAACC,OAAO,CAAeC,yBAAQ,CAACoB,YAAY;wBACtF1B,IAAII,SAAS,CAACiB,QAAQ,CAAC;4BACrB,CAAC1B,gBAAgB,EAAE2B,IAAAA,eAAO,EAACG;wBAC7B;wBACA;oBACF;gBACA,KAAKE,kCAAa;oBAAE;wBAClB,MAAMC,oBAAoB5B,IAAII,SAAS,CAACC,OAAO,CAAeC,yBAAQ,CAACuB,YAAY;wBACnF7B,IAAII,SAAS,CAACiB,QAAQ,CAAC;4BACrB,CAAC1B,gBAAgB,EAAEc,mBAAmBa,IAAAA,eAAO,EAACM,qBAAqBN,IAAAA,eAAO,EAACP;wBAC7E;wBACA;oBACF;gBACA,KAAKe,kCAAa;oBAAE;wBAClB,MAAMC,oBAAoB/B,IAAII,SAAS,CAACC,OAAO,CAAeC,yBAAQ,CAAC0B,YAAY;wBACnFhC,IAAII,SAAS,CAACiB,QAAQ,CAAC;4BACrB,CAAC1B,gBAAgB,EAAEiB,mBAAmBU,IAAAA,eAAO,EAACS,qBAAqBT,IAAAA,eAAO,EAACP;wBAC7E;oBACF;YACF;QACF,OAAO;YACLf,IAAII,SAAS,CAACiB,QAAQ,CAAC;gBACrB,CAAC3B,oBAAoB,EAAE4B,IAAAA,eAAO,EAACP;gBAC/B,CAAClB,kBAAkB,EAAEyB,IAAAA,eAAO,EAACP;gBAC7B,CAACnB,eAAe,EAAE0B,IAAAA,eAAO,EAACP;gBAC1B,CAACpB,gBAAgB,EAAE2B,IAAAA,eAAO,EAACP;YAC7B;QACF;QAEAb;IACF;AACF"}
@@ -9,7 +9,7 @@ Object.defineProperty(exports, "authorize", {
9
9
  }
10
10
  });
11
11
  const _passportjwt = require("passport-jwt");
12
- const authorize = (settingsStore, options, verify)=>{
12
+ const authorize = (settingsStore, options, logger, verify)=>{
13
13
  const strategy = new _passportjwt.Strategy(options, verify);
14
14
  return async function authorizeCallback(socket, next) {
15
15
  if (!await settingsStore.getLoginRequired()) {
@@ -18,8 +18,16 @@ const authorize = (settingsStore, options, verify)=>{
18
18
  strategy.success = function success(_user) {
19
19
  next();
20
20
  };
21
- strategy.fail = (info)=>next(new Error(info));
22
- strategy.error = (error)=>next(error);
21
+ strategy.fail = (info)=>{
22
+ logger.warn(`Failure authenticating SocketIO user, reason: '${info}'`, {
23
+ reason: info
24
+ });
25
+ next(new Error(info));
26
+ };
27
+ strategy.error = (error)=>{
28
+ logger.warn("Error authenticating SocketIO user");
29
+ next(error);
30
+ };
23
31
  strategy.authenticate(socket, {});
24
32
  };
25
33
  };
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/middleware/socketio.middleware.ts"],"names":["authorize","settingsStore","options","verify","strategy","PassportJwtStrategy","authorizeCallback","socket","next","getLoginRequired","success","_user","fail","info","Error","error","authenticate"],"mappings":";;;;+BAOaA;;;eAAAA;;;6BANkF;AAMxF,MAAMA,YAAY,CACvBC,eACAC,SACAC;IAEA,MAAMC,WAAW,IAAIC,qBAAmB,CAACH,SAASC;IAElD,OAAO,eAAeG,kBACpBC,MAAkD,EAClDC,IAAmC;QAEnC,IAAI,CAAE,MAAMP,cAAcQ,gBAAgB,IAAK;YAE7C,OAAOD;QACT;QAEAJ,SAASM,OAAO,GAAG,SAASA,QAAQC,KAAY;YAG9CH;QACF;QACAJ,SAASQ,IAAI,GAAG,CAACC,OAASL,KAAK,IAAIM,MAAMD;QACzCT,SAASW,KAAK,GAAG,CAACA,QAAUP,KAAKO;QAEjCX,SAASY,YAAY,CAACT,QAAe,CAAC;IACxC;AACF"}
1
+ {"version":3,"sources":["../../src/middleware/socketio.middleware.ts"],"names":["authorize","settingsStore","options","logger","verify","strategy","PassportJwtStrategy","authorizeCallback","socket","next","getLoginRequired","success","_user","fail","info","warn","reason","Error","error","authenticate"],"mappings":";;;;+BAQaA;;;eAAAA;;;6BAPkF;AAOxF,MAAMA,YAAY,CACvBC,eACAC,SACAC,QACAC;IAEA,MAAMC,WAAW,IAAIC,qBAAmB,CAACJ,SAASE;IAElD,OAAO,eAAeG,kBACpBC,MAAkD,EAClDC,IAAmC;QAEnC,IAAI,CAAE,MAAMR,cAAcS,gBAAgB,IAAK;YAE7C,OAAOD;QACT;QAEAJ,SAASM,OAAO,GAAG,SAASA,QAAQC,KAAY;YAG9CH;QACF;QACAJ,SAASQ,IAAI,GAAG,CAACC;YACfX,OAAOY,IAAI,CAAC,CAAC,+CAA+C,EAAED,KAAK,CAAC,CAAC,EAAE;gBAAEE,QAAQF;YAAK;YACtFL,KAAK,IAAIQ,MAAMH;QACjB;QACAT,SAASa,KAAK,GAAG,CAACA;YAChBf,OAAOY,IAAI,CAAC;YACZN,KAAKS;QACP;QAEAb,SAASc,YAAY,CAACX,QAAe,CAAC;IACxC;AACF"}
@@ -5,14 +5,14 @@ Object.defineProperty(exports, "__esModule", {
5
5
  function _export(target, all) {
6
6
  for(var name in all)Object.defineProperty(target, name, {
7
7
  enumerable: true,
8
- get: all[name]
8
+ get: Object.getOwnPropertyDescriptor(all, name).get
9
9
  });
10
10
  }
11
11
  _export(exports, {
12
- Printer: function() {
12
+ get Printer () {
13
13
  return Printer;
14
14
  },
15
- PrinterSchema: function() {
15
+ get PrinterSchema () {
16
16
  return PrinterSchema;
17
17
  }
18
18
  });
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/models/Printer.ts"],"names":["Printer","PrinterSchema","Schema","apiKey","type","String","default","required","username","password","printerURL","printerType","Number","OctoprintType","enabled","Boolean","disabledReason","assignee","name","dateAdded","feedRate","flowRate","model"],"mappings":";;;;;;;;;;;IA6EaA,OAAO;eAAPA;;IAzDAC,aAAa;eAAbA;;;0BApBiB;qCACA;AAmBvB,MAAMA,gBAAgB,IAAIC,gBAAM,CAAW;IAChDC,QAAQ;QACNC,MAAMC;QACNC,SAAS;QACTC,UAAU;IACZ;IACAC,UAAU;QACRJ,MAAMC;QACNC,SAAS;QACTC,UAAU;IACZ;IACAE,UAAU;QACRL,MAAMC;QACNC,SAAS;QACTC,UAAU;IACZ;IACAG,YAAY;QACVN,MAAMC;QACNE,UAAU;IACZ;IACAI,aAAa;QACXP,MAAMQ;QACNL,UAAU;QACVD,SAASO,kCAAa;IACxB;IACAC,SAAS;QACPV,MAAMW;QACNR,UAAU;QACVD,SAAS;IACX;IACAU,gBAAgB;QACdZ,MAAMC;QACNE,UAAU;IACZ;IACAU,UAAU;QACRb,MAAMC;QACNE,UAAU;IACZ;IACAW,MAAM;QACJd,MAAMC;QACNE,UAAU;IACZ;IAEAY,WAAW;QACTf,MAAMQ;QACNL,UAAU;IACZ;IACAa,UAAU;QACRhB,MAAMQ;QACNL,UAAU;IACZ;IACAc,UAAU;QACRjB,MAAMQ;QACNL,UAAU;IACZ;AACF;AAEO,MAAMP,UAAUsB,IAAAA,eAAK,EAAC,WAAWrB"}
1
+ {"version":3,"sources":["../../src/models/Printer.ts"],"names":["Printer","PrinterSchema","Schema","apiKey","type","String","default","required","username","password","printerURL","printerType","Number","OctoprintType","enabled","Boolean","disabledReason","assignee","name","dateAdded","feedRate","flowRate","model"],"mappings":";;;;;;;;;;;QA6EaA;eAAAA;;QAzDAC;eAAAA;;;0BApBiB;qCACA;AAmBvB,MAAMA,gBAAgB,IAAIC,gBAAM,CAAW;IAChDC,QAAQ;QACNC,MAAMC;QACNC,SAAS;QACTC,UAAU;IACZ;IACAC,UAAU;QACRJ,MAAMC;QACNC,SAAS;QACTC,UAAU;IACZ;IACAE,UAAU;QACRL,MAAMC;QACNC,SAAS;QACTC,UAAU;IACZ;IACAG,YAAY;QACVN,MAAMC;QACNE,UAAU;IACZ;IACAI,aAAa;QACXP,MAAMQ;QACNL,UAAU;QACVD,SAASO,kCAAa;IACxB;IACAC,SAAS;QACPV,MAAMW;QACNR,UAAU;QACVD,SAAS;IACX;IACAU,gBAAgB;QACdZ,MAAMC;QACNE,UAAU;IACZ;IACAU,UAAU;QACRb,MAAMC;QACNE,UAAU;IACZ;IACAW,MAAM;QACJd,MAAMC;QACNE,UAAU;IACZ;IAEAY,WAAW;QACTf,MAAMQ;QACNL,UAAU;IACZ;IACAa,UAAU;QACRhB,MAAMQ;QACNL,UAAU;IACZ;IACAc,UAAU;QACRjB,MAAMQ;QACNL,UAAU;IACZ;AACF;AAEO,MAAMP,UAAUsB,IAAAA,eAAK,EAAC,WAAWrB"}
@@ -130,7 +130,12 @@ const SettingsSchema = new _mongoose.Schema({
130
130
  [_serversettingsconstants.timeoutSettingKey]: {
131
131
  apiTimeout: {
132
132
  type: Number,
133
- default: 1000,
133
+ default: (0, _serversettingsconstants.getDefaultTimeout)().apiTimeout,
134
+ required: true
135
+ },
136
+ apiUploadTimeout: {
137
+ type: Number,
138
+ default: (0, _serversettingsconstants.getDefaultTimeout)().apiUploadTimeout,
134
139
  required: true
135
140
  }
136
141
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/models/Settings.ts"],"names":["Settings","SettingsSchema","Schema","wizardSettingKey","wizardCompleted","type","Boolean","default","required","wizardCompletedAt","Date","wizardVersion","Number","printerFileCleanSettingKey","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","credentialSettingsKey","jwtSecret","String","minlength","trim","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","serverSettingsKey","sentryDiagnosticsEnabled","loginRequired","registration","experimentalMoonrakerSupport","experimentalClientSupport","experimentalThumbnailSupport","experimentalPrusaLinkSupport","frontendSettingKey","gridCols","gridRows","largeTiles","tilePreferCancelOverQuickStop","timeoutSettingKey","apiTimeout","model"],"mappings":";;;;+BA2LaA;;;eAAAA;;;0BA3LiB;yCAQvB;AAqDP,MAAMC,iBAAiB,IAAIC,gBAAM,CAAY;IAC3C,CAACC,yCAAgB,CAAC,EAAE;QAClBC,iBAAiB;YACfC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAC,mBAAmB;YACjBJ,MAAMK;YACNH,SAAS;YACTC,UAAU;QACZ;QACAG,eAAe;YACbN,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACK,mDAA0B,CAAC,EAAE;QAC5BC,gCAAgC;YAC9BT,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAO,0BAA0B;YACxBV,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAQ,iCAAiC;YAC/BX,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACS,8CAAqB,CAAC,EAAE;QACvBZ,MAAM;YACJa,WAAW;gBACTb,MAAMc;gBACNC,WAAW;gBACXC,MAAM;gBACNb,UAAU;YACZ;YACAc,cAAc;gBACZjB,MAAMO;gBACNJ,UAAU;YACZ;YACAe,sBAAsB;gBACpBlB,MAAMO;gBACNJ,UAAU;YACZ;YACAgB,oBAAoB;gBAClBnB,MAAMO;gBACNJ,UAAU;YACZ;QACF;QACAA,UAAU;IACZ;IACA,CAACiB,0CAAiB,CAAC,EAAE;QACnBC,0BAA0B;YACxBrB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAmB,eAAe;YACbtB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAoB,cAAc;YACZvB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAqB,8BAA8B;YAC5BxB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAsB,2BAA2B;YACzBzB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAuB,8BAA8B;YAC5B1B,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAwB,8BAA8B;YAC5B3B,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACyB,2CAAkB,CAAC,EAAE;QACpBC,UAAU;YACR7B,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACA2B,UAAU;YACR9B,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACA4B,YAAY;YACV/B,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACA6B,+BAA+B;YAC7BhC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAAC8B,0CAAiB,CAAC,EAAE;QACnBC,YAAY;YACVlC,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;AACF;AAEO,MAAMR,WAAWwC,IAAAA,eAAK,EAAC,kBAAkBvC"}
1
+ {"version":3,"sources":["../../src/models/Settings.ts"],"names":["Settings","SettingsSchema","Schema","wizardSettingKey","wizardCompleted","type","Boolean","default","required","wizardCompletedAt","Date","wizardVersion","Number","printerFileCleanSettingKey","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","credentialSettingsKey","jwtSecret","String","minlength","trim","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","serverSettingsKey","sentryDiagnosticsEnabled","loginRequired","registration","experimentalMoonrakerSupport","experimentalClientSupport","experimentalThumbnailSupport","experimentalPrusaLinkSupport","frontendSettingKey","gridCols","gridRows","largeTiles","tilePreferCancelOverQuickStop","timeoutSettingKey","apiTimeout","getDefaultTimeout","apiUploadTimeout","model"],"mappings":";;;;+BAkMaA;;;eAAAA;;;0BAlMiB;yCASvB;AAsDP,MAAMC,iBAAiB,IAAIC,gBAAM,CAAY;IAC3C,CAACC,yCAAgB,CAAC,EAAE;QAClBC,iBAAiB;YACfC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAC,mBAAmB;YACjBJ,MAAMK;YACNH,SAAS;YACTC,UAAU;QACZ;QACAG,eAAe;YACbN,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACK,mDAA0B,CAAC,EAAE;QAC5BC,gCAAgC;YAC9BT,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAO,0BAA0B;YACxBV,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAQ,iCAAiC;YAC/BX,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACS,8CAAqB,CAAC,EAAE;QACvBZ,MAAM;YACJa,WAAW;gBACTb,MAAMc;gBACNC,WAAW;gBACXC,MAAM;gBACNb,UAAU;YACZ;YACAc,cAAc;gBACZjB,MAAMO;gBACNJ,UAAU;YACZ;YACAe,sBAAsB;gBACpBlB,MAAMO;gBACNJ,UAAU;YACZ;YACAgB,oBAAoB;gBAClBnB,MAAMO;gBACNJ,UAAU;YACZ;QACF;QACAA,UAAU;IACZ;IACA,CAACiB,0CAAiB,CAAC,EAAE;QACnBC,0BAA0B;YACxBrB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAmB,eAAe;YACbtB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAoB,cAAc;YACZvB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAqB,8BAA8B;YAC5BxB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAsB,2BAA2B;YACzBzB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAuB,8BAA8B;YAC5B1B,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAwB,8BAA8B;YAC5B3B,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACyB,2CAAkB,CAAC,EAAE;QACpBC,UAAU;YACR7B,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACA2B,UAAU;YACR9B,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACA4B,YAAY;YACV/B,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACA6B,+BAA+B;YAC7BhC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAAC8B,0CAAiB,CAAC,EAAE;QACnBC,YAAY;YACVlC,MAAMO;YACNL,SAASiC,IAAAA,0CAAiB,IAAGD,UAAU;YACvC/B,UAAU;QACZ;QACAiC,kBAAkB;YAChBpC,MAAMO;YACNL,SAASiC,IAAAA,0CAAiB,IAAGC,gBAAgB;YAC7CjC,UAAU;QACZ;IACF;AACF;AAEO,MAAMR,WAAW0C,IAAAA,eAAK,EAAC,kBAAkBzC"}
@@ -5,38 +5,38 @@ Object.defineProperty(exports, "__esModule", {
5
5
  function _export(target, all) {
6
6
  for(var name in all)Object.defineProperty(target, name, {
7
7
  enumerable: true,
8
- get: all[name]
8
+ get: Object.getOwnPropertyDescriptor(all, name).get
9
9
  });
10
10
  }
11
11
  _export(exports, {
12
- CameraStream: function() {
12
+ get CameraStream () {
13
13
  return _CameraStream.CameraStream;
14
14
  },
15
- CustomGcode: function() {
15
+ get CustomGcode () {
16
16
  return _CustomGcode.CustomGcode;
17
17
  },
18
- Floor: function() {
18
+ get Floor () {
19
19
  return _Floor.Floor;
20
20
  },
21
- Permission: function() {
21
+ get Permission () {
22
22
  return _Permission.Permission;
23
23
  },
24
- PrintCompletion: function() {
24
+ get PrintCompletion () {
25
25
  return _PrintCompletion.PrintCompletion;
26
26
  },
27
- Printer: function() {
27
+ get Printer () {
28
28
  return _Printer.Printer;
29
29
  },
30
- RefreshToken: function() {
30
+ get RefreshToken () {
31
31
  return _RefreshToken.RefreshToken;
32
32
  },
33
- Role: function() {
33
+ get Role () {
34
34
  return _Role.Role;
35
35
  },
36
- Settings: function() {
36
+ get Settings () {
37
37
  return _Settings.Settings;
38
38
  },
39
- User: function() {
39
+ get User () {
40
40
  return _User.User;
41
41
  }
42
42
  });
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/models/index.ts"],"names":["CameraStream","CustomGcode","Floor","Permission","PrintCompletion","Printer","RefreshToken","Role","Settings","User"],"mappings":";;;;;;;;;;;IAWuGA,YAAY;eAAZA,0BAAY;;IAAzEC,WAAW;eAAXA,wBAAW;;IAAnCC,KAAK;eAALA,YAAK;;IAAsDC,UAAU;eAAVA,sBAAU;;IAA9DC,eAAe;eAAfA,gCAAe;;IAA/BC,OAAO;eAAPA,gBAAO;;IAAyEC,YAAY;eAAZA,0BAAY;;IAA9BC,IAAI;eAAJA,UAAI;;IAApBC,QAAQ;eAARA,kBAAQ;;IAAEC,IAAI;eAAJA,UAAI;;;yBAX7C;uBACF;0BACG;sBACJ;sBACA;4BACM;iCACK;8BACH;8BACA;6BACD"}
1
+ {"version":3,"sources":["../../src/models/index.ts"],"names":["CameraStream","CustomGcode","Floor","Permission","PrintCompletion","Printer","RefreshToken","Role","Settings","User"],"mappings":";;;;;;;;;;;QAWuGA;eAAAA,0BAAY;;QAAzEC;eAAAA,wBAAW;;QAAnCC;eAAAA,YAAK;;QAAsDC;eAAAA,sBAAU;;QAA9DC;eAAAA,gCAAe;;QAA/BC;eAAAA,gBAAO;;QAAyEC;eAAAA,0BAAY;;QAA9BC;eAAAA,UAAI;;QAApBC;eAAAA,kBAAQ;;QAAEC;eAAAA,UAAI;;;yBAX7C;uBACF;0BACG;sBACJ;sBACA;4BACM;iCACK;8BACH;8BACA;6BACD"}
@@ -53,6 +53,7 @@ const AppConstants = {
53
53
  OVERRIDE_DEMO_ROLE: "OVERRIDE_DEMO_ROLE",
54
54
  DEFAULT_DEMO_ROLE: "ADMIN",
55
55
  defaultDevelopmentEnv: "development",
56
+ ENABLE_COLORED_LOGS_KEY: "ENABLE_COLORED_LOGS",
56
57
  defaultTestEnv: "test",
57
58
  defaultProductionEnv: "production",
58
59
  knownEnvNames: [
@@ -70,7 +71,7 @@ const AppConstants = {
70
71
  githubUrl: "https://github.com/fdm-monster/fdm-monster",
71
72
  orgName: "fdm-monster",
72
73
  currentWizardVersion: 1,
73
- defaultClientMinimum: "1.10.1",
74
+ defaultClientMinimum: "1.11.1",
74
75
  influxUrl: "INFLUX_URL",
75
76
  influxToken: "INFLUX_TOKEN",
76
77
  influxOrg: "INFLUX_ORG",
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultPrinterThumbnailsStorage","defaultFileUploadsStorage","defaultAcceptedGcodeExtensions","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","serverRepoName","clientPackageName","clientRepoName","clientNextPackageName","clientNextRepoName","githubUrl","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault","ENABLE_PROMETHEUS_METRICS","ENABLE_LOKI_LOGGING","LOKI_ADDRESS","LOKI_TIMEOUT_SECONDS","LOKI_INTERVAL"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,WAAW;IACXC,eAAe;IACfC,eAAe;IAEfC,gBAAgB;IAChBC,YAAY;IAGZC,0BAA0B;IAC1BC,mBAAmB;IACnBC,sBAAsB;IAEtBC,4BAA4B;IAC5BC,gCAAgC;IAChCC,iCAAiC;IACjCC,2BAA2B;IAC3BC,gCAAgC;QAAC;QAAU;KAAU;IACrDC,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,yBAAyB;IAEzBC,+BAA+B;IAE/BC,yBAAyB;IAEzBC,yBAAyB;IAEzBC,qBAAqB;IAErBC,yBAAyB;IACzBC,wBAAwB,KAAK;IAE7BC,gCAAgC,CAAC;IAEjCC,8BAA8B,KAAK,KAAK,KAAK;IAE7CC,qBAAqB;IACrBC,oBAAoB;IAEpBC,uBAAuB;IACvBC,sBAAsB;IAEtBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,oBAAoB;IACpBC,mBAAmB;IAEnBC,uBAAuB;IACvBC,gBAAgB;IAChBC,sBAAsB;IACtBC,eAAe;QAAC;QAAe;QAAc;KAAO;IACpDC,YAAY;IACZC,mBAAmB;IACnBC,gBAAgB;IAChBC,mBAAmB;IACnBC,gBAAgB;IAChBC,uBAAuB;IACvBC,oBAAoB;IACpBC,WAAW;IACXC,SAAS;IAETC,sBAAsB;IACtBC,sBAAsB;IAEtBC,WAAW;IACXC,aAAa;IACbC,WAAW;IACXC,cAAc;IAGdC,kCAAkC;IAClCC,2BAA2B;IAC3BC,sBAAsB;IACtBC,0BAA0B;IAG1BC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAGnBC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBACE;IAEFC,gBAAgB;IAEhBC,6BAA6B;IAC7BC,kCAAkC;IAClCC,2BAA2B;IAC3BC,qBAAqB;IACrBC,cAAc;IACdC,sBAAsB;IACtBC,eAAe;AACjB"}
1
+ {"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultPrinterThumbnailsStorage","defaultFileUploadsStorage","defaultAcceptedGcodeExtensions","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","ENABLE_COLORED_LOGS_KEY","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","serverRepoName","clientPackageName","clientRepoName","clientNextPackageName","clientNextRepoName","githubUrl","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault","ENABLE_PROMETHEUS_METRICS","ENABLE_LOKI_LOGGING","LOKI_ADDRESS","LOKI_TIMEOUT_SECONDS","LOKI_INTERVAL"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,WAAW;IACXC,eAAe;IACfC,eAAe;IAEfC,gBAAgB;IAChBC,YAAY;IAGZC,0BAA0B;IAC1BC,mBAAmB;IACnBC,sBAAsB;IAEtBC,4BAA4B;IAC5BC,gCAAgC;IAChCC,iCAAiC;IACjCC,2BAA2B;IAC3BC,gCAAgC;QAAC;QAAU;KAAU;IACrDC,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,yBAAyB;IAEzBC,+BAA+B;IAE/BC,yBAAyB;IAEzBC,yBAAyB;IAEzBC,qBAAqB;IAErBC,yBAAyB;IACzBC,wBAAwB,KAAK;IAE7BC,gCAAgC,CAAC;IAEjCC,8BAA8B,KAAK,KAAK,KAAK;IAE7CC,qBAAqB;IACrBC,oBAAoB;IAEpBC,uBAAuB;IACvBC,sBAAsB;IAEtBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,oBAAoB;IACpBC,mBAAmB;IAEnBC,uBAAuB;IACvBC,yBAAyB;IACzBC,gBAAgB;IAChBC,sBAAsB;IACtBC,eAAe;QAAC;QAAe;QAAc;KAAO;IACpDC,YAAY;IACZC,mBAAmB;IACnBC,gBAAgB;IAChBC,mBAAmB;IACnBC,gBAAgB;IAChBC,uBAAuB;IACvBC,oBAAoB;IACpBC,WAAW;IACXC,SAAS;IAETC,sBAAsB;IACtBC,sBAAsB;IAEtBC,WAAW;IACXC,aAAa;IACbC,WAAW;IACXC,cAAc;IAGdC,kCAAkC;IAClCC,2BAA2B;IAC3BC,sBAAsB;IACtBC,0BAA0B;IAG1BC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAGnBC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBACE;IAEFC,gBAAgB;IAEhBC,6BAA6B;IAC7BC,kCAAkC;IAClCC,2BAA2B;IAC3BC,qBAAqB;IACrBC,cAAc;IACdC,sBAAsB;IACtBC,eAAe;AACjB"}
@@ -5,39 +5,38 @@ Object.defineProperty(exports, "__esModule", {
5
5
  function _export(target, all) {
6
6
  for(var name in all)Object.defineProperty(target, name, {
7
7
  enumerable: true,
8
- get: all[name]
8
+ get: Object.getOwnPropertyDescriptor(all, name).get
9
9
  });
10
10
  }
11
11
  _export(exports, {
12
- ensureMongoDbConnectionStringSet: function() {
12
+ get ensureMongoDbConnectionStringSet () {
13
13
  return ensureMongoDbConnectionStringSet;
14
14
  },
15
- ensurePortSet: function() {
15
+ get ensurePortSet () {
16
16
  return ensurePortSet;
17
17
  },
18
- fetchMongoDBConnectionString: function() {
18
+ get fetchMongoDBConnectionString () {
19
19
  return fetchMongoDBConnectionString;
20
20
  },
21
- fetchServerPort: function() {
21
+ get fetchServerPort () {
22
22
  return fetchServerPort;
23
23
  },
24
- isEnvProd: function() {
24
+ get isEnvProd () {
25
25
  return isEnvProd;
26
26
  },
27
- runMigrations: function() {
27
+ get runMigrations () {
28
28
  return runMigrations;
29
29
  },
30
- setupEnvConfig: function() {
30
+ get setupEnvConfig () {
31
31
  return setupEnvConfig;
32
32
  },
33
- setupSentry: function() {
33
+ get setupSentry () {
34
34
  return setupSentry;
35
35
  }
36
36
  });
37
37
  const _migratemongo = require("migrate-mongo");
38
38
  const _path = require("path");
39
39
  const _node = /*#__PURE__*/ _interop_require_wildcard(require("@sentry/node"));
40
- const _dotenv = require("dotenv");
41
40
  const _serverconstants = require("./server.constants");
42
41
  const _logger = require("./handlers/logger");
43
42
  const _envutils = require("./utils/env.utils");
@@ -85,10 +84,8 @@ function _interop_require_wildcard(obj, nodeInterop) {
85
84
  }
86
85
  return newObj;
87
86
  }
88
- const logger = new _logger.LoggerService("FDM-Environment", false);
89
87
  const instructionsReferralURL = "https://docs.fdm-monster.net";
90
88
  const packageJsonPath = (0, _path.join)((0, _fsutils.superRootPath)(), "./package.json");
91
- const dotEnvPath = (0, _path.join)((0, _fsutils.superRootPath)(), "./.env");
92
89
  function isEnvTest() {
93
90
  return process.env[_serverconstants.AppConstants.NODE_ENV_KEY] === _serverconstants.AppConstants.defaultTestEnv;
94
91
  }
@@ -96,6 +93,7 @@ function isEnvProd() {
96
93
  return process.env[_serverconstants.AppConstants.NODE_ENV_KEY] === _serverconstants.AppConstants.defaultProductionEnv;
97
94
  }
98
95
  function ensureNodeEnvSet() {
96
+ const logger = new _logger.LoggerService("FDM-Environment");
99
97
  const environment = process.env[_serverconstants.AppConstants.NODE_ENV_KEY];
100
98
  if (!environment || !_serverconstants.AppConstants.knownEnvNames.includes(environment)) {
101
99
  const newEnvName = _serverconstants.AppConstants.defaultProductionEnv;
@@ -106,14 +104,17 @@ function ensureNodeEnvSet() {
106
104
  }
107
105
  }
108
106
  function ensurePackageVersionSet() {
107
+ const logger = new _logger.LoggerService("FDM-Environment");
109
108
  const packageJsonVersion = require(packageJsonPath).version;
110
109
  process.env[_serverconstants.AppConstants.VERSION_KEY] ??= packageJsonVersion;
111
110
  logger.log(`✓ Running server version ${process.env[_serverconstants.AppConstants.VERSION_KEY]}`);
112
111
  }
113
112
  function printInstructionsURL() {
113
+ const logger = new _logger.LoggerService("FDM-Environment");
114
114
  logger.log(`Please make sure to read ${instructionsReferralURL} for more information.`);
115
115
  }
116
116
  function fetchMongoDBConnectionString() {
117
+ const logger = new _logger.LoggerService("FDM-Environment");
117
118
  if (!process.env[_serverconstants.AppConstants.MONGO_KEY]) {
118
119
  logger.debug(`~ ${_serverconstants.AppConstants.MONGO_KEY} environment variable is not set. Assuming default`);
119
120
  printInstructionsURL();
@@ -130,6 +131,7 @@ function fetchServerPort() {
130
131
  return port;
131
132
  }
132
133
  function ensureMongoDbConnectionStringSet() {
134
+ const logger = new _logger.LoggerService("FDM-Environment");
133
135
  const dbConnectionString = process.env[_serverconstants.AppConstants.MONGO_KEY];
134
136
  if (!dbConnectionString) {
135
137
  fetchMongoDBConnectionString();
@@ -138,6 +140,7 @@ function ensureMongoDbConnectionStringSet() {
138
140
  }
139
141
  }
140
142
  function setupSentry() {
143
+ const logger = new _logger.LoggerService("FDM-Environment");
141
144
  const sentryDsnToken = (0, _envutils.getEnvOrDefault)(_serverconstants.AppConstants.sentryCustomDsnToken, _serverconstants.AppConstants.sentryCustomDsnDefault);
142
145
  _node.init({
143
146
  dsn: sentryDsnToken,
@@ -153,6 +156,7 @@ function setupSentry() {
153
156
  });
154
157
  }
155
158
  function ensurePortSet() {
159
+ const logger = new _logger.LoggerService("FDM-Environment");
156
160
  fetchServerPort();
157
161
  if (!process.env[_serverconstants.AppConstants.SERVER_PORT_KEY]) {
158
162
  logger.log(`~ ${_serverconstants.AppConstants.SERVER_PORT_KEY} environment variable is not set`);
@@ -160,13 +164,7 @@ function ensurePortSet() {
160
164
  process.env[_serverconstants.AppConstants.SERVER_PORT_KEY] = _serverconstants.AppConstants.defaultServerPort.toString();
161
165
  }
162
166
  }
163
- function setupEnvConfig(skipDotEnv = false) {
164
- if (!skipDotEnv) {
165
- (0, _dotenv.config)({
166
- path: dotEnvPath
167
- });
168
- logger.log("✓ Parsed environment and (optional) .env file");
169
- }
167
+ function setupEnvConfig() {
170
168
  ensureNodeEnvSet();
171
169
  ensurePackageVersionSet();
172
170
  setupSentry();
@@ -180,6 +178,7 @@ function setupEnvConfig(skipDotEnv = false) {
180
178
  }
181
179
  }
182
180
  async function runMigrations(db, client) {
181
+ const logger = new _logger.LoggerService("FDM-Environment");
183
182
  const migrationsStatus = await (0, _migratemongo.status)(db);
184
183
  const pendingMigrations = migrationsStatus.filter((m)=>m.appliedAt === "PENDING");
185
184
  if (pendingMigrations.length) {
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/server.env.ts"],"names":["ensureMongoDbConnectionStringSet","ensurePortSet","fetchMongoDBConnectionString","fetchServerPort","isEnvProd","runMigrations","setupEnvConfig","setupSentry","logger","Logger","instructionsReferralURL","packageJsonPath","join","superRootPath","dotEnvPath","isEnvTest","process","env","AppConstants","NODE_ENV_KEY","defaultTestEnv","defaultProductionEnv","ensureNodeEnvSet","environment","knownEnvNames","includes","newEnvName","warn","log","ensurePackageVersionSet","packageJsonVersion","require","version","VERSION_KEY","printInstructionsURL","MONGO_KEY","debug","defaultMongoStringUnauthenticated","port","SERVER_PORT_KEY","Number","isNaN","parseInt","defaultServerPort","toString","dbConnectionString","sentryDsnToken","getEnvOrDefault","sentryCustomDsnToken","sentryCustomDsnDefault","Sentry","init","dsn","NODE_ENV","release","npm_package_version","enabled","tracesSampleRate","isProductionEnvironment","on","e","message","errorSummary","error","captureException","skipDotEnv","config","path","ENABLE_PROMETHEUS_METRICS","collectDefaultMetrics","register","removeSingleMetric","db","client","migrationsStatus","status","pendingMigrations","filter","m","appliedAt","length","migrationResult","up"],"mappings":";;;;;;;;;;;IAmEgBA,gCAAgC;eAAhCA;;IA6BAC,aAAa;eAAbA;;IAhDAC,4BAA4B;eAA5BA;;IASAC,eAAe;eAAfA;;IAnCAC,SAAS;eAATA;;IAwGMC,aAAa;eAAbA;;IApBNC,cAAc;eAAdA;;IA9BAC,WAAW;eAAXA;;;8BA5EW;sBACN;8DACG;wBACD;iCACM;wBACW;0BACiB;4BAC5B;yBACC;4BACkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEhD,MAAMC,SAAS,IAAIC,qBAAM,CAAC,mBAAmB;AAG7C,MAAMC,0BAA0B;AAChC,MAAMC,kBAAkBC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAI;AAC9C,MAAMC,aAAaF,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAI;AAEzC,SAASE;IACP,OAAOC,QAAQC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC,KAAKD,6BAAY,CAACE,cAAc;AAC/E;AAEO,SAAShB;IACd,OAAOY,QAAQC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC,KAAKD,6BAAY,CAACG,oBAAoB;AACrF;AAEA,SAASC;IACP,MAAMC,cAAcP,QAAQC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC;IAC1D,IAAI,CAACI,eAAe,CAACL,6BAAY,CAACM,aAAa,CAACC,QAAQ,CAACF,cAAc;QACrE,MAAMG,aAAaR,6BAAY,CAACG,oBAAoB;QACpDL,QAAQC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC,GAAGO;QACzClB,OAAOmB,IAAI,CAAC,CAAC,SAAS,EAAEJ,YAAY,mDAAmD,EAAEG,YAAY;IACvG,OAAO;QACLlB,OAAOoB,GAAG,CAAC,CAAC,mCAAmC,EAAEL,YAAY,EAAE,CAAC;IAClE;AACF;AAEA,SAASM;IACP,MAAMC,qBAAqBC,QAAQpB,iBAAiBqB,OAAO;IAC3DhB,QAAQC,GAAG,CAACC,6BAAY,CAACe,WAAW,CAAC,KAAKH;IAE1CtB,OAAOoB,GAAG,CAAC,CAAC,yBAAyB,EAAEZ,QAAQC,GAAG,CAACC,6BAAY,CAACe,WAAW,CAAC,EAAE;AAChF;AAEA,SAASC;IACP1B,OAAOoB,GAAG,CAAC,CAAC,yBAAyB,EAAElB,wBAAwB,sBAAsB,CAAC;AACxF;AAEO,SAASR;IACd,IAAI,CAACc,QAAQC,GAAG,CAACC,6BAAY,CAACiB,SAAS,CAAC,EAAE;QACxC3B,OAAO4B,KAAK,CAAC,CAAC,EAAE,EAAElB,6BAAY,CAACiB,SAAS,CAAC,kDAAkD,CAAC;QAC5FD;QACAlB,QAAQC,GAAG,CAACC,6BAAY,CAACiB,SAAS,CAAC,GAAGjB,6BAAY,CAACmB,iCAAiC;IACtF;IACA,OAAOrB,QAAQC,GAAG,CAACC,6BAAY,CAACiB,SAAS,CAAC;AAC5C;AAEO,SAAShC;IACd,IAAImC,OAAOtB,QAAQC,GAAG,CAACC,6BAAY,CAACqB,eAAe,CAAC;IACpD,IAAIC,OAAOC,KAAK,CAACC,SAASJ,QAAS;QAEjCtB,QAAQC,GAAG,CAACC,6BAAY,CAACqB,eAAe,CAAC,GAAGrB,6BAAY,CAACyB,iBAAiB,CAACC,QAAQ;QACnFN,OAAOtB,QAAQC,GAAG,CAACC,6BAAY,CAACqB,eAAe,CAAC;IAClD;IACA,OAAOD;AACT;AAEO,SAAStC;IACd,MAAM6C,qBAAqB7B,QAAQC,GAAG,CAACC,6BAAY,CAACiB,SAAS,CAAC;IAC9D,IAAI,CAACU,oBAAoB;QACvB3C;IACF,OAAO;QACLM,OAAOoB,GAAG,CAAC,CAAC,EAAE,EAAEV,6BAAY,CAACiB,SAAS,CAAC,0BAA0B,CAAC;IACpE;AACF;AAEO,SAAS5B;IACd,MAAMuC,iBAAiBC,IAAAA,yBAAe,EAAC7B,6BAAY,CAAC8B,oBAAoB,EAAE9B,6BAAY,CAAC+B,sBAAsB;IAE7GC,MAAOC,IAAI,CAAC;QACVC,KAAKN;QACLvB,aAAaP,QAAQC,GAAG,CAACoC,QAAQ;QACjCC,SAAStC,QAAQC,GAAG,CAACsC,mBAAmB;QACxCC,SAAS,CAACzC;QACV0C,kBAAkBC,IAAAA,iCAAuB,MAAK,OAAO;IACvD;IAEA1C,QAAQ2C,EAAE,CAAC,sBAAsB,CAACC;QAChC,MAAMC,UAAU,CAAC,4BAA4B,EAAEC,IAAAA,wBAAY,EAACF,IAAI;QAChEpD,OAAOuD,KAAK,CAACF;QAGbX,MAAOc,gBAAgB,CAACJ;IAC1B;AACF;AAEO,SAAS3D;IACdE;IAEA,IAAI,CAACa,QAAQC,GAAG,CAACC,6BAAY,CAACqB,eAAe,CAAC,EAAE;QAC9C/B,OAAOoB,GAAG,CAAC,CAAC,EAAE,EAAEV,6BAAY,CAACqB,eAAe,CAAC,gCAAgC,CAAC;QAC9EL;QACAlB,QAAQC,GAAG,CAACC,6BAAY,CAACqB,eAAe,CAAC,GAAGrB,6BAAY,CAACyB,iBAAiB,CAACC,QAAQ;IACrF;AACF;AAEO,SAAStC,eAAe2D,aAAa,KAAK;IAC/C,IAAI,CAACA,YAAY;QAEfC,IAAAA,cAAM,EAAC;YAAEC,MAAMrD;QAAW;QAC1BN,OAAOoB,GAAG,CAAC;IACb;IAEAN;IACAO;IACAtB;IACAP;IACAC;IAGA,IAAIe,QAAQC,GAAG,CAACC,6BAAY,CAACkD,yBAAyB,CAAC,KAAK,QAAQ;QAClEC,IAAAA,iCAAqB,EAAC;YAAEC,UAAAA,oBAAQ;QAAC;QACjCA,oBAAQ,CAACC,kBAAkB,CAAC;IAC9B;AACF;AAEO,eAAelE,cAAcmE,EAAO,EAAEC,MAAW;IACtD,MAAMC,mBAAmB,MAAMC,IAAAA,oBAAM,EAACH;IACtC,MAAMI,oBAAoBF,iBAAiBG,MAAM,CAAC,CAACC,IAAMA,EAAEC,SAAS,KAAK;IAEzE,IAAIH,kBAAkBI,MAAM,EAAE;QAC5BxE,OAAOoB,GAAG,CACR,CAAC,cAAc,EAAEgD,kBAAkBI,MAAM,CAAC,yBAAyB,EAAEN,iBAAiBM,MAAM,CAAC,qBAAqB,CAAC;IAEvH,OAAO;QACLxE,OAAOoB,GAAG,CAAC,CAAC,gCAAgC,EAAE8C,iBAAiBM,MAAM,CAAC,mBAAmB,CAAC;IAC5F;IAEA,MAAMC,kBAAkB,MAAMC,IAAAA,gBAAE,EAACV,IAAIC;IACrC,IAAIQ,iBAAiBD,SAAS,GAAG;QAC/BxE,OAAOoB,GAAG,CAAC,CAAC,QAAQ,EAAEqD,gBAAgBD,MAAM,CAAC,wBAAwB,CAAC,EAAEC;IAC1E,OAAO;QACLzE,OAAOoB,GAAG,CAAC;IACb;AACF"}
1
+ {"version":3,"sources":["../src/server.env.ts"],"names":["ensureMongoDbConnectionStringSet","ensurePortSet","fetchMongoDBConnectionString","fetchServerPort","isEnvProd","runMigrations","setupEnvConfig","setupSentry","instructionsReferralURL","packageJsonPath","join","superRootPath","isEnvTest","process","env","AppConstants","NODE_ENV_KEY","defaultTestEnv","defaultProductionEnv","ensureNodeEnvSet","logger","Logger","environment","knownEnvNames","includes","newEnvName","warn","log","ensurePackageVersionSet","packageJsonVersion","require","version","VERSION_KEY","printInstructionsURL","MONGO_KEY","debug","defaultMongoStringUnauthenticated","port","SERVER_PORT_KEY","Number","isNaN","parseInt","defaultServerPort","toString","dbConnectionString","sentryDsnToken","getEnvOrDefault","sentryCustomDsnToken","sentryCustomDsnDefault","Sentry","init","dsn","NODE_ENV","release","npm_package_version","enabled","tracesSampleRate","isProductionEnvironment","on","e","message","errorSummary","error","captureException","ENABLE_PROMETHEUS_METRICS","collectDefaultMetrics","register","removeSingleMetric","db","client","migrationsStatus","status","pendingMigrations","filter","m","appliedAt","length","migrationResult","up"],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/server.host.ts"],"names":["ServerHost","logger","constructor","loggerFactory","configService","isTypeormMode","settingsStore","bootTask","socketIoGateway","typeormService","name","boot","app","quick_boot","listenRequests","mongoose","set","serveControllerRoutes","runOnce","httpListen","hasConnected","connections","readyState","use","req","res","next","originalUrl","startsWith","history","loadControllersFunc","nextClientPath","join","superRootPath","AppConstants","clientNextPackageName","bundleDistPath","defaultClientBundleStorage","backupClientPath","clientPackageName","isClientNextEnabled","express","static","get","_","path","resource","endsWith","error","NotFoundException","exceptionFilter","port","fetchServerPort","isProductionEnvironment","debugRoutesKey","expressListRoutes","require","prefix","Number","isNaN","parseInt","Error","hostOrFqdn","server","listen","log","attachServer","settings","getServerSettings","experimentalClientSupport"],"mappings":"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"}
1
+ {"version":3,"sources":["../src/server.host.ts"],"names":["ServerHost","logger","loggerFactory","configService","isTypeormMode","settingsStore","bootTask","socketIoGateway","typeormService","name","boot","app","quick_boot","listenRequests","mongoose","set","serveControllerRoutes","runOnce","httpListen","hasConnected","connections","readyState","use","req","res","next","originalUrl","startsWith","history","loadControllersFunc","nextClientPath","join","superRootPath","AppConstants","clientNextPackageName","bundleDistPath","defaultClientBundleStorage","backupClientPath","clientPackageName","isClientNextEnabled","express","static","get","_","path","resource","endsWith","error","NotFoundException","exceptionFilter","port","fetchServerPort","isProductionEnvironment","debugRoutesKey","expressListRoutes","require","prefix","Number","isNaN","parseInt","Error","hostOrFqdn","server","listen","log","attachServer","settings","getServerSettings","experimentalClientSupport"],"mappings":"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"}
@@ -18,13 +18,12 @@ class AuthService {
18
18
  settingsStore;
19
19
  refreshTokenService;
20
20
  logger;
21
- blacklistedJwtCache;
21
+ blacklistedJwtCache = {};
22
22
  constructor(loggerFactory, userService, jwtService, settingsStore, refreshTokenService){
23
23
  this.userService = userService;
24
24
  this.jwtService = jwtService;
25
25
  this.settingsStore = settingsStore;
26
26
  this.refreshTokenService = refreshTokenService;
27
- this.blacklistedJwtCache = {};
28
27
  this.logger = loggerFactory(AuthService.name);
29
28
  }
30
29
  async loginUser(username, password) {
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/services/authentication/auth.service.ts"],"names":["AuthService","logger","blacklistedJwtCache","constructor","loggerFactory","userService","jwtService","settingsStore","refreshTokenService","name","loginUser","username","password","userDoc","findRawByUsername","AuthenticationError","AUTH_ERROR_REASON","IncorrectCredentials","result","comparePasswordHash","passwordHash","userId","id","token","signJwtToken","purgeOutdatedRefreshTokensByUserId","purgeOutdatedBlacklistedJwtCache","refreshToken","createRefreshTokenForUserId","logoutUserId","jwtToken","deleteRefreshTokenByUserId","length","createdAt","Date","now","jwtExpiresIn","getCredentialSettings","keys","Object","key","err","error","captureException","logoutUserRefreshToken","userRefreshToken","getValidRefreshToken","renewLoginByRefreshToken","user","getUser","deleteRefreshToken","InvalidOrExpiredRefreshToken","increaseRefreshTokenAttemptsUsed","isJwtTokenBlacklisted","getRefreshToken","expiresAt","refreshTokenAttempts","attemptsUsed","refreshAttemptsUsed","updateRefreshTokenAttempts","needsPasswordChange","PasswordChangeRequired","isVerified","AccountNotVerified"],"mappings":"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"}
1
+ {"version":3,"sources":["../../../src/services/authentication/auth.service.ts"],"names":["AuthService","logger","blacklistedJwtCache","loggerFactory","userService","jwtService","settingsStore","refreshTokenService","name","loginUser","username","password","userDoc","findRawByUsername","AuthenticationError","AUTH_ERROR_REASON","IncorrectCredentials","result","comparePasswordHash","passwordHash","userId","id","token","signJwtToken","purgeOutdatedRefreshTokensByUserId","purgeOutdatedBlacklistedJwtCache","refreshToken","createRefreshTokenForUserId","logoutUserId","jwtToken","deleteRefreshTokenByUserId","length","createdAt","Date","now","jwtExpiresIn","getCredentialSettings","keys","Object","key","err","error","captureException","logoutUserRefreshToken","userRefreshToken","getValidRefreshToken","renewLoginByRefreshToken","user","getUser","deleteRefreshToken","InvalidOrExpiredRefreshToken","increaseRefreshTokenAttemptsUsed","isJwtTokenBlacklisted","getRefreshToken","expiresAt","refreshTokenAttempts","attemptsUsed","refreshAttemptsUsed","updateRefreshTokenAttempts","needsPasswordChange","PasswordChangeRequired","isVerified","AccountNotVerified"],"mappings":";;;;+BAcaA;;;eAAAA;;;mCAduB;6BACA;wCASF;sBACD;AAG1B,MAAMA;;;;;IACMC,OAAsB;IAI/BC,sBAA8E,CAAC,EAAE;IAoBzF,YACEC,aAA6B,EAC7B,AAAiBC,WAAkD,EACnE,AAAiBC,UAAgC,EACjD,AAAiBC,aAA4B,EAC7C,AAAiBC,mBAAkD,CACnE;aAJiBH,cAAAA;aACAC,aAAAA;aACAC,gBAAAA;aACAC,sBAAAA;QAEjB,IAAI,CAACN,MAAM,GAAGE,cAAcH,YAAYQ,IAAI;IAC9C;IAEA,MAAMC,UAAUC,QAAgB,EAAEC,QAAgB,EAAE;QAClD,MAAMC,UAAU,MAAM,IAAI,CAACR,WAAW,CAACS,iBAAiB,CAACH;QACzD,IAAI,CAACE,SAAS;YACZ,MAAM,IAAIE,sCAAmB,CAAC,mBAAmBC,yCAAiB,CAACC,oBAAoB;QACzF;QACA,MAAMC,SAASC,IAAAA,gCAAmB,EAACP,UAAUC,QAAQO,YAAY;QACjE,IAAI,CAACF,QAAQ;YACX,MAAM,IAAIH,sCAAmB,CAAC,mBAAmBC,yCAAiB,CAACC,oBAAoB;QACzF;QAEA,MAAMI,SAASR,QAAQS,EAAE;QACzB,MAAMC,QAAQ,MAAM,IAAI,CAACC,YAAY,CAACH;QACtC,MAAM,IAAI,CAACb,mBAAmB,CAACiB,kCAAkC,CAACJ;QAClE,MAAM,IAAI,CAACK,gCAAgC;QAE3C,MAAMC,eAAe,MAAM,IAAI,CAACnB,mBAAmB,CAACoB,2BAA2B,CAACP;QAChF,OAAO;YACLE;YACAI;QACF;IACF;IAEA,MAAME,aAAaR,MAAe,EAAES,QAAiB,EAAE;QACrD,MAAM,IAAI,CAACtB,mBAAmB,CAACuB,0BAA0B,CAACV;QAC1D,IAAIS,UAAUE,QAAQ;YACpB,IAAI,CAAC7B,mBAAmB,CAAC2B,SAAS,GAAG;gBAAET;gBAAQY,WAAWC,KAAKC,GAAG;YAAG;YACrE,MAAM,IAAI,CAACT,gCAAgC;QAC7C;IACF;IAEA,MAAMA,mCAAmC;QACvC,IAAI;YACF,MAAM,EAAEU,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC7B,aAAa,CAAC8B,qBAAqB;YACvE,MAAMF,MAAMD,KAAKC,GAAG;YACpB,MAAMG,OAAOC,OAAOD,IAAI,CAAC,IAAI,CAACnC,mBAAmB;YACjD,KAAK,MAAMqC,OAAOF,KAAM;gBACtB,MAAM,EAAEL,SAAS,EAAE,GAAG,IAAI,CAAC9B,mBAAmB,CAACqC,IAAI;gBACnD,IAAIL,MAAMF,YAAYG,cAAc;oBAClC,OAAO,IAAI,CAACjC,mBAAmB,CAACqC,IAAI;gBACtC;YACF;QACF,EAAE,OAAOC,KAAK;YACZ,IAAI,CAACvC,MAAM,CAACwC,KAAK,CAAC,yCAAyCD;YAC3DE,IAAAA,sBAAgB,EAACF;QACnB;IACF;IAEA,MAAMG,uBAAuBjB,YAAoB,EAAE;QACjD,MAAMkB,mBAAmB,MAAM,IAAI,CAACC,oBAAoB,CAACnB;QACzD,MAAM,IAAI,CAACnB,mBAAmB,CAACuB,0BAA0B,CAACc,iBAAiBxB,MAAM;IACnF;IAEA,MAAM0B,yBAAyBpB,YAAoB,EAAmB;QACpE,MAAMkB,mBAAmB,MAAM,IAAI,CAACC,oBAAoB,CAACnB;QAEzD,MAAMN,SAASwB,iBAAiBxB,MAAM;QACtC,MAAM2B,OAAO,MAAM,IAAI,CAAC3C,WAAW,CAAC4C,OAAO,CAAC5B;QAC5C,IAAI,CAAC2B,MAAM;YACT,MAAM,IAAI,CAACxC,mBAAmB,CAAC0C,kBAAkB,CAACvB;YAClD,MAAM,IAAIZ,sCAAmB,CAAC,kBAAkBC,yCAAiB,CAACmC,4BAA4B;QAChG;QAGA,MAAM5B,QAAQ,MAAM,IAAI,CAACC,YAAY,CAACH;QACtC,MAAM,IAAI,CAAC+B,gCAAgC,CAACP,iBAAiBlB,YAAY;QACzE,OAAOJ;IACT;IAEA8B,sBAAsBvB,QAAgB,EAAE;QACtC,OAAO,IAAI,CAAC3B,mBAAmB,CAAC2B,SAAS;IAC3C;IAEA,MAAMgB,qBAAqBnB,YAAoB,EAAE;QAC/C,MAAMkB,mBAAmB,MAAM,IAAI,CAACrC,mBAAmB,CAAC8C,eAAe,CAAC3B;QACxE,IAAIO,KAAKC,GAAG,KAAKU,iBAAiBU,SAAS,EAAE;YAC3C,MAAM,IAAI,CAAC/C,mBAAmB,CAACuB,0BAA0B,CAACc,iBAAiBxB,MAAM;YACjF,MAAM,IAAIN,sCAAmB,CAC3B,yCACAC,yCAAiB,CAACmC,4BAA4B;QAElD;QACA,OAAON;IACT;IAEA,MAAMO,iCAAiCzB,YAAoB,EAAiB;QAC1E,MAAM,EAAE6B,oBAAoB,EAAE,GAAG,MAAM,IAAI,CAACjD,aAAa,CAAC8B,qBAAqB;QAC/E,MAAMQ,mBAAmB,MAAM,IAAI,CAACC,oBAAoB,CAACnB;QACzD,MAAM8B,eAAeZ,iBAAiBa,mBAAmB;QAGzD,IAAIF,yBAAyB,CAAC,GAAG;YAC/B,IAAIC,gBAAgBD,sBAAsB;gBACxC,MAAM,IAAI,CAAChD,mBAAmB,CAACuB,0BAA0B,CAACc,iBAAiBxB,MAAM;gBACjF,MAAM,IAAIN,sCAAmB,CAC3B,mDACAC,yCAAiB,CAACmC,4BAA4B;YAElD;QACF;QAEA,MAAM,IAAI,CAAC3C,mBAAmB,CAACmD,0BAA0B,CAAChC,cAAc8B,eAAe;IACzF;IAEA,MAAMjC,aAAaH,MAAe,EAAE;QAClC,MAAM2B,OAAO,MAAM,IAAI,CAAC3C,WAAW,CAAC4C,OAAO,CAAC5B;QAC5C,IAAI,CAAC2B,MAAM;YACT,MAAM,IAAIjC,sCAAmB,CAAC,kBAAkBC,yCAAiB,CAACmC,4BAA4B;QAChG;QACA,IAAIH,KAAKY,mBAAmB,EAAE;YAC5B,MAAM,IAAI7C,sCAAmB,CAAC,4BAA4BC,yCAAiB,CAAC6C,sBAAsB;QACpG;QACA,IAAI,CAACb,KAAKc,UAAU,EAAE;YACpB,MAAM,IAAI/C,sCAAmB,CAAC,4BAA4BC,yCAAiB,CAAC+C,kBAAkB;QAChG;QACA,OAAO,IAAI,CAACzD,UAAU,CAACkB,YAAY,CAACH,QAAQ2B,KAAKrC,QAAQ;IAC3D;AACF"}
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/services/authentication/jwt.service.ts"],"names":["JwtService","constructor","settingsStore","configService","signJwtToken","userId","username","jwtSecret","jwtExpiresIn","getCredentialSettings","sign","expiresIn","subject","toString","audience","get","AppConstants","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","issuer","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER"],"mappings":";;;;+BAOaA;;;eAAAA;;;8BAPQ;iCACQ;AAMtB,MAAMA;;;IACXC,YACE,AAAiBC,aAA4B,EAC7C,AAAiBC,aAA6B,CAC9C;aAFiBD,gBAAAA;aACAC,gBAAAA;IAChB;IAEH,MAAMC,aAAaC,MAAc,EAAEC,QAAgB,EAAE;QACnD,MAAM,EAAEC,SAAS,EAAEC,YAAY,EAAE,GAAG,MAAM,IAAI,CAACN,aAAa,CAACO,qBAAqB;QAElF,OAAOC,IAAAA,kBAAI,EAAC;YAAEL;YAAQC;QAAS,GAAGC,WAAW;YAC3CI,WAAWH;YACXI,SAASP,OAAOQ,QAAQ;YACxBC,UAAU,IAAI,CAACX,aAAa,CAACY,GAAG,CAACC,6BAAY,CAACC,qBAAqB,EAAED,6BAAY,CAACE,oBAAoB;YACtGC,QAAQ,IAAI,CAAChB,aAAa,CAACY,GAAG,CAACC,6BAAY,CAACI,mBAAmB,EAAEJ,6BAAY,CAACK,kBAAkB;QAClG;IACF;AACF"}
1
+ {"version":3,"sources":["../../../src/services/authentication/jwt.service.ts"],"names":["JwtService","settingsStore","configService","signJwtToken","userId","username","jwtSecret","jwtExpiresIn","getCredentialSettings","sign","expiresIn","subject","toString","audience","get","AppConstants","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","issuer","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER"],"mappings":";;;;+BAOaA;;;eAAAA;;;8BAPQ;iCACQ;AAMtB,MAAMA;;;IACX,YACE,AAAiBC,aAA4B,EAC7C,AAAiBC,aAA6B,CAC9C;aAFiBD,gBAAAA;aACAC,gBAAAA;IAChB;IAEH,MAAMC,aAAaC,MAAc,EAAEC,QAAgB,EAAE;QACnD,MAAM,EAAEC,SAAS,EAAEC,YAAY,EAAE,GAAG,MAAM,IAAI,CAACN,aAAa,CAACO,qBAAqB;QAElF,OAAOC,IAAAA,kBAAI,EAAC;YAAEL;YAAQC;QAAS,GAAGC,WAAW;YAC3CI,WAAWH;YACXI,SAASP,OAAOQ,QAAQ;YACxBC,UAAU,IAAI,CAACX,aAAa,CAACY,GAAG,CAACC,6BAAY,CAACC,qBAAqB,EAAED,6BAAY,CAACE,oBAAoB;YACtGC,QAAQ,IAAI,CAAChB,aAAa,CAACY,GAAG,CAACC,6BAAY,CAACI,mBAAmB,EAAEJ,6BAAY,CAACK,kBAAkB;QAClG;IACF;AACF"}