@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 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/print-job.controller.ts"],"names":["PrintJobController","logger","loggerFactory","printJobService","fileAnalysisService","fileStorageService","name","searchJobs","req","res","searchPrinter","searchFile","startDate","endDate","validateInput","query","searchJobsSchema","endDateObj","toEndOfDay","Date","undefined","result","searchPrintJobs","send","searchJobsPaged","page","pageSize","searchJobsPagedSchema","items","count","searchPrintJobsPaged","pages","Math","ceil","getJob","jobId","local","id","job","getJobByIdOrFail","thumbnailCount","fileStorageId","thumbnails","listThumbnails","length","thumbnailsUrl","error","status","setCompleted","currentStatus","suggestion","log","endedAt","progress","statusReason","statistics","startedAt","actualPrintTimeSeconds","printJobRepository","save","message","previousStatus","newStatus","Error","setFailed","includes","actualTimeSeconds","getTime","failureReason","failureTime","setCancelled","setUnknown","reAnalyzeJob","triggerFileAnalysis","filePath","getFilePath","exists","needsAnalysis","NotFoundException","analysisState","metadata","analyzeFile","thumbnailMetadata","saveThumbnails","handleFileAnalyzed","fileHash","saveMetadata","fileName","deleteJob","deleteFileParam","deleteFile","remove","otherJobs","where","fileDeleted","warn","remainingReferences","getThumbnails","loadMetadata","_thumbnails","map","thumb","index","url","filename","width","height","format","size","getThumbnail","thumbnail","isPNG","isJPG","isQOI","contentType","setHeader","createJobFromFile","printerId","body","fileExists","printerName","createPendingJob","_originalFileName","_fileHash","analyzedAt","fileFormat","createdAt","date","endOfDay","setHours","ParamId","ParamInt","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN"],"mappings":"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"}
|
|
@@ -0,0 +1,375 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "PrintQueueController", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return PrintQueueController;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _awilixexpress = require("awilix-express");
|
|
12
|
+
const _serverconstants = require("../server.constants");
|
|
13
|
+
const _express = require("express");
|
|
14
|
+
const _authenticate = require("../middleware/authenticate");
|
|
15
|
+
const _authorizationconstants = require("../constants/authorization.constants");
|
|
16
|
+
const _printqueueservice = require("../services/print-queue.service");
|
|
17
|
+
const _loggerfactory = require("../handlers/logger-factory");
|
|
18
|
+
const _paramconvertermiddleware = require("../middleware/param-converter.middleware");
|
|
19
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
20
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
21
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
22
|
+
else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
23
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
24
|
+
}
|
|
25
|
+
function _ts_metadata(k, v) {
|
|
26
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
27
|
+
}
|
|
28
|
+
class PrintQueueController {
|
|
29
|
+
printQueueService;
|
|
30
|
+
logger;
|
|
31
|
+
constructor(loggerFactory, printQueueService){
|
|
32
|
+
this.printQueueService = printQueueService;
|
|
33
|
+
this.logger = loggerFactory(PrintQueueController.name);
|
|
34
|
+
}
|
|
35
|
+
async getGlobalQueue(req, res) {
|
|
36
|
+
try {
|
|
37
|
+
const page = Number.parseInt(req.query.page) || 1;
|
|
38
|
+
const pageSize = Number.parseInt(req.query.pageSize) || 50;
|
|
39
|
+
if (page < 1 || pageSize < 1 || pageSize > 200) {
|
|
40
|
+
res.status(400).send({
|
|
41
|
+
error: "Invalid page or pageSize parameters"
|
|
42
|
+
});
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
const skip = (page - 1) * pageSize;
|
|
46
|
+
const [jobs, totalCount] = await this.printQueueService.printJobRepository.findAndCount({
|
|
47
|
+
where: {
|
|
48
|
+
status: "QUEUED"
|
|
49
|
+
},
|
|
50
|
+
order: {
|
|
51
|
+
printerId: "ASC",
|
|
52
|
+
queuePosition: "ASC"
|
|
53
|
+
},
|
|
54
|
+
relations: [
|
|
55
|
+
'printer'
|
|
56
|
+
],
|
|
57
|
+
take: pageSize,
|
|
58
|
+
skip: skip
|
|
59
|
+
});
|
|
60
|
+
const queueItems = jobs.map((job)=>({
|
|
61
|
+
jobId: job.id,
|
|
62
|
+
fileName: job.fileName,
|
|
63
|
+
printerId: job.printerId,
|
|
64
|
+
printerName: job.printerName || job.printer?.name,
|
|
65
|
+
queuePosition: job.queuePosition,
|
|
66
|
+
status: job.status,
|
|
67
|
+
createdAt: job.createdAt,
|
|
68
|
+
estimatedTimeSeconds: job.metadata?.gcodePrintTimeSeconds,
|
|
69
|
+
filamentGrams: job.metadata?.filamentUsedGrams
|
|
70
|
+
}));
|
|
71
|
+
res.send({
|
|
72
|
+
items: queueItems,
|
|
73
|
+
page,
|
|
74
|
+
pageSize,
|
|
75
|
+
totalCount,
|
|
76
|
+
totalPages: Math.ceil(totalCount / pageSize)
|
|
77
|
+
});
|
|
78
|
+
} catch (error) {
|
|
79
|
+
this.logger.error(`Failed to get global queue: ${error}`);
|
|
80
|
+
res.status(500).send({
|
|
81
|
+
error: "Failed to get global queue"
|
|
82
|
+
});
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
async getQueue(req, res) {
|
|
86
|
+
const printerId = req.local.printerId;
|
|
87
|
+
try {
|
|
88
|
+
const queue = await this.printQueueService.getQueue(printerId);
|
|
89
|
+
res.send({
|
|
90
|
+
printerId,
|
|
91
|
+
queue,
|
|
92
|
+
count: queue.length
|
|
93
|
+
});
|
|
94
|
+
} catch (error) {
|
|
95
|
+
this.logger.error(`Failed to get queue for printer ${printerId}: ${error}`);
|
|
96
|
+
res.status(500).send({
|
|
97
|
+
error: "Failed to get queue"
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
async addToQueue(req, res) {
|
|
102
|
+
const printerId = req.local.printerId;
|
|
103
|
+
const jobId = req.local.jobId;
|
|
104
|
+
const position = req.body.position === undefined ? undefined : Number.parseInt(req.body.position);
|
|
105
|
+
try {
|
|
106
|
+
await this.printQueueService.addToQueue(printerId, jobId, position);
|
|
107
|
+
const queue = await this.printQueueService.getQueue(printerId);
|
|
108
|
+
res.send({
|
|
109
|
+
message: "Job added to queue",
|
|
110
|
+
printerId,
|
|
111
|
+
jobId,
|
|
112
|
+
position,
|
|
113
|
+
queue
|
|
114
|
+
});
|
|
115
|
+
} catch (error) {
|
|
116
|
+
this.logger.error(`Failed to add job ${jobId} to queue: ${error}`);
|
|
117
|
+
res.status(500).send({
|
|
118
|
+
error: "Failed to add to queue",
|
|
119
|
+
message: error instanceof Error ? error.message : "Unknown error"
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
async reorderQueue(req, res) {
|
|
124
|
+
const printerId = req.local.printerId;
|
|
125
|
+
const jobIds = req.body.jobIds;
|
|
126
|
+
if (!Array.isArray(jobIds)) {
|
|
127
|
+
res.status(400).send({
|
|
128
|
+
error: "jobIds must be an array"
|
|
129
|
+
});
|
|
130
|
+
return;
|
|
131
|
+
}
|
|
132
|
+
try {
|
|
133
|
+
await this.printQueueService.reorderQueue(printerId, jobIds);
|
|
134
|
+
const queue = await this.printQueueService.getQueue(printerId);
|
|
135
|
+
res.send({
|
|
136
|
+
message: "Queue reordered",
|
|
137
|
+
printerId,
|
|
138
|
+
queue
|
|
139
|
+
});
|
|
140
|
+
} catch (error) {
|
|
141
|
+
this.logger.error(`Failed to reorder queue for printer ${printerId}: ${error}`);
|
|
142
|
+
res.status(500).send({
|
|
143
|
+
error: "Failed to reorder queue",
|
|
144
|
+
message: error instanceof Error ? error.message : "Unknown error"
|
|
145
|
+
});
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
async clearQueue(req, res) {
|
|
149
|
+
const printerId = req.local.printerId;
|
|
150
|
+
try {
|
|
151
|
+
await this.printQueueService.clearQueue(printerId);
|
|
152
|
+
res.send({
|
|
153
|
+
message: "Queue cleared",
|
|
154
|
+
printerId
|
|
155
|
+
});
|
|
156
|
+
} catch (error) {
|
|
157
|
+
this.logger.error(`Failed to clear queue for printer ${printerId}: ${error}`);
|
|
158
|
+
res.status(500).send({
|
|
159
|
+
error: "Failed to clear queue",
|
|
160
|
+
message: error instanceof Error ? error.message : "Unknown error"
|
|
161
|
+
});
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
async removeFromQueue(req, res) {
|
|
165
|
+
const printerId = req.local.printerId;
|
|
166
|
+
const jobId = req.local.jobId;
|
|
167
|
+
try {
|
|
168
|
+
await this.printQueueService.removeFromQueue(jobId);
|
|
169
|
+
const queue = await this.printQueueService.getQueue(printerId);
|
|
170
|
+
res.send({
|
|
171
|
+
message: "Job removed from queue",
|
|
172
|
+
printerId,
|
|
173
|
+
jobId,
|
|
174
|
+
queue
|
|
175
|
+
});
|
|
176
|
+
} catch (error) {
|
|
177
|
+
this.logger.error(`Failed to remove job ${jobId} from queue: ${error}`);
|
|
178
|
+
res.status(500).send({
|
|
179
|
+
error: "Failed to remove from queue",
|
|
180
|
+
message: error instanceof Error ? error.message : "Unknown error"
|
|
181
|
+
});
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
async getNextInQueue(req, res) {
|
|
185
|
+
const printerId = req.local.printerId;
|
|
186
|
+
try {
|
|
187
|
+
const nextJob = await this.printQueueService.getNextInQueue(printerId);
|
|
188
|
+
res.send({
|
|
189
|
+
printerId,
|
|
190
|
+
nextJob
|
|
191
|
+
});
|
|
192
|
+
} catch (error) {
|
|
193
|
+
this.logger.error(`Failed to get next job for printer ${printerId}: ${error}`);
|
|
194
|
+
res.status(500).send({
|
|
195
|
+
error: "Failed to get next job"
|
|
196
|
+
});
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
async processQueue(req, res) {
|
|
200
|
+
const printerId = req.local.printerId;
|
|
201
|
+
try {
|
|
202
|
+
const nextJob = await this.printQueueService.processQueue(printerId);
|
|
203
|
+
if (!nextJob) {
|
|
204
|
+
res.send({
|
|
205
|
+
message: "Queue is empty",
|
|
206
|
+
printerId,
|
|
207
|
+
nextJob: null
|
|
208
|
+
});
|
|
209
|
+
return;
|
|
210
|
+
}
|
|
211
|
+
res.send({
|
|
212
|
+
message: "Processing next job in queue",
|
|
213
|
+
printerId,
|
|
214
|
+
nextJob
|
|
215
|
+
});
|
|
216
|
+
} catch (error) {
|
|
217
|
+
this.logger.error(`Failed to process queue for printer ${printerId}: ${error}`);
|
|
218
|
+
res.status(500).send({
|
|
219
|
+
error: "Failed to process queue",
|
|
220
|
+
message: error instanceof Error ? error.message : "Unknown error"
|
|
221
|
+
});
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
async submitToPrinter(req, res) {
|
|
225
|
+
const printerId = req.local.printerId;
|
|
226
|
+
const jobId = req.local.jobId;
|
|
227
|
+
try {
|
|
228
|
+
await this.printQueueService.submitToPrinter(printerId, jobId);
|
|
229
|
+
res.send({
|
|
230
|
+
message: "Job submitted to printer for printing",
|
|
231
|
+
printerId,
|
|
232
|
+
jobId
|
|
233
|
+
});
|
|
234
|
+
} catch (error) {
|
|
235
|
+
this.logger.error(`Failed to submit job ${jobId} to printer ${printerId}: ${error}`);
|
|
236
|
+
res.status(500).send({
|
|
237
|
+
error: "Failed to submit job to printer",
|
|
238
|
+
message: error instanceof Error ? error.message : "Unknown error"
|
|
239
|
+
});
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
_ts_decorate([
|
|
244
|
+
(0, _awilixexpress.GET)(),
|
|
245
|
+
_ts_metadata("design:type", Function),
|
|
246
|
+
_ts_metadata("design:paramtypes", [
|
|
247
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
248
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
249
|
+
]),
|
|
250
|
+
_ts_metadata("design:returntype", Promise)
|
|
251
|
+
], PrintQueueController.prototype, "getGlobalQueue", null);
|
|
252
|
+
_ts_decorate([
|
|
253
|
+
(0, _awilixexpress.GET)(),
|
|
254
|
+
(0, _awilixexpress.route)("/:printerId"),
|
|
255
|
+
(0, _awilixexpress.before)([
|
|
256
|
+
(0, _paramconvertermiddleware.ParamId)("printerId")
|
|
257
|
+
]),
|
|
258
|
+
_ts_metadata("design:type", Function),
|
|
259
|
+
_ts_metadata("design:paramtypes", [
|
|
260
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
261
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
262
|
+
]),
|
|
263
|
+
_ts_metadata("design:returntype", Promise)
|
|
264
|
+
], PrintQueueController.prototype, "getQueue", null);
|
|
265
|
+
_ts_decorate([
|
|
266
|
+
(0, _awilixexpress.POST)(),
|
|
267
|
+
(0, _awilixexpress.route)("/:printerId/add/:jobId"),
|
|
268
|
+
(0, _awilixexpress.before)([
|
|
269
|
+
(0, _paramconvertermiddleware.ParamId)("printerId"),
|
|
270
|
+
(0, _paramconvertermiddleware.ParamId)("jobId")
|
|
271
|
+
]),
|
|
272
|
+
_ts_metadata("design:type", Function),
|
|
273
|
+
_ts_metadata("design:paramtypes", [
|
|
274
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
275
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
276
|
+
]),
|
|
277
|
+
_ts_metadata("design:returntype", Promise)
|
|
278
|
+
], PrintQueueController.prototype, "addToQueue", null);
|
|
279
|
+
_ts_decorate([
|
|
280
|
+
(0, _awilixexpress.PUT)(),
|
|
281
|
+
(0, _awilixexpress.route)("/:printerId/reorder"),
|
|
282
|
+
(0, _awilixexpress.before)([
|
|
283
|
+
(0, _paramconvertermiddleware.ParamId)("printerId")
|
|
284
|
+
]),
|
|
285
|
+
_ts_metadata("design:type", Function),
|
|
286
|
+
_ts_metadata("design:paramtypes", [
|
|
287
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
288
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
289
|
+
]),
|
|
290
|
+
_ts_metadata("design:returntype", Promise)
|
|
291
|
+
], PrintQueueController.prototype, "reorderQueue", null);
|
|
292
|
+
_ts_decorate([
|
|
293
|
+
(0, _awilixexpress.DELETE)(),
|
|
294
|
+
(0, _awilixexpress.route)("/:printerId/clear"),
|
|
295
|
+
(0, _awilixexpress.before)([
|
|
296
|
+
(0, _paramconvertermiddleware.ParamId)("printerId")
|
|
297
|
+
]),
|
|
298
|
+
_ts_metadata("design:type", Function),
|
|
299
|
+
_ts_metadata("design:paramtypes", [
|
|
300
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
301
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
302
|
+
]),
|
|
303
|
+
_ts_metadata("design:returntype", Promise)
|
|
304
|
+
], PrintQueueController.prototype, "clearQueue", null);
|
|
305
|
+
_ts_decorate([
|
|
306
|
+
(0, _awilixexpress.DELETE)(),
|
|
307
|
+
(0, _awilixexpress.route)("/:printerId/:jobId"),
|
|
308
|
+
(0, _awilixexpress.before)([
|
|
309
|
+
(0, _paramconvertermiddleware.ParamId)("printerId"),
|
|
310
|
+
(0, _paramconvertermiddleware.ParamId)("jobId")
|
|
311
|
+
]),
|
|
312
|
+
_ts_metadata("design:type", Function),
|
|
313
|
+
_ts_metadata("design:paramtypes", [
|
|
314
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
315
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
316
|
+
]),
|
|
317
|
+
_ts_metadata("design:returntype", Promise)
|
|
318
|
+
], PrintQueueController.prototype, "removeFromQueue", null);
|
|
319
|
+
_ts_decorate([
|
|
320
|
+
(0, _awilixexpress.GET)(),
|
|
321
|
+
(0, _awilixexpress.route)("/:printerId/next"),
|
|
322
|
+
(0, _awilixexpress.before)([
|
|
323
|
+
(0, _paramconvertermiddleware.ParamId)("printerId")
|
|
324
|
+
]),
|
|
325
|
+
_ts_metadata("design:type", Function),
|
|
326
|
+
_ts_metadata("design:paramtypes", [
|
|
327
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
328
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
329
|
+
]),
|
|
330
|
+
_ts_metadata("design:returntype", Promise)
|
|
331
|
+
], PrintQueueController.prototype, "getNextInQueue", null);
|
|
332
|
+
_ts_decorate([
|
|
333
|
+
(0, _awilixexpress.POST)(),
|
|
334
|
+
(0, _awilixexpress.route)("/:printerId/process"),
|
|
335
|
+
(0, _awilixexpress.before)([
|
|
336
|
+
(0, _paramconvertermiddleware.ParamId)("printerId")
|
|
337
|
+
]),
|
|
338
|
+
_ts_metadata("design:type", Function),
|
|
339
|
+
_ts_metadata("design:paramtypes", [
|
|
340
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
341
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
342
|
+
]),
|
|
343
|
+
_ts_metadata("design:returntype", Promise)
|
|
344
|
+
], PrintQueueController.prototype, "processQueue", null);
|
|
345
|
+
_ts_decorate([
|
|
346
|
+
(0, _awilixexpress.POST)(),
|
|
347
|
+
(0, _awilixexpress.route)("/:printerId/submit/:jobId"),
|
|
348
|
+
(0, _awilixexpress.before)([
|
|
349
|
+
(0, _paramconvertermiddleware.ParamId)("printerId"),
|
|
350
|
+
(0, _paramconvertermiddleware.ParamId)("jobId")
|
|
351
|
+
]),
|
|
352
|
+
_ts_metadata("design:type", Function),
|
|
353
|
+
_ts_metadata("design:paramtypes", [
|
|
354
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
355
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
356
|
+
]),
|
|
357
|
+
_ts_metadata("design:returntype", Promise)
|
|
358
|
+
], PrintQueueController.prototype, "submitToPrinter", null);
|
|
359
|
+
PrintQueueController = _ts_decorate([
|
|
360
|
+
(0, _awilixexpress.route)(_serverconstants.AppConstants.apiRoute + "/print-queue"),
|
|
361
|
+
(0, _awilixexpress.before)([
|
|
362
|
+
(0, _authenticate.authenticate)(),
|
|
363
|
+
(0, _authenticate.authorizeRoles)([
|
|
364
|
+
_authorizationconstants.ROLES.ADMIN,
|
|
365
|
+
_authorizationconstants.ROLES.OPERATOR
|
|
366
|
+
])
|
|
367
|
+
]),
|
|
368
|
+
_ts_metadata("design:type", Function),
|
|
369
|
+
_ts_metadata("design:paramtypes", [
|
|
370
|
+
typeof _loggerfactory.ILoggerFactory === "undefined" ? Object : _loggerfactory.ILoggerFactory,
|
|
371
|
+
typeof _printqueueservice.PrintQueueService === "undefined" ? Object : _printqueueservice.PrintQueueService
|
|
372
|
+
])
|
|
373
|
+
], PrintQueueController);
|
|
374
|
+
|
|
375
|
+
//# sourceMappingURL=print-queue.controller.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/print-queue.controller.ts"],"names":["PrintQueueController","logger","loggerFactory","printQueueService","name","getGlobalQueue","req","res","page","Number","parseInt","query","pageSize","status","send","error","skip","jobs","totalCount","printJobRepository","findAndCount","where","order","printerId","queuePosition","relations","take","queueItems","map","job","jobId","id","fileName","printerName","printer","createdAt","estimatedTimeSeconds","metadata","gcodePrintTimeSeconds","filamentGrams","filamentUsedGrams","items","totalPages","Math","ceil","getQueue","local","queue","count","length","addToQueue","position","body","undefined","message","Error","reorderQueue","jobIds","Array","isArray","clearQueue","removeFromQueue","getNextInQueue","nextJob","processQueue","submitToPrinter","ParamId","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR"],"mappings":"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"}
|
|
@@ -17,17 +17,19 @@ const _runtimeexceptions = require("../exceptions/runtime.exceptions");
|
|
|
17
17
|
const _printer = require("../middleware/printer");
|
|
18
18
|
const _authorizationconstants = require("../constants/authorization.constants");
|
|
19
19
|
const _printerfilesstore = require("../state/printer-files.store");
|
|
20
|
-
const _settingsstore = require("../state/settings.store");
|
|
21
20
|
const _multerservice = require("../services/core/multer.service");
|
|
22
|
-
const _printerfilecleantask = require("../tasks/printer-file-clean.task");
|
|
23
21
|
const _loggerfactory = require("../handlers/logger-factory");
|
|
24
22
|
const _express = require("express");
|
|
25
23
|
const _printerapiinterface = require("../services/printer-api.interface");
|
|
26
24
|
const _printerthumbnailcache = require("../state/printer-thumbnail.cache");
|
|
27
25
|
const _node = require("@sentry/node");
|
|
28
26
|
const _errorutils = require("../utils/error.utils");
|
|
29
|
-
const _logindto = require("../services/interfaces/login.dto");
|
|
30
27
|
const _printerresolver = require("../middleware/printer-resolver");
|
|
28
|
+
const _fileanalysisservice = require("../services/file-analysis.service");
|
|
29
|
+
const _filestorageservice = require("../services/file-storage.service");
|
|
30
|
+
const _nodefs = require("node:fs");
|
|
31
|
+
const _printjobservice = require("../services/orm/print-job.service");
|
|
32
|
+
const _nodepath = require("node:path");
|
|
31
33
|
function _ts_decorate(decorators, target, key, desc) {
|
|
32
34
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
33
35
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -39,19 +41,19 @@ function _ts_metadata(k, v) {
|
|
|
39
41
|
}
|
|
40
42
|
class PrinterFilesController {
|
|
41
43
|
printerApi;
|
|
42
|
-
printerLogin;
|
|
43
44
|
printerFilesStore;
|
|
44
|
-
|
|
45
|
-
|
|
45
|
+
printJobService;
|
|
46
|
+
fileAnalysisService;
|
|
47
|
+
fileStorageService;
|
|
46
48
|
multerService;
|
|
47
49
|
printerThumbnailCache;
|
|
48
50
|
logger;
|
|
49
|
-
constructor(loggerFactory, printerApi,
|
|
51
|
+
constructor(loggerFactory, printerApi, printerFilesStore, printJobService, fileAnalysisService, fileStorageService, multerService, printerThumbnailCache){
|
|
50
52
|
this.printerApi = printerApi;
|
|
51
|
-
this.printerLogin = printerLogin;
|
|
52
53
|
this.printerFilesStore = printerFilesStore;
|
|
53
|
-
this.
|
|
54
|
-
this.
|
|
54
|
+
this.printJobService = printJobService;
|
|
55
|
+
this.fileAnalysisService = fileAnalysisService;
|
|
56
|
+
this.fileStorageService = fileStorageService;
|
|
55
57
|
this.multerService = multerService;
|
|
56
58
|
this.printerThumbnailCache = printerThumbnailCache;
|
|
57
59
|
this.logger = loggerFactory(PrinterFilesController.name);
|
|
@@ -70,30 +72,12 @@ class PrinterFilesController {
|
|
|
70
72
|
const files = await this.printerFilesStore.loadFiles(currentPrinterId);
|
|
71
73
|
res.send(files);
|
|
72
74
|
}
|
|
73
|
-
async reloadThumbnail(req, res) {
|
|
74
|
-
const { filePath } = await (0, _validators.validateInput)(req.body, _printerfilescontrollervalidation.startPrintFileSchema);
|
|
75
|
-
try {
|
|
76
|
-
if (this.settingsStore.isThumbnailSupportEnabled()) {
|
|
77
|
-
await this.printerThumbnailCache.loadPrinterThumbnailRemote(this.printerLogin, req.params.id, filePath);
|
|
78
|
-
}
|
|
79
|
-
} catch (e) {
|
|
80
|
-
this.logger.error(`Unexpected error processing thumbnail ${(0, _errorutils.errorSummary)(e)}`);
|
|
81
|
-
(0, _node.captureException)(e);
|
|
82
|
-
}
|
|
83
|
-
res.send();
|
|
84
|
-
}
|
|
85
75
|
async startPrintFile(req, res) {
|
|
76
|
+
const { currentPrinterId } = (0, _printerresolver.getScopedPrinter)(req);
|
|
86
77
|
const { filePath } = await (0, _validators.validateInput)(req.body, _printerfilescontrollervalidation.startPrintFileSchema);
|
|
87
78
|
const encodedFilePath = encodeURIComponent(filePath);
|
|
88
79
|
await this.printerApi.startPrint(encodedFilePath);
|
|
89
|
-
|
|
90
|
-
if (this.settingsStore.isThumbnailSupportEnabled()) {
|
|
91
|
-
await this.printerThumbnailCache.loadPrinterThumbnailRemote(this.printerLogin, req.params.id, encodedFilePath);
|
|
92
|
-
}
|
|
93
|
-
} catch (e) {
|
|
94
|
-
this.logger.error(`Unexpected error processing thumbnail ${(0, _errorutils.errorSummary)(e)}`);
|
|
95
|
-
(0, _node.captureException)(e);
|
|
96
|
-
}
|
|
80
|
+
this.logger.log(`Started print for printer ${currentPrinterId}`);
|
|
97
81
|
res.send();
|
|
98
82
|
}
|
|
99
83
|
async getFilesCache(req, res) {
|
|
@@ -143,7 +127,7 @@ class PrinterFilesController {
|
|
|
143
127
|
}
|
|
144
128
|
async getPrinterThumbnail(req, res) {
|
|
145
129
|
const { currentPrinterId } = (0, _printerresolver.getScopedPrinter)(req);
|
|
146
|
-
const printerThumbnail = await this.printerThumbnailCache.getValue(currentPrinterId
|
|
130
|
+
const printerThumbnail = await this.printerThumbnailCache.getValue(currentPrinterId);
|
|
147
131
|
res.send(printerThumbnail);
|
|
148
132
|
}
|
|
149
133
|
async uploadPrinterFile(req, res) {
|
|
@@ -162,10 +146,6 @@ class PrinterFilesController {
|
|
|
162
146
|
error: "Only 1 file can be uploaded at a time"
|
|
163
147
|
});
|
|
164
148
|
}
|
|
165
|
-
const fileCleanEnabled = this.settingsStore.isPreUploadFileCleanEnabled();
|
|
166
|
-
if (fileCleanEnabled) {
|
|
167
|
-
await this.printerFileCleanTask.cleanPrinterFiles(currentPrinterId);
|
|
168
|
-
}
|
|
169
149
|
const uploadedFile = files[0];
|
|
170
150
|
const token = this.multerService.startTrackingSession(uploadedFile, currentPrinterId);
|
|
171
151
|
await this.printerApi.uploadFile(uploadedFile, startPrint, token).catch((e)=>{
|
|
@@ -177,18 +157,78 @@ class PrinterFilesController {
|
|
|
177
157
|
throw e;
|
|
178
158
|
});
|
|
179
159
|
await this.printerFilesStore.loadFiles(currentPrinterId);
|
|
160
|
+
const ext = (0, _nodepath.extname)(uploadedFile.originalname);
|
|
161
|
+
const tempPathWithExt = uploadedFile.path + ext;
|
|
180
162
|
try {
|
|
181
|
-
|
|
182
|
-
|
|
163
|
+
this.logger.log(`Processing uploaded file: ${uploadedFile.originalname} (ext: ${ext})`);
|
|
164
|
+
if (!(0, _nodefs.existsSync)(uploadedFile.path)) {
|
|
165
|
+
throw new _runtimeexceptions.NotFoundException(`Upload file does not exist: ${uploadedFile.path}`);
|
|
166
|
+
}
|
|
167
|
+
(0, _nodefs.copyFileSync)(uploadedFile.path, tempPathWithExt);
|
|
168
|
+
const fileHash = await this.fileStorageService.calculateFileHash(tempPathWithExt);
|
|
169
|
+
this.logger.log(`File hash: ${fileHash.substring(0, 12)}...`);
|
|
170
|
+
const existingJob = await this.fileStorageService.findDuplicateByHash(fileHash);
|
|
171
|
+
let metadata;
|
|
172
|
+
let fileStorageId;
|
|
173
|
+
if (existingJob && existingJob.fileStorageId) {
|
|
174
|
+
const cachedMetadata = await this.fileStorageService.loadMetadata(existingJob.fileStorageId);
|
|
175
|
+
if (cachedMetadata) {
|
|
176
|
+
this.logger.log(`Duplicate file detected (job ${existingJob.id}, hash match) - reusing storage ${existingJob.fileStorageId}`);
|
|
177
|
+
metadata = {
|
|
178
|
+
...cachedMetadata,
|
|
179
|
+
fileName: uploadedFile.originalname
|
|
180
|
+
};
|
|
181
|
+
fileStorageId = existingJob.fileStorageId;
|
|
182
|
+
} else if (existingJob.analysisState === "ANALYZED" && existingJob.metadata) {
|
|
183
|
+
this.logger.log(`Duplicate file with DB metadata (job ${existingJob.id}) - reusing storage ${existingJob.fileStorageId}`);
|
|
184
|
+
metadata = {
|
|
185
|
+
...existingJob.metadata,
|
|
186
|
+
fileName: uploadedFile.originalname
|
|
187
|
+
};
|
|
188
|
+
fileStorageId = existingJob.fileStorageId;
|
|
189
|
+
await this.fileStorageService.saveMetadata(fileStorageId, metadata, fileHash, uploadedFile.originalname);
|
|
190
|
+
} else {
|
|
191
|
+
this.logger.log(`Duplicate file not analyzed - reusing storage ${existingJob.fileStorageId}, analyzing now`);
|
|
192
|
+
const existingFilePath = this.fileStorageService.getFilePath(existingJob.fileStorageId);
|
|
193
|
+
const analysisResult = await this.fileAnalysisService.analyzeFile(existingFilePath);
|
|
194
|
+
metadata = analysisResult.metadata;
|
|
195
|
+
fileStorageId = existingJob.fileStorageId;
|
|
196
|
+
await this.fileStorageService.saveMetadata(fileStorageId, metadata, fileHash, uploadedFile.originalname);
|
|
197
|
+
this.logger.log(`Analysis complete and cached: ${fileStorageId}`);
|
|
198
|
+
}
|
|
199
|
+
} else {
|
|
200
|
+
this.logger.log(`Analyzing new file: ${uploadedFile.originalname}`);
|
|
201
|
+
const analysisResult = await this.fileAnalysisService.analyzeFile(tempPathWithExt);
|
|
202
|
+
metadata = analysisResult.metadata;
|
|
203
|
+
const thumbnails = analysisResult.thumbnails;
|
|
204
|
+
this.logger.log(`Analysis complete: format=${metadata.fileFormat}, layers=${metadata.totalLayers}, time=${metadata.gcodePrintTimeSeconds}s, filament=${metadata.filamentUsedGrams}g, thumbnails=${thumbnails.length}`);
|
|
205
|
+
fileStorageId = await this.fileStorageService.saveFile(uploadedFile, fileHash);
|
|
206
|
+
this.logger.log(`Saved file to storage: ${fileStorageId} (deterministic from hash+name)`);
|
|
207
|
+
let thumbnailMetadata = [];
|
|
208
|
+
if (thumbnails.length > 0) {
|
|
209
|
+
thumbnailMetadata = await this.fileStorageService.saveThumbnails(fileStorageId, thumbnails);
|
|
210
|
+
this.logger.log(`Saved ${thumbnailMetadata.length} thumbnail(s) for ${fileStorageId}`);
|
|
211
|
+
}
|
|
212
|
+
await this.fileStorageService.saveMetadata(fileStorageId, metadata, fileHash, uploadedFile.originalname, thumbnailMetadata);
|
|
213
|
+
this.logger.log(`Saved metadata JSON for ${fileStorageId}`);
|
|
214
|
+
}
|
|
215
|
+
const job = await this.printJobService.createPendingJob(currentPrinterId, uploadedFile.originalname, metadata, currentPrinter.name);
|
|
216
|
+
job.fileStorageId = fileStorageId;
|
|
217
|
+
job.fileHash = fileHash;
|
|
218
|
+
await this.printJobService.printJobRepository.save(job);
|
|
219
|
+
this.logger.log(`Created job ${job.id}: format=${job.fileFormat}, ` + `state=${job.analysisState}, ` + `storageId=${fileStorageId}, ` + `hash=${fileHash.substring(0, 8)}...`);
|
|
220
|
+
if ((0, _nodefs.existsSync)(tempPathWithExt)) {
|
|
221
|
+
(0, _nodefs.unlinkSync)(tempPathWithExt);
|
|
222
|
+
}
|
|
223
|
+
} catch (error) {
|
|
224
|
+
this.logger.error(`File processing failed: ${(0, _errorutils.errorSummary)(error)}`);
|
|
225
|
+
(0, _node.captureException)(error);
|
|
226
|
+
} finally{
|
|
227
|
+
try {
|
|
228
|
+
this.multerService.clearUploadedFile(uploadedFile);
|
|
229
|
+
} catch (e) {
|
|
230
|
+
this.logger.error(`Could not remove uploaded file from temporary storage ${(0, _errorutils.errorSummary)(e)}`);
|
|
183
231
|
}
|
|
184
|
-
} catch (e) {
|
|
185
|
-
this.logger.error(`Unexpected error processing thumbnail ${(0, _errorutils.errorSummary)(e)}`);
|
|
186
|
-
(0, _node.captureException)(e);
|
|
187
|
-
}
|
|
188
|
-
try {
|
|
189
|
-
this.multerService.clearUploadedFile(uploadedFile);
|
|
190
|
-
} catch (e) {
|
|
191
|
-
this.logger.error(`Could not remove uploaded file from temporary storage ${(0, _errorutils.errorSummary)(e)}`);
|
|
192
232
|
}
|
|
193
233
|
res.send();
|
|
194
234
|
}
|
|
@@ -232,17 +272,6 @@ _ts_decorate([
|
|
|
232
272
|
]),
|
|
233
273
|
_ts_metadata("design:returntype", Promise)
|
|
234
274
|
], PrinterFilesController.prototype, "getFiles", null);
|
|
235
|
-
_ts_decorate([
|
|
236
|
-
(0, _awilixexpress.POST)(),
|
|
237
|
-
(0, _awilixexpress.route)("/:id/reload-thumbnail"),
|
|
238
|
-
(0, _awilixexpress.before)((0, _authenticate.permission)(_authorizationconstants.PERMS.PrinterFiles.Actions)),
|
|
239
|
-
_ts_metadata("design:type", Function),
|
|
240
|
-
_ts_metadata("design:paramtypes", [
|
|
241
|
-
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
242
|
-
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
243
|
-
]),
|
|
244
|
-
_ts_metadata("design:returntype", Promise)
|
|
245
|
-
], PrinterFilesController.prototype, "reloadThumbnail", null);
|
|
246
275
|
_ts_decorate([
|
|
247
276
|
(0, _awilixexpress.POST)(),
|
|
248
277
|
(0, _awilixexpress.route)("/:id/select"),
|
|
@@ -335,10 +364,10 @@ PrinterFilesController = _ts_decorate([
|
|
|
335
364
|
_ts_metadata("design:paramtypes", [
|
|
336
365
|
typeof _loggerfactory.ILoggerFactory === "undefined" ? Object : _loggerfactory.ILoggerFactory,
|
|
337
366
|
typeof _printerapiinterface.IPrinterApi === "undefined" ? Object : _printerapiinterface.IPrinterApi,
|
|
338
|
-
typeof _logindto.LoginDto === "undefined" ? Object : _logindto.LoginDto,
|
|
339
367
|
typeof _printerfilesstore.PrinterFilesStore === "undefined" ? Object : _printerfilesstore.PrinterFilesStore,
|
|
340
|
-
typeof
|
|
341
|
-
typeof
|
|
368
|
+
typeof _printjobservice.PrintJobService === "undefined" ? Object : _printjobservice.PrintJobService,
|
|
369
|
+
typeof _fileanalysisservice.FileAnalysisService === "undefined" ? Object : _fileanalysisservice.FileAnalysisService,
|
|
370
|
+
typeof _filestorageservice.FileStorageService === "undefined" ? Object : _filestorageservice.FileStorageService,
|
|
342
371
|
typeof _multerservice.MulterService === "undefined" ? Object : _multerservice.MulterService,
|
|
343
372
|
typeof _printerthumbnailcache.PrinterThumbnailCache === "undefined" ? Object : _printerthumbnailcache.PrinterThumbnailCache
|
|
344
373
|
])
|