@fdm-monster/server 1.9.4 → 2.0.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 +8 -7
- package/.yarn/install-state.gz +0 -0
- package/CONTRIBUTING.md +5 -5
- package/README.md +9 -8
- package/RELEASE_NOTES.MD +52 -0
- package/SECURITY.md +1 -1
- package/biome.json +8 -5
- package/dist/consoles/download-github-releases.js +3 -3
- package/dist/consoles/launch-http-servers.js +4 -4
- package/dist/consoles/launch-http-servers.js.map +1 -1
- package/dist/consoles/mock-bambu.server.js +50 -30
- package/dist/consoles/mock-bambu.server.js.map +1 -1
- package/dist/consoles/mock-camera/default-image.js +13 -0
- package/dist/consoles/mock-camera/default-image.js.map +1 -0
- package/dist/consoles/mock-camera/mock-camera.server.js +160 -0
- package/dist/consoles/mock-camera/mock-camera.server.js.map +1 -0
- package/dist/consoles/mock-octoprint.server.js +281 -73
- package/dist/consoles/mock-octoprint.server.js.map +1 -1
- package/dist/consoles/mock-prusalink.server.js +17 -17
- package/dist/consoles/mock-prusalink.server.js.map +1 -1
- package/dist/consoles/typeorm-create.js +135 -0
- package/dist/consoles/typeorm-create.js.map +1 -0
- package/dist/consoles/typeorm-generate.js +8 -8
- package/dist/consoles/typeorm-generate.js.map +1 -1
- package/dist/consoles/utils/api-messages.js.map +1 -1
- package/dist/constants/authorization.constants.js +25 -31
- package/dist/constants/authorization.constants.js.map +1 -1
- package/dist/constants/event.constants.js.map +1 -1
- package/dist/constants/server-settings.constants.js +3 -19
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/container.js +43 -59
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +9 -6
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/auth.controller.js +1 -1
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/batch-call.controller.js +7 -25
- package/dist/controllers/batch-call.controller.js.map +1 -1
- package/dist/controllers/file-storage.controller.js +248 -0
- package/dist/controllers/file-storage.controller.js.map +1 -0
- package/dist/controllers/first-time-setup.controller.js +6 -5
- package/dist/controllers/first-time-setup.controller.js.map +1 -1
- package/dist/controllers/floor.controller.js +12 -12
- package/dist/controllers/floor.controller.js.map +1 -1
- package/dist/controllers/metrics.controller.js.map +1 -1
- package/dist/controllers/print-job.controller.js +666 -0
- package/dist/controllers/print-job.controller.js.map +1 -0
- package/dist/controllers/print-queue.controller.js +375 -0
- package/dist/controllers/print-queue.controller.js.map +1 -0
- package/dist/controllers/printer-files.controller.js +88 -59
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer-settings.controller.js +0 -21
- package/dist/controllers/printer-settings.controller.js.map +1 -1
- package/dist/controllers/{printer-group.controller.js → printer-tag.controller.js} +51 -34
- package/dist/controllers/printer-tag.controller.js.map +1 -0
- package/dist/controllers/printer.controller.js +21 -7
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +2 -1
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +11 -15
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/controllers/settings.controller.js +0 -68
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/controllers/slicer-compat.controller.js +216 -0
- package/dist/controllers/slicer-compat.controller.js.map +1 -0
- package/dist/controllers/user.controller.js +8 -12
- package/dist/controllers/user.controller.js.map +1 -1
- package/dist/controllers/validation/batch-controller.validation.js +13 -13
- package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
- package/dist/controllers/validation/generic.validation.js +4 -8
- package/dist/controllers/validation/generic.validation.js.map +1 -1
- package/dist/controllers/validation/printer-files-controller.validation.js +2 -2
- package/dist/controllers/validation/user-controller.validation.js +14 -9
- package/dist/controllers/validation/user-controller.validation.js.map +1 -1
- package/dist/data-source.js +25 -12
- package/dist/data-source.js.map +1 -1
- package/dist/entities/camera-stream.entity.js +2 -1
- package/dist/entities/camera-stream.entity.js.map +1 -1
- package/dist/entities/floor.entity.js +3 -5
- package/dist/entities/floor.entity.js.map +1 -1
- package/dist/entities/index.js +15 -11
- package/dist/entities/index.js.map +1 -1
- package/dist/entities/print-job.entity.js +195 -0
- package/dist/entities/print-job.entity.js.map +1 -0
- package/dist/entities/{printer-group.entity.js → printer-tag.entity.js} +17 -17
- package/dist/entities/printer-tag.entity.js.map +1 -0
- package/dist/entities/printer.entity.js +4 -10
- package/dist/entities/printer.entity.js.map +1 -1
- package/dist/entities/settings.entity.js +3 -12
- package/dist/entities/settings.entity.js.map +1 -1
- package/dist/entities/{group.entity.js → tag.entity.js} +15 -8
- package/dist/entities/tag.entity.js.map +1 -0
- package/dist/handlers/logging/file-logging.transport.js.map +1 -1
- package/dist/handlers/logging/static.logger.js.map +1 -1
- package/dist/index.js +8 -2
- package/dist/index.js.map +1 -1
- package/dist/middleware/authenticate.js +4 -4
- package/dist/middleware/authenticate.js.map +1 -1
- package/dist/middleware/database.js +1 -1
- package/dist/middleware/exception.filter.js +114 -90
- package/dist/middleware/exception.filter.js.map +1 -1
- package/dist/middleware/global.middleware.js +10 -18
- package/dist/middleware/global.middleware.js.map +1 -1
- package/dist/middleware/param-converter.middleware.js +5 -13
- package/dist/middleware/param-converter.middleware.js.map +1 -1
- package/dist/middleware/passport.js +2 -2
- package/dist/middleware/passport.js.map +1 -1
- package/dist/middleware/printer-resolver.js.map +1 -1
- package/dist/middleware/printer.js +3 -2
- package/dist/middleware/printer.js.map +1 -1
- package/dist/middleware/socketio.middleware.js.map +1 -1
- package/dist/migrations/1745141688926-AddPrinterUsernamePassword.js +1 -1
- package/dist/migrations/1745141688926-AddPrinterUsernamePassword.js.map +1 -1
- package/dist/migrations/1766576698569-DropPermissions.js +28 -0
- package/dist/migrations/1766576698569-DropPermissions.js.map +1 -0
- package/dist/migrations/1767278216516-ChangeCameraPrinterOnDeleteSetNull.js +186 -0
- package/dist/migrations/1767278216516-ChangeCameraPrinterOnDeleteSetNull.js.map +1 -0
- package/dist/migrations/1767279607392-DropCustomGcode.js +31 -0
- package/dist/migrations/1767279607392-DropCustomGcode.js.map +1 -0
- package/dist/migrations/1767291804417-DropPrintCompletions.js +37 -0
- package/dist/migrations/1767291804417-DropPrintCompletions.js.map +1 -0
- package/dist/migrations/1767352862576-DropSettingsFileClean.js +88 -0
- package/dist/migrations/1767352862576-DropSettingsFileClean.js.map +1 -0
- package/dist/migrations/1767355639023-ChangeFloorLevelToOrder.js +107 -0
- package/dist/migrations/1767355639023-ChangeFloorLevelToOrder.js.map +1 -0
- package/dist/migrations/1767370191762-ChangeFloorNonUniqueOrder.js +62 -0
- package/dist/migrations/1767370191762-ChangeFloorNonUniqueOrder.js.map +1 -0
- package/dist/migrations/1767432108916-RenameGroupToTag.js +86 -0
- package/dist/migrations/1767432108916-RenameGroupToTag.js.map +1 -0
- package/dist/migrations/1767451444137-AddPrintJob.js +207 -0
- package/dist/migrations/1767451444137-AddPrintJob.js.map +1 -0
- package/dist/server.constants.js +9 -17
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js +3 -7
- package/dist/server.core.js.map +1 -1
- package/dist/server.env.js +4 -49
- package/dist/server.env.js.map +1 -1
- package/dist/server.host.js +26 -44
- package/dist/server.host.js.map +1 -1
- package/dist/services/authentication/auth.service.js.map +1 -1
- package/dist/services/authentication/jwt.service.js.map +1 -1
- package/dist/services/bambu/bambu-ftp.adapter.js +3 -3
- package/dist/services/bambu/bambu-ftp.adapter.js.map +1 -1
- package/dist/services/bambu/bambu-mqtt.adapter.js +74 -77
- package/dist/services/bambu/bambu-mqtt.adapter.js.map +1 -1
- package/dist/services/bambu/bambu.client.js.map +1 -1
- package/dist/services/bambu.api.js +11 -0
- package/dist/services/bambu.api.js.map +1 -1
- package/dist/services/core/batch-call.service.js +0 -25
- package/dist/services/core/batch-call.service.js.map +1 -1
- package/dist/services/core/multer.service.js +5 -9
- package/dist/services/core/multer.service.js.map +1 -1
- package/dist/services/core/yaml.service.js +219 -187
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/file-analysis.service.js +146 -0
- package/dist/services/file-analysis.service.js.map +1 -0
- package/dist/services/file-storage.service.js +386 -0
- package/dist/services/file-storage.service.js.map +1 -0
- package/dist/services/interfaces/camera-stream.dto.js +2 -2
- package/dist/services/interfaces/camera-stream.dto.js.map +1 -1
- package/dist/services/interfaces/floor.dto.js +3 -3
- package/dist/services/interfaces/floor.dto.js.map +1 -1
- package/dist/services/interfaces/{printer-group.dto.js → printer-tag.dto.js} +9 -8
- package/dist/services/interfaces/printer-tag.dto.js.map +1 -0
- package/dist/services/interfaces/{print-completion.interface.js → printer-tag.service.interface.js} +1 -1
- package/dist/services/interfaces/{printer-group.service.interface.js.map → printer-tag.service.interface.js.map} +1 -1
- package/dist/services/interfaces/printer.dto.js +2 -2
- package/dist/services/interfaces/printer.dto.js.map +1 -1
- package/dist/services/interfaces/refresh-token.dto.js.map +1 -1
- package/dist/services/interfaces/role.dto.js.map +1 -1
- package/dist/services/interfaces/settings.dto.js +0 -1
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/interfaces/{group.dto.js → tag.dto.js} +1 -1
- package/dist/services/interfaces/tag.dto.js.map +1 -0
- package/dist/services/interfaces/user.dto.js.map +1 -1
- package/dist/services/moonraker/constants/moonraker-event.dto.js.map +1 -1
- package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
- package/dist/services/moonraker/moonraker.client.js.map +1 -1
- package/dist/services/moonraker.api.js +3 -0
- package/dist/services/moonraker.api.js.map +1 -1
- package/dist/services/octoprint/dto/files/gcode-analysis.dto.js.map +1 -0
- package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.routes.js +0 -7
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -1
- package/dist/services/octoprint/octoprint.client.js +0 -4
- package/dist/services/octoprint/octoprint.client.js.map +1 -1
- package/dist/services/octoprint.api.js +3 -0
- package/dist/services/octoprint.api.js.map +1 -1
- package/dist/services/orm/base.service.js.map +1 -1
- package/dist/services/orm/camera-stream.service.js.map +1 -1
- package/dist/services/orm/floor-position.service.js.map +1 -1
- package/dist/services/orm/floor.service.js +12 -19
- package/dist/services/orm/floor.service.js.map +1 -1
- package/dist/services/orm/permission.service.js +3 -54
- package/dist/services/orm/permission.service.js.map +1 -1
- package/dist/services/orm/print-job.service.js +539 -0
- package/dist/services/orm/print-job.service.js.map +1 -0
- package/dist/services/orm/printer-tag.service.js +120 -0
- package/dist/services/orm/printer-tag.service.js.map +1 -0
- package/dist/services/orm/printer.service.js.map +1 -1
- package/dist/services/orm/refresh-token.service.js.map +1 -1
- package/dist/services/orm/role.service.js +25 -39
- package/dist/services/orm/role.service.js.map +1 -1
- package/dist/services/orm/settings.service.js +4 -15
- package/dist/services/orm/settings.service.js.map +1 -1
- package/dist/services/orm/user.service.js +17 -13
- package/dist/services/orm/user.service.js.map +1 -1
- package/dist/services/print-file-downloader.service.js +169 -0
- package/dist/services/print-file-downloader.service.js.map +1 -0
- package/dist/services/print-queue.service.js +268 -0
- package/dist/services/print-queue.service.js.map +1 -0
- package/dist/services/printer-api.factory.js +1 -1
- package/dist/services/printer-api.factory.js.map +1 -1
- package/dist/services/printer-api.interface.js.map +1 -1
- package/dist/services/prusa-link/constants/prusalink-event.dto.js.map +1 -1
- package/dist/services/prusa-link/prusa-link-http-polling.adapter.js +1 -3
- package/dist/services/prusa-link/prusa-link-http-polling.adapter.js.map +1 -1
- package/dist/services/prusa-link/prusa-link.api.js +4 -1
- package/dist/services/prusa-link/prusa-link.api.js.map +1 -1
- package/dist/services/prusa-link/utils/prusa-link-http-client.builder.js.map +1 -1
- package/dist/services/validators/floor-service.validation.js +25 -31
- package/dist/services/validators/floor-service.validation.js.map +1 -1
- package/dist/services/validators/print-job.validation.js +31 -0
- package/dist/services/validators/print-job.validation.js.map +1 -0
- package/dist/services/validators/settings-service.validation.js +0 -22
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/services/validators/user-service.validation.js +15 -10
- package/dist/services/validators/user-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +8 -14
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/shared/load-controllers.js +2 -1
- package/dist/shared/load-controllers.js.map +1 -1
- package/dist/shared/runtime-settings.migration.js +1 -11
- package/dist/shared/runtime-settings.migration.js.map +1 -1
- package/dist/shared/websocket-rpc-extended.adapter.js +13 -4
- package/dist/shared/websocket-rpc-extended.adapter.js.map +1 -1
- package/dist/shared/websocket.adapter.js.map +1 -1
- package/dist/state/file-upload-tracker.cache.js.map +1 -1
- package/dist/state/file.cache.js +6 -6
- package/dist/state/file.cache.js.map +1 -1
- package/dist/state/floor.store.js +3 -10
- package/dist/state/floor.store.js.map +1 -1
- package/dist/state/printer-events.cache.js +180 -20
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/printer-files.store.js.map +1 -1
- package/dist/state/printer-socket.store.js +25 -20
- package/dist/state/printer-socket.store.js.map +1 -1
- package/dist/state/printer-thumbnail.cache.js +98 -188
- package/dist/state/printer-thumbnail.cache.js.map +1 -1
- package/dist/state/printer.cache.js +3 -13
- package/dist/state/printer.cache.js.map +1 -1
- package/dist/state/settings.store.js +4 -42
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/socket-io.gateway.js +1 -1
- package/dist/state/socket-io.gateway.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +6 -3
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/dist/tasks/boot.task.js +11 -91
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/print-job-analysis.task.js +116 -0
- package/dist/tasks/print-job-analysis.task.js.map +1 -0
- package/dist/tasks/printer-files-load.task.js +29 -0
- package/dist/tasks/printer-files-load.task.js.map +1 -0
- package/dist/tasks/socketio.task.js +1 -1
- package/dist/tasks/socketio.task.js.map +1 -1
- package/dist/tasks.js +3 -2
- package/dist/tasks.js.map +1 -1
- package/dist/utils/cache/key-diff.cache.js +20 -61
- package/dist/utils/cache/key-diff.cache.js.map +1 -1
- package/dist/utils/parsers/3mf.parser.js +337 -0
- package/dist/utils/parsers/3mf.parser.js.map +1 -0
- package/dist/utils/parsers/bgcode.parser.js +223 -0
- package/dist/utils/parsers/bgcode.parser.js.map +1 -0
- package/dist/utils/parsers/gcode.parser.js +254 -0
- package/dist/utils/parsers/gcode.parser.js.map +1 -0
- package/dist/utils/swagger/decorators.js +39 -0
- package/dist/utils/swagger/decorators.js.map +1 -0
- package/dist/utils/swagger/generator.js +196 -0
- package/dist/utils/swagger/generator.js.map +1 -0
- package/dist/utils/swagger/swagger.js +93 -0
- package/dist/utils/swagger/swagger.js.map +1 -0
- package/package.json +24 -30
- package/dist/controllers/custom-gcode.controller.js +0 -150
- package/dist/controllers/custom-gcode.controller.js.map +0 -1
- package/dist/controllers/print-completion.controller.js +0 -118
- package/dist/controllers/print-completion.controller.js.map +0 -1
- package/dist/controllers/printer-group.controller.js.map +0 -1
- package/dist/entities/custom-gcode.entity.js +0 -49
- package/dist/entities/custom-gcode.entity.js.map +0 -1
- package/dist/entities/group.entity.js.map +0 -1
- package/dist/entities/permission.entity.js +0 -37
- package/dist/entities/permission.entity.js.map +0 -1
- package/dist/entities/print-completion.entity.js +0 -90
- package/dist/entities/print-completion.entity.js.map +0 -1
- package/dist/entities/printer-group.entity.js.map +0 -1
- package/dist/models/Auth/Permission.js +0 -20
- package/dist/models/Auth/Permission.js.map +0 -1
- package/dist/models/Auth/RefreshToken.js +0 -41
- package/dist/models/Auth/RefreshToken.js.map +0 -1
- package/dist/models/Auth/Role.js +0 -20
- package/dist/models/Auth/Role.js.map +0 -1
- package/dist/models/Auth/User.js +0 -49
- package/dist/models/Auth/User.js.map +0 -1
- package/dist/models/CameraStream.js +0 -49
- package/dist/models/CameraStream.js.map +0 -1
- package/dist/models/CustomGcode.js +0 -28
- package/dist/models/CustomGcode.js.map +0 -1
- package/dist/models/Floor.js +0 -33
- package/dist/models/Floor.js.map +0 -1
- package/dist/models/FloorPrinter.js +0 -38
- package/dist/models/FloorPrinter.js.map +0 -1
- package/dist/models/PrintCompletion.js +0 -40
- package/dist/models/PrintCompletion.js.map +0 -1
- package/dist/models/Printer.js +0 -78
- package/dist/models/Printer.js.map +0 -1
- package/dist/models/Settings.js +0 -150
- package/dist/models/Settings.js.map +0 -1
- package/dist/models/index.js +0 -54
- package/dist/models/index.js.map +0 -1
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js +0 -45
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js.map +0 -1
- package/dist/mongo-migrations/20210907173950-printers-enabled.js +0 -35
- package/dist/mongo-migrations/20210907173950-printers-enabled.js.map +0 -1
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js +0 -35
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js.map +0 -1
- package/dist/mongo-migrations/20230414141005-floor-remove-groupinfloor.js +0 -60
- package/dist/mongo-migrations/20230414141005-floor-remove-groupinfloor.js.map +0 -1
- package/dist/mongo-migrations/20230427202911-printer-remove-sortindex.js +0 -30
- package/dist/mongo-migrations/20230427202911-printer-remove-sortindex.js.map +0 -1
- package/dist/mongo-migrations/20230716065316-user-remove-name.js +0 -30
- package/dist/mongo-migrations/20230716065316-user-remove-name.js.map +0 -1
- package/dist/mongo-migrations/20231111081809-printer-flatten-name.js +0 -35
- package/dist/mongo-migrations/20231111081809-printer-flatten-name.js.map +0 -1
- package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js +0 -41
- package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js.map +0 -1
- package/dist/mongo-migrations/20231202183902-printer-files-simpler.js +0 -41
- package/dist/mongo-migrations/20231202183902-printer-files-simpler.js.map +0 -1
- package/dist/services/interfaces/custom-gcode.dto.js +0 -18
- package/dist/services/interfaces/custom-gcode.dto.js.map +0 -1
- package/dist/services/interfaces/custom-gcode.service.interface.js +0 -6
- package/dist/services/interfaces/custom-gcode.service.interface.js.map +0 -1
- package/dist/services/interfaces/gcode-analysis.dto.js.map +0 -1
- package/dist/services/interfaces/group.dto.js.map +0 -1
- package/dist/services/interfaces/permission.dto.js +0 -16
- package/dist/services/interfaces/permission.dto.js.map +0 -1
- package/dist/services/interfaces/print-completion-context.dto.js +0 -6
- package/dist/services/interfaces/print-completion-context.dto.js.map +0 -1
- package/dist/services/interfaces/print-completion.dto.js +0 -38
- package/dist/services/interfaces/print-completion.dto.js.map +0 -1
- package/dist/services/interfaces/print-completion.interface.js.map +0 -1
- package/dist/services/interfaces/printer-group.dto.js.map +0 -1
- package/dist/services/interfaces/printer-group.service.interface.js +0 -6
- package/dist/services/mongoose/camera-stream.service.js +0 -67
- package/dist/services/mongoose/camera-stream.service.js.map +0 -1
- package/dist/services/mongoose/custom-gcode.service.js +0 -50
- package/dist/services/mongoose/custom-gcode.service.js.map +0 -1
- package/dist/services/mongoose/floor.service.js +0 -139
- package/dist/services/mongoose/floor.service.js.map +0 -1
- package/dist/services/mongoose/permission.service.js +0 -73
- package/dist/services/mongoose/permission.service.js.map +0 -1
- package/dist/services/mongoose/print-completion.service.js +0 -134
- package/dist/services/mongoose/print-completion.service.js.map +0 -1
- package/dist/services/mongoose/print-completion.shared.js +0 -59
- package/dist/services/mongoose/print-completion.shared.js.map +0 -1
- package/dist/services/mongoose/printer.service.js +0 -216
- package/dist/services/mongoose/printer.service.js.map +0 -1
- package/dist/services/mongoose/refresh-token.service.js +0 -104
- package/dist/services/mongoose/refresh-token.service.js.map +0 -1
- package/dist/services/mongoose/role.service.js +0 -132
- package/dist/services/mongoose/role.service.js.map +0 -1
- package/dist/services/mongoose/settings.service.js +0 -124
- package/dist/services/mongoose/settings.service.js.map +0 -1
- package/dist/services/mongoose/user.service.js +0 -180
- package/dist/services/mongoose/user.service.js.map +0 -1
- package/dist/services/orm/custom-gcode.service.js +0 -42
- package/dist/services/orm/custom-gcode.service.js.map +0 -1
- package/dist/services/orm/print-completion.service.js +0 -87
- package/dist/services/orm/print-completion.service.js.map +0 -1
- package/dist/services/orm/printer-group.service.js +0 -109
- package/dist/services/orm/printer-group.service.js.map +0 -1
- package/dist/services/validators/camera-service.validation.js +0 -19
- package/dist/services/validators/camera-service.validation.js.map +0 -1
- package/dist/services/validators/print-completion-service.validation.js +0 -33
- package/dist/services/validators/print-completion-service.validation.js.map +0 -1
- package/dist/shared.constants.js +0 -15
- package/dist/shared.constants.js.map +0 -1
- package/dist/tasks/print-completion.socketio.task.js +0 -91
- package/dist/tasks/print-completion.socketio.task.js.map +0 -1
- package/dist/tasks/printer-file-clean.task.js +0 -74
- package/dist/tasks/printer-file-clean.task.js.map +0 -1
- package/migrate-mongo-config.js +0 -45
- /package/dist/services/{interfaces → octoprint/dto/files}/gcode-analysis.dto.js +0 -0
|
@@ -0,0 +1,268 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "PrintQueueService", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return PrintQueueService;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _typeorm = require("typeorm");
|
|
12
|
+
const _printjobentity = require("../entities/print-job.entity");
|
|
13
|
+
const _node = require("@sentry/node");
|
|
14
|
+
class PrintQueueService {
|
|
15
|
+
printerApiFactory;
|
|
16
|
+
fileStorageService;
|
|
17
|
+
printJobRepository;
|
|
18
|
+
eventEmitter2;
|
|
19
|
+
logger;
|
|
20
|
+
constructor(loggerFactory, typeormService, eventEmitter2, printerApiFactory, fileStorageService){
|
|
21
|
+
this.printerApiFactory = printerApiFactory;
|
|
22
|
+
this.fileStorageService = fileStorageService;
|
|
23
|
+
this.printJobRepository = typeormService.getDataSource().getRepository(_printjobentity.PrintJob);
|
|
24
|
+
this.eventEmitter2 = eventEmitter2;
|
|
25
|
+
this.logger = loggerFactory(PrintQueueService.name);
|
|
26
|
+
this.eventEmitter2.on("printQueue.jobSubmitted", (event)=>{
|
|
27
|
+
this.handleJobSubmission(event.printerId, event.jobId, event.fileName, event.fileStorageId).catch((error)=>{
|
|
28
|
+
this.logger.error(`Failed to handle job submission for job ${event.jobId}`, error);
|
|
29
|
+
(0, _node.captureException)(error);
|
|
30
|
+
});
|
|
31
|
+
});
|
|
32
|
+
this.logger.log("Print queue service initialized");
|
|
33
|
+
}
|
|
34
|
+
async addToQueue(printerId, jobId, position) {
|
|
35
|
+
const job = await this.printJobRepository.findOne({
|
|
36
|
+
where: {
|
|
37
|
+
id: jobId
|
|
38
|
+
}
|
|
39
|
+
});
|
|
40
|
+
if (!job) {
|
|
41
|
+
throw new Error(`Print job ${jobId} not found`);
|
|
42
|
+
}
|
|
43
|
+
if (!job.printerId) {
|
|
44
|
+
job.printerId = printerId;
|
|
45
|
+
} else if (job.printerId !== printerId) {
|
|
46
|
+
throw new Error(`Job ${jobId} belongs to printer ${job.printerId}, cannot add to printer ${printerId}`);
|
|
47
|
+
}
|
|
48
|
+
if (position === undefined || position === null) {
|
|
49
|
+
const maxPosition = await this.getMaxQueuePosition(printerId);
|
|
50
|
+
job.queuePosition = (maxPosition ?? -1) + 1;
|
|
51
|
+
} else {
|
|
52
|
+
await this.shiftQueuePositions(printerId, position);
|
|
53
|
+
job.queuePosition = position;
|
|
54
|
+
}
|
|
55
|
+
job.status = "QUEUED";
|
|
56
|
+
await this.printJobRepository.save(job);
|
|
57
|
+
this.logger.log(`Added job ${jobId} to printer ${printerId} queue at position ${job.queuePosition}`);
|
|
58
|
+
this.eventEmitter2.emit("printQueue.jobAdded", {
|
|
59
|
+
printerId,
|
|
60
|
+
jobId,
|
|
61
|
+
position: job.queuePosition
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
async removeFromQueue(jobId) {
|
|
65
|
+
const job = await this.printJobRepository.findOne({
|
|
66
|
+
where: {
|
|
67
|
+
id: jobId
|
|
68
|
+
}
|
|
69
|
+
});
|
|
70
|
+
if (!job) {
|
|
71
|
+
throw new Error(`Print job ${jobId} not found`);
|
|
72
|
+
}
|
|
73
|
+
const printerId = job.printerId;
|
|
74
|
+
const oldPosition = job.queuePosition;
|
|
75
|
+
job.queuePosition = null;
|
|
76
|
+
if (job.status === "QUEUED") {
|
|
77
|
+
job.status = "PENDING";
|
|
78
|
+
}
|
|
79
|
+
await this.printJobRepository.save(job);
|
|
80
|
+
if (oldPosition !== null && printerId) {
|
|
81
|
+
await this.compactQueuePositions(printerId, oldPosition);
|
|
82
|
+
}
|
|
83
|
+
this.logger.log(`Removed job ${jobId} from queue`);
|
|
84
|
+
this.eventEmitter2.emit("printQueue.jobRemoved", {
|
|
85
|
+
printerId,
|
|
86
|
+
jobId
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
async getQueue(printerId) {
|
|
90
|
+
const jobs = await this.printJobRepository.find({
|
|
91
|
+
where: {
|
|
92
|
+
printerId,
|
|
93
|
+
status: "QUEUED",
|
|
94
|
+
queuePosition: (0, _typeorm.Not)((0, _typeorm.IsNull)())
|
|
95
|
+
},
|
|
96
|
+
order: {
|
|
97
|
+
queuePosition: "ASC"
|
|
98
|
+
}
|
|
99
|
+
});
|
|
100
|
+
return jobs.map((j)=>({
|
|
101
|
+
id: j.id,
|
|
102
|
+
fileName: j.fileName,
|
|
103
|
+
queuePosition: j.queuePosition,
|
|
104
|
+
status: j.status,
|
|
105
|
+
estimatedTimeSeconds: j.metadata?.gcodePrintTimeSeconds,
|
|
106
|
+
filamentGrams: j.metadata?.filamentUsedGrams,
|
|
107
|
+
createdAt: j.createdAt
|
|
108
|
+
}));
|
|
109
|
+
}
|
|
110
|
+
async getNextInQueue(printerId) {
|
|
111
|
+
return this.printJobRepository.findOne({
|
|
112
|
+
where: {
|
|
113
|
+
printerId,
|
|
114
|
+
status: "QUEUED",
|
|
115
|
+
queuePosition: (0, _typeorm.Not)((0, _typeorm.IsNull)())
|
|
116
|
+
},
|
|
117
|
+
order: {
|
|
118
|
+
queuePosition: "ASC"
|
|
119
|
+
}
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
async reorderQueue(printerId, jobIds) {
|
|
123
|
+
for(let i = 0; i < jobIds.length; i++){
|
|
124
|
+
const job = await this.printJobRepository.findOne({
|
|
125
|
+
where: {
|
|
126
|
+
id: jobIds[i]
|
|
127
|
+
}
|
|
128
|
+
});
|
|
129
|
+
if (job && job.printerId === printerId) {
|
|
130
|
+
job.queuePosition = i;
|
|
131
|
+
await this.printJobRepository.save(job);
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
this.logger.log(`Reordered queue for printer ${printerId}`);
|
|
135
|
+
this.eventEmitter2.emit("printQueue.reordered", {
|
|
136
|
+
printerId
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
async clearQueue(printerId) {
|
|
140
|
+
const jobs = await this.printJobRepository.find({
|
|
141
|
+
where: {
|
|
142
|
+
printerId,
|
|
143
|
+
status: "QUEUED"
|
|
144
|
+
}
|
|
145
|
+
});
|
|
146
|
+
for (const job of jobs){
|
|
147
|
+
job.status = "PENDING";
|
|
148
|
+
job.queuePosition = null;
|
|
149
|
+
await this.printJobRepository.save(job);
|
|
150
|
+
}
|
|
151
|
+
this.logger.log(`Cleared queue for printer ${printerId} (${jobs.length} jobs)`);
|
|
152
|
+
this.eventEmitter2.emit("printQueue.cleared", {
|
|
153
|
+
printerId
|
|
154
|
+
});
|
|
155
|
+
}
|
|
156
|
+
async processQueue(printerId) {
|
|
157
|
+
const nextJob = await this.getNextInQueue(printerId);
|
|
158
|
+
if (!nextJob) {
|
|
159
|
+
this.logger.log(`No jobs in queue for printer ${printerId}`);
|
|
160
|
+
return null;
|
|
161
|
+
}
|
|
162
|
+
this.logger.log(`Processing queue: next job is ${nextJob.id} (${nextJob.fileName})`);
|
|
163
|
+
this.eventEmitter2.emit("printQueue.processNext", {
|
|
164
|
+
printerId,
|
|
165
|
+
jobId: nextJob.id,
|
|
166
|
+
fileName: nextJob.fileName,
|
|
167
|
+
fileStorageId: nextJob.fileStorageId
|
|
168
|
+
});
|
|
169
|
+
return nextJob;
|
|
170
|
+
}
|
|
171
|
+
async getMaxQueuePosition(printerId) {
|
|
172
|
+
const result = await this.printJobRepository.createQueryBuilder("job").select("MAX(job.queuePosition)", "max").where("job.printerId = :printerId", {
|
|
173
|
+
printerId
|
|
174
|
+
}).getRawOne();
|
|
175
|
+
return result?.max ?? null;
|
|
176
|
+
}
|
|
177
|
+
async shiftQueuePositions(printerId, fromPosition) {
|
|
178
|
+
await this.printJobRepository.createQueryBuilder().update(_printjobentity.PrintJob).set({
|
|
179
|
+
queuePosition: ()=>"queuePosition + 1"
|
|
180
|
+
}).where("printerId = :printerId", {
|
|
181
|
+
printerId
|
|
182
|
+
}).andWhere("queuePosition >= :fromPosition", {
|
|
183
|
+
fromPosition
|
|
184
|
+
}).execute();
|
|
185
|
+
}
|
|
186
|
+
async compactQueuePositions(printerId, removedPosition) {
|
|
187
|
+
await this.printJobRepository.createQueryBuilder().update(_printjobentity.PrintJob).set({
|
|
188
|
+
queuePosition: ()=>"queuePosition - 1"
|
|
189
|
+
}).where("printerId = :printerId", {
|
|
190
|
+
printerId
|
|
191
|
+
}).andWhere("queuePosition > :removedPosition", {
|
|
192
|
+
removedPosition
|
|
193
|
+
}).execute();
|
|
194
|
+
}
|
|
195
|
+
async handleJobCompleted(printerId) {
|
|
196
|
+
const nextJob = await this.getNextInQueue(printerId);
|
|
197
|
+
if (nextJob) {
|
|
198
|
+
this.logger.log(`Auto-processing queue after completion: starting job ${nextJob.id}`);
|
|
199
|
+
await this.processQueue(printerId);
|
|
200
|
+
} else {
|
|
201
|
+
this.logger.log(`Queue empty for printer ${printerId} after job completion`);
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
async submitToPrinter(printerId, jobId) {
|
|
205
|
+
const job = await this.printJobRepository.findOne({
|
|
206
|
+
where: {
|
|
207
|
+
id: jobId
|
|
208
|
+
}
|
|
209
|
+
});
|
|
210
|
+
if (!job) {
|
|
211
|
+
throw new Error(`Print job ${jobId} not found`);
|
|
212
|
+
}
|
|
213
|
+
if (job.printerId && job.printerId !== printerId) {
|
|
214
|
+
throw new Error(`Job ${jobId} belongs to printer ${job.printerId}, cannot submit to printer ${printerId}`);
|
|
215
|
+
}
|
|
216
|
+
if (!job.printerId) {
|
|
217
|
+
job.printerId = printerId;
|
|
218
|
+
}
|
|
219
|
+
if (job.queuePosition !== null) {
|
|
220
|
+
const oldPosition = job.queuePosition;
|
|
221
|
+
job.queuePosition = null;
|
|
222
|
+
await this.compactQueuePositions(printerId, oldPosition);
|
|
223
|
+
}
|
|
224
|
+
job.status = "PRINTING";
|
|
225
|
+
await this.printJobRepository.save(job);
|
|
226
|
+
this.logger.log(`Submitting job ${jobId} (${job.fileName}) to printer ${printerId}`);
|
|
227
|
+
this.eventEmitter2.emit("printQueue.jobSubmitted", {
|
|
228
|
+
printerId,
|
|
229
|
+
jobId: job.id,
|
|
230
|
+
fileName: job.fileName,
|
|
231
|
+
fileStorageId: job.fileStorageId
|
|
232
|
+
});
|
|
233
|
+
}
|
|
234
|
+
async handleJobSubmission(printerId, jobId, fileName, fileStorageId) {
|
|
235
|
+
this.logger.log(`Handling job submission for job ${jobId} on printer ${printerId}`);
|
|
236
|
+
try {
|
|
237
|
+
if (!fileStorageId) {
|
|
238
|
+
throw new Error(`Job ${jobId} has no fileStorageId - cannot submit to printer`);
|
|
239
|
+
}
|
|
240
|
+
const fileBuffer = this.fileStorageService.readFile(fileStorageId);
|
|
241
|
+
this.logger.log(`Read ${fileBuffer.length} bytes for job ${jobId}`);
|
|
242
|
+
const printerApi = this.printerApiFactory.getById(printerId);
|
|
243
|
+
this.logger.log(`Uploading file ${fileName} to printer ${printerId} and starting print`);
|
|
244
|
+
await printerApi.uploadFile(fileBuffer, true);
|
|
245
|
+
this.logger.log(`Successfully submitted job ${jobId} to printer ${printerId}`);
|
|
246
|
+
} catch (error) {
|
|
247
|
+
this.logger.error(`Failed to submit job ${jobId} to printer ${printerId}`, error);
|
|
248
|
+
try {
|
|
249
|
+
const job = await this.printJobRepository.findOne({
|
|
250
|
+
where: {
|
|
251
|
+
id: jobId
|
|
252
|
+
}
|
|
253
|
+
});
|
|
254
|
+
if (job) {
|
|
255
|
+
job.status = "FAILED";
|
|
256
|
+
job.statusReason = `Print submission failed: ${error instanceof Error ? error.message : "Unknown error"}`;
|
|
257
|
+
await this.printJobRepository.save(job);
|
|
258
|
+
this.logger.log(`Updated job ${jobId} status to FAILED`);
|
|
259
|
+
}
|
|
260
|
+
} catch (updateError) {
|
|
261
|
+
this.logger.error(`Failed to update job ${jobId} status after submission error`, updateError);
|
|
262
|
+
}
|
|
263
|
+
throw error;
|
|
264
|
+
}
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
|
|
268
|
+
//# sourceMappingURL=print-queue.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/services/print-queue.service.ts"],"names":["PrintQueueService","printJobRepository","eventEmitter2","logger","loggerFactory","typeormService","printerApiFactory","fileStorageService","getDataSource","getRepository","PrintJob","name","on","event","handleJobSubmission","printerId","jobId","fileName","fileStorageId","catch","error","captureException","log","addToQueue","position","job","findOne","where","id","Error","undefined","maxPosition","getMaxQueuePosition","queuePosition","shiftQueuePositions","status","save","emit","removeFromQueue","oldPosition","compactQueuePositions","getQueue","jobs","find","Not","IsNull","order","map","j","estimatedTimeSeconds","metadata","gcodePrintTimeSeconds","filamentGrams","filamentUsedGrams","createdAt","getNextInQueue","reorderQueue","jobIds","i","length","clearQueue","processQueue","nextJob","result","createQueryBuilder","select","getRawOne","max","fromPosition","update","set","andWhere","execute","removedPosition","handleJobCompleted","submitToPrinter","fileBuffer","readFile","printerApi","getById","uploadFile","statusReason","message","updateError"],"mappings":";;;;+BAuCaA;;;eAAAA;;;yBAvC2B;gCACf;sBAOQ;AA+B1B,MAAMA;;;IACXC,mBAAyC;IACzCC,cAA6B;IACZC,OAAsB;IAEvC,YACEC,aAA6B,EAC7BC,cAA8B,EAC9BH,aAA4B,EAC5B,AAAiBI,iBAAoC,EACrD,AAAiBC,kBAAsC,CACvD;aAFiBD,oBAAAA;aACAC,qBAAAA;QAEjB,IAAI,CAACN,kBAAkB,GAAGI,eAAeG,aAAa,GAAGC,aAAa,CAACC,wBAAQ;QAC/E,IAAI,CAACR,aAAa,GAAGA;QACrB,IAAI,CAACC,MAAM,GAAGC,cAAcJ,kBAAkBW,IAAI;QAGlD,IAAI,CAACT,aAAa,CAACU,EAAE,CAAC,2BAA2B,CAACC;YAChD,IAAI,CAACC,mBAAmB,CAACD,MAAME,SAAS,EAAEF,MAAMG,KAAK,EAAEH,MAAMI,QAAQ,EAAEJ,MAAMK,aAAa,EAAEC,KAAK,CAAC,CAACC;gBACjG,IAAI,CAACjB,MAAM,CAACiB,KAAK,CAAC,CAAC,wCAAwC,EAAEP,MAAMG,KAAK,EAAE,EAAEI;gBAC5EC,IAAAA,sBAAgB,EAACD;YACnB;QACF;QAEA,IAAI,CAACjB,MAAM,CAACmB,GAAG,CAAC;IAClB;IAKA,MAAMC,WAAWR,SAAiB,EAAEC,KAAa,EAAEQ,QAAiB,EAAiB;QACnF,MAAMC,MAAM,MAAM,IAAI,CAACxB,kBAAkB,CAACyB,OAAO,CAAC;YAAEC,OAAO;gBAAEC,IAAIZ;YAAM;QAAE;QACzE,IAAI,CAACS,KAAK;YACR,MAAM,IAAII,MAAM,CAAC,UAAU,EAAGb,MAAO,UAAU,CAAC;QAClD;QAGA,IAAI,CAACS,IAAIV,SAAS,EAAE;YAClBU,IAAIV,SAAS,GAAGA;QAClB,OAAO,IAAIU,IAAIV,SAAS,KAAKA,WAAW;YACtC,MAAM,IAAIc,MAAM,CAAC,IAAI,EAAGb,MAAO,oBAAoB,EAAGS,IAAIV,SAAS,CAAE,wBAAwB,EAAGA,WAAY;QAC9G;QAEA,IAAIS,aAAaM,aAAaN,aAAa,MAAM;YAE/C,MAAMO,cAAc,MAAM,IAAI,CAACC,mBAAmB,CAACjB;YACnDU,IAAIQ,aAAa,GAAG,AAACF,CAAAA,eAAe,CAAC,CAAA,IAAK;QAC5C,OAAO;YAEL,MAAM,IAAI,CAACG,mBAAmB,CAACnB,WAAWS;YAC1CC,IAAIQ,aAAa,GAAGT;QACtB;QAEAC,IAAIU,MAAM,GAAG;QACb,MAAM,IAAI,CAAClC,kBAAkB,CAACmC,IAAI,CAACX;QAEnC,IAAI,CAACtB,MAAM,CAACmB,GAAG,CAAC,CAAC,UAAU,EAAGN,MAAO,YAAY,EAAGD,UAAW,mBAAmB,EAAGU,IAAIQ,aAAa,EAAG;QACzG,IAAI,CAAC/B,aAAa,CAACmC,IAAI,CAAC,uBAAuB;YAC7CtB;YACAC;YACAQ,UAAUC,IAAIQ,aAAa;QAC7B;IACF;IAKA,MAAMK,gBAAgBtB,KAAa,EAAiB;QAClD,MAAMS,MAAM,MAAM,IAAI,CAACxB,kBAAkB,CAACyB,OAAO,CAAC;YAAEC,OAAO;gBAAEC,IAAIZ;YAAM;QAAE;QACzE,IAAI,CAACS,KAAK;YACR,MAAM,IAAII,MAAM,CAAC,UAAU,EAAGb,MAAO,UAAU,CAAC;QAClD;QAEA,MAAMD,YAAYU,IAAIV,SAAS;QAC/B,MAAMwB,cAAcd,IAAIQ,aAAa;QAErCR,IAAIQ,aAAa,GAAG;QACpB,IAAIR,IAAIU,MAAM,KAAK,UAAU;YAC3BV,IAAIU,MAAM,GAAG;QACf;QACA,MAAM,IAAI,CAAClC,kBAAkB,CAACmC,IAAI,CAACX;QAGnC,IAAIc,gBAAgB,QAAQxB,WAAW;YACrC,MAAM,IAAI,CAACyB,qBAAqB,CAACzB,WAAWwB;QAC9C;QAEA,IAAI,CAACpC,MAAM,CAACmB,GAAG,CAAC,CAAC,YAAY,EAAGN,MAAO,WAAW,CAAC;QACnD,IAAI,CAACd,aAAa,CAACmC,IAAI,CAAC,yBAAyB;YAC/CtB;YACAC;QACF;IACF;IAKA,MAAMyB,SAAS1B,SAAiB,EAAwB;QACtD,MAAM2B,OAAO,MAAM,IAAI,CAACzC,kBAAkB,CAAC0C,IAAI,CAAC;YAC9ChB,OAAO;gBACLZ;gBACAoB,QAAQ;gBACRF,eAAeW,IAAAA,YAAG,EAACC,IAAAA,eAAM;YAC3B;YACAC,OAAO;gBAAEb,eAAe;YAAM;QAChC;QAEA,OAAOS,KAAKK,GAAG,CAACC,CAAAA,IAAM,CAAA;gBACpBpB,IAAIoB,EAAEpB,EAAE;gBACRX,UAAU+B,EAAE/B,QAAQ;gBACpBgB,eAAee,EAAEf,aAAa;gBAC9BE,QAAQa,EAAEb,MAAM;gBAChBc,sBAAuBD,EAAEE,QAAQ,EAAUC;gBAC3CC,eAAgBJ,EAAEE,QAAQ,EAAUG;gBACpCC,WAAWN,EAAEM,SAAS;YACxB,CAAA;IACF;IAKA,MAAMC,eAAexC,SAAiB,EAA4B;QAChE,OAAO,IAAI,CAACd,kBAAkB,CAACyB,OAAO,CAAC;YACrCC,OAAO;gBACLZ;gBACAoB,QAAQ;gBACRF,eAAeW,IAAAA,YAAG,EAACC,IAAAA,eAAM;YAC3B;YACAC,OAAO;gBAAEb,eAAe;YAAM;QAChC;IACF;IAKA,MAAMuB,aAAazC,SAAiB,EAAE0C,MAAgB,EAAiB;QACrE,IAAK,IAAIC,IAAI,GAAGA,IAAID,OAAOE,MAAM,EAAED,IAAK;YACtC,MAAMjC,MAAM,MAAM,IAAI,CAACxB,kBAAkB,CAACyB,OAAO,CAAC;gBAAEC,OAAO;oBAAEC,IAAI6B,MAAM,CAACC,EAAE;gBAAC;YAAE;YAC7E,IAAIjC,OAAOA,IAAIV,SAAS,KAAKA,WAAW;gBACtCU,IAAIQ,aAAa,GAAGyB;gBACpB,MAAM,IAAI,CAACzD,kBAAkB,CAACmC,IAAI,CAACX;YACrC;QACF;QAEA,IAAI,CAACtB,MAAM,CAACmB,GAAG,CAAC,CAAC,4BAA4B,EAAGP,WAAY;QAC5D,IAAI,CAACb,aAAa,CAACmC,IAAI,CAAC,wBAAwB;YAAEtB;QAAU;IAC9D;IAKA,MAAM6C,WAAW7C,SAAiB,EAAiB;QACjD,MAAM2B,OAAO,MAAM,IAAI,CAACzC,kBAAkB,CAAC0C,IAAI,CAAC;YAC9ChB,OAAO;gBACLZ;gBACAoB,QAAQ;YACV;QACF;QAEA,KAAK,MAAMV,OAAOiB,KAAM;YACtBjB,IAAIU,MAAM,GAAG;YACbV,IAAIQ,aAAa,GAAG;YACpB,MAAM,IAAI,CAAChC,kBAAkB,CAACmC,IAAI,CAACX;QACrC;QAEA,IAAI,CAACtB,MAAM,CAACmB,GAAG,CAAC,CAAC,0BAA0B,EAAGP,UAAW,EAAE,EAAG2B,KAAKiB,MAAM,CAAE,MAAM,CAAC;QAClF,IAAI,CAACzD,aAAa,CAACmC,IAAI,CAAC,sBAAsB;YAAEtB;QAAU;IAC5D;IAMA,MAAM8C,aAAa9C,SAAiB,EAA4B;QAC9D,MAAM+C,UAAU,MAAM,IAAI,CAACP,cAAc,CAACxC;QAE1C,IAAI,CAAC+C,SAAS;YACZ,IAAI,CAAC3D,MAAM,CAACmB,GAAG,CAAC,CAAC,6BAA6B,EAAGP,WAAY;YAC7D,OAAO;QACT;QAEA,IAAI,CAACZ,MAAM,CAACmB,GAAG,CAAC,CAAC,8BAA8B,EAAGwC,QAAQlC,EAAE,CAAE,EAAE,EAAGkC,QAAQ7C,QAAQ,CAAE,CAAC,CAAC;QAGvF,IAAI,CAACf,aAAa,CAACmC,IAAI,CAAC,0BAA0B;YAChDtB;YACAC,OAAO8C,QAAQlC,EAAE;YACjBX,UAAU6C,QAAQ7C,QAAQ;YAC1BC,eAAe4C,QAAQ5C,aAAa;QACtC;QAEA,OAAO4C;IACT;IAMA,MAAc9B,oBAAoBjB,SAAiB,EAA0B;QAC3E,MAAMgD,SAAS,MAAM,IAAI,CAAC9D,kBAAkB,CACzC+D,kBAAkB,CAAC,OACnBC,MAAM,CAAC,0BAA0B,OACjCtC,KAAK,CAAC,8BAA8B;YAAEZ;QAAU,GAChDmD,SAAS;QAEZ,OAAOH,QAAQI,OAAO;IACxB;IAKA,MAAcjC,oBAAoBnB,SAAiB,EAAEqD,YAAoB,EAAiB;QACxF,MAAM,IAAI,CAACnE,kBAAkB,CAC1B+D,kBAAkB,GAClBK,MAAM,CAAC3D,wBAAQ,EACf4D,GAAG,CAAC;YAAErC,eAAe,IAAM;QAAoB,GAC/CN,KAAK,CAAC,0BAA0B;YAAEZ;QAAU,GAC5CwD,QAAQ,CAAC,kCAAkC;YAAEH;QAAa,GAC1DI,OAAO;IACZ;IAKA,MAAchC,sBAAsBzB,SAAiB,EAAE0D,eAAuB,EAAiB;QAC7F,MAAM,IAAI,CAACxE,kBAAkB,CAC1B+D,kBAAkB,GAClBK,MAAM,CAAC3D,wBAAQ,EACf4D,GAAG,CAAC;YAAErC,eAAe,IAAM;QAAoB,GAC/CN,KAAK,CAAC,0BAA0B;YAAEZ;QAAU,GAC5CwD,QAAQ,CAAC,oCAAoC;YAAEE;QAAgB,GAC/DD,OAAO;IACZ;IAKA,MAAME,mBAAmB3D,SAAiB,EAAiB;QACzD,MAAM+C,UAAU,MAAM,IAAI,CAACP,cAAc,CAACxC;QAE1C,IAAI+C,SAAS;YACX,IAAI,CAAC3D,MAAM,CAACmB,GAAG,CAAC,CAAC,qDAAqD,EAAGwC,QAAQlC,EAAE,EAAG;YACtF,MAAM,IAAI,CAACiC,YAAY,CAAC9C;QAC1B,OAAO;YACL,IAAI,CAACZ,MAAM,CAACmB,GAAG,CAAC,CAAC,wBAAwB,EAAGP,UAAW,qBAAqB,CAAC;QAC/E;IACF;IAEA,MAAM4D,gBAAgB5D,SAAiB,EAAEC,KAAa,EAAiB;QACrE,MAAMS,MAAM,MAAM,IAAI,CAACxB,kBAAkB,CAACyB,OAAO,CAAC;YAAEC,OAAO;gBAAEC,IAAIZ;YAAM;QAAE;QAEzE,IAAI,CAACS,KAAK;YACR,MAAM,IAAII,MAAM,CAAC,UAAU,EAAGb,MAAO,UAAU,CAAC;QAClD;QAGA,IAAIS,IAAIV,SAAS,IAAIU,IAAIV,SAAS,KAAKA,WAAW;YAChD,MAAM,IAAIc,MAAM,CAAC,IAAI,EAAGb,MAAO,oBAAoB,EAAGS,IAAIV,SAAS,CAAE,2BAA2B,EAAGA,WAAY;QACjH;QAEA,IAAI,CAACU,IAAIV,SAAS,EAAE;YAClBU,IAAIV,SAAS,GAAGA;QAClB;QAGA,IAAIU,IAAIQ,aAAa,KAAK,MAAM;YAC9B,MAAMM,cAAcd,IAAIQ,aAAa;YACrCR,IAAIQ,aAAa,GAAG;YACpB,MAAM,IAAI,CAACO,qBAAqB,CAACzB,WAAWwB;QAC9C;QAGAd,IAAIU,MAAM,GAAG;QACb,MAAM,IAAI,CAAClC,kBAAkB,CAACmC,IAAI,CAACX;QAEnC,IAAI,CAACtB,MAAM,CAACmB,GAAG,CAAC,CAAC,eAAe,EAAGN,MAAO,EAAE,EAAGS,IAAIR,QAAQ,CAAE,aAAa,EAAGF,WAAY;QAGzF,IAAI,CAACb,aAAa,CAACmC,IAAI,CAAC,2BAA2B;YACjDtB;YACAC,OAAOS,IAAIG,EAAE;YACbX,UAAUQ,IAAIR,QAAQ;YACtBC,eAAeO,IAAIP,aAAa;QAClC;IACF;IAKA,MAAcJ,oBAAoBC,SAAiB,EAAEC,KAAa,EAAEC,QAAgB,EAAEC,aAAsB,EAAiB;QAC3H,IAAI,CAACf,MAAM,CAACmB,GAAG,CAAC,CAAC,gCAAgC,EAAEN,MAAM,YAAY,EAAED,WAAW;QAElF,IAAI;YAEF,IAAI,CAACG,eAAe;gBAClB,MAAM,IAAIW,MAAM,CAAC,IAAI,EAAEb,MAAM,gDAAgD,CAAC;YAChF;YAGA,MAAM4D,aAAa,IAAI,CAACrE,kBAAkB,CAACsE,QAAQ,CAAC3D;YACpD,IAAI,CAACf,MAAM,CAACmB,GAAG,CAAC,CAAC,KAAK,EAAEsD,WAAWjB,MAAM,CAAC,eAAe,EAAE3C,OAAO;YAGlE,MAAM8D,aAAa,IAAI,CAACxE,iBAAiB,CAACyE,OAAO,CAAChE;YAGlD,IAAI,CAACZ,MAAM,CAACmB,GAAG,CAAC,CAAC,eAAe,EAAEL,SAAS,YAAY,EAAEF,UAAU,mBAAmB,CAAC;YACvF,MAAM+D,WAAWE,UAAU,CAACJ,YAAY;YAExC,IAAI,CAACzE,MAAM,CAACmB,GAAG,CAAC,CAAC,2BAA2B,EAAEN,MAAM,YAAY,EAAED,WAAW;QAE/E,EAAE,OAAOK,OAAO;YACd,IAAI,CAACjB,MAAM,CAACiB,KAAK,CAAC,CAAC,qBAAqB,EAAEJ,MAAM,YAAY,EAAED,WAAW,EAAEK;YAG3E,IAAI;gBACF,MAAMK,MAAM,MAAM,IAAI,CAACxB,kBAAkB,CAACyB,OAAO,CAAC;oBAAEC,OAAO;wBAAEC,IAAIZ;oBAAM;gBAAE;gBACzE,IAAIS,KAAK;oBACPA,IAAIU,MAAM,GAAG;oBACbV,IAAIwD,YAAY,GAAG,CAAC,yBAAyB,EAAE7D,iBAAiBS,QAAQT,MAAM8D,OAAO,GAAG,iBAAiB;oBACzG,MAAM,IAAI,CAACjF,kBAAkB,CAACmC,IAAI,CAACX;oBACnC,IAAI,CAACtB,MAAM,CAACmB,GAAG,CAAC,CAAC,YAAY,EAAEN,MAAM,iBAAiB,CAAC;gBACzD;YACF,EAAE,OAAOmE,aAAa;gBACpB,IAAI,CAAChF,MAAM,CAACiB,KAAK,CAAC,CAAC,qBAAqB,EAAEJ,MAAM,8BAA8B,CAAC,EAAEmE;YACnF;YAEA,MAAM/D;QACR;IACF;AACF"}
|
|
@@ -19,7 +19,7 @@ class PrinterApiFactory {
|
|
|
19
19
|
const printerCache = this.cradleService.resolve(_containertokens.DITokens.printerCache);
|
|
20
20
|
const login = printerCache.getLoginDto(id);
|
|
21
21
|
const printerApi = this.getScopedPrinter(login);
|
|
22
|
-
if (login.printerType === _printerapiinterface.BambuType &&
|
|
22
|
+
if (login.printerType === _printerapiinterface.BambuType && "setPrinterId" in printerApi) {
|
|
23
23
|
printerApi.setPrinterId(id);
|
|
24
24
|
}
|
|
25
25
|
return printerApi;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/printer-api.factory.ts"],"names":["PrinterApiFactory","cradleService","getById","id","printerCache","resolve","DITokens","login","getLoginDto","printerApi","getScopedPrinter","printerType","BambuType","setPrinterId","OctoprintType","octoprintApi","MoonrakerType","moonrakerApi","PrusaLinkType","prusaLinkApi","bambuApi","Error"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../src/services/printer-api.factory.ts"],"names":["PrinterApiFactory","cradleService","getById","id","printerCache","resolve","DITokens","login","getLoginDto","printerApi","getScopedPrinter","printerType","BambuType","setPrinterId","OctoprintType","octoprintApi","MoonrakerType","moonrakerApi","PrusaLinkType","prusaLinkApi","bambuApi","Error"],"mappings":";;;;+BAMaA;;;eAAAA;;;qCANuE;iCAC3D;AAKlB,MAAMA;;IACX,YAAY,AAAiBC,aAA4B,CAAE;aAA9BA,gBAAAA;IAA+B;IAE5DC,QAAQC,EAAU,EAAe;QAC/B,MAAMC,eAAe,IAAI,CAACH,aAAa,CAACI,OAAO,CAAeC,yBAAQ,CAACF,YAAY;QACnF,MAAMG,QAAQH,aAAaI,WAAW,CAACL;QACvC,MAAMM,aAAa,IAAI,CAACC,gBAAgB,CAACH;QAGzC,IAAIA,MAAMI,WAAW,KAAKC,8BAAS,IAAI,kBAAkBH,YAAY;YAClEA,WAAmBI,YAAY,CAACV;QACnC;QAEA,OAAOM;IACT;IAEAC,iBAAiBH,KAAe,EAAe;QAC7C,IAAIE;QACJ,IAAIF,MAAMI,WAAW,KAAKG,kCAAa,EAAE;YACvCL,aAAa,IAAI,CAACR,aAAa,CAACI,OAAO,CAAcC,yBAAQ,CAACS,YAAY;QAC5E,OAAO,IAAIR,MAAMI,WAAW,KAAKK,kCAAa,EAAE;YAC9CP,aAAa,IAAI,CAACR,aAAa,CAACI,OAAO,CAAcC,yBAAQ,CAACW,YAAY;QAC5E,OAAO,IAAIV,MAAMI,WAAW,KAAKO,kCAAa,EAAE;YAC9CT,aAAa,IAAI,CAACR,aAAa,CAACI,OAAO,CAAcC,yBAAQ,CAACa,YAAY;QAC5E,OAAO,IAAIZ,MAAMI,WAAW,KAAKC,8BAAS,EAAE;YAC1CH,aAAa,IAAI,CAACR,aAAa,CAACI,OAAO,CAAcC,yBAAQ,CAACc,QAAQ;QACxE,OAAO;YACL,MAAM,IAAIC,MAAM;QAClB;QAEAZ,WAAWF,KAAK,GAAGA;QACnB,OAAOE;IACT;AACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/printer-api.interface.ts"],"names":["BambuType","MoonrakerType","OctoprintType","PrinterTypesEnum","PrusaLinkType","ReprintState"],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../src/services/printer-api.interface.ts"],"names":["BambuType","MoonrakerType","OctoprintType","PrinterTypesEnum","PrusaLinkType","ReprintState"],"mappings":";;;;;;;;;;;QAUaA;eAAAA;;QAFAC;eAAAA;;QADAC;eAAAA;;QAKDC;eAAAA;;QAHCC;eAAAA;;QA6CDC;eAAAA;;;AA/CL,MAAMH,gBAAgB;AACtB,MAAMD,gBAAgB;AACtB,MAAMG,gBAAgB;AACtB,MAAMJ,YAAY;AAElB,IAAA,AAAKG,0CAAAA;;;;;WAAAA;;AA0CL,IAAA,AAAKE,sCAAAA;;;;WAAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/services/prusa-link/constants/prusalink-event.dto.ts"],"names":["PrusaLinkEventDto","event","payload","printerId","printerType"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../../../src/services/prusa-link/constants/prusalink-event.dto.ts"],"names":["PrusaLinkEventDto","event","payload","printerId","printerType"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA;IACXC,MAAS;IACTC,QAAW;IACXC,UAAkB;IAClBC,YAAe;AACjB"}
|
|
@@ -20,7 +20,6 @@ const defaultLog = {
|
|
|
20
20
|
class PrusaLinkHttpPollingAdapter {
|
|
21
21
|
prusaLinkApi;
|
|
22
22
|
eventEmitter2;
|
|
23
|
-
configService;
|
|
24
23
|
printerType = _printerapiinterface.PrusaLinkType;
|
|
25
24
|
printerId;
|
|
26
25
|
login;
|
|
@@ -29,10 +28,9 @@ class PrusaLinkHttpPollingAdapter {
|
|
|
29
28
|
lastMessageReceivedTimestamp;
|
|
30
29
|
refreshPrinterCurrentInterval;
|
|
31
30
|
eventEmittingAllowed = true;
|
|
32
|
-
constructor(loggerFactory, prusaLinkApi, eventEmitter2
|
|
31
|
+
constructor(loggerFactory, prusaLinkApi, eventEmitter2){
|
|
33
32
|
this.prusaLinkApi = prusaLinkApi;
|
|
34
33
|
this.eventEmitter2 = eventEmitter2;
|
|
35
|
-
this.configService = configService;
|
|
36
34
|
this.logger = loggerFactory(PrusaLinkHttpPollingAdapter.name);
|
|
37
35
|
}
|
|
38
36
|
allowEmittingEvents() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/prusa-link/prusa-link-http-polling.adapter.ts"],"names":["PrusaLinkHttpPollingAdapter","defaultLog","adapter","printerType","PrusaLinkType","printerId","login","socketState","apiState","lastMessageReceivedTimestamp","refreshPrinterCurrentInterval","eventEmittingAllowed","loggerFactory","prusaLinkApi","eventEmitter2","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/prusa-link/prusa-link-http-polling.adapter.ts"],"names":["PrusaLinkHttpPollingAdapter","defaultLog","adapter","printerType","PrusaLinkType","printerId","login","socketState","apiState","lastMessageReceivedTimestamp","refreshPrinterCurrentInterval","eventEmittingAllowed","loggerFactory","prusaLinkApi","eventEmitter2","logger","name","allowEmittingEvents","disallowEmittingEvents","needsReopen","needsSetup","needsReauth","Error","isClosedOrAborted","reauthSession","registerCredentials","socketLogin","loginDto","open","startPolling","close","debug","logMeta","stopPolling","setupSocketSession","warn","Promise","resolve","resetSocketState","setInterval","updateSocketState","SOCKET_STATE","opening","printerURL","username","password","apiKey","authenticating","printerState","getPrinterState","state","flags","link_state","text","jobState","getJobState","authenticated","updateApiState","API_STATE","responding","emitEvent","job","progress","printTime","printTimeLeft","completion","error","errorSummary","clearInterval","undefined","closed","event","payload","prusaLinkEvent","emitAsync","emitEventSync","emit","WsMessage","WS_STATE_UPDATED","API_STATE_UPDATED"],"mappings":"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"}
|
|
@@ -44,6 +44,9 @@ class PrusaLinkApi {
|
|
|
44
44
|
const response = await this.client.get("/api/version");
|
|
45
45
|
return response.data.server;
|
|
46
46
|
}
|
|
47
|
+
async validateConnection() {
|
|
48
|
+
await this.getVersion();
|
|
49
|
+
}
|
|
47
50
|
async getFiles() {
|
|
48
51
|
const response = await this.client.get("/api/files");
|
|
49
52
|
return response.data.files.filter((dir)=>dir.path === "/usb")[0].children.map((f)=>({
|
|
@@ -156,7 +159,7 @@ class PrusaLinkApi {
|
|
|
156
159
|
const response = await this.createClient((b)=>{
|
|
157
160
|
b.withHeaders({
|
|
158
161
|
"Content-Length": contentLength.toString(),
|
|
159
|
-
|
|
162
|
+
Overwrite: "?1",
|
|
160
163
|
"Print-After-Upload": startPrint ? "?1" : "?0"
|
|
161
164
|
}).withTimeout(this.settingsStore.getTimeoutSettings().apiUploadTimeout).withOnUploadProgress((p)=>{
|
|
162
165
|
if (progressToken) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/prusa-link/prusa-link.api.ts"],"names":["PrusaLinkApi","defaultLog","adapter","logger","authHeader","loggerFactory","eventEmitter2","httpClientFactory","settingsStore","printerLogin","name","debug","logMeta","type","PrusaLinkType","login","client","createClient","getVersion","response","get","data","server","getFiles","files","filter","dir","path","children","map","f","display","date","size","getFile","getFileRaw","getStatus","getPrinterState","getJobState","connect","Error","disconnect","restartServer","restartHost","restartPrinterFirmware","startPrint","post","pausePrint","jobId","getCurrentJobId","warn","put","resumePrint","cancelPrint","delete","quickStop","sendGcode","script","movePrintHead","amounts","homeAxes","axes","downloadFile","fileReference","pathUrl","refs","download","responseType","getFileChunk","startBytes","endBytes","o","withHeaders","Range","uploadFile","multerFileOrBuffer","progressToken","fileBuffer","filename","originalname","Buffer","isBuffer","log","filePath","readFileSync","contentLength","length","b","toString","withTimeout","getTimeoutSettings","apiUploadTimeout","withOnUploadProgress","p","emit","uploadProgressEvent","encodeURIComponent","uploadDoneEvent","e","uploadFailedEvent","message","JSON","parse","body","ExternalServiceError","error","statusCode","success","stack","deleteFile","deleteFolder","getSettings","getReprintState","status","job","id","buildFluentOptions","builder","PrusaLinkHttpClientBuilder","createClientWithBaseUrl","printerURL","withDigestAuth","username","password","attemptCount","config","method","toUpperCase","url","withAuthHeader"],"mappings":";;;;+BAkCaA;;;eAAAA;;;qCAzBN;4CAKoC;oBAMd;gCAC2C;mCACnC;AAKrC,MAAMC,aAAa;IAAEC,SAAS;AAAa;AAOpC,MAAMF;;;;;IACDG,OAAsB;IACxBC,aAA4B,KAAK;IAEzC,YACEC,aAA6B,EAC7B,AAAiBC,aAA4B,EAC7C,AAAiBC,iBAAoC,EACrD,AAAiBC,aAA4B,EAC7C,AAAQC,YAAsB,CAC9B;aAJiBH,gBAAAA;aACAC,oBAAAA;aACAC,gBAAAA;aACTC,eAAAA;QAER,IAAI,CAACN,MAAM,GAAGE,cAAcL,aAAaU,IAAI;QAC7C,IAAI,CAACP,MAAM,CAACQ,KAAK,CAAC,0BAA0B,IAAI,CAACC,OAAO;IAC1D;IAEA,IAAIC,OAAoB;QACtB,OAAOC,kCAAa;IACtB;IAEA,IAAIC,MAAMA,KAAe,EAAE;QACzB,IAAI,CAACN,YAAY,GAAGM;IACtB;IAEA,IAAYC,SAAS;QACnB,OAAO,IAAI,CAACC,YAAY;IAC1B;IAEA,MAAMC,aAA8B;QAClC,MAAMC,WAAW,MAAM,IAAI,CAACH,MAAM,CAACI,GAAG,CAAa;QACnD,OAAOD,SAASE,IAAI,CAACC,MAAM;IAC7B;IAEA,MAAMC,WAA+B;QACnC,
|
|
1
|
+
{"version":3,"sources":["../../../src/services/prusa-link/prusa-link.api.ts"],"names":["PrusaLinkApi","defaultLog","adapter","logger","authHeader","loggerFactory","eventEmitter2","httpClientFactory","settingsStore","printerLogin","name","debug","logMeta","type","PrusaLinkType","login","client","createClient","getVersion","response","get","data","server","validateConnection","getFiles","files","filter","dir","path","children","map","f","display","date","size","getFile","getFileRaw","getStatus","getPrinterState","getJobState","connect","Error","disconnect","restartServer","restartHost","restartPrinterFirmware","startPrint","post","pausePrint","jobId","getCurrentJobId","warn","put","resumePrint","cancelPrint","delete","quickStop","sendGcode","script","movePrintHead","amounts","homeAxes","axes","downloadFile","fileReference","pathUrl","refs","download","responseType","getFileChunk","startBytes","endBytes","o","withHeaders","Range","uploadFile","multerFileOrBuffer","progressToken","fileBuffer","filename","originalname","Buffer","isBuffer","log","filePath","readFileSync","contentLength","length","b","toString","Overwrite","withTimeout","getTimeoutSettings","apiUploadTimeout","withOnUploadProgress","p","emit","uploadProgressEvent","encodeURIComponent","uploadDoneEvent","e","uploadFailedEvent","message","JSON","parse","body","ExternalServiceError","error","statusCode","success","stack","deleteFile","deleteFolder","getSettings","getReprintState","status","job","id","buildFluentOptions","builder","PrusaLinkHttpClientBuilder","createClientWithBaseUrl","printerURL","withDigestAuth","username","password","attemptCount","config","method","toUpperCase","url","withAuthHeader"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/services/prusa-link/utils/prusa-link-http-client.builder.ts"],"names":["PrusaLinkHttpClientBuilder","DefaultHttpClientBuilder","maxRetries","username","password","authHeaderContext","onAuthError","onAuthSuccess","onRequestRetry","build","axiosOptions","baseURL","Error","axiosInstance","interceptors","request","use","config","computedDigestHeader","generateDigestHeader","method","toUpperCase","url","headers","authorizationHeaderKey","response","error","originalRequest","status","length","_retryCount","wwwAuthHeader","wwwAuthenticationHeaderKey","saveParsedAuthHeaderContext","Promise","reject","withDigestAuth","withAuthHeader","authHeader","headerValue","startsWith","substring","authParams","Object","fromEntries","split","map","param","parts","replace","realm","nonce","qop","hasQop","uri","generateDigestAuthHeader","undefined","nc","cnonce","randomBytes","toString"],"mappings":";;;;+BAgBaA;;;eAAAA;;;0CAhB4B;2CAIlC;gCAEkC;4BACb;AASrB,MAAMA,mCAAmCC,kDAAwB;IACrDC,aAAqB,EAAE;IAChCC,SAAkB;IAClBC,SAAkB;IAClBC,kBAAmC;IACnCC,YAA0C;IAC1CC,cAA6C;IAC7CC,eAAmE;IAE3DC,QAAgC;QAC9C,IAAI,CAAC,IAAI,CAACC,YAAY,CAACC,OAAO,EAAE;YAC9B,MAAM,IAAIC,MAAM;QAClB;QAEA,MAAMC,gBAAgB,KAAK,CAACJ;QAG5B,IAAI,IAAI,CAACN,QAAQ,IAAI,IAAI,CAACC,QAAQ,EAAE;YAClCS,cAAcC,YAAY,CAACC,OAAO,CAACC,GAAG,CAAC,OAAOC;gBAE5C,IAAI,IAAI,CAACZ,iBAAiB,EAAE;oBAC1B,MAAMa,uBAAuB,IAAI,CAACC,oBAAoB,CACpDF,OAAOG,MAAM,EAAEC,iBAAiB,OAChCJ,OAAOK,GAAG,IAAI;oBAGhBL,OAAOM,OAAO,CAACC,iDAAsB,CAAC,GAAGN;gBAC3C;gBACA,OAAOD;YACT;YAGAJ,cAAcC,YAAY,CAACW,QAAQ,CAACT,GAAG,CACrC,CAACS,WAAaA,UACd,OAAOC;gBACL,MAAMC,kBAAkBD,MAAMT,MAAM;gBAGpC,IACES,MAAMD,QAAQ,EAAEG,WAAW,OAC3B,IAAI,CAACzB,QAAQ,EAAE0B,UACf,IAAI,CAACzB,QAAQ,EAAEyB,UACd,CAAA,CAACF,gBAAgBG,WAAW,IAAIH,gBAAgBG,WAAW,GAAG,IAAI,CAAC5B,UAAU,AAAD,GAC7E;oBAEA,MAAM6B,gBAAgBL,MAAMD,QAAQ,CAACF,OAAO,CAACS,qDAA0B,CAAC;oBACxE,IAAID,eAAe;
|
|
1
|
+
{"version":3,"sources":["../../../../src/services/prusa-link/utils/prusa-link-http-client.builder.ts"],"names":["PrusaLinkHttpClientBuilder","DefaultHttpClientBuilder","maxRetries","username","password","authHeaderContext","onAuthError","onAuthSuccess","onRequestRetry","build","axiosOptions","baseURL","Error","axiosInstance","interceptors","request","use","config","computedDigestHeader","generateDigestHeader","method","toUpperCase","url","headers","authorizationHeaderKey","response","error","originalRequest","status","length","_retryCount","wwwAuthHeader","wwwAuthenticationHeaderKey","saveParsedAuthHeaderContext","Promise","reject","withDigestAuth","withAuthHeader","authHeader","headerValue","startsWith","substring","authParams","Object","fromEntries","split","map","param","parts","replace","realm","nonce","qop","hasQop","uri","generateDigestAuthHeader","undefined","nc","cnonce","randomBytes","toString"],"mappings":"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"}
|
|
@@ -12,24 +12,21 @@ _export(exports, {
|
|
|
12
12
|
get createOrUpdateFloorSchema () {
|
|
13
13
|
return createOrUpdateFloorSchema;
|
|
14
14
|
},
|
|
15
|
-
get floorLevelValidator () {
|
|
16
|
-
return floorLevelValidator;
|
|
17
|
-
},
|
|
18
15
|
get floorNameValidator () {
|
|
19
16
|
return floorNameValidator;
|
|
20
17
|
},
|
|
18
|
+
get floorOrderValidator () {
|
|
19
|
+
return floorOrderValidator;
|
|
20
|
+
},
|
|
21
21
|
get printerInFloorSchema () {
|
|
22
22
|
return printerInFloorSchema;
|
|
23
23
|
},
|
|
24
|
-
get removePrinterInFloorSchema () {
|
|
25
|
-
return removePrinterInFloorSchema;
|
|
26
|
-
},
|
|
27
|
-
get updateFloorLevelSchema () {
|
|
28
|
-
return updateFloorLevelSchema;
|
|
29
|
-
},
|
|
30
24
|
get updateFloorNameSchema () {
|
|
31
25
|
return updateFloorNameSchema;
|
|
32
26
|
},
|
|
27
|
+
get updateFloorOrderSchema () {
|
|
28
|
+
return updateFloorOrderSchema;
|
|
29
|
+
},
|
|
33
30
|
get xValidator () {
|
|
34
31
|
return xValidator;
|
|
35
32
|
},
|
|
@@ -40,34 +37,31 @@ _export(exports, {
|
|
|
40
37
|
const _zod = require("zod");
|
|
41
38
|
const _serviceconstants = require("../../constants/service.constants");
|
|
42
39
|
const _genericvalidation = require("../../controllers/validation/generic.validation");
|
|
43
|
-
const removePrinterInFloorSchema = (isSqlite)=>_zod.z.object({
|
|
44
|
-
printerId: (0, _genericvalidation.idRuleV2)(isSqlite)
|
|
45
|
-
});
|
|
46
40
|
const xValidator = _zod.z.number().int().min(0).max(12);
|
|
47
41
|
const yValidator = _zod.z.number().int().min(0).max(12);
|
|
48
|
-
const
|
|
42
|
+
const floorOrderValidator = _zod.z.number().int();
|
|
49
43
|
const floorNameValidator = _zod.z.string().min(_serviceconstants.minFloorNameLength);
|
|
50
|
-
const printerInFloorSchema =
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
44
|
+
const printerInFloorSchema = _zod.z.object({
|
|
45
|
+
printerId: _genericvalidation.idRuleV2,
|
|
46
|
+
floorId: _genericvalidation.idRuleV2,
|
|
47
|
+
x: xValidator,
|
|
48
|
+
y: yValidator
|
|
49
|
+
});
|
|
56
50
|
const updateFloorNameSchema = _zod.z.object({
|
|
57
51
|
name: floorNameValidator
|
|
58
52
|
});
|
|
59
|
-
const
|
|
60
|
-
|
|
53
|
+
const updateFloorOrderSchema = _zod.z.object({
|
|
54
|
+
order: floorOrderValidator
|
|
55
|
+
});
|
|
56
|
+
const createOrUpdateFloorSchema = _zod.z.object({
|
|
57
|
+
name: floorNameValidator,
|
|
58
|
+
order: floorOrderValidator,
|
|
59
|
+
printers: _zod.z.array(_zod.z.object({
|
|
60
|
+
printerId: _genericvalidation.idRuleV2,
|
|
61
|
+
floorId: _genericvalidation.idRuleV2.optional(),
|
|
62
|
+
x: xValidator,
|
|
63
|
+
y: yValidator
|
|
64
|
+
})).optional()
|
|
61
65
|
});
|
|
62
|
-
const createOrUpdateFloorSchema = (isSqlite)=>_zod.z.object({
|
|
63
|
-
name: floorNameValidator,
|
|
64
|
-
floor: floorLevelValidator,
|
|
65
|
-
printers: _zod.z.array(_zod.z.object({
|
|
66
|
-
printerId: (0, _genericvalidation.idRuleV2)(isSqlite),
|
|
67
|
-
floorId: (0, _genericvalidation.idRuleV2)(isSqlite).optional(),
|
|
68
|
-
x: xValidator,
|
|
69
|
-
y: yValidator
|
|
70
|
-
})).optional()
|
|
71
|
-
});
|
|
72
66
|
|
|
73
67
|
//# sourceMappingURL=floor-service.validation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/validators/floor-service.validation.ts"],"names":["createOrUpdateFloorSchema","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/validators/floor-service.validation.ts"],"names":["createOrUpdateFloorSchema","floorNameValidator","floorOrderValidator","printerInFloorSchema","updateFloorNameSchema","updateFloorOrderSchema","xValidator","yValidator","z","number","int","min","max","string","minFloorNameLength","object","printerId","idRuleV2","floorId","x","y","name","order","printers","array","optional"],"mappings":";;;;;;;;;;;QAuBaA;eAAAA;;QAjBAC;eAAAA;;QADAC;eAAAA;;QAGAC;eAAAA;;QAOAC;eAAAA;;QAIAC;eAAAA;;QAhBAC;eAAAA;;QACAC;eAAAA;;;qBAJK;kCACiB;mCACV;AAClB,MAAMD,aAAaE,MAAC,CAACC,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC,GAAGC,GAAG,CAAC;AAC/C,MAAML,aAAaC,MAAC,CAACC,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC,GAAGC,GAAG,CAAC;AAC/C,MAAMV,sBAAsBM,MAAC,CAACC,MAAM,GAAGC,GAAG;AAC1C,MAAMT,qBAAqBO,MAAC,CAACK,MAAM,GAAGF,GAAG,CAACG,oCAAkB;AAE5D,MAAMX,uBAAuBK,MAAC,CAACO,MAAM,CAAC;IAC3CC,WAAWC,2BAAQ;IACnBC,SAASD,2BAAQ;IACjBE,GAAGb;IACHc,GAAGb;AACL;AAEO,MAAMH,wBAAwBI,MAAC,CAACO,MAAM,CAAC;IAC5CM,MAAMpB;AACR;AAEO,MAAMI,yBAAyBG,MAAC,CAACO,MAAM,CAAC;IAC7CO,OAAOpB;AACT;AAEO,MAAMF,4BAA4BQ,MAAC,CAACO,MAAM,CAAC;IAChDM,MAAMpB;IACNqB,OAAOpB;IACPqB,UAAUf,MAAC,CACRgB,KAAK,CACJhB,MAAC,CAACO,MAAM,CAAC;QACPC,WAAWC,2BAAQ;QACnBC,SAASD,2BAAQ,CAACQ,QAAQ;QAC1BN,GAAGb;QACHc,GAAGb;IACL,IAEDkB,QAAQ;AACb"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
function _export(target, all) {
|
|
6
|
+
for(var name in all)Object.defineProperty(target, name, {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
get: Object.getOwnPropertyDescriptor(all, name).get
|
|
9
|
+
});
|
|
10
|
+
}
|
|
11
|
+
_export(exports, {
|
|
12
|
+
get searchJobsPagedSchema () {
|
|
13
|
+
return searchJobsPagedSchema;
|
|
14
|
+
},
|
|
15
|
+
get searchJobsSchema () {
|
|
16
|
+
return searchJobsSchema;
|
|
17
|
+
}
|
|
18
|
+
});
|
|
19
|
+
const _zod = require("zod");
|
|
20
|
+
const searchJobsSchema = _zod.z.object({
|
|
21
|
+
searchPrinter: _zod.z.string().trim().min(1).optional(),
|
|
22
|
+
searchFile: _zod.z.string().trim().min(1).optional(),
|
|
23
|
+
startDate: _zod.z.string().date().min(1).optional(),
|
|
24
|
+
endDate: _zod.z.string().date().min(1).optional()
|
|
25
|
+
});
|
|
26
|
+
const searchJobsPagedSchema = searchJobsSchema.extend({
|
|
27
|
+
page: _zod.z.coerce.number().int().min(1),
|
|
28
|
+
pageSize: _zod.z.coerce.number().int().min(1).max(500)
|
|
29
|
+
});
|
|
30
|
+
|
|
31
|
+
//# sourceMappingURL=print-job.validation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/validators/print-job.validation.ts"],"names":["searchJobsPagedSchema","searchJobsSchema","z","object","searchPrinter","string","trim","min","optional","searchFile","startDate","date","endDate","extend","page","coerce","number","int","pageSize","max"],"mappings":";;;;;;;;;;;QASaA;eAAAA;;QAPAC;eAAAA;;;qBAFK;AAEX,MAAMA,mBAAmBC,MAAC,CAACC,MAAM,CAAC;IACvCC,eAAeF,MAAC,CAACG,MAAM,GAAGC,IAAI,GAAGC,GAAG,CAAC,GAAGC,QAAQ;IAChDC,YAAYP,MAAC,CAACG,MAAM,GAAGC,IAAI,GAAGC,GAAG,CAAC,GAAGC,QAAQ;IAC7CE,WAAWR,MAAC,CAACG,MAAM,GAAGM,IAAI,GAAGJ,GAAG,CAAC,GAAGC,QAAQ;IAC5CI,SAASV,MAAC,CAACG,MAAM,GAAGM,IAAI,GAAGJ,GAAG,CAAC,GAAGC,QAAQ;AAC5C;AAEO,MAAMR,wBAAwBC,iBAAiBY,MAAM,CAAC;IAC3DC,MAAMZ,MAAC,CAACa,MAAM,CAACC,MAAM,GAAGC,GAAG,GAAGV,GAAG,CAAC;IAClCW,UAAUhB,MAAC,CAACa,MAAM,CAACC,MAAM,GAAGC,GAAG,GAAGV,GAAG,CAAC,GAAGY,GAAG,CAAC;AAC/C"}
|