@fdm-monster/server 1.8.3 → 1.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.env.template +6 -4
- package/.gitattributes +4 -2
- package/.yarn/install-state.gz +0 -0
- package/.yarn/releases/yarn-4.9.1.cjs +948 -0
- package/.yarnrc.yml +1 -1
- package/README.md +27 -28
- package/RELEASE_NOTES.MD +69 -1
- package/biome.json +33 -0
- package/dist/consoles/download-github-releases.js.map +1 -1
- package/dist/consoles/launch-http-servers.js +31 -0
- package/dist/consoles/launch-http-servers.js.map +1 -0
- package/dist/consoles/mock-octoprint.server.js +291 -0
- package/dist/consoles/mock-octoprint.server.js.map +1 -0
- package/dist/consoles/mock-prusalink.server.js +57 -0
- package/dist/consoles/mock-prusalink.server.js.map +1 -0
- package/dist/consoles/utils/api-messages.js +856 -0
- package/dist/consoles/utils/api-messages.js.map +1 -0
- package/dist/consoles/utils/delayed-memory.storage.js +42 -0
- package/dist/consoles/utils/delayed-memory.storage.js.map +1 -0
- package/dist/consoles/utils/ws-messages.js +88 -0
- package/dist/consoles/utils/ws-messages.js.map +1 -0
- package/dist/constants/event.constants.js +5 -21
- package/dist/constants/event.constants.js.map +1 -1
- package/dist/constants/server-settings.constants.js +8 -12
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/container.js +13 -14
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +3 -4
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/auth.controller.js +114 -24
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/batch-call.controller.js +95 -24
- package/dist/controllers/batch-call.controller.js.map +1 -1
- package/dist/controllers/camera-stream.controller.js +16 -12
- package/dist/controllers/camera-stream.controller.js.map +1 -1
- package/dist/controllers/custom-gcode.controller.js +116 -40
- package/dist/controllers/custom-gcode.controller.js.map +1 -1
- package/dist/controllers/dto/update-client-dist.dto.js +0 -21
- package/dist/controllers/dto/update-client-dist.dto.js.map +1 -1
- package/dist/controllers/first-time-setup.controller.js +54 -18
- package/dist/controllers/first-time-setup.controller.js.map +1 -1
- package/dist/controllers/floor.controller.js +154 -43
- package/dist/controllers/floor.controller.js.map +1 -1
- package/dist/controllers/metrics.controller.js +56 -0
- package/dist/controllers/metrics.controller.js.map +1 -0
- package/dist/controllers/print-completion.controller.js +81 -18
- package/dist/controllers/print-completion.controller.js.map +1 -1
- package/dist/controllers/printer-files.controller.js +45 -29
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer-group.controller.js +123 -33
- package/dist/controllers/printer-group.controller.js.map +1 -1
- package/dist/controllers/printer-settings.controller.js +73 -26
- package/dist/controllers/printer-settings.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +57 -198
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +153 -39
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +87 -88
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/controllers/settings.controller.js +222 -79
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/controllers/user.controller.js +67 -57
- package/dist/controllers/user.controller.js.map +1 -1
- package/dist/controllers/validation/auth-controller.validation.js +6 -5
- package/dist/controllers/validation/auth-controller.validation.js.map +1 -1
- package/dist/controllers/validation/batch-controller.validation.js +17 -18
- package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
- package/dist/controllers/validation/generic.validation.js +8 -3
- package/dist/controllers/validation/generic.validation.js.map +1 -1
- package/dist/controllers/validation/printer-completion-controller.validation.js +16 -0
- package/dist/controllers/validation/printer-completion-controller.validation.js.map +1 -0
- package/dist/controllers/validation/printer-controller.validation.js +31 -50
- package/dist/controllers/validation/printer-controller.validation.js.map +1 -1
- package/dist/controllers/validation/printer-files-controller.validation.js +25 -15
- package/dist/controllers/validation/printer-files-controller.validation.js.map +1 -1
- package/dist/controllers/validation/printer-settings-controller.validation.js +6 -5
- package/dist/controllers/validation/printer-settings-controller.validation.js.map +1 -1
- package/dist/controllers/validation/server-private.validation.js +17 -0
- package/dist/controllers/validation/server-private.validation.js.map +1 -0
- package/dist/controllers/validation/setting.validation.js +28 -10
- package/dist/controllers/validation/setting.validation.js.map +1 -1
- package/dist/controllers/validation/user-controller.validation.js +44 -13
- package/dist/controllers/validation/user-controller.validation.js.map +1 -1
- package/dist/data-source.js +10 -6
- package/dist/data-source.js.map +1 -1
- package/dist/entities/camera-stream.entity.js +2 -3
- package/dist/entities/camera-stream.entity.js.map +1 -1
- package/dist/entities/custom-gcode.entity.js +1 -2
- package/dist/entities/custom-gcode.entity.js.map +1 -1
- package/dist/entities/floor-position.entity.js.map +1 -1
- package/dist/entities/floor.entity.js +1 -2
- package/dist/entities/floor.entity.js.map +1 -1
- package/dist/entities/group.entity.js +6 -2
- package/dist/entities/group.entity.js.map +1 -1
- package/dist/entities/permission.entity.js +1 -2
- package/dist/entities/permission.entity.js.map +1 -1
- package/dist/entities/print-completion.entity.js +1 -2
- package/dist/entities/print-completion.entity.js.map +1 -1
- package/dist/entities/printer-group.entity.js +6 -2
- package/dist/entities/printer-group.entity.js.map +1 -1
- package/dist/entities/printer.entity.js +22 -4
- package/dist/entities/printer.entity.js.map +1 -1
- package/dist/entities/refresh-token.entity.js +1 -2
- package/dist/entities/refresh-token.entity.js.map +1 -1
- package/dist/entities/role.entity.js +1 -2
- package/dist/entities/role.entity.js.map +1 -1
- package/dist/entities/settings.entity.js +1 -2
- package/dist/entities/settings.entity.js.map +1 -1
- package/dist/entities/user-role.entity.js +1 -2
- package/dist/entities/user-role.entity.js.map +1 -1
- package/dist/entities/user.entity.js +1 -2
- package/dist/entities/user.entity.js.map +1 -1
- package/dist/exceptions/runtime.exceptions.js.map +1 -1
- package/dist/handlers/logger-factory.js +2 -2
- package/dist/handlers/logger-factory.js.map +1 -1
- package/dist/handlers/logger.js +11 -58
- package/dist/handlers/logger.js.map +1 -1
- package/dist/handlers/logging/file-logging.transport.js +35 -0
- package/dist/handlers/logging/file-logging.transport.js.map +1 -0
- package/dist/handlers/logging/loki-logging.transport.js +55 -0
- package/dist/handlers/logging/loki-logging.transport.js.map +1 -0
- package/dist/handlers/logging/static.logger.js +134 -0
- package/dist/handlers/logging/static.logger.js.map +1 -0
- package/dist/handlers/validators.js +7 -116
- package/dist/handlers/validators.js.map +1 -1
- package/dist/index.js +13 -0
- package/dist/index.js.map +1 -1
- package/dist/middleware/authenticate.js +11 -22
- package/dist/middleware/authenticate.js.map +1 -1
- package/dist/middleware/database.js.map +1 -1
- package/dist/middleware/demo.middleware.js +4 -17
- package/dist/middleware/demo.middleware.js.map +1 -1
- package/dist/middleware/exception.filter.js +23 -23
- package/dist/middleware/exception.filter.js.map +1 -1
- package/dist/middleware/global.middleware.js +4 -4
- package/dist/middleware/global.middleware.js.map +1 -1
- package/dist/middleware/param-converter.middleware.js +81 -0
- package/dist/middleware/param-converter.middleware.js.map +1 -0
- package/dist/middleware/passport.js +3 -5
- package/dist/middleware/passport.js.map +1 -1
- package/dist/middleware/printer-resolver.js +37 -0
- package/dist/middleware/printer-resolver.js.map +1 -0
- package/dist/middleware/printer.js +22 -10
- package/dist/middleware/printer.js.map +1 -1
- package/dist/middleware/socketio.middleware.js +35 -0
- package/dist/middleware/socketio.middleware.js.map +1 -0
- package/dist/migrations/1706829146617-InitSqlite.js +1 -1
- package/dist/migrations/1706829146617-InitSqlite.js.map +1 -1
- package/dist/migrations/1707494762198-PrinterGroup.js +1 -1
- package/dist/migrations/1707494762198-PrinterGroup.js.map +1 -1
- package/dist/migrations/1708465930665-ChangePrintCompletionDeletePrinterCascade.js +1 -1
- package/dist/migrations/1708465930665-ChangePrintCompletionDeletePrinterCascade.js.map +1 -1
- package/dist/migrations/1713897879622-AddPrinterType.js +1 -1
- package/dist/migrations/1713897879622-AddPrinterType.js.map +1 -1
- package/dist/migrations/1745141688926-AddPrinterUsernamePassword.js +229 -0
- package/dist/migrations/1745141688926-AddPrinterUsernamePassword.js.map +1 -0
- package/dist/models/Auth/Permission.js.map +1 -1
- package/dist/models/Auth/RefreshToken.js +1 -1
- package/dist/models/Auth/RefreshToken.js.map +1 -1
- package/dist/models/Auth/Role.js.map +1 -1
- package/dist/models/Auth/User.js.map +1 -1
- package/dist/models/CameraStream.js +20 -0
- package/dist/models/CameraStream.js.map +1 -1
- package/dist/models/CustomGcode.js.map +1 -1
- package/dist/models/Floor.js.map +1 -1
- package/dist/models/FloorPrinter.js +10 -1
- package/dist/models/FloorPrinter.js.map +1 -1
- package/dist/models/PrintCompletion.js.map +1 -1
- package/dist/models/Printer.js +12 -5
- package/dist/models/Printer.js.map +1 -1
- package/dist/models/Settings.js +11 -43
- package/dist/models/Settings.js.map +1 -1
- package/dist/models/index.js +0 -4
- package/dist/models/index.js.map +1 -1
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js.map +1 -1
- package/dist/mongo-migrations/20210907173950-printers-enabled.js.map +1 -1
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js.map +1 -1
- package/dist/mongo-migrations/20230414141005-floor-remove-groupinfloor.js.map +1 -1
- package/dist/mongo-migrations/20230427202911-printer-remove-sortindex.js.map +1 -1
- package/dist/mongo-migrations/20230716065316-user-remove-name.js.map +1 -1
- package/dist/mongo-migrations/20231111081809-printer-flatten-name.js.map +1 -1
- package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js.map +1 -1
- package/dist/mongo-migrations/20231202183902-printer-files-simpler.js.map +1 -1
- package/dist/server.constants.js +8 -4
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js +29 -2
- package/dist/server.core.js.map +1 -1
- package/dist/server.env.js +22 -18
- package/dist/server.env.js.map +1 -1
- package/dist/server.host.js +24 -33
- package/dist/server.host.js.map +1 -1
- package/dist/services/authentication/auth.service.js +15 -20
- package/dist/services/authentication/auth.service.js.map +1 -1
- package/dist/services/authentication/jwt.service.js +1 -1
- package/dist/services/authentication/jwt.service.js.map +1 -1
- package/dist/services/core/batch-call.service.js +23 -25
- package/dist/services/core/batch-call.service.js.map +1 -1
- package/dist/services/core/client-bundle.service.js +78 -136
- package/dist/services/core/client-bundle.service.js.map +1 -1
- package/dist/services/core/config.service.js.map +1 -1
- package/dist/services/core/cradle.service.js +21 -0
- package/dist/services/core/cradle.service.js.map +1 -0
- package/dist/services/core/github.service.js +2 -2
- package/dist/services/core/github.service.js.map +1 -1
- package/dist/services/core/http-client.factory.js +1 -1
- package/dist/services/core/http-client.factory.js.map +1 -1
- package/dist/services/core/logs-manager.service.js +3 -3
- package/dist/services/core/logs-manager.service.js.map +1 -1
- package/dist/services/core/monsterpi.service.js +1 -1
- package/dist/services/core/monsterpi.service.js.map +1 -1
- package/dist/services/core/multer.service.js +8 -7
- package/dist/services/core/multer.service.js.map +1 -1
- package/dist/services/core/server-release.service.js +14 -8
- package/dist/services/core/server-release.service.js.map +1 -1
- package/dist/services/core/yaml.service.js +16 -17
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/interfaces/camera-stream.dto.js +4 -34
- package/dist/services/interfaces/camera-stream.dto.js.map +1 -1
- package/dist/services/interfaces/custom-gcode.dto.js.map +1 -1
- package/dist/services/interfaces/floor.dto.js +5 -47
- package/dist/services/interfaces/floor.dto.js.map +1 -1
- package/dist/services/interfaces/login.dto.js +2 -0
- package/dist/services/interfaces/login.dto.js.map +1 -1
- package/dist/services/interfaces/print-completion.dto.js.map +1 -1
- package/dist/services/interfaces/printer-group.dto.js +0 -14
- package/dist/services/interfaces/printer-group.dto.js.map +1 -1
- package/dist/services/interfaces/printer.dto.js +11 -11
- package/dist/services/interfaces/printer.dto.js.map +1 -1
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/interfaces/task.interfaces.js +6 -0
- package/dist/services/interfaces/task.interfaces.js.map +1 -0
- package/dist/services/mongoose/camera-stream.service.js +17 -15
- package/dist/services/mongoose/camera-stream.service.js.map +1 -1
- package/dist/services/mongoose/custom-gcode.service.js +4 -2
- package/dist/services/mongoose/custom-gcode.service.js.map +1 -1
- package/dist/services/mongoose/floor.service.js +37 -30
- package/dist/services/mongoose/floor.service.js.map +1 -1
- package/dist/services/mongoose/permission.service.js +1 -1
- package/dist/services/mongoose/permission.service.js.map +1 -1
- package/dist/services/mongoose/print-completion.service.js +2 -2
- package/dist/services/mongoose/print-completion.service.js.map +1 -1
- package/dist/services/mongoose/print-completion.shared.js +2 -2
- package/dist/services/mongoose/print-completion.shared.js.map +1 -1
- package/dist/services/mongoose/printer.service.js +33 -45
- package/dist/services/mongoose/printer.service.js.map +1 -1
- package/dist/services/mongoose/refresh-token.service.js +5 -8
- package/dist/services/mongoose/refresh-token.service.js.map +1 -1
- package/dist/services/mongoose/role.service.js +14 -5
- package/dist/services/mongoose/role.service.js.map +1 -1
- package/dist/services/mongoose/settings.service.js +35 -62
- package/dist/services/mongoose/settings.service.js.map +1 -1
- package/dist/services/mongoose/user.service.js +8 -7
- package/dist/services/mongoose/user.service.js.map +1 -1
- package/dist/services/moonraker/constants/{websocket.constants.js → moonraker.constants.js} +1 -1
- package/dist/services/moonraker/constants/{websocket.constants.js.map → moonraker.constants.js.map} +1 -1
- package/dist/services/moonraker/moonraker-websocket.adapter.js +109 -96
- package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
- package/dist/services/moonraker/moonraker.client.js +25 -16
- package/dist/services/moonraker/moonraker.client.js.map +1 -1
- package/dist/services/moonraker.api.js +5 -7
- package/dist/services/moonraker.api.js.map +1 -1
- package/dist/services/octoprint/constants/octoprint-service.constants.js +7 -36
- package/dist/services/octoprint/constants/octoprint-service.constants.js.map +1 -1
- package/dist/services/octoprint/constants/octoprint-websocket.constants.js +12 -3
- package/dist/services/octoprint/constants/octoprint-websocket.constants.js.map +1 -1
- package/dist/services/octoprint/dto/octoprint-event.dto.js +2 -1
- package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.routes.js +1 -38
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-websocket.adapter.js +66 -72
- package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -1
- package/dist/services/octoprint/octoprint.client.js +19 -192
- package/dist/services/octoprint/octoprint.client.js.map +1 -1
- package/dist/services/octoprint/utils/octoprint-http-client.builder.js.map +1 -1
- package/dist/services/octoprint.api.js +10 -19
- package/dist/services/octoprint.api.js.map +1 -1
- package/dist/services/orm/base.service.js +11 -12
- package/dist/services/orm/base.service.js.map +1 -1
- package/dist/services/orm/camera-stream.service.js +5 -1
- package/dist/services/orm/camera-stream.service.js.map +1 -1
- package/dist/services/orm/custom-gcode.service.js +2 -2
- package/dist/services/orm/custom-gcode.service.js.map +1 -1
- package/dist/services/orm/floor-position.service.js +0 -5
- package/dist/services/orm/floor-position.service.js.map +1 -1
- package/dist/services/orm/floor.service.js +43 -39
- package/dist/services/orm/floor.service.js.map +1 -1
- package/dist/services/orm/permission.service.js +3 -4
- package/dist/services/orm/permission.service.js.map +1 -1
- package/dist/services/orm/print-completion.service.js +2 -4
- package/dist/services/orm/print-completion.service.js.map +1 -1
- package/dist/services/orm/printer-group.service.js +2 -7
- package/dist/services/orm/printer-group.service.js.map +1 -1
- package/dist/services/orm/printer.service.js +21 -36
- package/dist/services/orm/printer.service.js.map +1 -1
- package/dist/services/orm/refresh-token.service.js +5 -11
- package/dist/services/orm/refresh-token.service.js.map +1 -1
- package/dist/services/orm/role.service.js +11 -10
- package/dist/services/orm/role.service.js.map +1 -1
- package/dist/services/orm/settings.service.js +37 -133
- package/dist/services/orm/settings.service.js.map +1 -1
- package/dist/services/orm/user.service.js +13 -15
- package/dist/services/orm/user.service.js.map +1 -1
- package/dist/services/printer-api.factory.js +9 -6
- package/dist/services/printer-api.factory.js.map +1 -1
- package/dist/services/printer-api.interface.js +13 -6
- package/dist/services/printer-api.interface.js.map +1 -1
- package/dist/services/prusa-link/constants/prusalink-event.dto.js +18 -0
- package/dist/services/prusa-link/constants/prusalink-event.dto.js.map +1 -0
- package/dist/services/prusa-link/constants/prusalink.constants.js +13 -0
- package/dist/services/prusa-link/constants/prusalink.constants.js.map +1 -0
- package/dist/services/prusa-link/dto/file-response.dto.js +6 -0
- package/dist/services/prusa-link/dto/file-response.dto.js.map +1 -0
- package/dist/services/{octoprint/dto/plugin.dto.js → prusa-link/dto/file.dto.js} +1 -1
- package/dist/services/prusa-link/dto/file.dto.js.map +1 -0
- package/dist/services/prusa-link/dto/job-state.dto.js +6 -0
- package/dist/services/prusa-link/dto/job-state.dto.js.map +1 -0
- package/dist/services/prusa-link/dto/printer-state.dto.js +6 -0
- package/dist/services/prusa-link/dto/printer-state.dto.js.map +1 -0
- package/dist/services/prusa-link/dto/status.dto.js +6 -0
- package/dist/services/prusa-link/dto/status.dto.js.map +1 -0
- package/dist/services/prusa-link/dto/version.dto.js +6 -0
- package/dist/services/prusa-link/dto/version.dto.js.map +1 -0
- package/dist/services/prusa-link/prusa-link-http-polling.adapter.js +142 -0
- package/dist/services/prusa-link/prusa-link-http-polling.adapter.js.map +1 -0
- package/dist/services/prusa-link/prusa-link.api.js +235 -0
- package/dist/services/prusa-link/prusa-link.api.js.map +1 -0
- package/dist/services/prusa-link/utils/digest-auth.params.js +6 -0
- package/dist/services/prusa-link/utils/digest-auth.params.js.map +1 -0
- package/dist/services/prusa-link/utils/digest-auth.util.js +28 -0
- package/dist/services/prusa-link/utils/digest-auth.util.js.map +1 -0
- package/dist/services/prusa-link/utils/prusa-link-http-client.builder.js +131 -0
- package/dist/services/prusa-link/utils/prusa-link-http-client.builder.js.map +1 -0
- package/dist/services/socket.factory.js +9 -6
- package/dist/services/socket.factory.js.map +1 -1
- package/dist/services/{core/task-manager.service.js → task-manager.service.js} +72 -78
- package/dist/services/task-manager.service.js.map +1 -0
- package/dist/services/validators/camera-service.validation.js +19 -0
- package/dist/services/validators/camera-service.validation.js.map +1 -0
- package/dist/services/validators/floor-service.validation.js +47 -36
- package/dist/services/validators/floor-service.validation.js.map +1 -1
- package/dist/services/validators/print-completion-service.validation.js +22 -9
- package/dist/services/validators/print-completion-service.validation.js.map +1 -1
- package/dist/services/validators/printer-service.validation.js +112 -29
- package/dist/services/validators/printer-service.validation.js.map +1 -1
- package/dist/services/validators/settings-service.validation.js +79 -66
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/services/validators/user-service.validation.js +17 -16
- package/dist/services/validators/user-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +94 -51
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/shared/default-http-client.builder.js.map +1 -1
- package/dist/shared/load-controllers.js +20 -0
- package/dist/shared/load-controllers.js.map +1 -0
- package/dist/shared/runtime-settings.migration.js +53 -0
- package/dist/shared/runtime-settings.migration.js.map +1 -0
- package/dist/shared/websocket-rpc-extended.adapter.js +15 -14
- package/dist/shared/websocket-rpc-extended.adapter.js.map +1 -1
- package/dist/shared/websocket.adapter.js +4 -5
- package/dist/shared/websocket.adapter.js.map +1 -1
- package/dist/state/file-upload-tracker.cache.js +5 -4
- package/dist/state/file-upload-tracker.cache.js.map +1 -1
- package/dist/state/file.cache.js +1 -1
- package/dist/state/file.cache.js.map +1 -1
- package/dist/state/floor.store.js +6 -6
- package/dist/state/floor.store.js.map +1 -1
- package/dist/state/printer-events.cache.js +21 -22
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/printer-files.store.js +6 -8
- package/dist/state/printer-files.store.js.map +1 -1
- package/dist/state/printer-socket.store.js +27 -50
- package/dist/state/printer-socket.store.js.map +1 -1
- package/dist/state/printer-thumbnail.cache.js +5 -9
- package/dist/state/printer-thumbnail.cache.js.map +1 -1
- package/dist/state/printer.cache.js +14 -12
- package/dist/state/printer.cache.js.map +1 -1
- package/dist/state/settings.store.js +74 -50
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/socket-io.gateway.js +39 -36
- package/dist/state/socket-io.gateway.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +20 -15
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/dist/state/validation/create-test-printer.validation.js +13 -11
- package/dist/state/validation/create-test-printer.validation.js.map +1 -1
- package/dist/task.presets.js.map +1 -1
- package/dist/tasks/boot.task.js +14 -19
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/client-bundle.task.js +1 -3
- package/dist/tasks/client-bundle.task.js.map +1 -1
- package/dist/tasks/print-completion.socketio.task.js +27 -28
- package/dist/tasks/print-completion.socketio.task.js.map +1 -1
- package/dist/tasks/printer-file-clean.task.js +6 -10
- package/dist/tasks/printer-file-clean.task.js.map +1 -1
- package/dist/tasks/printer-websocket-restore.task.js +3 -14
- package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
- package/dist/tasks/printer-websocket.task.js +2 -14
- package/dist/tasks/printer-websocket.task.js.map +1 -1
- package/dist/tasks/socketio.task.js +6 -33
- package/dist/tasks/socketio.task.js.map +1 -1
- package/dist/tasks/software-update.task.js +1 -1
- package/dist/tasks/software-update.task.js.map +1 -1
- package/dist/tasks.js +3 -3
- package/dist/tasks.js.map +1 -1
- package/dist/utils/array.util.js.map +1 -1
- package/dist/utils/cache/key-diff.cache.js.map +1 -1
- package/dist/utils/env.utils.js +0 -2
- package/dist/utils/env.utils.js.map +1 -1
- package/dist/utils/normalize-url.js +3 -2
- package/dist/utils/normalize-url.js.map +1 -1
- package/dist/utils/printer-type.utils.js.map +1 -1
- package/dist/utils/time.utils.js +7 -17
- package/dist/utils/time.utils.js.map +1 -1
- package/dist/utils/url.utils.js +3 -4
- package/dist/utils/url.utils.js.map +1 -1
- package/package.json +46 -48
- package/tsconfig.json +2 -1
- package/.yarn/releases/yarn-4.7.0.cjs +0 -935
- package/dist/consoles/check-ports.js +0 -170
- package/dist/consoles/check-ports.js.map +0 -1
- package/dist/consoles/http-file-receiver.console.js +0 -81
- package/dist/consoles/http-file-receiver.console.js.map +0 -1
- package/dist/consoles/sqlite-torm.js +0 -31
- package/dist/consoles/sqlite-torm.js.map +0 -1
- package/dist/consoles/upload-test.js +0 -52
- package/dist/consoles/upload-test.js.map +0 -1
- package/dist/controllers/plugin-firmware-update.controller.js +0 -234
- package/dist/controllers/plugin-firmware-update.controller.js.map +0 -1
- package/dist/entities/base.entity.js +0 -29
- package/dist/entities/base.entity.js.map +0 -1
- package/dist/entities/printer-file.entity.js +0 -140
- package/dist/entities/printer-file.entity.js.map +0 -1
- package/dist/handlers/cache-manager.js +0 -18
- package/dist/handlers/cache-manager.js.map +0 -1
- package/dist/models/PrinterFile.js +0 -44
- package/dist/models/PrinterFile.js.map +0 -1
- package/dist/services/core/task-manager.service.js.map +0 -1
- package/dist/services/octoprint/dto/plugin.dto.js.map +0 -1
- package/dist/services/octoprint/plugin-base.service.js +0 -101
- package/dist/services/octoprint/plugin-base.service.js.map +0 -1
- package/dist/services/octoprint/plugin-firmware-update.service.js +0 -100
- package/dist/services/octoprint/plugin-firmware-update.service.js.map +0 -1
- package/dist/services/octoprint/plugin-repository.cache.js +0 -46
- package/dist/services/octoprint/plugin-repository.cache.js.map +0 -1
- package/dist/utils/benchmark.util.js +0 -39
- package/dist/utils/benchmark.util.js.map +0 -1
- package/dist/utils/is-docker.js +0 -40
- package/dist/utils/is-docker.js.map +0 -1
- package/dist/utils/metric.utils.js +0 -35
- package/dist/utils/metric.utils.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/moonraker.api.ts"],"names":["MoonrakerApi","
|
|
1
|
+
{"version":3,"sources":["../../src/services/moonraker.api.ts"],"names":["MoonrakerApi","client","constructor","moonrakerClient","printerLogin","type","MoonrakerType","login","getVersion","result","getApiVersion","data","server","connect","NotImplementedException","disconnect","restartServer","postRestartServer","restartHost","postHostRestart","restartPrinterFirmware","postFirmwareRestart","startPrint","filename","postPrintStart","pausePrint","postPrintPause","resumePrint","postPrintResume","cancelPrint","postPrintCancel","sendGcode","script","postGcodeScript","quickStop","postQuickStop","movePrintHead","amounts","setSpeed","speed","g1CommandAxes","Number","isNaN","x","y","z","getFile","path","metadata","getServerFileMetadata","file","size","date","modified","getFiles","files","getServerFilesList","map","f","homeAxes","axes","homeCommand","downloadFile","getServerFilesDownload","getFileChunk","startBytes","endBytes","getServerFilesDownloadChunk","uploadFile","fileOrBuffer","uploadToken","postServerFileUpload","deleteFile","deleteServerFile","deleteFolder","deleteServerFilesDirectory","getSettings","getServerConfig","getReprintState","response","getPrinterObjectsQuery","print_stats","webhooks","operational","status","state","response2","getServerHistoryList","jobs","sort","a","b","start_time","length","connectionState","reprintState","ReprintState","NoLastPrint","job","LastPrintReady"],"mappings":"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"}
|
|
@@ -12,6 +12,9 @@ _export(exports, {
|
|
|
12
12
|
apiKeyHeaderKey: function() {
|
|
13
13
|
return apiKeyHeaderKey;
|
|
14
14
|
},
|
|
15
|
+
authorizationHeaderKey: function() {
|
|
16
|
+
return authorizationHeaderKey;
|
|
17
|
+
},
|
|
15
18
|
contentTypeHeaderKey: function() {
|
|
16
19
|
return contentTypeHeaderKey;
|
|
17
20
|
},
|
|
@@ -21,47 +24,15 @@ _export(exports, {
|
|
|
21
24
|
multiPartContentType: function() {
|
|
22
25
|
return multiPartContentType;
|
|
23
26
|
},
|
|
24
|
-
|
|
25
|
-
return
|
|
26
|
-
},
|
|
27
|
-
pluginRepositoryUrl: function() {
|
|
28
|
-
return pluginRepositoryUrl;
|
|
27
|
+
wwwAuthenticationHeaderKey: function() {
|
|
28
|
+
return wwwAuthenticationHeaderKey;
|
|
29
29
|
}
|
|
30
30
|
});
|
|
31
|
-
const pluginManagerCommands = {
|
|
32
|
-
install: {
|
|
33
|
-
name: "install",
|
|
34
|
-
param: "url"
|
|
35
|
-
},
|
|
36
|
-
uninstall: {
|
|
37
|
-
name: "install",
|
|
38
|
-
param: "plugin"
|
|
39
|
-
},
|
|
40
|
-
enable: {
|
|
41
|
-
name: "enable",
|
|
42
|
-
param: "plugin"
|
|
43
|
-
},
|
|
44
|
-
disable: {
|
|
45
|
-
name: "disable",
|
|
46
|
-
param: "plugin"
|
|
47
|
-
},
|
|
48
|
-
cleanup: {
|
|
49
|
-
name: "cleanup",
|
|
50
|
-
param: "plugin"
|
|
51
|
-
},
|
|
52
|
-
cleanup_all: {
|
|
53
|
-
name: "cleanup_all",
|
|
54
|
-
param: undefined
|
|
55
|
-
},
|
|
56
|
-
refresh_repository: {
|
|
57
|
-
name: "refresh_repository",
|
|
58
|
-
param: undefined
|
|
59
|
-
}
|
|
60
|
-
};
|
|
61
|
-
const pluginRepositoryUrl = "https://plugins.octoprint.org/plugins.json";
|
|
62
31
|
const contentTypeHeaderKey = "content-type";
|
|
32
|
+
const authorizationHeaderKey = "Authorization";
|
|
63
33
|
const apiKeyHeaderKey = "x-api-key";
|
|
64
34
|
const jsonContentType = "application/json";
|
|
35
|
+
const wwwAuthenticationHeaderKey = "www-authenticate";
|
|
65
36
|
const multiPartContentType = "multipart/form-data";
|
|
66
37
|
|
|
67
38
|
//# sourceMappingURL=octoprint-service.constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/services/octoprint/constants/octoprint-service.constants.ts"],"names":["apiKeyHeaderKey","contentTypeHeaderKey","jsonContentType","multiPartContentType","
|
|
1
|
+
{"version":3,"sources":["../../../../src/services/octoprint/constants/octoprint-service.constants.ts"],"names":["apiKeyHeaderKey","authorizationHeaderKey","contentTypeHeaderKey","jsonContentType","multiPartContentType","wwwAuthenticationHeaderKey"],"mappings":";;;;;;;;;;;IAEaA,eAAe;eAAfA;;IADAC,sBAAsB;eAAtBA;;IADAC,oBAAoB;eAApBA;;IAGAC,eAAe;eAAfA;;IAEAC,oBAAoB;eAApBA;;IADAC,0BAA0B;eAA1BA;;;AAJN,MAAMH,uBAAuB;AAC7B,MAAMD,yBAAyB;AAC/B,MAAMD,kBAAkB;AACxB,MAAMG,kBAAkB;AACxB,MAAME,6BAA6B;AACnC,MAAMD,uBAAuB"}
|
|
@@ -2,10 +2,18 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
function _export(target, all) {
|
|
6
|
+
for(var name in all)Object.defineProperty(target, name, {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
get: all[name]
|
|
9
|
+
});
|
|
10
|
+
}
|
|
11
|
+
_export(exports, {
|
|
12
|
+
EVENT_TYPES: function() {
|
|
8
13
|
return EVENT_TYPES;
|
|
14
|
+
},
|
|
15
|
+
EVENT_TYPES_ARRAY: function() {
|
|
16
|
+
return EVENT_TYPES_ARRAY;
|
|
9
17
|
}
|
|
10
18
|
});
|
|
11
19
|
const EVENT_TYPES = {
|
|
@@ -48,5 +56,6 @@ const EVENT_TYPES = {
|
|
|
48
56
|
Waiting: "Waiting",
|
|
49
57
|
ZChange: "ZChange"
|
|
50
58
|
};
|
|
59
|
+
const EVENT_TYPES_ARRAY = Object.values(EVENT_TYPES);
|
|
51
60
|
|
|
52
61
|
//# sourceMappingURL=octoprint-websocket.constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/services/octoprint/constants/octoprint-websocket.constants.ts"],"names":["EVENT_TYPES","ClientAuthed","ClientClosed","ClientOpened","Connected","Disconnecting","Disconnected","Dwelling","Eject","Error","EStop","FileAdded","FileDeselected","FileRemoved","FirmwareData","FolderAdded","FolderRemoved","Home","MetadataAnalysisFinished","MetadataAnalysisStarted","MetadataStatisticsUpdated","PositionUpdate","PowerOff","PowerOn","PrintCancelled","PrintCancelling","PrintDone","PrintFailed","PrintPaused","PrintResumed","PrintStarted","PrinterStateChanged","TransferDone","TransferStarted","UpdatedFiles","Upload","UserLoggedIn","Waiting","ZChange"],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../../../src/services/octoprint/constants/octoprint-websocket.constants.ts"],"names":["EVENT_TYPES","EVENT_TYPES_ARRAY","ClientAuthed","ClientClosed","ClientOpened","Connected","Disconnecting","Disconnected","Dwelling","Eject","Error","EStop","FileAdded","FileDeselected","FileRemoved","FirmwareData","FolderAdded","FolderRemoved","Home","MetadataAnalysisFinished","MetadataAnalysisStarted","MetadataStatisticsUpdated","PositionUpdate","PowerOff","PowerOn","PrintCancelled","PrintCancelling","PrintDone","PrintFailed","PrintPaused","PrintResumed","PrintStarted","PrinterStateChanged","TransferDone","TransferStarted","UpdatedFiles","Upload","UserLoggedIn","Waiting","ZChange","Object","values"],"mappings":";;;;;;;;;;;IAAaA,WAAW;eAAXA;;IAyCAC,iBAAiB;eAAjBA;;;AAzCN,MAAMD,cAAc;IACzBE,cAAc;IACdC,cAAc;IACdC,cAAc;IACdC,WAAW;IACXC,eAAe;IACfC,cAAc;IACdC,UAAU;IACVC,OAAO;IACPC,OAAO;IACPC,OAAO;IACPC,WAAW;IACXC,gBAAgB;IAChBC,aAAa;IACbC,cAAc;IACdC,aAAa;IACbC,eAAe;IACfC,MAAM;IACNC,0BAA0B;IAC1BC,yBAAyB;IACzBC,2BAA2B;IAC3BC,gBAAgB;IAChBC,UAAU;IACVC,SAAS;IACTC,gBAAgB;IAChBC,iBAAiB;IACjBC,WAAW;IACXC,aAAa;IACbC,aAAa;IACbC,cAAc;IACdC,cAAc;IACdC,qBAAqB;IACrBC,cAAc;IACdC,iBAAiB;IACjBC,cAAc;IACdC,QAAQ;IACRC,cAAc;IACdC,SAAS;IACTC,SAAS;AACX;AAEO,MAAMtC,oBAAoBuC,OAAOC,MAAM,CAACzC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/services/octoprint/dto/octoprint-event.dto.ts"],"names":["OctoPrintEventDto","messages","octoprintWsMessages","connected","reauthRequired","current","history","notify_status_update","WS_OPENED","WS_CLOSED","WS_ERROR","API_STATE_UPDATED","WS_STATE_UPDATED","
|
|
1
|
+
{"version":3,"sources":["../../../../src/services/octoprint/dto/octoprint-event.dto.ts"],"names":["OctoPrintEventDto","messages","octoprintWsMessages","connected","reauthRequired","current","history","event","notify_status_update","WS_OPENED","WS_CLOSED","WS_ERROR","API_STATE_UPDATED","WS_STATE_UPDATED","payload","printerId","printerType"],"mappings":";;;;;;;;;;;IAgCaA,iBAAiB;eAAjBA;;IAhBAC,QAAQ;eAARA;;IAdAC,mBAAmB;eAAnBA;;;AAAN,MAAMA,sBAAsB;IACjCC,WAAW;IACXC,gBAAgB;IAChBC,SAAS;IACTC,SAAS;IAETC,OAAO;AAIT;AAIO,MAAMN,WAAW;IACtB,GAAGC,mBAAmB;IAGtBM,sBAAsB;IAGtBC,WAAW;IACXC,WAAW;IACXC,UAAU;IACVC,mBAAmB;IACnBC,kBAAkB;AACpB;AAIO,MAAMb;IACXO,MAAS;IACTO,QAAW;IACXC,UAAa;IACbC,YAAe;AACjB"}
|
|
@@ -29,28 +29,7 @@ class OctoprintRoutes {
|
|
|
29
29
|
apiSystemCommands = `${this.apiSystem}/commands`;
|
|
30
30
|
apiServerRestartCommand = `${this.apiSystemCommands}/core/restart`;
|
|
31
31
|
apiUsers = `${this.apiBase}/users`;
|
|
32
|
-
apiLogin = `${this.apiBase}/login
|
|
33
|
-
apiPluginPiSupport = `${this.apiBase}/plugin/pi_support`;
|
|
34
|
-
apiProfiles = `${this.apiBase}/plugin/printerprofiles`;
|
|
35
|
-
apiTimelapse = `${this.apiBase}/timelapse`;
|
|
36
|
-
apiPlugin = `${this.apiBase}/plugin`;
|
|
37
|
-
apiPluginManager = `${this.apiPlugin}/pluginmanager`;
|
|
38
|
-
pluginsBase = `${this.octoPrintBase}plugin`;
|
|
39
|
-
pluginSoftwareUpdate = `${this.pluginsBase}/softwareupdate`;
|
|
40
|
-
pluginSoftwareUpdateCheck = `${this.pluginSoftwareUpdate}/check`;
|
|
41
|
-
pluginSoftwareUpdateUpdate = `${this.pluginSoftwareUpdate}/update`;
|
|
42
|
-
pluginFirmwareUpdater = `${this.pluginsBase}/firmwareupdater`;
|
|
43
|
-
pluginFirmwareUpdaterStatus = `${this.pluginsBase}/firmwareupdater/status`;
|
|
44
|
-
pluginFirmwareUpdaterFlash = `${this.pluginsBase}/firmwareupdater/flash`;
|
|
45
|
-
pluginBackupIndex = `${this.pluginsBase}/backup`;
|
|
46
|
-
pluginBackupEndpoint = `${this.pluginsBase}/backup/backup`;
|
|
47
|
-
pluginBackupFile = (filename)=>`${this.pluginsBase}/backup/backup/${filename}`;
|
|
48
|
-
pluginBackupFileDownload = (filename)=>`${this.pluginsBase}/backup/download/${filename}`;
|
|
49
|
-
pluginBackupFileRestore = `${this.pluginsBase}/backup/restore`;
|
|
50
|
-
pluginManager = `${this.pluginsBase}/pluginmanager`;
|
|
51
|
-
pluginManagerPlugins = `${this.pluginManager}/plugins`;
|
|
52
|
-
pluginManagerExport = `${this.pluginManager}/export`;
|
|
53
|
-
pluginManagerOrphans = `${this.pluginManager}/orphans`;
|
|
32
|
+
apiLogin = `${this.apiBase}/login`;
|
|
54
33
|
get disconnectCommand() {
|
|
55
34
|
return {
|
|
56
35
|
command: "disconnect"
|
|
@@ -84,8 +63,6 @@ class OctoprintRoutes {
|
|
|
84
63
|
target: targetTemperature
|
|
85
64
|
};
|
|
86
65
|
}
|
|
87
|
-
pluginManagerPlugin = (pluginName)=>`${this.pluginManager}/${pluginName}`;
|
|
88
|
-
pluginManagerRepository = (refresh = false)=>`${this.pluginManager}/repository?refresh=${refresh}`;
|
|
89
66
|
apiPrinterCurrent = (history, limit, exclude)=>{
|
|
90
67
|
exclude = exclude?.filter((e)=>!!e.length);
|
|
91
68
|
const excludeParam = exclude?.length ? `&exclude=${exclude?.join(",")}` : "";
|
|
@@ -95,7 +72,6 @@ class OctoprintRoutes {
|
|
|
95
72
|
apiFile = (path)=>`${this.apiFilesLocal}/${path}`;
|
|
96
73
|
downloadFileLocal = (path)=>`${this.octoPrintBase}downloads/files/local/${path}`;
|
|
97
74
|
apiGetFiles = (recursive = false)=>`${this.apiFiles}/local?recursive=${recursive}`;
|
|
98
|
-
apiSoftwareUpdateCheck = (force)=>`${this.octoPrintBase}plugin/softwareupdate/check${force ? "?force=true" : ""}`;
|
|
99
75
|
selectCommand(print = false) {
|
|
100
76
|
return {
|
|
101
77
|
command: "select",
|
|
@@ -122,19 +98,6 @@ class OctoprintRoutes {
|
|
|
122
98
|
}
|
|
123
99
|
};
|
|
124
100
|
}
|
|
125
|
-
pluginFirmwareUpdaterSettings(subsettings) {
|
|
126
|
-
return {
|
|
127
|
-
plugins: {
|
|
128
|
-
firmwareupdater: subsettings
|
|
129
|
-
}
|
|
130
|
-
};
|
|
131
|
-
}
|
|
132
|
-
pluginManagerCommand(command, url) {
|
|
133
|
-
return {
|
|
134
|
-
command,
|
|
135
|
-
url
|
|
136
|
-
};
|
|
137
|
-
}
|
|
138
101
|
}
|
|
139
102
|
|
|
140
103
|
//# sourceMappingURL=octoprint-api.routes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/octoprint/octoprint-api.routes.ts"],"names":["OctoprintRoutes","octoPrintBase","apiBase","apiVersion","apiServer","apiCurrentUser","apiSettingsPart","apiFiles","apiFilesLocal","apiConnection","apiJob","apiPrinter","apiPrinterHead","apiPrinterBed","apiPrinterCustomCommand","apiPrinterProfiles","apiSystem","apiSystemInfo","apiSystemCommands","apiServerRestartCommand","apiUsers","apiLogin","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/octoprint-api.routes.ts"],"names":["OctoprintRoutes","octoPrintBase","apiBase","apiVersion","apiServer","apiCurrentUser","apiSettingsPart","apiFiles","apiFilesLocal","apiConnection","apiJob","apiPrinter","apiPrinterHead","apiPrinterBed","apiPrinterCustomCommand","apiPrinterProfiles","apiSystem","apiSystemInfo","apiSystemCommands","apiServerRestartCommand","apiUsers","apiLogin","disconnectCommand","command","cancelJobCommand","pauseJobCommand","action","resumeJobCommand","connectCommand","getBedTargetCommand","targetTemperature","target","apiPrinterCurrent","history","limit","exclude","filter","e","length","excludeParam","join","limitParam","apiFile","path","downloadFileLocal","apiGetFiles","recursive","selectCommand","print","moveFileCommand","destination","printerNameSetting","name","appearance","gcodeAnalysisSetting","enabled","gcodeAnalysis","runAt"],"mappings":"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"}
|
|
@@ -20,6 +20,9 @@ _export(exports, {
|
|
|
20
20
|
},
|
|
21
21
|
octoPrintEvent: function() {
|
|
22
22
|
return octoPrintEvent;
|
|
23
|
+
},
|
|
24
|
+
octoPrintWebsocketEvent: function() {
|
|
25
|
+
return octoPrintWebsocketEvent;
|
|
23
26
|
}
|
|
24
27
|
});
|
|
25
28
|
const _httpstatuscodesconstants = require("../../constants/http-status-codes.constants");
|
|
@@ -28,7 +31,6 @@ const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
|
|
|
28
31
|
const _urlutils = require("../../utils/url.utils");
|
|
29
32
|
const _normalizeurl = require("../../utils/normalize-url");
|
|
30
33
|
const _websocketadapter = require("../../shared/websocket.adapter");
|
|
31
|
-
const _nodefs = require("node:fs");
|
|
32
34
|
const _socketstatetype = require("../../shared/dtos/socket-state.type");
|
|
33
35
|
const _apistatetype = require("../../shared/dtos/api-state.type");
|
|
34
36
|
const _printerapiinterface = require("../printer-api.interface");
|
|
@@ -49,35 +51,31 @@ const OctoPrintMessage = {
|
|
|
49
51
|
timelapse: "timelapse",
|
|
50
52
|
slicingProgress: "slicingProgress"
|
|
51
53
|
};
|
|
54
|
+
const octoPrintWebsocketEvent = (printerId)=>`octoprint.${printerId}`;
|
|
52
55
|
const octoPrintEvent = (event)=>`octoprint.${event}`;
|
|
53
56
|
class OctoprintWebsocketAdapter extends _websocketadapter.WebsocketAdapter {
|
|
54
|
-
printerType = 0;
|
|
55
57
|
octoprintClient;
|
|
58
|
+
eventEmitter2;
|
|
59
|
+
configService;
|
|
60
|
+
printerType;
|
|
56
61
|
printerId;
|
|
57
|
-
stateUpdated
|
|
58
|
-
stateUpdateTimestamp
|
|
59
|
-
socketState
|
|
60
|
-
apiStateUpdated
|
|
61
|
-
apiStateUpdateTimestamp
|
|
62
|
-
apiState
|
|
63
|
-
lastMessageReceivedTimestamp
|
|
64
|
-
reauthRequired
|
|
65
|
-
reauthRequiredTimestamp
|
|
62
|
+
stateUpdated;
|
|
63
|
+
stateUpdateTimestamp;
|
|
64
|
+
socketState;
|
|
65
|
+
apiStateUpdated;
|
|
66
|
+
apiStateUpdateTimestamp;
|
|
67
|
+
apiState;
|
|
68
|
+
lastMessageReceivedTimestamp;
|
|
69
|
+
reauthRequired;
|
|
70
|
+
reauthRequiredTimestamp;
|
|
66
71
|
login;
|
|
67
|
-
eventEmitter;
|
|
68
|
-
configService;
|
|
69
72
|
socketURL;
|
|
70
73
|
sessionDto;
|
|
71
74
|
username;
|
|
72
75
|
refreshPrinterCurrentInterval;
|
|
73
|
-
constructor(
|
|
74
|
-
super(
|
|
75
|
-
loggerFactory
|
|
76
|
-
});
|
|
76
|
+
constructor(loggerFactory, octoprintClient, eventEmitter2, configService){
|
|
77
|
+
super(loggerFactory), this.octoprintClient = octoprintClient, this.eventEmitter2 = eventEmitter2, this.configService = configService, this.printerType = 0, this.stateUpdated = false, this.stateUpdateTimestamp = null, this.socketState = _socketstatetype.SOCKET_STATE.unopened, this.apiStateUpdated = false, this.apiStateUpdateTimestamp = null, this.apiState = _apistatetype.API_STATE.unset, this.lastMessageReceivedTimestamp = null, this.reauthRequired = false, this.reauthRequiredTimestamp = null;
|
|
77
78
|
this.logger = loggerFactory(OctoprintWebsocketAdapter.name);
|
|
78
|
-
this.octoprintClient = octoprintClient;
|
|
79
|
-
this.eventEmitter = eventEmitter2;
|
|
80
|
-
this.configService = configService;
|
|
81
79
|
}
|
|
82
80
|
get _debugMode() {
|
|
83
81
|
return this.configService.get(_serverconstants.AppConstants.debugSocketStatesKey, _serverconstants.AppConstants.defaultDebugSocketStates) === "true";
|
|
@@ -162,14 +160,9 @@ class OctoprintWebsocketAdapter extends _websocketadapter.WebsocketAdapter {
|
|
|
162
160
|
});
|
|
163
161
|
this.username = await this.octoprintClient.getAdminUserOrDefault(this.login).catch((e)=>{
|
|
164
162
|
const status = e.response?.status;
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
} else {
|
|
169
|
-
this.setApiState("authFail");
|
|
170
|
-
this.setSocketState("aborted");
|
|
171
|
-
}
|
|
172
|
-
if ([
|
|
163
|
+
this.setApiState("authFail");
|
|
164
|
+
this.setSocketState("aborted");
|
|
165
|
+
if (status && [
|
|
173
166
|
_httpstatuscodesconstants.HttpStatusCode.BAD_GATEWAY,
|
|
174
167
|
_httpstatuscodesconstants.HttpStatusCode.NOT_IMPLEMENTED,
|
|
175
168
|
_httpstatuscodesconstants.HttpStatusCode.SERVICE_UNAVAILABLE,
|
|
@@ -188,46 +181,6 @@ class OctoprintWebsocketAdapter extends _websocketadapter.WebsocketAdapter {
|
|
|
188
181
|
await this.updateCurrentStateSafely();
|
|
189
182
|
}, 10000);
|
|
190
183
|
}
|
|
191
|
-
async updateCurrentStateSafely() {
|
|
192
|
-
try {
|
|
193
|
-
const current = await this.octoprintClient.getPrinterCurrent(this.login, true);
|
|
194
|
-
const isOperational = current.data?.state?.flags?.operational;
|
|
195
|
-
let job = {};
|
|
196
|
-
if (isOperational) {
|
|
197
|
-
const jobResponse = await this.octoprintClient.getJob(this.login);
|
|
198
|
-
job = jobResponse.data;
|
|
199
|
-
}
|
|
200
|
-
this.setApiState(_apistatetype.API_STATE.responding);
|
|
201
|
-
return await this.emitEvent("current", {
|
|
202
|
-
...current.data,
|
|
203
|
-
progress: job?.progress,
|
|
204
|
-
job: job?.job
|
|
205
|
-
});
|
|
206
|
-
} catch (e) {
|
|
207
|
-
if (e.isAxiosError) {
|
|
208
|
-
const castError = e;
|
|
209
|
-
if (castError?.response?.status == 409) {
|
|
210
|
-
this.logger.error(`Printer current interval loop error`);
|
|
211
|
-
await this.emitEvent("current", {
|
|
212
|
-
state: {
|
|
213
|
-
flags: {
|
|
214
|
-
operational: false,
|
|
215
|
-
error: false
|
|
216
|
-
},
|
|
217
|
-
text: "USB disconnected",
|
|
218
|
-
error: castError?.response.data.error
|
|
219
|
-
}
|
|
220
|
-
});
|
|
221
|
-
return;
|
|
222
|
-
}
|
|
223
|
-
this.logger.error(`Could not update Octoprint current due to a request error`);
|
|
224
|
-
this.setApiState(_apistatetype.API_STATE.noResponse);
|
|
225
|
-
return;
|
|
226
|
-
}
|
|
227
|
-
this.logger.error(`Could not update Octoprint current due to an unknown error`);
|
|
228
|
-
this.setApiState(_apistatetype.API_STATE.noResponse);
|
|
229
|
-
}
|
|
230
|
-
}
|
|
231
184
|
setReauthRequired() {
|
|
232
185
|
this.reauthRequired = true;
|
|
233
186
|
this.reauthRequiredTimestamp = Date.now();
|
|
@@ -244,7 +197,7 @@ class OctoprintWebsocketAdapter extends _websocketadapter.WebsocketAdapter {
|
|
|
244
197
|
if (!this.eventEmittingAllowed) {
|
|
245
198
|
return;
|
|
246
199
|
}
|
|
247
|
-
this.
|
|
200
|
+
this.eventEmitter2.emit(octoPrintEvent(event), {
|
|
248
201
|
event,
|
|
249
202
|
payload,
|
|
250
203
|
printerId: this.printerId,
|
|
@@ -270,8 +223,6 @@ class OctoprintWebsocketAdapter extends _websocketadapter.WebsocketAdapter {
|
|
|
270
223
|
if (eventName === OctoPrintMessage.reauthRequired) {
|
|
271
224
|
this.logger.log("Received 'reauthRequired', acting on it");
|
|
272
225
|
this.setReauthRequired();
|
|
273
|
-
} else if (eventName === OctoPrintMessage.current && this.configService.get(_serverconstants.AppConstants.debugFileWritePrinterStatesKey, _serverconstants.AppConstants.defaultDebugFileWritePrinterStates) === "true") {
|
|
274
|
-
(0, _nodefs.writeFileSync)(`websocket_current_${this.printerId}.txt`, JSON.stringify(payload, null, 2));
|
|
275
226
|
}
|
|
276
227
|
await this.emitEvent(eventName, payload);
|
|
277
228
|
}
|
|
@@ -284,11 +235,51 @@ class OctoprintWebsocketAdapter extends _websocketadapter.WebsocketAdapter {
|
|
|
284
235
|
this.setSocketState("error");
|
|
285
236
|
await this.emitEvent(WsMessage.WS_ERROR, error?.length ? error : "connection error");
|
|
286
237
|
}
|
|
238
|
+
async updateCurrentStateSafely() {
|
|
239
|
+
try {
|
|
240
|
+
const current = await this.octoprintClient.getPrinterCurrent(this.login, true);
|
|
241
|
+
const isOperational = current.data?.state?.flags?.operational;
|
|
242
|
+
let job = {};
|
|
243
|
+
if (isOperational) {
|
|
244
|
+
const jobResponse = await this.octoprintClient.getJob(this.login);
|
|
245
|
+
job = jobResponse.data;
|
|
246
|
+
}
|
|
247
|
+
this.setApiState(_apistatetype.API_STATE.responding);
|
|
248
|
+
return await this.emitEvent("current", {
|
|
249
|
+
...current.data,
|
|
250
|
+
progress: job?.progress,
|
|
251
|
+
job: job?.job
|
|
252
|
+
});
|
|
253
|
+
} catch (e) {
|
|
254
|
+
if (e.isAxiosError) {
|
|
255
|
+
const castError = e;
|
|
256
|
+
if (castError?.response?.status == 409) {
|
|
257
|
+
this.logger.error(`Printer current interval loop error`);
|
|
258
|
+
await this.emitEvent("current", {
|
|
259
|
+
state: {
|
|
260
|
+
flags: {
|
|
261
|
+
operational: false,
|
|
262
|
+
error: false
|
|
263
|
+
},
|
|
264
|
+
text: "USB disconnected",
|
|
265
|
+
error: castError?.response.data.error
|
|
266
|
+
}
|
|
267
|
+
});
|
|
268
|
+
return;
|
|
269
|
+
}
|
|
270
|
+
this.logger.error(`Could not update Octoprint current due to a request error`);
|
|
271
|
+
this.setApiState(_apistatetype.API_STATE.noResponse);
|
|
272
|
+
return;
|
|
273
|
+
}
|
|
274
|
+
this.logger.error(`Could not update Octoprint current due to an unknown error`);
|
|
275
|
+
this.setApiState(_apistatetype.API_STATE.noResponse);
|
|
276
|
+
}
|
|
277
|
+
}
|
|
287
278
|
async emitEvent(event, payload) {
|
|
288
279
|
if (!this.eventEmittingAllowed) {
|
|
289
280
|
return;
|
|
290
281
|
}
|
|
291
|
-
await this.
|
|
282
|
+
await this.eventEmitter2.emitAsync(octoPrintEvent(event), {
|
|
292
283
|
event,
|
|
293
284
|
payload,
|
|
294
285
|
printerId: this.printerId,
|
|
@@ -296,6 +287,9 @@ class OctoprintWebsocketAdapter extends _websocketadapter.WebsocketAdapter {
|
|
|
296
287
|
});
|
|
297
288
|
}
|
|
298
289
|
async sendAuth() {
|
|
290
|
+
if (!this.sessionDto?.session?.length) {
|
|
291
|
+
throw new Error("Cant send auth, session is unset.");
|
|
292
|
+
}
|
|
299
293
|
this.setSocketState(_socketstatetype.SOCKET_STATE.authenticating);
|
|
300
294
|
await this.sendMessage(JSON.stringify({
|
|
301
295
|
auth: `${this.username}:${this.sessionDto.session}`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/octoprint/octoprint-websocket.adapter.ts"],"names":["OctoPrintMessage","OctoprintWebsocketAdapter","WsMessage","octoPrintEvent","WS_OPENED","WS_CLOSED","WS_ERROR","API_STATE_UPDATED","WS_STATE_UPDATED","connected","reauthRequired","current","history","event","plugin","timelapse","slicingProgress","WebsocketAdapter","printerType","octoprintClient","printerId","stateUpdated","stateUpdateTimestamp","socketState","SOCKET_STATE","unopened","apiStateUpdated","apiStateUpdateTimestamp","apiState","API_STATE","unset","lastMessageReceivedTimestamp","reauthRequiredTimestamp","login","eventEmitter","configService","socketURL","sessionDto","username","refreshPrinterCurrentInterval","constructor","loggerFactory","eventEmitter2","logger","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","isApiOnline","responding","closed","error","needsSetup","needsReauth","isClosedOrAborted","aborted","registerCredentials","socketLogin","loginDto","httpUrlString","normalizeUrl","printerURL","httpUrl","URL","httpUrlPath","pathname","wsUrl","httpToWsUrl","open","socket","Error","close","clearInterval","sendThrottle","throttle","defaultSocketThrottleRate","sendMessage","JSON","stringify","reauthSession","log","setupSocketSession","sendAuth","resetReauthRequired","resetSocketState","then","d","r","data","setApiState","setSocketState","ExternalServiceError","needs","group","warn","catch","e","response","status","getAdminUserOrDefault","HttpStatusCode","FORBIDDEN","BAD_GATEWAY","NOT_IMPLEMENTED","SERVICE_UNAVAILABLE","GATEWAY_TIMEOUT","includes","updateCurrentStateSafely","setInterval","getPrinterCurrent","isOperational","state","flags","operational","job","jobResponse","getJob","emitEvent","progress","isAxiosError","castError","text","noResponse","setReauthRequired","Date","now","emitEventSync","payload","eventEmittingAllowed","emit","OctoprintType","afterOpened","_","onMessage","message","authenticated","parse","eventName","Object","keys","substring","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","writeFileSync","afterClosed","onError","length","emitAsync","authenticating","auth","session","globalKey"],"mappings":";;;;;;;;;;;IAoCaA,gBAAgB;eAAhBA;;IAaAC,yBAAyB;eAAzBA;;IAtBAC,SAAS;eAATA;;IAoBAC,cAAc;eAAdA;;;0CA/CkB;iCACF;mCACQ;0BACT;8BACC;kCASI;wBAEH;iCAEY;8BACN;qCAKN;AAIvB,MAAMD,YAAY;IAEvBE,WAAW;IACXC,WAAW;IACXC,UAAU;IACVC,mBAAmB;IACnBC,kBAAkB;AACpB;AAEO,MAAMR,mBAAmB;IAC9BS,WAAW;IACXC,gBAAgB;IAChBC,SAAS;IACTC,SAAS;IACTC,OAAO;IACPC,QAAQ;IACRC,WAAW;IACXC,iBAAiB;AACnB;AAEO,MAAMb,iBAAiB,CAACU,QAAkB,CAAC,UAAU,EAAEA,OAAO;AAE9D,MAAMZ,kCAAkCgB,kCAAgB;IAC7CC,cAAc,EAAE;IAChCC,gBAAiC;IAC1BC,UAAmB;IAC1BC,eAAe,MAAM;IACrBC,uBAAsC,KAAK;IAC3CC,cAA2BC,6BAAY,CAACC,QAAQ,CAAC;IACjDC,kBAAkB,MAAM;IACxBC,0BAAyC,KAAK;IAC9CC,WAAqBC,uBAAS,CAACC,KAAK,CAAC;IACrCC,+BAA8C,KAAK;IACnDrB,iBAAiB,MAAM;IACvBsB,0BAAyC,KAAK;IAC9CC,MAAiB;IAETC,aAA4B;IAC5BC,cAA6B;IAC7BC,UAAgB;IAChBC,WAAyB;IACzBC,SAAkB;IAClBC,8BAA+C;IAEvDC,YAAY,EACVC,aAAa,EACbtB,eAAe,EACfuB,aAAa,EACbP,aAAa,EAMd,CAAE;QACD,KAAK,CAAC;YAAEM;QAAc;QAEtB,IAAI,CAACE,MAAM,GAAGF,cAAcxC,0BAA0B2C,IAAI;QAC1D,IAAI,CAACzB,eAAe,GAAGA;QACvB,IAAI,CAACe,YAAY,GAAGQ;QACpB,IAAI,CAACP,aAAa,GAAGA;IACvB;IAEA,IAAIU,aAAa;QACf,OAAO,IAAI,CAACV,aAAa,CAACW,GAAG,CAACC,6BAAY,CAACC,oBAAoB,EAAED,6BAAY,CAACE,wBAAwB,MAAM;IAC9G;IAEAC,cAAc;QACZ,MAAMC,cAAc,IAAI,CAACvB,QAAQ,KAAKC,uBAAS,CAACuB,UAAU;QAC1D,OAAOD,eAAgB,CAAA,IAAI,CAAC5B,WAAW,KAAKC,6BAAY,CAAC6B,MAAM,IAAI,IAAI,CAAC9B,WAAW,KAAKC,6BAAY,CAAC8B,KAAK,AAAD;IAC3G;IAEAC,aAAa;QACX,OAAO,IAAI,CAAChC,WAAW,KAAKC,6BAAY,CAACC,QAAQ;IACnD;IAEA+B,cAAc;QACZ,OAAO,IAAI,CAAC9C,cAAc;IAC5B;IAEA+C,oBAAoB;QAClB,OAAO,IAAI,CAAClC,WAAW,KAAKC,6BAAY,CAAC6B,MAAM,IAAI,IAAI,CAAC9B,WAAW,KAAKC,6BAAY,CAACkC,OAAO;IAC9F;IAEAC,oBAAoBC,WAAyB,EAAE;QAC7C,MAAM,EAAExC,SAAS,EAAEyC,QAAQ,EAAE,GAAGD;QAChC,IAAI,CAACxC,SAAS,GAAGA;QACjB,IAAI,CAACa,KAAK,GAAG4B;QAEb,MAAMC,gBAAgBC,IAAAA,0BAAY,EAAC,IAAI,CAAC9B,KAAK,CAAC+B,UAAU;QACxD,MAAMC,UAAU,IAAIC,IAAIJ;QACxB,MAAMK,cAAcF,QAAQG,QAAQ;QAEpC,MAAMC,QAAQC,IAAAA,qBAAW,EAACR;QAC1BO,MAAMD,QAAQ,GAAG,AAACD,CAAAA,eAAe,GAAE,IAAK;QACxC,IAAI,CAAC/B,SAAS,GAAGiC;IACnB;IAEAE,OAAO;QACL,IAAI,IAAI,CAACC,MAAM,EAAE;YACf,MAAM,IAAIC,MAAM,CAAC,yDAAyD,CAAC;QAC7E;QACA,KAAK,CAACF,KAAK,IAAI,CAACnC,SAAS;IAC3B;IAEAsC,QAAQ;QACNC,cAAc,IAAI,CAACpC,6BAA6B;QAChD,KAAK,CAACmC;IACR;IAEA,MAAME,aAAaC,WAAmB9B,6BAAY,CAAC+B,yBAAyB,EAAiB;QAC3F,OAAO,MAAM,IAAI,CAACC,WAAW,CAACC,KAAKC,SAAS,CAAC;YAAEJ;QAAS;IAC1D;IAEA,MAAMK,gBAAgB;QACpB,IAAI,CAACvC,MAAM,CAACwC,GAAG,CAAC;QAChB,MAAM,IAAI,CAACC,kBAAkB;QAC7B,MAAM,IAAI,CAACC,QAAQ;QACnB,IAAI,CAACC,mBAAmB;IAC1B;IAKA,MAAMF,qBAAoC;QACxC,IAAI,CAACG,gBAAgB;QACrB,IAAI,CAAClD,UAAU,GAAG,MAAM,IAAI,CAAClB,eAAe,CACzCc,KAAK,CAAC,IAAI,CAACA,KAAK,EAChBuD,IAAI,CAAC,CAACC;YACL,MAAMC,IAAID,EAAEE,IAAI;YAEhB,IAAID,EAAE9C,IAAI,KAAK,QAAQ;gBAErB,IAAI,CAACgD,WAAW,CAAC;gBACjB,IAAI,CAACC,cAAc,CAAC;gBACpB,MAAM,IAAIC,uCAAoB,CAAC,uDAAuD;YACxF,OAAO,IAAIJ,EAAEK,KAAK,EAAEC,KAAK,CAAC,EAAE,KAAK,UAAU;gBACzC,IAAI,CAACrD,MAAM,CAACsD,IAAI,CAAC;gBAEjB,IAAI,CAACL,WAAW,CAAC;gBACjB,IAAI,CAACC,cAAc,CAAC;gBACpB,MAAM,IAAIC,uCAAoB,CAAC,2EAA2E;YAC5G;YACA,IAAI,CAACF,WAAW,CAAC;YACjB,IAAI,CAACC,cAAc,CAAC;YACpB,OAAOH;QACT,GACCQ,KAAK,CAAC,CAACC;YACN,IAAI,CAACN,cAAc,CAAC;YAEpB,IAAIM,aAAaL,uCAAoB,EAAE;gBACrC,IAAI,CAACnD,MAAM,CAACsD,IAAI,CAAC,CAAC,uCAAuC,EAAE,IAAI,CAACrE,QAAQ,EAAE;gBAC1E,MAAMuE;YACR,OAAO;gBACL,IAAIA,GAAGC,UAAUC,WAAW,KAAK;oBAC/B,IAAI,CAACT,WAAW,CAAC;oBACjB,IAAI,CAACC,cAAc,CAAC;oBACpB,MAAM,IAAIC,uCAAoB,CAACK,GAAG;gBACpC;gBAEA,IAAI,CAACxD,MAAM,CAACW,KAAK,CAAC,CAAC,SAAS,EAAE,IAAI,CAAClC,SAAS,CAAC,yDAAyD,EAAE+E,GAAG;gBAC3G,IAAI,CAACP,WAAW,CAAC;YACnB;YACA,MAAMO;QACR;QAEF,IAAI,CAAC7D,QAAQ,GAAG,MAAM,IAAI,CAACnB,eAAe,CAACmF,qBAAqB,CAAC,IAAI,CAACrE,KAAK,EAAEiE,KAAK,CAAC,CAACC;YAClF,MAAME,SAASF,EAAEC,QAAQ,EAAEC;YAC3B,IAAIA,WAAWE,wCAAc,CAACC,SAAS,EAAE;gBACvC,IAAI,CAACZ,WAAW,CAAC;gBACjB,IAAI,CAACC,cAAc,CAAC;YACtB,OAAO;gBACL,IAAI,CAACD,WAAW,CAAC;gBACjB,IAAI,CAACC,cAAc,CAAC;YACtB;YACA,IACE;gBACEU,wCAAc,CAACE,WAAW;gBAC1BF,wCAAc,CAACG,eAAe;gBAC9BH,wCAAc,CAACI,mBAAmB;gBAClCJ,wCAAc,CAACK,eAAe;aAC/B,CAACC,QAAQ,CAACR,SACX;gBACA,IAAI,CAAC1D,MAAM,CAACW,KAAK,CAAC,CAAC,0BAA0B,EAAE+C,OAAO,iDAAiD,CAAC;YAC1G;YACA,MAAMF;QACR;QAEA,MAAM,IAAI,CAACW,wBAAwB;QAEnC,IAAI,CAACnE,MAAM,CAACwC,GAAG,CAAC,CAAC,iEAAiE,CAAC;QACnF,IAAI,IAAI,CAAC5C,6BAA6B,EAAE;YACtCoC,cAAc,IAAI,CAACpC,6BAA6B;QAClD;QACA,IAAI,CAACA,6BAA6B,GAAGwE,YAAY;YAC/C,MAAM,IAAI,CAACD,wBAAwB;QAErC,GAAG;IACL;IAMA,MAAcA,2BAA2B;QACvC,IAAI;YACF,MAAMnG,UAAU,MAAM,IAAI,CAACQ,eAAe,CAAC6F,iBAAiB,CAAC,IAAI,CAAC/E,KAAK,EAAE;YACzE,MAAMgF,gBAAgBtG,QAAQgF,IAAI,EAAEuB,OAAOC,OAAOC;YAElD,IAAIC,MAAM,CAAC;YACX,IAAIJ,eAAe;gBACjB,MAAMK,cAAc,MAAM,IAAI,CAACnG,eAAe,CAACoG,MAAM,CAAC,IAAI,CAACtF,KAAK;gBAChEoF,MAAMC,YAAY3B,IAAI;YACxB;YAEA,IAAI,CAACC,WAAW,CAAC/D,uBAAS,CAACuB,UAAU;YACrC,OAAO,MAAM,IAAI,CAACoE,SAAS,CAAC,WAAW;gBAAE,GAAG7G,QAAQgF,IAAI;gBAAE8B,UAAUJ,KAAKI;gBAAUJ,KAAKA,KAAKA;YAAI;QACnG,EAAE,OAAOlB,GAAG;YACV,IAAI,AAACA,EAAiBuB,YAAY,EAAE;gBAClC,MAAMC,YAAYxB;gBAClB,IAAIwB,WAAWvB,UAAUC,UAAU,KAAK;oBACtC,IAAI,CAAC1D,MAAM,CAACW,KAAK,CAAC,CAAC,mCAAmC,CAAC;oBACvD,MAAM,IAAI,CAACkE,SAAS,CAAC,WAAW;wBAC9BN,OAAO;4BACLC,OAAO;gCACLC,aAAa;gCACb9D,OAAO;4BACT;4BACAsE,MAAM;4BACNtE,OAAOqE,WAAWvB,SAAST,KAAKrC;wBAClC;oBACF;oBACA;gBACF;gBACA,IAAI,CAACX,MAAM,CAACW,KAAK,CAAC,CAAC,yDAAyD,CAAC;gBAC7E,IAAI,CAACsC,WAAW,CAAC/D,uBAAS,CAACgG,UAAU;gBACrC;YACF;YACA,IAAI,CAAClF,MAAM,CAACW,KAAK,CAAC,CAAC,0DAA0D,CAAC;YAC9E,IAAI,CAACsC,WAAW,CAAC/D,uBAAS,CAACgG,UAAU;QACvC;IACF;IAEAC,oBAAoB;QAClB,IAAI,CAACpH,cAAc,GAAG;QACtB,IAAI,CAACsB,uBAAuB,GAAG+F,KAAKC,GAAG;IACzC;IAEA1C,sBAAsB;QACpB,IAAI,CAAC5E,cAAc,GAAG;QACtB,IAAI,CAACsB,uBAAuB,GAAG;IACjC;IAEAuD,mBAAmB;QACjB,IAAI,CAACM,cAAc,CAAC;QACpB,IAAI,CAACD,WAAW,CAAC;IACnB;IAEAqC,cAAcpH,KAAa,EAAEqH,OAAY,EAAE;QACzC,IAAI,CAAC,IAAI,CAACC,oBAAoB,EAAE;YAC9B;QACF;QAEA,IAAI,CAACjG,YAAY,CAACkG,IAAI,CAACjI,eAAeU,QAAQ;YAC5CA;YACAqH;YACA9G,WAAW,IAAI,CAACA,SAAS;YACzBF,aAAamH,kCAAa;QAC5B;IACF;IAEA,MAAgBC,YAAYC,CAAU,EAAiB;QACrD,IAAI,CAAC1C,cAAc,CAAC;QACpB,MAAM,IAAI,CAACR,QAAQ;QACnB,MAAM,IAAI,CAACT,YAAY,CAAC7B,6BAAY,CAAC+B,yBAAyB;IAChE;IAEA,MAAgB0D,UAAUC,OAAe,EAAiB;QACxD,IAAI,CAAC1G,4BAA4B,GAAGgG,KAAKC,GAAG;QAE5C,IAAI,IAAI,CAACzG,WAAW,KAAKC,6BAAY,CAACkH,aAAa,EAAE;YACnD,IAAI,CAAC7C,cAAc,CAAC;QACtB;QAEA,MAAMF,OAAOX,KAAK2D,KAAK,CAACF;QACxB,MAAMG,YAAYC,OAAOC,IAAI,CAACnD,KAAK,CAAC,EAAE;QACtC,MAAMuC,UAAUvC,IAAI,CAACiD,UAAU;QAE/B,IAAI,IAAI,CAAC/F,UAAU,EAAE;YACnB,IAAI,CAACF,MAAM,CAACwC,GAAG,CAAC,CAAC,OAAO,EAAEyD,UAAU,CAAC,EAAEH,QAAQM,SAAS,CAAC,GAAG,KAAK,GAAG,CAAC;QACvE;QAEA,IAAIH,cAAc5I,iBAAiBU,cAAc,EAAE;YACjD,IAAI,CAACiC,MAAM,CAACwC,GAAG,CAAC;YAChB,IAAI,CAAC2C,iBAAiB;QACxB,OAAO,IACLc,cAAc5I,iBAAiBW,OAAO,IACtC,IAAI,CAACwB,aAAa,CAACW,GAAG,CAACC,6BAAY,CAACiG,8BAA8B,EAAEjG,6BAAY,CAACkG,kCAAkC,MACjH,QACF;YACAC,IAAAA,qBAAa,EAAC,CAAC,kBAAkB,EAAE,IAAI,CAAC9H,SAAS,CAAC,IAAI,CAAC,EAAE4D,KAAKC,SAAS,CAACiD,SAAS,MAAM;QACzF;QAGA,MAAM,IAAI,CAACV,SAAS,CAACoB,WAAWV;IAClC;IAEA,MAAgBiB,YAAYtI,KAAU,EAAE;QACtC,IAAI,CAACgF,cAAc,CAAC;QACpB,OAAO,IAAI,CAACrB,MAAM;QAClB,MAAM,IAAI,CAACgD,SAAS,CAACtH,UAAUG,SAAS,EAAE;IAC5C;IAEA,MAAgB+I,QAAQ9F,KAAU,EAAE;QAClC,IAAI,CAACuC,cAAc,CAAC;QACpB,MAAM,IAAI,CAAC2B,SAAS,CAACtH,UAAUI,QAAQ,EAAEgD,OAAO+F,SAAS/F,QAAQ;IACnE;IAEA,MAAckE,UAAU3G,KAAa,EAAEqH,OAAa,EAAE;QACpD,IAAI,CAAC,IAAI,CAACC,oBAAoB,EAAE;YAC9B;QACF;QAEA,MAAM,IAAI,CAACjG,YAAY,CAACoH,SAAS,CAACnJ,eAAeU,QAAQ;YACvDA;YACAqH;YACA9G,WAAW,IAAI,CAACA,SAAS;YACzBF,aAAa;QACf;IACF;IAEA,MAAcmE,WAA0B;QACtC,IAAI,CAACQ,cAAc,CAACrE,6BAAY,CAAC+H,cAAc;QAC/C,MAAM,IAAI,CAACxE,WAAW,CACpBC,KAAKC,SAAS,CAAC;YACbuE,MAAM,GAAG,IAAI,CAAClH,QAAQ,CAAC,CAAC,EAAE,IAAI,CAACD,UAAU,CAACoH,OAAO,EAAE;QACrD;IAGJ;IAEQ5D,eAAeqB,KAAkB,EAAE;QACzC,IAAI,CAAC3F,WAAW,GAAG2F;QACnB,IAAI,CAAC7F,YAAY,GAAG;QACpB,IAAI,CAACC,oBAAoB,GAAGyG,KAAKC,GAAG;QACpC,IAAI,IAAI,CAACnF,UAAU,EAAE;YACnB,IAAI,CAACF,MAAM,CAACwC,GAAG,CAAC,GAAG,IAAI,CAAC/D,SAAS,CAAC,0BAA0B,CAAC,GAAG8F;QAClE;QACA,IAAI,CAACe,aAAa,CAAC/H,UAAUM,gBAAgB,EAAE0G;IACjD;IAEQtB,YAAYsB,KAAe,EAAE;QACnC,IAAIA,UAAUrF,uBAAS,CAAC6H,SAAS,EAAE;YACjC,IAAI,CAAC/G,MAAM,CAACsD,IAAI,CAAC;QACnB;QACA,IAAI,CAACrE,QAAQ,GAAGsF;QAChB,IAAI,CAACxF,eAAe,GAAG;QACvB,IAAI,CAACC,uBAAuB,GAAGoG,KAAKC,GAAG;QACvC,IAAI,IAAI,CAACnF,UAAU,EAAE;YACnB,IAAI,CAACF,MAAM,CAACwC,GAAG,CAAC,GAAG,IAAI,CAAC/D,SAAS,CAAC,uBAAuB,CAAC,GAAG8F;QAC/D;QACA,IAAI,CAACe,aAAa,CAAC/H,UAAUK,iBAAiB,EAAE2G;IAClD;AACF"}
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/octoprint-websocket.adapter.ts"],"names":["OctoPrintMessage","OctoprintWebsocketAdapter","WsMessage","octoPrintEvent","octoPrintWebsocketEvent","WS_OPENED","WS_CLOSED","WS_ERROR","API_STATE_UPDATED","WS_STATE_UPDATED","connected","reauthRequired","current","history","event","plugin","timelapse","slicingProgress","printerId","WebsocketAdapter","printerType","stateUpdated","stateUpdateTimestamp","socketState","apiStateUpdated","apiStateUpdateTimestamp","apiState","lastMessageReceivedTimestamp","reauthRequiredTimestamp","login","socketURL","sessionDto","username","refreshPrinterCurrentInterval","constructor","loggerFactory","octoprintClient","eventEmitter2","configService","SOCKET_STATE","unopened","API_STATE","unset","logger","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","isApiOnline","responding","closed","error","needsSetup","needsReauth","isClosedOrAborted","aborted","registerCredentials","socketLogin","loginDto","httpUrlString","normalizeUrl","printerURL","httpUrl","URL","httpUrlPath","pathname","wsUrl","httpToWsUrl","open","socket","Error","close","clearInterval","sendThrottle","throttle","defaultSocketThrottleRate","sendMessage","JSON","stringify","reauthSession","log","setupSocketSession","sendAuth","resetReauthRequired","resetSocketState","then","d","r","data","setApiState","setSocketState","ExternalServiceError","needs","group","warn","catch","e","response","status","getAdminUserOrDefault","HttpStatusCode","BAD_GATEWAY","NOT_IMPLEMENTED","SERVICE_UNAVAILABLE","GATEWAY_TIMEOUT","includes","updateCurrentStateSafely","setInterval","setReauthRequired","Date","now","emitEventSync","payload","eventEmittingAllowed","emit","OctoprintType","afterOpened","_","onMessage","message","authenticated","parse","eventName","Object","keys","substring","emitEvent","afterClosed","onError","length","getPrinterCurrent","isOperational","state","flags","operational","job","jobResponse","getJob","progress","isAxiosError","castError","text","noResponse","emitAsync","session","authenticating","auth","globalKey"],"mappings":"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"}
|