@fdm-monster/server 1.8.2 → 1.9.0-rc1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.env.template +5 -3
- package/.gitattributes +4 -2
- package/.yarn/install-state.gz +0 -0
- package/.yarn/releases/yarn-4.9.1.cjs +948 -0
- package/.yarnrc.yml +1 -1
- package/README.md +25 -26
- package/RELEASE_NOTES.MD +69 -7
- package/biome.json +33 -0
- package/dist/consoles/download-github-releases.js.map +1 -1
- package/dist/consoles/launch-http-servers.js +31 -0
- package/dist/consoles/launch-http-servers.js.map +1 -0
- package/dist/consoles/mock-octoprint.server.js +291 -0
- package/dist/consoles/mock-octoprint.server.js.map +1 -0
- package/dist/consoles/mock-prusalink.server.js +57 -0
- package/dist/consoles/mock-prusalink.server.js.map +1 -0
- package/dist/consoles/utils/api-messages.js +856 -0
- package/dist/consoles/utils/api-messages.js.map +1 -0
- package/dist/consoles/utils/delayed-memory.storage.js +42 -0
- package/dist/consoles/utils/delayed-memory.storage.js.map +1 -0
- package/dist/consoles/utils/ws-messages.js +88 -0
- package/dist/consoles/utils/ws-messages.js.map +1 -0
- package/dist/constants/event.constants.js +11 -19
- package/dist/constants/event.constants.js.map +1 -1
- package/dist/constants/server-settings.constants.js +6 -11
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/container.js +15 -24
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +4 -5
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/auth.controller.js +114 -24
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/batch-call.controller.js +95 -24
- package/dist/controllers/batch-call.controller.js.map +1 -1
- package/dist/controllers/camera-stream.controller.js +16 -12
- package/dist/controllers/camera-stream.controller.js.map +1 -1
- package/dist/controllers/custom-gcode.controller.js +116 -40
- package/dist/controllers/custom-gcode.controller.js.map +1 -1
- package/dist/controllers/dto/update-client-dist.dto.js +0 -21
- package/dist/controllers/dto/update-client-dist.dto.js.map +1 -1
- package/dist/controllers/first-time-setup.controller.js +54 -18
- package/dist/controllers/first-time-setup.controller.js.map +1 -1
- package/dist/controllers/floor.controller.js +154 -43
- package/dist/controllers/floor.controller.js.map +1 -1
- package/dist/controllers/metrics.controller.js +56 -0
- package/dist/controllers/metrics.controller.js.map +1 -0
- package/dist/controllers/print-completion.controller.js +81 -18
- package/dist/controllers/print-completion.controller.js.map +1 -1
- package/dist/controllers/printer-files.controller.js +61 -50
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer-group.controller.js +123 -33
- package/dist/controllers/printer-group.controller.js.map +1 -1
- package/dist/controllers/printer-settings.controller.js +76 -29
- package/dist/controllers/printer-settings.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +62 -197
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +153 -39
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +79 -84
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/controllers/settings.controller.js +222 -79
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/controllers/user.controller.js +67 -57
- package/dist/controllers/user.controller.js.map +1 -1
- package/dist/controllers/validation/auth-controller.validation.js +6 -5
- package/dist/controllers/validation/auth-controller.validation.js.map +1 -1
- package/dist/controllers/validation/batch-controller.validation.js +17 -18
- package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
- package/dist/controllers/validation/generic.validation.js +8 -3
- package/dist/controllers/validation/generic.validation.js.map +1 -1
- package/dist/controllers/validation/printer-completion-controller.validation.js +16 -0
- package/dist/controllers/validation/printer-completion-controller.validation.js.map +1 -0
- package/dist/controllers/validation/printer-controller.validation.js +31 -50
- package/dist/controllers/validation/printer-controller.validation.js.map +1 -1
- package/dist/controllers/validation/printer-files-controller.validation.js +16 -15
- package/dist/controllers/validation/printer-files-controller.validation.js.map +1 -1
- package/dist/controllers/validation/printer-settings-controller.validation.js +6 -5
- package/dist/controllers/validation/printer-settings-controller.validation.js.map +1 -1
- package/dist/controllers/validation/server-private.validation.js +17 -0
- package/dist/controllers/validation/server-private.validation.js.map +1 -0
- package/dist/controllers/validation/setting.validation.js +28 -10
- package/dist/controllers/validation/setting.validation.js.map +1 -1
- package/dist/controllers/validation/user-controller.validation.js +44 -13
- package/dist/controllers/validation/user-controller.validation.js.map +1 -1
- package/dist/data-source.js +10 -6
- package/dist/data-source.js.map +1 -1
- package/dist/entities/camera-stream.entity.js +2 -3
- package/dist/entities/camera-stream.entity.js.map +1 -1
- package/dist/entities/custom-gcode.entity.js +1 -2
- package/dist/entities/custom-gcode.entity.js.map +1 -1
- package/dist/entities/floor-position.entity.js.map +1 -1
- package/dist/entities/floor.entity.js +1 -2
- package/dist/entities/floor.entity.js.map +1 -1
- package/dist/entities/group.entity.js +6 -2
- package/dist/entities/group.entity.js.map +1 -1
- package/dist/entities/permission.entity.js +1 -2
- package/dist/entities/permission.entity.js.map +1 -1
- package/dist/entities/print-completion.entity.js +1 -2
- package/dist/entities/print-completion.entity.js.map +1 -1
- package/dist/entities/printer-group.entity.js +6 -2
- package/dist/entities/printer-group.entity.js.map +1 -1
- package/dist/entities/printer.entity.js +22 -4
- package/dist/entities/printer.entity.js.map +1 -1
- package/dist/entities/refresh-token.entity.js +1 -2
- package/dist/entities/refresh-token.entity.js.map +1 -1
- package/dist/entities/role.entity.js +1 -2
- package/dist/entities/role.entity.js.map +1 -1
- package/dist/entities/settings.entity.js +1 -2
- package/dist/entities/settings.entity.js.map +1 -1
- package/dist/entities/user-role.entity.js +1 -2
- package/dist/entities/user-role.entity.js.map +1 -1
- package/dist/entities/user.entity.js +1 -2
- package/dist/entities/user.entity.js.map +1 -1
- package/dist/exceptions/runtime.exceptions.js.map +1 -1
- package/dist/handlers/logger.js +131 -36
- package/dist/handlers/logger.js.map +1 -1
- package/dist/handlers/validators.js +7 -113
- package/dist/handlers/validators.js.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/middleware/authenticate.js +11 -22
- package/dist/middleware/authenticate.js.map +1 -1
- package/dist/middleware/database.js.map +1 -1
- package/dist/middleware/demo.middleware.js +4 -17
- package/dist/middleware/demo.middleware.js.map +1 -1
- package/dist/middleware/exception.filter.js +23 -23
- package/dist/middleware/exception.filter.js.map +1 -1
- package/dist/middleware/global.middleware.js +4 -4
- package/dist/middleware/global.middleware.js.map +1 -1
- package/dist/middleware/param-converter.middleware.js +81 -0
- package/dist/middleware/param-converter.middleware.js.map +1 -0
- package/dist/middleware/passport.js +3 -5
- package/dist/middleware/passport.js.map +1 -1
- package/dist/middleware/printer-resolver.js +37 -0
- package/dist/middleware/printer-resolver.js.map +1 -0
- package/dist/middleware/printer.js +22 -10
- package/dist/middleware/printer.js.map +1 -1
- package/dist/middleware/socketio.middleware.js +27 -0
- package/dist/middleware/socketio.middleware.js.map +1 -0
- package/dist/migrations/1706829146617-InitSqlite.js +1 -1
- package/dist/migrations/1706829146617-InitSqlite.js.map +1 -1
- package/dist/migrations/1707494762198-PrinterGroup.js +1 -1
- package/dist/migrations/1707494762198-PrinterGroup.js.map +1 -1
- package/dist/migrations/1708465930665-ChangePrintCompletionDeletePrinterCascade.js +1 -1
- package/dist/migrations/1708465930665-ChangePrintCompletionDeletePrinterCascade.js.map +1 -1
- package/dist/migrations/1713897879622-AddPrinterType.js +1 -1
- package/dist/migrations/1713897879622-AddPrinterType.js.map +1 -1
- package/dist/migrations/1745141688926-AddPrinterUsernamePassword.js +229 -0
- package/dist/migrations/1745141688926-AddPrinterUsernamePassword.js.map +1 -0
- package/dist/models/Auth/Permission.js.map +1 -1
- package/dist/models/Auth/RefreshToken.js +1 -1
- package/dist/models/Auth/RefreshToken.js.map +1 -1
- package/dist/models/Auth/Role.js.map +1 -1
- package/dist/models/Auth/User.js.map +1 -1
- package/dist/models/CameraStream.js +20 -0
- package/dist/models/CameraStream.js.map +1 -1
- package/dist/models/CustomGcode.js.map +1 -1
- package/dist/models/Floor.js.map +1 -1
- package/dist/models/FloorPrinter.js +10 -1
- package/dist/models/FloorPrinter.js.map +1 -1
- package/dist/models/PrintCompletion.js.map +1 -1
- package/dist/models/Printer.js +12 -5
- package/dist/models/Printer.js.map +1 -1
- package/dist/models/Settings.js +5 -42
- package/dist/models/Settings.js.map +1 -1
- package/dist/models/index.js +0 -4
- package/dist/models/index.js.map +1 -1
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js.map +1 -1
- package/dist/mongo-migrations/20210907173950-printers-enabled.js.map +1 -1
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js.map +1 -1
- package/dist/mongo-migrations/20230414141005-floor-remove-groupinfloor.js.map +1 -1
- package/dist/mongo-migrations/20230427202911-printer-remove-sortindex.js.map +1 -1
- package/dist/mongo-migrations/20230716065316-user-remove-name.js.map +1 -1
- package/dist/mongo-migrations/20231111081809-printer-flatten-name.js.map +1 -1
- package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js.map +1 -1
- package/dist/mongo-migrations/20231202183902-printer-files-simpler.js.map +1 -1
- package/dist/server.constants.js +7 -4
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js +29 -2
- package/dist/server.core.js.map +1 -1
- package/dist/server.env.js +13 -8
- package/dist/server.env.js.map +1 -1
- package/dist/server.host.js +24 -31
- package/dist/server.host.js.map +1 -1
- package/dist/services/authentication/auth.service.js +15 -20
- package/dist/services/authentication/auth.service.js.map +1 -1
- package/dist/services/authentication/jwt.service.js +1 -1
- package/dist/services/authentication/jwt.service.js.map +1 -1
- package/dist/services/core/batch-call.service.js +23 -25
- package/dist/services/core/batch-call.service.js.map +1 -1
- package/dist/services/core/client-bundle.service.js +78 -136
- package/dist/services/core/client-bundle.service.js.map +1 -1
- package/dist/services/core/config.service.js.map +1 -1
- package/dist/services/core/cradle.service.js +21 -0
- package/dist/services/core/cradle.service.js.map +1 -0
- package/dist/services/core/github.service.js +2 -2
- package/dist/services/core/github.service.js.map +1 -1
- package/dist/services/core/http-client.factory.js +40 -0
- package/dist/services/core/http-client.factory.js.map +1 -0
- package/dist/services/core/logs-manager.service.js +7 -6
- package/dist/services/core/logs-manager.service.js.map +1 -1
- package/dist/services/core/monsterpi.service.js +1 -1
- package/dist/services/core/monsterpi.service.js.map +1 -1
- package/dist/services/core/multer.service.js +79 -28
- package/dist/services/core/multer.service.js.map +1 -1
- package/dist/services/core/server-release.service.js +14 -8
- package/dist/services/core/server-release.service.js.map +1 -1
- package/dist/services/core/yaml.service.js +16 -17
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/interfaces/camera-stream.dto.js +4 -34
- package/dist/services/interfaces/camera-stream.dto.js.map +1 -1
- package/dist/services/interfaces/custom-gcode.dto.js.map +1 -1
- package/dist/services/interfaces/file-upload-tracker.interface.js +6 -0
- package/dist/services/interfaces/file-upload-tracker.interface.js.map +1 -0
- package/dist/services/interfaces/floor.dto.js +5 -47
- package/dist/services/interfaces/floor.dto.js.map +1 -1
- package/dist/services/interfaces/login.dto.js +2 -0
- package/dist/services/interfaces/login.dto.js.map +1 -1
- package/dist/services/interfaces/print-completion.dto.js.map +1 -1
- package/dist/services/interfaces/printer-group.dto.js +0 -14
- package/dist/services/interfaces/printer-group.dto.js.map +1 -1
- package/dist/services/interfaces/printer.dto.js +11 -5
- package/dist/services/interfaces/printer.dto.js.map +1 -1
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/interfaces/task.interfaces.js +6 -0
- package/dist/services/interfaces/task.interfaces.js.map +1 -0
- package/dist/services/mongoose/camera-stream.service.js +17 -15
- package/dist/services/mongoose/camera-stream.service.js.map +1 -1
- package/dist/services/mongoose/custom-gcode.service.js +4 -2
- package/dist/services/mongoose/custom-gcode.service.js.map +1 -1
- package/dist/services/mongoose/floor.service.js +37 -30
- package/dist/services/mongoose/floor.service.js.map +1 -1
- package/dist/services/mongoose/permission.service.js +1 -1
- package/dist/services/mongoose/permission.service.js.map +1 -1
- package/dist/services/mongoose/print-completion.service.js +2 -2
- package/dist/services/mongoose/print-completion.service.js.map +1 -1
- package/dist/services/mongoose/print-completion.shared.js +2 -2
- package/dist/services/mongoose/print-completion.shared.js.map +1 -1
- package/dist/services/mongoose/printer.service.js +40 -45
- package/dist/services/mongoose/printer.service.js.map +1 -1
- package/dist/services/mongoose/refresh-token.service.js +5 -8
- package/dist/services/mongoose/refresh-token.service.js.map +1 -1
- package/dist/services/mongoose/role.service.js +14 -5
- package/dist/services/mongoose/role.service.js.map +1 -1
- package/dist/services/mongoose/settings.service.js +35 -62
- package/dist/services/mongoose/settings.service.js.map +1 -1
- package/dist/services/mongoose/user.service.js +8 -7
- package/dist/services/mongoose/user.service.js.map +1 -1
- package/dist/services/moonraker/constants/{websocket.constants.js → moonraker.constants.js} +1 -1
- package/dist/services/moonraker/constants/{websocket.constants.js.map → moonraker.constants.js.map} +1 -1
- package/dist/services/moonraker/moonraker-websocket.adapter.js +108 -96
- package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
- package/dist/services/moonraker/moonraker.client.js +212 -167
- package/dist/services/moonraker/moonraker.client.js.map +1 -1
- package/dist/services/moonraker.api.js +3 -5
- package/dist/services/moonraker.api.js.map +1 -1
- package/dist/services/octoprint/constants/octoprint-service.constants.js +7 -36
- package/dist/services/octoprint/constants/octoprint-service.constants.js.map +1 -1
- package/dist/services/octoprint/constants/octoprint-websocket.constants.js +12 -3
- package/dist/services/octoprint/constants/octoprint-websocket.constants.js.map +1 -1
- package/dist/services/octoprint/dto/octoprint-event.dto.js +2 -1
- package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.routes.js +0 -98
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-websocket.adapter.js +72 -72
- package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -1
- package/dist/services/octoprint/octoprint.client.js +87 -343
- package/dist/services/octoprint/octoprint.client.js.map +1 -1
- package/dist/services/octoprint/utils/octoprint-http-client.builder.js +31 -0
- package/dist/services/octoprint/utils/octoprint-http-client.builder.js.map +1 -0
- package/dist/services/octoprint.api.js +14 -18
- package/dist/services/octoprint.api.js.map +1 -1
- package/dist/services/orm/base.service.js +11 -12
- package/dist/services/orm/base.service.js.map +1 -1
- package/dist/services/orm/camera-stream.service.js +5 -1
- package/dist/services/orm/camera-stream.service.js.map +1 -1
- package/dist/services/orm/custom-gcode.service.js +2 -2
- package/dist/services/orm/custom-gcode.service.js.map +1 -1
- package/dist/services/orm/floor-position.service.js +0 -5
- package/dist/services/orm/floor-position.service.js.map +1 -1
- package/dist/services/orm/floor.service.js +43 -39
- package/dist/services/orm/floor.service.js.map +1 -1
- package/dist/services/orm/permission.service.js +3 -4
- package/dist/services/orm/permission.service.js.map +1 -1
- package/dist/services/orm/print-completion.service.js +2 -4
- package/dist/services/orm/print-completion.service.js.map +1 -1
- package/dist/services/orm/printer-group.service.js +2 -7
- package/dist/services/orm/printer-group.service.js.map +1 -1
- package/dist/services/orm/printer.service.js +29 -39
- package/dist/services/orm/printer.service.js.map +1 -1
- package/dist/services/orm/refresh-token.service.js +5 -11
- package/dist/services/orm/refresh-token.service.js.map +1 -1
- package/dist/services/orm/role.service.js +11 -10
- package/dist/services/orm/role.service.js.map +1 -1
- package/dist/services/orm/settings.service.js +37 -133
- package/dist/services/orm/settings.service.js.map +1 -1
- package/dist/services/orm/user.service.js +13 -15
- package/dist/services/orm/user.service.js.map +1 -1
- package/dist/services/printer-api.factory.js +9 -6
- package/dist/services/printer-api.factory.js.map +1 -1
- package/dist/services/printer-api.interface.js +13 -6
- package/dist/services/printer-api.interface.js.map +1 -1
- package/dist/services/prusa-link/constants/prusalink-event.dto.js +18 -0
- package/dist/services/prusa-link/constants/prusalink-event.dto.js.map +1 -0
- package/dist/services/prusa-link/constants/prusalink.constants.js +13 -0
- package/dist/services/prusa-link/constants/prusalink.constants.js.map +1 -0
- package/dist/services/prusa-link/dto/file-response.dto.js +6 -0
- package/dist/services/prusa-link/dto/file-response.dto.js.map +1 -0
- package/dist/services/prusa-link/dto/file.dto.js +6 -0
- package/dist/services/prusa-link/dto/file.dto.js.map +1 -0
- package/dist/services/prusa-link/dto/job-state.dto.js +6 -0
- package/dist/services/prusa-link/dto/job-state.dto.js.map +1 -0
- package/dist/services/prusa-link/dto/printer-state.dto.js +6 -0
- package/dist/services/prusa-link/dto/printer-state.dto.js.map +1 -0
- package/dist/services/prusa-link/dto/status.dto.js +6 -0
- package/dist/services/prusa-link/dto/status.dto.js.map +1 -0
- package/dist/services/prusa-link/dto/version.dto.js +6 -0
- package/dist/services/prusa-link/dto/version.dto.js.map +1 -0
- package/dist/services/prusa-link/prusa-link-http-polling.adapter.js +142 -0
- package/dist/services/prusa-link/prusa-link-http-polling.adapter.js.map +1 -0
- package/dist/services/prusa-link/prusa-link.api.js +233 -0
- package/dist/services/prusa-link/prusa-link.api.js.map +1 -0
- package/dist/services/prusa-link/utils/digest-auth.params.js +6 -0
- package/dist/services/prusa-link/utils/digest-auth.params.js.map +1 -0
- package/dist/services/prusa-link/utils/digest-auth.util.js +28 -0
- package/dist/services/prusa-link/utils/digest-auth.util.js.map +1 -0
- package/dist/services/prusa-link/utils/prusa-link-http-client.builder.js +131 -0
- package/dist/services/prusa-link/utils/prusa-link-http-client.builder.js.map +1 -0
- package/dist/services/socket.factory.js +9 -6
- package/dist/services/socket.factory.js.map +1 -1
- package/dist/services/{core/task-manager.service.js → task-manager.service.js} +72 -78
- package/dist/services/task-manager.service.js.map +1 -0
- package/dist/services/validators/camera-service.validation.js +19 -0
- package/dist/services/validators/camera-service.validation.js.map +1 -0
- package/dist/services/validators/floor-service.validation.js +47 -36
- package/dist/services/validators/floor-service.validation.js.map +1 -1
- package/dist/services/validators/print-completion-service.validation.js +22 -9
- package/dist/services/validators/print-completion-service.validation.js.map +1 -1
- package/dist/services/validators/printer-service.validation.js +112 -29
- package/dist/services/validators/printer-service.validation.js.map +1 -1
- package/dist/services/validators/settings-service.validation.js +78 -66
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/services/validators/user-service.validation.js +17 -16
- package/dist/services/validators/user-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +94 -51
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/shared/default-http-client.builder.js +94 -0
- package/dist/shared/default-http-client.builder.js.map +1 -0
- package/dist/shared/load-controllers.js +20 -0
- package/dist/shared/load-controllers.js.map +1 -0
- package/dist/shared/runtime-settings.migration.js +46 -0
- package/dist/shared/runtime-settings.migration.js.map +1 -0
- package/dist/shared/websocket-rpc-extended.adapter.js +15 -14
- package/dist/shared/websocket-rpc-extended.adapter.js.map +1 -1
- package/dist/shared/websocket.adapter.js +4 -5
- package/dist/shared/websocket.adapter.js.map +1 -1
- package/dist/state/file-upload-tracker.cache.js +33 -42
- package/dist/state/file-upload-tracker.cache.js.map +1 -1
- package/dist/state/file.cache.js +1 -1
- package/dist/state/file.cache.js.map +1 -1
- package/dist/state/floor.store.js +6 -6
- package/dist/state/floor.store.js.map +1 -1
- package/dist/state/printer-events.cache.js +21 -22
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/printer-files.store.js +6 -8
- package/dist/state/printer-files.store.js.map +1 -1
- package/dist/state/printer-socket.store.js +27 -50
- package/dist/state/printer-socket.store.js.map +1 -1
- package/dist/state/printer-thumbnail.cache.js +5 -9
- package/dist/state/printer-thumbnail.cache.js.map +1 -1
- package/dist/state/printer.cache.js +14 -12
- package/dist/state/printer.cache.js.map +1 -1
- package/dist/state/settings.store.js +78 -51
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/socket-io.gateway.js +39 -36
- package/dist/state/socket-io.gateway.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +20 -15
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/dist/state/validation/create-test-printer.validation.js +13 -10
- package/dist/state/validation/create-test-printer.validation.js.map +1 -1
- package/dist/task.presets.js.map +1 -1
- package/dist/tasks/boot.task.js +14 -19
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/client-bundle.task.js +1 -3
- package/dist/tasks/client-bundle.task.js.map +1 -1
- package/dist/tasks/print-completion.socketio.task.js +27 -28
- package/dist/tasks/print-completion.socketio.task.js.map +1 -1
- package/dist/tasks/printer-file-clean.task.js +6 -10
- package/dist/tasks/printer-file-clean.task.js.map +1 -1
- package/dist/tasks/printer-websocket-restore.task.js +4 -15
- package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
- package/dist/tasks/printer-websocket.task.js +2 -14
- package/dist/tasks/printer-websocket.task.js.map +1 -1
- package/dist/tasks/socketio.task.js +8 -35
- package/dist/tasks/socketio.task.js.map +1 -1
- package/dist/tasks/software-update.task.js +1 -1
- package/dist/tasks/software-update.task.js.map +1 -1
- package/dist/tasks.js +3 -3
- package/dist/tasks.js.map +1 -1
- package/dist/utils/array.util.js.map +1 -1
- package/dist/utils/cache/key-diff.cache.js.map +1 -1
- package/dist/utils/env.utils.js +0 -2
- package/dist/utils/env.utils.js.map +1 -1
- package/dist/utils/normalize-url.js +6 -3
- package/dist/utils/normalize-url.js.map +1 -1
- package/dist/utils/pretty-print.utils.js +1 -1
- package/dist/utils/pretty-print.utils.js.map +1 -1
- package/dist/utils/printer-type.utils.js.map +1 -1
- package/dist/utils/time.utils.js +7 -17
- package/dist/utils/time.utils.js.map +1 -1
- package/dist/utils/url.utils.js +11 -14
- package/dist/utils/url.utils.js.map +1 -1
- package/package.json +53 -55
- package/tsconfig.json +2 -1
- package/.yarn/releases/yarn-4.6.0.cjs +0 -934
- package/dist/consoles/check-ports.js +0 -170
- package/dist/consoles/check-ports.js.map +0 -1
- package/dist/consoles/sqlite-torm.js +0 -31
- package/dist/consoles/sqlite-torm.js.map +0 -1
- package/dist/consoles/upload-test.js +0 -52
- package/dist/consoles/upload-test.js.map +0 -1
- package/dist/controllers/plugin-firmware-update.controller.js +0 -236
- package/dist/controllers/plugin-firmware-update.controller.js.map +0 -1
- package/dist/entities/base.entity.js +0 -29
- package/dist/entities/base.entity.js.map +0 -1
- package/dist/entities/printer-file.entity.js +0 -140
- package/dist/entities/printer-file.entity.js.map +0 -1
- package/dist/handlers/cache-manager.js +0 -18
- package/dist/handlers/cache-manager.js.map +0 -1
- package/dist/models/PrinterFile.js +0 -44
- package/dist/models/PrinterFile.js.map +0 -1
- package/dist/services/core/task-manager.service.js.map +0 -1
- package/dist/services/octoprint/plugin-base.service.js +0 -101
- package/dist/services/octoprint/plugin-base.service.js.map +0 -1
- package/dist/services/octoprint/plugin-firmware-update.service.js +0 -100
- package/dist/services/octoprint/plugin-firmware-update.service.js.map +0 -1
- package/dist/services/octoprint/plugin-repository.cache.js +0 -45
- package/dist/services/octoprint/plugin-repository.cache.js.map +0 -1
- package/dist/utils/benchmark.util.js +0 -39
- package/dist/utils/benchmark.util.js.map +0 -1
- package/dist/utils/is-docker.js +0 -40
- package/dist/utils/is-docker.js.map +0 -1
- package/dist/utils/metric.utils.js +0 -35
- package/dist/utils/metric.utils.js.map +0 -1
- package/requests/moonraker/api_job.http +0 -5
- package/requests/moonraker/api_printer.http +0 -5
- package/requests/moonraker/api_settings.http +0 -5
- package/requests/moonraker/printer_info.http +0 -5
- package/requests/moonraker/printer_objects_list.http +0 -6
- package/requests/moonraker/printer_objects_pause_resume.http +0 -6
- package/requests/moonraker/printer_objects_print_stats.http +0 -6
- package/requests/moonraker/printer_objects_webhooks.http +0 -6
- package/requests/moonraker/server_info.http +0 -5
- package/requests/octoprint/octoprint-api-printer-current.http +0 -7
- package/requests/octoprint/octoprint-pluginmanager-plugins.http +0 -7
- package/requests/printer-file/get-partial-file-moonraker.http +0 -5
- package/requests/printer-file/get-thumbnails.http +0 -5
- package/requests/printer-file/reload-printer-thumbnails.http +0 -10
- package/requests/printer-file/testfile.gcode +0 -5665
- package/requests/printer-file/upload-file.http +0 -11
- package/requests/printer-file/upload-slicer-file.http +0 -11
- package/requests/printers/list.http +0 -5
|
@@ -8,28 +8,71 @@ Object.defineProperty(exports, "MulterService", {
|
|
|
8
8
|
return MulterService;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
const _multer = /*#__PURE__*/
|
|
11
|
+
const _multer = /*#__PURE__*/ _interop_require_wildcard(require("multer"));
|
|
12
12
|
const _path = require("path");
|
|
13
13
|
const _fs = require("fs");
|
|
14
14
|
const _fsutils = require("../../utils/fs.utils");
|
|
15
15
|
const _serverconstants = require("../../server.constants");
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
const _nodefs = require("node:fs");
|
|
17
|
+
const _errorutils = require("../../utils/error.utils");
|
|
18
|
+
function _getRequireWildcardCache(nodeInterop) {
|
|
19
|
+
if (typeof WeakMap !== "function") return null;
|
|
20
|
+
var cacheBabelInterop = new WeakMap();
|
|
21
|
+
var cacheNodeInterop = new WeakMap();
|
|
22
|
+
return (_getRequireWildcardCache = function(nodeInterop) {
|
|
23
|
+
return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
|
|
24
|
+
})(nodeInterop);
|
|
25
|
+
}
|
|
26
|
+
function _interop_require_wildcard(obj, nodeInterop) {
|
|
27
|
+
if (!nodeInterop && obj && obj.__esModule) {
|
|
28
|
+
return obj;
|
|
29
|
+
}
|
|
30
|
+
if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
|
|
31
|
+
return {
|
|
32
|
+
default: obj
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
var cache = _getRequireWildcardCache(nodeInterop);
|
|
36
|
+
if (cache && cache.has(obj)) {
|
|
37
|
+
return cache.get(obj);
|
|
38
|
+
}
|
|
39
|
+
var newObj = {
|
|
40
|
+
__proto__: null
|
|
19
41
|
};
|
|
42
|
+
var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
|
|
43
|
+
for(var key in obj){
|
|
44
|
+
if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
|
|
45
|
+
var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
|
|
46
|
+
if (desc && (desc.get || desc.set)) {
|
|
47
|
+
Object.defineProperty(newObj, key, desc);
|
|
48
|
+
} else {
|
|
49
|
+
newObj[key] = obj[key];
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
newObj.default = obj;
|
|
54
|
+
if (cache) {
|
|
55
|
+
cache.set(obj, newObj);
|
|
56
|
+
}
|
|
57
|
+
return newObj;
|
|
20
58
|
}
|
|
21
59
|
class MulterService {
|
|
22
60
|
fileUploadTrackerCache;
|
|
23
|
-
|
|
24
|
-
|
|
61
|
+
httpClientFactory;
|
|
62
|
+
logger;
|
|
63
|
+
constructor(loggerFactory, fileUploadTrackerCache, httpClientFactory){
|
|
25
64
|
this.fileUploadTrackerCache = fileUploadTrackerCache;
|
|
26
|
-
this.
|
|
65
|
+
this.httpClientFactory = httpClientFactory;
|
|
66
|
+
this.orderRecentFiles = (dir)=>{
|
|
67
|
+
return (0, _fs.readdirSync)(dir).filter((file)=>(0, _fs.lstatSync)((0, _path.join)(dir, file)).isFile()).map((file)=>({
|
|
68
|
+
file,
|
|
69
|
+
mtime: (0, _fs.lstatSync)((0, _path.join)(dir, file)).mtime
|
|
70
|
+
})).sort((a, b)=>b.mtime.getTime() - a.mtime.getTime());
|
|
71
|
+
};
|
|
72
|
+
this.logger = loggerFactory(MulterService.name);
|
|
27
73
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
const files = this.orderRecentFiles(dirPath);
|
|
31
|
-
const latestFile = files.length ? files[0] : undefined;
|
|
32
|
-
return latestFile ? (0, _path.join)(dirPath, latestFile.file) : undefined;
|
|
74
|
+
startTrackingSession(multerFile, printerId) {
|
|
75
|
+
return this.fileUploadTrackerCache.addUploadTracker(multerFile, printerId);
|
|
33
76
|
}
|
|
34
77
|
clearUploadsFolder() {
|
|
35
78
|
const fileStoragePath = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder);
|
|
@@ -38,11 +81,26 @@ class MulterService {
|
|
|
38
81
|
withFileTypes: true
|
|
39
82
|
}).filter((item)=>!item.isDirectory()).map((item)=>item.name);
|
|
40
83
|
for (const file of files){
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
})
|
|
84
|
+
try {
|
|
85
|
+
(0, _nodefs.rmSync)((0, _path.join)(fileStoragePath, file));
|
|
86
|
+
} catch (error) {
|
|
87
|
+
this.logger.error(`Could not clear upload file in temporary folder ${(0, _errorutils.errorSummary)(error)}`);
|
|
88
|
+
}
|
|
44
89
|
}
|
|
45
90
|
}
|
|
91
|
+
clearUploadedFile(multerFile) {
|
|
92
|
+
if ((0, _fs.existsSync)(multerFile.path)) {
|
|
93
|
+
(0, _nodefs.rmSync)(multerFile.path);
|
|
94
|
+
} else {
|
|
95
|
+
this.logger.warn("Cannot unlink temporarily uploaded file as it was not found");
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
getNewestFile(collection) {
|
|
99
|
+
const dirPath = this.collectionPath(collection);
|
|
100
|
+
const files = this.orderRecentFiles(dirPath);
|
|
101
|
+
const latestFile = files.length ? files[0] : undefined;
|
|
102
|
+
return latestFile ? (0, _path.join)(dirPath, latestFile.file) : undefined;
|
|
103
|
+
}
|
|
46
104
|
fileExists(downloadFilename, collection) {
|
|
47
105
|
const downloadPath = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder, collection, downloadFilename);
|
|
48
106
|
return (0, _fs.existsSync)(downloadPath);
|
|
@@ -56,7 +114,8 @@ class MulterService {
|
|
|
56
114
|
}
|
|
57
115
|
const downloadPath = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder, collection, downloadFilename);
|
|
58
116
|
const fileStream = (0, _fs.createWriteStream)(downloadPath);
|
|
59
|
-
const
|
|
117
|
+
const defaultHttpClient = this.httpClientFactory.createDefaultClient();
|
|
118
|
+
const res = await defaultHttpClient.get(downloadUrl);
|
|
60
119
|
return await new Promise((resolve, reject)=>{
|
|
61
120
|
fileStream.write(res.data);
|
|
62
121
|
fileStream.on("error", (err)=>{
|
|
@@ -84,14 +143,14 @@ class MulterService {
|
|
|
84
143
|
}
|
|
85
144
|
getMulterFileFilter(fileExtensions, storeAsFile = true) {
|
|
86
145
|
return (0, _multer.default)({
|
|
87
|
-
storage: storeAsFile ? _multer.
|
|
146
|
+
storage: storeAsFile ? (0, _multer.diskStorage)({
|
|
88
147
|
destination: (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder)
|
|
89
|
-
}) : _multer.
|
|
148
|
+
}) : (0, _multer.memoryStorage)(),
|
|
90
149
|
fileFilter: this.multerFileFilter(fileExtensions)
|
|
91
150
|
}).any();
|
|
92
151
|
}
|
|
93
152
|
multerFileFilter(extensions) {
|
|
94
|
-
return (
|
|
153
|
+
return (_, file, callback)=>{
|
|
95
154
|
const ext = (0, _path.extname)(file.originalname);
|
|
96
155
|
if (extensions?.length && !extensions.includes(ext?.toLowerCase())) {
|
|
97
156
|
return callback(new Error(`Only files with extensions ${extensions} are allowed`));
|
|
@@ -99,18 +158,10 @@ class MulterService {
|
|
|
99
158
|
return callback(null, true);
|
|
100
159
|
};
|
|
101
160
|
}
|
|
102
|
-
startTrackingSession(multerFile) {
|
|
103
|
-
return this.fileUploadTrackerCache.addUploadTracker(multerFile);
|
|
104
|
-
}
|
|
105
161
|
getSessions() {
|
|
106
162
|
return this.fileUploadTrackerCache.getUploads();
|
|
107
163
|
}
|
|
108
|
-
orderRecentFiles
|
|
109
|
-
return (0, _fs.readdirSync)(dir).filter((file)=>(0, _fs.lstatSync)((0, _path.join)(dir, file)).isFile()).map((file)=>({
|
|
110
|
-
file,
|
|
111
|
-
mtime: (0, _fs.lstatSync)((0, _path.join)(dir, file)).mtime
|
|
112
|
-
})).sort((a, b)=>b.mtime.getTime() - a.mtime.getTime());
|
|
113
|
-
};
|
|
164
|
+
orderRecentFiles;
|
|
114
165
|
collectionPath(collection) {
|
|
115
166
|
return (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder, collection);
|
|
116
167
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/multer.service.ts"],"names":["MulterService","fileUploadTrackerCache","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/multer.service.ts"],"names":["MulterService","logger","constructor","loggerFactory","fileUploadTrackerCache","httpClientFactory","orderRecentFiles","dir","readdirSync","filter","file","lstatSync","join","isFile","map","mtime","sort","a","b","getTime","name","startTrackingSession","multerFile","printerId","addUploadTracker","clearUploadsFolder","fileStoragePath","superRootPath","AppConstants","defaultFileStorageFolder","existsSync","files","withFileTypes","item","isDirectory","rmSync","error","errorSummary","clearUploadedFile","path","warn","getNewestFile","collection","dirPath","collectionPath","latestFile","length","undefined","fileExists","downloadFilename","downloadPath","downloadFile","downloadUrl","downloadFolder","mkdirSync","recursive","fileStream","createWriteStream","defaultHttpClient","createDefaultClient","res","get","Promise","resolve","reject","write","data","on","err","getMulterGCodeFileFilter","storeAsFile","getMulterFileFilter","defaultAcceptedGcodeExtensions","multerLoadFileAsync","req","fileExtensions","multer","storage","diskStorage","destination","memoryStorage","fileFilter","multerFileFilter","any","extensions","_","callback","ext","extname","originalname","includes","toLowerCase","Error","getSessions","getUploads"],"mappings":"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"}
|
|
@@ -16,18 +16,24 @@ function _interop_require_default(obj) {
|
|
|
16
16
|
};
|
|
17
17
|
}
|
|
18
18
|
class ServerReleaseService {
|
|
19
|
-
|
|
19
|
+
serverVersion;
|
|
20
20
|
githubService;
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
21
|
+
airGapped;
|
|
22
|
+
synced;
|
|
23
|
+
installedReleaseFound;
|
|
24
|
+
updateAvailable;
|
|
25
|
+
latestRelease;
|
|
26
|
+
installedRelease;
|
|
26
27
|
logger;
|
|
27
|
-
serverVersion
|
|
28
|
-
constructor({ serverVersion, githubService, loggerFactory }){
|
|
28
|
+
constructor(loggerFactory, serverVersion, githubService){
|
|
29
29
|
this.serverVersion = serverVersion;
|
|
30
30
|
this.githubService = githubService;
|
|
31
|
+
this.airGapped = null;
|
|
32
|
+
this.synced = false;
|
|
33
|
+
this.installedReleaseFound = null;
|
|
34
|
+
this.updateAvailable = null;
|
|
35
|
+
this.latestRelease = null;
|
|
36
|
+
this.installedRelease = null;
|
|
31
37
|
this.logger = loggerFactory(ServerReleaseService.name);
|
|
32
38
|
}
|
|
33
39
|
getState() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/server-release.service.ts"],"names":["ServerReleaseService","airGapped","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/server-release.service.ts"],"names":["ServerReleaseService","airGapped","synced","installedReleaseFound","updateAvailable","latestRelease","installedRelease","logger","constructor","loggerFactory","serverVersion","githubService","name","getState","syncLatestRelease","wasAuthenticated","owner","AppConstants","orgName","repo","serverRepoName","response","getReleases","latestResponse","getLatestRelease","releases","data","length","warn","currentlyInstalledRelease","tag_name","lastTagIsNewer","semver","gt","logServerVersionState","latestReleaseState","latestReleaseTag","packageVersion","log","prerelease","error"],"mappings":"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"}
|
|
@@ -14,27 +14,25 @@ const _jsyaml = require("js-yaml");
|
|
|
14
14
|
const _printerapiinterface = require("../printer-api.interface");
|
|
15
15
|
class YamlService {
|
|
16
16
|
printerGroupService;
|
|
17
|
-
floorStore;
|
|
18
|
-
floorService;
|
|
19
17
|
printerService;
|
|
20
18
|
printerCache;
|
|
21
|
-
|
|
22
|
-
|
|
19
|
+
floorStore;
|
|
20
|
+
floorService;
|
|
23
21
|
isTypeormMode;
|
|
24
|
-
|
|
22
|
+
logger;
|
|
23
|
+
constructor(loggerFactory, printerGroupService, printerService, printerCache, floorStore, floorService, isTypeormMode){
|
|
25
24
|
this.printerGroupService = printerGroupService;
|
|
26
|
-
this.floorStore = floorStore;
|
|
27
25
|
this.printerService = printerService;
|
|
28
26
|
this.printerCache = printerCache;
|
|
27
|
+
this.floorStore = floorStore;
|
|
29
28
|
this.floorService = floorService;
|
|
30
|
-
this.serverVersion = serverVersion;
|
|
31
|
-
this.logger = loggerFactory(YamlService.name);
|
|
32
29
|
this.isTypeormMode = isTypeormMode;
|
|
30
|
+
this.logger = loggerFactory(YamlService.name);
|
|
33
31
|
}
|
|
34
32
|
async importPrintersAndFloors(yamlBuffer) {
|
|
35
33
|
const importSpec = await (0, _jsyaml.load)(yamlBuffer);
|
|
36
34
|
const databaseTypeSqlite = importSpec.databaseType === "sqlite";
|
|
37
|
-
const { exportPrinters, exportFloorGrid
|
|
35
|
+
const { exportPrinters, exportFloorGrid } = importSpec.config;
|
|
38
36
|
for (const printer of importSpec.printers){
|
|
39
37
|
if (!printer.name && printer.printerName) {
|
|
40
38
|
printer.name = printer.printerName;
|
|
@@ -66,18 +64,18 @@ class YamlService {
|
|
|
66
64
|
}
|
|
67
65
|
}
|
|
68
66
|
}
|
|
69
|
-
const importData = await (0, _validators.validateInput)(importSpec,
|
|
70
|
-
if (
|
|
67
|
+
const importData = await (0, _validators.validateInput)(importSpec, _yamlservicevalidation.importPrintersFloorsYamlSchema);
|
|
68
|
+
if (exportFloorGrid && importData.floors?.length) {
|
|
71
69
|
for (const floor of importData.floors){
|
|
72
|
-
await (0, _validators.validateInput)(floor,
|
|
70
|
+
await (0, _validators.validateInput)(floor, _yamlservicevalidation.importPrinterPositionsSchema);
|
|
73
71
|
}
|
|
74
72
|
}
|
|
75
73
|
this.logger.log("Analysing printers for import");
|
|
76
|
-
const { updateByPropertyPrinters, insertPrinters } = await this.analysePrintersUpsert(importData.printers, importData.config.printerComparisonStrategiesByPriority);
|
|
74
|
+
const { updateByPropertyPrinters, insertPrinters } = await this.analysePrintersUpsert(importData.printers ?? [], importData.config.printerComparisonStrategiesByPriority);
|
|
77
75
|
this.logger.log("Analysing floors for import");
|
|
78
|
-
const { updateByPropertyFloors, insertFloors } = await this.analyseFloorsUpsert(importData.floors, importData.config.floorComparisonStrategiesByPriority);
|
|
76
|
+
const { updateByPropertyFloors, insertFloors } = await this.analyseFloorsUpsert(importData.floors ?? [], importData.config.floorComparisonStrategiesByPriority);
|
|
79
77
|
this.logger.log("Analysing groups for import");
|
|
80
|
-
const { updateByNameGroups, insertGroups } = await this.analyseUpsertGroups(importData.groups);
|
|
78
|
+
const { updateByNameGroups, insertGroups } = await this.analyseUpsertGroups(importData.groups ?? []);
|
|
81
79
|
this.logger.log(`Performing pure insert printers (${insertPrinters.length} printers)`);
|
|
82
80
|
const printerIdMap = {};
|
|
83
81
|
for (const newPrinter of insertPrinters){
|
|
@@ -152,6 +150,7 @@ class YamlService {
|
|
|
152
150
|
delete floorPosition.id;
|
|
153
151
|
delete floorPosition.floorId;
|
|
154
152
|
floorPosition.printerId = knownPrinterId;
|
|
153
|
+
floorPosition.floorId = updateId;
|
|
155
154
|
knownPrinters.push(floorPosition);
|
|
156
155
|
}
|
|
157
156
|
updatedFloor.id = updateId;
|
|
@@ -361,11 +360,11 @@ class YamlService {
|
|
|
361
360
|
};
|
|
362
361
|
}
|
|
363
362
|
async exportPrintersAndFloors(options) {
|
|
364
|
-
const input = await (0, _validators.validateInput)(options, _yamlservicevalidation.
|
|
365
|
-
const { exportFloors, exportPrinters, exportFloorGrid, exportGroups } = input;
|
|
363
|
+
const input = await (0, _validators.validateInput)(options, _yamlservicevalidation.exportPrintersFloorsYamlSchema);
|
|
366
364
|
if (!this.isTypeormMode) {
|
|
367
365
|
input.exportGroups = false;
|
|
368
366
|
}
|
|
367
|
+
const { exportFloors, exportPrinters, exportFloorGrid, exportGroups } = input;
|
|
369
368
|
const dumpedObject = {
|
|
370
369
|
version: process.env.npm_package_version,
|
|
371
370
|
exportedAt: new Date(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/yaml.service.ts"],"names":["YamlService","printerGroupService","floorStore","floorService","printerService","printerCache","serverVersion","logger","isTypeormMode","constructor","loggerFactory","name","importPrintersAndFloors","yamlBuffer","importSpec","load","databaseTypeSqlite","databaseType","exportPrinters","exportFloorGrid","exportFloors","exportGroups","config","printer","printers","printerName","settingsAppearance","id","parseInt","OctoprintType","MoonrakerType","includes","printerType","floor","floors","printerId","importData","validateInput","importPrintersFloorsYamlRules","importPrinterPositionsRules","log","updateByPropertyPrinters","insertPrinters","analysePrintersUpsert","printerComparisonStrategiesByPriority","updateByPropertyFloors","insertFloors","analyseFloorsUpsert","floorComparisonStrategiesByPriority","updateByNameGroups","insertGroups","analyseUpsertGroups","groups","length","printerIdMap","newPrinter","state","create","Error","JSON","stringify","updatePrinterSpec","updateId","updatedPrinter","value","originalPrinterId","update","floorIdMap","newFloor","originalFloorId","knownPrinterPositions","floorPosition","knownPrinterId","floorId","push","createdFloor","updateFloorSpec","updatedFloor","knownPrinters","loadStore","group","createdGroup","createGroup","addPrinterToGroup","updateGroupSpec","existingGroup","getGroupWithPrinters","groupId","existingPrinterIds","map","p","wantedTargetPrinterIds","filter","unwantedId","eid","removePrinterFromGroup","nonExistingNewId","upsertPrinters","comparisonStrategies","existingPrinters","list","names","toLowerCase","urls","printerURL","ids","toString","strategy","comparedName","foundIndex","findIndex","n","upsertFloors","comparisonStrategy","existingFloors","floorLevels","comparedProperty","upsertGroups","existingGroups","listGroups","exportPrintersAndFloors","options","input","exportPrintersFloorsYamlRules","dumpedObject","version","process","env","npm_package_version","exportedAt","Date","undefined","apiKey","getLoginDto","disabledReason","enabled","dateAdded","listCache","f","dumpedFloor","fPrinterId","x","y","g","dump"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/yaml.service.ts"],"names":["YamlService","logger","constructor","loggerFactory","printerGroupService","printerService","printerCache","floorStore","floorService","isTypeormMode","name","importPrintersAndFloors","yamlBuffer","importSpec","load","databaseTypeSqlite","databaseType","exportPrinters","exportFloorGrid","config","printer","printers","printerName","settingsAppearance","id","parseInt","OctoprintType","MoonrakerType","includes","printerType","floor","floors","printerId","importData","validateInput","importPrintersFloorsYamlSchema","length","importPrinterPositionsSchema","log","updateByPropertyPrinters","insertPrinters","analysePrintersUpsert","printerComparisonStrategiesByPriority","updateByPropertyFloors","insertFloors","analyseFloorsUpsert","floorComparisonStrategiesByPriority","updateByNameGroups","insertGroups","analyseUpsertGroups","groups","printerIdMap","newPrinter","state","create","Error","JSON","stringify","updatePrinterSpec","updateId","updatedPrinter","value","originalPrinterId","update","floorIdMap","newFloor","originalFloorId","knownPrinterPositions","floorPosition","knownPrinterId","floorId","push","createdFloor","updateFloorSpec","updatedFloor","knownPrinters","loadStore","group","createdGroup","createGroup","addPrinterToGroup","updateGroupSpec","existingGroup","getGroupWithPrinters","groupId","existingPrinterIds","map","p","wantedTargetPrinterIds","filter","unwantedId","eid","removePrinterFromGroup","nonExistingNewId","upsertPrinters","comparisonStrategies","existingPrinters","list","names","toLowerCase","urls","printerURL","ids","toString","strategy","comparedName","foundIndex","findIndex","n","upsertFloors","comparisonStrategy","existingFloors","floorLevels","comparedProperty","upsertGroups","existingGroups","listGroups","exportPrintersAndFloors","options","input","exportPrintersFloorsYamlSchema","exportGroups","exportFloors","dumpedObject","version","process","env","npm_package_version","exportedAt","Date","undefined","apiKey","getLoginDto","disabledReason","enabled","dateAdded","listCache","f","dumpedFloor","fPrinterId","x","y","g","dump"],"mappings":"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"}
|
|
@@ -20,54 +20,24 @@ _export(exports, {
|
|
|
20
20
|
}
|
|
21
21
|
});
|
|
22
22
|
const _sharedconstants = require("../../shared.constants");
|
|
23
|
-
const _classvalidator = require("class-validator");
|
|
24
|
-
function _ts_decorate(decorators, target, key, desc) {
|
|
25
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
26
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
27
|
-
else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
28
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
29
|
-
}
|
|
30
|
-
function _ts_metadata(k, v) {
|
|
31
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
32
|
-
}
|
|
33
23
|
class CameraStreamDto extends _sharedconstants.IdDto {
|
|
34
24
|
name;
|
|
35
25
|
streamURL;
|
|
36
26
|
printerId;
|
|
27
|
+
aspectRatio;
|
|
28
|
+
rotationClockwise;
|
|
29
|
+
flipHorizontal;
|
|
30
|
+
flipVertical;
|
|
37
31
|
}
|
|
38
32
|
class CreateCameraStreamDto {
|
|
39
33
|
streamURL;
|
|
40
34
|
name;
|
|
41
35
|
printerId;
|
|
42
36
|
}
|
|
43
|
-
_ts_decorate([
|
|
44
|
-
(0, _classvalidator.IsNotEmpty)(),
|
|
45
|
-
_ts_metadata("design:type", String)
|
|
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);
|
|
51
|
-
_ts_decorate([
|
|
52
|
-
(0, _classvalidator.IsOptional)(),
|
|
53
|
-
_ts_metadata("design:type", typeof KeyType === "undefined" ? Object : KeyType)
|
|
54
|
-
], CreateCameraStreamDto.prototype, "printerId", void 0);
|
|
55
37
|
class UpdateCameraStreamDto {
|
|
56
38
|
streamURL;
|
|
57
39
|
name;
|
|
58
40
|
printerId;
|
|
59
41
|
}
|
|
60
|
-
_ts_decorate([
|
|
61
|
-
(0, _classvalidator.IsNotEmpty)(),
|
|
62
|
-
_ts_metadata("design:type", String)
|
|
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);
|
|
68
|
-
_ts_decorate([
|
|
69
|
-
(0, _classvalidator.IsOptional)(),
|
|
70
|
-
_ts_metadata("design:type", typeof KeyType === "undefined" ? Object : KeyType)
|
|
71
|
-
], UpdateCameraStreamDto.prototype, "printerId", void 0);
|
|
72
42
|
|
|
73
43
|
//# sourceMappingURL=camera-stream.dto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/interfaces/camera-stream.dto.ts"],"names":["CameraStreamDto","CreateCameraStreamDto","UpdateCameraStreamDto","IdDto","name","streamURL","printerId"],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/camera-stream.dto.ts"],"names":["CameraStreamDto","CreateCameraStreamDto","UpdateCameraStreamDto","IdDto","name","streamURL","printerId","aspectRatio","rotationClockwise","flipHorizontal","flipVertical"],"mappings":";;;;;;;;;;;IAEaA,eAAe;eAAfA;;IAUAC,qBAAqB;eAArBA;;IAMAC,qBAAqB;eAArBA;;;iCAlBS;AAEf,MAAMF,wBAAiCG,sBAAK;IACjDC,KAAc;IACdC,UAAkB;IAClBC,UAA0B;IAC1BC,YAAoB;IACpBC,kBAA0B;IAC1BC,eAAwB;IACxBC,aAAsB;AACxB;AAEO,MAAMT;IACXI,UAAkB;IAClBD,KAAa;IACbE,UAAoB;AACtB;AAEO,MAAMJ;IACXG,UAAkB;IAClBD,KAAa;IACbE,UAAmB;AACrB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/interfaces/custom-gcode.dto.ts"],"names":["CustomGcodeDto","id","name","description","gcode"],"mappings":";;;;+BAEaA;;;eAAAA;;;AAAN,MAAMA;IACXC,GAAY;IACZC,KAAa;IACbC,
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/custom-gcode.dto.ts"],"names":["CustomGcodeDto","id","name","description","gcode"],"mappings":";;;;+BAEaA;;;eAAAA;;;AAAN,MAAMA;IACXC,GAAY;IACZC,KAAa;IACbC,YAAqB;IACrBC,MAAgB;AAClB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/file-upload-tracker.interface.ts"],"names":[],"mappings":""}
|
|
@@ -9,46 +9,33 @@ function _export(target, all) {
|
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
11
|
_export(exports, {
|
|
12
|
-
AddOrUpdatePrinterDto: function() {
|
|
13
|
-
return AddOrUpdatePrinterDto;
|
|
14
|
-
},
|
|
15
12
|
CreateFloorDto: function() {
|
|
16
13
|
return CreateFloorDto;
|
|
17
14
|
},
|
|
15
|
+
CreatePositionDto: function() {
|
|
16
|
+
return CreatePositionDto;
|
|
17
|
+
},
|
|
18
18
|
FloorDto: function() {
|
|
19
19
|
return FloorDto;
|
|
20
20
|
},
|
|
21
21
|
PositionDto: function() {
|
|
22
22
|
return PositionDto;
|
|
23
23
|
},
|
|
24
|
-
PrinterInFloorDto: function() {
|
|
25
|
-
return PrinterInFloorDto;
|
|
26
|
-
},
|
|
27
24
|
UpdateFloorDto: function() {
|
|
28
25
|
return UpdateFloorDto;
|
|
29
26
|
}
|
|
30
27
|
});
|
|
31
|
-
const _classvalidator = require("class-validator");
|
|
32
|
-
function _ts_decorate(decorators, target, key, desc) {
|
|
33
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
34
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
35
|
-
else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
36
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
37
|
-
}
|
|
38
|
-
function _ts_metadata(k, v) {
|
|
39
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
40
|
-
}
|
|
41
28
|
class PositionDto {
|
|
42
29
|
x;
|
|
43
30
|
y;
|
|
44
31
|
printerId;
|
|
45
32
|
floorId;
|
|
46
33
|
}
|
|
47
|
-
class
|
|
48
|
-
id;
|
|
34
|
+
class CreatePositionDto {
|
|
49
35
|
x;
|
|
50
36
|
y;
|
|
51
37
|
printerId;
|
|
38
|
+
floorId;
|
|
52
39
|
}
|
|
53
40
|
class FloorDto {
|
|
54
41
|
id;
|
|
@@ -61,39 +48,10 @@ class CreateFloorDto {
|
|
|
61
48
|
name;
|
|
62
49
|
floor;
|
|
63
50
|
}
|
|
64
|
-
_ts_decorate([
|
|
65
|
-
(0, _classvalidator.IsOptional)(),
|
|
66
|
-
_ts_metadata("design:type", Array)
|
|
67
|
-
], CreateFloorDto.prototype, "printers", void 0);
|
|
68
|
-
_ts_decorate([
|
|
69
|
-
(0, _classvalidator.IsNotEmpty)(),
|
|
70
|
-
_ts_metadata("design:type", String)
|
|
71
|
-
], CreateFloorDto.prototype, "name", void 0);
|
|
72
|
-
_ts_decorate([
|
|
73
|
-
(0, _classvalidator.IsDefined)(),
|
|
74
|
-
(0, _classvalidator.IsNumber)(),
|
|
75
|
-
_ts_metadata("design:type", Number)
|
|
76
|
-
], CreateFloorDto.prototype, "floor", void 0);
|
|
77
51
|
class UpdateFloorDto {
|
|
78
52
|
printers;
|
|
79
53
|
name;
|
|
80
54
|
floor;
|
|
81
55
|
}
|
|
82
|
-
_ts_decorate([
|
|
83
|
-
(0, _classvalidator.IsOptional)(),
|
|
84
|
-
_ts_metadata("design:type", Array)
|
|
85
|
-
], UpdateFloorDto.prototype, "printers", void 0);
|
|
86
|
-
_ts_decorate([
|
|
87
|
-
(0, _classvalidator.IsDefined)(),
|
|
88
|
-
_ts_metadata("design:type", String)
|
|
89
|
-
], UpdateFloorDto.prototype, "name", void 0);
|
|
90
|
-
_ts_decorate([
|
|
91
|
-
(0, _classvalidator.IsDefined)(),
|
|
92
|
-
(0, _classvalidator.IsNumber)(),
|
|
93
|
-
_ts_metadata("design:type", Number)
|
|
94
|
-
], UpdateFloorDto.prototype, "floor", void 0);
|
|
95
|
-
class AddOrUpdatePrinterDto {
|
|
96
|
-
printerId;
|
|
97
|
-
}
|
|
98
56
|
|
|
99
57
|
//# sourceMappingURL=floor.dto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/interfaces/floor.dto.ts"],"names":["
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/floor.dto.ts"],"names":["CreateFloorDto","CreatePositionDto","FloorDto","PositionDto","UpdateFloorDto","x","y","printerId","floorId","id","name","floor","printers"],"mappings":";;;;;;;;;;;IAuBaA,cAAc;eAAdA;;IAdAC,iBAAiB;eAAjBA;;IAOAC,QAAQ;eAARA;;IAdAC,WAAW;eAAXA;;IA2BAC,cAAc;eAAdA;;;AA3BN,MAAMD;IACXE,EAAU;IACVC,EAAU;IACVC,UAAmB;IACnBC,QAAiB;AACnB;AAEO,MAAMP;IACXI,EAAU;IACVC,EAAU;IACVC,UAAmB;IACnBC,QAAkB;AACpB;AAEO,MAAMN;IACXO,GAAY;IACZC,KAAa;IACbC,MAAc;IACdC,SAAiC;AACnC;AAEO,MAAMZ;IACXY,SAAwC;IACxCF,KAAa;IACbC,MAAc;AAChB;AAEO,MAAMP;IACXQ,SAAkC;IAClCF,KAAc;IACdC,MAAe;AACjB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/interfaces/login.dto.ts"],"names":["LoginDto","apiKey","printerURL","printerType"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA;IACXC,
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/login.dto.ts"],"names":["LoginDto","apiKey","username","password","printerURL","printerType"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA;IACXC,OAAgB;IAChBC,SAAkB;IAClBC,SAAkB;IAClBC,WAAmB;IACnBC,YAAoB;AACtB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/interfaces/print-completion.dto.ts"],"names":["CreatePrintCompletionDto","PrintCompletionDto","fileName","status","printerId","printerReference","completionLog","context","id","createdAt"],"mappings":";;;;;;;;;;;IAMaA,wBAAwB;eAAxBA;;IASAC,kBAAkB;eAAlBA;;;AATN,MAAMD;IACXE,SAAiB;IACjBC,OAAe;IACfC,UAAmB;IACnBC,iBAA0B;IAC1BC,
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/print-completion.dto.ts"],"names":["CreatePrintCompletionDto","PrintCompletionDto","fileName","status","printerId","printerReference","completionLog","context","id","createdAt"],"mappings":";;;;;;;;;;;IAMaA,wBAAwB;eAAxBA;;IASAC,kBAAkB;eAAlBA;;;AATN,MAAMD;IACXE,SAAiB;IACjBC,OAAe;IACfC,UAAmB;IACnBC,iBAA0B;IAC1BC,cAAuB;IACvBC,QAAgC;AAClC;AAEO,MAAMN;IACXO,GAAa;IACbN,SAAiB;IACjBO,UAAkB;IAClBN,OAAe;IACfC,UAAmB;IACnBC,iBAA0B;IAC1BC,cAAuB;IACvBC,QAAgC;AAClC"}
|