@fdm-monster/server 1.8.2 → 1.9.0-rc1
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.
- package/.env.template +5 -3
- package/.gitattributes +4 -2
- package/.yarn/install-state.gz +0 -0
- package/.yarn/releases/yarn-4.9.1.cjs +948 -0
- package/.yarnrc.yml +1 -1
- package/README.md +25 -26
- package/RELEASE_NOTES.MD +69 -7
- package/biome.json +33 -0
- package/dist/consoles/download-github-releases.js.map +1 -1
- package/dist/consoles/launch-http-servers.js +31 -0
- package/dist/consoles/launch-http-servers.js.map +1 -0
- package/dist/consoles/mock-octoprint.server.js +291 -0
- package/dist/consoles/mock-octoprint.server.js.map +1 -0
- package/dist/consoles/mock-prusalink.server.js +57 -0
- package/dist/consoles/mock-prusalink.server.js.map +1 -0
- package/dist/consoles/utils/api-messages.js +856 -0
- package/dist/consoles/utils/api-messages.js.map +1 -0
- package/dist/consoles/utils/delayed-memory.storage.js +42 -0
- package/dist/consoles/utils/delayed-memory.storage.js.map +1 -0
- package/dist/consoles/utils/ws-messages.js +88 -0
- package/dist/consoles/utils/ws-messages.js.map +1 -0
- package/dist/constants/event.constants.js +11 -19
- package/dist/constants/event.constants.js.map +1 -1
- package/dist/constants/server-settings.constants.js +6 -11
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/container.js +15 -24
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +4 -5
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/auth.controller.js +114 -24
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/batch-call.controller.js +95 -24
- package/dist/controllers/batch-call.controller.js.map +1 -1
- package/dist/controllers/camera-stream.controller.js +16 -12
- package/dist/controllers/camera-stream.controller.js.map +1 -1
- package/dist/controllers/custom-gcode.controller.js +116 -40
- package/dist/controllers/custom-gcode.controller.js.map +1 -1
- package/dist/controllers/dto/update-client-dist.dto.js +0 -21
- package/dist/controllers/dto/update-client-dist.dto.js.map +1 -1
- package/dist/controllers/first-time-setup.controller.js +54 -18
- package/dist/controllers/first-time-setup.controller.js.map +1 -1
- package/dist/controllers/floor.controller.js +154 -43
- package/dist/controllers/floor.controller.js.map +1 -1
- package/dist/controllers/metrics.controller.js +56 -0
- package/dist/controllers/metrics.controller.js.map +1 -0
- package/dist/controllers/print-completion.controller.js +81 -18
- package/dist/controllers/print-completion.controller.js.map +1 -1
- package/dist/controllers/printer-files.controller.js +61 -50
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer-group.controller.js +123 -33
- package/dist/controllers/printer-group.controller.js.map +1 -1
- package/dist/controllers/printer-settings.controller.js +76 -29
- package/dist/controllers/printer-settings.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +62 -197
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +153 -39
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +79 -84
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/controllers/settings.controller.js +222 -79
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/controllers/user.controller.js +67 -57
- package/dist/controllers/user.controller.js.map +1 -1
- package/dist/controllers/validation/auth-controller.validation.js +6 -5
- package/dist/controllers/validation/auth-controller.validation.js.map +1 -1
- package/dist/controllers/validation/batch-controller.validation.js +17 -18
- package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
- package/dist/controllers/validation/generic.validation.js +8 -3
- package/dist/controllers/validation/generic.validation.js.map +1 -1
- package/dist/controllers/validation/printer-completion-controller.validation.js +16 -0
- package/dist/controllers/validation/printer-completion-controller.validation.js.map +1 -0
- package/dist/controllers/validation/printer-controller.validation.js +31 -50
- package/dist/controllers/validation/printer-controller.validation.js.map +1 -1
- package/dist/controllers/validation/printer-files-controller.validation.js +16 -15
- package/dist/controllers/validation/printer-files-controller.validation.js.map +1 -1
- package/dist/controllers/validation/printer-settings-controller.validation.js +6 -5
- package/dist/controllers/validation/printer-settings-controller.validation.js.map +1 -1
- package/dist/controllers/validation/server-private.validation.js +17 -0
- package/dist/controllers/validation/server-private.validation.js.map +1 -0
- package/dist/controllers/validation/setting.validation.js +28 -10
- package/dist/controllers/validation/setting.validation.js.map +1 -1
- package/dist/controllers/validation/user-controller.validation.js +44 -13
- package/dist/controllers/validation/user-controller.validation.js.map +1 -1
- package/dist/data-source.js +10 -6
- package/dist/data-source.js.map +1 -1
- package/dist/entities/camera-stream.entity.js +2 -3
- package/dist/entities/camera-stream.entity.js.map +1 -1
- package/dist/entities/custom-gcode.entity.js +1 -2
- package/dist/entities/custom-gcode.entity.js.map +1 -1
- package/dist/entities/floor-position.entity.js.map +1 -1
- package/dist/entities/floor.entity.js +1 -2
- package/dist/entities/floor.entity.js.map +1 -1
- package/dist/entities/group.entity.js +6 -2
- package/dist/entities/group.entity.js.map +1 -1
- package/dist/entities/permission.entity.js +1 -2
- package/dist/entities/permission.entity.js.map +1 -1
- package/dist/entities/print-completion.entity.js +1 -2
- package/dist/entities/print-completion.entity.js.map +1 -1
- package/dist/entities/printer-group.entity.js +6 -2
- package/dist/entities/printer-group.entity.js.map +1 -1
- package/dist/entities/printer.entity.js +22 -4
- package/dist/entities/printer.entity.js.map +1 -1
- package/dist/entities/refresh-token.entity.js +1 -2
- package/dist/entities/refresh-token.entity.js.map +1 -1
- package/dist/entities/role.entity.js +1 -2
- package/dist/entities/role.entity.js.map +1 -1
- package/dist/entities/settings.entity.js +1 -2
- package/dist/entities/settings.entity.js.map +1 -1
- package/dist/entities/user-role.entity.js +1 -2
- package/dist/entities/user-role.entity.js.map +1 -1
- package/dist/entities/user.entity.js +1 -2
- package/dist/entities/user.entity.js.map +1 -1
- package/dist/exceptions/runtime.exceptions.js.map +1 -1
- package/dist/handlers/logger.js +131 -36
- package/dist/handlers/logger.js.map +1 -1
- package/dist/handlers/validators.js +7 -113
- package/dist/handlers/validators.js.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/middleware/authenticate.js +11 -22
- package/dist/middleware/authenticate.js.map +1 -1
- package/dist/middleware/database.js.map +1 -1
- package/dist/middleware/demo.middleware.js +4 -17
- package/dist/middleware/demo.middleware.js.map +1 -1
- package/dist/middleware/exception.filter.js +23 -23
- package/dist/middleware/exception.filter.js.map +1 -1
- package/dist/middleware/global.middleware.js +4 -4
- package/dist/middleware/global.middleware.js.map +1 -1
- package/dist/middleware/param-converter.middleware.js +81 -0
- package/dist/middleware/param-converter.middleware.js.map +1 -0
- package/dist/middleware/passport.js +3 -5
- package/dist/middleware/passport.js.map +1 -1
- package/dist/middleware/printer-resolver.js +37 -0
- package/dist/middleware/printer-resolver.js.map +1 -0
- package/dist/middleware/printer.js +22 -10
- package/dist/middleware/printer.js.map +1 -1
- package/dist/middleware/socketio.middleware.js +27 -0
- package/dist/middleware/socketio.middleware.js.map +1 -0
- package/dist/migrations/1706829146617-InitSqlite.js +1 -1
- package/dist/migrations/1706829146617-InitSqlite.js.map +1 -1
- package/dist/migrations/1707494762198-PrinterGroup.js +1 -1
- package/dist/migrations/1707494762198-PrinterGroup.js.map +1 -1
- package/dist/migrations/1708465930665-ChangePrintCompletionDeletePrinterCascade.js +1 -1
- package/dist/migrations/1708465930665-ChangePrintCompletionDeletePrinterCascade.js.map +1 -1
- package/dist/migrations/1713897879622-AddPrinterType.js +1 -1
- package/dist/migrations/1713897879622-AddPrinterType.js.map +1 -1
- package/dist/migrations/1745141688926-AddPrinterUsernamePassword.js +229 -0
- package/dist/migrations/1745141688926-AddPrinterUsernamePassword.js.map +1 -0
- package/dist/models/Auth/Permission.js.map +1 -1
- package/dist/models/Auth/RefreshToken.js +1 -1
- package/dist/models/Auth/RefreshToken.js.map +1 -1
- package/dist/models/Auth/Role.js.map +1 -1
- package/dist/models/Auth/User.js.map +1 -1
- package/dist/models/CameraStream.js +20 -0
- package/dist/models/CameraStream.js.map +1 -1
- package/dist/models/CustomGcode.js.map +1 -1
- package/dist/models/Floor.js.map +1 -1
- package/dist/models/FloorPrinter.js +10 -1
- package/dist/models/FloorPrinter.js.map +1 -1
- package/dist/models/PrintCompletion.js.map +1 -1
- package/dist/models/Printer.js +12 -5
- package/dist/models/Printer.js.map +1 -1
- package/dist/models/Settings.js +5 -42
- package/dist/models/Settings.js.map +1 -1
- package/dist/models/index.js +0 -4
- package/dist/models/index.js.map +1 -1
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js.map +1 -1
- package/dist/mongo-migrations/20210907173950-printers-enabled.js.map +1 -1
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js.map +1 -1
- package/dist/mongo-migrations/20230414141005-floor-remove-groupinfloor.js.map +1 -1
- package/dist/mongo-migrations/20230427202911-printer-remove-sortindex.js.map +1 -1
- package/dist/mongo-migrations/20230716065316-user-remove-name.js.map +1 -1
- package/dist/mongo-migrations/20231111081809-printer-flatten-name.js.map +1 -1
- package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js.map +1 -1
- package/dist/mongo-migrations/20231202183902-printer-files-simpler.js.map +1 -1
- package/dist/server.constants.js +7 -4
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js +29 -2
- package/dist/server.core.js.map +1 -1
- package/dist/server.env.js +13 -8
- package/dist/server.env.js.map +1 -1
- package/dist/server.host.js +24 -31
- package/dist/server.host.js.map +1 -1
- package/dist/services/authentication/auth.service.js +15 -20
- package/dist/services/authentication/auth.service.js.map +1 -1
- package/dist/services/authentication/jwt.service.js +1 -1
- package/dist/services/authentication/jwt.service.js.map +1 -1
- package/dist/services/core/batch-call.service.js +23 -25
- package/dist/services/core/batch-call.service.js.map +1 -1
- package/dist/services/core/client-bundle.service.js +78 -136
- package/dist/services/core/client-bundle.service.js.map +1 -1
- package/dist/services/core/config.service.js.map +1 -1
- package/dist/services/core/cradle.service.js +21 -0
- package/dist/services/core/cradle.service.js.map +1 -0
- package/dist/services/core/github.service.js +2 -2
- package/dist/services/core/github.service.js.map +1 -1
- package/dist/services/core/http-client.factory.js +40 -0
- package/dist/services/core/http-client.factory.js.map +1 -0
- package/dist/services/core/logs-manager.service.js +7 -6
- package/dist/services/core/logs-manager.service.js.map +1 -1
- package/dist/services/core/monsterpi.service.js +1 -1
- package/dist/services/core/monsterpi.service.js.map +1 -1
- package/dist/services/core/multer.service.js +79 -28
- package/dist/services/core/multer.service.js.map +1 -1
- package/dist/services/core/server-release.service.js +14 -8
- package/dist/services/core/server-release.service.js.map +1 -1
- package/dist/services/core/yaml.service.js +16 -17
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/interfaces/camera-stream.dto.js +4 -34
- package/dist/services/interfaces/camera-stream.dto.js.map +1 -1
- package/dist/services/interfaces/custom-gcode.dto.js.map +1 -1
- package/dist/services/interfaces/file-upload-tracker.interface.js +6 -0
- package/dist/services/interfaces/file-upload-tracker.interface.js.map +1 -0
- package/dist/services/interfaces/floor.dto.js +5 -47
- package/dist/services/interfaces/floor.dto.js.map +1 -1
- package/dist/services/interfaces/login.dto.js +2 -0
- package/dist/services/interfaces/login.dto.js.map +1 -1
- package/dist/services/interfaces/print-completion.dto.js.map +1 -1
- package/dist/services/interfaces/printer-group.dto.js +0 -14
- package/dist/services/interfaces/printer-group.dto.js.map +1 -1
- package/dist/services/interfaces/printer.dto.js +11 -5
- package/dist/services/interfaces/printer.dto.js.map +1 -1
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/interfaces/task.interfaces.js +6 -0
- package/dist/services/interfaces/task.interfaces.js.map +1 -0
- package/dist/services/mongoose/camera-stream.service.js +17 -15
- package/dist/services/mongoose/camera-stream.service.js.map +1 -1
- package/dist/services/mongoose/custom-gcode.service.js +4 -2
- package/dist/services/mongoose/custom-gcode.service.js.map +1 -1
- package/dist/services/mongoose/floor.service.js +37 -30
- package/dist/services/mongoose/floor.service.js.map +1 -1
- package/dist/services/mongoose/permission.service.js +1 -1
- package/dist/services/mongoose/permission.service.js.map +1 -1
- package/dist/services/mongoose/print-completion.service.js +2 -2
- package/dist/services/mongoose/print-completion.service.js.map +1 -1
- package/dist/services/mongoose/print-completion.shared.js +2 -2
- package/dist/services/mongoose/print-completion.shared.js.map +1 -1
- package/dist/services/mongoose/printer.service.js +40 -45
- package/dist/services/mongoose/printer.service.js.map +1 -1
- package/dist/services/mongoose/refresh-token.service.js +5 -8
- package/dist/services/mongoose/refresh-token.service.js.map +1 -1
- package/dist/services/mongoose/role.service.js +14 -5
- package/dist/services/mongoose/role.service.js.map +1 -1
- package/dist/services/mongoose/settings.service.js +35 -62
- package/dist/services/mongoose/settings.service.js.map +1 -1
- package/dist/services/mongoose/user.service.js +8 -7
- package/dist/services/mongoose/user.service.js.map +1 -1
- package/dist/services/moonraker/constants/{websocket.constants.js → moonraker.constants.js} +1 -1
- package/dist/services/moonraker/constants/{websocket.constants.js.map → moonraker.constants.js.map} +1 -1
- package/dist/services/moonraker/moonraker-websocket.adapter.js +108 -96
- package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
- package/dist/services/moonraker/moonraker.client.js +212 -167
- package/dist/services/moonraker/moonraker.client.js.map +1 -1
- package/dist/services/moonraker.api.js +3 -5
- package/dist/services/moonraker.api.js.map +1 -1
- package/dist/services/octoprint/constants/octoprint-service.constants.js +7 -36
- package/dist/services/octoprint/constants/octoprint-service.constants.js.map +1 -1
- package/dist/services/octoprint/constants/octoprint-websocket.constants.js +12 -3
- package/dist/services/octoprint/constants/octoprint-websocket.constants.js.map +1 -1
- package/dist/services/octoprint/dto/octoprint-event.dto.js +2 -1
- package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.routes.js +0 -98
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-websocket.adapter.js +72 -72
- package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -1
- package/dist/services/octoprint/octoprint.client.js +87 -343
- package/dist/services/octoprint/octoprint.client.js.map +1 -1
- package/dist/services/octoprint/utils/octoprint-http-client.builder.js +31 -0
- package/dist/services/octoprint/utils/octoprint-http-client.builder.js.map +1 -0
- package/dist/services/octoprint.api.js +14 -18
- package/dist/services/octoprint.api.js.map +1 -1
- package/dist/services/orm/base.service.js +11 -12
- package/dist/services/orm/base.service.js.map +1 -1
- package/dist/services/orm/camera-stream.service.js +5 -1
- package/dist/services/orm/camera-stream.service.js.map +1 -1
- package/dist/services/orm/custom-gcode.service.js +2 -2
- package/dist/services/orm/custom-gcode.service.js.map +1 -1
- package/dist/services/orm/floor-position.service.js +0 -5
- package/dist/services/orm/floor-position.service.js.map +1 -1
- package/dist/services/orm/floor.service.js +43 -39
- package/dist/services/orm/floor.service.js.map +1 -1
- package/dist/services/orm/permission.service.js +3 -4
- package/dist/services/orm/permission.service.js.map +1 -1
- package/dist/services/orm/print-completion.service.js +2 -4
- package/dist/services/orm/print-completion.service.js.map +1 -1
- package/dist/services/orm/printer-group.service.js +2 -7
- package/dist/services/orm/printer-group.service.js.map +1 -1
- package/dist/services/orm/printer.service.js +29 -39
- package/dist/services/orm/printer.service.js.map +1 -1
- package/dist/services/orm/refresh-token.service.js +5 -11
- package/dist/services/orm/refresh-token.service.js.map +1 -1
- package/dist/services/orm/role.service.js +11 -10
- package/dist/services/orm/role.service.js.map +1 -1
- package/dist/services/orm/settings.service.js +37 -133
- package/dist/services/orm/settings.service.js.map +1 -1
- package/dist/services/orm/user.service.js +13 -15
- package/dist/services/orm/user.service.js.map +1 -1
- package/dist/services/printer-api.factory.js +9 -6
- package/dist/services/printer-api.factory.js.map +1 -1
- package/dist/services/printer-api.interface.js +13 -6
- package/dist/services/printer-api.interface.js.map +1 -1
- package/dist/services/prusa-link/constants/prusalink-event.dto.js +18 -0
- package/dist/services/prusa-link/constants/prusalink-event.dto.js.map +1 -0
- package/dist/services/prusa-link/constants/prusalink.constants.js +13 -0
- package/dist/services/prusa-link/constants/prusalink.constants.js.map +1 -0
- package/dist/services/prusa-link/dto/file-response.dto.js +6 -0
- package/dist/services/prusa-link/dto/file-response.dto.js.map +1 -0
- package/dist/services/prusa-link/dto/file.dto.js +6 -0
- package/dist/services/prusa-link/dto/file.dto.js.map +1 -0
- package/dist/services/prusa-link/dto/job-state.dto.js +6 -0
- package/dist/services/prusa-link/dto/job-state.dto.js.map +1 -0
- package/dist/services/prusa-link/dto/printer-state.dto.js +6 -0
- package/dist/services/prusa-link/dto/printer-state.dto.js.map +1 -0
- package/dist/services/prusa-link/dto/status.dto.js +6 -0
- package/dist/services/prusa-link/dto/status.dto.js.map +1 -0
- package/dist/services/prusa-link/dto/version.dto.js +6 -0
- package/dist/services/prusa-link/dto/version.dto.js.map +1 -0
- package/dist/services/prusa-link/prusa-link-http-polling.adapter.js +142 -0
- package/dist/services/prusa-link/prusa-link-http-polling.adapter.js.map +1 -0
- package/dist/services/prusa-link/prusa-link.api.js +233 -0
- package/dist/services/prusa-link/prusa-link.api.js.map +1 -0
- package/dist/services/prusa-link/utils/digest-auth.params.js +6 -0
- package/dist/services/prusa-link/utils/digest-auth.params.js.map +1 -0
- package/dist/services/prusa-link/utils/digest-auth.util.js +28 -0
- package/dist/services/prusa-link/utils/digest-auth.util.js.map +1 -0
- package/dist/services/prusa-link/utils/prusa-link-http-client.builder.js +131 -0
- package/dist/services/prusa-link/utils/prusa-link-http-client.builder.js.map +1 -0
- package/dist/services/socket.factory.js +9 -6
- package/dist/services/socket.factory.js.map +1 -1
- package/dist/services/{core/task-manager.service.js → task-manager.service.js} +72 -78
- package/dist/services/task-manager.service.js.map +1 -0
- package/dist/services/validators/camera-service.validation.js +19 -0
- package/dist/services/validators/camera-service.validation.js.map +1 -0
- package/dist/services/validators/floor-service.validation.js +47 -36
- package/dist/services/validators/floor-service.validation.js.map +1 -1
- package/dist/services/validators/print-completion-service.validation.js +22 -9
- package/dist/services/validators/print-completion-service.validation.js.map +1 -1
- package/dist/services/validators/printer-service.validation.js +112 -29
- package/dist/services/validators/printer-service.validation.js.map +1 -1
- package/dist/services/validators/settings-service.validation.js +78 -66
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/services/validators/user-service.validation.js +17 -16
- package/dist/services/validators/user-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +94 -51
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/shared/default-http-client.builder.js +94 -0
- package/dist/shared/default-http-client.builder.js.map +1 -0
- package/dist/shared/load-controllers.js +20 -0
- package/dist/shared/load-controllers.js.map +1 -0
- package/dist/shared/runtime-settings.migration.js +46 -0
- package/dist/shared/runtime-settings.migration.js.map +1 -0
- package/dist/shared/websocket-rpc-extended.adapter.js +15 -14
- package/dist/shared/websocket-rpc-extended.adapter.js.map +1 -1
- package/dist/shared/websocket.adapter.js +4 -5
- package/dist/shared/websocket.adapter.js.map +1 -1
- package/dist/state/file-upload-tracker.cache.js +33 -42
- package/dist/state/file-upload-tracker.cache.js.map +1 -1
- package/dist/state/file.cache.js +1 -1
- package/dist/state/file.cache.js.map +1 -1
- package/dist/state/floor.store.js +6 -6
- package/dist/state/floor.store.js.map +1 -1
- package/dist/state/printer-events.cache.js +21 -22
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/printer-files.store.js +6 -8
- package/dist/state/printer-files.store.js.map +1 -1
- package/dist/state/printer-socket.store.js +27 -50
- package/dist/state/printer-socket.store.js.map +1 -1
- package/dist/state/printer-thumbnail.cache.js +5 -9
- package/dist/state/printer-thumbnail.cache.js.map +1 -1
- package/dist/state/printer.cache.js +14 -12
- package/dist/state/printer.cache.js.map +1 -1
- package/dist/state/settings.store.js +78 -51
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/socket-io.gateway.js +39 -36
- package/dist/state/socket-io.gateway.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +20 -15
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/dist/state/validation/create-test-printer.validation.js +13 -10
- package/dist/state/validation/create-test-printer.validation.js.map +1 -1
- package/dist/task.presets.js.map +1 -1
- package/dist/tasks/boot.task.js +14 -19
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/client-bundle.task.js +1 -3
- package/dist/tasks/client-bundle.task.js.map +1 -1
- package/dist/tasks/print-completion.socketio.task.js +27 -28
- package/dist/tasks/print-completion.socketio.task.js.map +1 -1
- package/dist/tasks/printer-file-clean.task.js +6 -10
- package/dist/tasks/printer-file-clean.task.js.map +1 -1
- package/dist/tasks/printer-websocket-restore.task.js +4 -15
- package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
- package/dist/tasks/printer-websocket.task.js +2 -14
- package/dist/tasks/printer-websocket.task.js.map +1 -1
- package/dist/tasks/socketio.task.js +8 -35
- package/dist/tasks/socketio.task.js.map +1 -1
- package/dist/tasks/software-update.task.js +1 -1
- package/dist/tasks/software-update.task.js.map +1 -1
- package/dist/tasks.js +3 -3
- package/dist/tasks.js.map +1 -1
- package/dist/utils/array.util.js.map +1 -1
- package/dist/utils/cache/key-diff.cache.js.map +1 -1
- package/dist/utils/env.utils.js +0 -2
- package/dist/utils/env.utils.js.map +1 -1
- package/dist/utils/normalize-url.js +6 -3
- package/dist/utils/normalize-url.js.map +1 -1
- package/dist/utils/pretty-print.utils.js +1 -1
- package/dist/utils/pretty-print.utils.js.map +1 -1
- package/dist/utils/printer-type.utils.js.map +1 -1
- package/dist/utils/time.utils.js +7 -17
- package/dist/utils/time.utils.js.map +1 -1
- package/dist/utils/url.utils.js +11 -14
- package/dist/utils/url.utils.js.map +1 -1
- package/package.json +53 -55
- package/tsconfig.json +2 -1
- package/.yarn/releases/yarn-4.6.0.cjs +0 -934
- package/dist/consoles/check-ports.js +0 -170
- package/dist/consoles/check-ports.js.map +0 -1
- package/dist/consoles/sqlite-torm.js +0 -31
- package/dist/consoles/sqlite-torm.js.map +0 -1
- package/dist/consoles/upload-test.js +0 -52
- package/dist/consoles/upload-test.js.map +0 -1
- package/dist/controllers/plugin-firmware-update.controller.js +0 -236
- package/dist/controllers/plugin-firmware-update.controller.js.map +0 -1
- package/dist/entities/base.entity.js +0 -29
- package/dist/entities/base.entity.js.map +0 -1
- package/dist/entities/printer-file.entity.js +0 -140
- package/dist/entities/printer-file.entity.js.map +0 -1
- package/dist/handlers/cache-manager.js +0 -18
- package/dist/handlers/cache-manager.js.map +0 -1
- package/dist/models/PrinterFile.js +0 -44
- package/dist/models/PrinterFile.js.map +0 -1
- package/dist/services/core/task-manager.service.js.map +0 -1
- package/dist/services/octoprint/plugin-base.service.js +0 -101
- package/dist/services/octoprint/plugin-base.service.js.map +0 -1
- package/dist/services/octoprint/plugin-firmware-update.service.js +0 -100
- package/dist/services/octoprint/plugin-firmware-update.service.js.map +0 -1
- package/dist/services/octoprint/plugin-repository.cache.js +0 -45
- package/dist/services/octoprint/plugin-repository.cache.js.map +0 -1
- package/dist/utils/benchmark.util.js +0 -39
- package/dist/utils/benchmark.util.js.map +0 -1
- package/dist/utils/is-docker.js +0 -40
- package/dist/utils/is-docker.js.map +0 -1
- package/dist/utils/metric.utils.js +0 -35
- package/dist/utils/metric.utils.js.map +0 -1
- package/requests/moonraker/api_job.http +0 -5
- package/requests/moonraker/api_printer.http +0 -5
- package/requests/moonraker/api_settings.http +0 -5
- package/requests/moonraker/printer_info.http +0 -5
- package/requests/moonraker/printer_objects_list.http +0 -6
- package/requests/moonraker/printer_objects_pause_resume.http +0 -6
- package/requests/moonraker/printer_objects_print_stats.http +0 -6
- package/requests/moonraker/printer_objects_webhooks.http +0 -6
- package/requests/moonraker/server_info.http +0 -5
- package/requests/octoprint/octoprint-api-printer-current.http +0 -7
- package/requests/octoprint/octoprint-pluginmanager-plugins.http +0 -7
- package/requests/printer-file/get-partial-file-moonraker.http +0 -5
- package/requests/printer-file/get-thumbnails.http +0 -5
- package/requests/printer-file/reload-printer-thumbnails.http +0 -10
- package/requests/printer-file/testfile.gcode +0 -5665
- package/requests/printer-file/upload-file.http +0 -11
- package/requests/printer-file/upload-slicer-file.http +0 -11
- package/requests/printers/list.http +0 -5
|
@@ -11,27 +11,17 @@ Object.defineProperty(exports, "PrinterService", {
|
|
|
11
11
|
const _printerdto = require("../interfaces/printer.dto");
|
|
12
12
|
const _printerentity = require("../../entities/printer.entity");
|
|
13
13
|
const _baseservice = require("./base.service");
|
|
14
|
-
const _urlutils = require("../../utils/url.utils");
|
|
15
14
|
const _validators = require("../../handlers/validators");
|
|
16
|
-
const _printerservicevalidation = require("../validators/printer-service.validation");
|
|
17
15
|
const _eventconstants = require("../../constants/event.constants");
|
|
18
|
-
|
|
19
|
-
|
|
16
|
+
const _normalizeurl = require("../../utils/normalize-url");
|
|
17
|
+
const _urlutils = require("../../utils/url.utils");
|
|
18
|
+
const _printerservicevalidation = require("../validators/printer-service.validation");
|
|
19
|
+
class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printer, _printerdto.PrinterDto, _printerdto.CreatePrinterDto) {
|
|
20
20
|
eventEmitter2;
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
});
|
|
21
|
+
logger;
|
|
22
|
+
constructor(loggerFactory, typeormService, eventEmitter2){
|
|
23
|
+
super(typeormService), this.eventEmitter2 = eventEmitter2;
|
|
25
24
|
this.logger = loggerFactory(PrinterService.name);
|
|
26
|
-
this.eventEmitter2 = eventEmitter2;
|
|
27
|
-
}
|
|
28
|
-
toUnsafeDto(entity) {
|
|
29
|
-
return {
|
|
30
|
-
...this.toDto(entity),
|
|
31
|
-
apiKey: entity.apiKey,
|
|
32
|
-
printerURL: entity.printerURL,
|
|
33
|
-
printerType: entity.printerType
|
|
34
|
-
};
|
|
35
25
|
}
|
|
36
26
|
toDto(entity) {
|
|
37
27
|
return {
|
|
@@ -39,7 +29,12 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
|
|
|
39
29
|
name: entity.name,
|
|
40
30
|
enabled: entity.enabled,
|
|
41
31
|
disabledReason: entity.disabledReason,
|
|
42
|
-
dateAdded: entity.dateAdded
|
|
32
|
+
dateAdded: entity.dateAdded,
|
|
33
|
+
apiKey: entity.apiKey,
|
|
34
|
+
username: entity.username,
|
|
35
|
+
password: entity.password,
|
|
36
|
+
printerURL: entity.printerURL,
|
|
37
|
+
printerType: entity.printerType
|
|
43
38
|
};
|
|
44
39
|
}
|
|
45
40
|
async list() {
|
|
@@ -50,9 +45,6 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
|
|
|
50
45
|
});
|
|
51
46
|
}
|
|
52
47
|
async create(newPrinter, emitEvent = true) {
|
|
53
|
-
if (newPrinter.id) {
|
|
54
|
-
delete newPrinter.id;
|
|
55
|
-
}
|
|
56
48
|
const mergedPrinter = await this.validateAndDefault(newPrinter);
|
|
57
49
|
mergedPrinter.dateAdded = Date.now();
|
|
58
50
|
const printer = await super.create(mergedPrinter);
|
|
@@ -66,26 +58,29 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
|
|
|
66
58
|
async update(printerId, partial) {
|
|
67
59
|
const printer = await this.get(printerId);
|
|
68
60
|
if (partial.printerURL) {
|
|
69
|
-
partial.printerURL = (0,
|
|
61
|
+
partial.printerURL = (0, _normalizeurl.normalizeUrl)(partial.printerURL, {
|
|
62
|
+
defaultProtocol: _urlutils.defaultHttpProtocol
|
|
63
|
+
});
|
|
70
64
|
}
|
|
71
65
|
Object.assign(printer, partial);
|
|
72
|
-
const { printerURL, apiKey, enabled, name, printerType } = await (0, _validators.validateInput)(printer, _printerservicevalidation.
|
|
66
|
+
const { printerURL, apiKey, enabled, name, printerType, password, username } = await (0, _validators.validateInput)(printer, _printerservicevalidation.createPrinterSchema);
|
|
73
67
|
const updatedPrinter = await super.update(printerId, {
|
|
74
68
|
printerURL,
|
|
75
69
|
name,
|
|
76
70
|
apiKey,
|
|
77
71
|
enabled,
|
|
78
|
-
printerType
|
|
72
|
+
printerType,
|
|
73
|
+
password,
|
|
74
|
+
username
|
|
79
75
|
});
|
|
80
76
|
this.eventEmitter2.emit(_eventconstants.printerEvents.printerUpdated, {
|
|
81
|
-
printer
|
|
82
|
-
updatedPrinter
|
|
77
|
+
printer
|
|
83
78
|
});
|
|
84
79
|
return updatedPrinter;
|
|
85
80
|
}
|
|
86
81
|
async batchImport(printers) {
|
|
87
82
|
if (!printers?.length) return [];
|
|
88
|
-
this.logger.log("
|
|
83
|
+
this.logger.log("Validation passed");
|
|
89
84
|
for (let printer of printers){
|
|
90
85
|
await this.validateAndDefault(printer);
|
|
91
86
|
}
|
|
@@ -101,31 +96,24 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
|
|
|
101
96
|
return newPrinters;
|
|
102
97
|
}
|
|
103
98
|
async delete(printerId, emitEvent = true) {
|
|
104
|
-
|
|
99
|
+
await this.repository.delete([
|
|
105
100
|
printerId
|
|
106
101
|
]);
|
|
107
102
|
if (emitEvent) {
|
|
108
103
|
this.eventEmitter2.emit(_eventconstants.printerEvents.printersDeleted, {
|
|
109
104
|
printerIds: [
|
|
110
|
-
|
|
111
|
-
printerId
|
|
112
|
-
]
|
|
105
|
+
printerId
|
|
113
106
|
]
|
|
114
107
|
});
|
|
115
108
|
}
|
|
116
|
-
return result;
|
|
117
109
|
}
|
|
118
110
|
async deleteMany(printerIds, emitEvent = true) {
|
|
119
|
-
|
|
111
|
+
await this.repository.delete(printerIds);
|
|
120
112
|
if (emitEvent) {
|
|
121
113
|
this.eventEmitter2.emit(_eventconstants.printerEvents.printersDeleted, {
|
|
122
114
|
printerIds
|
|
123
115
|
});
|
|
124
116
|
}
|
|
125
|
-
return result;
|
|
126
|
-
}
|
|
127
|
-
updateConnectionSettings(printerId, partial) {
|
|
128
|
-
return this.update(printerId, partial);
|
|
129
117
|
}
|
|
130
118
|
updateDisabledReason(printerId, disabledReason) {
|
|
131
119
|
return this.update(printerId, {
|
|
@@ -153,9 +141,11 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
|
|
|
153
141
|
...printer
|
|
154
142
|
};
|
|
155
143
|
if (mergedPrinter.printerURL?.length) {
|
|
156
|
-
mergedPrinter.printerURL = (0,
|
|
144
|
+
mergedPrinter.printerURL = (0, _normalizeurl.normalizeUrl)(mergedPrinter.printerURL, {
|
|
145
|
+
defaultProtocol: _urlutils.defaultHttpProtocol
|
|
146
|
+
});
|
|
157
147
|
}
|
|
158
|
-
return await (0, _validators.validateInput)(mergedPrinter, _printerservicevalidation.
|
|
148
|
+
return await (0, _validators.validateInput)(mergedPrinter, _printerservicevalidation.createPrinterSchema);
|
|
159
149
|
}
|
|
160
150
|
}
|
|
161
151
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/printer.service.ts"],"names":["PrinterService","BaseService","Printer","PrinterDto","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/printer.service.ts"],"names":["PrinterService","BaseService","Printer","PrinterDto","CreatePrinterDto","logger","constructor","loggerFactory","typeormService","eventEmitter2","name","toDto","entity","id","enabled","disabledReason","dateAdded","apiKey","username","password","printerURL","printerType","list","repository","find","order","create","newPrinter","emitEvent","mergedPrinter","validateAndDefault","Date","now","printer","emit","printerEvents","printerCreated","update","printerId","partial","get","normalizeUrl","defaultProtocol","defaultHttpProtocol","Object","assign","validateInput","createPrinterSchema","updatedPrinter","printerUpdated","batchImport","printers","length","log","newPrinters","createdPrinter","push","batchPrinterCreated","delete","printersDeleted","printerIds","deleteMany","updateDisabledReason","updateEnabled","updateFeedRate","feedRate","updateFlowRate","flowRate"],"mappings":"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"}
|
|
@@ -19,11 +19,8 @@ const _authorizationconstants = require("../../constants/authorization.constants
|
|
|
19
19
|
class RefreshTokenService extends (0, _baseservice.BaseService)(_entities.RefreshToken, _refreshtokendto.RefreshTokenDto) {
|
|
20
20
|
settingsStore;
|
|
21
21
|
logger;
|
|
22
|
-
constructor(
|
|
23
|
-
super(
|
|
24
|
-
typeormService
|
|
25
|
-
});
|
|
26
|
-
this.settingsStore = settingsStore;
|
|
22
|
+
constructor(settingsStore, loggerFactory, typeormService){
|
|
23
|
+
super(typeormService), this.settingsStore = settingsStore;
|
|
27
24
|
this.logger = loggerFactory(RefreshTokenService.name);
|
|
28
25
|
}
|
|
29
26
|
toDto(entity) {
|
|
@@ -34,15 +31,12 @@ class RefreshTokenService extends (0, _baseservice.BaseService)(_entities.Refres
|
|
|
34
31
|
refreshAttemptsUsed: entity.refreshAttemptsUsed
|
|
35
32
|
};
|
|
36
33
|
}
|
|
37
|
-
async getRefreshToken(refreshToken
|
|
34
|
+
async getRefreshToken(refreshToken) {
|
|
38
35
|
const entity = await this.repository.findOneBy({
|
|
39
36
|
refreshToken
|
|
40
37
|
});
|
|
41
38
|
if (!entity) {
|
|
42
|
-
|
|
43
|
-
throw new _runtimeexceptions.AuthenticationError(`The entity ${_entities.RefreshToken.name} by provided refresh token is not found`, _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredRefreshToken);
|
|
44
|
-
}
|
|
45
|
-
return null;
|
|
39
|
+
throw new _runtimeexceptions.AuthenticationError(`The entity ${_entities.RefreshToken.name} by provided refresh token is not found`, _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredRefreshToken);
|
|
46
40
|
}
|
|
47
41
|
return entity;
|
|
48
42
|
}
|
|
@@ -62,7 +56,7 @@ class RefreshTokenService extends (0, _baseservice.BaseService)(_entities.Refres
|
|
|
62
56
|
return refreshToken;
|
|
63
57
|
}
|
|
64
58
|
async updateRefreshTokenAttempts(refreshToken, refreshAttemptsUsed) {
|
|
65
|
-
await this.getRefreshToken(refreshToken
|
|
59
|
+
await this.getRefreshToken(refreshToken);
|
|
66
60
|
await this.repository.update({
|
|
67
61
|
refreshToken
|
|
68
62
|
}, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/refresh-token.service.ts"],"names":["RefreshTokenService","BaseService","RefreshToken","RefreshTokenDto","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/refresh-token.service.ts"],"names":["RefreshTokenService","BaseService","RefreshToken","RefreshTokenDto","logger","constructor","settingsStore","loggerFactory","typeormService","name","toDto","entity","id","userId","expiresAt","refreshAttemptsUsed","getRefreshToken","refreshToken","repository","findOneBy","AuthenticationError","AUTH_ERROR_REASON","InvalidOrExpiredRefreshToken","createRefreshTokenForUserId","refreshTokenExpiry","getCredentialSettings","uuidv4","timespan","AppConstants","DEFAULT_REFRESH_TOKEN_EXPIRY","warn","create","Date","now","updateRefreshTokenAttempts","update","purgeAllOutdatedRefreshTokens","result","delete","LessThan","affected","debug","deleteRefreshTokenByUserId","deleteRefreshToken","purgeOutdatedRefreshTokensByUserId"],"mappings":"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"}
|
|
@@ -15,20 +15,15 @@ const _lodash = require("lodash");
|
|
|
15
15
|
const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
|
|
16
16
|
const _authorizationconstants = require("../../constants/authorization.constants");
|
|
17
17
|
class RoleService extends (0, _baseservice.BaseService)(_entities.Role, _roledto.RoleDto) {
|
|
18
|
-
settingsStore;
|
|
19
18
|
appDefaultRole;
|
|
20
19
|
appDefaultRoleNoLogin;
|
|
20
|
+
settingsStore;
|
|
21
21
|
logger;
|
|
22
|
-
constructor(
|
|
23
|
-
super(
|
|
24
|
-
typeormService
|
|
25
|
-
});
|
|
22
|
+
constructor(typeormService, loggerFactory, appDefaultRole, appDefaultRoleNoLogin, settingsStore){
|
|
23
|
+
super(typeormService), this.appDefaultRole = appDefaultRole, this.appDefaultRoleNoLogin = appDefaultRoleNoLogin, this.settingsStore = settingsStore, this._roles = [];
|
|
26
24
|
this.logger = loggerFactory(RoleService.name);
|
|
27
|
-
this.settingsStore = settingsStore;
|
|
28
|
-
this.appDefaultRole = appDefaultRole;
|
|
29
|
-
this.appDefaultRoleNoLogin = appDefaultRoleNoLogin;
|
|
30
25
|
}
|
|
31
|
-
_roles
|
|
26
|
+
_roles;
|
|
32
27
|
get roles() {
|
|
33
28
|
return this._roles;
|
|
34
29
|
}
|
|
@@ -93,7 +88,13 @@ class RoleService extends (0, _baseservice.BaseService)(_entities.Role, _roledto
|
|
|
93
88
|
return role;
|
|
94
89
|
}
|
|
95
90
|
getRolePermissions(role) {
|
|
91
|
+
if (!role || !role?.length) {
|
|
92
|
+
return [];
|
|
93
|
+
}
|
|
96
94
|
const normalizedRole = this.normalizeRoleIdOrName(role);
|
|
95
|
+
if (!normalizedRole?.length) {
|
|
96
|
+
return [];
|
|
97
|
+
}
|
|
97
98
|
return _authorizationconstants.ROLE_PERMS[normalizedRole];
|
|
98
99
|
}
|
|
99
100
|
async getSynchronizedRoleByName(roleName) {
|
|
@@ -121,7 +122,7 @@ class RoleService extends (0, _baseservice.BaseService)(_entities.Role, _roledto
|
|
|
121
122
|
normalizeRoleIdOrName(assignedRole) {
|
|
122
123
|
const roleInstance = this.roles.find((r)=>r.id === assignedRole || r.name === assignedRole);
|
|
123
124
|
if (!roleInstance) {
|
|
124
|
-
|
|
125
|
+
this.logger.warn(`The role by provided id was not found. Skipping.`);
|
|
125
126
|
return;
|
|
126
127
|
}
|
|
127
128
|
return roleInstance.name;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/role.service.ts"],"names":["RoleService","BaseService","Role","RoleDto","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/role.service.ts"],"names":["RoleService","BaseService","Role","RoleDto","logger","constructor","typeormService","loggerFactory","appDefaultRole","appDefaultRoleNoLogin","settingsStore","_roles","name","roles","getAppDefaultRole","getLoginRequired","getAppDefaultRoleIds","length","syncRoles","guestRole","getRoleByName","id","toDto","role","getRolesPermissions","permissions","normalizedRole","normalizeRoleIdOrName","rolePermissions","getRolePermissions","union","authorizeRoles","requiredRoles","assignedRoles","subset","isAuthorized","forEach","rr","result","authorizeRole","requiredRole","find","ar","getManyRoles","roleIds","map","roleId","getRole","r","NotFoundException","roleName","ROLE_PERMS","getSynchronizedRoleByName","Object","values","ROLES","storedRole","repository","findOneBy","newRole","create","push","assignedRole","roleInstance","warn"],"mappings":"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"}
|
|
@@ -2,24 +2,20 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
Object.defineProperty(exports, "
|
|
5
|
+
Object.defineProperty(exports, "SettingsService", {
|
|
6
6
|
enumerable: true,
|
|
7
7
|
get: function() {
|
|
8
|
-
return
|
|
8
|
+
return SettingsService;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
const _entities = require("../../entities");
|
|
12
12
|
const _serversettingsconstants = require("../../constants/server-settings.constants");
|
|
13
13
|
const _baseservice = require("./base.service");
|
|
14
14
|
const _settingsdto = require("../interfaces/settings.dto");
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
typeormService
|
|
20
|
-
});
|
|
21
|
-
this.configService = configService;
|
|
22
|
-
}
|
|
15
|
+
const _settingsservicevalidation = require("../validators/settings-service.validation");
|
|
16
|
+
const _runtimesettingsmigration = require("../../shared/runtime-settings.migration");
|
|
17
|
+
const _validators = require("../../handlers/validators");
|
|
18
|
+
class SettingsService extends (0, _baseservice.BaseService)(_entities.Settings, _settingsdto.SettingsDto) {
|
|
23
19
|
toDto(entity) {
|
|
24
20
|
return {
|
|
25
21
|
[_serversettingsconstants.serverSettingsKey]: {
|
|
@@ -33,168 +29,76 @@ class SettingsService2 extends (0, _baseservice.BaseService)(_entities.Settings,
|
|
|
33
29
|
};
|
|
34
30
|
}
|
|
35
31
|
async getOrCreate() {
|
|
36
|
-
let settings = await this.
|
|
32
|
+
let settings = await this.getOptional();
|
|
37
33
|
if (!settings) {
|
|
38
|
-
|
|
39
|
-
[_serversettingsconstants.serverSettingsKey]: (0, _serversettingsconstants.getDefaultServerSettings)(),
|
|
40
|
-
[_serversettingsconstants.credentialSettingsKey]: (0, _serversettingsconstants.getDefaultCredentialSettings)(),
|
|
41
|
-
[_serversettingsconstants.wizardSettingKey]: (0, _serversettingsconstants.getDefaultWizardSettings)(),
|
|
42
|
-
[_serversettingsconstants.printerFileCleanSettingKey]: (0, _serversettingsconstants.getDefaultFileCleanSettings)(),
|
|
43
|
-
[_serversettingsconstants.frontendSettingKey]: (0, _serversettingsconstants.getDefaultFrontendSettings)(),
|
|
44
|
-
[_serversettingsconstants.timeoutSettingKey]: (0, _serversettingsconstants.getDefaultTimeout)()
|
|
45
|
-
});
|
|
46
|
-
return settings;
|
|
34
|
+
return await this.create((0, _serversettingsconstants.getDefaultSettings)());
|
|
47
35
|
} else {
|
|
48
|
-
settings =
|
|
36
|
+
settings = (0, _runtimesettingsmigration.migrateSettingsRuntime)(settings);
|
|
37
|
+
const settingsId = settings.id;
|
|
38
|
+
return await this.update(settingsId, settings);
|
|
49
39
|
}
|
|
50
|
-
return settings;
|
|
51
40
|
}
|
|
52
41
|
async getServerSettings() {
|
|
53
42
|
const settings = await this.getOrCreate();
|
|
54
43
|
return settings[_serversettingsconstants.serverSettingsKey];
|
|
55
44
|
}
|
|
56
|
-
async
|
|
57
|
-
const
|
|
58
|
-
if (!entity[_serversettingsconstants.serverSettingsKey]) {
|
|
59
|
-
throw new Error("No existing server settings found, cant patch");
|
|
60
|
-
}
|
|
61
|
-
const newServerSettings = {
|
|
62
|
-
...entity[_serversettingsconstants.serverSettingsKey],
|
|
63
|
-
...serverSettingsPartial
|
|
64
|
-
};
|
|
65
|
-
return await this.updateServerSettings(newServerSettings);
|
|
66
|
-
}
|
|
67
|
-
async updateServerSettings(serverSettings) {
|
|
45
|
+
async updateServerSettings(update) {
|
|
46
|
+
const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.serverSettingsUpdateSchema);
|
|
68
47
|
const entity = await this.getOrCreate();
|
|
69
|
-
entity[_serversettingsconstants.serverSettingsKey] =
|
|
48
|
+
entity[_serversettingsconstants.serverSettingsKey] = validatedInput;
|
|
70
49
|
await this.update(entity.id, entity);
|
|
71
50
|
return entity;
|
|
72
51
|
}
|
|
73
|
-
async
|
|
52
|
+
async updateJwtSecretCredentialSetting(update) {
|
|
53
|
+
const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.jwtSecretCredentialSettingUpdateSchema);
|
|
74
54
|
const entity = await this.getOrCreate();
|
|
75
|
-
entity[_serversettingsconstants.credentialSettingsKey] =
|
|
55
|
+
entity[_serversettingsconstants.credentialSettingsKey].jwtSecret = validatedInput.jwtSecret;
|
|
76
56
|
await this.update(entity.id, entity);
|
|
77
57
|
return entity;
|
|
78
58
|
}
|
|
79
|
-
async
|
|
59
|
+
async updateCredentialSettings(update) {
|
|
60
|
+
const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.credentialSettingUpdateSchema);
|
|
80
61
|
const entity = await this.getOrCreate();
|
|
81
|
-
entity[_serversettingsconstants.
|
|
62
|
+
entity[_serversettingsconstants.credentialSettingsKey].refreshTokenExpiry = validatedInput.refreshTokenExpiry;
|
|
63
|
+
entity[_serversettingsconstants.credentialSettingsKey].refreshTokenAttempts = validatedInput.refreshTokenAttempts;
|
|
64
|
+
entity[_serversettingsconstants.credentialSettingsKey].jwtExpiresIn = validatedInput.jwtExpiresIn;
|
|
82
65
|
await this.update(entity.id, entity);
|
|
83
66
|
return entity;
|
|
84
67
|
}
|
|
85
|
-
async
|
|
68
|
+
async updateFileCleanSettings(update) {
|
|
69
|
+
const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.fileCleanSettingsUpdateSchema);
|
|
86
70
|
const entity = await this.getOrCreate();
|
|
87
|
-
entity[_serversettingsconstants.
|
|
71
|
+
entity[_serversettingsconstants.printerFileCleanSettingKey] = validatedInput;
|
|
88
72
|
await this.update(entity.id, entity);
|
|
89
73
|
return entity;
|
|
90
74
|
}
|
|
91
|
-
async
|
|
75
|
+
async updateFrontendSettings(update) {
|
|
76
|
+
const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.frontendSettingsUpdateSchema);
|
|
92
77
|
const entity = await this.getOrCreate();
|
|
93
|
-
entity[_serversettingsconstants.
|
|
78
|
+
entity[_serversettingsconstants.frontendSettingKey] = validatedInput;
|
|
94
79
|
await this.update(entity.id, entity);
|
|
95
80
|
return entity;
|
|
96
81
|
}
|
|
97
|
-
async
|
|
82
|
+
async updateTimeoutSettings(update) {
|
|
83
|
+
const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.timeoutSettingsUpdateSchema);
|
|
98
84
|
const entity = await this.getOrCreate();
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
const newWizardSettings = {
|
|
103
|
-
...entity[_serversettingsconstants.wizardSettingKey],
|
|
104
|
-
...wizardSettingsPartial
|
|
105
|
-
};
|
|
106
|
-
return await this.updateWizardSettings(newWizardSettings);
|
|
85
|
+
entity[_serversettingsconstants.timeoutSettingKey] = validatedInput;
|
|
86
|
+
await this.update(entity.id, entity);
|
|
87
|
+
return entity;
|
|
107
88
|
}
|
|
108
|
-
async updateWizardSettings(
|
|
89
|
+
async updateWizardSettings(update) {
|
|
90
|
+
const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.wizardUpdateSchema);
|
|
109
91
|
const entity = await this.getOrCreate();
|
|
110
|
-
entity[_serversettingsconstants.wizardSettingKey] =
|
|
92
|
+
entity[_serversettingsconstants.wizardSettingKey] = validatedInput;
|
|
111
93
|
await this.update(entity.id, entity);
|
|
112
94
|
return entity;
|
|
113
95
|
}
|
|
114
|
-
async
|
|
96
|
+
async getOptional() {
|
|
115
97
|
const settingsList = await this.repository.find({
|
|
116
98
|
take: 1
|
|
117
99
|
});
|
|
118
100
|
return settingsList?.length ? settingsList[0] : null;
|
|
119
101
|
}
|
|
120
|
-
migrateSettingsRuntime(knownSettings) {
|
|
121
|
-
const entity = knownSettings;
|
|
122
|
-
if (!entity[_serversettingsconstants.printerFileCleanSettingKey]) {
|
|
123
|
-
entity[_serversettingsconstants.printerFileCleanSettingKey] = (0, _serversettingsconstants.getDefaultFileCleanSettings)();
|
|
124
|
-
} else {
|
|
125
|
-
entity[_serversettingsconstants.printerFileCleanSettingKey] = {
|
|
126
|
-
autoRemoveOldFilesBeforeUpload: entity[_serversettingsconstants.printerFileCleanSettingKey].autoRemoveOldFilesBeforeUpload,
|
|
127
|
-
autoRemoveOldFilesAtBoot: entity[_serversettingsconstants.printerFileCleanSettingKey].autoRemoveOldFilesBeforeUpload,
|
|
128
|
-
autoRemoveOldFilesCriteriumDays: entity[_serversettingsconstants.printerFileCleanSettingKey].autoRemoveOldFilesCriteriumDays
|
|
129
|
-
};
|
|
130
|
-
}
|
|
131
|
-
if (!entity[_serversettingsconstants.wizardSettingKey]) {
|
|
132
|
-
entity[_serversettingsconstants.wizardSettingKey] = (0, _serversettingsconstants.getDefaultWizardSettings)();
|
|
133
|
-
}
|
|
134
|
-
if (!entity[_serversettingsconstants.timeoutSettingKey]) {
|
|
135
|
-
entity[_serversettingsconstants.timeoutSettingKey] = (0, _serversettingsconstants.getDefaultTimeout)();
|
|
136
|
-
}
|
|
137
|
-
if (!entity[_serversettingsconstants.serverSettingsKey]) {
|
|
138
|
-
entity[_serversettingsconstants.serverSettingsKey] = (0, _serversettingsconstants.getDefaultServerSettings)();
|
|
139
|
-
} else {
|
|
140
|
-
entity[_serversettingsconstants.serverSettingsKey] = {
|
|
141
|
-
debugSettings: entity[_serversettingsconstants.serverSettingsKey].debugSettings,
|
|
142
|
-
loginRequired: entity[_serversettingsconstants.serverSettingsKey].loginRequired,
|
|
143
|
-
registration: entity[_serversettingsconstants.serverSettingsKey].registration,
|
|
144
|
-
experimentalClientSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalClientSupport,
|
|
145
|
-
experimentalMoonrakerSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
|
|
146
|
-
sentryDiagnosticsEnabled: entity[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled,
|
|
147
|
-
experimentalThumbnailSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalThumbnailSupport || false
|
|
148
|
-
};
|
|
149
|
-
}
|
|
150
|
-
if (!entity[_serversettingsconstants.credentialSettingsKey]) {
|
|
151
|
-
entity[_serversettingsconstants.credentialSettingsKey] = (0, _serversettingsconstants.getDefaultCredentialSettings)();
|
|
152
|
-
}
|
|
153
|
-
if (!entity[_serversettingsconstants.frontendSettingKey]) {
|
|
154
|
-
entity[_serversettingsconstants.frontendSettingKey] = (0, _serversettingsconstants.getDefaultFrontendSettings)();
|
|
155
|
-
}
|
|
156
|
-
return entity;
|
|
157
|
-
}
|
|
158
|
-
async patchCredentialSettings(patchUpdate) {
|
|
159
|
-
const entity = await this.getOrCreate();
|
|
160
|
-
if (!entity[_serversettingsconstants.credentialSettingsKey]) {
|
|
161
|
-
throw new Error("No existing wizard settings found, cant patch");
|
|
162
|
-
}
|
|
163
|
-
const newCredentialSettings = {
|
|
164
|
-
...entity[_serversettingsconstants.credentialSettingsKey],
|
|
165
|
-
...patchUpdate
|
|
166
|
-
};
|
|
167
|
-
return await this.updateCredentialSettings(newCredentialSettings);
|
|
168
|
-
}
|
|
169
|
-
async patchFileCleanSettings(patchUpdate) {
|
|
170
|
-
const entity = await this.getOrCreate();
|
|
171
|
-
if (!entity[_serversettingsconstants.printerFileCleanSettingKey]) {
|
|
172
|
-
throw new Error("No existing wizard settings found, cant patch");
|
|
173
|
-
}
|
|
174
|
-
const newFileCleanSettings = {
|
|
175
|
-
...entity[_serversettingsconstants.printerFileCleanSettingKey],
|
|
176
|
-
...patchUpdate
|
|
177
|
-
};
|
|
178
|
-
return await this.updateFileCleanSettings(newFileCleanSettings);
|
|
179
|
-
}
|
|
180
|
-
async setLoginRequired(enabled) {
|
|
181
|
-
const entity = await this.getOrCreate();
|
|
182
|
-
entity[_serversettingsconstants.serverSettingsKey].loginRequired = enabled;
|
|
183
|
-
await this.update(entity.id, entity);
|
|
184
|
-
return entity;
|
|
185
|
-
}
|
|
186
|
-
async setRegistrationEnabled(enabled) {
|
|
187
|
-
const entity = await this.getOrCreate();
|
|
188
|
-
entity[_serversettingsconstants.serverSettingsKey].registration = enabled;
|
|
189
|
-
await this.update(entity.id, entity);
|
|
190
|
-
return entity;
|
|
191
|
-
}
|
|
192
|
-
async setSentryDiagnosticsEnabled(enabled) {
|
|
193
|
-
const entity = await this.getOrCreate();
|
|
194
|
-
entity[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled = enabled;
|
|
195
|
-
await this.update(entity.id, entity);
|
|
196
|
-
return entity;
|
|
197
|
-
}
|
|
198
102
|
}
|
|
199
103
|
|
|
200
104
|
//# sourceMappingURL=settings.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/settings.service.ts"],"names":["
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/settings.service.ts"],"names":["SettingsService","BaseService","Settings","SettingsDto","toDto","entity","serverSettingsKey","experimentalTypeormSupport","frontendSettingKey","printerFileCleanSettingKey","wizardSettingKey","timeoutSettingKey","getOrCreate","settings","getOptional","create","getDefaultSettings","migrateSettingsRuntime","settingsId","id","update","getServerSettings","updateServerSettings","validatedInput","validateInput","serverSettingsUpdateSchema","updateJwtSecretCredentialSetting","jwtSecretCredentialSettingUpdateSchema","credentialSettingsKey","jwtSecret","updateCredentialSettings","credentialSettingUpdateSchema","refreshTokenExpiry","refreshTokenAttempts","jwtExpiresIn","updateFileCleanSettings","fileCleanSettingsUpdateSchema","updateFrontendSettings","frontendSettingsUpdateSchema","updateTimeoutSettings","timeoutSettingsUpdateSchema","updateWizardSettings","wizardUpdateSchema","settingsList","repository","find","take","length"],"mappings":"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"}
|