@fdm-monster/server 1.6.3 → 1.6.4
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 +3 -2
- package/RELEASE_NOTES.MD +28 -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.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.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 +468 -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 +9 -0
- package/dist/controllers/server-public.controller.js.map +1 -1
- 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.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 +1 -1
- 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 +30 -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.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 +2 -1
- 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 +3 -3
- 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 +8 -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.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} +6 -6
- 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 -35
- package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
- package/dist/services/moonraker/moonraker.client.js +16 -12
- 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.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 +21 -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 +13 -13
- package/dist/services/octoprint/plugin-base.service.js.map +1 -1
- package/dist/services/octoprint/plugin-firmware-update.service.js +8 -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 +3 -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.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 +34 -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 +27 -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.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 +11 -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.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 +44 -44
- 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.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-state.dto.js → connection/connection-state.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
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/octoprint.client.ts"],"names":["OctoprintClient","OctoprintRoutes","eventEmitter2","httpClient","logger","constructor","settingsStore","loggerFactory","name","getApiVersion","login","timeout","url","options","prepareRequest","apiVersion","get","getServer","apiServer","apiLogin","post","sendConnectionCommand","commandData","data","prepareJsonRequest","apiConnection","sendPrintHeadJogCommand","amounts","axesToHome","x","y","z","command","sendPrintHeadCommand","sendPrintHeadHomeCommand","axes","apiPrinterHead","response","sendCustomGCodeCommand","commandString","apiPrinterCustomCommand","getJob","apiJob","sendJobCommand","sendBedTempCommand","targetTemp","apiPrinterBed","getBedTargetCommand","getSettings","apiSettingsPart","updatePrinterNameSetting","printerName","settingPatch","printerNameSetting","updateFirmwareUpdaterSettings","firmwareUpdateConfig","pluginFirmwareUpdaterSettings","setGCodeAnalysis","enabled","gcodeAnalysisSetting","getCurrentUser","apiCurrentUser","getAdminUserOrDefault","currentUser","getUsers","apiUsers","getLocalFiles","recursive","apiGetFiles","files","filter","f","date","map","normalizePrinterFile","getFile","path","pathUrl","apiFile","e","captureException","error","downloadFile","downloadFileLocal","responseType","createFolder","foldername","apiFilesLocal","formData","FormData","append","headers","getHeaders","getLengthSync","moveFileOrFolder","destination","moveFileCommand","postSelectPrintFile","print","selectCommand","uploadFileAsMultiPart","multerFileOrBuffer","commands","token","multiPartContentType","select","source","buffer","isPhysicalFile","createReadStream","filename","originalname","result","Promise","resolve","reject","getLength","err","length","axios","method","onUploadProgress","p","emit","uploadProgressEvent","failed","JSON","parse","body","ExternalServiceError","message","statusCode","success","stack","deleteFileOrFolder","delete","getPrinterCurrent","history","limit","exclude","apiPrinterCurrent","getConnection","getPrinterProfiles","apiPrinterProfiles","postSoftwareUpdate","targets","pluginSoftwareUpdateUpdate","getPluginManagerPlugins","pluginManagerPlugins","getPluginManagerPlugin","pluginName","pluginManagerPlugin","postApiPluginManagerCommand","pluginCommand","pluginUrl","apiPluginManager","pluginManagerCommand","postPluginFirmwareUpdateFlash","currentPrinterId","firmwarePath","pluginFirmwareUpdaterFlash","basename","fileReadStream","fs","uploadProgress","firmwareFlashUploadEvent","getPluginFirmwareUpdateStatus","pluginFirmwareUpdaterStatus","fetchOctoPrintPlugins","prepareAnonymousRequest","pluginRepositoryUrl","getSystemInfo","apiSystemInfo","getSystemCommands","apiSystemCommands","postServerRestartCommand","apiServerRestartCommand","getSoftwareUpdateCheck","force","apiSoftwareUpdateCheck","getPluginPiSupport","apiPluginPiSupport","deleteTimeLapse","fileName","apiTimelapse","listUnrenderedTimeLapses","listProfiles","apiProfiles","getBackupOverview","pluginBackupIndex","getBackups","pluginBackupEndpoint","createBackup","excludeArray","getDownloadBackupStream","pluginBackupFileDownload","catch","forwardRestoreBackupFileStream","pluginBackupFileRestore","deleteBackup","pluginBackupFile"],"mappings":"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"}
|
|
@@ -11,13 +11,13 @@ Object.defineProperty(exports, "PluginBaseService", {
|
|
|
11
11
|
const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
|
|
12
12
|
const _octoprintserviceconstants = require("./constants/octoprint-service.constants");
|
|
13
13
|
class PluginBaseService {
|
|
14
|
-
|
|
14
|
+
octoprintClient;
|
|
15
15
|
pluginRepositoryCache;
|
|
16
16
|
_pluginName;
|
|
17
17
|
_pluginUrl;
|
|
18
18
|
logger;
|
|
19
|
-
constructor({
|
|
20
|
-
this.
|
|
19
|
+
constructor({ octoprintClient, pluginRepositoryCache, loggerFactory }, { pluginName, pluginUrl }){
|
|
20
|
+
this.octoprintClient = octoprintClient;
|
|
21
21
|
this.pluginRepositoryCache = pluginRepositoryCache;
|
|
22
22
|
this._pluginName = pluginName;
|
|
23
23
|
this.logger = loggerFactory(`Plugin-${pluginName}`);
|
|
@@ -36,7 +36,7 @@ class PluginBaseService {
|
|
|
36
36
|
return result?.github?.latest_release.name === response.version;
|
|
37
37
|
}
|
|
38
38
|
async #queryInstalledPlugin(printerLogin) {
|
|
39
|
-
const response = await this.
|
|
39
|
+
const response = await this.octoprintClient.getPluginManagerPlugin(printerLogin, this.pluginName);
|
|
40
40
|
if (!response) {
|
|
41
41
|
throw new _runtimeexceptions.InternalServerException("Plugin query response was empty");
|
|
42
42
|
}
|
|
@@ -47,7 +47,7 @@ class PluginBaseService {
|
|
|
47
47
|
return !!foundPlugin;
|
|
48
48
|
}
|
|
49
49
|
async #findPluginFromListQuery(printerLogin) {
|
|
50
|
-
const response = await this.
|
|
50
|
+
const response = await this.octoprintClient.getPluginManagerPlugins(printerLogin);
|
|
51
51
|
if (!response?.plugins?.length) {
|
|
52
52
|
throw new _runtimeexceptions.InternalServerException("Plugin query response was empty");
|
|
53
53
|
}
|
|
@@ -57,44 +57,44 @@ class PluginBaseService {
|
|
|
57
57
|
return pluginList.find((p)=>p.key.toLowerCase() === this.pluginName.toLowerCase());
|
|
58
58
|
}
|
|
59
59
|
async updatePlugin(login) {
|
|
60
|
-
return await this.
|
|
60
|
+
return await this.octoprintClient.postSoftwareUpdate(login, [
|
|
61
61
|
this.pluginName
|
|
62
62
|
], this._pluginUrl);
|
|
63
63
|
}
|
|
64
64
|
async installPlugin(login, restartAfter = false) {
|
|
65
65
|
const command = _octoprintserviceconstants.pluginManagerCommands.install.name;
|
|
66
66
|
const plugin = this.pluginRepositoryCache.getPlugin(this.pluginName);
|
|
67
|
-
await this.
|
|
67
|
+
await this.octoprintClient.postApiPluginManagerCommand(login, command, plugin.archive);
|
|
68
68
|
await this.#conditionalRestartCommand(login, restartAfter);
|
|
69
69
|
}
|
|
70
70
|
async uninstallPlugin(login, restartAfter = false) {
|
|
71
71
|
const command = _octoprintserviceconstants.pluginManagerCommands.uninstall.name;
|
|
72
|
-
await this.
|
|
72
|
+
await this.octoprintClient.postApiPluginManagerCommand(login, command, this.pluginName);
|
|
73
73
|
await this.#conditionalRestartCommand(login, restartAfter);
|
|
74
74
|
}
|
|
75
75
|
async enablePlugin(login, restartAfter = false) {
|
|
76
76
|
const command = _octoprintserviceconstants.pluginManagerCommands.enable.name;
|
|
77
|
-
await this.
|
|
77
|
+
await this.octoprintClient.postApiPluginManagerCommand(login, command, this.pluginName);
|
|
78
78
|
await this.#conditionalRestartCommand(login, restartAfter);
|
|
79
79
|
}
|
|
80
80
|
async disablePlugin(login, restartAfter = false) {
|
|
81
81
|
const command = _octoprintserviceconstants.pluginManagerCommands.disable.name;
|
|
82
|
-
await this.
|
|
82
|
+
await this.octoprintClient.postApiPluginManagerCommand(login, command, this.pluginName);
|
|
83
83
|
await this.#conditionalRestartCommand(login, restartAfter);
|
|
84
84
|
}
|
|
85
85
|
async cleanupPlugin(login, restartAfter = false) {
|
|
86
86
|
const command = _octoprintserviceconstants.pluginManagerCommands.cleanup.name;
|
|
87
|
-
await this.
|
|
87
|
+
await this.octoprintClient.postApiPluginManagerCommand(login, command, this.pluginName);
|
|
88
88
|
await this.#conditionalRestartCommand(login, restartAfter);
|
|
89
89
|
}
|
|
90
90
|
async cleanupAllPlugins(login, restartAfter = false) {
|
|
91
91
|
const command = _octoprintserviceconstants.pluginManagerCommands.cleanup_all.name;
|
|
92
|
-
await this.
|
|
92
|
+
await this.octoprintClient.postApiPluginManagerCommand(login, command);
|
|
93
93
|
await this.#conditionalRestartCommand(login, restartAfter);
|
|
94
94
|
}
|
|
95
95
|
async #conditionalRestartCommand(printerLogin, restartAfter = false) {
|
|
96
96
|
if (!restartAfter) return;
|
|
97
|
-
await this.
|
|
97
|
+
await this.octoprintClient.postServerRestartCommand(printerLogin);
|
|
98
98
|
}
|
|
99
99
|
}
|
|
100
100
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/octoprint/plugin-base.service.ts"],"names":["PluginBaseService","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/plugin-base.service.ts"],"names":["PluginBaseService","octoprintClient","pluginRepositoryCache","_pluginName","_pluginUrl","logger","constructor","loggerFactory","pluginName","pluginUrl","pluginReference","getPlugin","archive","ValidationException","isPluginUpToDate","printerLogin","response","result","github","latest_release","name","version","getPluginManagerPlugin","InternalServerException","plugin","isPluginInstalled","foundPlugin","getPluginManagerPlugins","plugins","length","findPluginInList","pluginList","find","p","key","toLowerCase","updatePlugin","login","postSoftwareUpdate","installPlugin","restartAfter","command","pluginManagerCommands","install","postApiPluginManagerCommand","uninstallPlugin","uninstall","enablePlugin","enable","disablePlugin","disable","cleanupPlugin","cleanup","cleanupAllPlugins","cleanup_all","postServerRestartCommand"],"mappings":"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"}
|
|
@@ -23,18 +23,18 @@ const connectivityProp = "connectivity.connection_ok";
|
|
|
23
23
|
const firmwareProp = "printer.firmware";
|
|
24
24
|
const firmwareDownloadPath = "firmware-downloads";
|
|
25
25
|
class PluginFirmwareUpdateService extends _pluginbaseservice.PluginBaseService {
|
|
26
|
-
|
|
26
|
+
octoprintClient;
|
|
27
27
|
githubService;
|
|
28
28
|
multerService;
|
|
29
29
|
prusaFirmwareReleases;
|
|
30
30
|
latestFirmware;
|
|
31
|
-
constructor({
|
|
31
|
+
constructor({ octoprintClient, pluginRepositoryCache, githubService, multerService, loggerFactory }){
|
|
32
32
|
super({
|
|
33
|
-
|
|
33
|
+
octoprintClient,
|
|
34
34
|
pluginRepositoryCache,
|
|
35
35
|
loggerFactory
|
|
36
36
|
}, config);
|
|
37
|
-
this.
|
|
37
|
+
this.octoprintClient = octoprintClient;
|
|
38
38
|
this.githubService = githubService;
|
|
39
39
|
this.multerService = multerService;
|
|
40
40
|
}
|
|
@@ -71,7 +71,7 @@ class PluginFirmwareUpdateService extends _pluginbaseservice.PluginBaseService {
|
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
async getPrinterFirmwareVersion(printerLogin) {
|
|
74
|
-
const response = await this.
|
|
74
|
+
const response = await this.octoprintClient.getSystemInfo(printerLogin);
|
|
75
75
|
const systemInfo = response.systeminfo;
|
|
76
76
|
if (!Object.keys(systemInfo).includes(connectivityProp) || !Object.keys(systemInfo).includes(firmwareProp)) {
|
|
77
77
|
throw new _runtimeexceptions.ValidationException("Could not retrieve printer firmware version as the OctoPrint response was not recognized. Is it connected?");
|
|
@@ -87,14 +87,14 @@ class PluginFirmwareUpdateService extends _pluginbaseservice.PluginBaseService {
|
|
|
87
87
|
return firmware;
|
|
88
88
|
}
|
|
89
89
|
async getPluginFirmwareStatus(printerLogin) {
|
|
90
|
-
return await this.
|
|
90
|
+
return await this.octoprintClient.getPluginFirmwareUpdateStatus(printerLogin);
|
|
91
91
|
}
|
|
92
92
|
async configureFirmwareUpdaterSettings(printerLogin) {
|
|
93
|
-
return await this.
|
|
93
|
+
return await this.octoprintClient.updateFirmwareUpdaterSettings(printerLogin, _firmwareupdatesettingsconstants.defaultFirmwareUpdaterSettings);
|
|
94
94
|
}
|
|
95
95
|
async flashPrusaFirmware(currentPrinterId, printerLogin) {
|
|
96
96
|
const latestHexFilePath = this.multerService.getNewestFile(firmwareDownloadPath);
|
|
97
|
-
return await this.
|
|
97
|
+
return await this.octoprintClient.postPluginFirmwareUpdateFlash(currentPrinterId, printerLogin, latestHexFilePath);
|
|
98
98
|
}
|
|
99
99
|
}
|
|
100
100
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/octoprint/plugin-firmware-update.service.ts"],"names":["PluginFirmwareUpdateService","config","pluginName","pluginUrl","defaultRepos","prusaFirmwareOwner","prusaFirmwareRepo","connectivityProp","firmwareProp","firmwareDownloadPath","PluginBaseService","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/plugin-firmware-update.service.ts"],"names":["PluginFirmwareUpdateService","config","pluginName","pluginUrl","defaultRepos","prusaFirmwareOwner","prusaFirmwareRepo","connectivityProp","firmwareProp","firmwareDownloadPath","PluginBaseService","octoprintClient","githubService","multerService","prusaFirmwareReleases","latestFirmware","constructor","pluginRepositoryCache","loggerFactory","queryGithubPrusaFirmwareReleasesCache","response","getReleases","data","e","logger","error","length","log","url","tag_name","downloadFirmware","ValidationException","firmwareAsset","assets","find","asset","name","includes","downloadUrl","browser_download_url","downloadName","fileExists","downloadFile","getPrinterFirmwareVersion","printerLogin","getSystemInfo","systemInfo","systeminfo","Object","keys","connected","firmware","getPluginFirmwareStatus","getPluginFirmwareUpdateStatus","configureFirmwareUpdaterSettings","updateFirmwareUpdaterSettings","defaultFirmwareUpdaterSettings","flashPrusaFirmware","currentPrinterId","latestHexFilePath","getNewestFile","postPluginFirmwareUpdateFlash"],"mappings":";;;;+BAyBaA;;;eAAAA;;;mCAzBqB;mCACE;iDACW;AAS/C,MAAMC,SAAS;IACbC,YAAY;IACZC,WAAW;AACb;AAEA,MAAMC,eAAe;IACnBC,oBAAoB;IACpBC,mBAAmB;AACrB;AAEA,MAAMC,mBAAmB;AACzB,MAAMC,eAAe;AACrB,MAAMC,uBAAuB;AAEtB,MAAMT,oCAAoCU,oCAAiB;IAChEC,gBAAiC;IACjCC,cAA6B;IACrBC,cAA6B;IAE7BC,sBAAsB;IACtBC,eAAe;IAEvBC,YAAY,EACVL,eAAe,EACfM,qBAAqB,EACrBL,aAAa,EACbC,aAAa,EACbK,aAAa,EAOd,CAAE;QACD,KAAK,CAAC;YAAEP;YAAiBM;YAAuBC;QAAc,GAAGjB;QACjE,IAAI,CAACU,eAAe,GAAGA;QACvB,IAAI,CAACC,aAAa,GAAGA;QACrB,IAAI,CAACC,aAAa,GAAGA;IACvB;IAEA,MAAMM,wCAAwC;QAC5C,IAAI;YACF,MAAMC,WAAW,MAAM,IAAI,CAACR,aAAa,CAACS,WAAW,CAACjB,aAAaC,kBAAkB,EAAED,aAAaE,iBAAiB;YACrH,IAAI,CAACQ,qBAAqB,GAAGM,SAASE,IAAI;QAC5C,EAAE,OAAOC,GAAG;YACV,OAAO,IAAI,CAACC,MAAM,CAACC,KAAK,CAAC;QAC3B;QAEA,IAAI,CAAC,IAAI,CAACX,qBAAqB,EAAEY,QAAQ,OAAO,EAAE;QAElD,IAAI,CAACX,cAAc,GAAG,IAAI,CAACD,qBAAqB,CAAC,EAAE;QACnD,IAAI,CAACU,MAAM,CAACG,GAAG,CAAC,CAAC,yBAAyB,EAAE,IAAI,CAACb,qBAAqB,EAAEY,UAAU,IAAI,kBAAkB,CAAC,EAAE;YACzGE,KAAK,IAAI,CAACb,cAAc,CAACa,GAAG;YAC5BC,UAAU,IAAI,CAACd,cAAc,CAACc,QAAQ;QACxC;QAEA,OAAO,IAAI,CAACf,qBAAqB;IACnC;IAEA,MAAMgB,mBAAmB;QACvB,IAAI,CAAC,IAAI,CAAChB,qBAAqB,EAAEY,UAAU,CAAC,IAAI,CAACX,cAAc,EAAE;YAC/D,MAAM,IAAIgB,sCAAmB,CAAC;QAChC;QAEA,MAAMhB,iBAAiB,IAAI,CAACD,qBAAqB,CAAC,EAAE;QAGpD,MAAMkB,gBAAgBjB,eAAekB,MAAM,CAACC,IAAI,CAAC,CAACC,QAAUA,MAAMC,IAAI,CAACC,QAAQ,CAAC;QAChF,MAAMC,cAAcN,cAAcO,oBAAoB;QACtD,MAAMC,eAAeR,cAAcI,IAAI;QACvC,IAAI,CAACZ,MAAM,CAACG,GAAG,CAAC,CAAC,kBAAkB,EAAEa,cAAc;QACnD,IAAI,CAAC,IAAI,CAAC3B,aAAa,CAAC4B,UAAU,CAACD,cAAc/B,uBAAuB;YACtE,IAAI,CAACe,MAAM,CAACG,GAAG,CAAC,CAAC,0BAA0B,EAAEW,aAAa;YAC1D,MAAM,IAAI,CAACzB,aAAa,CAAC6B,YAAY,CAACJ,aAAaE,cAAc/B;YACjE,IAAI,CAACe,MAAM,CAACG,GAAG,CAAC,CAAC,oBAAoB,EAAEa,cAAc;QACvD,OAAO;YACL,IAAI,CAAChB,MAAM,CAACG,GAAG,CAAC,CAAC,eAAe,EAAEa,cAAc;QAClD;IACF;IAEA,MAAMG,0BAA0BC,YAAsB,EAAE;QACtD,MAAMxB,WAAW,MAAM,IAAI,CAACT,eAAe,CAACkC,aAAa,CAACD;QAC1D,MAAME,aAAa1B,SAAS2B,UAAU;QAGtC,IAAI,CAACC,OAAOC,IAAI,CAACH,YAAYT,QAAQ,CAAC9B,qBAAqB,CAACyC,OAAOC,IAAI,CAACH,YAAYT,QAAQ,CAAC7B,eAAe;YAC1G,MAAM,IAAIuB,sCAAmB,CAC3B;QAEJ;QAEA,MAAMmB,YAAYJ,UAAU,CAACvC,iBAAiB;QAC9C,IAAI,CAAC2C,WAAW;YACd,MAAM,IAAInB,sCAAmB,CAAC;QAChC;QAEA,MAAMoB,WAAWL,UAAU,CAACtC,aAAa;QACzC,IAAI,CAAC2C,UAAUzB,QAAQ;YACrB,MAAM,IAAIK,sCAAmB,CAAC;QAChC;QAEA,OAAOoB;IACT;IAEA,MAAMC,wBAAwBR,YAAsB,EAAE;QACpD,OAAO,MAAM,IAAI,CAACjC,eAAe,CAAC0C,6BAA6B,CAACT;IAClE;IAEA,MAAMU,iCAAiCV,YAAsB,EAAE;QAC7D,OAAO,MAAM,IAAI,CAACjC,eAAe,CAAC4C,6BAA6B,CAACX,cAAcY,+DAA8B;IAC9G;IAEA,MAAMC,mBAAmBC,gBAAwB,EAAEd,YAAsB,EAAE;QACzE,MAAMe,oBAAoB,IAAI,CAAC9C,aAAa,CAAC+C,aAAa,CAACnD;QAE3D,OAAO,MAAM,IAAI,CAACE,eAAe,CAACkD,6BAA6B,CAACH,kBAAkBd,cAAce;IAClG;AACF"}
|
|
@@ -10,13 +10,13 @@ Object.defineProperty(exports, "PluginRepositoryCache", {
|
|
|
10
10
|
});
|
|
11
11
|
const _envutils = require("../../utils/env.utils");
|
|
12
12
|
class PluginRepositoryCache {
|
|
13
|
-
|
|
13
|
+
octoprintClient;
|
|
14
14
|
logger;
|
|
15
15
|
wasCached = false;
|
|
16
16
|
pluginCache = [];
|
|
17
17
|
lastQueried = undefined;
|
|
18
|
-
constructor({
|
|
19
|
-
this.
|
|
18
|
+
constructor({ octoprintClient, loggerFactory }){
|
|
19
|
+
this.octoprintClient = octoprintClient;
|
|
20
20
|
this.logger = loggerFactory(PluginRepositoryCache.name);
|
|
21
21
|
}
|
|
22
22
|
getPlugin(pluginName) {
|
|
@@ -34,7 +34,7 @@ class PluginRepositoryCache {
|
|
|
34
34
|
];
|
|
35
35
|
}
|
|
36
36
|
async queryCache() {
|
|
37
|
-
this.pluginCache = await this.
|
|
37
|
+
this.pluginCache = await this.octoprintClient.fetchOctoPrintPlugins() || [];
|
|
38
38
|
this.wasCached = true;
|
|
39
39
|
this.lastQueried = Date.now();
|
|
40
40
|
this.logger.log(`Plugin Cache filled with ${this.pluginCache?.length || "?"} plugins`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/octoprint/plugin-repository.cache.ts"],"names":["PluginRepositoryCache","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/plugin-repository.cache.ts"],"names":["PluginRepositoryCache","octoprintClient","logger","wasCached","pluginCache","lastQueried","undefined","constructor","loggerFactory","name","getPlugin","pluginName","isTestEnvironment","warn","getCache","find","p","id","toLowerCase","queryCache","fetchOctoPrintPlugins","Date","now","log","length"],"mappings":";;;;+BAKaA;;;eAAAA;;;0BALqB;AAK3B,MAAMA;IACXC,gBAAiC;IACjCC,OAAsB;IAEtBC,YAAY,MAAM;IAClBC,cAAc,EAAE,CAAC;IACjBC,cAAcC,UAAU;IAExBC,YAAY,EAAEN,eAAe,EAAEO,aAAa,EAAuE,CAAE;QACnH,IAAI,CAACP,eAAe,GAAGA;QACvB,IAAI,CAACC,MAAM,GAAGM,cAAcR,sBAAsBS,IAAI;IACxD;IAEAC,UAAUC,UAAkB,EAAE;QAC5B,IAAI,CAAC,IAAI,CAACR,SAAS,EAAE;YACnB,IAAI,CAACS,IAAAA,2BAAiB,KAAI;gBACxB,IAAI,CAACV,MAAM,CAACW,IAAI,CAAC,CAAC,wBAAwB,EAAEF,WAAW,0BAA0B,CAAC;YACpF;YACA;QACF;QAEA,OAAO,IAAI,CAACG,QAAQ,GAAGC,IAAI,CAAC,CAACC,IAAMA,EAAEC,EAAE,CAACC,WAAW,OAAOP,WAAWO,WAAW;IAClF;IAEAJ,WAAW;QACT,OAAO;eAAI,IAAI,CAACV,WAAW;SAAC;IAC9B;IAEA,MAAMe,aAAa;QACjB,IAAI,CAACf,WAAW,GAAG,AAAC,MAAM,IAAI,CAACH,eAAe,CAACmB,qBAAqB,MAAO,EAAE;QAC7E,IAAI,CAACjB,SAAS,GAAG;QACjB,IAAI,CAACE,WAAW,GAAGgB,KAAKC,GAAG;QAE3B,IAAI,CAACpB,MAAM,CAACqB,GAAG,CAAC,CAAC,yBAAyB,EAAE,IAAI,CAACnB,WAAW,EAAEoB,UAAU,IAAI,QAAQ,CAAC;QAErF,OAAO,IAAI,CAACV,QAAQ;IACtB;AACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/services/octoprint/utils/api.utils.ts"],"names":["constructHeaders","validateLogin","login","apiKey","printerURL","ValidationException","contentType","jsonContentType","contentTypeHeaderKey","apiKeyHeaderKey"],"
|
|
1
|
+
{"version":3,"sources":["../../../../src/services/octoprint/utils/api.utils.ts"],"names":["constructHeaders","validateLogin","login","apiKey","printerURL","ValidationException","contentType","jsonContentType","contentTypeHeaderKey","apiKeyHeaderKey"],"mappings":";;;;;;;;;;;IAmBgBA,gBAAgB;eAAhBA;;IAXAC,aAAa;eAAbA;;;2CAJT;mCAC6B;AAG7B,SAASA,cAAcC,KAAe;IAC3C,IAAI,CAACA,MAAMC,MAAM,IAAI,CAACD,MAAME,UAAU,EAAE;QACtC,MAAM,IAAIC,sCAAmB,CAAC;IAChC;IAEA,OAAO;QACLF,QAAQD,MAAMC,MAAM;QACpBC,YAAYF,MAAME,UAAU;IAC9B;AACF;AAEO,SAASJ,iBAAiBG,MAAc,EAAEG,cAAcC,0CAAe;IAC5E,OAAO;QACL,CAACC,+CAAoB,CAAC,EAAEF;QACxB,CAACG,0CAAe,CAAC,EAAEN;IACrB;AACF"}
|
|
@@ -17,19 +17,11 @@ function normalizePrinterFile(file) {
|
|
|
17
17
|
...file
|
|
18
18
|
};
|
|
19
19
|
const knownKeys = [
|
|
20
|
-
"
|
|
20
|
+
"path",
|
|
21
21
|
"date",
|
|
22
|
-
"display",
|
|
23
|
-
"gcodeAnalysis",
|
|
24
22
|
"hash",
|
|
25
|
-
"
|
|
26
|
-
"
|
|
27
|
-
"prints",
|
|
28
|
-
"refs",
|
|
29
|
-
"size",
|
|
30
|
-
"statistics",
|
|
31
|
-
"type",
|
|
32
|
-
"typePath"
|
|
23
|
+
"name",
|
|
24
|
+
"size"
|
|
33
25
|
];
|
|
34
26
|
const unknownKeys = keys.filter((k)=>!knownKeys.includes(k));
|
|
35
27
|
const customData = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/services/octoprint/utils/file.utils.ts"],"names":["normalizePrinterFile","file","Error","keys","Object","fileCopy","knownKeys","unknownKeys","filter","k","includes","customData","unknownKey"],"
|
|
1
|
+
{"version":3,"sources":["../../../../src/services/octoprint/utils/file.utils.ts"],"names":["normalizePrinterFile","file","Error","keys","Object","fileCopy","knownKeys","unknownKeys","filter","k","includes","customData","unknownKey"],"mappings":";;;;+BAGgBA;;;eAAAA;;;AAAT,SAASA,qBAAqBC,IAAsB;IACzD,IAAI,CAACA,MAAM;QACT,MAAM,IAAIC,MAAM;IAClB;IAEA,MAAMC,OAAOC,OAAOD,IAAI,CAACF;IACzB,MAAMI,WAAW;QACf,GAAGJ,IAAI;IACT;IAEA,MAAMK,YAAY;QAChB;QACA;QACA;QAIA;QAGA;KAID;IAED,MAAMC,cAAcJ,KAAKK,MAAM,CAAC,CAACC,IAAM,CAACH,UAAUI,QAAQ,CAACD;IAE3D,MAAME,aAAiC,CAAC;IACxC,KAAK,MAAMC,cAAcL,YAAa;QACpCI,UAAU,CAACC,WAAW,GAAGP,QAAQ,CAACO,WAAW;QAC7C,OAAOP,QAAQ,CAACO,WAAW;IAC7B;IAEAP,SAASM,UAAU,GAAGA;IAEtB,OAAON;AACT"}
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "OctoprintApi", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return OctoprintApi;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _printerapiinterface = require("./printer-api.interface");
|
|
12
|
+
const _runtimeexceptions = require("../exceptions/runtime.exceptions");
|
|
13
|
+
class OctoprintApi {
|
|
14
|
+
client;
|
|
15
|
+
printerLogin;
|
|
16
|
+
constructor({ octoprintClient, printerLogin }){
|
|
17
|
+
this.client = octoprintClient;
|
|
18
|
+
this.printerLogin = printerLogin;
|
|
19
|
+
}
|
|
20
|
+
get type() {
|
|
21
|
+
return _printerapiinterface.OctoprintType;
|
|
22
|
+
}
|
|
23
|
+
set login(login) {
|
|
24
|
+
this.printerLogin = login;
|
|
25
|
+
}
|
|
26
|
+
get login() {
|
|
27
|
+
return this.printerLogin;
|
|
28
|
+
}
|
|
29
|
+
async getVersion() {
|
|
30
|
+
const result = await this.client.getApiVersion(this.login);
|
|
31
|
+
return result.data?.server;
|
|
32
|
+
}
|
|
33
|
+
async connect() {
|
|
34
|
+
await this.client.sendConnectionCommand(this.login, this.client.connectCommand);
|
|
35
|
+
}
|
|
36
|
+
async disconnect() {
|
|
37
|
+
await this.client.sendConnectionCommand(this.login, this.client.disconnectCommand);
|
|
38
|
+
}
|
|
39
|
+
async restartServer() {
|
|
40
|
+
await this.client.postServerRestartCommand(this.login);
|
|
41
|
+
}
|
|
42
|
+
async restartHost() {
|
|
43
|
+
throw new _runtimeexceptions.NotImplementedException();
|
|
44
|
+
}
|
|
45
|
+
async restartPrinterFirmware() {
|
|
46
|
+
throw new _runtimeexceptions.NotImplementedException();
|
|
47
|
+
}
|
|
48
|
+
async startPrint(path) {
|
|
49
|
+
await this.client.postSelectPrintFile(this.login, path, true);
|
|
50
|
+
}
|
|
51
|
+
async pausePrint() {
|
|
52
|
+
await this.client.sendJobCommand(this.login, this.client.pauseJobCommand);
|
|
53
|
+
}
|
|
54
|
+
async resumePrint() {
|
|
55
|
+
await this.client.sendJobCommand(this.login, this.client.resumeJobCommand);
|
|
56
|
+
}
|
|
57
|
+
async cancelPrint() {
|
|
58
|
+
await this.client.sendJobCommand(this.login, this.client.cancelJobCommand);
|
|
59
|
+
}
|
|
60
|
+
async sendGcode(script) {
|
|
61
|
+
await this.client.sendCustomGCodeCommand(this.login, script);
|
|
62
|
+
}
|
|
63
|
+
async quickStop() {
|
|
64
|
+
await this.client.sendCustomGCodeCommand(this.login, "M112");
|
|
65
|
+
}
|
|
66
|
+
async movePrintHead(amounts) {
|
|
67
|
+
await this.client.sendPrintHeadJogCommand(this.login, amounts);
|
|
68
|
+
}
|
|
69
|
+
async homeAxes(axes) {
|
|
70
|
+
await this.client.sendPrintHeadHomeCommand(this.login, axes);
|
|
71
|
+
}
|
|
72
|
+
async getFiles() {
|
|
73
|
+
const files = await this.client.getLocalFiles(this.login, false);
|
|
74
|
+
return files.map((f)=>({
|
|
75
|
+
name: f.name,
|
|
76
|
+
path: f.path,
|
|
77
|
+
size: f.size,
|
|
78
|
+
date: f.date
|
|
79
|
+
}));
|
|
80
|
+
}
|
|
81
|
+
async downloadFile(path) {
|
|
82
|
+
return await this.client.downloadFile(this.login, path);
|
|
83
|
+
}
|
|
84
|
+
async uploadFile(fileOrBuffer, uploadToken) {
|
|
85
|
+
await this.client.uploadFileAsMultiPart(this.login, fileOrBuffer, {
|
|
86
|
+
select: true,
|
|
87
|
+
print: true
|
|
88
|
+
}, uploadToken);
|
|
89
|
+
}
|
|
90
|
+
async deleteFile(path) {
|
|
91
|
+
await this.client.deleteFileOrFolder(this.login, path);
|
|
92
|
+
}
|
|
93
|
+
async deleteFolder(path) {
|
|
94
|
+
await this.client.deleteFileOrFolder(this.login, path);
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
//# sourceMappingURL=octoprint.api.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/services/octoprint.api.ts"],"names":["OctoprintApi","client","printerLogin","constructor","octoprintClient","type","OctoprintType","login","getVersion","result","getApiVersion","data","server","connect","sendConnectionCommand","connectCommand","disconnect","disconnectCommand","restartServer","postServerRestartCommand","restartHost","NotImplementedException","restartPrinterFirmware","startPrint","path","postSelectPrintFile","pausePrint","sendJobCommand","pauseJobCommand","resumePrint","resumeJobCommand","cancelPrint","cancelJobCommand","sendGcode","script","sendCustomGCodeCommand","quickStop","movePrintHead","amounts","sendPrintHeadJogCommand","homeAxes","axes","sendPrintHeadHomeCommand","getFiles","files","getLocalFiles","map","f","name","size","date","downloadFile","uploadFile","fileOrBuffer","uploadToken","uploadFileAsMultiPart","select","print","deleteFile","deleteFileOrFolder","deleteFolder"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/base.interface.ts"],"names":[],"
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/base.interface.ts"],"names":[],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/base.service.ts"],"names":["BaseService","entity","dto","createDTO","updateDto","BaseServiceHost","typeormService","repository","constructor","getDataSource","getRepository","get","id","throwIfNotFound","options","findOneOrFail","where","e","EntityNotFoundError","NotFoundException","undefined","list","find","listPaged","page","DEFAULT_PAGE","take","pageSize","skip","update","validate","Object","assign","create","save","delete","deleteMany","ids","emitEvent"],"
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/base.service.ts"],"names":["BaseService","entity","dto","createDTO","updateDto","BaseServiceHost","typeormService","repository","constructor","getDataSource","getRepository","get","id","throwIfNotFound","options","findOneOrFail","where","e","EntityNotFoundError","NotFoundException","undefined","list","find","listPaged","page","DEFAULT_PAGE","take","pageSize","skip","update","validate","Object","assign","create","save","delete","deleteMany","ids","emitEvent"],"mappings":";;;;+BAkBgBA;;;eAAAA;;;yBAPT;gCACkB;mCAGS;+BACQ;AAEnC,SAASA,YAKdC,MAAuB,EAAEC,GAAc,EAAEC,SAA2B,EAAEC,SAA2B;IACjG,MAAeC;QACbC,eAA+B;QAC/BC,WAA0B;QAE1BC,YAAY,EAAEF,cAAc,EAAsC,CAAE;YAClE,IAAI,CAACA,cAAc,GAAGA;YACtB,IAAI,CAACC,UAAU,GAAGD,eAAeG,aAAa,GAAGC,aAAa,CAACT;QACjE;QAIA,MAAMU,IAAIC,EAAgB,EAAEC,kBAAkB,IAAI,EAAEC,OAA2B,EAAE;YAC/E,IAAI;gBACF,OAAO,IAAI,CAACP,UAAU,CAACQ,aAAa,CAAC;oBAAE,GAAGD,OAAO;oBAAEE,OAAO;wBAAEJ;oBAAG;gBAAE;YACnE,EAAE,OAAOK,GAAG;gBACV,IAAIJ,mBAAmBI,aAAaC,4BAAmB,EAAE;oBACvD,MAAM,IAAIC,oCAAiB,CAAC,CAAC,WAAW,EAAElB,OAAO,mCAAmC,CAAC;gBACvF;gBACA,OAAOmB;YACT;QACF;QAEA,MAAMC,KAAKP,OAA4B,EAAE;YACvC,OAAO,IAAI,CAACP,UAAU,CAACe,IAAI,CAACR;QAC9B;QAEA,MAAMS,UAAUC,OAAoBC,2BAAY,EAAEX,OAA4B,EAAE;YAC9E,OAAO,IAAI,CAACP,UAAU,CAACe,IAAI,CAAC;gBAAEI,MAAMF,KAAKG,QAAQ;gBAAEC,MAAMJ,KAAKG,QAAQ,GAAGH,KAAKA,IAAI;gBAAE,GAAGV,OAAO;YAAC;QACjG;QAEA,MAAMe,OAAOjB,EAAgB,EAAER,SAAoB,EAAE;YACnD,MAAMH,SAAS,MAAM,IAAI,CAACU,GAAG,CAACC;YAC9B,MAAMkB,IAAAA,wBAAQ,EAAC1B;YACf,MAAM0B,IAAAA,wBAAQ,EAACC,OAAOC,MAAM,CAAC/B,QAAQG;YACrC,MAAM,IAAI,CAACG,UAAU,CAACsB,MAAM,CAAC5B,OAAOW,EAAE,EAAER;YACxC,OAAO,MAAM,IAAI,CAACO,GAAG,CAACC;QACxB;QAEA,MAAMqB,OAAO/B,GAAc,EAAE;YAE3B,IAAIA,IAAIU,EAAE,EAAE;gBACV,OAAOV,IAAIU,EAAE;YACf;YACA,MAAMkB,IAAAA,wBAAQ,EAAC5B;YACf,MAAMD,SAAS,IAAI,CAACM,UAAU,CAAC0B,MAAM,CAAC/B;YACtC,MAAM4B,IAAAA,wBAAQ,EAAC7B;YAEf,OAAO,MAAM,IAAI,CAACM,UAAU,CAAC2B,IAAI,CAACjC;QACpC;QAEA,MAAMkC,OAAOvB,EAAgB,EAAEC,kBAAkB,IAAI,EAAE;YACrD,MAAMZ,SAAS,MAAM,IAAI,CAACU,GAAG,CAACC,IAAIC;YAClC,OAAO,MAAM,IAAI,CAACN,UAAU,CAAC4B,MAAM,CAAClC,OAAOW,EAAE;QAC/C;QAEA,MAAMwB,WAAWC,GAAmB,EAAEC,YAAY,IAAI,EAAyB;YAC7E,OAAO,MAAM,IAAI,CAAC/B,UAAU,CAAC4B,MAAM,CAACE;QACtC;IACF;IAEA,OAAOhC;AACT"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/camera-stream.service.ts"],"names":["CameraStreamService","BaseService","CameraStream","CameraStreamDto","CreateCameraStreamDto","toDto","entity","id","streamURL","name","printerId"],"
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/camera-stream.service.ts"],"names":["CameraStreamService","BaseService","CameraStream","CameraStreamDto","CreateCameraStreamDto","toDto","entity","id","streamURL","name","printerId"],"mappings":";;;;+BAMaA;;;eAAAA;;;6BANe;0BACC;iCAC0B;AAIhD,MAAMA,4BACHC,IAAAA,wBAAW,EAACC,sBAAY,EAAEC,gCAAe,EAAEC,sCAAqB;IAGxEC,MAAMC,MAAoB,EAAiC;QAEzD,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,WAAWF,OAAOE,SAAS;YAC3BC,MAAMH,OAAOG,IAAI;YACjBC,WAAWJ,OAAOI,SAAS;QAO7B;IACF;AACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/custom-gcode.service.ts"],"names":["CustomGcodeService","BaseService","CustomGcode","CustomGcodeDto","toDto","entity","id","name","description","gcode","create","gcodeScript","delete","gcodeScriptId","throwIfNotFound","get","list","update","updatedData"],"
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/custom-gcode.service.ts"],"names":["CustomGcodeService","BaseService","CustomGcode","CustomGcodeDto","toDto","entity","id","name","description","gcode","create","gcodeScript","delete","gcodeScriptId","throwIfNotFound","get","list","update","updatedData"],"mappings":";;;;+BAMaA;;;eAAAA;;;0BALe;gCAEG;6BACH;AAErB,MAAMA,2BACHC,IAAAA,wBAAW,EAACC,qBAAW,EAAEC,8BAAc,EAAgBA,8BAAc;IAG7EC,MAAMC,MAAmB,EAAkB;QACzC,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,MAAMF,OAAOE,IAAI;YACjBC,aAAaH,OAAOG,WAAW;YAC/BC,OAAO;mBAAIJ,OAAOI,KAAK;aAAC;QAC1B;IACF;IAEA,MAAMC,OAAOC,WAAyC,EAAwB;QAC5E,OAAO,MAAM,KAAK,CAACD,OAAOC;IAC5B;IAEA,MAAMC,OAAOC,aAA2B,EAAEC,eAAyB,EAAE;QACnE,OAAO,MAAM,KAAK,CAACF,OAAOC,eAAeC;IAC3C;IAEA,MAAMC,IAAIF,aAA2B,EAAwB;QAC3D,OAAO,MAAM,KAAK,CAACE,IAAIF;IACzB;IAEA,MAAMG,OAA+B;QACnC,OAAO,MAAM,KAAK,CAACA;IACrB;IAEA,MAAMC,OAAOJ,aAA2B,EAAEK,WAAyC,EAAwB;QACzG,OAAO,MAAM,KAAK,CAACD,OAAOJ,eAAeK;IAC3C;AACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/floor-position.service.ts"],"names":["FloorPositionService","BaseService","FloorPosition","PositionDto","constructor","typeormService","create","dto","findPosition","floorId","x","y","repository","findOneBy","findPrinterPosition","printerId","deletePrinterPositionsByPrinterId","delete","findPrinterPositionOnFloor","toDto","entity"],"
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/floor-position.service.ts"],"names":["FloorPositionService","BaseService","FloorPosition","PositionDto","constructor","typeormService","create","dto","findPosition","floorId","x","y","repository","findOneBy","findPrinterPosition","printerId","deletePrinterPositionsByPrinterId","delete","findPrinterPositionOnFloor","toDto","entity"],"mappings":";;;;+BAMaA;;;eAAAA;;;qCANiB;6BACF;0BAGA;AAErB,MAAMA,6BAA6BC,IAAAA,wBAAW,EAACC,kCAAa,EAAEC,qBAAW;IAC9EC,YAAY,EAAEC,cAAc,EAAsC,CAAE;QAClE,KAAK,CAAC;YAAEA;QAAe;IACzB;IAEA,MAAMC,OAAOC,GAA8B,EAA0B;QACnE,OAAO,KAAK,CAACD,OAAOC;IACtB;IAEAC,aAAaC,OAAqB,EAAEC,CAAS,EAAEC,CAAS,EAAE;QACxD,OAAO,IAAI,CAACC,UAAU,CAACC,SAAS,CAAC;YAAEJ;YAASC;YAAGC;QAAE;IACnD;IAMAG,oBAAoBC,SAAuB,EAAE;QAC3C,OAAO,IAAI,CAACH,UAAU,CAACC,SAAS,CAAC;YAAEE;QAAU;IAC/C;IAEAC,kCAAkCD,SAAuB,EAAE;QACzD,OAAO,IAAI,CAACH,UAAU,CAACK,MAAM,CAAC;YAAEF;QAAU;IAC5C;IAEAG,2BAA2BT,OAAqB,EAAEM,SAAuB,EAAE;QACzE,OAAO,IAAI,CAACH,UAAU,CAACC,SAAS,CAAC;YAAEJ;YAASM;QAAU;IACxD;IAEAI,MAAMC,MAAqB,EAA6B;QACtD,OAAO;YACLV,GAAGU,OAAOV,CAAC;YACXC,GAAGS,OAAOT,CAAC;YACXI,WAAWK,OAAOL,SAAS;YAC3BN,SAASW,OAAOX,OAAO;QACzB;IACF;AACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/floor.service.ts"],"names":["FloorService","BaseService","Floor","FloorDto","CreateFloorDto","UpdateFloorDto","floorPositionService","constructor","typeormService","list","options","Object","assign","relations","get","id","throwIfNotFound","create","dto","validateInput","createFloorRules","floor","name","printers","length","printer","addOrUpdatePrinter","toDto","map","p","printerId","floorId","x","y","createDefaultFloor","update","floorUpdate","updateFloorRules","desiredPositions","undesiredPositions","filter","pos","find","dp","deleteMany","updateName","updateLevel","level","positionDto","position","findPrinterPosition","delete","xyPosition","findPosition","newPosition","FloorPosition","removePrinter","findPrinterPositionOnFloor","NotFoundException","deletePrinterFromAnyFloor","deletePrinterPositionsByPrinterId"],"
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/floor.service.ts"],"names":["FloorService","BaseService","Floor","FloorDto","CreateFloorDto","UpdateFloorDto","floorPositionService","constructor","typeormService","list","options","Object","assign","relations","get","id","throwIfNotFound","create","dto","validateInput","createFloorRules","floor","name","printers","length","printer","addOrUpdatePrinter","toDto","map","p","printerId","floorId","x","y","createDefaultFloor","update","floorUpdate","updateFloorRules","desiredPositions","undesiredPositions","filter","pos","find","dp","deleteMany","updateName","updateLevel","level","positionDto","position","findPrinterPosition","delete","xyPosition","findPosition","newPosition","FloorPosition","removePrinter","findPrinterPositionOnFloor","NotFoundException","deletePrinterFromAnyFloor","deletePrinterPositionsByPrinterId"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/permission.service.ts"],"names":["PermissionService","BaseService","Permission","PermissionDto","logger","_permissions","constructor","loggerFactory","typeormService","permissions","toDto","permission","id","name","authorizePermission","requiredPermission","assignedPermissions","find","assignedPermission","normalizePermission","getPermissionByName","permissionName","r","NotFoundException","getPermission","permissionId","syncPermissions","permissionDefinition","flattenPermissionDefinition","storedPermission","repository","findOneBy","newPermission","create","push","permissionInstance","warn"],"
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/permission.service.ts"],"names":["PermissionService","BaseService","Permission","PermissionDto","logger","_permissions","constructor","loggerFactory","typeormService","permissions","toDto","permission","id","name","authorizePermission","requiredPermission","assignedPermissions","find","assignedPermission","normalizePermission","getPermissionByName","permissionName","r","NotFoundException","getPermission","permissionId","syncPermissions","permissionDefinition","flattenPermissionDefinition","storedPermission","repository","findOneBy","newPermission","create","push","permissionInstance","warn"],"mappings":";;;;+BAWaA;;;eAAAA;;;6BATe;0BACD;+BACG;mCACI;wCAIU;AAErC,MAAMA,0BACHC,IAAAA,wBAAW,EAACC,oBAAU,EAAEC,4BAAa;IAGrCC,OAAsB;IACtBC,eAA6B,EAAE,CAAC;IAExCC,YAAY,EAAEC,aAAa,EAAEC,cAAc,EAAqE,CAAE;QAChH,KAAK,CAAC;YAAEA;QAAe;IACzB;IACA,IAAIC,cAAc;QAChB,OAAO,IAAI,CAACJ,YAAY;IAC1B;IAEAK,MAAMC,UAAsB,EAA+B;QACzD,OAAO;YACLC,IAAID,WAAWC,EAAE;YACjBC,MAAMF,WAAWE,IAAI;QACvB;IACF;IAEAC,oBAAoBC,kBAA0B,EAAEC,mBAA6B,EAAW;QACtF,OAAO,CAAC,CAACA,oBAAoBC,IAAI,CAAC,CAACC;YACjC,MAAMC,sBAAsB,IAAI,CAACA,mBAAmB,CAACD;YACrD,IAAI,CAACC,qBAAqB,OAAO;YACjC,OAAOA,wBAAwBJ;QACjC;IACF;IAEA,MAAMK,oBAAoBC,cAAsB,EAAuB;QACrE,MAAMV,aAAa,IAAI,CAACF,WAAW,CAACQ,IAAI,CAAC,CAACK,IAAMA,EAAET,IAAI,KAAKQ;QAC3D,IAAI,CAACV,YAAY,MAAM,IAAIY,oCAAiB,CAAC;QAC7C,OAAOZ;IACT;IAEA,MAAMa,cAAcC,YAA0B,EAAuB;QACnE,MAAMd,aAAa,IAAI,CAACF,WAAW,CAACQ,IAAI,CAAC,CAACK,IAAMA,EAAEV,EAAE,KAAKa;QACzD,IAAI,CAACd,YAAY,MAAM,IAAIY,oCAAiB,CAAC,CAAC,sCAAsC,CAAC;QAErF,OAAOZ;IACT;IAEA,MAAMe,kBAAiC;QACrC,IAAI,CAACrB,YAAY,GAAG,EAAE;QAEtB,MAAMsB,uBAAuBC,IAAAA,mDAA2B;QACxD,KAAK,IAAIjB,cAAcgB,qBAAsB;YAC3C,MAAME,mBAAmB,MAAM,IAAI,CAACC,UAAU,CAACC,SAAS,CAAC;gBAAElB,MAAMF;YAAW;YAC5E,IAAI,CAACkB,kBAAkB;gBACrB,MAAMG,gBAAgB,MAAM,IAAI,CAACC,MAAM,CAAC;oBACtCpB,MAAMF;gBACR;gBACA,IAAI,CAACN,YAAY,CAAC6B,IAAI,CAACF;YACzB,OAAO;gBACL,IAAI,CAAC3B,YAAY,CAAC6B,IAAI,CAACL;YACzB;QACF;IACF;IAEAV,oBAAoBD,kBAAmC,EAAU;QAC/D,MAAMiB,qBAAqB,IAAI,CAAC1B,WAAW,CAACQ,IAAI,CAAC,CAACK,IAAMA,EAAEV,EAAE,KAAKM,sBAAsBI,EAAET,IAAI,KAAKK;QAClG,IAAI,CAACiB,oBAAoB;YACvB,IAAI,CAAC/B,MAAM,CAACgC,IAAI,CAAC,CAAC,oDAAoD,CAAC;YACvE;QACF;QACA,OAAOD,mBAAmBtB,IAAI;IAChC;AACF"}
|
|
@@ -14,7 +14,7 @@ const _printcompletiondto = require("../interfaces/print-completion.dto");
|
|
|
14
14
|
const _typeorm = require("typeorm");
|
|
15
15
|
const _octoprintwebsocketconstants = require("../octoprint/constants/octoprint-websocket.constants");
|
|
16
16
|
const _arrayutil = require("../../utils/array.util");
|
|
17
|
-
const _printcompletionshared = require("../print-completion.shared");
|
|
17
|
+
const _printcompletionshared = require("../mongoose/print-completion.shared");
|
|
18
18
|
class PrintCompletionService extends (0, _baseservice.BaseService)(_entities.PrintCompletion, _printcompletiondto.PrintCompletionDto) {
|
|
19
19
|
logger;
|
|
20
20
|
constructor({ typeormService, loggerFactory }){
|
|
@@ -40,14 +40,13 @@ class PrintCompletionService extends (0, _baseservice.BaseService)(_entities.Pri
|
|
|
40
40
|
}
|
|
41
41
|
async findPrintCompletion(correlationId) {
|
|
42
42
|
const completions = await this.repository.findBy({});
|
|
43
|
-
console.log({
|
|
44
|
-
context: {
|
|
45
|
-
correlationId
|
|
46
|
-
}
|
|
47
|
-
});
|
|
48
43
|
return completions.filter((c)=>c.context?.correlationId === correlationId);
|
|
49
44
|
}
|
|
50
45
|
async updateContext(correlationId, context) {
|
|
46
|
+
if (!correlationId?.length) {
|
|
47
|
+
this.logger.warn("Ignoring undefined correlationId, cant update print completion context");
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
51
50
|
const completionEntry = await this.repository.findOneBy({
|
|
52
51
|
context: {
|
|
53
52
|
correlationId
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/print-completion.service.ts"],"names":["PrintCompletionService","BaseService","PrintCompletion","PrintCompletionDto","logger","constructor","typeormService","loggerFactory","name","toDto","entity","id","completionLog","context","fileName","createdAt","printerReference","status","printerId","create","input","findPrintCompletion","correlationId","completions","repository","findBy","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/print-completion.service.ts"],"names":["PrintCompletionService","BaseService","PrintCompletion","PrintCompletionDto","logger","constructor","typeormService","loggerFactory","name","toDto","entity","id","completionLog","context","fileName","createdAt","printerReference","status","printerId","create","input","findPrintCompletion","correlationId","completions","repository","findBy","filter","c","updateContext","length","warn","completionEntry","findOneBy","EVENT_TYPES","PrintStarted","update","listGroupByPrinterStatus","limitedCompletions","listPaged","printCompletionsAggr","groupArrayBy","val","toString","Object","entries","map","pc","parseInt","printEvents","processCompletions","loadPrintContexts","find","where","Not","In","PrintDone","PrintFailed","order"],"mappings":";;;;+BAaaA;;;eAAAA;;;6BAbe;0BACI;oCACqD;yBAG7D;6CACI;2BACC;uCAI2B;AAEjD,MAAMA,+BACHC,IAAAA,wBAAW,EAACC,yBAAe,EAAEC,sCAAkB;IAGvDC,OAAsB;IAEtBC,YAAY,EAAEC,cAAc,EAAEC,aAAa,EAAqE,CAAE;QAChH,KAAK,CAAC;YAAED;QAAe;QACvB,IAAI,CAACF,MAAM,GAAGG,cAAcP,uBAAuBQ,IAAI;IACzD;IAEAC,MAAMC,MAAuB,EAAoC;QAC/D,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,eAAeF,OAAOE,aAAa;YACnCC,SAASH,OAAOG,OAAO;YACvBC,UAAUJ,OAAOI,QAAQ;YACzBC,WAAWL,OAAOK,SAAS;YAC3BC,kBAAkBN,OAAOM,gBAAgB;YACzCC,QAAQP,OAAOO,MAAM;YACrBC,WAAWR,OAAOQ,SAAS;QAC7B;IACF;IAEA,MAAMC,OAAOC,KAA6C,EAAE;QAC1D,OAAO,MAAM,KAAK,CAACD,OAAOC;IAC5B;IAEA,MAAMC,oBAAoBC,aAAqB,EAAE;QAC/C,MAAMC,cAAc,MAAM,IAAI,CAACC,UAAU,CAACC,MAAM,CAAC,CAAC;QAClD,OAAOF,YAAYG,MAAM,CAAC,CAACC,IAAMA,EAAEd,OAAO,EAAES,kBAAkBA;IAChE;IAEA,MAAMM,cAAcN,aAAqB,EAAET,OAA+B,EAAiB;QACzF,IAAI,CAACS,eAAeO,QAAQ;YAC1B,IAAI,CAACzB,MAAM,CAAC0B,IAAI,CAAC;YACjB;QACF;QAEA,MAAMC,kBAAkB,MAAM,IAAI,CAACP,UAAU,CAACQ,SAAS,CAAC;YACtDnB,SAAS;gBAAES;YAAc;YACzBL,QAAQgB,wCAAW,CAACC,YAAY;QAClC;QACA,IAAI,CAACH,iBAAiB;YACpB,IAAI,CAAC3B,MAAM,CAAC0B,IAAI,CAAC,CAAC,yBAAyB,EAAER,cAAc,0DAA0D,CAAC;YACtH;QACF;QACAS,gBAAgBlB,OAAO,GAAGA;QAC1B,MAAM,IAAI,CAACsB,MAAM,CAACJ,gBAAgBpB,EAAE,EAAEoB;IACxC;IAEA,MAAMK,2BAA2D;QAC/D,MAAMC,qBAAqB,MAAM,IAAI,CAACC,SAAS;QAC/C,MAAMC,uBAAuBC,IAAAA,uBAAY,EAACH,oBAAoB,CAACI,MAAQA,IAAIvB,SAAS,CAACwB,QAAQ;QAC7F,MAAMnB,cAAcoB,OAAOC,OAAO,CAACL,sBAAsBM,GAAG,CAAC,CAAC,CAACC,IAAIL,IAAI,GAAM,CAAA;gBAC3EvB,WAAW6B,SAASD;gBACpBE,aAAaP;YACf,CAAA;QACA,OAAOQ,IAAAA,yCAAkB,EAAC1B;IAC5B;IAEA,MAAM2B,oBAAgE;QACpE,MAAM3B,cAAc,MAAM,IAAI,CAACC,UAAU,CAAC2B,IAAI,CAAC;YAC7CC,OAAO;gBACLnC,QAAQoC,IAAAA,YAAG,EAACC,IAAAA,WAAE,EAAC;oBAACrB,wCAAW,CAACsB,SAAS;oBAAEtB,wCAAW,CAACuB,WAAW;iBAAC;YACjE;YACAC,OAAO;gBACLvC,WAAW;gBACXH,WAAW,CAAC;YACd;QACF;QAEA,OAAOyB,IAAAA,uBAAY,EAACjB,aAAa,CAACkB,MAAQA,IAAI9B,EAAE,CAAC+B,QAAQ;IAC3D;AACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/printer-group.service.ts"],"names":["PrinterGroupService","BaseService","PrinterGroup","PrinterGroupDto","groupRepository","constructor","typeormService","getDataSource","getRepository","Group","listGroups","groups","find","groupListing","group","id","name","printers","repository","findBy","groupId","Object","values","getGroup","findOneBy","NotFoundException","getGroupWithPrinters","printerGroups","createGroup","dto","validate","entity","create","save","updateGroupName","updateDto","assign","update","deleteGroup","delete","addPrinterToGroup","printerId","alreadyExisting","removePrinterFromGroup","toDto"],"
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/printer-group.service.ts"],"names":["PrinterGroupService","BaseService","PrinterGroup","PrinterGroupDto","groupRepository","constructor","typeormService","getDataSource","getRepository","Group","listGroups","groups","find","groupListing","group","id","name","printers","repository","findBy","groupId","Object","values","getGroup","findOneBy","NotFoundException","getGroupWithPrinters","printerGroups","createGroup","dto","validate","entity","create","save","updateGroupName","updateDto","assign","update","deleteGroup","delete","addPrinterToGroup","printerId","alreadyExisting","removePrinterFromGroup","toDto"],"mappings":"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"}
|
|
@@ -29,7 +29,8 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
|
|
|
29
29
|
return {
|
|
30
30
|
...this.toDto(entity),
|
|
31
31
|
apiKey: entity.apiKey,
|
|
32
|
-
printerURL: entity.printerURL
|
|
32
|
+
printerURL: entity.printerURL,
|
|
33
|
+
printerType: entity.printerType
|
|
33
34
|
};
|
|
34
35
|
}
|
|
35
36
|
toDto(entity) {
|
|
@@ -68,12 +69,13 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
|
|
|
68
69
|
partial.printerURL = (0, _urlutils.normalizeURLWithProtocol)(partial.printerURL);
|
|
69
70
|
}
|
|
70
71
|
Object.assign(printer, partial);
|
|
71
|
-
const { printerURL, apiKey, enabled, name } = await (0, _validators.validateInput)(printer, _printerservicevalidation.createPrinterRules);
|
|
72
|
+
const { printerURL, apiKey, enabled, name, printerType } = await (0, _validators.validateInput)(printer, _printerservicevalidation.createPrinterRules);
|
|
72
73
|
const updatedPrinter = await super.update(printerId, {
|
|
73
74
|
printerURL,
|
|
74
75
|
name,
|
|
75
76
|
apiKey,
|
|
76
|
-
enabled
|
|
77
|
+
enabled,
|
|
78
|
+
printerType
|
|
77
79
|
});
|
|
78
80
|
this.eventEmitter2.emit(_eventconstants.printerEvents.printerUpdated, {
|
|
79
81
|
printer,
|