@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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","
|
|
1
|
+
{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","logger","settings","constructor","loggerFactory","settingsService","isTypeormMode","name","getSettings","throwIfSettingsUnset","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","experimentalMoonrakerSupport","experimentalPrusaLinkSupport","experimentalTypeormSupport","experimentalClientSupport","experimentalThumbnailSupport","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","credentialSettings","length","updateJwtSecretCredentialSetting","jwtSecret","updateCredentialSettings","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","isThumbnailSupportEnabled","getServerSettings","getTimeoutSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","updateWizardSettings","wizardCompletedAt","Date","getLoginRequired","setLoginRequired","updateServerSettings","setRegistrationEnabled","serverSettings","updateTimeoutSettings","timeoutSettings","updateFileCleanSettings","fileClean","setRefreshTokenSettings","setSentryDiagnosticsEnabled","setExperimentalMoonrakerSupport","setExperimentalThumbnailSupport","setExperimentalPrusaLinkSupport","setExperimentalClientSupport","updateFrontendSettings","frontendSettings","InternalServerException","sentryEnabled","log","isTestEnvironment","client","getClient","warn","getOptions","enabled"],"mappings":"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"}
|
|
@@ -19,37 +19,37 @@ _export(exports, {
|
|
|
19
19
|
const _socketio = require("socket.io");
|
|
20
20
|
const _eventconstants = require("../constants/event.constants");
|
|
21
21
|
const _passport = require("../middleware/passport");
|
|
22
|
-
const
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
22
|
+
const _socketiomiddleware = require("../middleware/socketio.middleware");
|
|
23
|
+
const _promclient = require("prom-client");
|
|
24
|
+
const socketIoGatewaySessions = new _promclient.Gauge({
|
|
25
|
+
name: "socketio_gateway_sessions",
|
|
26
|
+
help: "Gateway active sessions"
|
|
27
|
+
});
|
|
28
|
+
const socketIoGatewayDisconnects = new _promclient.Counter({
|
|
29
|
+
name: "socketio_gateway_disconnects",
|
|
30
|
+
help: "Gateway connections closed"
|
|
31
|
+
});
|
|
32
|
+
const socketIoGatewayMessagesSent = new _promclient.Counter({
|
|
33
|
+
name: "socketio_messages_sent",
|
|
34
|
+
help: "Gateway messages sent"
|
|
35
|
+
});
|
|
36
|
+
const socketIoGatewayMessageSentSize = new _promclient.Gauge({
|
|
37
|
+
name: "socketio_message_size",
|
|
38
|
+
help: "Gateway message sent size"
|
|
39
|
+
});
|
|
38
40
|
class SocketIoGateway {
|
|
39
|
-
logger;
|
|
40
41
|
eventEmitter2;
|
|
41
|
-
io;
|
|
42
|
-
authService;
|
|
43
42
|
settingsStore;
|
|
44
|
-
configService;
|
|
45
43
|
userService;
|
|
46
|
-
|
|
47
|
-
|
|
44
|
+
configService;
|
|
45
|
+
logger;
|
|
46
|
+
io;
|
|
47
|
+
constructor(loggerFactory, eventEmitter2, settingsStore, userService, configService){
|
|
48
48
|
this.eventEmitter2 = eventEmitter2;
|
|
49
49
|
this.settingsStore = settingsStore;
|
|
50
|
-
this.authService = authService;
|
|
51
50
|
this.userService = userService;
|
|
52
51
|
this.configService = configService;
|
|
52
|
+
this.logger = loggerFactory(SocketIoGateway.name);
|
|
53
53
|
}
|
|
54
54
|
attachServer(httpServer) {
|
|
55
55
|
this.io = new _socketio.Server(httpServer, {
|
|
@@ -58,34 +58,37 @@ class SocketIoGateway {
|
|
|
58
58
|
}
|
|
59
59
|
});
|
|
60
60
|
const opts = (0, _passport.getPassportJwtOptions)(this.settingsStore, this.configService, (value)=>value.handshake.auth.token);
|
|
61
|
-
|
|
62
|
-
this.io.use(authorize(this.settingsStore, opts, verify));
|
|
61
|
+
this.io.use((0, _socketiomiddleware.authorize)(this.settingsStore, opts, (0, _passport.verifyUserCallback)(this.userService)));
|
|
63
62
|
this.io.on("connection", (socket)=>this.onConnect.bind(this)(socket));
|
|
64
63
|
}
|
|
65
64
|
onConnect(socket) {
|
|
66
|
-
this.logger.debug("SocketIO Client connected",
|
|
65
|
+
this.logger.debug("SocketIO Client connected", {
|
|
66
|
+
socketId: socket.id
|
|
67
|
+
});
|
|
67
68
|
this.eventEmitter2.emit(_eventconstants.socketIoConnectedEvent, socket.id);
|
|
69
|
+
socketIoGatewaySessions.inc();
|
|
68
70
|
socket.on("disconnect", ()=>{
|
|
69
|
-
this.logger.debug("SocketIO Client disconnected",
|
|
71
|
+
this.logger.debug("SocketIO Client disconnected", {
|
|
72
|
+
socketId: socket.id
|
|
73
|
+
});
|
|
74
|
+
socketIoGatewaySessions.dec(1);
|
|
75
|
+
socketIoGatewayDisconnects.inc();
|
|
70
76
|
});
|
|
71
77
|
}
|
|
72
78
|
send(event, data) {
|
|
73
79
|
if (!this.io) {
|
|
74
|
-
this.logger.debug(
|
|
80
|
+
this.logger.debug(`Cant send event ${event}, socketio gateway must be created first`);
|
|
75
81
|
return;
|
|
76
82
|
}
|
|
77
|
-
if (this.settingsStore.getServerSettings().debugSettings?.debugSocketIoEvents) {
|
|
78
|
-
this.logger.log(`Sending event ${event}`);
|
|
79
|
-
}
|
|
80
83
|
this.io.emit(event, data);
|
|
84
|
+
socketIoGatewayMessagesSent.inc();
|
|
85
|
+
const payload = JSON.stringify(data);
|
|
86
|
+
const sizeInBytes = Buffer.byteLength(payload);
|
|
87
|
+
socketIoGatewayMessageSentSize.set(sizeInBytes);
|
|
81
88
|
}
|
|
82
89
|
}
|
|
83
90
|
const IO_MESSAGES = {
|
|
84
|
-
LegacyUpdate: "legacy-update"
|
|
85
|
-
LegacyPrinterTest: "legacy-printer-test",
|
|
86
|
-
CompletionEvent: "completion-event",
|
|
87
|
-
HostState: "host-state",
|
|
88
|
-
ApiAccessibility: "api-accessibility"
|
|
91
|
+
LegacyUpdate: "legacy-update"
|
|
89
92
|
};
|
|
90
93
|
|
|
91
94
|
//# sourceMappingURL=socket-io.gateway.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/socket-io.gateway.ts"],"names":["IO_MESSAGES","SocketIoGateway","
|
|
1
|
+
{"version":3,"sources":["../../src/state/socket-io.gateway.ts"],"names":["IO_MESSAGES","SocketIoGateway","socketIoGatewaySessions","Gauge","name","help","socketIoGatewayDisconnects","Counter","socketIoGatewayMessagesSent","socketIoGatewayMessageSentSize","logger","io","constructor","loggerFactory","eventEmitter2","settingsStore","userService","configService","attachServer","httpServer","Server","cors","origin","opts","getPassportJwtOptions","value","handshake","auth","token","use","authorize","verifyUserCallback","on","socket","onConnect","bind","debug","socketId","id","emit","socketIoConnectedEvent","inc","dec","send","event","data","payload","JSON","stringify","sizeInBytes","Buffer","byteLength","set","LegacyUpdate"],"mappings":";;;;;;;;;;;IAuFaA,WAAW;eAAXA;;IAtDAC,eAAe;eAAfA;;;0BAjCkB;gCACQ;0BAMmB;oCAGhC;4BACK;AAE/B,MAAMC,0BAA0B,IAAIC,iBAAK,CAAC;IACxCC,MAAM;IACNC,MAAM;AACR;AAEA,MAAMC,6BAA6B,IAAIC,mBAAO,CAAC;IAC7CH,MAAM;IACNC,MAAM;AACR;AAEA,MAAMG,8BAA8B,IAAID,mBAAO,CAAC;IAC9CH,MAAM;IACNC,MAAM;AACR;AAEA,MAAMI,iCAAiC,IAAIN,iBAAK,CAAC;IAC/CC,MAAM;IACNC,MAAM;AACR;AAEO,MAAMJ;;;;;IACXS,OAAsB;IAEtBC,GAAW;IAEXC,YACEC,aAA6B,EAC7B,AAAiBC,aAA4B,EAC7C,AAAiBC,aAA4B,EAC7C,AAAiBC,WAAyB,EAC1C,AAAiBC,aAA6B,CAC9C;aAJiBH,gBAAAA;aACAC,gBAAAA;aACAC,cAAAA;aACAC,gBAAAA;QAEjB,IAAI,CAACP,MAAM,GAAGG,cAAcZ,gBAAgBG,IAAI;IAClD;IAEAc,aAAaC,UAAsB,EAAE;QACnC,IAAI,CAACR,EAAE,GAAG,IAAIS,gBAAM,CAACD,YAAY;YAAEE,MAAM;gBAAEC,QAAQ;YAAI;QAAE;QACzD,MAAMC,OAAOC,IAAAA,+BAAqB,EAChC,IAAI,CAACT,aAAa,EAClB,IAAI,CAACE,aAAa,EAClB,CAACQ,QAAkBA,MAAMC,SAAS,CAACC,IAAI,CAACC,KAAK;QAE/C,IAAI,CAACjB,EAAE,CAACkB,GAAG,CAACC,IAAAA,6BAAS,EAAC,IAAI,CAACf,aAAa,EAAEQ,MAAMQ,IAAAA,4BAAkB,EAAC,IAAI,CAACf,WAAW;QACnF,IAAI,CAACL,EAAE,CAACqB,EAAE,CAAC,cAAc,CAACC,SAAW,IAAI,CAACC,SAAS,CAACC,IAAI,CAAC,IAAI,EAAEF;IAEjE;IAEAC,UAAUD,MAAc,EAAE;QACxB,IAAI,CAACvB,MAAM,CAAC0B,KAAK,CAAC,6BAA6B;YAAEC,UAAUJ,OAAOK,EAAE;QAAC;QACrE,IAAI,CAACxB,aAAa,CAACyB,IAAI,CAACC,sCAAsB,EAAEP,OAAOK,EAAE;QACzDpC,wBAAwBuC,GAAG;QAE3BR,OAAOD,EAAE,CAAC,cAAc;YACtB,IAAI,CAACtB,MAAM,CAAC0B,KAAK,CAAC,gCAAgC;gBAAEC,UAAUJ,OAAOK,EAAE;YAAC;YACxEpC,wBAAwBwC,GAAG,CAAC;YAC5BpC,2BAA2BmC,GAAG;QAChC;IACF;IAEAE,KAAQC,KAAa,EAAEC,IAAO,EAAE;QAC9B,IAAI,CAAC,IAAI,CAAClC,EAAE,EAAE;YACZ,IAAI,CAACD,MAAM,CAAC0B,KAAK,CAAC,CAAC,gBAAgB,EAAEQ,MAAM,wCAAwC,CAAC;YACpF;QACF;QAEA,IAAI,CAACjC,EAAE,CAAC4B,IAAI,CAACK,OAAOC;QACpBrC,4BAA4BiC,GAAG;QAE/B,MAAMK,UAAUC,KAAKC,SAAS,CAACH;QAC/B,MAAMI,cAAcC,OAAOC,UAAU,CAACL;QACtCrC,+BAA+B2C,GAAG,CAACH;IACrC;AACF;AAEO,MAAMjD,cAAc;IACzBqD,cAAc;AAChB"}
|
|
@@ -16,33 +16,34 @@ const _serverconstants = require("../server.constants");
|
|
|
16
16
|
const _errorutils = require("../utils/error.utils");
|
|
17
17
|
const _node = require("@sentry/node");
|
|
18
18
|
const _socketstatetype = require("../shared/dtos/socket-state.type");
|
|
19
|
-
const
|
|
19
|
+
const _moonrakerconstants = require("../services/moonraker/constants/moonraker.constants");
|
|
20
20
|
const _eventconstants = require("../constants/event.constants");
|
|
21
21
|
class TestPrinterSocketStore {
|
|
22
|
-
testSocket;
|
|
23
|
-
socketIoGateway;
|
|
24
22
|
socketFactory;
|
|
23
|
+
socketIoGateway;
|
|
25
24
|
eventEmitter2;
|
|
25
|
+
testSocket;
|
|
26
26
|
logger;
|
|
27
|
-
constructor(
|
|
27
|
+
constructor(loggerFactory, socketFactory, socketIoGateway, eventEmitter2){
|
|
28
28
|
this.socketFactory = socketFactory;
|
|
29
29
|
this.socketIoGateway = socketIoGateway;
|
|
30
30
|
this.eventEmitter2 = eventEmitter2;
|
|
31
31
|
this.logger = loggerFactory(TestPrinterSocketStore.name);
|
|
32
32
|
}
|
|
33
|
-
async setupTestPrinter(printer) {
|
|
33
|
+
async setupTestPrinter(correlationToken, printer) {
|
|
34
34
|
if (this.testSocket) {
|
|
35
35
|
this.testSocket.close();
|
|
36
|
-
this.testSocket
|
|
36
|
+
delete this.testSocket;
|
|
37
37
|
}
|
|
38
|
-
const validatedData = await (0, _validators.validateInput)(printer, _createtestprintervalidation.
|
|
38
|
+
const validatedData = await (0, _validators.validateInput)(printer, _createtestprintervalidation.createTestPrinterSchema);
|
|
39
39
|
validatedData.enabled = true;
|
|
40
|
-
const { correlationToken } = printer;
|
|
41
40
|
this.testSocket = this.socketFactory.createInstance(printer.printerType);
|
|
42
41
|
this.testSocket.registerCredentials({
|
|
43
42
|
printerId: correlationToken,
|
|
44
43
|
loginDto: {
|
|
45
44
|
apiKey: printer.apiKey,
|
|
45
|
+
username: printer.username,
|
|
46
|
+
password: printer.password,
|
|
46
47
|
printerURL: printer.printerURL,
|
|
47
48
|
printerType: printer.printerType
|
|
48
49
|
}
|
|
@@ -53,11 +54,11 @@ class TestPrinterSocketStore {
|
|
|
53
54
|
(0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.WS_CLOSED),
|
|
54
55
|
(0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.WS_OPENED),
|
|
55
56
|
(0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.WS_ERROR),
|
|
56
|
-
(0,
|
|
57
|
-
(0,
|
|
58
|
-
(0,
|
|
59
|
-
(0,
|
|
60
|
-
(0,
|
|
57
|
+
(0, _moonrakerconstants.moonrakerEvent)(_octoprintwebsocketadapter.WsMessage.WS_STATE_UPDATED),
|
|
58
|
+
(0, _moonrakerconstants.moonrakerEvent)(_octoprintwebsocketadapter.WsMessage.API_STATE_UPDATED),
|
|
59
|
+
(0, _moonrakerconstants.moonrakerEvent)(_octoprintwebsocketadapter.WsMessage.WS_CLOSED),
|
|
60
|
+
(0, _moonrakerconstants.moonrakerEvent)(_octoprintwebsocketadapter.WsMessage.WS_OPENED),
|
|
61
|
+
(0, _moonrakerconstants.moonrakerEvent)(_octoprintwebsocketadapter.WsMessage.WS_ERROR)
|
|
61
62
|
];
|
|
62
63
|
const listener = ({ event, payload, printerId })=>{
|
|
63
64
|
if (printerId !== correlationToken) {
|
|
@@ -77,11 +78,15 @@ class TestPrinterSocketStore {
|
|
|
77
78
|
await this.testSocket.setupSocketSession();
|
|
78
79
|
this.logger.log("Test socket connection started");
|
|
79
80
|
const promise = new Promise(async (resolve, reject)=>{
|
|
81
|
+
if (!this.testSocket) {
|
|
82
|
+
this.logger.error("Aborting test as testSocket is undefined.");
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
80
85
|
this.testSocket.open();
|
|
81
|
-
for await (const
|
|
86
|
+
for await (const _startTime of (0, _promises.setInterval)(100)){
|
|
82
87
|
if (!this.testSocket) {
|
|
83
88
|
this.logger.warn("Test without socket, rejecting");
|
|
84
|
-
reject();
|
|
89
|
+
reject(new Error("Test without socket, rejecting"));
|
|
85
90
|
return;
|
|
86
91
|
}
|
|
87
92
|
if (this.testSocket.socketState === _socketstatetype.SOCKET_STATE.authenticated) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","
|
|
1
|
+
{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","logger","constructor","loggerFactory","socketFactory","socketIoGateway","eventEmitter2","name","setupTestPrinter","correlationToken","printer","close","validatedData","validateInput","createTestPrinterSchema","enabled","createInstance","printerType","registerCredentials","printerId","loginDto","apiKey","username","password","printerURL","testEvents","octoPrintEvent","WsMessage","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","moonrakerEvent","listener","event","payload","send","forEach","te","on","log","setupSocketSession","promise","Promise","resolve","reject","error","open","_startTime","setInterval","warn","Error","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","e","errorSummary","captureException","disallowEmittingEvents","emit","printerEvents","printersDeleted","printerIds","off"],"mappings":"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"}
|
|
@@ -2,19 +2,22 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
Object.defineProperty(exports, "
|
|
5
|
+
Object.defineProperty(exports, "createTestPrinterSchema", {
|
|
6
6
|
enumerable: true,
|
|
7
7
|
get: function() {
|
|
8
|
-
return
|
|
8
|
+
return createTestPrinterSchema;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
const
|
|
12
|
-
const
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
apiKey:
|
|
17
|
-
|
|
18
|
-
|
|
11
|
+
const _zod = require("zod");
|
|
12
|
+
const _printerservicevalidation = require("../../services/validators/printer-service.validation");
|
|
13
|
+
const createTestPrinterSchema = _zod.z.object({
|
|
14
|
+
printerURL: _printerservicevalidation.printerUrlValidator,
|
|
15
|
+
printerType: _printerservicevalidation.printerTypeValidator,
|
|
16
|
+
apiKey: _printerservicevalidation.printerApiKeyValidator,
|
|
17
|
+
enabled: _printerservicevalidation.printerEnabledValidator.optional(),
|
|
18
|
+
name: _printerservicevalidation.printerNameValidator.optional(),
|
|
19
|
+
username: _printerservicevalidation.printerUsernameValidator.optional(),
|
|
20
|
+
password: _printerservicevalidation.printerPasswordValidator.optional()
|
|
21
|
+
}).strict().superRefine(_printerservicevalidation.refineApiKeyValidator);
|
|
19
22
|
|
|
20
23
|
//# sourceMappingURL=create-test-printer.validation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/state/validation/create-test-printer.validation.ts"],"names":["
|
|
1
|
+
{"version":3,"sources":["../../../src/state/validation/create-test-printer.validation.ts"],"names":["createTestPrinterSchema","z","object","printerURL","printerUrlValidator","printerType","printerTypeValidator","apiKey","printerApiKeyValidator","enabled","printerEnabledValidator","optional","name","printerNameValidator","username","printerUsernameValidator","password","printerPasswordValidator","strict","superRefine","refineApiKeyValidator"],"mappings":";;;;+BAYaA;;;eAAAA;;;qBAZK;0CAUX;AAEA,MAAMA,0BAA0BC,MAAC,CACrCC,MAAM,CAAC;IACNC,YAAYC,6CAAmB;IAC/BC,aAAaC,8CAAoB;IACjCC,QAAQC,gDAAsB;IAC9BC,SAASC,iDAAuB,CAACC,QAAQ;IACzCC,MAAMC,8CAAoB,CAACF,QAAQ;IACnCG,UAAUC,kDAAwB,CAACJ,QAAQ;IAC3CK,UAAUC,kDAAwB,CAACN,QAAQ;AAC7C,GACCO,MAAM,GACNC,WAAW,CAACC,+CAAqB"}
|
package/dist/task.presets.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/task.presets.ts"],"names":["TASK_PRESETS","PERIODIC","periodic","logFirstCompletion","runImmediately","PERIODIC_DISABLED","disabled","PERIODIC_2500MS","milliseconds","RUNONCE","runOnce","RUNDELAYED","runDelayed","seconds"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../src/task.presets.ts"],"names":["TASK_PRESETS","PERIODIC","periodic","logFirstCompletion","runImmediately","PERIODIC_DISABLED","disabled","PERIODIC_2500MS","milliseconds","RUNONCE","runOnce","RUNDELAYED","runDelayed","seconds"],"mappings":";;;;+BAEaA;;;eAAAA;;;AAAN,MAAMA;IACX,OAAOC,WAAyB;QAC9BC,UAAU;QACVC,oBAAoB;QACpBC,gBAAgB;IAClB,EAAE;IAEF,OAAOC,oBAAkC;QACvC,GAAG,IAAI,CAACJ,QAAQ;QAChBG,gBAAgB;QAChBE,UAAU;IACZ,EAAE;IAEF,OAAOC,kBAAgC;QACrC,GAAG,IAAI,CAACN,QAAQ;QAChBO,cAAc;IAChB,EAAE;IAEF,OAAOC,UAAwB;QAC7BC,SAAS;QACTP,oBAAoB;QACpBC,gBAAgB;IAClB,EAAE;IAEF,OAAOO,aAA2B;QAChCC,YAAY;QACZT,oBAAoB;QACpBC,gBAAgB;QAChBS,SAAS;IACX,EAAE;AACJ"}
|
package/dist/tasks/boot.task.js
CHANGED
|
@@ -12,6 +12,7 @@ const _mongoose = /*#__PURE__*/ _interop_require_wildcard(require("mongoose"));
|
|
|
12
12
|
const _serverenv = require("../server.env");
|
|
13
13
|
const _containertokens = require("../container.tokens");
|
|
14
14
|
const _serverconstants = require("../server.constants");
|
|
15
|
+
const _tasks = require("../tasks");
|
|
15
16
|
function _getRequireWildcardCache(nodeInterop) {
|
|
16
17
|
if (typeof WeakMap !== "function") return null;
|
|
17
18
|
var cacheBabelInterop = new WeakMap();
|
|
@@ -54,30 +55,22 @@ function _interop_require_wildcard(obj, nodeInterop) {
|
|
|
54
55
|
return newObj;
|
|
55
56
|
}
|
|
56
57
|
class BootTask {
|
|
57
|
-
logger;
|
|
58
58
|
taskManagerService;
|
|
59
|
-
serverTasks;
|
|
60
59
|
settingsStore;
|
|
61
|
-
settingsService;
|
|
62
60
|
multerService;
|
|
63
61
|
printerSocketStore;
|
|
64
62
|
printerFilesStore;
|
|
65
63
|
permissionService;
|
|
66
64
|
roleService;
|
|
67
65
|
userService;
|
|
68
|
-
pluginRepositoryCache;
|
|
69
66
|
floorStore;
|
|
70
|
-
pluginFirmwareUpdateService;
|
|
71
|
-
clientBundleService;
|
|
72
67
|
configService;
|
|
73
|
-
isTypeormMode;
|
|
74
68
|
typeormService;
|
|
69
|
+
isTypeormMode;
|
|
75
70
|
printerThumbnailCache;
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
this.
|
|
79
|
-
this.serverTasks = serverTasks;
|
|
80
|
-
this.settingsService = settingsService;
|
|
71
|
+
logger;
|
|
72
|
+
constructor(loggerFactory, taskManagerService, settingsStore, multerService, printerSocketStore, printerFilesStore, permissionService, roleService, userService, floorStore, configService, typeormService, isTypeormMode, printerThumbnailCache){
|
|
73
|
+
this.taskManagerService = taskManagerService;
|
|
81
74
|
this.settingsStore = settingsStore;
|
|
82
75
|
this.multerService = multerService;
|
|
83
76
|
this.printerSocketStore = printerSocketStore;
|
|
@@ -85,16 +78,15 @@ class BootTask {
|
|
|
85
78
|
this.permissionService = permissionService;
|
|
86
79
|
this.roleService = roleService;
|
|
87
80
|
this.userService = userService;
|
|
88
|
-
this.taskManagerService = taskManagerService;
|
|
89
|
-
this.pluginRepositoryCache = pluginRepositoryCache;
|
|
90
81
|
this.floorStore = floorStore;
|
|
91
|
-
this.clientBundleService = clientBundleService;
|
|
92
82
|
this.configService = configService;
|
|
93
83
|
this.typeormService = typeormService;
|
|
84
|
+
this.isTypeormMode = isTypeormMode;
|
|
94
85
|
this.printerThumbnailCache = printerThumbnailCache;
|
|
86
|
+
this.logger = loggerFactory(BootTask.name);
|
|
95
87
|
}
|
|
96
88
|
async runOnce() {
|
|
97
|
-
this.taskManagerService.registerJobOrTask(
|
|
89
|
+
this.taskManagerService.registerJobOrTask(_tasks.ServerTasks.SERVER_BOOT_TASK);
|
|
98
90
|
this.logger.log("Running boot task once.");
|
|
99
91
|
await this.run();
|
|
100
92
|
}
|
|
@@ -143,8 +135,8 @@ class BootTask {
|
|
|
143
135
|
await this.settingsStore.setRegistrationEnabled(registrationEnabled === "true");
|
|
144
136
|
}
|
|
145
137
|
}
|
|
146
|
-
const overrideJwtSecret = this.configService.get(_serverconstants.AppConstants.OVERRIDE_JWT_SECRET
|
|
147
|
-
const overrideJwtExpiresIn = this.configService.get(_serverconstants.AppConstants.OVERRIDE_JWT_EXPIRES_IN
|
|
138
|
+
const overrideJwtSecret = this.configService.get(_serverconstants.AppConstants.OVERRIDE_JWT_SECRET);
|
|
139
|
+
const overrideJwtExpiresIn = this.configService.get(_serverconstants.AppConstants.OVERRIDE_JWT_EXPIRES_IN);
|
|
148
140
|
await this.settingsStore.persistOptionalCredentialSettings(overrideJwtSecret, overrideJwtExpiresIn);
|
|
149
141
|
this.logger.log("Clearing upload folder");
|
|
150
142
|
this.multerService.clearUploadsFolder();
|
|
@@ -161,7 +153,7 @@ class BootTask {
|
|
|
161
153
|
if (process.env.SAFEMODE_ENABLED === "true") {
|
|
162
154
|
this.logger.warn("Starting in safe mode due to SAFEMODE_ENABLED");
|
|
163
155
|
} else {
|
|
164
|
-
|
|
156
|
+
_tasks.ServerTasks.BOOT_TASKS.forEach((task)=>{
|
|
165
157
|
this.taskManagerService.registerJobOrTask(task);
|
|
166
158
|
});
|
|
167
159
|
}
|
|
@@ -199,6 +191,9 @@ class BootTask {
|
|
|
199
191
|
async createConnection() {
|
|
200
192
|
if (!this.isTypeormMode) {
|
|
201
193
|
const envUrl = (0, _serverenv.fetchMongoDBConnectionString)();
|
|
194
|
+
if (!envUrl?.length) {
|
|
195
|
+
throw new Error("Mongodb connection string not set");
|
|
196
|
+
}
|
|
202
197
|
await (0, _mongoose.connect)(envUrl, {
|
|
203
198
|
serverSelectionTimeoutMS: 1500
|
|
204
199
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","
|
|
1
|
+
{"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","constructor","loggerFactory","taskManagerService","settingsStore","multerService","printerSocketStore","printerFilesStore","permissionService","roleService","userService","floorStore","configService","typeormService","isTypeormMode","printerThumbnailCache","name","runOnce","registerJobOrTask","ServerTasks","SERVER_BOOT_TASK","log","run","createConnection","migrateDatabase","e","mongoose","Error","message","includes","error","scheduleDisabledJob","DITokens","bootTask","loadSettings","syncPermissions","syncRoles","isDemoMode","warn","AppConstants","OVERRIDE_IS_DEMO_MODE","createOrUpdateDemoAccount","setLoginRequired","setRegistrationEnabled","loginRequired","get","OVERRIDE_LOGIN_REQUIRED","registrationEnabled","OVERRIDE_REGISTRATION_ENABLED","overrideJwtSecret","OVERRIDE_JWT_SECRET","overrideJwtExpiresIn","OVERRIDE_JWT_EXPIRES_IN","persistOptionalCredentialSettings","clearUploadsFolder","loadPrinterSockets","loadFilesStore","loadStore","loadCache","length","getAllValues","process","env","SAFEMODE_ENABLED","BOOT_TASKS","forEach","task","disableJob","demoUsername","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","demoPassword","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","demoRole","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","adminRole","getRoleByName","demoUserId","getDemoUserId","register","username","password","isDemoUser","isVerified","isRootUser","needsPasswordChange","roles","id","setVerifiedById","setIsRootUserById","updatePasswordUnsafeByUsername","setUserRoleIds","envUrl","fetchMongoDBConnectionString","connect","serverSelectionTimeoutMS","syncIndexes","runMigrations","connection","db","getClient"],"mappings":"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"}
|
|
@@ -11,10 +11,8 @@ Object.defineProperty(exports, "ClientDistDownloadTask", {
|
|
|
11
11
|
const _serverconstants = require("../server.constants");
|
|
12
12
|
class ClientDistDownloadTask {
|
|
13
13
|
clientBundleService;
|
|
14
|
-
githubService;
|
|
15
14
|
logger;
|
|
16
|
-
constructor(
|
|
17
|
-
this.githubService = githubService;
|
|
15
|
+
constructor(loggerFactory, clientBundleService){
|
|
18
16
|
this.clientBundleService = clientBundleService;
|
|
19
17
|
this.logger = loggerFactory(ClientDistDownloadTask.name);
|
|
20
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/tasks/client-bundle.task.ts"],"names":["ClientDistDownloadTask","
|
|
1
|
+
{"version":3,"sources":["../../src/tasks/client-bundle.task.ts"],"names":["ClientDistDownloadTask","logger","constructor","loggerFactory","clientBundleService","name","run","result","shouldUpdateWithReason","AppConstants","defaultClientMinimum","shouldUpdate","log","reason","downloadClientUpdate"],"mappings":";;;;+BAKaA;;;eAAAA;;;iCALgB;AAKtB,MAAMA;;IACMC,OAAsB;IAEvCC,YACEC,aAA6B,EAC7B,AAAiBC,mBAAwC,CACzD;aADiBA,sBAAAA;QAEjB,IAAI,CAACH,MAAM,GAAGE,cAAcH,uBAAuBK,IAAI;IACzD;IAEA,MAAMC,MAAM;QACV,MAAMC,SAAS,MAAM,IAAI,CAACH,mBAAmB,CAACI,sBAAsB,CAAC,OAAOC,6BAAY,CAACC,oBAAoB;QAC7G,IAAI,CAACH,OAAOI,YAAY,EAAE;YACxB,IAAI,CAACV,MAAM,CAACW,GAAG,CAAC,CAAC,sCAAsC,EAAEL,OAAOM,MAAM,EAAE;YACxE;QACF;QAEA,IAAI,CAACZ,MAAM,CAACW,GAAG,CAAC,CAAC,oDAAoD,EAAEL,OAAOM,MAAM,EAAE;QAEtF,MAAM,IAAI,CAACT,mBAAmB,CAACU,oBAAoB,CAACL,6BAAY,CAACC,oBAAoB;IACvF;AACF"}
|