@fdm-monster/server 1.8.0 β†’ 1.8.2

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 (31) hide show
  1. package/.yarn/install-state.gz +0 -0
  2. package/.yarn/releases/{yarn-4.5.3.cjs β†’ yarn-4.6.0.cjs} +287 -287
  3. package/.yarnrc.yml +1 -1
  4. package/README.md +64 -60
  5. package/RELEASE_NOTES.MD +29 -0
  6. package/dist/container.js +0 -4
  7. package/dist/container.js.map +1 -1
  8. package/dist/container.tokens.js +0 -2
  9. package/dist/container.tokens.js.map +1 -1
  10. package/dist/controllers/server-private.controller.js +5 -17
  11. package/dist/controllers/server-private.controller.js.map +1 -1
  12. package/dist/controllers/server-public.controller.js +0 -2
  13. package/dist/controllers/server-public.controller.js.map +1 -1
  14. package/dist/server.constants.js +1 -2
  15. package/dist/server.constants.js.map +1 -1
  16. package/dist/server.env.js +3 -25
  17. package/dist/server.env.js.map +1 -1
  18. package/dist/services/core/yaml.service.js +1 -1
  19. package/dist/services/core/yaml.service.js.map +1 -1
  20. package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
  21. package/dist/services/octoprint/octoprint.client.js +1 -1
  22. package/dist/services/octoprint/octoprint.client.js.map +1 -1
  23. package/dist/services/validators/yaml-service.validation.js +1 -1
  24. package/dist/services/validators/yaml-service.validation.js.map +1 -1
  25. package/dist/tasks/boot.task.js +1 -2
  26. package/dist/tasks/boot.task.js.map +1 -1
  27. package/dist/utils/env.utils.js +0 -42
  28. package/dist/utils/env.utils.js.map +1 -1
  29. package/package.json +26 -42
  30. package/dist/services/core/server-update.service.js +0 -71
  31. package/dist/services/core/server-update.service.js.map +0 -1
package/.yarnrc.yml CHANGED
@@ -1,4 +1,4 @@
1
1
  nodeLinker: node-modules
2
2
 
3
- yarnPath: .yarn/releases/yarn-4.5.3.cjs
3
+ yarnPath: .yarn/releases/yarn-4.6.0.cjs
4
4
  httpTimeout: 1000000
package/README.md CHANGED
@@ -4,79 +4,85 @@
4
4
  </a>
5
5
  </p>
6
6
  <h1 align="center" style="padding-top: 0; margin-top: 10px">FDM Monster</h1>
7
-
8
7
  <p align="center">
9
- <a href="https://discord.gg/mwA8uP8CMc">
10
- <img src="https://img.shields.io/discord/864835453773807686?label=Discord"/>
11
- </a>
12
- <a href="https://github.com/fdm-monster/fdm-monster/releases/latest">
13
- <img src="https://img.shields.io/github/release/fdm-monster/fdm-monster"/>
14
- </a>
15
- <a href="https://github.com/fdm-monster/fdm-monster/stargazers">
16
- <img src="https://img.shields.io/github/stars/fdm-monster/fdmonster"/>
17
- </a>
18
-
19
- <a href="https://github.com/fdm-monster/fdm-monster/issues">
20
- <img src="https://img.shields.io/github/issues/fdm-monster/fdm-monster"/>
21
- </a>
22
- <a href="https://app.codecov.io/gh/fdm-monster/fdm-monster">
23
- <img src="https://codecov.io/gh/fdm-monster/fdm-monster/branch/develop/graph/badge.svg?flag=server-nodejs&precision=0"/>
24
- </a>
25
- <br/>
26
- <a href="https://unraid.net/community/apps?q=fdm+monster">
27
- <img src="https://img.shields.io/badge/Unraid%20Community%20Application-fc832e"/>
28
- </a>
29
-
8
+ <a href="https://discord.gg/mwA8uP8CMc"><img src="https://img.shields.io/discord/864835453773807686?label=Discord&logo=discord"/></a>
9
+ <a href="https://github.com/fdm-monster/fdm-monster/releases/latest">
10
+ <img src="https://img.shields.io/github/release/fdm-monster/fdm-monster"/></a>
11
+ <a href="https://github.com/fdm-monster/fdm-monster/stargazers">
12
+ <img src="https://img.shields.io/github/stars/fdm-monster/fdmonster"/></a>
13
+ <a href="https://github.com/fdm-monster/fdm-monster/issues">
14
+ <img src="https://img.shields.io/github/issues/fdm-monster/fdm-monster"/></a>
15
+ <a href="https://app.codecov.io/gh/fdm-monster/fdm-monster">
16
+ <img src="https://codecov.io/gh/fdm-monster/fdm-monster/branch/develop/graph/badge.svg?flag=server-nodejs&precision=0"/></a>
17
+ <br/>
18
+ <a href="https://unraid.net/community/apps?q=fdm+monster">
19
+ <img src="https://img.shields.io/badge/Unraid%20Community%20Application-fc832e"/>
20
+ </a>
30
21
  </p>
31
22
 
32
- ## Support the project
23
+ FDM Monster is a server for managing your 3D printer farm through [OctoPrint](https://octoprint.org/) as well as [Klipper](https://www.klipper3d.org/) using [Moonraker](https://github.com/Arksine/moonraker).
33
24
 
34
- Github ![GitHub Sponsor](https://img.shields.io/github/sponsors/fdm-monster?label=Sponsor&logo=GitHub)
25
+ ## Check out our [documentation](https://docs.fdm-monster.net)
35
26
 
36
- Ko-Fi [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/V7V6XFWY0)
27
+ ![fdm-monster-main-grid](https://github.com/user-attachments/assets/4137d8d6-0365-44db-b9a9-53e3820a4cb3)
37
28
 
38
- <h2 align="center">
39
- <a href="https://docs.fdm-monster.net/" target="_blank">Documentation</a>
40
- </h2>
29
+ ## Features πŸ–¨οΈ
30
+ Here is a list of features that make FDM Monster stand out:
41
31
 
42
- ## What is FDM Monster?
32
+ - Adding OctoPrint and Moonraker instances
33
+ - Dragging or creating new printers on a customizable grid
34
+ - Drag n drop GCode to print
35
+ - Select printers and print one GCode file in batch
36
+ - Marking printers as 'under maintenance'
37
+ - Import printers from software like OctoFarm
38
+ - YAML backup and import
39
+ - Thumbnail support
40
+ - SQLite as well as MongoDB support
43
41
 
44
- FDM Monster is a server for managing your 3D printer farm through [OctoPrint](https://octoprint.org/).
45
- Our efforts are focused on providing a professional print-farming workflow that is suitable for hobby and commercial farms alike.
42
+ ## Installation methods βš™οΈ
46
43
 
47
- This server has been battle-tested in the field for 100+ printers, so give it a star ⭐and enhance your 3D Printing Farm's workflow!
48
-
49
- ## Features
50
- - Adding OctoPrint instances
51
- - Dragging printers on grid
52
- - Dropping GCode to print
53
- - Batch select and print GCode
54
- - Marking printers as maintenance mode
55
- - Import printers from OctoFarm
44
+ - [Docker image](https://hub.docker.com/r/fdmmonster/fdm-monster)
56
45
  - [Raspberry Pi image MonsterPi](https://docs.fdm-monster.net/guides/monsterpi)
46
+ - [Unraid Community App](https://unraid.net/community/apps?q=fdm+monster)
57
47
 
58
- ![docs/images/server-running.png](https://raw.githubusercontent.com/fdm-monster/fdm-monster-docs/main/docs/images/server-running.png)
59
- _The FDM Monster grid after placing one OctoPrint instance._
48
+ Would you like to add a method of running FDM Monster? Please reach out or create an issue/pull-request!
60
49
 
61
- ## Getting started
50
+ ## Getting started 😎
62
51
 
63
- Check out the [Documentation](https://docs.fdm-monster.net). Are you interested in running the Raspberry Pi image?
52
+ Check out the [documentation](https://docs.fdm-monster.net) to install or deploy FDM Monster for your farm. Are you interested in running the Raspberry Pi image?
64
53
  Please jump ahead [MonsterPi Section](https://docs.fdm-monster.net/guides/monsterpi).
65
54
 
66
- ### Reach out for questions
55
+ ## Reach out for questions or ideas ❔
67
56
 
68
57
  Please join the discord, but stay professional and proactive!
69
58
 
70
59
  - Discord server: https://discord.gg/mwA8uP8CMc
71
60
  - Website: [https://fdm-monster.net](https://fdm-monster.net)
72
- - Mail: davidzwa@gmail.com
61
+
62
+ ## Support the project πŸ’Έ
63
+
64
+ Is the project helping you? Please consider these options. FDM Monster would not exist without all your support!
65
+
66
+ ![GitHub Sponsor](https://img.shields.io/github/sponsors/fdm-monster?label=Sponsor&logo=GitHub)
67
+ [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/V7V6XFWY0)
68
+
69
+ ## Sponsors 🀩
70
+
71
+ Please consider sponsoring FDM Monster to help this project! You can find the [GitHub Sponsorship Tiers here](https://github.com/sponsors/fdm-monster).
72
+
73
+ Thanks to the following parties for their financial support:
74
+
75
+ | Tier 1 | Tier 2 | Tier 3 | Tier 4 | One time |
76
+ |--------|--------|--------|--------|-----------|
77
+ | | [WindArrow3d](https://github.com/WindArrow3d), [thatguymendel](https://github.com/thatguymendel) | | [doucettom](https://github.com/doucettom) | [th3dstudio](https://github.com/th3dstudio) |
78
+
73
79
 
74
80
  ## Contributors ✨
75
81
 
76
82
  These are the people involved in the project. Find the meaning of the emoji keys [here](https://allcontributors.org/docs/en/emoji-key).
77
83
 
78
84
  <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
79
- [![All Contributors](https://img.shields.io/badge/all_contributors-19-orange.svg?style=flat-square)](#contributors-)
85
+ [![All Contributors](https://img.shields.io/badge/all_contributors-22-orange.svg?style=flat-square)](#contributors-)
80
86
  <!-- ALL-CONTRIBUTORS-BADGE:END -->
81
87
 
82
88
  <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
@@ -108,6 +114,11 @@ These are the people involved in the project. Find the meaning of the emoji keys
108
114
  <td align="center" valign="top" width="14.28%"><a href="https://github.com/LyfeOnEdge"><img src="https://avatars.githubusercontent.com/u/26140376?v=4?s=80" width="80px;" alt="Andrew (LyfeOnEdge) (ArcticGentoo)"/><br /><sub><b>Andrew (LyfeOnEdge) (ArcticGentoo)</b></sub></a><br /><a href="#ideas-LyfeOnEdge" title="Ideas, Planning, & Feedback">πŸ€”</a></td>
109
115
  <td align="center" valign="top" width="14.28%"><a href="https://github.com/callanova"><img src="https://avatars.githubusercontent.com/u/175639705?v=4?s=80" width="80px;" alt="callanova"/><br /><sub><b>callanova</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Acallanova" title="Bug reports">πŸ›</a></td>
110
116
  <td align="center" valign="top" width="14.28%"><a href="https://github.com/thatguymendel"><img src="https://avatars.githubusercontent.com/u/67444998?v=4?s=80" width="80px;" alt="thatguymendel"/><br /><sub><b>thatguymendel</b></sub></a><br /><a href="#ideas-thatguymendel" title="Ideas, Planning, & Feedback">πŸ€”</a></td>
117
+ <td align="center" valign="top" width="14.28%"><a href="https://github.com/julien-printerbox"><img src="https://avatars.githubusercontent.com/u/134132189?v=4?s=80" width="80px;" alt="julien-printerbox"/><br /><sub><b>julien-printerbox</b></sub></a><br /><a href="#ideas-julien-printerbox" title="Ideas, Planning, & Feedback">πŸ€”</a></td>
118
+ <td align="center" valign="top" width="14.28%"><a href="https://github.com/Tbwan"><img src="https://avatars.githubusercontent.com/u/44231748?v=4?s=80" width="80px;" alt="Tbwan"/><br /><sub><b>Tbwan</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3ATbwan" title="Bug reports">πŸ›</a></td>
119
+ </tr>
120
+ <tr>
121
+ <td align="center" valign="top" width="14.28%"><a href="https://github.com/nuvious"><img src="https://avatars.githubusercontent.com/u/5287736?v=4?s=80" width="80px;" alt="David Cheeseman"/><br /><sub><b>David Cheeseman</b></sub></a><br /><a href="#ideas-nuvious" title="Ideas, Planning, & Feedback">πŸ€”</a> <a href="#platform-nuvious" title="Packaging/porting to new platform">πŸ“¦</a> <a href="#infra-nuvious" title="Infrastructure (Hosting, Build-Tools, etc)">πŸš‡</a></td>
111
122
  </tr>
112
123
  </tbody>
113
124
  </table>
@@ -127,16 +138,6 @@ These are the people involved in the project. Find the meaning of the emoji keys
127
138
 
128
139
  <!-- ALL-CONTRIBUTORS-LIST:END -->
129
140
 
130
- ## Sponsors
131
-
132
- Please consider sponsoring FDM Monster to help this project! You can find the [GitHub Sponsorship Tiers here](https://github.com/sponsors/fdm-monster).
133
-
134
- Thanks to the following parties for their financial support:
135
-
136
- | Tier 4 | Tier 3 | Tier 2 | Tier 1 | One Time |
137
- |--------|--------|--------|--------|-----------|
138
- | | [WindArrow3d](https://github.com/WindArrow3d) | | [doucettom](https://github.com/doucettom) | [th3dstudio](https://github.com/th3dstudio) |
139
-
140
141
 
141
142
  ## Contribute
142
143
 
@@ -158,11 +159,14 @@ the [CONTRIBUTING](CONTRIBUTING.md) file.
158
159
  - [x] :rocket: Documentation (https://docs.fdm-monster.net)
159
160
  - [x] πŸ›‘οΈ Login and user management
160
161
  - [x] OctoFarm export
161
- - [ ] Klipper and Moonraker API integration
162
- - [ ] OctoKlipper integration
162
+ - [x] Klipper and Moonraker API integration
163
+ - [x] GCode Thumbnail support
164
+ - [x] `.bgcode` support
165
+ - [x] Modernized UI layout and tile design
166
+ - [ ] History and statistics
167
+ - [ ] Extended webcam integration
163
168
  - [ ] Spoolman integration
164
169
 
165
-
166
170
  ## License
167
171
 
168
172
  FDM Monster is licensed with [AGPL-3.0](LICENSE). For details, please consult the [LICENSE](LICENSE) file.
package/RELEASE_NOTES.MD CHANGED
@@ -1,5 +1,34 @@
1
1
  # Develop
2
2
 
3
+ # FDM Monster 03/01/2025 1.8.2
4
+
5
+ ## Changes
6
+
7
+ Update client to 1.8.8
8
+
9
+ ## Chore
10
+
11
+ - Change developer setup to be node based only (remove concurrently and nodemon packages)
12
+ - Replace server restart with NotImplementedException
13
+ - Remove simple-git package
14
+ - Remove git-pull-based server update mechanic
15
+ - Remove unnecessary environment utilities
16
+
17
+ ## Fixes
18
+
19
+ - OctoPrint client: filter folders on calling getLocalFiles for OctoPrint
20
+
21
+ # FDM Monster 13/12/2024 1.8.1
22
+
23
+ ## Changes
24
+
25
+ - Update to client 1.8.4
26
+
27
+ ## Fixes
28
+
29
+ - YAML import: regression caused all imports to fail validation
30
+ - YAML import: a bug caused all import with printers without api key to fail validation
31
+
3
32
  # FDM Monster 02/12/2024 1.8.0
4
33
 
5
34
  ## Chores
package/dist/container.js CHANGED
@@ -17,7 +17,6 @@ _export(exports, {
17
17
  }
18
18
  });
19
19
  const _axios = /*#__PURE__*/ _interop_require_default(require("axios"));
20
- const _simplegit = /*#__PURE__*/ _interop_require_default(require("simple-git"));
21
20
  const _octokit = require("octokit");
22
21
  const _awilix = require("awilix");
23
22
  const _toadscheduler = require("toad-scheduler");
@@ -28,7 +27,6 @@ const _settingsstore = require("./state/settings.store");
28
27
  const _settingsservice = require("./services/mongoose/settings.service");
29
28
  const _serverreleaseservice = require("./services/core/server-release.service");
30
29
  const _taskmanagerservice = require("./services/core/task-manager.service");
31
- const _serverupdateservice = require("./services/core/server-update.service");
32
30
  const _githubservice = require("./services/core/github.service");
33
31
  const _filecache = require("./state/file.cache");
34
32
  const _printerwebsockettask = require("./tasks/printer-websocket.task");
@@ -146,7 +144,6 @@ function configureContainer(isSqlite = false) {
146
144
  [di.cacheManager]: (0, _awilix.asFunction)(_cachemanager.configureCacheManager).singleton(),
147
145
  [di.serverReleaseService]: (0, _awilix.asClass)(_serverreleaseservice.ServerReleaseService).singleton(),
148
146
  [di.monsterPiService]: (0, _awilix.asClass)(_monsterpiservice.MonsterPiService).singleton(),
149
- [di.serverUpdateService]: (0, _awilix.asClass)(_serverupdateservice.ServerUpdateService).singleton(),
150
147
  [di.githubService]: (0, _awilix.asClass)(_githubservice.GithubService),
151
148
  [di.octokitService]: (0, _awilix.asFunction)((cradle)=>{
152
149
  const config = cradle.configService;
@@ -167,7 +164,6 @@ function configureContainer(isSqlite = false) {
167
164
  }),
168
165
  [di.clientBundleService]: (0, _awilix.asClass)(_clientbundleservice.ClientBundleService),
169
166
  [di.logDumpService]: (0, _awilix.asClass)(_logsmanagerservice.LogDumpService),
170
- [di.simpleGitService]: (0, _awilix.asValue)((0, _simplegit.default)()),
171
167
  [di.httpClient]: (0, _awilix.asValue)(_axios.default.create({
172
168
  maxBodyLength: 1000 * 1000 * 1000,
173
169
  maxContentLength: 1000 * 1000 * 1000
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/container.ts"],"names":["config","configureContainer","key","experimentalMode","serviceTypeorm","serviceMongoose","isSqlite","container","createContainer","injectionMode","InjectionMode","PROXY","di","DITokens","register","serverTasks","asValue","ServerTasks","isTypeormMode","appDefaultRole","ROLES","GUEST","appDefaultRoleNoLogin","ADMIN","serverVersion","asFunction","process","env","AppConstants","VERSION_KEY","socketFactory","asClass","SocketFactory","transient","typeormService","TypeormService","singleton","settingsService","SettingsService2","SettingsService","floorService","FloorService2","FloorService","floorPositionService","FloorPositionService","cameraStreamService","CameraService2","CameraService","printerService","PrinterService2","PrinterService","printerGroupService","PrinterGroupService","refreshTokenService","RefreshToken2","RefreshTokenService","userService","UserService2","UserService","userRoleService","UserRoleService","roleService","RoleService2","RoleService","permissionService","PermissionService2","PermissionService","customGCodeService","CustomGcodeService2","CustomGcodeService","printCompletionService","PrintCompletionService2","PrintCompletionService","serverHost","ServerHost","settingsStore","SettingsStore","configService","ConfigService","authService","AuthService","jwtService","JwtService","loggerFactory","LoggerFactory","taskManagerService","TaskManagerService","toadScheduler","ToadScheduler","eventEmitter2","configureEventEmitter","cacheManager","configureCacheManager","serverReleaseService","ServerReleaseService","monsterPiService","MonsterPiService","serverUpdateService","ServerUpdateService","githubService","GithubService","octokitService","cradle","CustomOctoKit","Octokit","plugin","throttling","auth","get","GITHUB_PAT","throttle","onRateLimit","retryAfter","options","octokit","retryCount","logger","warn","method","url","onSecondaryRateLimit","clientBundleService","ClientBundleService","logDumpService","LogDumpService","simpleGitService","simpleGit","httpClient","axios","create","maxBodyLength","maxContentLength","socketIoGateway","SocketIoGateway","multerService","MulterService","yamlService","YamlService","printerLogin","printerApiFactory","PrinterApiFactory","octoprintApi","OctoprintApi","octoprintClient","OctoprintClient","octoPrintSockIoAdapter","OctoprintWebsocketAdapter","moonrakerApi","MoonrakerApi","moonrakerClient","MoonrakerClient","moonrakerWebsocketAdapter","MoonrakerWebsocketAdapter","batchCallService","BatchCallService","pluginFirmwareUpdateService","PluginFirmwareUpdateService","floorStore","FloorStore","pluginRepositoryCache","PluginRepositoryCache","printerThumbnailCache","PrinterThumbnailCache","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","printerFilesStore","PrinterFilesStore","printerCache","PrinterCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","bootTask","BootTask","softwareUpdateTask","SoftwareUpdateTask","socketIoTask","SocketIoTask","clientDistDownloadTask","ClientDistDownloadTask","printCompletionSocketIoTask","PrintCompletionSocketIoTask","printerWebsocketTask","PrinterWebsocketTask","printerWebsocketRestoreTask","PrinterWebsocketRestoreTask","printerFileCleanTask","PrinterFileCleanTask"],"mappings":"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"}
1
+ {"version":3,"sources":["../src/container.ts"],"names":["config","configureContainer","key","experimentalMode","serviceTypeorm","serviceMongoose","isSqlite","container","createContainer","injectionMode","InjectionMode","PROXY","di","DITokens","register","serverTasks","asValue","ServerTasks","isTypeormMode","appDefaultRole","ROLES","GUEST","appDefaultRoleNoLogin","ADMIN","serverVersion","asFunction","process","env","AppConstants","VERSION_KEY","socketFactory","asClass","SocketFactory","transient","typeormService","TypeormService","singleton","settingsService","SettingsService2","SettingsService","floorService","FloorService2","FloorService","floorPositionService","FloorPositionService","cameraStreamService","CameraService2","CameraService","printerService","PrinterService2","PrinterService","printerGroupService","PrinterGroupService","refreshTokenService","RefreshToken2","RefreshTokenService","userService","UserService2","UserService","userRoleService","UserRoleService","roleService","RoleService2","RoleService","permissionService","PermissionService2","PermissionService","customGCodeService","CustomGcodeService2","CustomGcodeService","printCompletionService","PrintCompletionService2","PrintCompletionService","serverHost","ServerHost","settingsStore","SettingsStore","configService","ConfigService","authService","AuthService","jwtService","JwtService","loggerFactory","LoggerFactory","taskManagerService","TaskManagerService","toadScheduler","ToadScheduler","eventEmitter2","configureEventEmitter","cacheManager","configureCacheManager","serverReleaseService","ServerReleaseService","monsterPiService","MonsterPiService","githubService","GithubService","octokitService","cradle","CustomOctoKit","Octokit","plugin","throttling","auth","get","GITHUB_PAT","throttle","onRateLimit","retryAfter","options","octokit","retryCount","logger","warn","method","url","onSecondaryRateLimit","clientBundleService","ClientBundleService","logDumpService","LogDumpService","httpClient","axios","create","maxBodyLength","maxContentLength","socketIoGateway","SocketIoGateway","multerService","MulterService","yamlService","YamlService","printerLogin","printerApiFactory","PrinterApiFactory","octoprintApi","OctoprintApi","octoprintClient","OctoprintClient","octoPrintSockIoAdapter","OctoprintWebsocketAdapter","moonrakerApi","MoonrakerApi","moonrakerClient","MoonrakerClient","moonrakerWebsocketAdapter","MoonrakerWebsocketAdapter","batchCallService","BatchCallService","pluginFirmwareUpdateService","PluginFirmwareUpdateService","floorStore","FloorStore","pluginRepositoryCache","PluginRepositoryCache","printerThumbnailCache","PrinterThumbnailCache","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","printerFilesStore","PrinterFilesStore","printerCache","PrinterCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","bootTask","BootTask","softwareUpdateTask","SoftwareUpdateTask","socketIoTask","SocketIoTask","clientDistDownloadTask","ClientDistDownloadTask","printCompletionSocketIoTask","PrintCompletionSocketIoTask","printerWebsocketTask","PrinterWebsocketTask","printerWebsocketRestoreTask","PrinterWebsocketRestoreTask","printerFileCleanTask","PrinterFileCleanTask"],"mappings":"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"}
@@ -18,7 +18,6 @@ const DITokens = {
18
18
  loggerFactory: "loggerFactory",
19
19
  httpClient: "httpClient",
20
20
  socketIoGateway: "socketIoGateway",
21
- simpleGitService: "simpleGitService",
22
21
  multerService: "multerService",
23
22
  configService: "configService",
24
23
  taskManagerService: "taskManagerService",
@@ -34,7 +33,6 @@ const DITokens = {
34
33
  settingsService: "settingsService",
35
34
  serverReleaseService: "serverReleaseService",
36
35
  monsterPiService: "monsterPiService",
37
- serverUpdateService: "serverUpdateService",
38
36
  githubService: "githubService",
39
37
  octokitService: "octokitService",
40
38
  clientBundleService: "clientBundleService",
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/container.tokens.ts"],"names":["DITokens","serverVersion","isTypeormMode","appDefaultRole","appDefaultRoleNoLogin","typeormService","serverHost","loggerFactory","httpClient","socketIoGateway","simpleGitService","multerService","configService","taskManagerService","toadScheduler","eventEmitter2","cacheManager","printerService","printerGroupService","floorPositionService","printCompletionService","floorService","yamlService","settingsService","serverReleaseService","monsterPiService","serverUpdateService","githubService","octokitService","clientBundleService","logDumpService","userTokenService","authService","refreshTokenService","userService","userRoleService","permissionService","jwtService","roleService","octoprintApi","octoprintClient","moonrakerApi","moonrakerClient","cameraStreamService","socketFactory","printerApiFactory","printerLogin","batchCallService","pluginRepositoryCache","pluginFirmwareUpdateService","influxDbV2BaseService","systemInfoBundleService","customGCodeService","floorStore","settingsStore","printerSocketStore","testPrinterSocketStore","printerFilesStore","octoPrintSockIoAdapter","moonrakerWebsocketAdapter","printerCache","printerEventsCache","printerThumbnailCache","fileCache","fileUploadTrackerCache","serverTasks","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printCompletionSocketIoTask","printerWebsocketTask","printerWebsocketRestoreTask","printerFileCleanTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IAEtBC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAEhBC,YAAY;IACZC,eAAe;IACfC,YAAY;IACZC,iBAAiB;IACjBC,kBAAkB;IAClBC,eAAe;IACfC,eAAe;IACfC,oBAAoB;IACpBC,eAAe;IACfC,eAAe;IACfC,cAAc;IACdC,gBAAgB;IAChBC,qBAAqB;IACrBC,sBAAsB;IACtBC,wBAAwB;IACxBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,sBAAsB;IACtBC,kBAAkB;IAClBC,qBAAqB;IACrBC,eAAe;IACfC,gBAAgB;IAChBC,qBAAqB;IACrBC,gBAAgB;IAChBC,kBAAkB;IAClBC,aAAa;IACbC,qBAAqB;IACrBC,aAAa;IACbC,iBAAiB;IACjBC,mBAAmB;IACnBC,YAAY;IACZC,aAAa;IACbC,cAAc;IACdC,iBAAiB;IACjBC,cAAc;IACdC,iBAAiB;IACjBC,qBAAqB;IACrBC,eAAe;IACfC,mBAAmB;IACnBC,cAAc;IACdC,kBAAkB;IAClBC,uBAAuB;IACvBC,6BAA6B;IAC7BC,uBAAuB;IACvBC,yBAAyB;IACzBC,oBAAoB;IAEpBC,YAAY;IACZC,eAAe;IACfC,oBAAoB;IACpBC,wBAAwB;IACxBC,mBAAmB;IACnBC,wBAAwB;IACxBC,2BAA2B;IAE3BC,cAAc;IACdC,oBAAoB;IACpBC,uBAAuB;IACvBC,WAAW;IACXC,wBAAwB;IAExBC,aAAa;IACbC,UAAU;IACVC,oBAAoB;IACpBC,wBAAwB;IACxBC,cAAc;IACdC,6BAA6B;IAC7BC,sBAAsB;IACtBC,6BAA6B;IAC7BC,sBAAsB;AACxB"}
1
+ {"version":3,"sources":["../src/container.tokens.ts"],"names":["DITokens","serverVersion","isTypeormMode","appDefaultRole","appDefaultRoleNoLogin","typeormService","serverHost","loggerFactory","httpClient","socketIoGateway","multerService","configService","taskManagerService","toadScheduler","eventEmitter2","cacheManager","printerService","printerGroupService","floorPositionService","printCompletionService","floorService","yamlService","settingsService","serverReleaseService","monsterPiService","githubService","octokitService","clientBundleService","logDumpService","userTokenService","authService","refreshTokenService","userService","userRoleService","permissionService","jwtService","roleService","octoprintApi","octoprintClient","moonrakerApi","moonrakerClient","cameraStreamService","socketFactory","printerApiFactory","printerLogin","batchCallService","pluginRepositoryCache","pluginFirmwareUpdateService","influxDbV2BaseService","systemInfoBundleService","customGCodeService","floorStore","settingsStore","printerSocketStore","testPrinterSocketStore","printerFilesStore","octoPrintSockIoAdapter","moonrakerWebsocketAdapter","printerCache","printerEventsCache","printerThumbnailCache","fileCache","fileUploadTrackerCache","serverTasks","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printCompletionSocketIoTask","printerWebsocketTask","printerWebsocketRestoreTask","printerFileCleanTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IAEtBC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAEhBC,YAAY;IACZC,eAAe;IACfC,YAAY;IACZC,iBAAiB;IACjBC,eAAe;IACfC,eAAe;IACfC,oBAAoB;IACpBC,eAAe;IACfC,eAAe;IACfC,cAAc;IACdC,gBAAgB;IAChBC,qBAAqB;IACrBC,sBAAsB;IACtBC,wBAAwB;IACxBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,sBAAsB;IACtBC,kBAAkB;IAClBC,eAAe;IACfC,gBAAgB;IAChBC,qBAAqB;IACrBC,gBAAgB;IAChBC,kBAAkB;IAClBC,aAAa;IACbC,qBAAqB;IACrBC,aAAa;IACbC,iBAAiB;IACjBC,mBAAmB;IACnBC,YAAY;IACZC,aAAa;IACbC,cAAc;IACdC,iBAAiB;IACjBC,cAAc;IACdC,iBAAiB;IACjBC,qBAAqB;IACrBC,eAAe;IACfC,mBAAmB;IACnBC,cAAc;IACdC,kBAAkB;IAClBC,uBAAuB;IACvBC,6BAA6B;IAC7BC,uBAAuB;IACvBC,yBAAyB;IACzBC,oBAAoB;IAEpBC,YAAY;IACZC,eAAe;IACfC,oBAAoB;IACpBC,wBAAwB;IACxBC,mBAAmB;IACnBC,wBAAwB;IACxBC,2BAA2B;IAE3BC,cAAc;IACdC,oBAAoB;IACpBC,uBAAuB;IACvBC,WAAW;IACXC,wBAAwB;IAExBC,aAAa;IACbC,UAAU;IACVC,oBAAoB;IACpBC,wBAAwB;IACxBC,cAAc;IACdC,6BAA6B;IAC7BC,sBAAsB;IACtBC,6BAA6B;IAC7BC,sBAAsB;AACxB"}
@@ -22,7 +22,6 @@ const _authenticate = require("../middleware/authenticate");
22
22
  const _logger = require("../handlers/logger");
23
23
  const _serverconstants = require("../server.constants");
24
24
  const _authorizationconstants = require("../constants/authorization.constants");
25
- const _envutils = require("../utils/env.utils");
26
25
  const _validators = require("../handlers/validators");
27
26
  const _demomiddleware = require("../middleware/demo.middleware");
28
27
  class ServerPrivateController {
@@ -35,11 +34,9 @@ class ServerPrivateController {
35
34
  multerService;
36
35
  logDumpService;
37
36
  logger = new _logger.LoggerService(ServerPrivateController.name);
38
- serverUpdateService;
39
37
  serverReleaseService;
40
- constructor({ serverUpdateService, serverReleaseService, printerCache, printerService, clientBundleService, githubService, logDumpService, printerSocketStore, yamlService, multerService }){
38
+ constructor({ serverReleaseService, printerCache, printerService, clientBundleService, githubService, logDumpService, printerSocketStore, yamlService, multerService }){
41
39
  this.serverReleaseService = serverReleaseService;
42
- this.serverUpdateService = serverUpdateService;
43
40
  this.clientBundleService = clientBundleService;
44
41
  this.githubService = githubService;
45
42
  this.logDumpService = logDumpService;
@@ -92,19 +89,10 @@ class ServerPrivateController {
92
89
  const updateState = this.serverReleaseService.getState();
93
90
  res.send(updateState);
94
91
  }
95
- async pullGitUpdates(req, res) {
96
- const result = await this.serverUpdateService.checkGitUpdates();
97
- res.send(result);
98
- }
99
- async restartServer(req, res) {
100
- if (!(0, _envutils.isTestEnvironment)()) {
101
- this.logger.warn("Server restart command fired. Expect the server to be unavailable for a moment");
102
- }
103
- const result = await this.serverUpdateService.restartServer();
104
- res.send(result);
105
- }
106
92
  async importPrintersAndFloorsYaml(req, res) {
107
- const files = await this.multerService.multerLoadFileAsync(req, res, ".yaml", false);
93
+ const files = await this.multerService.multerLoadFileAsync(req, res, [
94
+ ".yaml"
95
+ ], false);
108
96
  const firstFile = files[0];
109
97
  const spec = await this.yamlService.importPrintersAndFloors(firstFile.buffer.toString());
110
98
  res.send({
@@ -143,6 +131,6 @@ const _default = (0, _awilixexpress.createController)(ServerPrivateController).p
143
131
  _authorizationconstants.ROLES.ADMIN
144
132
  ]),
145
133
  _demomiddleware.demoUserNotAllowed
146
- ]).get("/", "getReleaseStateInfo").get("/client-releases", "getClientReleases").get("/github-rate-limit", "getGithubRateLimit").post("/update-client-bundle-github", "updateClientBundleGithub").post("/export-printers-floors-yaml", "exportPrintersAndFloorsYaml").post("/import-printers-floors-yaml", "importPrintersAndFloorsYaml").post("/git-update", "pullGitUpdates").post("/restart", "restartServer").get("/dump-fdm-monster-logs", "dumpLogZips").post("/dump-fdm-monster-logs", "dumpLogZips").delete("/clear-outdated-fdm-monster-logs", "clearLogs").delete("/delete-all-printers", "deleteAllPrinters");
134
+ ]).get("/", "getReleaseStateInfo").get("/client-releases", "getClientReleases").get("/github-rate-limit", "getGithubRateLimit").post("/update-client-bundle-github", "updateClientBundleGithub").post("/export-printers-floors-yaml", "exportPrintersAndFloorsYaml").post("/import-printers-floors-yaml", "importPrintersAndFloorsYaml").get("/dump-fdm-monster-logs", "dumpLogZips").post("/dump-fdm-monster-logs", "dumpLogZips").delete("/clear-outdated-fdm-monster-logs", "clearLogs").delete("/delete-all-printers", "deleteAllPrinters");
147
135
 
148
136
  //# sourceMappingURL=server-private.controller.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/controllers/server-private.controller.ts"],"names":["ServerPrivateController","clientBundleService","printerCache","printerService","printerSocketStore","githubService","yamlService","multerService","logDumpService","logger","Logger","name","serverUpdateService","serverReleaseService","constructor","getClientReleases","req","res","releaseSpec","getReleases","send","updateClientBundleGithub","inputRules","downloadRelease","allowDowngrade","updateDto","validateMiddleware","willExecute","shouldUpdateWithReason","AppConstants","defaultClientMinimum","log","shouldUpdate","reason","executed","requestedVersion","currentVersion","minimumVersion","targetVersion","tag_name","downloadClientUpdate","getGithubRateLimit","rateLimitResponse","getRateLimit","data","getReleaseStateInfo","syncLatestRelease","updateState","getState","pullGitUpdates","result","checkGitUpdates","restartServer","isTestEnvironment","warn","importPrintersAndFloorsYaml","files","multerLoadFileAsync","firstFile","spec","importPrintersAndFloors","buffer","toString","success","exportPrintersAndFloorsYaml","yaml","exportPrintersAndFloors","body","fileContents","Buffer","from","readStream","PassThrough","end","fileName","serverRepoName","Date","now","set","pipe","deleteAllPrinters","printers","listCachedPrinters","printerIds","map","p","id","deleteMany","clearLogs","counts","deleteOlderThanWeekAndMismatchingLogFiles","dumpLogZips","filePath","dumpZip","sendFile","createController","prefix","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","get","post","delete"],"mappings":"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"}
1
+ {"version":3,"sources":["../../src/controllers/server-private.controller.ts"],"names":["ServerPrivateController","clientBundleService","printerCache","printerService","printerSocketStore","githubService","yamlService","multerService","logDumpService","logger","Logger","name","serverReleaseService","constructor","getClientReleases","req","res","releaseSpec","getReleases","send","updateClientBundleGithub","inputRules","downloadRelease","allowDowngrade","updateDto","validateMiddleware","willExecute","shouldUpdateWithReason","AppConstants","defaultClientMinimum","log","shouldUpdate","reason","executed","requestedVersion","currentVersion","minimumVersion","targetVersion","tag_name","downloadClientUpdate","getGithubRateLimit","rateLimitResponse","getRateLimit","data","getReleaseStateInfo","syncLatestRelease","updateState","getState","importPrintersAndFloorsYaml","files","multerLoadFileAsync","firstFile","spec","importPrintersAndFloors","buffer","toString","success","exportPrintersAndFloorsYaml","yaml","exportPrintersAndFloors","body","fileContents","Buffer","from","readStream","PassThrough","end","fileName","serverRepoName","Date","now","set","pipe","deleteAllPrinters","printers","listCachedPrinters","printerIds","map","p","id","deleteMany","clearLogs","counts","deleteOlderThanWeekAndMismatchingLogFiles","dumpLogZips","filePath","dumpZip","sendFile","createController","prefix","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","get","post","delete"],"mappings":"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"}
@@ -130,9 +130,7 @@ class ServerPublicController {
130
130
  res.json({
131
131
  version: this.serverVersion,
132
132
  isDockerContainer: (0, _isdocker.isDocker)(),
133
- isNodemon: (0, _envutils.isNodemon)(),
134
133
  isNode: (0, _envutils.isNode)(),
135
- isPm2: (0, _envutils.isPm2)(),
136
134
  os: process.env.OS,
137
135
  monsterPi: monsterPiVersion,
138
136
  update: {
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/controllers/server-public.controller.ts"],"names":["ServerPublicController","serverVersion","settingsStore","printerSocketStore","serverReleaseService","monsterPiService","userService","roleService","isTypeormMode","constructor","welcome","req","res","serverSettings","getSettings","getLoginRequired","send","message","getFeatures","getServerSettings","moonrakerEnabled","experimentalMoonrakerSupport","batchReprintCalls","available","version","batchConnectSocketCalls","batchConnectUsbCalls","newSockets","anonymousDiagnosticsToggle","pauseResumePrinterCommand","logDumpZip","clearLogFiles","batchTogglePrinterEnabled","cameraStream","subFeatures","printerGroupsApi","printerControlApi","githubRateLimitApi","multiplePrinterServices","types","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isDockerContainer","isDocker","isNodemon","isNode","isPm2","os","process","env","OS","monsterPi","update","synced","updateAvailable","airGapped","test","createController","prefix","AppConstants","apiRoute","get","before","authenticate","authorizePermission","PERMS","ServerInfo","Get"],"mappings":"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"}
1
+ {"version":3,"sources":["../../src/controllers/server-public.controller.ts"],"names":["ServerPublicController","serverVersion","settingsStore","printerSocketStore","serverReleaseService","monsterPiService","userService","roleService","isTypeormMode","constructor","welcome","req","res","serverSettings","getSettings","getLoginRequired","send","message","getFeatures","getServerSettings","moonrakerEnabled","experimentalMoonrakerSupport","batchReprintCalls","available","version","batchConnectSocketCalls","batchConnectUsbCalls","newSockets","anonymousDiagnosticsToggle","pauseResumePrinterCommand","logDumpZip","clearLogFiles","batchTogglePrinterEnabled","cameraStream","subFeatures","printerGroupsApi","printerControlApi","githubRateLimitApi","multiplePrinterServices","types","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isDockerContainer","isDocker","isNode","os","process","env","OS","monsterPi","update","synced","updateAvailable","airGapped","test","createController","prefix","AppConstants","apiRoute","get","before","authenticate","authorizePermission","PERMS","ServerInfo","Get"],"mappings":"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"}
@@ -9,7 +9,6 @@ Object.defineProperty(exports, "AppConstants", {
9
9
  }
10
10
  });
11
11
  const AppConstants = {
12
- NON_NPM_MODE_KEY: "NON_NPM_MODE",
13
12
  NODE_ENV_KEY: "NODE_ENV",
14
13
  VERSION_KEY: "npm_package_version",
15
14
  SERVER_PORT_KEY: "SERVER_PORT",
@@ -71,7 +70,7 @@ const AppConstants = {
71
70
  githubUrl: "https://github.com/fdm-monster/fdm-monster",
72
71
  orgName: "fdm-monster",
73
72
  currentWizardVersion: 1,
74
- defaultClientMinimum: "1.8.0",
73
+ defaultClientMinimum: "1.8.8",
75
74
  influxUrl: "INFLUX_URL",
76
75
  influxToken: "INFLUX_TOKEN",
77
76
  influxOrg: "INFLUX_ORG",
@@ -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","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","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","ENABLE_EXPERIMENTAL_TYPEORM","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,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;IAC1BC,gCAAgC;IAChCC,oCAAoC;IAGpCC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAGnBC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBAAwB;IAExBC,gBAAgB;IAEhBC,6BAA6B;IAC7BC,kCAAkC;AACpC"}
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","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault"],"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;IAC1BC,gCAAgC;IAChCC,oCAAoC;IAGpCC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAGnBC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBAAwB;IAExBC,gBAAgB;IAEhBC,6BAA6B;IAC7BC,kCAAkC;AACpC"}
@@ -36,7 +36,6 @@ _export(exports, {
36
36
  });
37
37
  const _migratemongo = require("migrate-mongo");
38
38
  const _path = require("path");
39
- const _child_process = require("child_process");
40
39
  const _node = /*#__PURE__*/ _interop_require_wildcard(require("@sentry/node"));
41
40
  const _dotenv = require("dotenv");
42
41
  const _serverconstants = require("./server.constants");
@@ -105,32 +104,12 @@ function ensureNodeEnvSet() {
105
104
  logger.log(`βœ“ NODE_ENV variable correctly set (${environment})!`);
106
105
  }
107
106
  }
108
- function ensureEnvNpmVersionSet() {
107
+ function ensurePackageVersionSet() {
109
108
  const packageJsonVersion = require(packageJsonPath).version;
110
109
  if (!process.env[_serverconstants.AppConstants.VERSION_KEY]) {
111
110
  process.env[_serverconstants.AppConstants.VERSION_KEY] = packageJsonVersion;
112
- process.env[_serverconstants.AppConstants.NON_NPM_MODE_KEY] = "true";
113
- logger.log(`βœ“ Running server version ${process.env[_serverconstants.AppConstants.VERSION_KEY]} in non-NPM mode!`);
114
- } else {
115
- logger.debug(`βœ“ Running server version ${process.env[_serverconstants.AppConstants.VERSION_KEY]} in NPM mode!`);
116
- }
117
- if (process.env[_serverconstants.AppConstants.VERSION_KEY] !== packageJsonVersion) {
118
- process.env[_serverconstants.AppConstants.VERSION_KEY] = packageJsonVersion;
119
- logger.debug(`~ Had to synchronize FDM version to '${packageJsonVersion}' as it was outdated.`);
120
- }
121
- }
122
- function removePm2Service(reason) {
123
- logger.error(`Removing PM2 service as Server failed to start: ${reason}`);
124
- (0, _child_process.execSync)(`pm2 delete ${_serverconstants.AppConstants.pm2ServiceName}`);
125
- }
126
- function setupPackageJsonVersionOrThrow() {
127
- const result = (0, _envutils.verifyPackageJsonRequirements)((0, _fsutils.superRootPath)());
128
- if (!result) {
129
- if ((0, _envutils.isPm2)()) {
130
- removePm2Service("didnt pass startup validation (package.json)");
131
- }
132
- throw new Error("Aborting server.");
133
111
  }
112
+ logger.log(`βœ“ Running server version ${process.env[_serverconstants.AppConstants.VERSION_KEY]}`);
134
113
  }
135
114
  function printInstructionsURL() {
136
115
  logger.log(`Please make sure to read ${instructionsReferralURL} for more information.`);
@@ -190,8 +169,7 @@ function setupEnvConfig(skipDotEnv = false) {
190
169
  logger.log("βœ“ Parsed environment and (optional) .env file");
191
170
  }
192
171
  ensureNodeEnvSet();
193
- setupPackageJsonVersionOrThrow();
194
- ensureEnvNpmVersionSet();
172
+ ensurePackageVersionSet();
195
173
  setupSentry();
196
174
  ensureMongoDBConnectionStringSet();
197
175
  ensurePortSet();
@@ -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","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","db","client","migrationsStatus","status","pendingMigrations","filter","m","appliedAt","length","migrationResult","up"],"mappings":"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"}
@@ -50,7 +50,7 @@ class YamlService {
50
50
  if (![
51
51
  _printerapiinterface.OctoprintType,
52
52
  _printerapiinterface.MoonrakerType
53
- ].includes[printer.printerType]) {
53
+ ].includes(printer.printerType)) {
54
54
  printer.printerType = _printerapiinterface.OctoprintType;
55
55
  }
56
56
  }