@fdm-monster/server 1.8.3 → 1.9.0
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 +6 -4
- 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 +27 -28
- package/RELEASE_NOTES.MD +69 -1
- 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 +5 -21
- package/dist/constants/event.constants.js.map +1 -1
- package/dist/constants/server-settings.constants.js +8 -12
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/container.js +13 -14
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +3 -4
- 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 +45 -29
- 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 +73 -26
- package/dist/controllers/printer-settings.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +57 -198
- 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 +87 -88
- 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 +25 -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-factory.js +2 -2
- package/dist/handlers/logger-factory.js.map +1 -1
- package/dist/handlers/logger.js +11 -58
- package/dist/handlers/logger.js.map +1 -1
- package/dist/handlers/logging/file-logging.transport.js +35 -0
- package/dist/handlers/logging/file-logging.transport.js.map +1 -0
- package/dist/handlers/logging/loki-logging.transport.js +55 -0
- package/dist/handlers/logging/loki-logging.transport.js.map +1 -0
- package/dist/handlers/logging/static.logger.js +134 -0
- package/dist/handlers/logging/static.logger.js.map +1 -0
- package/dist/handlers/validators.js +7 -116
- package/dist/handlers/validators.js.map +1 -1
- package/dist/index.js +13 -0
- 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 +35 -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 +11 -43
- 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 +8 -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 +22 -18
- package/dist/server.env.js.map +1 -1
- package/dist/server.host.js +24 -33
- 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 +1 -1
- package/dist/services/core/http-client.factory.js.map +1 -1
- package/dist/services/core/logs-manager.service.js +3 -3
- 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 +8 -7
- 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/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 -11
- 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 +33 -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 +109 -96
- package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
- package/dist/services/moonraker/moonraker.client.js +25 -16
- package/dist/services/moonraker/moonraker.client.js.map +1 -1
- package/dist/services/moonraker.api.js +5 -7
- 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 +1 -38
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-websocket.adapter.js +66 -72
- package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -1
- package/dist/services/octoprint/octoprint.client.js +19 -192
- package/dist/services/octoprint/octoprint.client.js.map +1 -1
- package/dist/services/octoprint/utils/octoprint-http-client.builder.js.map +1 -1
- package/dist/services/octoprint.api.js +10 -19
- 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 +21 -36
- 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/{octoprint/dto/plugin.dto.js → prusa-link/dto/file.dto.js} +1 -1
- 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 +235 -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 +79 -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.map +1 -1
- package/dist/shared/load-controllers.js +20 -0
- package/dist/shared/load-controllers.js.map +1 -0
- package/dist/shared/runtime-settings.migration.js +53 -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 +5 -4
- 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 +74 -50
- 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 -11
- 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 +3 -14
- 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 +6 -33
- 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 +3 -2
- package/dist/utils/normalize-url.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 +3 -4
- package/dist/utils/url.utils.js.map +1 -1
- package/package.json +46 -48
- package/tsconfig.json +2 -1
- package/.yarn/releases/yarn-4.7.0.cjs +0 -935
- package/dist/consoles/check-ports.js +0 -170
- package/dist/consoles/check-ports.js.map +0 -1
- package/dist/consoles/http-file-receiver.console.js +0 -81
- package/dist/consoles/http-file-receiver.console.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 -234
- 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/dto/plugin.dto.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 -46
- 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
|
@@ -2,60 +2,71 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
get: all[name]
|
|
9
|
-
});
|
|
10
|
-
}
|
|
11
|
-
_export(exports, {
|
|
12
|
-
ServerPrivateController: function() {
|
|
5
|
+
Object.defineProperty(exports, "ServerPrivateController", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
13
8
|
return ServerPrivateController;
|
|
14
|
-
},
|
|
15
|
-
default: function() {
|
|
16
|
-
return _default;
|
|
17
9
|
}
|
|
18
10
|
});
|
|
19
11
|
const _stream = require("stream");
|
|
20
12
|
const _awilixexpress = require("awilix-express");
|
|
21
13
|
const _authenticate = require("../middleware/authenticate");
|
|
22
|
-
const _logger = require("../handlers/logger");
|
|
23
14
|
const _serverconstants = require("../server.constants");
|
|
24
15
|
const _authorizationconstants = require("../constants/authorization.constants");
|
|
25
16
|
const _validators = require("../handlers/validators");
|
|
17
|
+
const _serverreleaseservice = require("../services/core/server-release.service");
|
|
18
|
+
const _clientbundleservice = require("../services/core/client-bundle.service");
|
|
19
|
+
const _printercache = require("../state/printer.cache");
|
|
20
|
+
const _yamlservice = require("../services/core/yaml.service");
|
|
21
|
+
const _multerservice = require("../services/core/multer.service");
|
|
22
|
+
const _logsmanagerservice = require("../services/core/logs-manager.service");
|
|
23
|
+
const _express = require("express");
|
|
26
24
|
const _demomiddleware = require("../middleware/demo.middleware");
|
|
25
|
+
const _githubservice = require("../services/core/github.service");
|
|
26
|
+
const _printerserviceinterface = require("../services/interfaces/printer.service.interface");
|
|
27
|
+
const _serverprivatevalidation = require("./validation/server-private.validation");
|
|
28
|
+
const _loggerfactory = require("../handlers/logger-factory");
|
|
29
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
30
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
31
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
32
|
+
else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
33
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
34
|
+
}
|
|
35
|
+
function _ts_metadata(k, v) {
|
|
36
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
37
|
+
}
|
|
27
38
|
class ServerPrivateController {
|
|
28
|
-
|
|
39
|
+
serverReleaseService;
|
|
29
40
|
printerCache;
|
|
30
41
|
printerService;
|
|
31
|
-
|
|
42
|
+
clientBundleService;
|
|
32
43
|
githubService;
|
|
44
|
+
logDumpService;
|
|
33
45
|
yamlService;
|
|
34
46
|
multerService;
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
serverReleaseService;
|
|
38
|
-
constructor({ serverReleaseService, printerCache, printerService, clientBundleService, githubService, logDumpService, printerSocketStore, yamlService, multerService }){
|
|
47
|
+
logger;
|
|
48
|
+
constructor(loggerFactory, serverReleaseService, printerCache, printerService, clientBundleService, githubService, logDumpService, yamlService, multerService){
|
|
39
49
|
this.serverReleaseService = serverReleaseService;
|
|
50
|
+
this.printerCache = printerCache;
|
|
51
|
+
this.printerService = printerService;
|
|
40
52
|
this.clientBundleService = clientBundleService;
|
|
41
53
|
this.githubService = githubService;
|
|
42
54
|
this.logDumpService = logDumpService;
|
|
43
|
-
this.printerSocketStore = printerSocketStore;
|
|
44
|
-
this.printerCache = printerCache;
|
|
45
|
-
this.printerService = printerService;
|
|
46
55
|
this.yamlService = yamlService;
|
|
47
56
|
this.multerService = multerService;
|
|
57
|
+
this.logger = loggerFactory(ServerPrivateController.name);
|
|
48
58
|
}
|
|
49
|
-
async
|
|
59
|
+
async getReleaseStateInfo(req, res) {
|
|
60
|
+
await this.serverReleaseService.syncLatestRelease();
|
|
61
|
+
const updateState = this.serverReleaseService.getState();
|
|
62
|
+
res.send(updateState);
|
|
63
|
+
}
|
|
64
|
+
async getClientReleases(_req, res) {
|
|
50
65
|
const releaseSpec = await this.clientBundleService.getReleases();
|
|
51
66
|
res.send(releaseSpec);
|
|
52
67
|
}
|
|
53
68
|
async updateClientBundleGithub(req, res) {
|
|
54
|
-
const
|
|
55
|
-
downloadRelease: "string",
|
|
56
|
-
allowDowngrade: "boolean"
|
|
57
|
-
};
|
|
58
|
-
const updateDto = await (0, _validators.validateMiddleware)(req, inputRules);
|
|
69
|
+
const updateDto = await (0, _validators.validateMiddleware)(req, _serverprivatevalidation.updateClientBundleSchema);
|
|
59
70
|
const willExecute = await this.clientBundleService.shouldUpdateWithReason(true, _serverconstants.AppConstants.defaultClientMinimum, updateDto.downloadRelease, updateDto.allowDowngrade);
|
|
60
71
|
this.logger.log(`Will execute: ${willExecute?.shouldUpdate}, reason: ${willExecute?.reason}`);
|
|
61
72
|
if (!willExecute?.shouldUpdate) {
|
|
@@ -69,7 +80,9 @@ class ServerPrivateController {
|
|
|
69
80
|
reason: willExecute?.reason
|
|
70
81
|
});
|
|
71
82
|
}
|
|
72
|
-
|
|
83
|
+
if (willExecute.targetVersion) {
|
|
84
|
+
await this.clientBundleService.downloadClientUpdate(willExecute.targetVersion);
|
|
85
|
+
}
|
|
73
86
|
return res.send({
|
|
74
87
|
executed: true,
|
|
75
88
|
requestedVersion: willExecute.requestedVersion,
|
|
@@ -84,11 +97,6 @@ class ServerPrivateController {
|
|
|
84
97
|
const rateLimitResponse = await this.githubService.getRateLimit();
|
|
85
98
|
res.send(rateLimitResponse.data);
|
|
86
99
|
}
|
|
87
|
-
async getReleaseStateInfo(req, res) {
|
|
88
|
-
await this.serverReleaseService.syncLatestRelease();
|
|
89
|
-
const updateState = this.serverReleaseService.getState();
|
|
90
|
-
res.send(updateState);
|
|
91
|
-
}
|
|
92
100
|
async importPrintersAndFloorsYaml(req, res) {
|
|
93
101
|
const files = await this.multerService.multerLoadFileAsync(req, res, [
|
|
94
102
|
".yaml"
|
|
@@ -125,12 +133,118 @@ class ServerPrivateController {
|
|
|
125
133
|
res.sendFile(filePath);
|
|
126
134
|
}
|
|
127
135
|
}
|
|
128
|
-
|
|
129
|
-
(0,
|
|
130
|
-
(0,
|
|
131
|
-
|
|
136
|
+
_ts_decorate([
|
|
137
|
+
(0, _awilixexpress.GET)(),
|
|
138
|
+
(0, _awilixexpress.route)("/"),
|
|
139
|
+
_ts_metadata("design:type", Function),
|
|
140
|
+
_ts_metadata("design:paramtypes", [
|
|
141
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
142
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
143
|
+
]),
|
|
144
|
+
_ts_metadata("design:returntype", Promise)
|
|
145
|
+
], ServerPrivateController.prototype, "getReleaseStateInfo", null);
|
|
146
|
+
_ts_decorate([
|
|
147
|
+
(0, _awilixexpress.GET)(),
|
|
148
|
+
(0, _awilixexpress.route)("/client-releases"),
|
|
149
|
+
_ts_metadata("design:type", Function),
|
|
150
|
+
_ts_metadata("design:paramtypes", [
|
|
151
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
152
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
153
|
+
]),
|
|
154
|
+
_ts_metadata("design:returntype", Promise)
|
|
155
|
+
], ServerPrivateController.prototype, "getClientReleases", null);
|
|
156
|
+
_ts_decorate([
|
|
157
|
+
(0, _awilixexpress.POST)(),
|
|
158
|
+
(0, _awilixexpress.route)("/update-client-bundle-github"),
|
|
159
|
+
_ts_metadata("design:type", Function),
|
|
160
|
+
_ts_metadata("design:paramtypes", [
|
|
161
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
162
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
163
|
+
]),
|
|
164
|
+
_ts_metadata("design:returntype", Promise)
|
|
165
|
+
], ServerPrivateController.prototype, "updateClientBundleGithub", null);
|
|
166
|
+
_ts_decorate([
|
|
167
|
+
(0, _awilixexpress.GET)(),
|
|
168
|
+
(0, _awilixexpress.route)("/github-rate-limit"),
|
|
169
|
+
_ts_metadata("design:type", Function),
|
|
170
|
+
_ts_metadata("design:paramtypes", [
|
|
171
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
172
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
173
|
+
]),
|
|
174
|
+
_ts_metadata("design:returntype", Promise)
|
|
175
|
+
], ServerPrivateController.prototype, "getGithubRateLimit", null);
|
|
176
|
+
_ts_decorate([
|
|
177
|
+
(0, _awilixexpress.POST)(),
|
|
178
|
+
(0, _awilixexpress.route)("/import-printers-floors-yaml"),
|
|
179
|
+
_ts_metadata("design:type", Function),
|
|
180
|
+
_ts_metadata("design:paramtypes", [
|
|
181
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
182
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
183
|
+
]),
|
|
184
|
+
_ts_metadata("design:returntype", Promise)
|
|
185
|
+
], ServerPrivateController.prototype, "importPrintersAndFloorsYaml", null);
|
|
186
|
+
_ts_decorate([
|
|
187
|
+
(0, _awilixexpress.POST)(),
|
|
188
|
+
(0, _awilixexpress.route)("/export-printers-floors-yaml"),
|
|
189
|
+
_ts_metadata("design:type", Function),
|
|
190
|
+
_ts_metadata("design:paramtypes", [
|
|
191
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
192
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
193
|
+
]),
|
|
194
|
+
_ts_metadata("design:returntype", Promise)
|
|
195
|
+
], ServerPrivateController.prototype, "exportPrintersAndFloorsYaml", null);
|
|
196
|
+
_ts_decorate([
|
|
197
|
+
(0, _awilixexpress.DELETE)(),
|
|
198
|
+
(0, _awilixexpress.route)("/delete-all-printers"),
|
|
199
|
+
_ts_metadata("design:type", Function),
|
|
200
|
+
_ts_metadata("design:paramtypes", [
|
|
201
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
202
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
203
|
+
]),
|
|
204
|
+
_ts_metadata("design:returntype", Promise)
|
|
205
|
+
], ServerPrivateController.prototype, "deleteAllPrinters", null);
|
|
206
|
+
_ts_decorate([
|
|
207
|
+
(0, _awilixexpress.DELETE)(),
|
|
208
|
+
(0, _awilixexpress.route)("/clear-outdated-fdm-monster-logs"),
|
|
209
|
+
_ts_metadata("design:type", Function),
|
|
210
|
+
_ts_metadata("design:paramtypes", [
|
|
211
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
212
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
213
|
+
]),
|
|
214
|
+
_ts_metadata("design:returntype", Promise)
|
|
215
|
+
], ServerPrivateController.prototype, "clearLogs", null);
|
|
216
|
+
_ts_decorate([
|
|
217
|
+
(0, _awilixexpress.GET)(),
|
|
218
|
+
(0, _awilixexpress.POST)(),
|
|
219
|
+
(0, _awilixexpress.route)("/dump-fdm-monster-logs"),
|
|
220
|
+
_ts_metadata("design:type", Function),
|
|
221
|
+
_ts_metadata("design:paramtypes", [
|
|
222
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
223
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
224
|
+
]),
|
|
225
|
+
_ts_metadata("design:returntype", Promise)
|
|
226
|
+
], ServerPrivateController.prototype, "dumpLogZips", null);
|
|
227
|
+
ServerPrivateController = _ts_decorate([
|
|
228
|
+
(0, _awilixexpress.route)(_serverconstants.AppConstants.apiRoute + "/server"),
|
|
229
|
+
(0, _awilixexpress.before)([
|
|
230
|
+
(0, _authenticate.authenticate)(),
|
|
231
|
+
(0, _authenticate.authorizeRoles)([
|
|
232
|
+
_authorizationconstants.ROLES.ADMIN
|
|
233
|
+
]),
|
|
234
|
+
_demomiddleware.demoUserNotAllowed
|
|
132
235
|
]),
|
|
133
|
-
|
|
134
|
-
|
|
236
|
+
_ts_metadata("design:type", Function),
|
|
237
|
+
_ts_metadata("design:paramtypes", [
|
|
238
|
+
typeof _loggerfactory.ILoggerFactory === "undefined" ? Object : _loggerfactory.ILoggerFactory,
|
|
239
|
+
typeof _serverreleaseservice.ServerReleaseService === "undefined" ? Object : _serverreleaseservice.ServerReleaseService,
|
|
240
|
+
typeof _printercache.PrinterCache === "undefined" ? Object : _printercache.PrinterCache,
|
|
241
|
+
typeof _printerserviceinterface.IPrinterService === "undefined" ? Object : _printerserviceinterface.IPrinterService,
|
|
242
|
+
typeof _clientbundleservice.ClientBundleService === "undefined" ? Object : _clientbundleservice.ClientBundleService,
|
|
243
|
+
typeof _githubservice.GithubService === "undefined" ? Object : _githubservice.GithubService,
|
|
244
|
+
typeof _logsmanagerservice.LogDumpService === "undefined" ? Object : _logsmanagerservice.LogDumpService,
|
|
245
|
+
typeof _yamlservice.YamlService === "undefined" ? Object : _yamlservice.YamlService,
|
|
246
|
+
typeof _multerservice.MulterService === "undefined" ? Object : _multerservice.MulterService
|
|
247
|
+
])
|
|
248
|
+
], ServerPrivateController);
|
|
135
249
|
|
|
136
250
|
//# sourceMappingURL=server-private.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/server-private.controller.ts"],"names":["ServerPrivateController","
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/server-private.controller.ts"],"names":["ServerPrivateController","logger","constructor","loggerFactory","serverReleaseService","printerCache","printerService","clientBundleService","githubService","logDumpService","yamlService","multerService","name","getReleaseStateInfo","req","res","syncLatestRelease","updateState","getState","send","getClientReleases","_req","releaseSpec","getReleases","updateClientBundleGithub","updateDto","validateMiddleware","updateClientBundleSchema","willExecute","shouldUpdateWithReason","AppConstants","defaultClientMinimum","downloadRelease","allowDowngrade","log","shouldUpdate","reason","executed","requestedVersion","currentVersion","minimumVersion","targetVersion","downloadClientUpdate","getGithubRateLimit","rateLimitResponse","getRateLimit","data","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","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed"],"mappings":";;;;+BAqBaA;;;eAAAA;;;wBArBe;+BACqB;8BACJ;iCAChB;wCACP;4BACa;sCACE;qCACD;8BACP;6BACD;+BACE;oCACC;yBACG;gCACC;+BACL;yCACE;yCACS;+BACV;;;;;;;;;;AAIxB,MAAMA;;;;;;;;;IACMC,OAAO;IAExBC,YACEC,aAA6B,EAC7B,AAAiBC,oBAA0C,EAC3D,AAAiBC,YAA0B,EAC3C,AAAiBC,cAA+B,EAChD,AAAiBC,mBAAwC,EACzD,AAAiBC,aAA4B,EAC7C,AAAiBC,cAA8B,EAC/C,AAAiBC,WAAwB,EACzC,AAAiBC,aAA4B,CAC7C;aARiBP,uBAAAA;aACAC,eAAAA;aACAC,iBAAAA;aACAC,sBAAAA;aACAC,gBAAAA;aACAC,iBAAAA;aACAC,cAAAA;aACAC,gBAAAA;QAEjB,IAAI,CAACV,MAAM,GAAGE,cAAcH,wBAAwBY,IAAI;IAC1D;IAEA,MAEMC,oBAAoBC,GAAY,EAAEC,GAAa,EAAE;QACrD,MAAM,IAAI,CAACX,oBAAoB,CAACY,iBAAiB;QACjD,MAAMC,cAAc,IAAI,CAACb,oBAAoB,CAACc,QAAQ;QACtDH,IAAII,IAAI,CAACF;IACX;IAEA,MAEMG,kBAAkBC,IAAa,EAAEN,GAAa,EAAE;QACpD,MAAMO,cAAc,MAAM,IAAI,CAACf,mBAAmB,CAACgB,WAAW;QAC9DR,IAAII,IAAI,CAACG;IACX;IAMA,MAEME,yBAAyBV,GAAY,EAAEC,GAAa,EAAE;QAC1D,MAAMU,YAAY,MAAMC,IAAAA,8BAAkB,EAACZ,KAAKa,iDAAwB;QAExE,MAAMC,cAAc,MAAM,IAAI,CAACrB,mBAAmB,CAACsB,sBAAsB,CACvE,MACAC,6BAAY,CAACC,oBAAoB,EACjCN,UAAUO,eAAe,EACzBP,UAAUQ,cAAc;QAG1B,IAAI,CAAChC,MAAM,CAACiC,GAAG,CAAC,CAAC,cAAc,EAAEN,aAAaO,aAAa,UAAU,EAAEP,aAAaQ,QAAQ;QAC5F,IAAI,CAACR,aAAaO,cAAc;YAC9B,OAAOpB,IAAII,IAAI,CAAC;gBACdkB,UAAU;gBACVC,kBAAkBV,YAAYU,gBAAgB;gBAC9CC,gBAAgBX,YAAYW,cAAc;gBAC1CC,gBAAgBZ,YAAYY,cAAc;gBAC1CL,cAAcP,YAAYO,YAAY;gBACtCM,eAAeb,YAAYa,aAAa;gBACxCL,QAAQR,aAAaQ;YACvB;QACF;QAEA,IAAIR,YAAYa,aAAa,EAAE;YAC7B,MAAM,IAAI,CAAClC,mBAAmB,CAACmC,oBAAoB,CAACd,YAAYa,aAAa;QAC/E;QAEA,OAAO1B,IAAII,IAAI,CAAC;YACdkB,UAAU;YACVC,kBAAkBV,YAAYU,gBAAgB;YAC9CC,gBAAgBX,YAAYW,cAAc;YAC1CC,gBAAgBZ,YAAYY,cAAc;YAC1CL,cAAcP,YAAYO,YAAY;YACtCM,eAAeb,YAAYa,aAAa;YACxCL,QAAQR,aAAaQ;QACvB;IACF;IAEA,MAEMO,mBAAmB7B,GAAY,EAAEC,GAAa,EAAE;QACpD,MAAM6B,oBAAoB,MAAM,IAAI,CAACpC,aAAa,CAACqC,YAAY;QAC/D9B,IAAII,IAAI,CAACyB,kBAAkBE,IAAI;IACjC;IAEA,MAEMC,4BAA4BjC,GAAY,EAAEC,GAAa,EAAE;QAC7D,MAAMiC,QAAQ,MAAM,IAAI,CAACrC,aAAa,CAACsC,mBAAmB,CAACnC,KAAKC,KAAK;YAAC;SAAQ,EAAE;QAChF,MAAMmC,YAAYF,KAAK,CAAC,EAAE;QAC1B,MAAMG,OAAO,MAAM,IAAI,CAACzC,WAAW,CAAC0C,uBAAuB,CAACF,UAAUG,MAAM,CAACC,QAAQ;QAErFvC,IAAII,IAAI,CAAC;YACPoC,SAAS;YACTJ;QACF;IACF;IAEA,MAEMK,4BAA4B1C,GAAY,EAAEC,GAAa,EAAE;QAC7D,MAAM0C,OAAO,MAAM,IAAI,CAAC/C,WAAW,CAACgD,uBAAuB,CAAC5C,IAAI6C,IAAI;QACpE,MAAMC,eAAeC,OAAOC,IAAI,CAACL;QACjC,MAAMM,aAAa,IAAIC,mBAAW;QAClCD,WAAWE,GAAG,CAACL;QAEf,MAAMM,WAAW,CAAC,OAAO,EAAEpC,6BAAY,CAACqC,cAAc,CAAC,CAAC,CAAC,GAAGC,KAAKC,GAAG,KAAK;QACzEtD,IAAIuD,GAAG,CAAC,uBAAuB,0BAA0BJ;QACzDnD,IAAIuD,GAAG,CAAC,gBAAgB;QACxBP,WAAWQ,IAAI,CAACxD;IAClB;IAEA,MAEMyD,kBAAkB1D,GAAY,EAAEC,GAAa,EAAE;QACnD,MAAM0D,WAAW,MAAM,IAAI,CAACpE,YAAY,CAACqE,kBAAkB,CAAC;QAC5D,MAAMC,aAAaF,SAASG,GAAG,CAAC,CAACC,IAAMA,EAAEC,EAAE;QAC3C,MAAM,IAAI,CAACxE,cAAc,CAACyE,UAAU,CAACJ;QACrC5D,IAAII,IAAI;IACV;IAEA,MAEM6D,UAAUlE,GAAY,EAAEC,GAAa,EAAE;QAC3C,MAAMkE,SAAS,MAAM,IAAI,CAACxE,cAAc,CAACyE,yCAAyC;QAClFnE,IAAII,IAAI,CAAC8D;IACX;IAEA,MAGME,YAAYrE,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAMqE,WAAW,MAAM,IAAI,CAAC3E,cAAc,CAAC4E,OAAO;QAClDtE,IAAIuE,QAAQ,CAACF;IACf;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BAvIOtD,6BAAY,CAACyD,QAAQ,GAAG;;QACtBC,IAAAA,0BAAY;QAAIC,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;SAAC;QAAGC,kCAAkB"}
|
|
@@ -2,18 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
get: all[name]
|
|
9
|
-
});
|
|
10
|
-
}
|
|
11
|
-
_export(exports, {
|
|
12
|
-
ServerPublicController: function() {
|
|
5
|
+
Object.defineProperty(exports, "ServerPublicController", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
13
8
|
return ServerPublicController;
|
|
14
|
-
},
|
|
15
|
-
default: function() {
|
|
16
|
-
return _default;
|
|
17
9
|
}
|
|
18
10
|
});
|
|
19
11
|
const _awilixexpress = require("awilix-express");
|
|
@@ -21,28 +13,34 @@ const _serverconstants = require("../server.constants");
|
|
|
21
13
|
const _envutils = require("../utils/env.utils");
|
|
22
14
|
const _authenticate = require("../middleware/authenticate");
|
|
23
15
|
const _authorizationconstants = require("../constants/authorization.constants");
|
|
24
|
-
const
|
|
16
|
+
const _settingsstore = require("../state/settings.store");
|
|
17
|
+
const _serverreleaseservice = require("../services/core/server-release.service");
|
|
18
|
+
const _monsterpiservice = require("../services/core/monsterpi.service");
|
|
19
|
+
const _express = require("express");
|
|
20
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
21
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
22
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
23
|
+
else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
24
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
25
|
+
}
|
|
26
|
+
function _ts_metadata(k, v) {
|
|
27
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
28
|
+
}
|
|
25
29
|
class ServerPublicController {
|
|
26
|
-
serverVersion;
|
|
27
30
|
settingsStore;
|
|
28
|
-
|
|
31
|
+
serverVersion;
|
|
29
32
|
serverReleaseService;
|
|
30
33
|
monsterPiService;
|
|
31
|
-
userService;
|
|
32
|
-
roleService;
|
|
33
34
|
isTypeormMode;
|
|
34
|
-
constructor(
|
|
35
|
+
constructor(settingsStore, serverVersion, serverReleaseService, monsterPiService, isTypeormMode){
|
|
35
36
|
this.settingsStore = settingsStore;
|
|
36
37
|
this.serverVersion = serverVersion;
|
|
37
|
-
this.printerSocketStore = printerSocketStore;
|
|
38
38
|
this.serverReleaseService = serverReleaseService;
|
|
39
39
|
this.monsterPiService = monsterPiService;
|
|
40
|
-
this.userService = userService;
|
|
41
|
-
this.roleService = roleService;
|
|
42
40
|
this.isTypeormMode = isTypeormMode;
|
|
43
41
|
}
|
|
44
42
|
welcome(req, res) {
|
|
45
|
-
|
|
43
|
+
this.settingsStore.getSettings();
|
|
46
44
|
if (!this.settingsStore.getLoginRequired()) {
|
|
47
45
|
return res.send({
|
|
48
46
|
message: "Login disabled. Please load the Vue app."
|
|
@@ -55,81 +53,35 @@ class ServerPublicController {
|
|
|
55
53
|
getFeatures(req, res) {
|
|
56
54
|
const serverSettings = this.settingsStore.getServerSettings();
|
|
57
55
|
const moonrakerEnabled = serverSettings.experimentalMoonrakerSupport;
|
|
56
|
+
const prusaLinkEnabled = serverSettings.experimentalPrusaLinkSupport;
|
|
58
57
|
res.send({
|
|
59
|
-
batchReprintCalls: {
|
|
60
|
-
available: true,
|
|
61
|
-
version: 2
|
|
62
|
-
},
|
|
63
|
-
batchConnectSocketCalls: {
|
|
64
|
-
available: true,
|
|
65
|
-
version: 1
|
|
66
|
-
},
|
|
67
|
-
batchConnectUsbCalls: {
|
|
68
|
-
available: true,
|
|
69
|
-
version: 1
|
|
70
|
-
},
|
|
71
|
-
newSockets: {
|
|
72
|
-
available: true,
|
|
73
|
-
version: 1
|
|
74
|
-
},
|
|
75
|
-
anonymousDiagnosticsToggle: {
|
|
76
|
-
available: true,
|
|
77
|
-
version: 1
|
|
78
|
-
},
|
|
79
|
-
pauseResumePrinterCommand: {
|
|
80
|
-
available: true,
|
|
81
|
-
version: 1
|
|
82
|
-
},
|
|
83
|
-
logDumpZip: {
|
|
84
|
-
available: true,
|
|
85
|
-
version: 1
|
|
86
|
-
},
|
|
87
|
-
clearLogFiles: {
|
|
88
|
-
available: true,
|
|
89
|
-
version: 1
|
|
90
|
-
},
|
|
91
|
-
batchTogglePrinterEnabled: {
|
|
92
|
-
available: true,
|
|
93
|
-
version: 1
|
|
94
|
-
},
|
|
95
|
-
cameraStream: {
|
|
96
|
-
available: true,
|
|
97
|
-
version: 1,
|
|
98
|
-
subFeatures: {}
|
|
99
|
-
},
|
|
100
58
|
printerGroupsApi: {
|
|
101
59
|
available: this.isTypeormMode,
|
|
102
60
|
version: 1,
|
|
103
61
|
subFeatures: {}
|
|
104
62
|
},
|
|
105
|
-
printerControlApi: {
|
|
106
|
-
available: true,
|
|
107
|
-
version: 1
|
|
108
|
-
},
|
|
109
|
-
githubRateLimitApi: {
|
|
110
|
-
available: true,
|
|
111
|
-
version: 1
|
|
112
|
-
},
|
|
113
63
|
multiplePrinterServices: {
|
|
114
64
|
available: true,
|
|
115
65
|
version: 1,
|
|
116
66
|
subFeatures: {
|
|
117
|
-
types:
|
|
67
|
+
types: [
|
|
118
68
|
"octoprint",
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
69
|
+
...moonrakerEnabled ? [
|
|
70
|
+
"klipper"
|
|
71
|
+
] : [],
|
|
72
|
+
...prusaLinkEnabled ? [
|
|
73
|
+
"prusaLink"
|
|
74
|
+
] : []
|
|
122
75
|
]
|
|
123
76
|
}
|
|
124
77
|
}
|
|
125
78
|
});
|
|
126
79
|
}
|
|
127
80
|
async getVersion(req, res) {
|
|
128
|
-
|
|
81
|
+
const updateState = this.serverReleaseService.getState();
|
|
129
82
|
const monsterPiVersion = this.monsterPiService.getMonsterPiVersionSafe();
|
|
130
83
|
res.json({
|
|
131
84
|
version: this.serverVersion,
|
|
132
|
-
isDockerContainer: (0, _isdocker.isDocker)(),
|
|
133
85
|
isNode: (0, _envutils.isNode)(),
|
|
134
86
|
os: process.env.OS,
|
|
135
87
|
monsterPi: monsterPiVersion,
|
|
@@ -146,20 +98,67 @@ class ServerPublicController {
|
|
|
146
98
|
});
|
|
147
99
|
}
|
|
148
100
|
}
|
|
149
|
-
|
|
150
|
-
|
|
101
|
+
_ts_decorate([
|
|
102
|
+
(0, _awilixexpress.GET)(),
|
|
103
|
+
(0, _awilixexpress.route)("/"),
|
|
104
|
+
(0, _awilixexpress.before)([
|
|
151
105
|
(0, _authenticate.authenticate)(),
|
|
152
|
-
(0, _authenticate.
|
|
153
|
-
]
|
|
154
|
-
|
|
155
|
-
|
|
106
|
+
(0, _authenticate.permission)(_authorizationconstants.PERMS.ServerInfo.Get)
|
|
107
|
+
]),
|
|
108
|
+
_ts_metadata("design:type", Function),
|
|
109
|
+
_ts_metadata("design:paramtypes", [
|
|
110
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
111
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
112
|
+
]),
|
|
113
|
+
_ts_metadata("design:returntype", void 0)
|
|
114
|
+
], ServerPublicController.prototype, "welcome", null);
|
|
115
|
+
_ts_decorate([
|
|
116
|
+
(0, _awilixexpress.GET)(),
|
|
117
|
+
(0, _awilixexpress.route)("/features"),
|
|
118
|
+
(0, _awilixexpress.before)([
|
|
156
119
|
(0, _authenticate.authenticate)()
|
|
157
|
-
]
|
|
158
|
-
|
|
159
|
-
|
|
120
|
+
]),
|
|
121
|
+
_ts_metadata("design:type", Function),
|
|
122
|
+
_ts_metadata("design:paramtypes", [
|
|
123
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
124
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
125
|
+
]),
|
|
126
|
+
_ts_metadata("design:returntype", void 0)
|
|
127
|
+
], ServerPublicController.prototype, "getFeatures", null);
|
|
128
|
+
_ts_decorate([
|
|
129
|
+
(0, _awilixexpress.GET)(),
|
|
130
|
+
(0, _awilixexpress.route)("/version"),
|
|
131
|
+
(0, _awilixexpress.before)([
|
|
160
132
|
(0, _authenticate.authenticate)(),
|
|
161
|
-
(0, _authenticate.
|
|
162
|
-
]
|
|
163
|
-
|
|
133
|
+
(0, _authenticate.permission)(_authorizationconstants.PERMS.ServerInfo.Get)
|
|
134
|
+
]),
|
|
135
|
+
_ts_metadata("design:type", Function),
|
|
136
|
+
_ts_metadata("design:paramtypes", [
|
|
137
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
138
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
139
|
+
]),
|
|
140
|
+
_ts_metadata("design:returntype", Promise)
|
|
141
|
+
], ServerPublicController.prototype, "getVersion", null);
|
|
142
|
+
_ts_decorate([
|
|
143
|
+
(0, _awilixexpress.GET)(),
|
|
144
|
+
(0, _awilixexpress.route)("/test"),
|
|
145
|
+
_ts_metadata("design:type", Function),
|
|
146
|
+
_ts_metadata("design:paramtypes", [
|
|
147
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
148
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
149
|
+
]),
|
|
150
|
+
_ts_metadata("design:returntype", Promise)
|
|
151
|
+
], ServerPublicController.prototype, "test", null);
|
|
152
|
+
ServerPublicController = _ts_decorate([
|
|
153
|
+
(0, _awilixexpress.route)(_serverconstants.AppConstants.apiRoute),
|
|
154
|
+
_ts_metadata("design:type", Function),
|
|
155
|
+
_ts_metadata("design:paramtypes", [
|
|
156
|
+
typeof _settingsstore.SettingsStore === "undefined" ? Object : _settingsstore.SettingsStore,
|
|
157
|
+
String,
|
|
158
|
+
typeof _serverreleaseservice.ServerReleaseService === "undefined" ? Object : _serverreleaseservice.ServerReleaseService,
|
|
159
|
+
typeof _monsterpiservice.MonsterPiService === "undefined" ? Object : _monsterpiservice.MonsterPiService,
|
|
160
|
+
Boolean
|
|
161
|
+
])
|
|
162
|
+
], ServerPublicController);
|
|
164
163
|
|
|
165
164
|
//# sourceMappingURL=server-public.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/server-public.controller.ts"],"names":["ServerPublicController","
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/server-public.controller.ts"],"names":["ServerPublicController","constructor","settingsStore","serverVersion","serverReleaseService","monsterPiService","isTypeormMode","welcome","req","res","getSettings","getLoginRequired","send","message","getFeatures","serverSettings","getServerSettings","moonrakerEnabled","experimentalMoonrakerSupport","prusaLinkEnabled","experimentalPrusaLinkSupport","printerGroupsApi","available","version","subFeatures","multiplePrinterServices","types","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isNode","os","process","env","OS","monsterPi","update","synced","updateAvailable","airGapped","test","authenticate","permission","PERMS","ServerInfo","Get","apiRoute"],"mappings":";;;;+BAWaA;;;eAAAA;;;+BAXsB;iCACN;0BACN;8BACkB;wCACnB;+BACQ;sCACO;kCACJ;yBACC;;;;;;;;;;AAG3B,MAAMA;;;;;;IACXC,YACE,AAAiBC,aAA4B,EAC7C,AAAiBC,aAAqB,EACtC,AAAiBC,oBAA0C,EAC3D,AAAiBC,gBAAkC,EACnD,AAAiBC,aAAsB,CACvC;aALiBJ,gBAAAA;aACAC,gBAAAA;aACAC,uBAAAA;aACAC,mBAAAA;aACAC,gBAAAA;IAEnB;IAKAC,QAAQC,GAAY,EAAEC,GAAa,EAAE;QACnC,IAAI,CAACP,aAAa,CAACQ,WAAW;QAE9B,IAAI,CAAC,IAAI,CAACR,aAAa,CAACS,gBAAgB,IAAI;YAC1C,OAAOF,IAAIG,IAAI,CAAC;gBACdC,SAAS;YACX;QACF;QAEA,OAAOJ,IAAIG,IAAI,CAAC;YACdC,SAAS;QACX;IACF;IAKAC,YAAYN,GAAY,EAAEC,GAAa,EAAE;QACvC,MAAMM,iBAAiB,IAAI,CAACb,aAAa,CAACc,iBAAiB;QAC3D,MAAMC,mBAAmBF,eAAeG,4BAA4B;QACpE,MAAMC,mBAAmBJ,eAAeK,4BAA4B;QACpEX,IAAIG,IAAI,CAAC;YACPS,kBAAkB;gBAEhBC,WAAW,IAAI,CAAChB,aAAa;gBAC7BiB,SAAS;gBACTC,aAAa,CAAC;YAChB;YACAC,yBAAyB;gBACvBH,WAAW;gBACXC,SAAS;gBACTC,aAAa;oBACXE,OAAO;wBACL;2BACIT,mBAAmB;4BAAC;yBAAU,GAAG,EAAE;2BACnCE,mBAAmB;4BAAC;yBAAY,GAAG,EAAE;qBAC1C;gBACH;YACF;QACF;IACF;IAEA,MAGMQ,WAAWnB,GAAY,EAAEC,GAAa,EAAE;QAC5C,MAAMmB,cAAc,IAAI,CAACxB,oBAAoB,CAACyB,QAAQ;QACtD,MAAMC,mBAAmB,IAAI,CAACzB,gBAAgB,CAAC0B,uBAAuB;QAEtEtB,IAAIuB,IAAI,CAAC;YACPT,SAAS,IAAI,CAACpB,aAAa;YAC3B8B,QAAQA,IAAAA,gBAAM;YACdC,IAAIC,QAAQC,GAAG,CAACC,EAAE;YAClBC,WAAWR;YACXS,QAAQ;gBACNC,QAAQZ,YAAYY,MAAM;gBAC1BC,iBAAiBb,YAAYa,eAAe;gBAC5CC,WAAWd,YAAYc,SAAS;YAClC;QACF;IACF;IAEA,MAEMC,KAAKnC,GAAY,EAAEC,GAAa,EAAE;QACtCA,IAAIG,IAAI,CAAC;YACPC,SAAS;QACX;IACF;AACF;;;;;QAtEW+B,IAAAA,0BAAY;QAAIC,IAAAA,wBAAU,EAACC,6BAAK,CAACC,UAAU,CAACC,GAAG;;;;;;;;;;;;;QAiB/CJ,IAAAA,0BAAY;;;;;;;;;;;;;QA4BZA,IAAAA,0BAAY;QAAIC,IAAAA,wBAAU,EAACC,6BAAK,CAACC,UAAU,CAACC,GAAG;;;;;;;;;;;;;;;;;;;;4DA1DtCC"}
|