@fdm-monster/server 1.6.3 → 1.7.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 +2 -0
- package/.yarn/install-state.gz +0 -0
- package/.yarn/releases/yarn-4.5.1.cjs +934 -0
- package/.yarnrc.yml +1 -1
- package/README.md +4 -2
- package/RELEASE_NOTES.MD +48 -0
- package/dist/consoles/download-github-releases.js +50 -0
- package/dist/consoles/download-github-releases.js.map +1 -0
- package/dist/consoles/moonraker-test.console.js.map +1 -1
- package/dist/consoles/sqlite-torm.js.map +1 -1
- package/dist/consoles/typeorm-generate.js +3 -3
- package/dist/consoles/typeorm-generate.js.map +1 -1
- package/dist/consoles/typeorm-migrate.js +1 -1
- package/dist/consoles/typeorm-migrate.js.map +1 -1
- package/dist/consoles/upload-test.js.map +1 -1
- package/dist/constants/authorization.constants.js.map +1 -1
- package/dist/constants/event.constants.js.map +1 -1
- package/dist/constants/http-status-codes.constants.js.map +1 -1
- package/dist/constants/server-settings.constants.js +9 -6
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/constants/service.constants.js.map +1 -1
- package/dist/container.js +23 -21
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +5 -3
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/batch-call.controller.js.map +1 -1
- package/dist/controllers/camera-stream.controller.js.map +1 -1
- package/dist/controllers/custom-gcode.controller.js +4 -6
- package/dist/controllers/custom-gcode.controller.js.map +1 -1
- package/dist/controllers/dto/update-client-dist.dto.js.map +1 -1
- package/dist/controllers/first-time-setup.controller.js.map +1 -1
- package/dist/controllers/floor.controller.js.map +1 -1
- package/dist/controllers/plugin-firmware-update.controller.js +117 -18
- package/dist/controllers/plugin-firmware-update.controller.js.map +1 -1
- package/dist/controllers/print-completion.controller.js.map +1 -1
- package/dist/controllers/printer-files.controller.js +168 -72
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer-group.controller.js.map +1 -1
- package/dist/controllers/printer-settings.controller.js +6 -6
- package/dist/controllers/printer-settings.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +467 -155
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +14 -0
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/controllers/settings.controller.js +38 -2
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/controllers/user.controller.js.map +1 -1
- package/dist/controllers/validation/auth-controller.validation.js.map +1 -1
- package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
- package/dist/controllers/validation/generic.validation.js.map +1 -1
- package/dist/controllers/validation/printer-controller.validation.js +3 -0
- package/dist/controllers/validation/printer-controller.validation.js.map +1 -1
- package/dist/controllers/validation/printer-files-controller.validation.js +7 -41
- package/dist/controllers/validation/printer-files-controller.validation.js.map +1 -1
- package/dist/controllers/validation/printer-settings-controller.validation.js.map +1 -1
- package/dist/controllers/validation/setting.validation.js.map +1 -1
- package/dist/controllers/validation/user-controller.validation.js.map +1 -1
- package/dist/data-source.js +6 -4
- package/dist/data-source.js.map +1 -1
- package/dist/entities/base.entity.js.map +1 -1
- package/dist/entities/camera-stream.entity.js.map +1 -1
- 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.map +1 -1
- package/dist/entities/group.entity.js.map +1 -1
- package/dist/entities/index.js.map +1 -1
- package/dist/entities/permission.entity.js.map +1 -1
- package/dist/entities/print-completion.entity.js.map +1 -1
- package/dist/entities/printer-file.entity.js +1 -1
- package/dist/entities/printer-file.entity.js.map +1 -1
- package/dist/entities/printer-group.entity.js.map +1 -1
- package/dist/entities/printer.entity.js +9 -6
- package/dist/entities/printer.entity.js.map +1 -1
- package/dist/entities/refresh-token.entity.js.map +1 -1
- package/dist/entities/role.entity.js.map +1 -1
- package/dist/entities/settings.entity.js +1 -1
- package/dist/entities/settings.entity.js.map +1 -1
- package/dist/entities/user-role.entity.js.map +1 -1
- package/dist/entities/user.entity.js.map +1 -1
- package/dist/exceptions/failed-dependency.exception.js.map +1 -1
- package/dist/exceptions/job.exceptions.js.map +1 -1
- package/dist/exceptions/runtime.exceptions.js.map +1 -1
- package/dist/handlers/cache-manager.js +2 -9
- package/dist/handlers/cache-manager.js.map +1 -1
- package/dist/handlers/event-emitter.js.map +1 -1
- package/dist/handlers/logger-factory.js.map +1 -1
- package/dist/handlers/logger.js +1 -1
- package/dist/handlers/logger.js.map +1 -1
- package/dist/handlers/validators.js +2 -1
- package/dist/handlers/validators.js.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/middleware/authenticate.js.map +1 -1
- package/dist/middleware/database.js.map +1 -1
- package/dist/middleware/demo.middleware.js.map +1 -1
- package/dist/middleware/exception.filter.js +1 -1
- package/dist/middleware/exception.filter.js.map +1 -1
- package/dist/middleware/global.middleware.js.map +1 -1
- package/dist/middleware/passport.js.map +1 -1
- package/dist/middleware/printer.js +33 -5
- package/dist/middleware/printer.js.map +1 -1
- package/dist/migrations/1706829146617-InitSqlite.js.map +1 -1
- package/dist/migrations/1707494762198-PrinterGroup.js.map +1 -1
- package/dist/migrations/1708465930665-ChangePrintCompletionDeletePrinterCascade.js.map +1 -1
- package/dist/migrations/1713300747465-ChangeRoleNameUnique.js.map +1 -1
- package/dist/migrations/1713897879622-AddPrinterType.js +192 -0
- package/dist/migrations/1713897879622-AddPrinterType.js.map +1 -0
- package/dist/migrations/1720338804844-RemovePrinterFile.js +43 -0
- package/dist/migrations/1720338804844-RemovePrinterFile.js.map +1 -0
- package/dist/models/Auth/Permission.js.map +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.map +1 -1
- package/dist/models/CustomGcode.js.map +1 -1
- package/dist/models/Floor.js.map +1 -1
- package/dist/models/FloorPrinter.js.map +1 -1
- package/dist/models/PrintCompletion.js.map +1 -1
- package/dist/models/Printer.js +6 -0
- package/dist/models/Printer.js.map +1 -1
- package/dist/models/PrinterFile.js +0 -41
- package/dist/models/PrinterFile.js.map +1 -1
- package/dist/models/Settings.js +12 -2
- package/dist/models/Settings.js.map +1 -1
- 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 +5 -2
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js +5 -5
- package/dist/server.core.js.map +1 -1
- package/dist/server.env.js +1 -1
- package/dist/server.env.js.map +1 -1
- package/dist/server.host.js +19 -7
- package/dist/server.host.js.map +1 -1
- package/dist/services/authentication/auth.service.js.map +1 -1
- package/dist/services/authentication/jwt.service.js.map +1 -1
- package/dist/services/authentication/permission.service.js.map +1 -1
- package/dist/services/authentication/refresh-token.service.js.map +1 -1
- package/dist/services/authentication/role.service.js.map +1 -1
- package/dist/services/authentication/user.service.js.map +1 -1
- package/dist/services/{batch-call.service.js → core/batch-call.service.js} +16 -15
- package/dist/services/core/batch-call.service.js.map +1 -0
- package/dist/services/core/client-bundle.service.js +1 -1
- 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/github.service.js.map +1 -1
- package/dist/services/core/logs-manager.service.js +1 -1
- package/dist/services/core/logs-manager.service.js.map +1 -1
- package/dist/services/core/monsterpi.service.js.map +1 -1
- package/dist/services/core/multer.service.js +1 -1
- package/dist/services/core/multer.service.js.map +1 -1
- package/dist/services/core/server-release.service.js +1 -1
- package/dist/services/core/server-release.service.js.map +1 -1
- package/dist/services/core/server-update.service.js.map +1 -1
- package/dist/services/core/task-manager.service.js.map +1 -1
- package/dist/services/core/yaml.service.js +9 -2
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/influxdb-v2/influx-db-v2-base.service.js.map +1 -1
- package/dist/services/interfaces/auth.service.interface.js.map +1 -1
- package/dist/services/interfaces/camera-stream.dto.js.map +1 -1
- package/dist/services/interfaces/camera-stream.service.interface.js.map +1 -1
- package/dist/services/interfaces/custom-gcode.dto.js.map +1 -1
- package/dist/services/interfaces/custom-gcode.service.interface.js.map +1 -1
- package/dist/services/interfaces/floor.dto.js.map +1 -1
- package/dist/services/interfaces/floor.service.interface.js.map +1 -1
- package/dist/services/interfaces/gcode-analysis.dto.js.map +1 -1
- package/dist/services/interfaces/group.dto.js.map +1 -1
- package/dist/services/interfaces/jwt.service.interface.js.map +1 -1
- package/dist/services/interfaces/login.dto.js +1 -0
- package/dist/services/interfaces/login.dto.js.map +1 -1
- package/dist/services/interfaces/page.interface.js.map +1 -1
- package/dist/services/interfaces/permission.dto.js.map +1 -1
- package/dist/services/interfaces/permission.service.interface.js.map +1 -1
- package/dist/services/interfaces/print-completion-context.dto.js.map +1 -1
- package/dist/services/interfaces/print-completion.dto.js.map +1 -1
- package/dist/services/interfaces/print-completion.interface.js.map +1 -1
- package/dist/services/interfaces/printer-file.dto.js +1 -21
- package/dist/services/interfaces/printer-file.dto.js.map +1 -1
- package/dist/services/interfaces/printer-group.dto.js.map +1 -1
- package/dist/services/interfaces/printer-group.service.interface.js.map +1 -1
- package/dist/services/interfaces/printer.dto.js +1 -0
- package/dist/services/interfaces/printer.dto.js.map +1 -1
- package/dist/services/interfaces/printer.service.interface.js.map +1 -1
- package/dist/services/interfaces/refresh-token.dto.js.map +1 -1
- package/dist/services/interfaces/refresh-token.service.interface.js.map +1 -1
- package/dist/services/interfaces/role-service.interface.js.map +1 -1
- package/dist/services/interfaces/role.dto.js.map +1 -1
- package/dist/services/interfaces/settings.dto.js +1 -1
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/interfaces/settings.service.interface.js.map +1 -1
- package/dist/services/interfaces/user-role.dto.js.map +1 -1
- package/dist/services/interfaces/user-service.interface.js.map +1 -1
- package/dist/services/interfaces/user.dto.js.map +1 -1
- package/dist/services/{camera-stream.service.js → mongoose/camera-stream.service.js} +3 -3
- package/dist/services/mongoose/camera-stream.service.js.map +1 -0
- package/dist/services/{custom-gcode.service.js → mongoose/custom-gcode.service.js} +2 -2
- package/dist/services/mongoose/custom-gcode.service.js.map +1 -0
- package/dist/services/{floor.service.js → mongoose/floor.service.js} +4 -4
- package/dist/services/mongoose/floor.service.js.map +1 -0
- package/dist/services/{print-completion.service.js → mongoose/print-completion.service.js} +4 -4
- package/dist/services/mongoose/print-completion.service.js.map +1 -0
- package/dist/services/{print-completion.shared.js → mongoose/print-completion.shared.js} +2 -2
- package/dist/services/mongoose/print-completion.shared.js.map +1 -0
- package/dist/services/{printer.service.js → mongoose/printer.service.js} +13 -10
- package/dist/services/mongoose/printer.service.js.map +1 -0
- package/dist/services/{settings.service.js → mongoose/settings.service.js} +20 -11
- package/dist/services/mongoose/settings.service.js.map +1 -0
- package/dist/services/moonraker/constants/moonraker-event.dto.js +35 -0
- package/dist/services/moonraker/constants/moonraker-event.dto.js.map +1 -0
- package/dist/services/moonraker/constants/websocket.constants.js +3 -17
- package/dist/services/moonraker/constants/websocket.constants.js.map +1 -1
- package/dist/services/moonraker/dto/access/access-info.dto.js.map +1 -1
- package/dist/services/moonraker/dto/access/access-login-refresh.dto.js.map +1 -1
- package/dist/services/moonraker/dto/access/access-login-result.dto.js.map +1 -1
- package/dist/services/moonraker/dto/access/access-user-result.dto.js.map +1 -1
- package/dist/services/moonraker/dto/access/access-user.dto.js.map +1 -1
- package/dist/services/moonraker/dto/database/database-namespace-item.dto.js.map +1 -1
- package/dist/services/moonraker/dto/database/database-namespace-list.dto.js.map +1 -1
- package/dist/services/moonraker/dto/gcode-help.dto.js.map +1 -1
- package/dist/services/moonraker/dto/gcode-store.dto.js.map +1 -1
- package/dist/services/moonraker/dto/job-queue/enqueue-job.dto.js.map +1 -1
- package/dist/services/moonraker/dto/job-queue/job-queue-status.dto.js.map +1 -1
- package/dist/services/moonraker/dto/machine/machine-device-power-device-state.dto.js.map +1 -1
- package/dist/services/moonraker/dto/machine/machine-device-power-devices.dto.js.map +1 -1
- package/dist/services/moonraker/dto/machine/machine-peripherals-canbus.dto.js.map +1 -1
- package/dist/services/moonraker/dto/machine/machine-peripherals-serial.dto.js.map +1 -1
- package/dist/services/moonraker/dto/machine/machine-peripherals-usb.dto.js.map +1 -1
- package/dist/services/moonraker/dto/machine/machine-peripherals-video.dto.js.map +1 -1
- package/dist/services/moonraker/dto/machine/machine-system-info.dto.js.map +1 -1
- package/dist/services/moonraker/dto/machine/machine-update-status.dto.js.map +1 -1
- package/dist/services/moonraker/dto/machine/machine-wled-strips.dto.js.map +1 -1
- package/dist/services/moonraker/dto/notifier-list.dto.js.map +1 -1
- package/dist/services/moonraker/dto/objects/bed-mesh.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/bed-mesh.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/configfile.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/configfile.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/display-status.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/display-status.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/extruder.dto.js.map +1 -1
- package/dist/services/moonraker/dto/objects/fan.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/fan.dto.js.map +1 -0
- package/dist/services/{octoprint/dto/octoprint-currentuser.dto.js → moonraker/dto/objects/filament-motion-sensor.dto.js} +1 -1
- package/dist/services/moonraker/dto/objects/filament-motion-sensor.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/filament-switch-sensor.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/filament-switch-sensor.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/gcode-move.dto.js.map +1 -1
- package/dist/services/moonraker/dto/objects/gcode.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/gcode.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/heater-bed.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/heater-bed.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/heaters.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/heaters.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/idle-timeout.dto.js +26 -0
- package/dist/services/moonraker/dto/objects/idle-timeout.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/mcu.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/mcu.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/motion-report.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/motion-report.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/output-pin.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/output-pin.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/pause-resume.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/pause-resume.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/print-stats.dto.js +29 -0
- package/dist/services/moonraker/dto/objects/print-stats.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/printer-object.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/printer-object.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/printer-object.types.js +6 -0
- package/dist/services/moonraker/dto/objects/printer-object.types.js.map +1 -0
- package/dist/services/moonraker/dto/objects/printer-objects-list.dto.js +42 -0
- package/dist/services/moonraker/dto/objects/printer-objects-list.dto.js.map +1 -1
- package/dist/services/moonraker/dto/objects/printer-objects-query.dto.js.map +1 -1
- package/dist/services/moonraker/dto/objects/stepper-enable.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/stepper-enable.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/system-stats.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/system-stats.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/temperature-fan.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/temperature-fan.dto.js.map +1 -0
- package/dist/services/{octoprint/dto/octoprint-session.dto.js → moonraker/dto/objects/temperature-sensor.dto.js} +1 -1
- package/dist/services/moonraker/dto/objects/temperature-sensor.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/toolhead.dto.js.map +1 -1
- package/dist/services/moonraker/dto/objects/virtual-sdcard.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/virtual-sdcard.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/webhooks.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/webhooks.dto.js.map +1 -0
- package/dist/services/moonraker/dto/octoprint-compat/api-job.dto.js.map +1 -1
- package/dist/services/moonraker/dto/octoprint-compat/api-login.dto.js.map +1 -1
- package/dist/services/moonraker/dto/octoprint-compat/api-printer.dto.js.map +1 -1
- package/dist/services/moonraker/dto/octoprint-compat/api-profiles.dto.js.map +1 -1
- package/dist/services/moonraker/dto/octoprint-compat/api-settings.dto.js.map +1 -1
- package/dist/services/moonraker/dto/octoprint-compat/api-version.dto.js.map +1 -1
- package/dist/services/moonraker/dto/octoprint-compat/server-version.dto.js.map +1 -1
- package/dist/services/moonraker/dto/printer-info.dto.js +21 -0
- package/dist/services/moonraker/dto/printer-info.dto.js.map +1 -1
- package/dist/services/moonraker/dto/printer-query-endstops.dto.js.map +1 -1
- package/dist/services/moonraker/dto/process-stats.dto.js.map +1 -1
- package/dist/services/moonraker/dto/rest/action-result.dto.js.map +1 -0
- package/dist/services/moonraker/dto/rest/error.dto.js +6 -0
- package/dist/services/moonraker/dto/rest/error.dto.js.map +1 -0
- package/dist/services/moonraker/dto/rest/result.dto.js.map +1 -0
- package/dist/services/moonraker/dto/rollover-logs.dto.js.map +1 -1
- package/dist/services/moonraker/dto/rpc/json-rpc-error.dto.js.map +1 -1
- package/dist/services/moonraker/dto/rpc/json-rpc-request.dto.js.map +1 -1
- package/dist/services/moonraker/dto/rpc/json-rpc-response.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server/server-config.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server/server-info.dto.js +12 -0
- package/dist/services/moonraker/dto/server/server-info.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-announcements/announcement-action.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-announcements/announcement-entry-id.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-announcements/announcement-feeds.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-announcements/announcement-list.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-files/server-file-directory-action.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-files/server-file-directory-info.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-files/server-file-metadata.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-files/server-file-root.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-files/server-file-thumbnail.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-files/server-file-zip-action.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-files/server-file.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-history/history-job.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-history/history-last-totals.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-history/history-list.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-history/history-totals.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-history/job.dto.js +26 -0
- package/dist/services/moonraker/dto/server-history/job.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-sensors/sensor-info.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-sensors/sensor-list.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-sensors/sensor-measurements.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-webcams/webcam-item.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-webcams/webcam-list.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-webcams/webcam-test.dto.js.map +1 -1
- package/dist/services/moonraker/dto/spoolman/spoolman-active-spool.dto.js.map +1 -1
- package/dist/services/moonraker/dto/spoolman/spoolman-proxy-request.dto.js.map +1 -1
- package/dist/services/moonraker/dto/spoolman/spoolman-response.dto.js.map +1 -1
- package/dist/services/moonraker/dto/spoolman/spoolman-status.dto.js.map +1 -1
- package/dist/services/moonraker/dto/sudo-info.dto.js.map +1 -1
- package/dist/services/moonraker/dto/sudo-response.dto.js.map +1 -1
- package/dist/services/moonraker/dto/temperature-store.dto.js.map +1 -1
- package/dist/services/{interfaces/printer-files.service.interface.js → moonraker/dto/websocket/connection-identify-response.dto.js} +1 -1
- package/dist/services/moonraker/dto/websocket/connection-identify-response.dto.js.map +1 -0
- package/dist/services/moonraker/dto/websocket/connection-identify.dto.js +6 -0
- package/dist/services/moonraker/dto/websocket/connection-identify.dto.js.map +1 -0
- package/dist/services/moonraker/dto/websocket/json-rpc-event.dto.js.map +1 -1
- package/dist/services/moonraker/dto/websocket/message.types.js.map +1 -1
- package/dist/services/moonraker/dto/websocket/methods.js.map +1 -1
- package/dist/services/moonraker/dto/websocket/notify-active-spool-set.params.js.map +1 -1
- package/dist/services/moonraker/dto/websocket/notify-agent-event.params.js.map +1 -1
- package/dist/services/moonraker/dto/websocket/notify-announcement-update.params.js.map +1 -1
- package/dist/services/moonraker/dto/websocket/notify-announcement.params.js.map +1 -1
- package/dist/services/moonraker/dto/websocket/notify-button-event.params.js.map +1 -1
- package/dist/services/moonraker/dto/websocket/notify-filelist-changed.params.js.map +1 -1
- package/dist/services/moonraker/dto/websocket/notify-history-changed.params.js.map +1 -1
- package/dist/services/moonraker/dto/websocket/notify-job-queue-changed.params.js.map +1 -1
- package/dist/services/moonraker/dto/websocket/notify-proc-stat-update.params.js.map +1 -1
- package/dist/services/moonraker/dto/websocket/notify-sensor-update.params.js.map +1 -1
- package/dist/services/moonraker/dto/websocket/notify-service-state-changed.params.js.map +1 -1
- package/dist/services/moonraker/dto/websocket/notify-spoolman-status-changed.js.map +1 -1
- package/dist/services/moonraker/dto/websocket/notify-sudo-alert.params.js.map +1 -1
- package/dist/services/moonraker/dto/websocket/notify-update-response.params.js.map +1 -1
- package/dist/services/moonraker/dto/websocket/notify-user-change.params.js.map +1 -1
- package/dist/services/moonraker/moonraker-websocket.adapter.js +220 -36
- package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
- package/dist/services/moonraker/moonraker.client.js +17 -13
- package/dist/services/moonraker/moonraker.client.js.map +1 -1
- package/dist/services/moonraker.api.js +120 -0
- package/dist/services/moonraker.api.js.map +1 -0
- package/dist/services/octoprint/constants/firmware-update-settings.constants.js.map +1 -1
- package/dist/services/octoprint/constants/octoprint-service.constants.js.map +1 -1
- package/dist/services/octoprint/constants/octoprint-websocket.constants.js +3 -39
- package/dist/services/octoprint/constants/octoprint-websocket.constants.js.map +1 -1
- package/dist/services/octoprint/dto/access/user-list.dto.js +6 -0
- package/dist/services/octoprint/dto/access/user-list.dto.js.map +1 -0
- package/dist/services/octoprint/dto/access/user.dto.js +6 -0
- package/dist/services/octoprint/dto/access/user.dto.js.map +1 -0
- package/dist/services/octoprint/dto/auth/current-user.dto.js +6 -0
- package/dist/services/octoprint/dto/auth/current-user.dto.js.map +1 -0
- package/dist/services/octoprint/dto/auth/login.dto.js +6 -0
- package/dist/services/octoprint/dto/auth/login.dto.js.map +1 -0
- package/dist/services/octoprint/dto/connection/connection-state.type.js +34 -0
- package/dist/services/octoprint/dto/connection/connection-state.type.js.map +1 -0
- package/dist/services/octoprint/dto/connection/connection.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/client-authed.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/client-closed.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/client-opened.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/dwelling.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/file-added.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/file-deselected.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/file-removed.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/folder-added.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/home.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/metadata-analysis-finished.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/metadata-analysis-started.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/metadata-statistics-updated.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/position-update.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/print-cancelled.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/print-cancelling.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/print-done.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/print-failed.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/print-paused.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/print-resumed.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/print-started.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/printer-state-changed.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/transfer-done.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/transfer-started.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/updated-files.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/upload.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/user-logged-in.dto.js.map +1 -0
- package/dist/services/octoprint/dto/events/z-change.dto.js.map +1 -0
- package/dist/services/octoprint/dto/files/octoprint-file.dto.js.map +1 -0
- package/dist/services/octoprint/dto/files/octoprint-files-response.dto.js +6 -0
- package/dist/services/octoprint/dto/files/octoprint-files-response.dto.js.map +1 -0
- package/dist/services/octoprint/dto/job/current-job.dto.js +17 -0
- package/dist/services/octoprint/dto/job/current-job.dto.js.map +1 -0
- package/dist/services/octoprint/dto/job/job.dto.js +6 -0
- package/dist/services/octoprint/dto/job/job.dto.js.map +1 -0
- package/dist/services/octoprint/dto/octoprint-event.dto.js +22 -19
- package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -1
- package/dist/services/octoprint/dto/printer/busy-file.dto.js +6 -0
- package/dist/services/octoprint/dto/printer/busy-file.dto.js.map +1 -0
- package/dist/services/octoprint/dto/printer/flags.dto.js +6 -0
- package/dist/services/octoprint/dto/printer/flags.dto.js.map +1 -0
- package/dist/services/octoprint/dto/printer/markings.dto.js +6 -0
- package/dist/services/octoprint/dto/printer/markings.dto.js.map +1 -0
- package/dist/services/octoprint/dto/printer/progress.dto.js +6 -0
- package/dist/services/octoprint/dto/printer/progress.dto.js.map +1 -0
- package/dist/services/octoprint/dto/printer/resends.dto.js +6 -0
- package/dist/services/octoprint/dto/printer/resends.dto.js.map +1 -0
- package/dist/services/octoprint/dto/printer/state.dto.js +6 -0
- package/dist/services/octoprint/dto/printer/state.dto.js.map +1 -0
- package/dist/services/octoprint/dto/printer/temps.dto.js +6 -0
- package/dist/services/octoprint/dto/printer/temps.dto.js.map +1 -0
- package/dist/services/octoprint/dto/rest/error.dto.js +6 -0
- package/dist/services/octoprint/dto/rest/error.dto.js.map +1 -0
- package/dist/services/octoprint/dto/server/server.dto.js +6 -0
- package/dist/services/octoprint/dto/server/server.dto.js.map +1 -0
- package/dist/services/octoprint/dto/server/version.dto.js +6 -0
- package/dist/services/octoprint/dto/server/version.dto.js.map +1 -0
- package/dist/services/octoprint/dto/settings/serial-settings.dto.js +6 -0
- package/dist/services/octoprint/dto/settings/serial-settings.dto.js.map +1 -0
- package/dist/services/octoprint/dto/settings/settings-parts.type.js +6 -0
- package/dist/services/octoprint/dto/settings/settings-parts.type.js.map +1 -0
- package/dist/services/octoprint/dto/settings/settings.dto.js +6 -0
- package/dist/services/octoprint/dto/settings/settings.dto.js.map +1 -0
- package/dist/services/octoprint/dto/settings/virtual-printer-settings.dto.js +6 -0
- package/dist/services/octoprint/dto/settings/virtual-printer-settings.dto.js.map +1 -0
- package/dist/services/octoprint/dto/{octoprint-system-info.dto.js → system/system-info.dto.js} +4 -4
- package/dist/services/octoprint/dto/system/system-info.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket/connection-message.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket/current-message.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket/event-message.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket/event.type.js +53 -0
- package/dist/services/octoprint/dto/websocket/event.type.js.map +1 -0
- package/dist/services/octoprint/dto/websocket/history-message.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket/plugin-message.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket/timelapse-message.dto.js.map +1 -0
- package/dist/services/octoprint/octoprint-api.routes.js +7 -6
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/{octoprint-sockio.adapter.js → octoprint-websocket.adapter.js} +71 -46
- package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -0
- package/dist/services/octoprint/{octoprint-api.service.js → octoprint.client.js} +75 -68
- package/dist/services/octoprint/octoprint.client.js.map +1 -0
- package/dist/services/octoprint/plugin-base.service.js +18 -18
- package/dist/services/octoprint/plugin-base.service.js.map +1 -1
- package/dist/services/octoprint/plugin-firmware-update.service.js +7 -8
- package/dist/services/octoprint/plugin-firmware-update.service.js.map +1 -1
- package/dist/services/octoprint/plugin-repository.cache.js +4 -4
- package/dist/services/octoprint/plugin-repository.cache.js.map +1 -1
- package/dist/services/octoprint/utils/api.utils.js.map +1 -1
- package/dist/services/octoprint/utils/file.utils.js +2 -11
- package/dist/services/octoprint/utils/file.utils.js.map +1 -1
- package/dist/services/octoprint.api.js +98 -0
- package/dist/services/octoprint.api.js.map +1 -0
- package/dist/services/orm/base.interface.js.map +1 -1
- package/dist/services/orm/base.service.js.map +1 -1
- package/dist/services/orm/camera-stream.service.js.map +1 -1
- package/dist/services/orm/custom-gcode.service.js.map +1 -1
- package/dist/services/orm/floor-position.service.js.map +1 -1
- package/dist/services/orm/floor.service.js.map +1 -1
- package/dist/services/orm/permission.service.js.map +1 -1
- package/dist/services/orm/print-completion.service.js +5 -6
- package/dist/services/orm/print-completion.service.js.map +1 -1
- package/dist/services/orm/printer-group.service.js.map +1 -1
- package/dist/services/orm/printer.service.js +5 -3
- package/dist/services/orm/printer.service.js.map +1 -1
- package/dist/services/orm/refresh-token.service.js.map +1 -1
- package/dist/services/orm/role.service.js.map +1 -1
- package/dist/services/orm/settings.service.js +17 -8
- package/dist/services/orm/settings.service.js.map +1 -1
- package/dist/services/orm/user-role.service.js.map +1 -1
- package/dist/services/orm/user.service.js.map +1 -1
- package/dist/services/printer-api.factory.js +36 -0
- package/dist/services/printer-api.factory.js.map +1 -0
- package/dist/services/printer-api.interface.js +28 -0
- package/dist/services/printer-api.interface.js.map +1 -0
- package/dist/services/socket.factory.js +32 -0
- package/dist/services/socket.factory.js.map +1 -0
- package/dist/services/typeorm/typeorm.service.js.map +1 -1
- package/dist/services/validators/floor-service.validation.js.map +1 -1
- package/dist/services/validators/print-completion-service.validation.js.map +1 -1
- package/dist/services/validators/printer-service.validation.js +3 -0
- package/dist/services/validators/printer-service.validation.js.map +1 -1
- package/dist/services/validators/settings-service.validation.js +14 -1
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/services/validators/user-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +3 -2
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/shared/dtos/api-state.type.js +19 -0
- package/dist/shared/dtos/api-state.type.js.map +1 -0
- package/dist/shared/dtos/socket-login.dto.js +6 -0
- package/dist/shared/dtos/socket-login.dto.js.map +1 -0
- package/dist/shared/dtos/socket-state.type.js +22 -0
- package/dist/shared/dtos/socket-state.type.js.map +1 -0
- package/dist/shared/websocket-rpc-extended.adapter.js +69 -0
- package/dist/shared/websocket-rpc-extended.adapter.js.map +1 -0
- package/dist/shared/websocket.adapter.js.map +1 -1
- package/dist/shared.constants.js.map +1 -1
- package/dist/state/file-upload-tracker.cache.js.map +1 -1
- package/dist/state/file.cache.js.map +1 -1
- package/dist/state/floor.store.js.map +1 -1
- package/dist/state/printer-events.cache.js +23 -17
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/printer-files.store.js +17 -39
- package/dist/state/printer-files.store.js.map +1 -1
- package/dist/state/printer-socket.store.js +6 -3
- package/dist/state/printer-socket.store.js.map +1 -1
- package/dist/state/printer.cache.js +4 -2
- package/dist/state/printer.cache.js.map +1 -1
- package/dist/state/settings.store.js +26 -6
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/socket-io.gateway.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +9 -8
- package/dist/state/test-printer-socket.store.js.map +1 -1
- 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 +1 -1
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/client-bundle.task.js.map +1 -1
- package/dist/tasks/print-completion.socketio.task.js.map +1 -1
- package/dist/tasks/printer-file-clean.task.js +5 -5
- package/dist/tasks/printer-file-clean.task.js.map +1 -1
- package/dist/tasks/printer-state-update-poll.task.js +17 -41
- package/dist/tasks/printer-state-update-poll.task.js.map +1 -1
- package/dist/tasks/printer-websocket-restore.task.js +6 -6
- package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
- package/dist/tasks/printer-websocket.task.js +3 -3
- package/dist/tasks/printer-websocket.task.js.map +1 -1
- package/dist/tasks/socketio.task.js.map +1 -1
- package/dist/tasks/software-update.task.js.map +1 -1
- package/dist/tasks.js +0 -2
- package/dist/tasks.js.map +1 -1
- package/dist/types/express/index.d.js.map +1 -1
- package/dist/utils/array.util.js.map +1 -1
- package/dist/utils/benchmark.util.js.map +1 -1
- package/dist/utils/cache/key-diff.cache.js.map +1 -1
- package/dist/utils/correlation-token.util.js.map +1 -1
- package/dist/utils/crypto.utils.js.map +1 -1
- package/dist/utils/env.utils.js +1 -1
- package/dist/utils/env.utils.js.map +1 -1
- package/dist/utils/error.utils.js.map +1 -1
- package/dist/utils/fs.utils.js.map +1 -1
- package/dist/utils/is-docker.js +1 -1
- package/dist/utils/is-docker.js.map +1 -1
- package/dist/utils/metric.utils.js.map +1 -1
- package/dist/utils/normalize-url.js.map +1 -1
- package/dist/utils/pretty-print.utils.js +26 -0
- package/dist/utils/pretty-print.utils.js.map +1 -0
- package/dist/utils/printer-type.utils.js +32 -0
- package/dist/utils/printer-type.utils.js.map +1 -0
- package/dist/utils/semver.utils.js.map +1 -1
- package/dist/utils/time.utils.js.map +1 -1
- package/dist/utils/url.utils.js.map +1 -1
- package/package.json +51 -49
- package/requests/octoprint-pluginmanager-plugins.http +7 -0
- package/tsconfig.json +2 -2
- package/.yarn/releases/yarn-4.3.0.cjs +0 -894
- package/dist/services/batch-call.service.js.map +0 -1
- package/dist/services/camera-stream.service.js.map +0 -1
- package/dist/services/custom-gcode.service.js.map +0 -1
- package/dist/services/floor.service.js.map +0 -1
- package/dist/services/interfaces/printer-files.service.interface.js.map +0 -1
- package/dist/services/moonraker/dto/action-result.dto.js.map +0 -1
- package/dist/services/moonraker/dto/result.dto.js.map +0 -1
- package/dist/services/moonraker/moonraker-subscription.client.js +0 -33
- package/dist/services/moonraker/moonraker-subscription.client.js.map +0 -1
- package/dist/services/octoprint/dto/connection-state.dto.js +0 -21
- package/dist/services/octoprint/dto/connection-state.dto.js.map +0 -1
- package/dist/services/octoprint/dto/connection.dto.js.map +0 -1
- package/dist/services/octoprint/dto/octoprint-currentuser.dto.js.map +0 -1
- package/dist/services/octoprint/dto/octoprint-file.dto.js +0 -84
- package/dist/services/octoprint/dto/octoprint-file.dto.js.map +0 -1
- package/dist/services/octoprint/dto/octoprint-files.dto.js +0 -17
- package/dist/services/octoprint/dto/octoprint-files.dto.js.map +0 -1
- package/dist/services/octoprint/dto/octoprint-session.dto.js.map +0 -1
- package/dist/services/octoprint/dto/octoprint-settings.dto.js +0 -29
- package/dist/services/octoprint/dto/octoprint-settings.dto.js.map +0 -1
- package/dist/services/octoprint/dto/octoprint-system-info.dto.js.map +0 -1
- package/dist/services/octoprint/dto/state.dto.js +0 -38
- package/dist/services/octoprint/dto/state.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/connection-message.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/current-message.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/event-message.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/event.type.js +0 -54
- package/dist/services/octoprint/dto/websocket-output/event.type.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/client-authed.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/client-closed.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/client-opened.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/dwelling.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/file-added.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/file-deselected.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/file-removed.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/folder-added.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/home.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/metadata-analysis-finished.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/metadata-analysis-started.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/metadata-statistics-updated.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/position-update.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/print-cancelled.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/print-cancelling.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/print-done.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/print-failed.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/print-paused.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/print-resumed.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/print-started.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/printer-state-changed.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/transfer-done.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/transfer-started.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/updated-files.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/upload.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/user-logged-in.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/events/z-change.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/history-message.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/plugin-message.dto.js.map +0 -1
- package/dist/services/octoprint/dto/websocket-output/timelapse-message.dto.js.map +0 -1
- package/dist/services/octoprint/models/octoprint-file.dto.js.map +0 -1
- package/dist/services/octoprint/octoprint-api.service.js.map +0 -1
- package/dist/services/octoprint/octoprint-sockio.adapter.js.map +0 -1
- package/dist/services/octoprint/socket.factory.js +0 -22
- package/dist/services/octoprint/socket.factory.js.map +0 -1
- package/dist/services/orm/printer-files.service.js +0 -130
- package/dist/services/orm/printer-files.service.js.map +0 -1
- package/dist/services/orm-migration.service.js +0 -20
- package/dist/services/orm-migration.service.js.map +0 -1
- package/dist/services/print-completion.service.js.map +0 -1
- package/dist/services/print-completion.shared.js.map +0 -1
- package/dist/services/printer-files.service.js +0 -111
- package/dist/services/printer-files.service.js.map +0 -1
- package/dist/services/printer.service.js.map +0 -1
- package/dist/services/settings.service.js.map +0 -1
- package/dist/shared/dtos/printer-login.dto.js +0 -58
- package/dist/shared/dtos/printer-login.dto.js.map +0 -1
- package/dist/state/printer-connection.cache.js +0 -34
- package/dist/state/printer-connection.cache.js.map +0 -1
- /package/dist/services/moonraker/dto/{action-result.dto.js → rest/action-result.dto.js} +0 -0
- /package/dist/services/moonraker/dto/{result.dto.js → rest/result.dto.js} +0 -0
- /package/dist/services/octoprint/dto/{connection.dto.js → connection/connection.dto.js} +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/client-authed.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/client-closed.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/client-opened.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/dwelling.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/file-added.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/file-deselected.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/file-removed.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/folder-added.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/home.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/metadata-analysis-finished.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/metadata-analysis-started.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/metadata-statistics-updated.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/position-update.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/print-cancelled.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/print-cancelling.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/print-done.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/print-failed.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/print-paused.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/print-resumed.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/print-started.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/printer-state-changed.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/transfer-done.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/transfer-started.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/updated-files.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/upload.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/user-logged-in.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output/events → events}/z-change.dto.js +0 -0
- /package/dist/services/octoprint/{models → dto/files}/octoprint-file.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output → websocket}/connection-message.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output → websocket}/current-message.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output → websocket}/event-message.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output → websocket}/history-message.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output → websocket}/plugin-message.dto.js +0 -0
- /package/dist/services/octoprint/dto/{websocket-output → websocket}/timelapse-message.dto.js +0 -0
|
@@ -9,38 +9,38 @@ Object.defineProperty(exports, "PrinterFilesStore", {
|
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
const _runtimeexceptions = require("../exceptions/runtime.exceptions");
|
|
12
|
-
const _errorutils = require("../utils/error.utils");
|
|
13
12
|
const _node = require("@sentry/node");
|
|
14
13
|
class PrinterFilesStore {
|
|
15
14
|
printerCache;
|
|
16
|
-
printerFilesService;
|
|
17
15
|
fileCache;
|
|
18
|
-
|
|
16
|
+
printerApiFactory;
|
|
17
|
+
octoprintClient;
|
|
19
18
|
logger;
|
|
20
|
-
constructor({ printerCache,
|
|
19
|
+
constructor({ printerCache, fileCache, printerApiFactory, octoprintClient, loggerFactory }){
|
|
21
20
|
this.printerCache = printerCache;
|
|
22
|
-
this.
|
|
21
|
+
this.printerApiFactory = printerApiFactory;
|
|
23
22
|
this.fileCache = fileCache;
|
|
24
|
-
this.
|
|
23
|
+
this.octoprintClient = octoprintClient;
|
|
25
24
|
this.logger = loggerFactory(PrinterFilesStore.name);
|
|
26
25
|
}
|
|
27
26
|
async loadFilesStore() {
|
|
28
27
|
const printers = await this.printerCache.listCachedPrinters(true);
|
|
29
|
-
for (
|
|
28
|
+
for (const printer of printers){
|
|
30
29
|
try {
|
|
31
|
-
const printerFiles = await this.
|
|
30
|
+
const printerFiles = await this.loadFiles(printer.id, false);
|
|
32
31
|
this.fileCache.cachePrinterFiles(printer.id, printerFiles);
|
|
33
32
|
} catch (e) {
|
|
34
33
|
(0, _node.captureException)(e);
|
|
35
|
-
this.logger.error("Files store failed to
|
|
34
|
+
this.logger.error("Files store failed to load file list for printer");
|
|
36
35
|
}
|
|
37
36
|
}
|
|
38
37
|
}
|
|
39
|
-
async
|
|
38
|
+
async loadFiles(printerId, recursive = false) {
|
|
40
39
|
const loginDto = await this.printerCache.getLoginDtoAsync(printerId);
|
|
41
|
-
const
|
|
42
|
-
await
|
|
43
|
-
|
|
40
|
+
const printerApi = this.printerApiFactory.getScopedPrinter(loginDto);
|
|
41
|
+
const files = await printerApi.getFiles();
|
|
42
|
+
this.fileCache.cachePrinterFiles(printerId, files);
|
|
43
|
+
return files;
|
|
44
44
|
}
|
|
45
45
|
getFiles(printerId) {
|
|
46
46
|
return this.fileCache.getPrinterFiles(printerId);
|
|
@@ -53,14 +53,14 @@ class PrinterFilesStore {
|
|
|
53
53
|
return printerFiles.filter((file)=>!!file.date && file.date + ageDaysMax * 86400 < nowTimestampSeconds);
|
|
54
54
|
}
|
|
55
55
|
async deleteOutdatedFiles(printerId, ageDaysMax) {
|
|
56
|
+
const printerApi = this.printerApiFactory.getById(printerId);
|
|
56
57
|
const failedFiles = [];
|
|
57
58
|
const succeededFiles = [];
|
|
58
59
|
const nonRecursiveFiles = this.getOutdatedFiles(printerId, ageDaysMax);
|
|
59
|
-
const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
|
|
60
60
|
const name = (await this.printerCache.getCachedPrinterOrThrowAsync(printerId)).name;
|
|
61
61
|
for (let file of nonRecursiveFiles){
|
|
62
62
|
try {
|
|
63
|
-
await
|
|
63
|
+
await printerApi.deleteFile(file.path);
|
|
64
64
|
succeededFiles.push(file);
|
|
65
65
|
} catch (e) {
|
|
66
66
|
failedFiles.push(file);
|
|
@@ -74,42 +74,20 @@ class PrinterFilesStore {
|
|
|
74
74
|
}
|
|
75
75
|
async purgePrinterFiles(printerId) {
|
|
76
76
|
const printerState = await this.printerCache.getCachedPrinterOrThrowAsync(printerId);
|
|
77
|
-
this.logger.log(`Purging files from printer`);
|
|
78
|
-
await this.printerFilesService.clearFiles(printerState.id);
|
|
79
77
|
this.logger.log(`Purging file cache from printer`);
|
|
80
78
|
this.fileCache.purgePrinterId(printerState.id);
|
|
81
79
|
this.logger.log(`Clearing printer files successful`);
|
|
82
80
|
}
|
|
83
81
|
async purgeFiles() {
|
|
84
82
|
const allPrinters = await this.printerCache.listCachedPrinters();
|
|
85
|
-
this.logger.log(`
|
|
86
|
-
for (let printer of allPrinters){
|
|
87
|
-
await this.printerFilesService.clearFiles(printer.id);
|
|
88
|
-
}
|
|
89
|
-
this.logger.log(`Purging files done. Clearing caches`);
|
|
83
|
+
this.logger.log(`Clearing file caches`);
|
|
90
84
|
for (let printer of allPrinters){
|
|
91
85
|
this.fileCache.purgePrinterId(printer.id);
|
|
92
86
|
}
|
|
93
87
|
this.logger.log(`Clearing caches successful.`);
|
|
94
88
|
}
|
|
95
|
-
async
|
|
96
|
-
const printer = await this.printerCache.getCachedPrinterOrThrowAsync(printerId);
|
|
97
|
-
const printerFileList = await this.printerFilesService.updateFiles(printer.id, files);
|
|
98
|
-
await this.fileCache.cachePrinterFiles(printer.id, printerFileList);
|
|
99
|
-
}
|
|
100
|
-
async appendOrSetPrinterFile(printerId, addedFile) {
|
|
101
|
-
const printer = await this.printerCache.getCachedPrinterOrThrowAsync(printerId);
|
|
102
|
-
const files = await this.printerFilesService.appendOrReplaceFile(printer.id, addedFile);
|
|
103
|
-
await this.fileCache.cachePrinterFiles(printer.id, files);
|
|
104
|
-
}
|
|
105
|
-
async deleteFile(printerId, filePath, throwError) {
|
|
106
|
-
const serviceActionResult = await this.printerFilesService.deletePrinterFiles(printerId, [
|
|
107
|
-
filePath
|
|
108
|
-
], throwError);
|
|
89
|
+
async deleteFile(printerId, filePath) {
|
|
109
90
|
this.fileCache.purgeFile(printerId, filePath);
|
|
110
|
-
return {
|
|
111
|
-
service: serviceActionResult
|
|
112
|
-
};
|
|
113
91
|
}
|
|
114
92
|
}
|
|
115
93
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/printer-files.store.ts"],"names":["PrinterFilesStore","printerCache","
|
|
1
|
+
{"version":3,"sources":["../../src/state/printer-files.store.ts"],"names":["PrinterFilesStore","printerCache","fileCache","printerApiFactory","octoprintClient","logger","constructor","loggerFactory","name","loadFilesStore","printers","listCachedPrinters","printer","printerFiles","loadFiles","id","cachePrinterFiles","e","captureException","error","printerId","recursive","loginDto","getLoginDtoAsync","printerApi","getScopedPrinter","files","getFiles","getPrinterFiles","getOutdatedFiles","ageDaysMax","ValidationException","length","nowTimestampSeconds","Date","now","filter","file","date","deleteOutdatedFiles","getById","failedFiles","succeededFiles","nonRecursiveFiles","getCachedPrinterOrThrowAsync","deleteFile","path","push","log","purgePrinterFiles","printerState","purgePrinterId","purgeFiles","allPrinters","filePath","purgeFile"],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ Object.defineProperty(exports, "PrinterSocketStore", {
|
|
|
11
11
|
const _node = require("@sentry/node");
|
|
12
12
|
const _errorutils = require("../utils/error.utils");
|
|
13
13
|
const _eventconstants = require("../constants/event.constants");
|
|
14
|
+
const _printerapiinterface = require("../services/printer-api.interface");
|
|
14
15
|
class PrinterSocketStore {
|
|
15
16
|
socketIoGateway;
|
|
16
17
|
socketFactory;
|
|
@@ -35,6 +36,7 @@ class PrinterSocketStore {
|
|
|
35
36
|
Object.values(this.printerSocketAdaptersById).forEach((s)=>{
|
|
36
37
|
socketStatesById[s.printerId] = {
|
|
37
38
|
printerId: s.printerId,
|
|
39
|
+
printerType: s.printerType,
|
|
38
40
|
socket: s.socketState,
|
|
39
41
|
api: s.apiState
|
|
40
42
|
};
|
|
@@ -78,7 +80,7 @@ class PrinterSocketStore {
|
|
|
78
80
|
const failedSocketsReauth = [];
|
|
79
81
|
for (const socket of Object.values(this.printerSocketAdaptersById)){
|
|
80
82
|
try {
|
|
81
|
-
if (socket.needsReauth()) {
|
|
83
|
+
if (socket.printerType === _printerapiinterface.OctoprintType && socket.needsReauth()) {
|
|
82
84
|
reauthRequested++;
|
|
83
85
|
const promise = socket.reauthSession().catch((_)=>{
|
|
84
86
|
failedSocketsReauth.push(socket.printerId);
|
|
@@ -141,7 +143,7 @@ class PrinterSocketStore {
|
|
|
141
143
|
return;
|
|
142
144
|
}
|
|
143
145
|
if (!foundAdapter) {
|
|
144
|
-
foundAdapter = this.socketFactory.createInstance();
|
|
146
|
+
foundAdapter = this.socketFactory.createInstance(printer.printerType);
|
|
145
147
|
this.printerSocketAdaptersById[id] = foundAdapter;
|
|
146
148
|
} else {
|
|
147
149
|
foundAdapter.close();
|
|
@@ -151,7 +153,8 @@ class PrinterSocketStore {
|
|
|
151
153
|
printerId: printer.id.toString(),
|
|
152
154
|
loginDto: {
|
|
153
155
|
apiKey: printer.apiKey,
|
|
154
|
-
printerURL: printer.printerURL
|
|
156
|
+
printerURL: printer.printerURL,
|
|
157
|
+
printerType: printer.printerType
|
|
155
158
|
},
|
|
156
159
|
protocol: "ws"
|
|
157
160
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/printer-socket.store.ts"],"names":["PrinterSocketStore","socketIoGateway","socketFactory","eventEmitter2","printerCache","printerSocketAdaptersById","logger","configService","settingsStore","constructor","loggerFactory","name","subscribeToEvents","getSocketStatesById","socketStatesById","Object","values","forEach","s","printerId","socket","socketState","api","apiState","loadPrinterSockets","loadCache","printerDocs","listCachedPrinters","doc","handlePrinterCreated","printer","e","captureException","error","errorSummary","log","keys","length","listPrinterSockets","reconnectOctoPrint","id","getPrinterSocket","close","resetSocketState","reconnectPrinterSockets","reauthRequested","socketSetupRequested","socketStates","apiStates","promisesReauth","failedSocketsReauth","needsReauth","promise","reauthSession","catch","_","push","getDebugSettingsSensitive","debugSocketSetup","Promise","all","promisesOpenSocket","failedSocketReopened","needsSetup","needsReopen","setupSocketSession","then","open","keySocket","valSocket","keyApi","valApi","reauth","socketSetup","createOrUpdateSocket","enabled","foundAdapter","toString","deleteSocket","createInstance","registerCredentials","loginDto","apiKey","printerURL","protocol","handleBatchPrinterCreated","printers","p","handlePrinterUpdated","handlePrintersDeleted","printerIds","on","printerEvents","printerCreated","bind","printersDeleted","printerUpdated","batchPrinterCreated"],"
|
|
1
|
+
{"version":3,"sources":["../../src/state/printer-socket.store.ts"],"names":["PrinterSocketStore","socketIoGateway","socketFactory","eventEmitter2","printerCache","printerSocketAdaptersById","logger","configService","settingsStore","constructor","loggerFactory","name","subscribeToEvents","getSocketStatesById","socketStatesById","Object","values","forEach","s","printerId","printerType","socket","socketState","api","apiState","loadPrinterSockets","loadCache","printerDocs","listCachedPrinters","doc","handlePrinterCreated","printer","e","captureException","error","errorSummary","log","keys","length","listPrinterSockets","reconnectOctoPrint","id","getPrinterSocket","close","resetSocketState","reconnectPrinterSockets","reauthRequested","socketSetupRequested","socketStates","apiStates","promisesReauth","failedSocketsReauth","OctoprintType","needsReauth","promise","reauthSession","catch","_","push","getDebugSettingsSensitive","debugSocketSetup","Promise","all","promisesOpenSocket","failedSocketReopened","needsSetup","needsReopen","setupSocketSession","then","open","keySocket","valSocket","keyApi","valApi","reauth","socketSetup","createOrUpdateSocket","enabled","foundAdapter","toString","deleteSocket","createInstance","registerCredentials","loginDto","apiKey","printerURL","protocol","handleBatchPrinterCreated","printers","p","handlePrinterUpdated","handlePrintersDeleted","printerIds","on","printerEvents","printerCreated","bind","printersDeleted","printerUpdated","batchPrinterCreated"],"mappings":"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"}
|
|
@@ -69,14 +69,16 @@ class PrinterCache extends _keydiffcache.KeyDiffCache {
|
|
|
69
69
|
const printer = await this.getCachedPrinterOrThrowAsync(id);
|
|
70
70
|
return {
|
|
71
71
|
printerURL: printer.printerURL,
|
|
72
|
-
apiKey: printer.apiKey
|
|
72
|
+
apiKey: printer.apiKey,
|
|
73
|
+
printerType: printer.printerType
|
|
73
74
|
};
|
|
74
75
|
}
|
|
75
76
|
getLoginDto(id) {
|
|
76
77
|
const printer = this.getCachedPrinterOrThrow(id);
|
|
77
78
|
return {
|
|
78
79
|
printerURL: printer.printerURL,
|
|
79
|
-
apiKey: printer.apiKey
|
|
80
|
+
apiKey: printer.apiKey,
|
|
81
|
+
printerType: printer.printerType
|
|
80
82
|
};
|
|
81
83
|
}
|
|
82
84
|
async handleBatchPrinterCreated({ printers }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/printer.cache.ts"],"names":["PrinterCache","KeyDiffCache","printerService","eventEmitter2","constructor","on","printerEvents","batchPrinterCreated","handleBatchPrinterCreated","bind","printerCreated","handlePrinterCreatedOrUpdated","printerUpdated","printersDeleted","handlePrintersDeleted","loadCache","printerDocs","list","dtos","mapArray","keyValues","map","p","key","getId","value","setKeyValuesBatch","countDisabledPrinters","getAllValues","filter","enabled","length","listCachedPrinters","includeDisabled","printers","getCachedPrinterOrThrowAsync","id","printer","getValue","NotFoundException","getCachedPrinterOrThrow","keyValueStore","getNameAsync","name","getName","getLoginDtoAsync","printerURL","apiKey","getLoginDto","mappedPrinters","printerDto","setKeyValue","printerIds","deleteKeysBatch","toString","entities","entity","toUnsafeDto"],"
|
|
1
|
+
{"version":3,"sources":["../../src/state/printer.cache.ts"],"names":["PrinterCache","KeyDiffCache","printerService","eventEmitter2","constructor","on","printerEvents","batchPrinterCreated","handleBatchPrinterCreated","bind","printerCreated","handlePrinterCreatedOrUpdated","printerUpdated","printersDeleted","handlePrintersDeleted","loadCache","printerDocs","list","dtos","mapArray","keyValues","map","p","key","getId","value","setKeyValuesBatch","countDisabledPrinters","getAllValues","filter","enabled","length","listCachedPrinters","includeDisabled","printers","getCachedPrinterOrThrowAsync","id","printer","getValue","NotFoundException","getCachedPrinterOrThrow","keyValueStore","getNameAsync","name","getName","getLoginDtoAsync","printerURL","apiKey","printerType","getLoginDto","mappedPrinters","printerDto","setKeyValue","printerIds","deleteKeysBatch","toString","entities","entity","toUnsafeDto"],"mappings":"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"}
|
|
@@ -14,12 +14,14 @@ const _node = require("@sentry/node");
|
|
|
14
14
|
const _envutils = require("../utils/env.utils");
|
|
15
15
|
const _serverconstants = require("../server.constants");
|
|
16
16
|
class SettingsStore {
|
|
17
|
+
isTypeOrmMode;
|
|
17
18
|
settingsService;
|
|
18
19
|
logger;
|
|
19
20
|
settings = null;
|
|
20
|
-
constructor({ settingsService, loggerFactory }){
|
|
21
|
+
constructor({ settingsService, loggerFactory, isTypeormMode }){
|
|
21
22
|
this.settingsService = settingsService;
|
|
22
23
|
this.logger = loggerFactory(SettingsStore.name);
|
|
24
|
+
this.isTypeOrmMode = isTypeormMode;
|
|
23
25
|
}
|
|
24
26
|
getSettings() {
|
|
25
27
|
const settings = this.settings;
|
|
@@ -28,11 +30,14 @@ class SettingsStore {
|
|
|
28
30
|
[_serversettingsconstants.serverSettingsKey]: {
|
|
29
31
|
loginRequired: settings[_serversettingsconstants.serverSettingsKey].loginRequired,
|
|
30
32
|
registration: settings[_serversettingsconstants.serverSettingsKey].registration,
|
|
31
|
-
sentryDiagnosticsEnabled: settings[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled
|
|
33
|
+
sentryDiagnosticsEnabled: settings[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled,
|
|
34
|
+
experimentalMoonrakerSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
|
|
35
|
+
experimentalTypeormSupport: this.isTypeOrmMode,
|
|
36
|
+
experimentalClientSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalClientSupport
|
|
32
37
|
},
|
|
33
38
|
[_serversettingsconstants.wizardSettingKey]: settings[_serversettingsconstants.wizardSettingKey],
|
|
34
39
|
[_serversettingsconstants.frontendSettingKey]: settings[_serversettingsconstants.frontendSettingKey],
|
|
35
|
-
[_serversettingsconstants.
|
|
40
|
+
[_serversettingsconstants.printerFileCleanSettingKey]: settings[_serversettingsconstants.printerFileCleanSettingKey],
|
|
36
41
|
[_serversettingsconstants.timeoutSettingKey]: settings[_serversettingsconstants.timeoutSettingKey]
|
|
37
42
|
});
|
|
38
43
|
}
|
|
@@ -48,7 +53,10 @@ class SettingsStore {
|
|
|
48
53
|
[_serversettingsconstants.serverSettingsKey]: {
|
|
49
54
|
debugSettings: settings[_serversettingsconstants.serverSettingsKey].debugSettings,
|
|
50
55
|
whitelistEnabled: settings[_serversettingsconstants.serverSettingsKey].whitelistEnabled,
|
|
51
|
-
whitelistedIpAddresses: settings[_serversettingsconstants.serverSettingsKey].whitelistedIpAddresses
|
|
56
|
+
whitelistedIpAddresses: settings[_serversettingsconstants.serverSettingsKey].whitelistedIpAddresses,
|
|
57
|
+
experimentalMoonrakerSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
|
|
58
|
+
experimentalTypeormSupport: this.isTypeOrmMode,
|
|
59
|
+
experimentalClientSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalClientSupport
|
|
52
60
|
}
|
|
53
61
|
});
|
|
54
62
|
}
|
|
@@ -101,10 +109,10 @@ class SettingsStore {
|
|
|
101
109
|
return this.getSettings()[_serversettingsconstants.frontendSettingKey];
|
|
102
110
|
}
|
|
103
111
|
getFileCleanSettings() {
|
|
104
|
-
return this.getSettings()[_serversettingsconstants.
|
|
112
|
+
return this.getSettings()[_serversettingsconstants.printerFileCleanSettingKey];
|
|
105
113
|
}
|
|
106
114
|
isPreUploadFileCleanEnabled() {
|
|
107
|
-
return this.getSettings()[_serversettingsconstants.
|
|
115
|
+
return this.getSettings()[_serversettingsconstants.printerFileCleanSettingKey]?.autoRemoveOldFilesBeforeUpload;
|
|
108
116
|
}
|
|
109
117
|
async setWizardCompleted(version) {
|
|
110
118
|
this.settings = await this.settingsService.patchWizardSettings({
|
|
@@ -159,6 +167,18 @@ class SettingsStore {
|
|
|
159
167
|
await this.processSentryEnabled();
|
|
160
168
|
return this.getSettings();
|
|
161
169
|
}
|
|
170
|
+
async setExperimentalMoonrakerSupport(moonrakerEnabled) {
|
|
171
|
+
this.settings = await this.settingsService.patchServerSettings({
|
|
172
|
+
experimentalMoonrakerSupport: moonrakerEnabled
|
|
173
|
+
});
|
|
174
|
+
return this.getSettings();
|
|
175
|
+
}
|
|
176
|
+
async setExperimentalClientSupport(experimentalClientEnabled) {
|
|
177
|
+
this.settings = await this.settingsService.patchServerSettings({
|
|
178
|
+
experimentalClientSupport: experimentalClientEnabled
|
|
179
|
+
});
|
|
180
|
+
return this.getSettings();
|
|
181
|
+
}
|
|
162
182
|
async updateFrontendSettings(frontendSettings) {
|
|
163
183
|
this.settings = await this.settingsService.updateFrontendSettings(frontendSettings);
|
|
164
184
|
return this.getSettings();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","settingsService","logger","settings","constructor","loggerFactory","name","getSettings","InternalServerException","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","wizardSettingKey","frontendSettingKey","
|
|
1
|
+
{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","isTypeOrmMode","settingsService","logger","settings","constructor","loggerFactory","isTypeormMode","name","getSettings","InternalServerException","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","experimentalMoonrakerSupport","experimentalTypeormSupport","experimentalClientSupport","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","debugSettings","whitelistEnabled","whitelistedIpAddresses","getDebugSettingsSensitive","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","updateCredentialSettings","jwtSecret","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","getServerSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","patchWizardSettings","wizardCompletedAt","Date","setRegistrationEnabled","patchServerSettings","getLoginRequired","setLoginRequired","setWhitelist","updateServerSettings","serverSettings","updateTimeoutSettings","timeoutSettings","patchFileCleanSettings","fileClean","credentialSettings","patchCredentialSettings","setSentryDiagnosticsEnabled","setExperimentalMoonrakerSupport","moonrakerEnabled","setExperimentalClientSupport","experimentalClientEnabled","updateFrontendSettings","frontendSettings","sentryEnabled","log","isTestEnvironment","client","getCurrentHub","getClient","warn","getOptions","enabled"],"mappings":";;;;+BAwBaA;;;eAAAA;;;mCAxB2B;yCAQjC;sBACuB;0BACI;iCACL;AAatB,MAAMA;IACHC,cAAuB;IACvBC,gBAAkC;IAClCC,OAAsB;IACtBC,WAA6B,KAAK;IAE1CC,YAAY,EACVH,eAAe,EACfI,aAAa,EACbC,aAAa,EAKd,CAAE;QACD,IAAI,CAACL,eAAe,GAAGA;QACvB,IAAI,CAACC,MAAM,GAAGG,cAAcN,cAAcQ,IAAI;QAC9C,IAAI,CAACP,aAAa,GAAGM;IACvB;IAEAE,cAAc;QACZ,MAAML,WAAW,IAAI,CAACA,QAAQ;QAC9B,IAAI,CAACA,UAAU,MAAM,IAAIM,0CAAuB,CAAC;QACjD,OAAOC,OAAOC,MAAM,CAAC;YAEnB,CAACC,0CAAiB,CAAC,EAAE;gBACnBC,eAAeV,QAAQ,CAACS,0CAAiB,CAAC,CAACC,aAAa;gBACxDC,cAAcX,QAAQ,CAACS,0CAAiB,CAAC,CAACE,YAAY;gBACtDC,0BAA0BZ,QAAQ,CAACS,0CAAiB,CAAC,CAACG,wBAAwB;gBAC9EC,8BAA8Bb,QAAQ,CAACS,0CAAiB,CAAC,CAACI,4BAA4B;gBACtFC,4BAA4B,IAAI,CAACjB,aAAa;gBAC9CkB,2BAA2Bf,QAAQ,CAACS,0CAAiB,CAAC,CAACM,yBAAyB;YAClF;YACA,CAACC,yCAAgB,CAAC,EAAEhB,QAAQ,CAACgB,yCAAgB,CAAC;YAC9C,CAACC,2CAAkB,CAAC,EAAEjB,QAAQ,CAACiB,2CAAkB,CAAC;YAClD,CAACC,mDAA0B,CAAC,EAAElB,QAAQ,CAACkB,mDAA0B,CAAC;YAClE,CAACC,0CAAiB,CAAC,EAAEnB,QAAQ,CAACmB,0CAAiB,CAAC;QAClD;IACF;IAEAC,uBAAuB;QACrB,MAAMpB,WAAW,IAAI,CAACA,QAAQ;QAC9B,IAAI,CAACA,UAAU,MAAM,IAAIM,0CAAuB,CAAC;QACjD,OAAOC,OAAOC,MAAM,CAAC;YACnB,CAACa,8CAAqB,CAAC,EAAE;gBACvBC,cAActB,QAAQ,CAACqB,8CAAqB,CAAC,CAACC,YAAY;gBAC1DC,sBAAsBvB,QAAQ,CAACqB,8CAAqB,CAAC,CAACE,oBAAoB;gBAC1EC,oBAAoBxB,QAAQ,CAACqB,8CAAqB,CAAC,CAACG,kBAAkB;YACxE;YACA,CAACf,0CAAiB,CAAC,EAAE;gBACnBgB,eAAezB,QAAQ,CAACS,0CAAiB,CAAC,CAACgB,aAAa;gBACxDC,kBAAkB1B,QAAQ,CAACS,0CAAiB,CAAC,CAACiB,gBAAgB;gBAC9DC,wBAAwB3B,QAAQ,CAACS,0CAAiB,CAAC,CAACkB,sBAAsB;gBAC1Ed,8BAA8Bb,QAAQ,CAACS,0CAAiB,CAAC,CAACI,4BAA4B;gBACtFC,4BAA4B,IAAI,CAACjB,aAAa;gBAC9CkB,2BAA2Bf,QAAQ,CAACS,0CAAiB,CAAC,CAACM,yBAAyB;YAClF;QACF;IACF;IAEAa,4BAA4B;QAC1B,OAAO,IAAI,CAACR,oBAAoB,EAAE,CAACX,0CAAiB,CAAC,CAACgB,aAAa;IACrE;IAEA,MAAMI,eAAe;QAEnB,IAAI,CAAC7B,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAACgC,WAAW;QACtD,MAAM,IAAI,CAACC,oBAAoB;IACjC;IAEA,MAAMC,wBAAwB;QAC5B,OAAO,IAAI,CAAChC,QAAQ,CAACqB,8CAAqB,CAAC;IAC7C;IAEA,MAAMY,iCAAiC;QACrC,OAAO,IAAI,CAACjC,QAAQ,CAACS,0CAAiB,CAAC,CAACG,wBAAwB;IAClE;IAEA,MAAMsB,kCAAkCC,iBAAyB,EAAEC,oBAA4B,EAAE;QAC/F,IAAID,mBAAmB;YACrB,MAAM,IAAI,CAACE,wBAAwB,CAAC;gBAClCC,WAAWH;YACb;QACF;QACA,IAAIC,sBAAsB;YACxB,MAAM,IAAI,CAACC,wBAAwB,CAAC;gBAClCf,cAAciB,SAASH;YACzB;QACF;IACF;IAEAI,iBAAiB;QACf,OAAO;YACLC,iBAAiB,IAAI,CAACzC,QAAQ,CAACgB,yCAAgB,CAAC,CAACyB,eAAe;YAChEC,eAAe,IAAI,CAAC1C,QAAQ,CAACgB,yCAAgB,CAAC,CAAC0B,aAAa;YAC5DC,qBAAqBC,6BAAY,CAACC,oBAAoB;QACxD;IACF;IAEAC,oBAAoB;QAClB,OACE,IAAI,CAAC9C,QAAQ,CAACgB,yCAAgB,CAAC,CAACyB,eAAe,IAC/C,IAAI,CAACzC,QAAQ,CAACgB,yCAAgB,CAAC,CAAC0B,aAAa,KAAKE,6BAAY,CAACC,oBAAoB;IAEvF;IAEAE,oBAAoB;QAClB,OAAO,IAAI,CAAC/C,QAAQ,CAACgB,yCAAgB,CAAC;IACxC;IAEAgC,wBAAwB;QACtB,IAAI,CAAC,IAAI,CAAChD,QAAQ,EAAE,MAAM,IAAIM,0CAAuB,CAAC;QACtD,OAAO,IAAI,CAACN,QAAQ,CAACS,0CAAiB,CAAC,CAACE,YAAY;IACtD;IAEAsC,oBAAoB;QAClB,OAAO,IAAI,CAAC5C,WAAW,EAAE,CAACI,0CAAiB,CAAC;IAC9C;IAEAyC,sBAAsB;QACpB,OAAO,IAAI,CAAC7C,WAAW,EAAE,CAACY,2CAAkB,CAAC;IAC/C;IAEAkC,uBAAuB;QACrB,OAAO,IAAI,CAAC9C,WAAW,EAAE,CAACa,mDAA0B,CAAC;IACvD;IAEAkC,8BAA8B;QAC5B,OAAO,IAAI,CAAC/C,WAAW,EAAE,CAACa,mDAA0B,CAAC,EAAEmC;IACzD;IAEA,MAAMC,mBAAmBC,OAAe,EAAE;QACxC,IAAI,CAACvD,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAAC0D,mBAAmB,CAAC;YAC7Df,iBAAiB;YACjBgB,mBAAmB,IAAIC;YACvBhB,eAAea;QACjB;QACA,OAAO,IAAI,CAAClD,WAAW;IACzB;IAEA,MAAMsD,uBAAuBhD,eAAe,IAAI,EAAE;QAChD,IAAI,CAACX,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAAC8D,mBAAmB,CAAC;YAC7DjD;QACF;QACA,OAAO,IAAI,CAACN,WAAW;IACzB;IAEA,MAAMwD,mBAAmB;QACvB,OAAO,IAAI,CAACZ,iBAAiB,GAAGvC,aAAa;IAC/C;IAEA,MAAMoD,iBAAiBpD,gBAAgB,IAAI,EAAE;QAC3C,IAAI,CAACV,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAAC8D,mBAAmB,CAAC;YAC7DlD;QACF;QACA,OAAO,IAAI,CAACL,WAAW;IACzB;IAEA,MAAM0D,aAAarC,mBAAmB,IAAI,EAAEC,sBAAgC,EAAE;QAC5E,IAAI,CAAC3B,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAAC8D,mBAAmB,CAAC;YAC7DlC;YACAC;QACF;QACA,OAAO,IAAI,CAACtB,WAAW;IACzB;IAEA,MAAM2D,qBAAqBC,cAA0C,EAAE;QACrE,IAAI,CAACjE,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAAC8D,mBAAmB,CAACK;QAC/D,OAAO,IAAI,CAAC5D,WAAW;IACzB;IAEA,MAAM6D,sBAAsBC,eAAmC,EAAE;QAC/D,IAAI,CAACnE,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAACoE,qBAAqB,CAACC;QACjE,OAAO,IAAI,CAAC9D,WAAW;IACzB;IAEA,MAAM+D,uBAAuBC,SAAwC,EAAE;QACrE,IAAI,CAACrE,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAACsE,sBAAsB,CAACC;QAClE,OAAO,IAAI,CAAChE,WAAW;IACzB;IAEA,MAAMgC,yBAAyBiC,kBAAkD,EAAE;QACjF,IAAI,CAACtE,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAACyE,uBAAuB,CAACD;QACnE,OAAO,IAAI,CAACjE,WAAW;IACzB;IAEA,MAAMmE,4BAA4B5D,wBAAiC,EAAE;QACnE,IAAI,CAACZ,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAAC8D,mBAAmB,CAAC;YAC7DhD;QACF;QACA,MAAM,IAAI,CAACmB,oBAAoB;QAC/B,OAAO,IAAI,CAAC1B,WAAW;IACzB;IAEA,MAAMoE,gCAAgCC,gBAAyB,EAAE;QAC/D,IAAI,CAAC1E,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAAC8D,mBAAmB,CAAC;YAC7D/C,8BAA8B6D;QAChC;QACA,OAAO,IAAI,CAACrE,WAAW;IACzB;IAEA,MAAMsE,6BAA6BC,yBAAkC,EAAE;QACrE,IAAI,CAAC5E,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAAC8D,mBAAmB,CAAC;YAC7D7C,2BAA2B6D;QAC7B;QACA,OAAO,IAAI,CAACvE,WAAW;IACzB;IAEA,MAAMwE,uBAAuBC,gBAAqC,EAAE;QAClE,IAAI,CAAC9E,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAAC+E,sBAAsB,CAACC;QAClE,OAAO,IAAI,CAACzE,WAAW;IACzB;IAEA,MAAc0B,uBAAuB;QACnC,MAAMgD,gBAAgB,MAAM,IAAI,CAAC9C,8BAA8B;QAC/D,IAAI8C,eAAe;YACjB,IAAI,CAAChF,MAAM,CAACiF,GAAG,CAAC;QAClB,OAAO;YACL,IAAI,CAACjF,MAAM,CAACiF,GAAG,CAAC;QAClB;QAEA,IAAIC,IAAAA,2BAAiB,KAAI;QACzB,MAAMC,SAASC,IAAAA,mBAAa,IAAGC,SAAS;QACxC,IAAI,CAACF,QAAQ;YACX,IAAI,CAACnF,MAAM,CAACsF,IAAI,CAAC;YACjB;QACF;QACAH,OAAOI,UAAU,GAAGC,OAAO,GAAGR;IAChC;AACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/socket-io.gateway.ts"],"names":["IO_MESSAGES","SocketIoGateway","authorize","settingsStore","options","verify","strategy","JwtStrategy","authorizeCallback","socket","next","getLoginRequired","success","user","handshake","fail","info","Error","error","authenticate","logger","eventEmitter2","io","authService","configService","userService","constructor","loggerFactory","name","attachServer","httpServer","Server","cors","origin","opts","getPassportJwtOptions","value","auth","token","verifyUserCallback","use","on","onConnect","bind","debug","id","emit","socketIoConnectedEvent","send","event","data","getServerSettings","debugSettings","debugSocketIoEvents","log","LegacyUpdate","LegacyPrinterTest","CompletionEvent","HostState","ApiAccessibility"],"
|
|
1
|
+
{"version":3,"sources":["../../src/state/socket-io.gateway.ts"],"names":["IO_MESSAGES","SocketIoGateway","authorize","settingsStore","options","verify","strategy","JwtStrategy","authorizeCallback","socket","next","getLoginRequired","success","user","handshake","fail","info","Error","error","authenticate","logger","eventEmitter2","io","authService","configService","userService","constructor","loggerFactory","name","attachServer","httpServer","Server","cors","origin","opts","getPassportJwtOptions","value","auth","token","verifyUserCallback","use","on","onConnect","bind","debug","id","emit","socketIoConnectedEvent","send","event","data","getServerSettings","debugSettings","debugSocketIoEvents","log","LegacyUpdate","LegacyPrinterTest","CompletionEvent","HostState","ApiAccessibility"],"mappings":";;;;;;;;;;;IA0GaA,WAAW;eAAXA;;IAhEAC,eAAe;eAAfA;;;0BA1CkB;gCACQ;0BAOmB;6BAEiB;AAK3E,MAAMC,YAAY,CAChBC,eACAC,SACAC;IAEA,MAAMC,WAAW,IAAIC,qBAAW,CAACH,SAASC;IAE1C,OAAO,eAAeG,kBACpBC,MAAyE,EACzEC,IAAmC;QAEnC,IAAI,CAAE,MAAMP,cAAcQ,gBAAgB,IAAK;YAE7C,OAAOD;QACT;QAEAJ,SAASM,OAAO,GAAG,SAASA,QAAQC,IAAI;YACtCJ,OAAOK,SAAS,CAACD,IAAI,GAAGA;YACxBH;QACF;QACAJ,SAASS,IAAI,GAAG,CAACC,OAASN,KAAK,IAAIO,MAAMD;QACzCV,SAASY,KAAK,GAAG,CAACA,QAAUR,KAAKQ;QAEjCZ,SAASa,YAAY,CAACV,QAAQ,CAAC;IACjC;AACF;AAEO,MAAMR;IACXmB,OAAsB;IACtBC,cAA6B;IAC7BC,GAAW;IAEXC,YAAyB;IACzBpB,cAA6B;IAC7BqB,cAA8B;IAC9BC,YAA0B;IAE1BC,YAAY,EACVC,aAAa,EACbN,aAAa,EACblB,aAAa,EACboB,WAAW,EACXC,aAAa,EACbC,WAAW,EAQZ,CAAE;QACD,IAAI,CAACL,MAAM,GAAGO,cAAc1B,gBAAgB2B,IAAI;QAChD,IAAI,CAACP,aAAa,GAAGA;QACrB,IAAI,CAAClB,aAAa,GAAGA;QACrB,IAAI,CAACoB,WAAW,GAAGA;QACnB,IAAI,CAACE,WAAW,GAAGA;QACnB,IAAI,CAACD,aAAa,GAAGA;IACvB;IAEAK,aAAaC,UAAuB,EAAE;QACpC,IAAI,CAACR,EAAE,GAAG,IAAIS,gBAAM,CAACD,YAAY;YAAEE,MAAM;gBAAEC,QAAQ;YAAI;QAAE;QACzD,MAAMC,OAAOC,IAAAA,+BAAqB,EAAC,IAAI,CAAChC,aAAa,EAAE,IAAI,CAACqB,aAAa,EAAE,CAACY,QAAkBA,MAAMtB,SAAS,CAACuB,IAAI,CAACC,KAAK;QACxH,MAAMjC,SAASkC,IAAAA,4BAAkB,EAAC,IAAI,CAACd,WAAW;QAClD,IAAI,CAACH,EAAE,CAACkB,GAAG,CAACtC,UAAU,IAAI,CAACC,aAAa,EAAE+B,MAAM7B;QAChD,IAAI,CAACiB,EAAE,CAACmB,EAAE,CAAC,cAAc,CAAChC,SAAW,IAAI,CAACiC,SAAS,CAACC,IAAI,CAAC,IAAI,EAAElC;IACjE;IAEAiC,UAAUjC,MAAc,EAAE;QACxB,IAAI,CAACW,MAAM,CAACwB,KAAK,CAAC,6BAA6BnC,OAAOoC,EAAE;QAExD,IAAI,CAACxB,aAAa,CAACyB,IAAI,CAACC,sCAAsB,EAAEtC,OAAOoC,EAAE;QAEzDpC,OAAOgC,EAAE,CAAC,cAAc;YACtB,IAAI,CAACrB,MAAM,CAACwB,KAAK,CAAC,gCAAgCnC,OAAOoC,EAAE;QAC7D;IACF;IAEAG,KAAQC,KAAa,EAAEC,IAAO,EAAE;QAC9B,IAAI,CAAC,IAAI,CAAC5B,EAAE,EAAE;YACZ,IAAI,CAACF,MAAM,CAACwB,KAAK,CAAC;YAClB;QACF;QAEA,IAAI,IAAI,CAACzC,aAAa,CAACgD,iBAAiB,GAAGC,aAAa,EAAEC,qBAAqB;YAC7E,IAAI,CAACjC,MAAM,CAACkC,GAAG,CAAC,CAAC,cAAc,EAAEL,OAAO;QAC1C;QACA,IAAI,CAAC3B,EAAE,CAACwB,IAAI,CAACG,OAAOC;IACtB;AACF;AAEO,MAAMlD,cAAc;IACzBuD,cAAc;IACdC,mBAAmB;IACnBC,iBAAiB;IACjBC,WAAW;IACXC,kBAAkB;AACpB"}
|
|
@@ -11,10 +11,11 @@ Object.defineProperty(exports, "TestPrinterSocketStore", {
|
|
|
11
11
|
const _promises = require("node:timers/promises");
|
|
12
12
|
const _validators = require("../handlers/validators");
|
|
13
13
|
const _createtestprintervalidation = require("./validation/create-test-printer.validation");
|
|
14
|
-
const
|
|
14
|
+
const _octoprintwebsocketadapter = require("../services/octoprint/octoprint-websocket.adapter");
|
|
15
15
|
const _serverconstants = require("../server.constants");
|
|
16
16
|
const _errorutils = require("../utils/error.utils");
|
|
17
17
|
const _node = require("@sentry/node");
|
|
18
|
+
const _socketstatetype = require("../shared/dtos/socket-state.type");
|
|
18
19
|
class TestPrinterSocketStore {
|
|
19
20
|
testSocket;
|
|
20
21
|
socketIoGateway;
|
|
@@ -35,7 +36,7 @@ class TestPrinterSocketStore {
|
|
|
35
36
|
const validatedData = await (0, _validators.validateInput)(printer, _createtestprintervalidation.createTestPrinterRules);
|
|
36
37
|
validatedData.enabled = true;
|
|
37
38
|
const { correlationToken } = printer;
|
|
38
|
-
this.testSocket = this.socketFactory.createInstance();
|
|
39
|
+
this.testSocket = this.socketFactory.createInstance(printer.printerType);
|
|
39
40
|
this.testSocket.registerCredentials({
|
|
40
41
|
printerId: correlationToken,
|
|
41
42
|
loginDto: {
|
|
@@ -45,11 +46,11 @@ class TestPrinterSocketStore {
|
|
|
45
46
|
protocol: "ws"
|
|
46
47
|
});
|
|
47
48
|
const testEvents = [
|
|
48
|
-
(0,
|
|
49
|
-
(0,
|
|
50
|
-
(0,
|
|
51
|
-
(0,
|
|
52
|
-
(0,
|
|
49
|
+
(0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.WS_STATE_UPDATED),
|
|
50
|
+
(0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.API_STATE_UPDATED),
|
|
51
|
+
(0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.WS_CLOSED),
|
|
52
|
+
(0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.WS_OPENED),
|
|
53
|
+
(0, _octoprintwebsocketadapter.octoPrintEvent)(_octoprintwebsocketadapter.WsMessage.WS_ERROR)
|
|
53
54
|
];
|
|
54
55
|
const listener = ({ event, payload, printerId })=>{
|
|
55
56
|
if (printerId !== correlationToken) {
|
|
@@ -76,7 +77,7 @@ class TestPrinterSocketStore {
|
|
|
76
77
|
reject();
|
|
77
78
|
return;
|
|
78
79
|
}
|
|
79
|
-
if (this.testSocket.socketState ===
|
|
80
|
+
if (this.testSocket.socketState === _socketstatetype.SOCKET_STATE.authenticated) {
|
|
80
81
|
this.logger.log("Test completed successfully, resolving");
|
|
81
82
|
resolve(true);
|
|
82
83
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","socketIoGateway","socketFactory","eventEmitter2","logger","constructor","loggerFactory","name","setupTestPrinter","printer","close","validatedData","validateInput","createTestPrinterRules","enabled","correlationToken","createInstance","registerCredentials","printerId","loginDto","apiKey","printerURL","protocol","testEvents","octoPrintEvent","WsMessage","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","listener","event","payload","send","forEach","te","on","log","setupSocketSession","promise","Promise","resolve","reject","open","startTime","setInterval","warn","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","e","error","errorSummary","captureException","off"],"
|
|
1
|
+
{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","socketIoGateway","socketFactory","eventEmitter2","logger","constructor","loggerFactory","name","setupTestPrinter","printer","close","validatedData","validateInput","createTestPrinterRules","enabled","correlationToken","createInstance","printerType","registerCredentials","printerId","loginDto","apiKey","printerURL","protocol","testEvents","octoPrintEvent","WsMessage","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","listener","event","payload","send","forEach","te","on","log","setupSocketSession","promise","Promise","resolve","reject","open","startTime","setInterval","warn","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","e","error","errorSummary","captureException","off"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/state/validation/create-test-printer.validation.ts"],"names":["createTestPrinterRules","correlationToken","apiKey","UUID_LENGTH","printerURL"],"
|
|
1
|
+
{"version":3,"sources":["../../../src/state/validation/create-test-printer.validation.ts"],"names":["createTestPrinterRules","correlationToken","apiKey","UUID_LENGTH","printerURL"],"mappings":";;;;+BAEaA;;;eAAAA;;;kCAFe;AAErB,MAAMA,yBAAyB;IACpCC,kBAAkB;IAClBC,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;AACd"}
|
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"],"
|
|
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":";;;;+BAWaA;;;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
|
@@ -8,7 +8,7 @@ Object.defineProperty(exports, "BootTask", {
|
|
|
8
8
|
return BootTask;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
const _mongoose = _interop_require_wildcard(require("mongoose"));
|
|
11
|
+
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");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","taskManagerService","serverTasks","settingsStore","settingsService","multerService","printerSocketStore","printerFilesStore","permissionService","roleService","userService","pluginRepositoryCache","floorStore","pluginFirmwareUpdateService","clientBundleService","configService","isTypeormMode","typeormService","constructor","loggerFactory","name","runOnce","registerJobOrTask","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","undefined","overrideJwtExpiresIn","OVERRIDE_JWT_EXPIRES_IN","persistOptionalCredentialSettings","clearUploadsFolder","loadPrinterSockets","loadFilesStore","loadStore","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"],"
|
|
1
|
+
{"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","taskManagerService","serverTasks","settingsStore","settingsService","multerService","printerSocketStore","printerFilesStore","permissionService","roleService","userService","pluginRepositoryCache","floorStore","pluginFirmwareUpdateService","clientBundleService","configService","isTypeormMode","typeormService","constructor","loggerFactory","name","runOnce","registerJobOrTask","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","undefined","overrideJwtExpiresIn","OVERRIDE_JWT_EXPIRES_IN","persistOptionalCredentialSettings","clearUploadsFolder","loadPrinterSockets","loadFilesStore","loadStore","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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/tasks/client-bundle.task.ts"],"names":["ClientDistDownloadTask","clientBundleService","githubService","logger","constructor","loggerFactory","name","run","result","shouldUpdateWithReason","AppConstants","defaultClientMinimum","shouldUpdate","log","reason","downloadClientUpdate"],"
|
|
1
|
+
{"version":3,"sources":["../../src/tasks/client-bundle.task.ts"],"names":["ClientDistDownloadTask","clientBundleService","githubService","logger","constructor","loggerFactory","name","run","result","shouldUpdateWithReason","AppConstants","defaultClientMinimum","shouldUpdate","log","reason","downloadClientUpdate"],"mappings":";;;;+BAMaA;;;eAAAA;;;iCANgB;AAMtB,MAAMA;IACXC,oBAAyC;IACzCC,cAA6B;IAC7BC,OAAsB;IAEtBC,YAAY,EACVH,mBAAmB,EACnBI,aAAa,EACbH,aAAa,EAKd,CAAE;QACD,IAAI,CAACA,aAAa,GAAGA;QACrB,IAAI,CAACD,mBAAmB,GAAGA;QAC3B,IAAI,CAACE,MAAM,GAAGE,cAAcL,uBAAuBM,IAAI;IACzD;IAEA,MAAMC,MAAM;QACV,MAAMC,SAAS,MAAM,IAAI,CAACP,mBAAmB,CAACQ,sBAAsB,CAAC,OAAOC,6BAAY,CAACC,oBAAoB;QAC7G,IAAI,CAACH,OAAOI,YAAY,EAAE;YACxB,IAAI,CAACT,MAAM,CAACU,GAAG,CAAC,CAAC,sCAAsC,EAAEL,OAAOM,MAAM,EAAE;YACxE;QACF;QAEA,IAAI,CAACX,MAAM,CAACU,GAAG,CAAC,CAAC,oDAAoD,EAAEL,OAAOM,MAAM,EAAE;QAEtF,MAAM,IAAI,CAACb,mBAAmB,CAACc,oBAAoB,CAACL,6BAAY,CAACC,oBAAoB;IACvF;AACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/tasks/print-completion.socketio.task.ts"],"names":["PrintCompletionSocketIoTask","eventEmitter2","socketIoGateway","logger","printerEventsCache","printCompletionService","contextCache","constructor","loggerFactory","name","that","on","octoPrintWebsocketEvent","octoPrintEvent","data","handleMessage","event","contexts","fdmEvent","printerId","log","completion","status","payload","type","fileName","createdAt","Date","now","completionLog","error","context","correlationId","EVENT_TYPES","EStop","PrintCancelling","PrintCancelled","Home","TransferStarted","TransferDone","Disconnecting","Disconnected","MetadataAnalysisStarted","MetadataAnalysisFinished","Error","setSubstate","text","flags","operational","printing","ready","closedOrError","corrId","updateContext","PrintStarted","token","generateCorrelationToken","create","PrintFailed","PrintDone","emit","fdmMonsterPrinterStoppedEvent","run","loadPrintContexts"],"
|
|
1
|
+
{"version":3,"sources":["../../src/tasks/print-completion.socketio.task.ts"],"names":["PrintCompletionSocketIoTask","eventEmitter2","socketIoGateway","logger","printerEventsCache","printCompletionService","contextCache","constructor","loggerFactory","name","that","on","octoPrintWebsocketEvent","octoPrintEvent","data","handleMessage","event","contexts","fdmEvent","printerId","log","completion","status","payload","type","fileName","createdAt","Date","now","completionLog","error","context","correlationId","EVENT_TYPES","EStop","PrintCancelling","PrintCancelled","Home","TransferStarted","TransferDone","Disconnecting","Disconnected","MetadataAnalysisStarted","MetadataAnalysisFinished","Error","setSubstate","text","flags","operational","printing","ready","closedOrError","corrId","updateContext","PrintStarted","token","generateCorrelationToken","create","PrintFailed","PrintDone","emit","fdmMonsterPrinterStoppedEvent","run","loadPrintContexts"],"mappings":"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"}
|