@fdm-monster/server 1.5.0-rc1 → 1.5.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 -3
- package/.gitattributes +1 -1
- package/.swcrc +0 -0
- package/CODE_OF_CONDUCT.md +0 -0
- package/CONTRIBUTING.md +0 -0
- package/LICENSE +0 -0
- package/README.md +0 -0
- package/SECURITY.md +0 -0
- package/dist/constants/authorization.constants.js +12 -0
- package/dist/constants/authorization.constants.js.map +1 -1
- package/dist/constants/event.constants.js +0 -0
- package/dist/constants/event.constants.js.map +0 -0
- package/dist/constants/http-status-codes.constants.js +0 -0
- package/dist/constants/http-status-codes.constants.js.map +0 -0
- package/dist/constants/server-settings.constants.js +0 -0
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/constants/service.constants.js +0 -0
- package/dist/constants/service.constants.js.map +0 -0
- package/dist/container.js +2 -1
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +3 -1
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/auth.controller.js +11 -6
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/batch-call.controller.js +0 -0
- package/dist/controllers/batch-call.controller.js.map +0 -0
- package/dist/controllers/camera-stream.controller.js +0 -0
- package/dist/controllers/camera-stream.controller.js.map +0 -0
- package/dist/controllers/custom-gcode.controller.js +0 -0
- package/dist/controllers/custom-gcode.controller.js.map +0 -0
- package/dist/controllers/first-time-setup.controller.js +11 -4
- package/dist/controllers/first-time-setup.controller.js.map +1 -1
- package/dist/controllers/floor.controller.js +0 -0
- package/dist/controllers/floor.controller.js.map +0 -0
- package/dist/controllers/plugin-firmware-update.controller.js +0 -0
- package/dist/controllers/plugin-firmware-update.controller.js.map +0 -0
- package/dist/controllers/print-completion.controller.js +0 -0
- package/dist/controllers/print-completion.controller.js.map +0 -0
- package/dist/controllers/printer-files.controller.js +0 -0
- package/dist/controllers/printer-files.controller.js.map +0 -0
- package/dist/controllers/printer-settings.controller.js +0 -0
- package/dist/controllers/printer-settings.controller.js.map +0 -0
- package/dist/controllers/printer.controller.js +0 -0
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +3 -1
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +0 -0
- package/dist/controllers/server-public.controller.js.map +0 -0
- package/dist/controllers/settings.controller.js +91 -7
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/controllers/user.controller.js +79 -20
- package/dist/controllers/user.controller.js.map +1 -1
- package/dist/controllers/validation/auth-controller.validation.js +0 -0
- package/dist/controllers/validation/auth-controller.validation.js.map +0 -0
- package/dist/controllers/validation/batch-controller.validation.js +0 -0
- package/dist/controllers/validation/batch-controller.validation.js.map +0 -0
- package/dist/controllers/validation/generic.validation.js +0 -0
- package/dist/controllers/validation/generic.validation.js.map +0 -0
- package/dist/controllers/validation/printer-controller.validation.js +0 -0
- package/dist/controllers/validation/printer-controller.validation.js.map +0 -0
- package/dist/controllers/validation/printer-files-controller.validation.js +0 -0
- package/dist/controllers/validation/printer-files-controller.validation.js.map +0 -0
- package/dist/controllers/validation/printer-settings-controller.validation.js +0 -0
- package/dist/controllers/validation/printer-settings-controller.validation.js.map +0 -0
- package/dist/controllers/validation/setting.validation.js +1 -1
- package/dist/controllers/validation/setting.validation.js.map +0 -0
- package/dist/controllers/validation/user-controller.validation.js +3 -2
- package/dist/controllers/validation/user-controller.validation.js.map +1 -1
- package/dist/exceptions/job.exceptions.js +0 -0
- package/dist/exceptions/job.exceptions.js.map +1 -1
- package/dist/exceptions/runtime.exceptions.js +10 -8
- package/dist/exceptions/runtime.exceptions.js.map +1 -1
- package/dist/handlers/cache-manager.js +0 -0
- package/dist/handlers/cache-manager.js.map +0 -0
- package/dist/handlers/event-emitter.js +0 -0
- package/dist/handlers/event-emitter.js.map +0 -0
- package/dist/handlers/logger-factory.js +0 -0
- package/dist/handlers/logger-factory.js.map +0 -0
- package/dist/handlers/logger.js +0 -0
- package/dist/handlers/logger.js.map +0 -0
- package/dist/handlers/validators.js +6 -1
- package/dist/handlers/validators.js.map +1 -1
- package/dist/index.js +0 -0
- package/dist/index.js.map +0 -0
- package/dist/middleware/authenticate.js +7 -4
- package/dist/middleware/authenticate.js.map +1 -1
- package/dist/middleware/database.js +0 -0
- package/dist/middleware/database.js.map +0 -0
- package/dist/middleware/demo.middleware.js +43 -0
- package/dist/middleware/demo.middleware.js.map +1 -0
- package/dist/middleware/{exception.handler.js → exception.filter.js} +9 -8
- package/dist/middleware/exception.filter.js.map +1 -0
- package/dist/middleware/global.middleware.js +27 -3
- package/dist/middleware/global.middleware.js.map +1 -1
- package/dist/middleware/passport.js +45 -16
- package/dist/middleware/passport.js.map +1 -1
- package/dist/middleware/printer.js +0 -0
- package/dist/middleware/printer.js.map +0 -0
- package/dist/models/Auth/Permission.js +0 -0
- package/dist/models/Auth/Permission.js.map +0 -0
- package/dist/models/Auth/RefreshToken.js +0 -0
- package/dist/models/Auth/RefreshToken.js.map +0 -0
- package/dist/models/Auth/Role.js +0 -0
- package/dist/models/Auth/Role.js.map +0 -0
- package/dist/models/Auth/User.js +0 -0
- package/dist/models/Auth/User.js.map +0 -0
- package/dist/models/CameraStream.js +5 -35
- package/dist/models/CameraStream.js.map +1 -1
- package/dist/models/CustomGcode.js +0 -0
- package/dist/models/CustomGcode.js.map +0 -0
- package/dist/models/Floor.js +0 -0
- package/dist/models/Floor.js.map +0 -0
- package/dist/models/FloorPrinter.js +0 -0
- package/dist/models/FloorPrinter.js.map +0 -0
- package/dist/models/PrintCompletion.js +0 -0
- package/dist/models/PrintCompletion.js.map +0 -0
- package/dist/models/Printer.js +0 -0
- package/dist/models/Printer.js.map +0 -0
- package/dist/models/Settings.js +0 -0
- package/dist/models/Settings.js.map +0 -0
- package/dist/models/index.js +0 -0
- package/dist/models/index.js.map +0 -0
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js +0 -0
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js.map +0 -0
- package/dist/mongo-migrations/20210907173950-printers-enabled.js +0 -0
- package/dist/mongo-migrations/20210907173950-printers-enabled.js.map +0 -0
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js +0 -0
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js.map +0 -0
- package/dist/mongo-migrations/20230414141005-floor-remove-groupinfloor.js +0 -0
- package/dist/mongo-migrations/20230414141005-floor-remove-groupinfloor.js.map +0 -0
- package/dist/mongo-migrations/20230427202911-printer-remove-sortindex.js +0 -0
- package/dist/mongo-migrations/20230427202911-printer-remove-sortindex.js.map +0 -0
- package/dist/mongo-migrations/20230716065316-user-remove-name.js +0 -0
- package/dist/mongo-migrations/20230716065316-user-remove-name.js.map +0 -0
- package/dist/server.constants.js +14 -5
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js +4 -2
- package/dist/server.core.js.map +1 -1
- package/dist/server.env.js +3 -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 +29 -15
- package/dist/services/authentication/auth.service.js.map +1 -1
- package/dist/services/authentication/jwt.service.js +0 -0
- package/dist/services/authentication/jwt.service.js.map +0 -0
- package/dist/services/authentication/permission.service.js +0 -0
- package/dist/services/authentication/permission.service.js.map +0 -0
- package/dist/services/authentication/refresh-token.service.js +6 -5
- package/dist/services/authentication/refresh-token.service.js.map +1 -1
- package/dist/services/authentication/role.service.js +6 -0
- package/dist/services/authentication/role.service.js.map +1 -1
- package/dist/services/authentication/user.service.js +35 -13
- package/dist/services/authentication/user.service.js.map +1 -1
- package/dist/services/batch-call.service.js +0 -0
- package/dist/services/batch-call.service.js.map +0 -0
- package/dist/services/camera-stream.service.js +2 -15
- package/dist/services/camera-stream.service.js.map +1 -1
- package/dist/services/core/client-bundle.service.js +0 -0
- package/dist/services/core/client-bundle.service.js.map +0 -0
- package/dist/services/core/config.service.js +4 -0
- package/dist/services/core/config.service.js.map +1 -1
- package/dist/services/core/github.service.js +0 -0
- package/dist/services/core/github.service.js.map +0 -0
- package/dist/services/core/logs-manager.service.js +0 -0
- package/dist/services/core/logs-manager.service.js.map +0 -0
- package/dist/services/core/monsterpi.service.js +0 -0
- package/dist/services/core/monsterpi.service.js.map +0 -0
- package/dist/services/core/multer.service.js +0 -0
- package/dist/services/core/multer.service.js.map +0 -0
- package/dist/services/core/server-release.service.js +0 -0
- package/dist/services/core/server-release.service.js.map +0 -0
- package/dist/services/core/server-update.service.js +0 -0
- package/dist/services/core/server-update.service.js.map +0 -0
- package/dist/services/core/task-manager.service.js +0 -0
- package/dist/services/core/task-manager.service.js.map +0 -0
- package/dist/services/core/yaml.service.js +0 -0
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/custom-gcode.service.js +0 -0
- package/dist/services/custom-gcode.service.js.map +0 -0
- package/dist/services/floor.service.js +0 -0
- package/dist/services/floor.service.js.map +0 -0
- package/dist/services/influxdb-v2/influx-db-v2-base.service.js +4 -8
- package/dist/services/influxdb-v2/influx-db-v2-base.service.js.map +1 -1
- package/dist/services/interfaces/auth.service.interface.js +0 -0
- package/dist/services/interfaces/auth.service.interface.js.map +0 -0
- package/dist/services/interfaces/camera-stream.dto.js +11 -47
- package/dist/services/interfaces/camera-stream.dto.js.map +1 -1
- package/dist/services/interfaces/camera-stream.service.interface.js +0 -0
- package/dist/services/interfaces/camera-stream.service.interface.js.map +0 -0
- package/dist/services/interfaces/custom-gcode.dto.js +0 -0
- package/dist/services/interfaces/custom-gcode.dto.js.map +0 -0
- package/dist/services/interfaces/custom-gcode.service.interface.js +0 -0
- package/dist/services/interfaces/custom-gcode.service.interface.js.map +0 -0
- package/dist/services/interfaces/floor.dto.js +0 -0
- package/dist/services/interfaces/floor.dto.js.map +0 -0
- package/dist/services/interfaces/floor.service.interface.js +0 -0
- package/dist/services/interfaces/floor.service.interface.js.map +0 -0
- package/dist/services/interfaces/gcode-analysis.dto.js +0 -0
- package/dist/services/interfaces/gcode-analysis.dto.js.map +0 -0
- package/dist/services/interfaces/jwt.service.interface.js +0 -0
- package/dist/services/interfaces/jwt.service.interface.js.map +0 -0
- package/dist/services/interfaces/login.dto.js +0 -0
- package/dist/services/interfaces/login.dto.js.map +0 -0
- package/dist/services/interfaces/page.interface.js +0 -0
- package/dist/services/interfaces/page.interface.js.map +0 -0
- package/dist/services/interfaces/permission.dto.js +0 -0
- package/dist/services/interfaces/permission.dto.js.map +0 -0
- package/dist/services/interfaces/permission.service.interface.js +0 -0
- package/dist/services/interfaces/permission.service.interface.js.map +0 -0
- package/dist/services/interfaces/printer-file.dto.js +0 -0
- package/dist/services/interfaces/printer-file.dto.js.map +0 -0
- package/dist/services/interfaces/printer-files.service.interface.js +0 -0
- package/dist/services/interfaces/printer-files.service.interface.js.map +0 -0
- package/dist/services/interfaces/printer.dto.js +0 -0
- package/dist/services/interfaces/printer.dto.js.map +0 -0
- package/dist/services/interfaces/printer.service.interface.js +0 -0
- package/dist/services/interfaces/printer.service.interface.js.map +0 -0
- package/dist/services/interfaces/refresh-token.dto.js +20 -0
- package/dist/services/interfaces/refresh-token.dto.js.map +1 -0
- package/dist/services/{orm/printer.service.interface.js → interfaces/refresh-token.service.interface.js} +1 -1
- package/dist/services/interfaces/refresh-token.service.interface.js.map +1 -0
- package/dist/services/interfaces/role-service.interface.js +0 -0
- package/dist/services/interfaces/role-service.interface.js.map +0 -0
- package/dist/services/interfaces/role.dto.js +16 -0
- package/dist/services/interfaces/role.dto.js.map +1 -0
- package/dist/services/interfaces/settings.dto.js +2 -3
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/interfaces/settings.service.interface.js +0 -0
- package/dist/services/interfaces/settings.service.interface.js.map +0 -0
- package/dist/services/interfaces/user-service.interface.js +0 -0
- package/dist/services/interfaces/user-service.interface.js.map +0 -0
- package/dist/services/interfaces/user.dto.js +0 -0
- package/dist/services/interfaces/user.dto.js.map +0 -0
- package/dist/services/octoprint/constants/firmware-update-settings.constants.js +0 -0
- package/dist/services/octoprint/constants/firmware-update-settings.constants.js.map +0 -0
- package/dist/services/octoprint/constants/octoprint-service.constants.js +0 -0
- package/dist/services/octoprint/constants/octoprint-service.constants.js.map +0 -0
- package/dist/services/octoprint/constants/octoprint-websocket.constants.js +0 -0
- package/dist/services/octoprint/constants/octoprint-websocket.constants.js.map +0 -0
- package/dist/services/octoprint/octoprint-api.routes.js +0 -0
- package/dist/services/octoprint/octoprint-api.routes.js.map +0 -0
- package/dist/services/octoprint/octoprint-api.service.js +0 -0
- package/dist/services/octoprint/octoprint-api.service.js.map +0 -0
- package/dist/services/octoprint/octoprint-sockio.adapter.js +7 -11
- package/dist/services/octoprint/octoprint-sockio.adapter.js.map +1 -1
- package/dist/services/octoprint/plugin-base.service.js +0 -0
- package/dist/services/octoprint/plugin-base.service.js.map +0 -0
- package/dist/services/octoprint/plugin-firmware-update.service.js +0 -0
- package/dist/services/octoprint/plugin-firmware-update.service.js.map +0 -0
- package/dist/services/octoprint/plugin-repository.cache.js +0 -0
- package/dist/services/octoprint/plugin-repository.cache.js.map +0 -0
- package/dist/services/octoprint/socket.factory.js +0 -0
- package/dist/services/octoprint/socket.factory.js.map +0 -0
- package/dist/services/octoprint/utils/api.utils.js +0 -0
- package/dist/services/octoprint/utils/api.utils.js.map +0 -0
- package/dist/services/print-completion.service.js +0 -0
- package/dist/services/print-completion.service.js.map +0 -0
- package/dist/services/printer-files.service.js +0 -0
- package/dist/services/printer-files.service.js.map +0 -0
- package/dist/services/printer.service.js +0 -0
- package/dist/services/printer.service.js.map +0 -0
- package/dist/services/settings.service.js +40 -31
- package/dist/services/settings.service.js.map +1 -1
- package/dist/services/validators/floor-service.validation.js +0 -0
- package/dist/services/validators/floor-service.validation.js.map +0 -0
- package/dist/services/validators/print-completion-service.validation.js +0 -0
- package/dist/services/validators/print-completion-service.validation.js.map +0 -0
- package/dist/services/validators/printer-service.validation.js +1 -1
- package/dist/services/validators/printer-service.validation.js.map +1 -1
- package/dist/services/validators/settings-service.validation.js +18 -8
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/services/validators/user-service.validation.js +3 -2
- package/dist/services/validators/user-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +0 -0
- package/dist/services/validators/yaml-service.validation.js.map +0 -0
- package/dist/shared.constants.js +0 -0
- package/dist/shared.constants.js.map +0 -0
- package/dist/state/file-upload-tracker.cache.js +0 -0
- package/dist/state/file-upload-tracker.cache.js.map +0 -0
- package/dist/state/file.cache.js +0 -0
- package/dist/state/file.cache.js.map +0 -0
- package/dist/state/files.store.js +0 -0
- package/dist/state/files.store.js.map +0 -0
- package/dist/state/floor.store.js +0 -0
- package/dist/state/floor.store.js.map +0 -0
- package/dist/state/printer-events.cache.js +0 -0
- package/dist/state/printer-events.cache.js.map +0 -0
- package/dist/state/printer-socket.store.js +0 -0
- package/dist/state/printer-socket.store.js.map +0 -0
- package/dist/state/printer.cache.js +0 -0
- package/dist/state/printer.cache.js.map +0 -0
- package/dist/state/settings.store.js +28 -5
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/socket-io.gateway.js +30 -3
- package/dist/state/socket-io.gateway.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +3 -0
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/dist/state/validation/create-test-printer.validation.js +0 -0
- package/dist/state/validation/create-test-printer.validation.js.map +0 -0
- package/dist/task.presets.js +0 -0
- package/dist/task.presets.js.map +0 -0
- package/dist/tasks/boot.task.js +18 -14
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/client-bundle.task.js +0 -0
- package/dist/tasks/client-bundle.task.js.map +0 -0
- package/dist/tasks/print-completion.socketio.task.js +0 -0
- package/dist/tasks/print-completion.socketio.task.js.map +0 -0
- package/dist/tasks/printer-file-clean.task.js +0 -0
- package/dist/tasks/printer-file-clean.task.js.map +0 -0
- package/dist/tasks/printer-websocket-restore.task.js +0 -0
- package/dist/tasks/printer-websocket-restore.task.js.map +0 -0
- package/dist/tasks/printer-websocket.task.js +0 -0
- package/dist/tasks/printer-websocket.task.js.map +0 -0
- package/dist/tasks/socketio.task.js +0 -0
- package/dist/tasks/socketio.task.js.map +0 -0
- package/dist/tasks/software-update.task.js +0 -0
- package/dist/tasks/software-update.task.js.map +0 -0
- package/dist/tasks.js +0 -0
- package/dist/tasks.js.map +0 -0
- package/dist/types/express/index.d.js +0 -0
- package/dist/types/express/index.d.js.map +0 -0
- package/dist/utils/array.util.js +0 -0
- package/dist/utils/array.util.js.map +0 -0
- package/dist/utils/benchmark.util.js +0 -0
- package/dist/utils/benchmark.util.js.map +0 -0
- package/dist/utils/cache/key-diff.cache.js +0 -0
- package/dist/utils/cache/key-diff.cache.js.map +0 -0
- package/dist/utils/correlation-token.util.js +0 -0
- package/dist/utils/correlation-token.util.js.map +0 -0
- package/dist/utils/crypto.utils.js +0 -0
- package/dist/utils/crypto.utils.js.map +0 -0
- package/dist/utils/env.utils.js +6 -0
- package/dist/utils/env.utils.js.map +1 -1
- package/dist/utils/error.utils.js +0 -0
- package/dist/utils/error.utils.js.map +0 -0
- package/dist/utils/find-predicate.utils.js +0 -0
- package/dist/utils/find-predicate.utils.js.map +0 -0
- package/dist/utils/fs.utils.js +0 -0
- package/dist/utils/fs.utils.js.map +0 -0
- package/dist/utils/is-docker.js +0 -0
- package/dist/utils/is-docker.js.map +0 -0
- package/dist/utils/mapper.utils.js +0 -0
- package/dist/utils/mapper.utils.js.map +0 -0
- package/dist/utils/metric.utils.js +0 -0
- package/dist/utils/metric.utils.js.map +0 -0
- package/dist/utils/normalize-url.js +0 -0
- package/dist/utils/normalize-url.js.map +0 -0
- package/dist/utils/semver.utils.js +0 -0
- package/dist/utils/semver.utils.js.map +0 -0
- package/dist/utils/time.utils.js +0 -0
- package/dist/utils/time.utils.js.map +0 -0
- package/dist/utils/url.utils.js +0 -0
- package/dist/utils/url.utils.js.map +0 -0
- package/dist/utils/websocket.adapter.js +0 -0
- package/dist/utils/websocket.adapter.js.map +0 -0
- package/migrate-mongo-config.js +0 -0
- package/package.json +21 -16
- package/src/index.ts +0 -0
- package/tsconfig.json +0 -0
- package/.env +0 -19
- package/.idea/codeStyles/Project.xml +0 -85
- package/.idea/codeStyles/codeStyleConfig.xml +0 -5
- package/.idea/dbnavigator.xml +0 -574
- package/.idea/fdm-monster.iml +0 -16
- package/.idea/inspectionProfiles/Project_Default.xml +0 -22
- package/.idea/jsLibraryMappings.xml +0 -6
- package/.idea/modules.xml +0 -12
- package/.idea/prettier.xml +0 -6
- package/.idea/vcs.xml +0 -17
- package/dist/@type/express/index.d.js +0 -7
- package/dist/@type/express/index.d.js.map +0 -1
- package/dist/middleware/exception.handler.js.map +0 -1
- package/dist/migrations/1696187882312-PrinterFile.js +0 -40
- package/dist/migrations/1696187882312-PrinterFile.js.map +0 -1
- package/dist/models/ServerSettings.js +0 -168
- package/dist/models/ServerSettings.js.map +0 -1
- package/dist/nodemon_restart_trigger.js +0 -4
- package/dist/nodemon_restart_trigger.js.map +0 -1
- package/dist/services/orm/floor.service.interface.js +0 -73
- package/dist/services/orm/floor.service.interface.js.map +0 -1
- package/dist/services/orm/printer.service.interface.js.map +0 -1
- package/dist/services/yaml.service.js +0 -278
- package/dist/services/yaml.service.js.map +0 -1
- package/nodemon_restart_trigger.js +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/yaml.service.ts"],"names":["YamlService","floorStore","floorService","printerService","printerCache","serverVersion","logger","constructor","loggerFactory","name","importPrintersAndFloors","yamlBuffer","importSpec","load","exportPrinters","exportFloorGrid","exportFloors","config","printer","printers","settingsAppearance","printerName","importData","validateInput","importPrintersFloorsYamlRules","floor","floors","importPrinterPositionsRules","log","updateByPropertyPrinters","insertPrinters","analysePrintersUpsert","printerComparisonStrategiesByPriority","updateByPropertyFloors","insertFloors","analyseFloorsUpsert","floorComparisonStrategiesByPriority","length","printerIdMap","newPrinter","state","create","id","updatePrinterSpec","updateId","printerId","update","value","floorIdMap","newFloor","knownPrinters","floorPosition","knownPrinterId","push","updateFloorSpec","floorId","updatedFloor","loadStore","upsertPrinters","comparisonStrategies","existingPrinters","list","names","map","p","toLowerCase","urls","printerURL","ids","toString","strategy","comparedName","foundIndex","findIndex","n","upsertFloors","comparisonStrategy","existingFloors","floorLevels","comparedProperty","exportPrintersAndFloors","options","input","exportPrintersFloorsYamlRules","dumpedObject","version","process","env","npm_package_version","exportedAt","Date","apiKey","getLoginDto","stepSize","disabledReason","enabled","dateAdded","listCache","f","dumpedFloor","fPrinterId","x","y","dump"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/yaml.service.ts"],"names":["YamlService","floorStore","floorService","printerService","printerCache","serverVersion","logger","constructor","loggerFactory","name","importPrintersAndFloors","yamlBuffer","importSpec","load","exportPrinters","exportFloorGrid","exportFloors","config","printer","printers","settingsAppearance","printerName","importData","validateInput","importPrintersFloorsYamlRules","floor","floors","importPrinterPositionsRules","log","updateByPropertyPrinters","insertPrinters","analysePrintersUpsert","printerComparisonStrategiesByPriority","updateByPropertyFloors","insertFloors","analyseFloorsUpsert","floorComparisonStrategiesByPriority","length","printerIdMap","newPrinter","state","create","id","updatePrinterSpec","updateId","printerId","update","value","floorIdMap","newFloor","knownPrinters","floorPosition","knownPrinterId","push","updateFloorSpec","floorId","updatedFloor","loadStore","upsertPrinters","comparisonStrategies","existingPrinters","list","names","map","p","toLowerCase","urls","printerURL","ids","toString","strategy","comparedName","foundIndex","findIndex","n","upsertFloors","comparisonStrategy","existingFloors","floorLevels","comparedProperty","exportPrintersAndFloors","options","input","exportPrintersFloorsYamlRules","dumpedObject","version","process","env","npm_package_version","exportedAt","Date","apiKey","getLoginDto","stepSize","disabledReason","enabled","dateAdded","listCache","f","dumpedFloor","fPrinterId","x","y","dump"],"mappings":"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"}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -18,10 +18,10 @@ class InfluxDbV2BaseService {
|
|
|
18
18
|
this.logger = loggerFactory(InfluxDbV2BaseService.name);
|
|
19
19
|
}
|
|
20
20
|
isConfigValid() {
|
|
21
|
-
const { bucket, org, url, token } = this
|
|
21
|
+
const { bucket, org, url, token } = this.getConfig();
|
|
22
22
|
return bucket && org && url && token;
|
|
23
23
|
}
|
|
24
|
-
|
|
24
|
+
getConfig() {
|
|
25
25
|
return {
|
|
26
26
|
url: this.configService.get(_serverconstants.AppConstants.influxUrl),
|
|
27
27
|
token: this.configService.get(_serverconstants.AppConstants.influxToken),
|
|
@@ -29,17 +29,13 @@ class InfluxDbV2BaseService {
|
|
|
29
29
|
bucket: this.configService.get(_serverconstants.AppConstants.influxBucket)
|
|
30
30
|
};
|
|
31
31
|
}
|
|
32
|
-
|
|
33
|
-
const { url, token } = this
|
|
32
|
+
getClient() {
|
|
33
|
+
const { url, token } = this.getConfig();
|
|
34
34
|
return new _influxdbclient.InfluxDB({
|
|
35
35
|
url,
|
|
36
36
|
token
|
|
37
37
|
});
|
|
38
38
|
}
|
|
39
|
-
#getQueryApi() {
|
|
40
|
-
const { org } = this.#getConfig();
|
|
41
|
-
return this.#getClient().getQueryApi(org);
|
|
42
|
-
}
|
|
43
39
|
}
|
|
44
40
|
|
|
45
41
|
//# sourceMappingURL=influx-db-v2-base.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/influxdb-v2/influx-db-v2-base.service.ts"],"names":["InfluxDbV2BaseService","configService","logger","constructor","loggerFactory","name","isConfigValid","bucket","org","url","token","getConfig","get","AppConstants","influxUrl","influxToken","influxOrg","influxBucket","getClient","InfluxDB"
|
|
1
|
+
{"version":3,"sources":["../../../src/services/influxdb-v2/influx-db-v2-base.service.ts"],"names":["InfluxDbV2BaseService","configService","logger","constructor","loggerFactory","name","isConfigValid","bucket","org","url","token","getConfig","get","AppConstants","influxUrl","influxToken","influxOrg","influxBucket","getClient","InfluxDB"],"mappings":";;;;+BAMaA;;;eAAAA;;;gCANY;iCACI;AAKtB,MAAMA;IACXC,cAA6B;IAC7BC,OAAsB;IAEtBC,YAAY,EAAEF,aAAa,EAAEG,aAAa,EAAmE,CAAE;QAC7G,IAAI,CAACH,aAAa,GAAGA;QACrB,IAAI,CAACC,MAAM,GAAGE,cAAcJ,sBAAsBK,IAAI;IACxD;IAEAC,gBAAgB;QACd,MAAM,EAAEC,MAAM,EAAEC,GAAG,EAAEC,GAAG,EAAEC,KAAK,EAAE,GAAG,IAAI,CAACC,SAAS;QAClD,OAAOJ,UAAUC,OAAOC,OAAOC;IACjC;IAEAC,YAAY;QACV,OAAO;YACLF,KAAK,IAAI,CAACR,aAAa,CAACW,GAAG,CAACC,6BAAY,CAACC,SAAS;YAClDJ,OAAO,IAAI,CAACT,aAAa,CAACW,GAAG,CAACC,6BAAY,CAACE,WAAW;YACtDP,KAAK,IAAI,CAACP,aAAa,CAACW,GAAG,CAACC,6BAAY,CAACG,SAAS;YAClDT,QAAQ,IAAI,CAACN,aAAa,CAACW,GAAG,CAACC,6BAAY,CAACI,YAAY;QAC1D;IACF;IAEAC,YAAY;QACV,MAAM,EAAET,GAAG,EAAEC,KAAK,EAAE,GAAG,IAAI,CAACC,SAAS;QACrC,OAAO,IAAIQ,wBAAQ,CAAC;YAAEV;YAAKC;QAAM;IACnC;AAMF"}
|
|
File without changes
|
|
File without changes
|
|
@@ -12,9 +12,6 @@ _export(exports, {
|
|
|
12
12
|
CameraStreamDto: function() {
|
|
13
13
|
return CameraStreamDto;
|
|
14
14
|
},
|
|
15
|
-
CameraStreamSettingsDto: function() {
|
|
16
|
-
return CameraStreamSettingsDto;
|
|
17
|
-
},
|
|
18
15
|
CreateCameraStreamDto: function() {
|
|
19
16
|
return CreateCameraStreamDto;
|
|
20
17
|
},
|
|
@@ -34,76 +31,43 @@ function _ts_metadata(k, v) {
|
|
|
34
31
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
35
32
|
}
|
|
36
33
|
class CameraStreamDto extends _sharedconstants.IdDto {
|
|
34
|
+
name;
|
|
37
35
|
streamURL;
|
|
38
36
|
printerId;
|
|
39
|
-
settings;
|
|
40
|
-
}
|
|
41
|
-
class CameraStreamSettingsDto {
|
|
42
|
-
aspectRatio;
|
|
43
|
-
rotationClockwise;
|
|
44
|
-
flipHorizontal;
|
|
45
|
-
flipVertical;
|
|
46
37
|
}
|
|
47
|
-
_ts_decorate([
|
|
48
|
-
(0, _classvalidator.IsNotEmpty)(),
|
|
49
|
-
(0, _classvalidator.IsIn)([
|
|
50
|
-
"16:9",
|
|
51
|
-
"4:3",
|
|
52
|
-
"1:1"
|
|
53
|
-
]),
|
|
54
|
-
_ts_metadata("design:type", String)
|
|
55
|
-
], CameraStreamSettingsDto.prototype, "aspectRatio", void 0);
|
|
56
|
-
_ts_decorate([
|
|
57
|
-
(0, _classvalidator.IsDefined)(),
|
|
58
|
-
(0, _classvalidator.IsIn)([
|
|
59
|
-
0,
|
|
60
|
-
90,
|
|
61
|
-
180,
|
|
62
|
-
270
|
|
63
|
-
]),
|
|
64
|
-
_ts_metadata("design:type", Number)
|
|
65
|
-
], CameraStreamSettingsDto.prototype, "rotationClockwise", void 0);
|
|
66
|
-
_ts_decorate([
|
|
67
|
-
(0, _classvalidator.IsDefined)(),
|
|
68
|
-
_ts_metadata("design:type", Boolean)
|
|
69
|
-
], CameraStreamSettingsDto.prototype, "flipHorizontal", void 0);
|
|
70
|
-
_ts_decorate([
|
|
71
|
-
(0, _classvalidator.IsDefined)(),
|
|
72
|
-
_ts_metadata("design:type", Boolean)
|
|
73
|
-
], CameraStreamSettingsDto.prototype, "flipVertical", void 0);
|
|
74
38
|
class CreateCameraStreamDto {
|
|
75
39
|
streamURL;
|
|
40
|
+
name;
|
|
76
41
|
printerId;
|
|
77
|
-
settings;
|
|
78
42
|
}
|
|
79
43
|
_ts_decorate([
|
|
80
44
|
(0, _classvalidator.IsNotEmpty)(),
|
|
81
45
|
_ts_metadata("design:type", String)
|
|
82
46
|
], CreateCameraStreamDto.prototype, "streamURL", void 0);
|
|
47
|
+
_ts_decorate([
|
|
48
|
+
(0, _classvalidator.IsNotEmpty)(),
|
|
49
|
+
_ts_metadata("design:type", String)
|
|
50
|
+
], CreateCameraStreamDto.prototype, "name", void 0);
|
|
83
51
|
_ts_decorate([
|
|
84
52
|
(0, _classvalidator.IsOptional)(),
|
|
85
53
|
_ts_metadata("design:type", typeof KeyType === "undefined" ? Object : KeyType)
|
|
86
54
|
], CreateCameraStreamDto.prototype, "printerId", void 0);
|
|
87
|
-
_ts_decorate([
|
|
88
|
-
(0, _classvalidator.IsDefined)(),
|
|
89
|
-
_ts_metadata("design:type", typeof CameraStreamSettingsDto === "undefined" ? Object : CameraStreamSettingsDto)
|
|
90
|
-
], CreateCameraStreamDto.prototype, "settings", void 0);
|
|
91
55
|
class UpdateCameraStreamDto {
|
|
92
56
|
streamURL;
|
|
57
|
+
name;
|
|
93
58
|
printerId;
|
|
94
|
-
settings;
|
|
95
59
|
}
|
|
96
60
|
_ts_decorate([
|
|
97
61
|
(0, _classvalidator.IsNotEmpty)(),
|
|
98
62
|
_ts_metadata("design:type", String)
|
|
99
63
|
], UpdateCameraStreamDto.prototype, "streamURL", void 0);
|
|
64
|
+
_ts_decorate([
|
|
65
|
+
(0, _classvalidator.IsNotEmpty)(),
|
|
66
|
+
_ts_metadata("design:type", String)
|
|
67
|
+
], UpdateCameraStreamDto.prototype, "name", void 0);
|
|
100
68
|
_ts_decorate([
|
|
101
69
|
(0, _classvalidator.IsOptional)(),
|
|
102
70
|
_ts_metadata("design:type", typeof KeyType === "undefined" ? Object : KeyType)
|
|
103
71
|
], UpdateCameraStreamDto.prototype, "printerId", void 0);
|
|
104
|
-
_ts_decorate([
|
|
105
|
-
(0, _classvalidator.IsDefined)(),
|
|
106
|
-
_ts_metadata("design:type", typeof CameraStreamSettingsDto === "undefined" ? Object : CameraStreamSettingsDto)
|
|
107
|
-
], UpdateCameraStreamDto.prototype, "settings", void 0);
|
|
108
72
|
|
|
109
73
|
//# sourceMappingURL=camera-stream.dto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/interfaces/camera-stream.dto.ts"],"names":["CameraStreamDto","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/camera-stream.dto.ts"],"names":["CameraStreamDto","CreateCameraStreamDto","UpdateCameraStreamDto","IdDto","name","streamURL","printerId","IsNotEmpty","IsOptional"],"mappings":";;;;;;;;;;;IAGaA,eAAe;eAAfA;;IAMAC,qBAAqB;eAArBA;;IASAC,qBAAqB;eAArBA;;;iCAlBS;gCACkC;;;;;;;;;;AAEjD,MAAMF,wBAAiCG,sBAAK;IACjDC,KAAa;IACbC,UAAkB;IAClBC,UAAmB;AACrB;AAEO,MAAML;IAEXI,UAAkB;IAElBD,KAAa;IAEbE,UAAoB;AACtB;;IANGC,IAAAA,0BAAU;;GADAN;;IAGVM,IAAAA,0BAAU;;GAHAN;;IAKVO,IAAAA,0BAAU;uCACC,mCAAA;GANDP;AASN,MAAMC;IAEXG,UAAkB;IAElBD,KAAa;IAEbE,UAAmB;AACrB;;IANGC,IAAAA,0BAAU;;GADAL;;IAGVK,IAAAA,0BAAU;;GAHAL;;IAKVM,IAAAA,0BAAU;uCACA,mCAAA;GANAN"}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "RefreshTokenDto", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return RefreshTokenDto;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
class RefreshTokenDto {
|
|
12
|
+
id;
|
|
13
|
+
userId;
|
|
14
|
+
expiresAt;
|
|
15
|
+
// Not exposed
|
|
16
|
+
// refreshToken!: string;
|
|
17
|
+
refreshAttemptsUsed;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
//# sourceMappingURL=refresh-token.dto.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/refresh-token.dto.ts"],"names":["RefreshTokenDto","id","userId","expiresAt","refreshAttemptsUsed"],"mappings":";;;;+BAEaA;;;eAAAA;;;AAAN,MAAMA;IACXC,GAAa;IACbC,OAAiB;IACjBC,UAAmB;IACnB,cAAc;IACd,yBAAyB;IACzBC,oBAA6B;AAC/B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/refresh-token.service.interface.ts"],"names":[],"mappings":""}
|
|
File without changes
|
|
File without changes
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "RoleDto", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return RoleDto;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
class RoleDto {
|
|
12
|
+
id;
|
|
13
|
+
name;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
//# sourceMappingURL=role.dto.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/role.dto.ts"],"names":["RoleDto","id","name"],"mappings":";;;;+BAEaA;;;eAAAA;;;AAAN,MAAMA;IACXC,GAAY;IACZC,KAAa;AACf"}
|
|
@@ -17,16 +17,15 @@ _export(exports, {
|
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
19
|
const _serversettingsconstants = require("../../constants/server-settings.constants");
|
|
20
|
-
const _sharedconstants = require("../../shared.constants");
|
|
21
20
|
class IpWhitelistSettingsDto {
|
|
22
21
|
whitelistedIpAddresses;
|
|
23
22
|
whitelistEnabled;
|
|
24
23
|
}
|
|
25
|
-
class SettingsDto
|
|
24
|
+
class SettingsDto {
|
|
26
25
|
[_serversettingsconstants.serverSettingsKey];
|
|
27
26
|
[_serversettingsconstants.wizardSettingKey];
|
|
28
27
|
[_serversettingsconstants.frontendSettingKey];
|
|
29
|
-
[
|
|
28
|
+
// [credentialSettingsKey]: CredentialSettingsDto;
|
|
30
29
|
[_serversettingsconstants.fileCleanSettingKey];
|
|
31
30
|
[_serversettingsconstants.timeoutSettingKey];
|
|
32
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/interfaces/settings.dto.ts"],"names":["IpWhitelistSettingsDto","SettingsDto","whitelistedIpAddresses","whitelistEnabled","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/settings.dto.ts"],"names":["IpWhitelistSettingsDto","SettingsDto","whitelistedIpAddresses","whitelistEnabled","serverSettingsKey","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey"],"mappings":";;;;;;;;;;;IAmBaA,sBAAsB;eAAtBA;;IA2CAC,WAAW;eAAXA;;;yCAvDN;AAYA,MAAMD;IACXE,uBAAiC;IACjCC,iBAA0B;AAC5B;AAwCO,MAAMF;IACX,CAACG,0CAAiB,CAAC,CAAoB;IACvC,CAACC,yCAAgB,CAAC,CAAoB;IACtC,CAACC,2CAAkB,CAAC,CAAsB;IAC1C,kDAAkD;IAClD,CAACC,4CAAmB,CAAC,CAAuB;IAC5C,CAACC,0CAAiB,CAAC,CAAqB;AAC1C"}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -141,7 +141,6 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
|
|
|
141
141
|
}
|
|
142
142
|
/**
|
|
143
143
|
* Retrieve session token by authenticating with OctoPrint API
|
|
144
|
-
* @returns {Promise<void>}
|
|
145
144
|
*/ async setupSocketSession() {
|
|
146
145
|
this.resetSocketState();
|
|
147
146
|
this.sessionDto = await this.octoPrintApiService.login(this.loginDto).then((r)=>{
|
|
@@ -149,38 +148,35 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
|
|
|
149
148
|
if (r.name === "_api") {
|
|
150
149
|
this.setApiState(API_STATE.globalKey);
|
|
151
150
|
this.setSocketState(SOCKET_STATE.aborted);
|
|
152
|
-
throw new _runtimeexceptions.
|
|
151
|
+
throw new _runtimeexceptions.ExternalServiceError("Global API Key detected, aborting socket connection");
|
|
153
152
|
} else if (r.needs?.group[0] === "guests") {
|
|
154
153
|
this.logger.warn("Detected group guests in OctoPrint login response, marking as unauthorized");
|
|
155
154
|
// This doesn't occur often (instead a 400 with CSRF failed is returned)
|
|
156
155
|
this.setApiState(API_STATE.authFail);
|
|
157
156
|
this.setSocketState(SOCKET_STATE.aborted);
|
|
158
|
-
throw new _runtimeexceptions.
|
|
157
|
+
throw new _runtimeexceptions.ExternalServiceError("Guest group detected, authentication failed, aborting socket connection");
|
|
159
158
|
}
|
|
160
159
|
this.setApiState(API_STATE.responding);
|
|
161
160
|
this.setSocketState(SOCKET_STATE.opening);
|
|
162
161
|
return r;
|
|
163
|
-
}).catch(
|
|
164
|
-
* @param {ExternalHttpError|AxiosError} e
|
|
165
|
-
*/ (e)=>{
|
|
162
|
+
}).catch((e)=>{
|
|
166
163
|
this.setSocketState(SOCKET_STATE.aborted);
|
|
167
|
-
|
|
164
|
+
// TODO improve error type detection
|
|
165
|
+
if (e instanceof _runtimeexceptions.ExternalServiceError) {
|
|
168
166
|
this.logger.warn(`Printer authorization error (id: ${this.printerId}), apiState: ${this.apiState}`);
|
|
169
167
|
throw e;
|
|
170
168
|
} else {
|
|
171
169
|
if (e?.response?.status === 403) {
|
|
172
170
|
this.setApiState(API_STATE.authFail);
|
|
173
171
|
this.setSocketState(SOCKET_STATE.aborted);
|
|
174
|
-
throw new _runtimeexceptions.
|
|
172
|
+
throw new _runtimeexceptions.ExternalServiceError(e);
|
|
175
173
|
}
|
|
176
174
|
this.logger.error(`Printer (${this.printerId}) network or transport error, marking it as unreachable; ${e}`);
|
|
177
175
|
this.setApiState(API_STATE.noResponse);
|
|
178
176
|
}
|
|
179
177
|
throw e;
|
|
180
178
|
});
|
|
181
|
-
this.username = await this.octoPrintApiService.getAdminUserOrDefault(this.loginDto).catch(
|
|
182
|
-
* @param {ExternalHttpError|AxiosError} e
|
|
183
|
-
*/ (e)=>{
|
|
179
|
+
this.username = await this.octoPrintApiService.getAdminUserOrDefault(this.loginDto).catch((e)=>{
|
|
184
180
|
const status = e.response?.status;
|
|
185
181
|
if (status === _httpstatuscodesconstants.HttpStatusCode.FORBIDDEN) {
|
|
186
182
|
this.setApiState(API_STATE.authFail);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/octoprint/octoprint-sockio.adapter.ts"],"names":["API_STATE","Message","OctoPrintSockIoAdapter","SOCKET_STATE","octoPrintEvent","connected","reauthRequired","current","history","event","plugin","timelapse","slicingProgress","WS_OPENED","WS_CLOSED","WS_ERROR","API_STATE_UPDATED","WS_STATE_UPDATED","unopened","opening","authenticating","opened","authenticated","aborted","error","closed","unset","noResponse","globalKey","authFail","responding","WebsocketAdapter","printerId","loginDto","socketURL","sessionDto","username","octoPrintApiService","eventEmitter","logger","configService","stateUpdated","stateUpdateTimestamp","socketState","apiStateUpdated","apiStateUpdateTimestamp","apiState","lastMessageReceivedTimestamp","reauthRequiredTimestamp","constructor","loggerFactory","eventEmitter2","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","isApiOnline","needsSetup","needsReauth","isClosedOrAborted","registerCredentials","socketLogin","protocol","httpUrl","normalizeUrl","printerURL","wsUrl","httpToWsUrl","pathname","open","_","socket","Error","close","sendThrottle","throttle","defaultSocketThrottleRate","sendMessage","JSON","stringify","reauthSession","setupSocketSession","sendAuth","resetReauthRequired","resetSocketState","login","then","r","setApiState","setSocketState","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/octoprint-sockio.adapter.ts"],"names":["API_STATE","Message","OctoPrintSockIoAdapter","SOCKET_STATE","octoPrintEvent","connected","reauthRequired","current","history","event","plugin","timelapse","slicingProgress","WS_OPENED","WS_CLOSED","WS_ERROR","API_STATE_UPDATED","WS_STATE_UPDATED","unopened","opening","authenticating","opened","authenticated","aborted","error","closed","unset","noResponse","globalKey","authFail","responding","WebsocketAdapter","printerId","loginDto","socketURL","sessionDto","username","octoPrintApiService","eventEmitter","logger","configService","stateUpdated","stateUpdateTimestamp","socketState","apiStateUpdated","apiStateUpdateTimestamp","apiState","lastMessageReceivedTimestamp","reauthRequiredTimestamp","constructor","loggerFactory","eventEmitter2","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","isApiOnline","needsSetup","needsReauth","isClosedOrAborted","registerCredentials","socketLogin","protocol","httpUrl","normalizeUrl","printerURL","wsUrl","httpToWsUrl","pathname","open","_","socket","Error","close","sendThrottle","throttle","defaultSocketThrottleRate","sendMessage","JSON","stringify","reauthSession","setupSocketSession","sendAuth","resetReauthRequired","resetSocketState","login","then","r","setApiState","setSocketState","ExternalServiceError","needs","group","warn","catch","e","response","status","getAdminUserOrDefault","HttpStatusCode","FORBIDDEN","BAD_GATEWAY","NOT_IMPLEMENTED","SERVICE_UNAVAILABLE","GATEWAY_TIMEOUT","includes","afterOpened","onMessage","message","Date","now","data","parse","eventName","Object","keys","payload","setReauthRequired","emitEvent","auth","session","afterClosed","onError","state","log","emitEventSync","emitAsync","emit"],"mappings":";;;;;;;;;;;IAkEaA,SAAS;eAATA;;IA7BAC,OAAO;eAAPA;;IAuCAC,sBAAsB;eAAtBA;;IArBAC,YAAY;eAAZA;;IAmBAC,cAAc;eAAdA;;;kCA1EoB;0CACF;iCACF;mCACQ;0BACT;8BACC;AAgCtB,MAAMH,UAAU;IACrBI,WAAW;IACXC,gBAAgB;IAChBC,SAAS;IACTC,SAAS;IACTC,OAAO;IACPC,QAAQ;IACRC,WAAW;IACXC,iBAAiB;IAEjB,gBAAgB;IAChBC,WAAW;IACXC,WAAW;IACXC,UAAU;IACVC,mBAAmB;IACnBC,kBAAkB;AACpB;AAEO,MAAMd,eAAe;IAC1Be,UAAU;IACVC,SAAS;IACTC,gBAAgB;IAChBC,QAAQ;IACRC,eAAe;IACfC,SAAS;IACTC,OAAO;IACPC,QAAQ;AACV;AAEO,MAAMzB,YAAY;IACvB0B,OAAO;IACPC,YAAY;IACZC,WAAW;IACXC,UAAU;IACVC,YAAY;AACd;AAEO,MAAM1B,iBAAiB,CAACK,QAAkB,CAAC,UAAU,EAAEA,MAAM,CAAC;AAE9D,MAAMP,+BAA+B6B,kCAAgB;IAC1DC,UAAkB;IAClBC,SAAmB;IACnBC,UAAgB;IAChBC,WAAuB;IACvBC,SAAiB;IACjBC,oBAAyC;IACzCC,aAA4B;IAC5BC,OAAsB;IACtBC,cAA6B;IAE7BC,eAAe,MAAM;IACrBC,uBAAsC,KAAK;IAC3CC,cAAcxC,aAAae,QAAQ,CAAC;IACpC0B,kBAAkB,MAAM;IACxBC,0BAAyC,KAAK;IAC9CC,WAAW9C,UAAU0B,KAAK,CAAC;IAC3BqB,+BAA8C,KAAK;IACnDzC,iBAAiB,MAAM;IACvB0C,0BAAyC,KAAK;IAE9CC,YAAY,EACVC,aAAa,EACbb,mBAAmB,EACnBc,aAAa,EACbX,aAAa,EAMd,CAAE;QACD,KAAK,CAAC;YAAEU;QAAc;QAEtB,IAAI,CAACX,MAAM,GAAGW,cAAchD,uBAAuBkD,IAAI;QACvD,IAAI,CAACf,mBAAmB,GAAGA;QAC3B,IAAI,CAACC,YAAY,GAAGa;QACpB,IAAI,CAACX,aAAa,GAAGA;IACvB;IAEA,IAAIa,aAAa;QACf,OAAO,IAAI,CAACb,aAAa,CAACc,GAAG,CAACC,6BAAY,CAACC,oBAAoB,EAAED,6BAAY,CAACE,wBAAwB,MAAM;IAC9G;IAEAC,cAAc;QACZ,MAAMC,cAAc,IAAI,CAACb,QAAQ,KAAK9C,UAAU8B,UAAU;QAC1D,OAAO6B,eAAgB,CAAA,IAAI,CAAChB,WAAW,KAAKxC,aAAasB,MAAM,IAAI,IAAI,CAACkB,WAAW,KAAKxC,aAAaqB,KAAK,AAAD;IAC3G;IAEAoC,aAAa;QACX,OAAO,IAAI,CAACjB,WAAW,KAAKxC,aAAae,QAAQ;IACnD;IAEA2C,cAAc;QACZ,OAAO,IAAI,CAACvD,cAAc;IAC5B;IAEAwD,oBAAoB;QAClB,OAAO,IAAI,CAACnB,WAAW,KAAKxC,aAAasB,MAAM,IAAI,IAAI,CAACkB,WAAW,KAAKxC,aAAaoB,OAAO;IAC9F;IAEA;;GAEC,GACDwC,oBAAoBC,WAAW,EAAE;QAC/B,MAAM,EAAEhC,SAAS,EAAEC,QAAQ,EAAEgC,QAAQ,EAAE,GAAGD;QAC1C,IAAI,CAAChC,SAAS,GAAGA;QACjB,IAAI,CAACC,QAAQ,GAAGA;QAEhB,MAAMiC,UAAUC,IAAAA,0BAAY,EAAC,IAAI,CAAClC,QAAQ,CAACmC,UAAU;QACrD,MAAMC,QAAQC,IAAAA,qBAAW,EAACJ,SAASD;QACnCI,MAAME,QAAQ,GAAG;QACjB,IAAI,CAACrC,SAAS,GAAGmC;IACnB;IAEAG,KAAKC,CAAC,EAAE;QACN,IAAI,IAAI,CAACC,MAAM,EAAE;YACf,MAAM,IAAIC,MAAM,CAAC,kCAAkC,EAAE,IAAI,CAAC3C,SAAS,CAAC,uBAAuB,CAAC;QAC9F;QACA,KAAK,CAACwC,KAAK,IAAI,CAACtC,SAAS;IAC3B;IAEA0C,QAAQ;QACN,KAAK,CAACA;IACR;IAEA,MAAMC,aAAaC,WAAyBvB,6BAAY,CAACwB,yBAAyB,EAAiB;QACjG,OAAO,MAAM,IAAI,CAACC,WAAW,CAACC,KAAKC,SAAS,CAAC;YAAEJ;QAAS;IAC1D;IAEA,MAAMK,gBAAgB;QACpB,MAAM,IAAI,CAACC,kBAAkB;QAC7B,MAAM,IAAI,CAACC,QAAQ;QACnB,IAAI,CAACC,mBAAmB;IAC1B;IAEA;;GAEC,GACD,MAAMF,qBAAoC;QACxC,IAAI,CAACG,gBAAgB;QACrB,IAAI,CAACpD,UAAU,GAAG,MAAM,IAAI,CAACE,mBAAmB,CAC7CmD,KAAK,CAAC,IAAI,CAACvD,QAAQ,EACnBwD,IAAI,CAAC,CAACC;YACL,+BAA+B;YAC/B,IAAIA,EAAEtC,IAAI,KAAK,QAAQ;gBACrB,IAAI,CAACuC,WAAW,CAAC3F,UAAU4B,SAAS;gBACpC,IAAI,CAACgE,cAAc,CAACzF,aAAaoB,OAAO;gBACxC,MAAM,IAAIsE,uCAAoB,CAAC;YACjC,OAAO,IAAIH,EAAEI,KAAK,EAAEC,KAAK,CAAC,EAAE,KAAK,UAAU;gBACzC,IAAI,CAACxD,MAAM,CAACyD,IAAI,CAAC;gBACjB,wEAAwE;gBACxE,IAAI,CAACL,WAAW,CAAC3F,UAAU6B,QAAQ;gBACnC,IAAI,CAAC+D,cAAc,CAACzF,aAAaoB,OAAO;gBACxC,MAAM,IAAIsE,uCAAoB,CAAC;YACjC;YACA,IAAI,CAACF,WAAW,CAAC3F,UAAU8B,UAAU;YACrC,IAAI,CAAC8D,cAAc,CAACzF,aAAagB,OAAO;YACxC,OAAOuE;QACT,GACCO,KAAK,CAAC,CAACC;YACN,IAAI,CAACN,cAAc,CAACzF,aAAaoB,OAAO;YACxC,oCAAoC;YACpC,IAAI2E,aAAaL,uCAAoB,EAAE;gBACrC,IAAI,CAACtD,MAAM,CAACyD,IAAI,CAAC,CAAC,iCAAiC,EAAE,IAAI,CAAChE,SAAS,CAAC,aAAa,EAAE,IAAI,CAACc,QAAQ,CAAC,CAAC;gBAClG,MAAMoD;YACR,OAAO;gBACL,IAAIA,GAAGC,UAAUC,WAAW,KAAK;oBAC/B,IAAI,CAACT,WAAW,CAAC3F,UAAU6B,QAAQ;oBACnC,IAAI,CAAC+D,cAAc,CAACzF,aAAaoB,OAAO;oBACxC,MAAM,IAAIsE,uCAAoB,CAACK;gBACjC;gBACA,IAAI,CAAC3D,MAAM,CAACf,KAAK,CAAC,CAAC,SAAS,EAAE,IAAI,CAACQ,SAAS,CAAC,yDAAyD,EAAEkE,EAAE,CAAC;gBAC3G,IAAI,CAACP,WAAW,CAAC3F,UAAU2B,UAAU;YACvC;YACA,MAAMuE;QACR;QAEF,IAAI,CAAC9D,QAAQ,GAAG,MAAM,IAAI,CAACC,mBAAmB,CAACgE,qBAAqB,CAAC,IAAI,CAACpE,QAAQ,EAAEgE,KAAK,CAAC,CAACC;YACzF,MAAME,SAASF,EAAEC,QAAQ,EAAEC;YAC3B,IAAIA,WAAWE,wCAAc,CAACC,SAAS,EAAE;gBACvC,IAAI,CAACZ,WAAW,CAAC3F,UAAU6B,QAAQ;gBACnC,IAAI,CAAC+D,cAAc,CAACzF,aAAaoB,OAAO;YAC1C,OAAO;gBACL,IAAI,CAACoE,WAAW,CAAC3F,UAAU6B,QAAQ;gBACnC,IAAI,CAAC+D,cAAc,CAACzF,aAAaoB,OAAO;YAC1C;YACA,IACE;gBACE+E,wCAAc,CAACE,WAAW;gBAC1BF,wCAAc,CAACG,eAAe;gBAC9BH,wCAAc,CAACI,mBAAmB;gBAClCJ,wCAAc,CAACK,eAAe;aAC/B,CAACC,QAAQ,CAACR,SACX;gBACA,IAAI,CAAC7D,MAAM,CAACf,KAAK,CAAC,CAAC,0BAA0B,EAAE4E,OAAO,iDAAiD,CAAC;YAC1G;YACA,MAAMF;QACR;IACF;IAEA;;;GAGC,GACD,MAAMW,YAAYpG,KAAK,EAAE;QACvB,IAAI,CAACmF,cAAc,CAACzF,aAAakB,MAAM;QACvC,MAAM,IAAI,CAACgE,QAAQ;QACnB,MAAM,IAAI,CAACR,YAAY,CAACtB,6BAAY,CAACwB,yBAAyB;IAChE;IAEA;;;GAGC,GACD,MAAM+B,UAAUC,OAAO,EAAE;QACvB,IAAI,CAAChE,4BAA4B,GAAGiE,KAAKC,GAAG;QAE5C,IAAI,IAAI,CAACtE,WAAW,KAAKxC,aAAamB,aAAa,EAAE;YACnD,IAAI,CAACsE,cAAc,CAACzF,aAAamB,aAAa;QAChD;QAEA,MAAM4F,OAAOjC,KAAKkC,KAAK,CAACJ;QACxB;;KAEC,GACD,MAAMK,YAAYC,OAAOC,IAAI,CAACJ,KAAK,CAAC,EAAE;QACtC,MAAMK,UAAUL,IAAI,CAACE,UAAU;QAE/B,IAAIA,cAAcnH,QAAQK,cAAc,EAAE;YACxC,IAAI,CAACkH,iBAAiB;QACxB;QAEA,oCAAoC;QACpC,MAAM,IAAI,CAACC,SAAS,CAACL,WAAWG;IAClC;IAEA;;;GAGC,GACD,MAAMlC,WAAW;QACf,IAAI,CAACO,cAAc,CAACzF,aAAaiB,cAAc;QAC/C,MAAM,IAAI,CAAC4D,WAAW,CACpBC,KAAKC,SAAS,CAAC;YACbwC,MAAM,CAAC,EAAE,IAAI,CAACtF,QAAQ,CAAC,CAAC,EAAE,IAAI,CAACD,UAAU,CAACwF,OAAO,CAAC,CAAC;QACrD;IAEF,gDAAgD;IAClD;IAEA,MAAMC,YAAYnH,KAAK,EAAE;QACvB,IAAI,CAACmF,cAAc,CAACzF,aAAasB,MAAM;QACvC,OAAO,IAAI,CAACiD,MAAM;QAClB,MAAM,IAAI,CAAC+C,SAAS,CAACxH,QAAQa,SAAS;IACxC;IAEA,MAAM+G,QAAQrG,KAAK,EAAE;QACnB,IAAI,CAACoE,cAAc,CAACzF,aAAaqB,KAAK;QACtC,MAAM,IAAI,CAACiG,SAAS,CAACxH,QAAQc,QAAQ,EAAES;IACzC;IAEAgG,oBAAoB;QAClB,IAAI,CAAClH,cAAc,GAAG;QACtB,IAAI,CAAC0C,uBAAuB,GAAGgE,KAAKC,GAAG;IACzC;IAEA3B,sBAAsB;QACpB,IAAI,CAAChF,cAAc,GAAG;QACtB,IAAI,CAAC0C,uBAAuB,GAAG;IACjC;IAEAuC,mBAAmB;QACjB,IAAI,CAACK,cAAc,CAACzF,aAAae,QAAQ;QACzC,IAAI,CAACyE,WAAW,CAAC3F,UAAU0B,KAAK;IAClC;IAEA;;;GAGC,GACDiE,YAAYmC,KAAK,EAAE;QACjB,IAAI,CAAChF,QAAQ,GAAGgF;QAChB,IAAI,CAAClF,eAAe,GAAG;QACvB,IAAI,CAACC,uBAAuB,GAAGmE,KAAKC,GAAG;QACvC,IAAI,IAAI,CAAC5D,UAAU,EAAE;YACnB,IAAI,CAACd,MAAM,CAACwF,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC/F,SAAS,CAAC,uBAAuB,CAAC,GAAG8F;QAC/D;QACA,IAAI,CAACE,aAAa,CAAC/H,QAAQe,iBAAiB,EAAE8G;IAChD;IAEA;;;GAGC,GACDlC,eAAekC,KAAK,EAAE;QACpB,IAAI,CAACnF,WAAW,GAAGmF;QACnB,IAAI,CAACrF,YAAY,GAAG;QACpB,IAAI,CAACC,oBAAoB,GAAGsE,KAAKC,GAAG;QACpC,IAAI,IAAI,CAAC5D,UAAU,EAAE;YACnB,IAAI,CAACd,MAAM,CAACwF,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC/F,SAAS,CAAC,0BAA0B,CAAC,GAAG8F;QAClE;QACA,IAAI,CAACE,aAAa,CAAC/H,QAAQgB,gBAAgB,EAAE6G;IAC/C;IAEA;;;;GAIC,GACD,MAAML,UAAUhH,KAAK,EAAE8G,OAAO,EAAE;QAC9B;;KAEC,GACD,MAAML,OAAO;YACXzG;YACA8G;YACAvF,WAAW,IAAI,CAACA,SAAS;QAC3B;QACA,MAAM,IAAI,CAACM,YAAY,CAAC2F,SAAS,CAAC7H,eAAeK,QAAQyG;IAC3D;IAEAc,cAAcvH,KAAK,EAAE8G,OAAO,EAAE;QAC5B,MAAML,OAAO;YACXzG;YACA8G;YACAvF,WAAW,IAAI,CAACA,SAAS;QAC3B;QACA,IAAI,CAACM,YAAY,CAAC4F,IAAI,CAAC9H,eAAeK,QAAQyG;IAChD;AACF"}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|