@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
@@ -126,7 +126,6 @@ const SettingsSchema = new _mongoose.Schema({
126
126
  default: false,
127
127
  required: true
128
128
  },
129
- // TODO: Feature not fully tested/implemented yet
130
129
  whitelistEnabled: {
131
130
  type: Boolean,
132
131
  default: false,
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/models/Settings.ts"],"names":["Settings","SettingsSchema","Schema","wizardSettingKey","wizardCompleted","type","Boolean","default","required","wizardCompletedAt","Date","wizardVersion","Number","fileCleanSettingKey","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","credentialSettingsKey","jwtSecret","String","minlength","trim","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","createdAt","now","updatedAt","serverSettingsKey","sentryDiagnosticsEnabled","debugSettings","debugSocketIoEvents","debugSocketReconnect","debugSocketRetries","debugSocketSetup","debugSocketMessages","debugSocketIoBandwidth","loginRequired","registration","whitelistEnabled","whitelistedIpAddresses","frontendSettingKey","gridCols","gridRows","largeTiles","timeoutSettingKey","apiTimeout","model"],"mappings":";;;;+BA8NaA;;;eAAAA;;;0BA9NiB;yCAQvB;AA4DP,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,4CAAmB,CAAC,EAAE;QACrBC,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;YACAiB,WAAW;gBACTpB,MAAMK;gBACNH,SAASG,KAAKgB,GAAG;gBACjBlB,UAAU;YACZ;YACAmB,WAAW;gBACTtB,MAAMK;gBACNH,SAASG,KAAKgB,GAAG;gBACjBlB,UAAU;YACZ;QACF;QACAA,UAAU;IACZ;IACA,CAACoB,0CAAiB,CAAC,EAAE;QACnBC,0BAA0B;YACxBxB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAsB,eAAe;YACbC,qBAAqB;gBACnB1B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACAwB,sBAAsB;gBACpB3B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACAyB,oBAAoB;gBAClB5B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA0B,kBAAkB;gBAChB7B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA2B,qBAAqB;gBACnB9B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA4B,wBAAwB;gBACtB/B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;QACF;QACA6B,eAAe;YACbhC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACA8B,cAAc;YACZjC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACA,iDAAiD;QACjD+B,kBAAkB;YAChBlC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAgC,wBAAwB;YACtB;gBACEnC,MAAMc;YACR;SACD;IACH;IACA,CAACsB,2CAAkB,CAAC,EAAE;QACpBC,UAAU;YACRrC,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACAmC,UAAU;YACRtC,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACAoC,YAAY;YACVvC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACqC,0CAAiB,CAAC,EAAE;QACnBC,YAAY;YACVzC,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;AACF;AAEO,MAAMR,WAAW+C,IAAAA,eAAK,EAAC,kBAAkB9C"}
1
+ {"version":3,"sources":["../../src/models/Settings.ts"],"names":["Settings","SettingsSchema","Schema","wizardSettingKey","wizardCompleted","type","Boolean","default","required","wizardCompletedAt","Date","wizardVersion","Number","fileCleanSettingKey","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","credentialSettingsKey","jwtSecret","String","minlength","trim","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","createdAt","now","updatedAt","serverSettingsKey","sentryDiagnosticsEnabled","debugSettings","debugSocketIoEvents","debugSocketReconnect","debugSocketRetries","debugSocketSetup","debugSocketMessages","debugSocketIoBandwidth","loginRequired","registration","whitelistEnabled","whitelistedIpAddresses","frontendSettingKey","gridCols","gridRows","largeTiles","timeoutSettingKey","apiTimeout","model"],"mappings":";;;;+BA8NaA;;;eAAAA;;;0BA9NiB;yCAQvB;AA4DP,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,4CAAmB,CAAC,EAAE;QACrBC,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;YACAiB,WAAW;gBACTpB,MAAMK;gBACNH,SAASG,KAAKgB,GAAG;gBACjBlB,UAAU;YACZ;YACAmB,WAAW;gBACTtB,MAAMK;gBACNH,SAASG,KAAKgB,GAAG;gBACjBlB,UAAU;YACZ;QACF;QACAA,UAAU;IACZ;IACA,CAACoB,0CAAiB,CAAC,EAAE;QACnBC,0BAA0B;YACxBxB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAsB,eAAe;YACbC,qBAAqB;gBACnB1B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACAwB,sBAAsB;gBACpB3B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACAyB,oBAAoB;gBAClB5B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA0B,kBAAkB;gBAChB7B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA2B,qBAAqB;gBACnB9B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA4B,wBAAwB;gBACtB/B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;QACF;QACA6B,eAAe;YACbhC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACA8B,cAAc;YACZjC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QAEA+B,kBAAkB;YAChBlC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAgC,wBAAwB;YACtB;gBACEnC,MAAMc;YACR;SACD;IACH;IACA,CAACsB,2CAAkB,CAAC,EAAE;QACpBC,UAAU;YACRrC,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACAmC,UAAU;YACRtC,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACAoC,YAAY;YACVvC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACqC,0CAAiB,CAAC,EAAE;QACnBC,YAAY;YACVzC,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;AACF;AAEO,MAAMR,WAAW+C,IAAAA,eAAK,EAAC,kBAAkB9C"}
@@ -3,9 +3,7 @@ module.exports = {
3
3
  async up (db, client) {
4
4
  const session = client.startSession();
5
5
  try {
6
- // Safety first
7
6
  await session.withTransaction(async ()=>{
8
- // Do the migration
9
7
  const dbCollection = db.collection("printers");
10
8
  await dbCollection.updateMany({}, {
11
9
  $rename: {
@@ -25,9 +23,7 @@ module.exports = {
25
23
  async down (db, client) {
26
24
  const session = client.startSession();
27
25
  try {
28
- // Safety first
29
26
  await session.withTransaction(async ()=>{
30
- // Do the inverse migration
31
27
  const dbCollection = db.collection("printers");
32
28
  await dbCollection.updateMany({}, {
33
29
  $rename: {
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/mongo-migrations/20210713120034-printers-settingsapperance-apikey.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","dbCollection","collection","updateMany","$rename","settingsApperance","apikey","endSession","down","settingsAppearance","apiKey"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IACf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,eAAe;YACf,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,mBAAmB;gBACnB,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAEC,mBAAmB;oBAAqB;gBAAE;gBACzF,MAAMJ,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAEE,QAAQ;oBAAS;gBAAE;YACpE;QACF,SAAU;YACR,MAAMR,QAAQS,UAAU;QAC1B;IACF;IAEA,MAAMC,MAAKZ,EAAE,EAAEC,MAAM;QACnB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,eAAe;YACf,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,2BAA2B;gBAC3B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAEK,oBAAoB;oBAAoB;gBAAE;gBACzF,MAAMR,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAEM,QAAQ;oBAAS;gBAAE;YACpE;QACF,SAAU;YACR,MAAMZ,QAAQS,UAAU;QAC1B;IACF;AACF"}
1
+ {"version":3,"sources":["../../src/mongo-migrations/20210713120034-printers-settingsapperance-apikey.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","dbCollection","collection","updateMany","$rename","settingsApperance","apikey","endSession","down","settingsAppearance","apiKey"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IACf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YAEF,MAAMD,QAAQE,eAAe,CAAC;gBAE5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAEC,mBAAmB;oBAAqB;gBAAE;gBACzF,MAAMJ,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAEE,QAAQ;oBAAS;gBAAE;YACpE;QACF,SAAU;YACR,MAAMR,QAAQS,UAAU;QAC1B;IACF;IAEA,MAAMC,MAAKZ,EAAE,EAAEC,MAAM;QACnB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YAEF,MAAMD,QAAQE,eAAe,CAAC;gBAE5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAEK,oBAAoB;oBAAoB;gBAAE;gBACzF,MAAMR,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAEM,QAAQ;oBAAS;gBAAE;YACpE;QACF,SAAU;YACR,MAAMZ,QAAQS,UAAU;QAC1B;IACF;AACF"}
@@ -3,9 +3,7 @@ module.exports = {
3
3
  async up (db, client) {
4
4
  const session = client.startSession();
5
5
  try {
6
- // Safety first
7
6
  await session.withTransaction(async ()=>{
8
- // Do the migration
9
7
  const dbCollection = db.collection("printers");
10
8
  await dbCollection.updateMany({}, {
11
9
  $set: {
@@ -20,9 +18,7 @@ module.exports = {
20
18
  async down (db, client) {
21
19
  const session = client.startSession();
22
20
  try {
23
- // Safety first
24
21
  await session.withTransaction(async ()=>{
25
- // Do the migration (destructive!)
26
22
  const dbCollection = db.collection("printers");
27
23
  await dbCollection.updateMany({}, {
28
24
  unset: {
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/mongo-migrations/20210907173950-printers-enabled.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","dbCollection","collection","updateMany","$set","enabled","endSession","down","unset"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IACf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,eAAe;YACf,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,mBAAmB;gBACnB,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,MAAM;wBAAEC,SAAS;oBAAK;gBAAE;YAC9D;QACF,SAAU;YACR,MAAMP,QAAQQ,UAAU;QAC1B;IACF;IAEA,MAAMC,MAAKX,EAAE,EAAEC,MAAM;QACnB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,eAAe;YACf,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,kCAAkC;gBAClC,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEK,OAAO;wBAAEH,SAAS;oBAAG;gBAAE;YAC7D;QACF,SAAU;YACR,MAAMP,QAAQQ,UAAU;QAC1B;IACF;AACF"}
1
+ {"version":3,"sources":["../../src/mongo-migrations/20210907173950-printers-enabled.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","dbCollection","collection","updateMany","$set","enabled","endSession","down","unset"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IACf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YAEF,MAAMD,QAAQE,eAAe,CAAC;gBAE5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,MAAM;wBAAEC,SAAS;oBAAK;gBAAE;YAC9D;QACF,SAAU;YACR,MAAMP,QAAQQ,UAAU;QAC1B;IACF;IAEA,MAAMC,MAAKX,EAAE,EAAEC,MAAM;QACnB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YAEF,MAAMD,QAAQE,eAAe,CAAC;gBAE5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEK,OAAO;wBAAEH,SAAS;oBAAG;gBAAE;YAC7D;QACF,SAAU;YACR,MAAMP,QAAQQ,UAAU;QAC1B;IACF;AACF"}
@@ -3,9 +3,7 @@ module.exports = {
3
3
  async up (db, client) {
4
4
  const session = client.startSession();
5
5
  try {
6
- // Safety first
7
6
  await session.withTransaction(async ()=>{
8
- // Do the migration
9
7
  const dbCollection = db.collection("users");
10
8
  await dbCollection.updateMany({}, {
11
9
  $rename: {
@@ -20,9 +18,7 @@ module.exports = {
20
18
  async down (db, client) {
21
19
  const session = client.startSession();
22
20
  try {
23
- // Safety first
24
21
  await session.withTransaction(async ()=>{
25
- // Do the migration
26
22
  const dbCollection = db.collection("users");
27
23
  await dbCollection.updateMany({}, {
28
24
  $rename: {
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/mongo-migrations/20211029110742-user-password-passwordhash.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","dbCollection","collection","updateMany","$rename","password","endSession","down","passwordHash"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IACf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,eAAe;YACf,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,mBAAmB;gBACnB,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAEC,UAAU;oBAAe;gBAAE;YAC5E;QACF,SAAU;YACR,MAAMP,QAAQQ,UAAU;QAC1B;IACF;IAEA,MAAMC,MAAKX,EAAE,EAAEC,MAAM;QACnB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,eAAe;YACf,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,mBAAmB;gBACnB,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAEI,cAAc;oBAAW;gBAAE;YAC5E;QACF,SAAU;YACR,MAAMV,QAAQQ,UAAU;QAC1B;IACF;AACF"}
1
+ {"version":3,"sources":["../../src/mongo-migrations/20211029110742-user-password-passwordhash.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","dbCollection","collection","updateMany","$rename","password","endSession","down","passwordHash"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IACf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YAEF,MAAMD,QAAQE,eAAe,CAAC;gBAE5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAEC,UAAU;oBAAe;gBAAE;YAC5E;QACF,SAAU;YACR,MAAMP,QAAQQ,UAAU;QAC1B;IACF;IAEA,MAAMC,MAAKX,EAAE,EAAEC,MAAM;QACnB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YAEF,MAAMD,QAAQE,eAAe,CAAC;gBAE5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAEI,cAAc;oBAAW;gBAAE;YAC5E;QACF,SAAU;YACR,MAAMV,QAAQQ,UAAU;QAC1B;IACF;AACF"}
@@ -0,0 +1,35 @@
1
+ "use strict";
2
+ module.exports = {
3
+ async up (db, client) {
4
+ const session = client.startSession();
5
+ try {
6
+ await session.withTransaction(async ()=>{
7
+ const dbCollection = db.collection("printers");
8
+ await dbCollection.updateMany({}, {
9
+ $rename: {
10
+ "settingsAppearance.name": "name"
11
+ }
12
+ });
13
+ });
14
+ } finally{
15
+ await session.endSession();
16
+ }
17
+ },
18
+ async down (db, client) {
19
+ const session = client.startSession();
20
+ try {
21
+ await session.withTransaction(async ()=>{
22
+ const dbCollection = db.collection("printers");
23
+ await dbCollection.updateMany({}, {
24
+ $rename: {
25
+ name: "settingsAppearance.name"
26
+ }
27
+ });
28
+ });
29
+ } finally{
30
+ await session.endSession();
31
+ }
32
+ }
33
+ };
34
+
35
+ //# sourceMappingURL=20231111081809-printer-flatten-name.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../src/mongo-migrations/20231111081809-printer-flatten-name.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","dbCollection","collection","updateMany","$rename","endSession","down","name"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IACf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAE,2BAA2B;oBAAO;gBAAE;YACrF;QACF,SAAU;YACR,MAAMN,QAAQO,UAAU;QAC1B;IAIF;IAEA,MAAMC,MAAKV,EAAE,EAAEC,MAAM;QACnB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YAEF,MAAMD,QAAQE,eAAe,CAAC;gBAE5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,SAAS;wBAAEG,MAAM;oBAA0B;gBAAE;YACnF;QACF,SAAU;YACR,MAAMT,QAAQO,UAAU;QAC1B;IACF;AACF"}
@@ -0,0 +1,41 @@
1
+ "use strict";
2
+ module.exports = {
3
+ async up (db, client) {
4
+ const session = client.startSession();
5
+ try {
6
+ await session.withTransaction(async ()=>{
7
+ const dbCollection = db.collection("printers");
8
+ await dbCollection.updateMany({}, {
9
+ $unset: {
10
+ settingsAppearance: 1
11
+ }
12
+ });
13
+ });
14
+ } catch (e) {
15
+ console.log("Error executing up migration", e);
16
+ throw e;
17
+ } finally{
18
+ await session.endSession();
19
+ }
20
+ },
21
+ async down (db, client) {
22
+ const session = client.startSession();
23
+ try {
24
+ await session.withTransaction(async ()=>{
25
+ const dbCollection = db.collection("printers");
26
+ await dbCollection.updateMany({}, {
27
+ $set: {
28
+ settingsAppearance: {}
29
+ }
30
+ });
31
+ });
32
+ } catch (e) {
33
+ console.log("Error executing down migration", e);
34
+ throw e;
35
+ } finally{
36
+ await session.endSession();
37
+ }
38
+ }
39
+ };
40
+
41
+ //# sourceMappingURL=20231111082521-printer-remove-settingsappearance.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../src/mongo-migrations/20231111082521-printer-remove-settingsappearance.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","dbCollection","collection","updateMany","$unset","settingsAppearance","e","console","log","endSession","down","$set"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IACf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,QAAQ;wBAAEC,oBAAoB;oBAAE;gBAAE;YACxE;QACF,EAAE,OAAOC,GAAG;YACVC,QAAQC,GAAG,CAAC,gCAAgCF;YAC5C,MAAMA;QACR,SAAU;YACR,MAAMR,QAAQW,UAAU;QAC1B;IAIF;IAEA,MAAMC,MAAKd,EAAE,EAAEC,MAAM;QACnB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YAEF,MAAMD,QAAQE,eAAe,CAAC;gBAE5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEQ,MAAM;wBAAEN,oBAAoB,CAAC;oBAAE;gBAAE;YACvE;QACF,EAAE,OAAOC,GAAG;YACVC,QAAQC,GAAG,CAAC,kCAAkCF;YAC9C,MAAMA;QACR,SAAU;YACR,MAAMR,QAAQW,UAAU;QAC1B;IACF;AACF"}
@@ -18,40 +18,27 @@ const AppConstants = {
18
18
  DATABASE_FILE: "DATABASE_FILE",
19
19
  pm2ServiceName: "FDM",
20
20
  logAppName: "fdm-monster",
21
- // @Deprecated: old storage path
22
21
  defaultFileStorageFolder: "./media",
23
22
  defaultLogsFolder: "./media/logs",
24
23
  defaultLogZipsFolder: "./media/log-zips",
25
- // New place for all downloads, files etc
26
24
  defaultClientBundleStorage: "./media/client-dist",
27
25
  defaultClientBundleZipsStorage: "./media/client-dist-zips",
28
26
  defaultServerPort: 4000,
29
27
  defaultMongoStringUnauthenticated: "mongodb://127.0.0.1:27017/fdm-monster",
30
28
  apiRoute: "/api",
31
29
  enableClientDistAutoUpdateKey: "ENABLE_CLIENT_DIST_AUTO_UPDATE",
32
- // This whitelist feature is experimental and may be removed or altered in the future
33
30
  ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS: "ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS",
34
- // Boolean string (true/false), persisted always
35
31
  OVERRIDE_LOGIN_REQUIRED: "OVERRIDE_LOGIN_REQUIRED",
36
- // Boolean string (true/false), persisted always
37
32
  OVERRIDE_REGISTRATION_ENABLED: "OVERRIDE_REGISTRATION_ENABLED",
38
- // Number
39
33
  DEFAULT_USERNAME_MINLEN: 3,
40
- // Number
41
34
  DEFAULT_PASSWORD_MINLEN: 8,
42
- // String, persisted always
43
35
  OVERRIDE_JWT_SECRET: "OVERRIDE_JWT_SECRET",
44
- // Number, Seconds, persisted always
45
36
  OVERRIDE_JWT_EXPIRES_IN: "OVERRIDE_JWT_EXPIRES_IN",
46
37
  DEFAULT_JWT_EXPIRES_IN: 60 * 60,
47
- // Number
48
38
  DEFAULT_REFRESH_TOKEN_ATTEMPTS: -1,
49
- // Number, Milli-seconds
50
39
  DEFAULT_REFRESH_TOKEN_EXPIRY: 60 * 60 * 24 * 14,
51
- // String, not persisted
52
40
  OVERRIDE_JWT_ISSUER: "OVERRIDE_JWT_ISSUER",
53
41
  DEFAULT_JWT_ISSUER: "fdm-monster-server",
54
- // String, not persisted
55
42
  OVERRIDE_JWT_AUDIENCE: "OVERRIDE_JWT_AUDIENCE",
56
43
  DEFAULT_JWT_AUDIENCE: "fdm-monster-client",
57
44
  OVERRIDE_IS_DEMO_MODE: "OVERRIDE_IS_DEMO_MODE",
@@ -75,19 +62,16 @@ const AppConstants = {
75
62
  clientRepoName: "fdm-monster-client",
76
63
  serverRepoName: "fdm-monster",
77
64
  orgName: "fdm-monster",
78
- // Wizard version changes will trigger a re-run of the wizard
79
65
  currentWizardVersion: 1,
80
- defaultClientMinimum: "1.4.0",
66
+ defaultClientMinimum: "1.4.4",
81
67
  influxUrl: "INFLUX_URL",
82
68
  influxToken: "INFLUX_TOKEN",
83
69
  influxOrg: "INFLUX_ORG",
84
70
  influxBucket: "INFLUX_BUCKET",
85
- // Websocket values
86
71
  defaultWebsocketHandshakeTimeout: 3000,
87
72
  defaultSocketThrottleRate: 1,
88
73
  debugSocketStatesKey: "DEBUG_SOCKET_STATES",
89
74
  defaultDebugSocketStates: "false",
90
- // Future experimental feature
91
75
  enableMqttAutoDiscoveryToken: "ENABLE_MQTT_AUTODISCOVERY",
92
76
  enableMqttAutoDiscoveryDefault: "false",
93
77
  mqttUrlToken: "MQTT_HOST",
@@ -95,9 +79,7 @@ const AppConstants = {
95
79
  mqttPortDefault: 1883,
96
80
  mqttUsernameToken: "MQTT_USERNAME",
97
81
  mqttPasswordToken: "MQTT_PASSWORD",
98
- // MonsterPi
99
82
  monsterPiFilePath: "/etc/monsterpi_version",
100
- // Sentry
101
83
  sentryCustomDsnToken: "SENTRY_CUSTOM_DSN",
102
84
  sentryCustomDsnDefault: "https://164b8028a8a745bba3dbcab991b84ae7@o4503975545733120.ingest.sentry.io/4505101598261248",
103
85
  debugRoutesKey: "DEBUG_ROUTES",
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NON_NPM_MODE_KEY","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS","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","clientPackageName","clientRepoName","serverRepoName","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","enableExperimentalTypeormKey","enableExperimentalTypeormDefault"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,kBAAkB;IAClBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,WAAW;IACXC,eAAe;IACfC,eAAe;IAEfC,gBAAgB;IAChBC,YAAY;IAEZ,gCAAgC;IAChCC,0BAA0B;IAC1BC,mBAAmB;IACnBC,sBAAsB;IACtB,yCAAyC;IACzCC,4BAA4B;IAC5BC,gCAAgC;IAChCC,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAE/B,qFAAqF;IACrFC,wCAAwC;IACxC,gDAAgD;IAChDC,yBAAyB;IACzB,gDAAgD;IAChDC,+BAA+B;IAC/B,SAAS;IACTC,yBAAyB;IACzB,SAAS;IACTC,yBAAyB;IACzB,2BAA2B;IAC3BC,qBAAqB;IACrB,oCAAoC;IACpCC,yBAAyB;IACzBC,wBAAwB,KAAK;IAC7B,SAAS;IACTC,gCAAgC,CAAC;IACjC,wBAAwB;IACxBC,8BAA8B,KAAK,KAAK,KAAK;IAC7C,wBAAwB;IACxBC,qBAAqB;IACrBC,oBAAoB;IACpB,wBAAwB;IACxBC,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,mBAAmB;IACnBC,gBAAgB;IAChBC,gBAAgB;IAChBC,SAAS;IACT,6DAA6D;IAC7DC,sBAAsB;IACtBC,sBAAsB;IAEtBC,WAAW;IACXC,aAAa;IACbC,WAAW;IACXC,cAAc;IAEd,mBAAmB;IACnBC,kCAAkC;IAClCC,2BAA2B;IAC3BC,sBAAsB;IACtBC,0BAA0B;IAE1B,8BAA8B;IAC9BC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAEnB,YAAY;IACZC,mBAAmB;IAEnB,SAAS;IACTC,sBAAsB;IACtBC,wBAAwB;IAExBC,gBAAgB;IAEhBC,8BAA8B;IAC9BC,kCAAkC;AACpC"}
1
+ {"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NON_NPM_MODE_KEY","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS","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","clientPackageName","clientRepoName","serverRepoName","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","enableExperimentalTypeormKey","enableExperimentalTypeormDefault"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,kBAAkB;IAClBC,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,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,wCAAwC;IAExCC,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,mBAAmB;IACnBC,gBAAgB;IAChBC,gBAAgB;IAChBC,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,wBAAwB;IAExBC,gBAAgB;IAEhBC,8BAA8B;IAC9BC,kCAAkC;AACpC"}
@@ -8,11 +8,11 @@ Object.defineProperty(exports, "setupServer", {
8
8
  return setupServer;
9
9
  }
10
10
  });
11
- const _express = /*#__PURE__*/ _interop_require_wildcard(require("express"));
12
- const _cookieparser = /*#__PURE__*/ _interop_require_default(require("cookie-parser"));
13
- const _passport = /*#__PURE__*/ _interop_require_default(require("passport"));
14
- const _cors = /*#__PURE__*/ _interop_require_default(require("cors"));
15
- const _helmet = /*#__PURE__*/ _interop_require_default(require("helmet"));
11
+ const _express = _interop_require_wildcard(require("express"));
12
+ const _cookieparser = _interop_require_default(require("cookie-parser"));
13
+ const _passport = _interop_require_default(require("passport"));
14
+ const _cors = _interop_require_default(require("cors"));
15
+ const _helmet = _interop_require_default(require("helmet"));
16
16
  const _awilixexpress = require("awilix-express");
17
17
  const _container = require("./container");
18
18
  const _database = require("./middleware/database");
@@ -82,8 +82,7 @@ async function setupServer() {
82
82
  "anonymous"
83
83
  ], {
84
84
  session: false
85
- })).use((0, _awilixexpress.scopePerRequest)(container)).use(_database.interceptDatabaseError)// Global guards
86
- .use(_globalmiddleware.validateWhitelistedIp).use(_globalmiddleware.validateWizardCompleted).use(_globalmiddleware.interceptRoles);
85
+ })).use((0, _awilixexpress.scopePerRequest)(container)).use(_database.interceptDatabaseError).use(_globalmiddleware.validateWhitelistedIp).use(_globalmiddleware.validateWizardCompleted).use(_globalmiddleware.interceptRoles);
87
86
  return {
88
87
  httpServer,
89
88
  container
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/server.core.ts"],"names":["setupServer","httpServer","express","container","configureContainer","initializePassportStrategies","passport","use","cors","origin","methods","helmet","contentSecurityPolicy","json","limit","cookieParser","urlencoded","extended","initialize","authenticate","session","scopePerRequest","interceptDatabaseError","validateWhitelistedIp","validateWizardCompleted","interceptRoles"],"mappings":";;;;+BAWsBA;;;eAAAA;;;iEAXoB;qEACjB;iEACJ;6DACJ;+DACE;+BACa;2BACG;0BACI;kCACwC;2BAClC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEtC,eAAeA;IACpB,MAAMC,aAAaC,IAAAA,gBAAO;IAC1B,MAAMC,YAAYC,IAAAA,6BAAkB;IACpCC,IAAAA,uCAA4B,EAACC,iBAAQ,EAAEH;IAEvCF,WACGM,GAAG,CACFC,IAAAA,aAAI,EAAC;QACHC,QAAQ;QACRC,SAAS;IACX,IAEDH,GAAG,CACFI,IAAAA,eAAM,EAAC;QACLC,uBAAuB;IACzB,IAEDL,GAAG,CAACM,IAAAA,aAAI,EAAC;QAAEC,OAAO;IAAO,IACzBP,GAAG,CAACQ,IAAAA,qBAAY,KAChBR,GAAG,CAACS,IAAAA,mBAAU,EAAC;QAAEC,UAAU;IAAM,IACjCV,GAAG,CAACD,iBAAQ,CAACY,UAAU,IACvBX,GAAG,CAACD,iBAAQ,CAACa,YAAY,CAAC;QAAC;QAAO;KAAY,EAAE;QAAEC,SAAS;IAAM,IACjEb,GAAG,CAACc,IAAAA,8BAAe,EAAClB,YACpBI,GAAG,CAACe,gCAAsB,CAC3B,gBAAgB;KACff,GAAG,CAACgB,uCAAqB,EACzBhB,GAAG,CAACiB,yCAAuB,EAC3BjB,GAAG,CAACkB,gCAAc;IAErB,OAAO;QACLxB;QACAE;IACF;AACF"}
1
+ {"version":3,"sources":["../src/server.core.ts"],"names":["setupServer","httpServer","express","container","configureContainer","initializePassportStrategies","passport","use","cors","origin","methods","helmet","contentSecurityPolicy","json","limit","cookieParser","urlencoded","extended","initialize","authenticate","session","scopePerRequest","interceptDatabaseError","validateWhitelistedIp","validateWizardCompleted","interceptRoles"],"mappings":";;;;+BAWsBA;;;eAAAA;;;mDAXoB;uDACjB;mDACJ;+CACJ;iDACE;+BACa;2BACG;0BACI;kCACwC;2BAClC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEtC,eAAeA;IACpB,MAAMC,aAAaC,IAAAA,gBAAO;IAC1B,MAAMC,YAAYC,IAAAA,6BAAkB;IACpCC,IAAAA,uCAA4B,EAACC,iBAAQ,EAAEH;IAEvCF,WACGM,GAAG,CACFC,IAAAA,aAAI,EAAC;QACHC,QAAQ;QACRC,SAAS;IACX,IAEDH,GAAG,CACFI,IAAAA,eAAM,EAAC;QACLC,uBAAuB;IACzB,IAEDL,GAAG,CAACM,IAAAA,aAAI,EAAC;QAAEC,OAAO;IAAO,IACzBP,GAAG,CAACQ,IAAAA,qBAAY,KAChBR,GAAG,CAACS,IAAAA,mBAAU,EAAC;QAAEC,UAAU;IAAM,IACjCV,GAAG,CAACD,iBAAQ,CAACY,UAAU,IACvBX,GAAG,CAACD,iBAAQ,CAACa,YAAY,CAAC;QAAC;QAAO;KAAY,EAAE;QAAEC,SAAS;IAAM,IACjEb,GAAG,CAACc,IAAAA,8BAAe,EAAClB,YACpBI,GAAG,CAACe,gCAAsB,EAE1Bf,GAAG,CAACgB,uCAAqB,EACzBhB,GAAG,CAACiB,yCAAuB,EAC3BjB,GAAG,CAACkB,gCAAc;IAErB,OAAO;QACLxB;QACAE;IACF;AACF"}
@@ -37,7 +37,7 @@ _export(exports, {
37
37
  const _migratemongo = require("migrate-mongo");
38
38
  const _path = require("path");
39
39
  const _child_process = require("child_process");
40
- const _node = /*#__PURE__*/ _interop_require_wildcard(require("@sentry/node"));
40
+ const _node = _interop_require_wildcard(require("@sentry/node"));
41
41
  const _dotenv = require("dotenv");
42
42
  const _serverconstants = require("./server.constants");
43
43
  const _logger = require("./handlers/logger");
@@ -86,8 +86,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
86
86
  return newObj;
87
87
  }
88
88
  const logger = new _logger.LoggerService("FDM-Environment", false);
89
- // Constants and definition
90
- const instructionsReferralURL = "https://github.com/fdm-monster/fdm-monster/blob/master/README.md";
89
+ const instructionsReferralURL = "https://docs.fdm-monster.net";
91
90
  const packageJsonPath = (0, _path.join)((0, _fsutils.superRootPath)(), "./package.json");
92
91
  const dotEnvPath = (0, _path.join)((0, _fsutils.superRootPath)(), "./.env");
93
92
  function isEnvTest() {
@@ -96,10 +95,7 @@ function isEnvTest() {
96
95
  function isEnvProd() {
97
96
  return process.env[_serverconstants.AppConstants.NODE_ENV_KEY] === _serverconstants.AppConstants.defaultProductionEnv;
98
97
  }
99
- /**
100
- * Set and write the environment name to file, if applicable
101
-
102
- */ function ensureNodeEnvSet() {
98
+ function ensureNodeEnvSet() {
103
99
  const environment = process.env[_serverconstants.AppConstants.NODE_ENV_KEY];
104
100
  if (!environment || !_serverconstants.AppConstants.knownEnvNames.includes(environment)) {
105
101
  const newEnvName = _serverconstants.AppConstants.defaultProductionEnv;
@@ -109,9 +105,7 @@ function isEnvProd() {
109
105
  logger.log(`✓ NODE_ENV variable correctly set (${environment})!`);
110
106
  }
111
107
  }
112
- /**
113
- * Ensures that `process.env[AppConstants.VERSION_KEY]` is never undefined
114
- */ function ensureEnvNpmVersionSet() {
108
+ function ensureEnvNpmVersionSet() {
115
109
  const packageJsonVersion = require(packageJsonPath).version;
116
110
  if (!process.env[_serverconstants.AppConstants.VERSION_KEY]) {
117
111
  process.env[_serverconstants.AppConstants.VERSION_KEY] = packageJsonVersion;
@@ -133,16 +127,13 @@ function setupPackageJsonVersionOrThrow() {
133
127
  const result = (0, _envutils.verifyPackageJsonRequirements)((0, _fsutils.superRootPath)());
134
128
  if (!result) {
135
129
  if ((0, _envutils.isPm2)()) {
136
- // TODO test this works under docker as well
137
130
  removePm2Service("didnt pass startup validation (package.json)");
138
131
  }
139
132
  throw new Error(`Aborting server.`);
140
133
  }
141
134
  }
142
- /**
143
- * Print out instructions URL
144
- */ function printInstructionsURL() {
145
- logger.log(`Please make sure to read ${instructionsReferralURL} on how to configure your environment correctly.`);
135
+ function printInstructionsURL() {
136
+ logger.log(`Please make sure to read ${instructionsReferralURL} for more information.`);
146
137
  }
147
138
  function fetchMongoDBConnectionString() {
148
139
  if (!process.env[_serverconstants.AppConstants.MONGO_KEY]) {
@@ -155,7 +146,6 @@ function fetchMongoDBConnectionString() {
155
146
  function fetchServerPort() {
156
147
  let port = process.env[_serverconstants.AppConstants.SERVER_PORT_KEY];
157
148
  if (Number.isNaN(parseInt(port))) {
158
- // Update config immediately
159
149
  process.env[_serverconstants.AppConstants.SERVER_PORT_KEY] = _serverconstants.AppConstants.defaultServerPort.toString();
160
150
  port = process.env[_serverconstants.AppConstants.SERVER_PORT_KEY];
161
151
  }
@@ -181,7 +171,6 @@ function setupSentry() {
181
171
  process.on("unhandledRejection", (e)=>{
182
172
  const message = `Unhandled rejection error - ${(0, _errorutils.errorSummary)(e)}`;
183
173
  logger.error(message);
184
- // The server must not crash
185
174
  _node.captureException(e);
186
175
  });
187
176
  }
@@ -195,7 +184,6 @@ function ensurePortSet() {
195
184
  }
196
185
  function setupEnvConfig(skipDotEnv = false) {
197
186
  if (!skipDotEnv) {
198
- // This needs to be CWD of app.js, so be careful not to move this call.
199
187
  (0, _dotenv.config)({
200
188
  path: dotEnvPath
201
189
  });
@@ -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","ensureEnvNpmVersionSet","packageJsonVersion","require","version","VERSION_KEY","NON_NPM_MODE_KEY","debug","removePm2Service","reason","error","execSync","pm2ServiceName","setupPackageJsonVersionOrThrow","result","verifyPackageJsonRequirements","isPm2","Error","printInstructionsURL","MONGO_KEY","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","captureException","skipDotEnv","config","path","db","client","migrationsStatus","status","pendingMigrations","filter","m","appliedAt","length","migrationResult","up"],"mappings":"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"}
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","ensureEnvNpmVersionSet","packageJsonVersion","require","version","VERSION_KEY","NON_NPM_MODE_KEY","debug","removePm2Service","reason","error","execSync","pm2ServiceName","setupPackageJsonVersionOrThrow","result","verifyPackageJsonRequirements","isPm2","Error","printInstructionsURL","MONGO_KEY","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","captureException","skipDotEnv","config","path","db","client","migrationsStatus","status","pendingMigrations","filter","m","appliedAt","length","migrationResult","up"],"mappings":"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"}
@@ -8,9 +8,9 @@ Object.defineProperty(exports, "ServerHost", {
8
8
  return ServerHost;
9
9
  }
10
10
  });
11
- const _express = /*#__PURE__*/ _interop_require_default(require("express"));
12
- const _mongoose = /*#__PURE__*/ _interop_require_default(require("mongoose"));
13
- const _connecthistoryapifallback = /*#__PURE__*/ _interop_require_default(require("connect-history-api-fallback"));
11
+ const _express = _interop_require_default(require("express"));
12
+ const _mongoose = _interop_require_default(require("mongoose"));
13
+ const _connecthistoryapifallback = _interop_require_default(require("connect-history-api-fallback"));
14
14
  const _awilixexpress = require("awilix-express");
15
15
  const _path = require("path");
16
16
  const _exceptionfilter = require("./middleware/exception.filter");
@@ -30,16 +30,17 @@ class ServerHost {
30
30
  socketIoGateway;
31
31
  appInstance = null;
32
32
  configService;
33
+ isTypeormMode;
33
34
  logger;
34
- constructor({ loggerFactory, bootTask, taskManagerService, socketIoGateway, configService }){
35
+ constructor({ loggerFactory, bootTask, taskManagerService, socketIoGateway, configService, isTypeormMode }){
35
36
  this.logger = loggerFactory(ServerHost.name);
36
37
  this.bootTask = bootTask;
37
38
  this.taskManagerService = taskManagerService;
38
39
  this.socketIoGateway = socketIoGateway;
39
40
  this.configService = configService;
41
+ this.isTypeormMode = isTypeormMode;
40
42
  }
41
43
  async boot(app, quick_boot = false, listenRequests = true) {
42
- // Enforce models to be strictly applied, any unknown property will not be persisted
43
44
  _mongoose.default.set("strictQuery", true);
44
45
  this.appInstance = app;
45
46
  this.serveControllerRoutes(this.appInstance);
@@ -53,7 +54,6 @@ class ServerHost {
53
54
  }
54
55
  serveControllerRoutes(app) {
55
56
  const routePath = "./controllers";
56
- // Catches any HTML request to paths like / or file/ as long as its text/html
57
57
  app.use((req, res, next)=>{
58
58
  if (!req.originalUrl.startsWith("/api") && !req.originalUrl.startsWith("/socket.io")) {
59
59
  (0, _connecthistoryapifallback.default)()(req, res, next);
@@ -64,10 +64,8 @@ class ServerHost {
64
64
  cwd: __dirname,
65
65
  ignore: "**/*.map"
66
66
  })).use(_exceptionfilter.exceptionFilter);
67
- // Serve the files for our frontend - do this later than the controllers
68
67
  const bundleDistPath = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultClientBundleStorage, "dist");
69
68
  app.use(_express.default.static(bundleDistPath));
70
- // Backup client in node_modules
71
69
  const backupClientPath = (0, _path.join)((0, _fsutils.superRootPath)(), "node_modules", _serverconstants.AppConstants.clientPackageName, "dist");
72
70
  app.use(_express.default.static(backupClientPath));
73
71
  app.get("*", (req, res)=>{
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/server.host.ts"],"names":["ServerHost","bootTask","taskManagerService","socketIoGateway","appInstance","configService","logger","constructor","loggerFactory","name","boot","app","quick_boot","listenRequests","mongoose","set","serveControllerRoutes","runOnce","httpListen","hasConnected","connections","readyState","routePath","use","req","res","next","originalUrl","startsWith","history","loadControllers","cwd","__dirname","ignore","exceptionFilter","bundleDistPath","join","superRootPath","AppConstants","defaultClientBundleStorage","express","static","backupClientPath","clientPackageName","get","path","resource","endsWith","error","NotFoundException","port","fetchServerPort","isProductionEnvironment","debugRoutesKey","expressListRoutes","require","prefix","Number","isNaN","parseInt","Error","hostOrFqdn","server","listen","log","attachServer"],"mappings":"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"}
1
+ {"version":3,"sources":["../src/server.host.ts"],"names":["ServerHost","bootTask","taskManagerService","socketIoGateway","appInstance","configService","isTypeormMode","logger","constructor","loggerFactory","name","boot","app","quick_boot","listenRequests","mongoose","set","serveControllerRoutes","runOnce","httpListen","hasConnected","connections","readyState","routePath","use","req","res","next","originalUrl","startsWith","history","loadControllers","cwd","__dirname","ignore","exceptionFilter","bundleDistPath","join","superRootPath","AppConstants","defaultClientBundleStorage","express","static","backupClientPath","clientPackageName","get","path","resource","endsWith","error","NotFoundException","port","fetchServerPort","isProductionEnvironment","debugRoutesKey","expressListRoutes","require","prefix","Number","isNaN","parseInt","Error","hostOrFqdn","server","listen","log","attachServer"],"mappings":"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"}
@@ -17,24 +17,8 @@ class AuthService {
17
17
  jwtService;
18
18
  settingsStore;
19
19
  refreshTokenService;
20
- /**
21
- * When users are blacklisted at runtime, this cache can make quick work of rejecting them
22
- */ blacklistedJwtCache = {};
23
- /**
24
- * loginUser: starts new session: id-token, refresh, removing any old refresh
25
- * logoutUser: ends session, removes refresh token and blacklists userId
26
- * renewLoginByRefreshToken: renews session, reduces refresh attempts
27
- * addBlackListEntry: private, adds a blacklisted entry after logout
28
- * removeBlacklistEntry: private, removes a blacklisted entry
29
- * logoutUser
30
- * signJwtToken: private, purely signs a new jwt token
31
- */ /**
32
- * cool features: faking other user logins (encapsulated login? Double login?)
33
- * registration link
34
- * loginUser: username/password based login
35
- * blacklist: forcing all existing refresh tokens and jwts to be rejected of that user until login
36
- * refreshAttempts => integer in setting with cap?
37
- */ constructor({ userService, jwtService, loggerFactory, settingsStore, refreshTokenService }){
20
+ blacklistedJwtCache = {};
21
+ constructor({ userService, jwtService, loggerFactory, settingsStore, refreshTokenService }){
38
22
  this.userService = userService;
39
23
  this.jwtService = jwtService;
40
24
  this.logger = loggerFactory(AuthService.name);
@@ -100,7 +84,6 @@ class AuthService {
100
84
  await this.refreshTokenService.deleteRefreshToken(refreshToken);
101
85
  throw new _runtimeexceptions.AuthenticationError("User not found", _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredRefreshToken);
102
86
  }
103
- // If the user is not found at this point, then the user was deleted
104
87
  const token = await this.signJwtToken(userId);
105
88
  await this.increaseRefreshTokenAttemptsUsed(userRefreshToken.refreshToken);
106
89
  return token;
@@ -123,7 +106,6 @@ class AuthService {
123
106
  const { refreshTokenAttempts } = await this.settingsStore.getCredentialSettings();
124
107
  const userRefreshToken = await this.getValidRefreshToken(refreshToken);
125
108
  const attemptsUsed = userRefreshToken.refreshAttemptsUsed;
126
- // If no attempts are set, then we don't care about attempts
127
109
  if (refreshTokenAttempts !== -1) {
128
110
  if (attemptsUsed >= refreshTokenAttempts) {
129
111
  await this.refreshTokenService.deleteRefreshTokenByUserId(userRefreshToken.userId.toString());
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/services/authentication/auth.service.ts"],"names":["AuthService","logger","userService","jwtService","settingsStore","refreshTokenService","blacklistedJwtCache","constructor","loggerFactory","name","loginUser","username","password","userDoc","findRawByUsername","AuthenticationError","AUTH_ERROR_REASON","IncorrectCredentials","result","comparePasswordHash","passwordHash","userId","id","toString","token","signJwtToken","purgeOutdatedRefreshTokensByUserId","purgeOutdatedBlacklistedJwtCache","refreshToken","createRefreshTokenForUserId","logoutUserId","jwtToken","deleteRefreshTokenByUserId","length","createdAt","Date","now","jwtExpiresIn","getCredentialSettings","keys","Object","key","err","error","logoutUserRefreshToken","userRefreshToken","getValidRefreshToken","renewLoginByRefreshToken","InvalidOrExpiredRefreshToken","user","getUser","deleteRefreshToken","increaseRefreshTokenAttemptsUsed","isJwtTokenBlacklisted","throwNotFoundError","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","userService","jwtService","settingsStore","refreshTokenService","blacklistedJwtCache","constructor","loggerFactory","name","loginUser","username","password","userDoc","findRawByUsername","AuthenticationError","AUTH_ERROR_REASON","IncorrectCredentials","result","comparePasswordHash","passwordHash","userId","id","toString","token","signJwtToken","purgeOutdatedRefreshTokensByUserId","purgeOutdatedBlacklistedJwtCache","refreshToken","createRefreshTokenForUserId","logoutUserId","jwtToken","deleteRefreshTokenByUserId","length","createdAt","Date","now","jwtExpiresIn","getCredentialSettings","keys","Object","key","err","error","logoutUserRefreshToken","userRefreshToken","getValidRefreshToken","renewLoginByRefreshToken","InvalidOrExpiredRefreshToken","user","getUser","deleteRefreshToken","increaseRefreshTokenAttemptsUsed","isJwtTokenBlacklisted","throwNotFoundError","getRefreshToken","expiresAt","refreshTokenAttempts","attemptsUsed","refreshAttemptsUsed","updateRefreshTokenAttempts","needsPasswordChange","PasswordChangeRequired","isVerified","AccountNotVerified"],"mappings":"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"}
@@ -24,7 +24,7 @@ class JwtService {
24
24
  username
25
25
  }, jwtSecret, {
26
26
  expiresIn: jwtExpiresIn,
27
- subject: userId,
27
+ subject: userId.toString(),
28
28
  audience: this.configService.get(_serverconstants.AppConstants.OVERRIDE_JWT_AUDIENCE, _serverconstants.AppConstants.DEFAULT_JWT_AUDIENCE),
29
29
  issuer: this.configService.get(_serverconstants.AppConstants.OVERRIDE_JWT_ISSUER, _serverconstants.AppConstants.DEFAULT_JWT_ISSUER)
30
30
  });
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/services/authentication/jwt.service.ts"],"names":["JwtService","settingsStore","configService","constructor","signJwtToken","userId","username","jwtSecret","jwtExpiresIn","getCredentialSettings","sign","expiresIn","subject","audience","get","AppConstants","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","issuer","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER"],"mappings":";;;;+BAOaA;;;eAAAA;;;8BAPQ;iCACQ;AAMtB,MAAMA;IACXC,cAA6B;IAC7BC,cAA8B;IAE9BC,YAAY,EAAEF,aAAa,EAAEC,aAAa,EAAmE,CAAE;QAC7G,IAAI,CAACD,aAAa,GAAGA;QACrB,IAAI,CAACC,aAAa,GAAGA;IACvB;IAEA,MAAME,aAAaC,MAAc,EAAEC,QAAgB,EAAE;QACnD,MAAM,EAAEC,SAAS,EAAEC,YAAY,EAAE,GAAG,MAAM,IAAI,CAACP,aAAa,CAACQ,qBAAqB;QAElF,OAAOC,IAAAA,kBAAI,EAAC;YAAEL;YAAQC;QAAS,GAAGC,WAAW;YAC3CI,WAAWH;YACXI,SAASP;YACTQ,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","constructor","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,cAA6B;IAC7BC,cAA8B;IAE9BC,YAAY,EAAEF,aAAa,EAAEC,aAAa,EAAmE,CAAE;QAC7G,IAAI,CAACD,aAAa,GAAGA;QACrB,IAAI,CAACC,aAAa,GAAGA;IACvB;IAEA,MAAME,aAAaC,MAAc,EAAEC,QAAgB,EAAE;QACnD,MAAM,EAAEC,SAAS,EAAEC,YAAY,EAAE,GAAG,MAAM,IAAI,CAACP,aAAa,CAACQ,qBAAqB;QAElF,OAAOC,IAAAA,kBAAI,EAAC;YAAEL;YAAQC;QAAS,GAAGC,WAAW;YAC3CI,WAAWH;YAEXI,SAASP,OAAOQ,QAAQ;YACxBC,UAAU,IAAI,CAACZ,aAAa,CAACa,GAAG,CAACC,6BAAY,CAACC,qBAAqB,EAAED,6BAAY,CAACE,oBAAoB;YACtGC,QAAQ,IAAI,CAACjB,aAAa,CAACa,GAAG,CAACC,6BAAY,CAACI,mBAAmB,EAAEJ,6BAAY,CAACK,kBAAkB;QAClG;IACF;AACF"}