@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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/octoprint.api.ts"],"names":["OctoprintApi","client","octoprintClient","printerLogin","type","OctoprintType","login","getVersion","result","getApiVersion","data","server","connect","sendConnectionCommand","connectCommand","disconnect","disconnectCommand","restartServer","postServerRestartCommand","restartHost","NotImplementedException","restartPrinterFirmware","startPrint","filePath","postSelectPrintFile","pausePrint","sendJobCommand","pauseJobCommand","resumePrint","resumeJobCommand","cancelPrint","cancelJobCommand","sendGcode","script","sendCustomGCodeCommand","quickStop","movePrintHead","amounts","sendPrintHeadJogCommand","homeAxes","axes","sendPrintHeadHomeCommand","getFile","path","getFiles","files","getLocalFiles","map","f","size","date","downloadFile","getFileChunk","startBytes","endBytes","uploadFile","fileOrBuffer","uploadToken","uploadFileAsMultiPart","deleteFile","deleteFileOrFolder","deleteFolder","getSettings","response","getReprintState","connectedResponse","getConnection","connectionState","current","state","selectedJobResponse","getJob","selectedJob","currentJobFile","job","file","reprintState","ReprintState","NoLastPrint","LastPrintReady"],"mappings":";;;;+BAMaA;;;eAAAA;;;qCANyD;mCAG9B;AAGjC,MAAMA;;IACMC,OAAwB;IAEzC,YACEC,eAAgC,EAChC,AAAQC,YAAsB,CAC9B;aADQA,eAAAA;QAER,IAAI,CAACF,MAAM,GAAGC;IAChB;IAEA,IAAIE,OAAoB;QACtB,OAAOC,kCAAa;IACtB;IAEA,IAAIC,QAAQ;QACV,OAAO,IAAI,CAACH,YAAY;IAC1B;IAEA,IAAIG,MAAMA,KAAe,EAAE;QACzB,IAAI,CAACH,YAAY,GAAGG;IACtB;IAEA,MAAMC,aAAa;QACjB,MAAMC,SAAS,MAAM,IAAI,CAACP,MAAM,CAACQ,aAAa,CAAC,IAAI,CAACH,KAAK;QACzD,OAAOE,OAAOE,IAAI,EAAEC;IACtB;IAEA,MAAMC,UAAU;QACd,MAAM,IAAI,
|
|
1
|
+
{"version":3,"sources":["../../src/services/octoprint.api.ts"],"names":["OctoprintApi","client","octoprintClient","printerLogin","type","OctoprintType","login","getVersion","result","getApiVersion","data","server","validateConnection","connect","sendConnectionCommand","connectCommand","disconnect","disconnectCommand","restartServer","postServerRestartCommand","restartHost","NotImplementedException","restartPrinterFirmware","startPrint","filePath","postSelectPrintFile","pausePrint","sendJobCommand","pauseJobCommand","resumePrint","resumeJobCommand","cancelPrint","cancelJobCommand","sendGcode","script","sendCustomGCodeCommand","quickStop","movePrintHead","amounts","sendPrintHeadJogCommand","homeAxes","axes","sendPrintHeadHomeCommand","getFile","path","getFiles","files","getLocalFiles","map","f","size","date","downloadFile","getFileChunk","startBytes","endBytes","uploadFile","fileOrBuffer","uploadToken","uploadFileAsMultiPart","deleteFile","deleteFileOrFolder","deleteFolder","getSettings","response","getReprintState","connectedResponse","getConnection","connectionState","current","state","selectedJobResponse","getJob","selectedJob","currentJobFile","job","file","reprintState","ReprintState","NoLastPrint","LastPrintReady"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/base.service.ts"],"names":["BaseService","entity","dto","createDTO","updateDto","BaseServiceHost","repository","typeormService","getDataSource","getRepository","get","id","options","undefined","EntityNotFoundError","findOneOrFail","where","e","NotFoundException","list","find","listPaged","page","DEFAULT_PAGE","take","pageSize","skip","update","validate","Object","assign","create","Error","save","delete","deleteMany","ids"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/base.service.ts"],"names":["BaseService","entity","dto","createDTO","updateDto","BaseServiceHost","repository","typeormService","getDataSource","getRepository","get","id","options","undefined","EntityNotFoundError","findOneOrFail","where","e","NotFoundException","list","find","listPaged","page","DEFAULT_PAGE","take","pageSize","skip","update","validate","Object","assign","create","Error","save","delete","deleteMany","ids"],"mappings":";;;;+BAQgBA;;;eAAAA;;;yBAN4F;gCACnF;mCAES;+BACQ;AAEnC,SAASA,YAKdC,MAAuB,EAAEC,GAAc,EAAEC,SAA2B,EAAEC,SAA2B;IACjG,MAAeC;;QACbC,WAA0B;QAE1B,YAAY,AAAmBC,cAA8B,CAAE;iBAAhCA,iBAAAA;YAC7B,IAAI,CAACD,UAAU,GAAGC,eAAeC,aAAa,GAAGC,aAAa,CAACR;QACjE;QAIA,MAAMS,IAAIC,EAAU,EAAEC,OAA2B,EAAE;YACjD,IAAI;gBACF,IAAID,OAAO,QAAQA,OAAOE,WAAW;oBACnC,MAAM,IAAIC,4BAAmB,CAACb,QAAQ;gBACxC;gBACA,OAAO,IAAI,CAACK,UAAU,CAACS,aAAa,CAAC;oBAAE,GAAGH,OAAO;oBAAEI,OAAO;wBAAEL;oBAAG;gBAAE;YACnE,EAAE,OAAOM,GAAG;gBACV,IAAIA,aAAaH,4BAAmB,EAAE;oBACpC,MAAM,IAAII,oCAAiB,CAAC,CAAC,WAAW,EAAEjB,OAAO,mCAAmC,CAAC;gBACvF;gBACA,MAAMgB;YACR;QACF;QAEA,MAAME,KAAKP,OAA4B,EAAE;YACvC,OAAO,IAAI,CAACN,UAAU,CAACc,IAAI,CAACR;QAC9B;QAEA,MAAMS,UAAUC,OAAoBC,2BAAY,EAAEX,OAA4B,EAAE;YAC9E,OAAO,IAAI,CAACN,UAAU,CAACc,IAAI,CAAC;gBAAEI,MAAMF,KAAKG,QAAQ;gBAAEC,MAAMJ,KAAKG,QAAQ,GAAGH,KAAKA,IAAI;gBAAE,GAAGV,OAAO;YAAC;QACjG;QAEA,MAAMe,OAAOhB,EAAU,EAAEP,SAAoB,EAAE;YAC7C,MAAMH,SAAS,MAAM,IAAI,CAACS,GAAG,CAACC;YAC9B,MAAMiB,IAAAA,wBAAQ,EAACxB;YACf,MAAMwB,IAAAA,wBAAQ,EAACC,OAAOC,MAAM,CAAC7B,QAAQG;YACrC,MAAM,IAAI,CAACE,UAAU,CAACqB,MAAM,CAAC1B,OAAOU,EAAE,EAAEP;YACxC,OAAO,MAAM,IAAI,CAACM,GAAG,CAACC;QACxB;QAEA,MAAMoB,OAAO7B,GAAc,EAAE;YAE3B,IAAI,QAAQA,OAAOA,IAAIS,EAAE,KAAKE,aAAaX,IAAIS,EAAE,KAAK,MAAM;gBAC1D,MAAM,IAAIqB,MAAM;YAClB;YAEA,MAAM/B,SAAS,IAAI,CAACK,UAAU,CAACyB,MAAM,CAAC7B;YACtC,MAAM0B,IAAAA,wBAAQ,EAAC3B;YAEf,OAAO,MAAM,IAAI,CAACK,UAAU,CAAC2B,IAAI,CAAChC;QACpC;QAEA,MAAMiC,OAAOvB,EAAU,EAAE;YACvB,MAAMV,SAAS,MAAM,IAAI,CAACS,GAAG,CAACC;YAC9B,MAAM,IAAI,CAACL,UAAU,CAAC4B,MAAM,CAACjC,OAAOU,EAAE;QACxC;QAEA,MAAMwB,WAAWC,GAAa,EAAE;YAC9B,MAAM,IAAI,CAAC9B,UAAU,CAAC4B,MAAM,CAACE;QAC/B;IACF;IAEA,OAAO/B;AACT"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/camera-stream.service.ts"],"names":["CameraStreamService","BaseService","CameraStream","CameraStreamDto","CreateCameraStreamDto","toDto","entity","id","streamURL","name","printerId","aspectRatio","rotationClockwise","flipHorizontal","flipVertical"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/camera-stream.service.ts"],"names":["CameraStreamService","BaseService","CameraStream","CameraStreamDto","CreateCameraStreamDto","toDto","entity","id","streamURL","name","printerId","aspectRatio","rotationClockwise","flipHorizontal","flipVertical"],"mappings":";;;;+BAKaA;;;eAAAA;;;6BALe;0BACC;iCAC0B;AAGhD,MAAMA,4BACHC,IAAAA,wBAAW,EAACC,sBAAY,EAAEC,gCAAe,EAAEC,sCAAqB;IAGxEC,MAAMC,MAAoB,EAAmB;QAE3C,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,WAAWF,OAAOE,SAAS;YAC3BC,MAAMH,OAAOG,IAAI;YACjBC,WAAWJ,OAAOI,SAAS;YAC3BC,aAAaL,OAAOK,WAAW;YAC/BC,mBAAmBN,OAAOM,iBAAiB;YAC3CC,gBAAgBP,OAAOO,cAAc;YACrCC,cAAcR,OAAOQ,YAAY;QACnC;IACF;AACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/floor-position.service.ts"],"names":["FloorPositionService","BaseService","FloorPosition","PositionDto","create","dto","findPosition","floorId","x","y","repository","findOneBy","findPrinterPosition","printerId","deletePrinterPositionsByPrinterId","delete","findPrinterPositionOnFloor","toDto","entity"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/floor-position.service.ts"],"names":["FloorPositionService","BaseService","FloorPosition","PositionDto","create","dto","findPosition","floorId","x","y","repository","findOneBy","findPrinterPosition","printerId","deletePrinterPositionsByPrinterId","delete","findPrinterPositionOnFloor","toDto","entity"],"mappings":";;;;+BAIaA;;;eAAAA;;;qCAJiB;6BACF;0BACA;AAErB,MAAMA,6BAA6BC,IAAAA,wBAAW,EAACC,kCAAa,EAAEC,qBAAW;IAC9E,MAAMC,OAAOC,GAAgB,EAA0B;QACrD,OAAO,KAAK,CAACD,OAAOC;IACtB;IAEAC,aAAaC,OAAe,EAAEC,CAAS,EAAEC,CAAS,EAAE;QAClD,OAAO,IAAI,CAACC,UAAU,CAACC,SAAS,CAAC;YAAEJ;YAASC;YAAGC;QAAE;IACnD;IAMAG,oBAAoBC,SAAiB,EAAE;QACrC,OAAO,IAAI,CAACH,UAAU,CAACC,SAAS,CAAC;YAAEE;QAAU;IAC/C;IAEAC,kCAAkCD,SAAiB,EAAE;QACnD,OAAO,IAAI,CAACH,UAAU,CAACK,MAAM,CAAC;YAAEF;QAAU;IAC5C;IAEAG,2BAA2BT,OAAe,EAAEM,SAAiB,EAAE;QAC7D,OAAO,IAAI,CAACH,UAAU,CAACC,SAAS,CAAC;YAAEJ;YAASM;QAAU;IACxD;IAEAI,MAAMC,MAAqB,EAAe;QACxC,OAAO;YACLV,GAAGU,OAAOV,CAAC;YACXC,GAAGS,OAAOT,CAAC;YACXI,WAAWK,OAAOL,SAAS;YAC3BN,SAASW,OAAOX,OAAO;QACzB;IACF;AACF"}
|
|
@@ -35,10 +35,10 @@ class FloorService extends (0, _baseservice.BaseService)(_entities.Floor, _floor
|
|
|
35
35
|
}));
|
|
36
36
|
}
|
|
37
37
|
async create(dto) {
|
|
38
|
-
const outcome = await (0, _validators.validateInput)(dto,
|
|
38
|
+
const outcome = await (0, _validators.validateInput)(dto, _floorservicevalidation.createOrUpdateFloorSchema);
|
|
39
39
|
const floor = await super.create({
|
|
40
40
|
name: outcome.name,
|
|
41
|
-
|
|
41
|
+
order: outcome.order,
|
|
42
42
|
printers: []
|
|
43
43
|
});
|
|
44
44
|
if (outcome.printers?.length) {
|
|
@@ -52,7 +52,7 @@ class FloorService extends (0, _baseservice.BaseService)(_entities.Floor, _floor
|
|
|
52
52
|
return {
|
|
53
53
|
id: floor.id,
|
|
54
54
|
name: floor.name,
|
|
55
|
-
|
|
55
|
+
order: floor.order,
|
|
56
56
|
printers: floor.printers.map((p)=>({
|
|
57
57
|
printerId: p.printerId,
|
|
58
58
|
floorId: p.floorId,
|
|
@@ -61,22 +61,15 @@ class FloorService extends (0, _baseservice.BaseService)(_entities.Floor, _floor
|
|
|
61
61
|
}))
|
|
62
62
|
};
|
|
63
63
|
}
|
|
64
|
-
async createDefaultFloor() {
|
|
65
|
-
const floor = await this.create({
|
|
66
|
-
name: "Default Floor",
|
|
67
|
-
floor: 1
|
|
68
|
-
});
|
|
69
|
-
return await this.get(floor.id);
|
|
70
|
-
}
|
|
71
64
|
async update(floorId, update) {
|
|
72
65
|
const existingFloor = await this.get(floorId);
|
|
73
66
|
const floorUpdate = {
|
|
74
67
|
...existingFloor,
|
|
75
68
|
name: update.name,
|
|
76
69
|
printers: update.printers,
|
|
77
|
-
|
|
70
|
+
order: update.order
|
|
78
71
|
};
|
|
79
|
-
const validatedFloor = await (0, _validators.validateInput)(floorUpdate,
|
|
72
|
+
const validatedFloor = await (0, _validators.validateInput)(floorUpdate, _floorservicevalidation.createOrUpdateFloorSchema);
|
|
80
73
|
const desiredPositions = validatedFloor.printers;
|
|
81
74
|
if (desiredPositions?.length) {
|
|
82
75
|
for (const printer of desiredPositions){
|
|
@@ -98,20 +91,20 @@ class FloorService extends (0, _baseservice.BaseService)(_entities.Floor, _floor
|
|
|
98
91
|
floor.name = name;
|
|
99
92
|
return this.update(floorId, floor);
|
|
100
93
|
}
|
|
101
|
-
async
|
|
102
|
-
const {
|
|
103
|
-
|
|
104
|
-
}, _floorservicevalidation.
|
|
94
|
+
async updateOrder(floorId, order) {
|
|
95
|
+
const { order: validOrder } = await (0, _validators.validateInput)({
|
|
96
|
+
order
|
|
97
|
+
}, _floorservicevalidation.updateFloorOrderSchema);
|
|
105
98
|
const floor = await this.get(floorId);
|
|
106
|
-
floor.
|
|
99
|
+
floor.order = validOrder;
|
|
107
100
|
return await this.update(floorId, floor);
|
|
108
101
|
}
|
|
109
102
|
async addOrUpdatePrinter(floorId, positionDto) {
|
|
110
103
|
await this.get(floorId);
|
|
111
104
|
positionDto.floorId = floorId;
|
|
112
|
-
const validInput = await (0, _validators.validateInput)(positionDto,
|
|
105
|
+
const validInput = await (0, _validators.validateInput)(positionDto, _floorservicevalidation.printerInFloorSchema);
|
|
113
106
|
const position = await this.floorPositionService.findPrinterPosition(validInput.printerId);
|
|
114
|
-
if (position
|
|
107
|
+
if (position?.floorId === floorId && position.x === validInput.x && position.y === validInput.y && position.printerId === validInput.printerId) {
|
|
115
108
|
return this.get(floorId);
|
|
116
109
|
}
|
|
117
110
|
if (position) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/floor.service.ts"],"names":["FloorService","BaseService","Floor","FloorDto","CreateFloorDto","UpdateFloorDto","typeormService","floorPositionService","list","options","Object","assign","relations","get","id","create","dto","outcome","validateInput","createOrUpdateFloorSchema","floor","name","printers","length","position","addOrUpdatePrinter","toDto","map","p","printerId","floorId","x","y","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/floor.service.ts"],"names":["FloorService","BaseService","Floor","FloorDto","CreateFloorDto","UpdateFloorDto","typeormService","floorPositionService","list","options","Object","assign","relations","get","id","create","dto","outcome","validateInput","createOrUpdateFloorSchema","floor","name","order","printers","length","position","addOrUpdatePrinter","toDto","map","p","printerId","floorId","x","y","update","existingFloor","floorUpdate","validatedFloor","desiredPositions","printer","undesiredPositions","filter","pos","find","dp","deleteMany","updateName","floorName","updateFloorNameSchema","updateOrder","validOrder","updateFloorOrderSchema","positionDto","validInput","printerInFloorSchema","findPrinterPosition","delete","xyPosition","findPosition","newPosition","FloorPosition","removePrinter","findPrinterPositionOnFloor","NotFoundException","deletePrinterFromAnyFloor","deletePrinterPositionsByPrinterId"],"mappings":"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"}
|
|
@@ -8,68 +8,17 @@ Object.defineProperty(exports, "PermissionService", {
|
|
|
8
8
|
return PermissionService;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
const _baseservice = require("./base.service");
|
|
12
|
-
const _entities = require("../../entities");
|
|
13
|
-
const _permissiondto = require("../interfaces/permission.dto");
|
|
14
|
-
const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
|
|
15
11
|
const _authorizationconstants = require("../../constants/authorization.constants");
|
|
16
|
-
class PermissionService
|
|
17
|
-
logger;
|
|
12
|
+
class PermissionService {
|
|
18
13
|
_permissions = [];
|
|
19
|
-
constructor(loggerFactory, typeormService){
|
|
20
|
-
super(typeormService);
|
|
21
|
-
this.logger = loggerFactory(PermissionService.name);
|
|
22
|
-
}
|
|
23
14
|
get permissions() {
|
|
24
15
|
return this._permissions;
|
|
25
16
|
}
|
|
26
|
-
toDto(permission) {
|
|
27
|
-
return {
|
|
28
|
-
id: permission.id,
|
|
29
|
-
name: permission.name
|
|
30
|
-
};
|
|
31
|
-
}
|
|
32
17
|
authorizePermission(requiredPermission, assignedPermissions) {
|
|
33
|
-
return
|
|
34
|
-
const normalizePermission = this.normalizePermission(assignedPermission);
|
|
35
|
-
if (!normalizePermission) return false;
|
|
36
|
-
return normalizePermission === requiredPermission;
|
|
37
|
-
});
|
|
38
|
-
}
|
|
39
|
-
async getPermissionByName(permissionName) {
|
|
40
|
-
const permission = this.permissions.find((r)=>r.name === permissionName);
|
|
41
|
-
if (!permission) throw new _runtimeexceptions.NotFoundException("Permission not found");
|
|
42
|
-
return permission;
|
|
43
|
-
}
|
|
44
|
-
async getPermission(permissionId) {
|
|
45
|
-
const permission = this.permissions.find((r)=>r.id === permissionId);
|
|
46
|
-
if (!permission) throw new _runtimeexceptions.NotFoundException(`Permission by provided id is not found`);
|
|
47
|
-
return permission;
|
|
18
|
+
return assignedPermissions.includes(requiredPermission);
|
|
48
19
|
}
|
|
49
20
|
async syncPermissions() {
|
|
50
|
-
this._permissions =
|
|
51
|
-
const permissionDefinition = (0, _authorizationconstants.flattenPermissionDefinition)();
|
|
52
|
-
for (let permission of permissionDefinition){
|
|
53
|
-
const storedPermission = await this.repository.findOneBy({
|
|
54
|
-
name: permission
|
|
55
|
-
});
|
|
56
|
-
if (!storedPermission) {
|
|
57
|
-
const newPermission = await this.create({
|
|
58
|
-
name: permission
|
|
59
|
-
});
|
|
60
|
-
this._permissions.push(newPermission);
|
|
61
|
-
} else {
|
|
62
|
-
this._permissions.push(storedPermission);
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
normalizePermission(assignedPermission) {
|
|
67
|
-
const permissionInstance = this.permissions.find((r)=>r.id === assignedPermission || r.name === assignedPermission);
|
|
68
|
-
if (!permissionInstance) {
|
|
69
|
-
this.logger.warn(`The permission by provided id is not found. Skipping`);
|
|
70
|
-
return;
|
|
71
|
-
}
|
|
72
|
-
return permissionInstance.name;
|
|
21
|
+
this._permissions = (0, _authorizationconstants.flattenPermissionDefinition)();
|
|
73
22
|
}
|
|
74
23
|
}
|
|
75
24
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/permission.service.ts"],"names":["PermissionService","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/permission.service.ts"],"names":["PermissionService","_permissions","permissions","authorizePermission","requiredPermission","assignedPermissions","includes","syncPermissions","flattenPermissionDefinition"],"mappings":";;;;+BAGaA;;;eAAAA;;;wCAF+C;AAErD,MAAMA;IACHC,eAAiC,EAAE,CAAC;IAE5C,IAAIC,cAAgC;QAClC,OAAO,IAAI,CAACD,YAAY;IAC1B;IAEAE,oBAAoBC,kBAAkC,EAAEC,mBAAqC,EAAW;QACtG,OAAOA,oBAAoBC,QAAQ,CAACF;IACtC;IAEA,MAAMG,kBAAiC;QACrC,IAAI,CAACN,YAAY,GAAGO,IAAAA,mDAA2B;IACjD;AACF"}
|