@fdm-monster/server 1.8.3 → 1.9.0-rc1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.env.template +5 -3
- package/.gitattributes +4 -2
- package/.yarn/install-state.gz +0 -0
- package/.yarn/releases/yarn-4.9.1.cjs +948 -0
- package/.yarnrc.yml +1 -1
- package/README.md +25 -26
- package/RELEASE_NOTES.MD +50 -1
- package/biome.json +33 -0
- package/dist/consoles/download-github-releases.js.map +1 -1
- package/dist/consoles/launch-http-servers.js +31 -0
- package/dist/consoles/launch-http-servers.js.map +1 -0
- package/dist/consoles/mock-octoprint.server.js +291 -0
- package/dist/consoles/mock-octoprint.server.js.map +1 -0
- package/dist/consoles/mock-prusalink.server.js +57 -0
- package/dist/consoles/mock-prusalink.server.js.map +1 -0
- package/dist/consoles/utils/api-messages.js +856 -0
- package/dist/consoles/utils/api-messages.js.map +1 -0
- package/dist/consoles/utils/delayed-memory.storage.js +42 -0
- package/dist/consoles/utils/delayed-memory.storage.js.map +1 -0
- package/dist/consoles/utils/ws-messages.js +88 -0
- package/dist/consoles/utils/ws-messages.js.map +1 -0
- package/dist/constants/event.constants.js +5 -21
- package/dist/constants/event.constants.js.map +1 -1
- package/dist/constants/server-settings.constants.js +6 -11
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/container.js +13 -14
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +3 -4
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/auth.controller.js +114 -24
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/batch-call.controller.js +95 -24
- package/dist/controllers/batch-call.controller.js.map +1 -1
- package/dist/controllers/camera-stream.controller.js +16 -12
- package/dist/controllers/camera-stream.controller.js.map +1 -1
- package/dist/controllers/custom-gcode.controller.js +116 -40
- package/dist/controllers/custom-gcode.controller.js.map +1 -1
- package/dist/controllers/dto/update-client-dist.dto.js +0 -21
- package/dist/controllers/dto/update-client-dist.dto.js.map +1 -1
- package/dist/controllers/first-time-setup.controller.js +54 -18
- package/dist/controllers/first-time-setup.controller.js.map +1 -1
- package/dist/controllers/floor.controller.js +154 -43
- package/dist/controllers/floor.controller.js.map +1 -1
- package/dist/controllers/metrics.controller.js +56 -0
- package/dist/controllers/metrics.controller.js.map +1 -0
- package/dist/controllers/print-completion.controller.js +81 -18
- package/dist/controllers/print-completion.controller.js.map +1 -1
- package/dist/controllers/printer-files.controller.js +42 -28
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer-group.controller.js +123 -33
- package/dist/controllers/printer-group.controller.js.map +1 -1
- package/dist/controllers/printer-settings.controller.js +73 -26
- package/dist/controllers/printer-settings.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +57 -198
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +153 -39
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +79 -84
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/controllers/settings.controller.js +222 -79
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/controllers/user.controller.js +67 -57
- package/dist/controllers/user.controller.js.map +1 -1
- package/dist/controllers/validation/auth-controller.validation.js +6 -5
- package/dist/controllers/validation/auth-controller.validation.js.map +1 -1
- package/dist/controllers/validation/batch-controller.validation.js +17 -18
- package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
- package/dist/controllers/validation/generic.validation.js +8 -3
- package/dist/controllers/validation/generic.validation.js.map +1 -1
- package/dist/controllers/validation/printer-completion-controller.validation.js +16 -0
- package/dist/controllers/validation/printer-completion-controller.validation.js.map +1 -0
- package/dist/controllers/validation/printer-controller.validation.js +31 -50
- package/dist/controllers/validation/printer-controller.validation.js.map +1 -1
- package/dist/controllers/validation/printer-files-controller.validation.js +16 -15
- package/dist/controllers/validation/printer-files-controller.validation.js.map +1 -1
- package/dist/controllers/validation/printer-settings-controller.validation.js +6 -5
- package/dist/controllers/validation/printer-settings-controller.validation.js.map +1 -1
- package/dist/controllers/validation/server-private.validation.js +17 -0
- package/dist/controllers/validation/server-private.validation.js.map +1 -0
- package/dist/controllers/validation/setting.validation.js +28 -10
- package/dist/controllers/validation/setting.validation.js.map +1 -1
- package/dist/controllers/validation/user-controller.validation.js +44 -13
- package/dist/controllers/validation/user-controller.validation.js.map +1 -1
- package/dist/data-source.js +10 -6
- package/dist/data-source.js.map +1 -1
- package/dist/entities/camera-stream.entity.js +2 -3
- package/dist/entities/camera-stream.entity.js.map +1 -1
- package/dist/entities/custom-gcode.entity.js +1 -2
- package/dist/entities/custom-gcode.entity.js.map +1 -1
- package/dist/entities/floor-position.entity.js.map +1 -1
- package/dist/entities/floor.entity.js +1 -2
- package/dist/entities/floor.entity.js.map +1 -1
- package/dist/entities/group.entity.js +6 -2
- package/dist/entities/group.entity.js.map +1 -1
- package/dist/entities/permission.entity.js +1 -2
- package/dist/entities/permission.entity.js.map +1 -1
- package/dist/entities/print-completion.entity.js +1 -2
- package/dist/entities/print-completion.entity.js.map +1 -1
- package/dist/entities/printer-group.entity.js +6 -2
- package/dist/entities/printer-group.entity.js.map +1 -1
- package/dist/entities/printer.entity.js +22 -4
- package/dist/entities/printer.entity.js.map +1 -1
- package/dist/entities/refresh-token.entity.js +1 -2
- package/dist/entities/refresh-token.entity.js.map +1 -1
- package/dist/entities/role.entity.js +1 -2
- package/dist/entities/role.entity.js.map +1 -1
- package/dist/entities/settings.entity.js +1 -2
- package/dist/entities/settings.entity.js.map +1 -1
- package/dist/entities/user-role.entity.js +1 -2
- package/dist/entities/user-role.entity.js.map +1 -1
- package/dist/entities/user.entity.js +1 -2
- package/dist/entities/user.entity.js.map +1 -1
- package/dist/exceptions/runtime.exceptions.js.map +1 -1
- package/dist/handlers/logger.js +131 -36
- package/dist/handlers/logger.js.map +1 -1
- package/dist/handlers/validators.js +7 -116
- package/dist/handlers/validators.js.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/middleware/authenticate.js +11 -22
- package/dist/middleware/authenticate.js.map +1 -1
- package/dist/middleware/database.js.map +1 -1
- package/dist/middleware/demo.middleware.js +4 -17
- package/dist/middleware/demo.middleware.js.map +1 -1
- package/dist/middleware/exception.filter.js +23 -23
- package/dist/middleware/exception.filter.js.map +1 -1
- package/dist/middleware/global.middleware.js +4 -4
- package/dist/middleware/global.middleware.js.map +1 -1
- package/dist/middleware/param-converter.middleware.js +81 -0
- package/dist/middleware/param-converter.middleware.js.map +1 -0
- package/dist/middleware/passport.js +3 -5
- package/dist/middleware/passport.js.map +1 -1
- package/dist/middleware/printer-resolver.js +37 -0
- package/dist/middleware/printer-resolver.js.map +1 -0
- package/dist/middleware/printer.js +22 -10
- package/dist/middleware/printer.js.map +1 -1
- package/dist/middleware/socketio.middleware.js +27 -0
- package/dist/middleware/socketio.middleware.js.map +1 -0
- package/dist/migrations/1706829146617-InitSqlite.js +1 -1
- package/dist/migrations/1706829146617-InitSqlite.js.map +1 -1
- package/dist/migrations/1707494762198-PrinterGroup.js +1 -1
- package/dist/migrations/1707494762198-PrinterGroup.js.map +1 -1
- package/dist/migrations/1708465930665-ChangePrintCompletionDeletePrinterCascade.js +1 -1
- package/dist/migrations/1708465930665-ChangePrintCompletionDeletePrinterCascade.js.map +1 -1
- package/dist/migrations/1713897879622-AddPrinterType.js +1 -1
- package/dist/migrations/1713897879622-AddPrinterType.js.map +1 -1
- package/dist/migrations/1745141688926-AddPrinterUsernamePassword.js +229 -0
- package/dist/migrations/1745141688926-AddPrinterUsernamePassword.js.map +1 -0
- package/dist/models/Auth/Permission.js.map +1 -1
- package/dist/models/Auth/RefreshToken.js +1 -1
- package/dist/models/Auth/RefreshToken.js.map +1 -1
- package/dist/models/Auth/Role.js.map +1 -1
- package/dist/models/Auth/User.js.map +1 -1
- package/dist/models/CameraStream.js +20 -0
- package/dist/models/CameraStream.js.map +1 -1
- package/dist/models/CustomGcode.js.map +1 -1
- package/dist/models/Floor.js.map +1 -1
- package/dist/models/FloorPrinter.js +10 -1
- package/dist/models/FloorPrinter.js.map +1 -1
- package/dist/models/PrintCompletion.js.map +1 -1
- package/dist/models/Printer.js +12 -5
- package/dist/models/Printer.js.map +1 -1
- package/dist/models/Settings.js +5 -42
- package/dist/models/Settings.js.map +1 -1
- package/dist/models/index.js +0 -4
- package/dist/models/index.js.map +1 -1
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js.map +1 -1
- package/dist/mongo-migrations/20210907173950-printers-enabled.js.map +1 -1
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js.map +1 -1
- package/dist/mongo-migrations/20230414141005-floor-remove-groupinfloor.js.map +1 -1
- package/dist/mongo-migrations/20230427202911-printer-remove-sortindex.js.map +1 -1
- package/dist/mongo-migrations/20230716065316-user-remove-name.js.map +1 -1
- package/dist/mongo-migrations/20231111081809-printer-flatten-name.js.map +1 -1
- package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js.map +1 -1
- package/dist/mongo-migrations/20231202183902-printer-files-simpler.js.map +1 -1
- package/dist/server.constants.js +7 -4
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js +29 -2
- package/dist/server.core.js.map +1 -1
- package/dist/server.env.js +13 -8
- package/dist/server.env.js.map +1 -1
- package/dist/server.host.js +24 -33
- package/dist/server.host.js.map +1 -1
- package/dist/services/authentication/auth.service.js +15 -20
- package/dist/services/authentication/auth.service.js.map +1 -1
- package/dist/services/authentication/jwt.service.js +1 -1
- package/dist/services/authentication/jwt.service.js.map +1 -1
- package/dist/services/core/batch-call.service.js +23 -25
- package/dist/services/core/batch-call.service.js.map +1 -1
- package/dist/services/core/client-bundle.service.js +78 -136
- package/dist/services/core/client-bundle.service.js.map +1 -1
- package/dist/services/core/config.service.js.map +1 -1
- package/dist/services/core/cradle.service.js +21 -0
- package/dist/services/core/cradle.service.js.map +1 -0
- package/dist/services/core/github.service.js +2 -2
- package/dist/services/core/github.service.js.map +1 -1
- package/dist/services/core/http-client.factory.js +1 -1
- package/dist/services/core/http-client.factory.js.map +1 -1
- package/dist/services/core/logs-manager.service.js +3 -3
- package/dist/services/core/logs-manager.service.js.map +1 -1
- package/dist/services/core/monsterpi.service.js +1 -1
- package/dist/services/core/monsterpi.service.js.map +1 -1
- package/dist/services/core/multer.service.js +8 -7
- package/dist/services/core/multer.service.js.map +1 -1
- package/dist/services/core/server-release.service.js +14 -8
- package/dist/services/core/server-release.service.js.map +1 -1
- package/dist/services/core/yaml.service.js +16 -17
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/interfaces/camera-stream.dto.js +4 -34
- package/dist/services/interfaces/camera-stream.dto.js.map +1 -1
- package/dist/services/interfaces/custom-gcode.dto.js.map +1 -1
- package/dist/services/interfaces/floor.dto.js +5 -47
- package/dist/services/interfaces/floor.dto.js.map +1 -1
- package/dist/services/interfaces/login.dto.js +2 -0
- package/dist/services/interfaces/login.dto.js.map +1 -1
- package/dist/services/interfaces/print-completion.dto.js.map +1 -1
- package/dist/services/interfaces/printer-group.dto.js +0 -14
- package/dist/services/interfaces/printer-group.dto.js.map +1 -1
- package/dist/services/interfaces/printer.dto.js +11 -11
- package/dist/services/interfaces/printer.dto.js.map +1 -1
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/interfaces/task.interfaces.js +6 -0
- package/dist/services/interfaces/task.interfaces.js.map +1 -0
- package/dist/services/mongoose/camera-stream.service.js +17 -15
- package/dist/services/mongoose/camera-stream.service.js.map +1 -1
- package/dist/services/mongoose/custom-gcode.service.js +4 -2
- package/dist/services/mongoose/custom-gcode.service.js.map +1 -1
- package/dist/services/mongoose/floor.service.js +37 -30
- package/dist/services/mongoose/floor.service.js.map +1 -1
- package/dist/services/mongoose/permission.service.js +1 -1
- package/dist/services/mongoose/permission.service.js.map +1 -1
- package/dist/services/mongoose/print-completion.service.js +2 -2
- package/dist/services/mongoose/print-completion.service.js.map +1 -1
- package/dist/services/mongoose/print-completion.shared.js +2 -2
- package/dist/services/mongoose/print-completion.shared.js.map +1 -1
- package/dist/services/mongoose/printer.service.js +33 -45
- package/dist/services/mongoose/printer.service.js.map +1 -1
- package/dist/services/mongoose/refresh-token.service.js +5 -8
- package/dist/services/mongoose/refresh-token.service.js.map +1 -1
- package/dist/services/mongoose/role.service.js +14 -5
- package/dist/services/mongoose/role.service.js.map +1 -1
- package/dist/services/mongoose/settings.service.js +35 -62
- package/dist/services/mongoose/settings.service.js.map +1 -1
- package/dist/services/mongoose/user.service.js +8 -7
- package/dist/services/mongoose/user.service.js.map +1 -1
- package/dist/services/moonraker/constants/{websocket.constants.js → moonraker.constants.js} +1 -1
- package/dist/services/moonraker/constants/{websocket.constants.js.map → moonraker.constants.js.map} +1 -1
- package/dist/services/moonraker/moonraker-websocket.adapter.js +102 -94
- package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
- package/dist/services/moonraker/moonraker.client.js +19 -14
- package/dist/services/moonraker/moonraker.client.js.map +1 -1
- package/dist/services/moonraker.api.js +3 -5
- package/dist/services/moonraker.api.js.map +1 -1
- package/dist/services/octoprint/constants/octoprint-service.constants.js +7 -36
- package/dist/services/octoprint/constants/octoprint-service.constants.js.map +1 -1
- package/dist/services/octoprint/constants/octoprint-websocket.constants.js +12 -3
- package/dist/services/octoprint/constants/octoprint-websocket.constants.js.map +1 -1
- package/dist/services/octoprint/dto/octoprint-event.dto.js +2 -1
- package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.routes.js +0 -37
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-websocket.adapter.js +66 -72
- package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -1
- package/dist/services/octoprint/octoprint.client.js +12 -185
- package/dist/services/octoprint/octoprint.client.js.map +1 -1
- package/dist/services/octoprint/utils/octoprint-http-client.builder.js.map +1 -1
- package/dist/services/octoprint.api.js +8 -14
- package/dist/services/octoprint.api.js.map +1 -1
- package/dist/services/orm/base.service.js +11 -12
- package/dist/services/orm/base.service.js.map +1 -1
- package/dist/services/orm/camera-stream.service.js +5 -1
- package/dist/services/orm/camera-stream.service.js.map +1 -1
- package/dist/services/orm/custom-gcode.service.js +2 -2
- package/dist/services/orm/custom-gcode.service.js.map +1 -1
- package/dist/services/orm/floor-position.service.js +0 -5
- package/dist/services/orm/floor-position.service.js.map +1 -1
- package/dist/services/orm/floor.service.js +43 -39
- package/dist/services/orm/floor.service.js.map +1 -1
- package/dist/services/orm/permission.service.js +3 -4
- package/dist/services/orm/permission.service.js.map +1 -1
- package/dist/services/orm/print-completion.service.js +2 -4
- package/dist/services/orm/print-completion.service.js.map +1 -1
- package/dist/services/orm/printer-group.service.js +2 -7
- package/dist/services/orm/printer-group.service.js.map +1 -1
- package/dist/services/orm/printer.service.js +21 -36
- package/dist/services/orm/printer.service.js.map +1 -1
- package/dist/services/orm/refresh-token.service.js +5 -11
- package/dist/services/orm/refresh-token.service.js.map +1 -1
- package/dist/services/orm/role.service.js +11 -10
- package/dist/services/orm/role.service.js.map +1 -1
- package/dist/services/orm/settings.service.js +37 -133
- package/dist/services/orm/settings.service.js.map +1 -1
- package/dist/services/orm/user.service.js +13 -15
- package/dist/services/orm/user.service.js.map +1 -1
- package/dist/services/printer-api.factory.js +9 -6
- package/dist/services/printer-api.factory.js.map +1 -1
- package/dist/services/printer-api.interface.js +13 -6
- package/dist/services/printer-api.interface.js.map +1 -1
- package/dist/services/prusa-link/constants/prusalink-event.dto.js +18 -0
- package/dist/services/prusa-link/constants/prusalink-event.dto.js.map +1 -0
- package/dist/services/prusa-link/constants/prusalink.constants.js +13 -0
- package/dist/services/prusa-link/constants/prusalink.constants.js.map +1 -0
- package/dist/services/prusa-link/dto/file-response.dto.js +6 -0
- package/dist/services/prusa-link/dto/file-response.dto.js.map +1 -0
- package/dist/services/{octoprint/dto/plugin.dto.js → prusa-link/dto/file.dto.js} +1 -1
- package/dist/services/prusa-link/dto/file.dto.js.map +1 -0
- package/dist/services/prusa-link/dto/job-state.dto.js +6 -0
- package/dist/services/prusa-link/dto/job-state.dto.js.map +1 -0
- package/dist/services/prusa-link/dto/printer-state.dto.js +6 -0
- package/dist/services/prusa-link/dto/printer-state.dto.js.map +1 -0
- package/dist/services/prusa-link/dto/status.dto.js +6 -0
- package/dist/services/prusa-link/dto/status.dto.js.map +1 -0
- package/dist/services/prusa-link/dto/version.dto.js +6 -0
- package/dist/services/prusa-link/dto/version.dto.js.map +1 -0
- package/dist/services/prusa-link/prusa-link-http-polling.adapter.js +142 -0
- package/dist/services/prusa-link/prusa-link-http-polling.adapter.js.map +1 -0
- package/dist/services/prusa-link/prusa-link.api.js +233 -0
- package/dist/services/prusa-link/prusa-link.api.js.map +1 -0
- package/dist/services/prusa-link/utils/digest-auth.params.js +6 -0
- package/dist/services/prusa-link/utils/digest-auth.params.js.map +1 -0
- package/dist/services/prusa-link/utils/digest-auth.util.js +28 -0
- package/dist/services/prusa-link/utils/digest-auth.util.js.map +1 -0
- package/dist/services/prusa-link/utils/prusa-link-http-client.builder.js +131 -0
- package/dist/services/prusa-link/utils/prusa-link-http-client.builder.js.map +1 -0
- package/dist/services/socket.factory.js +9 -6
- package/dist/services/socket.factory.js.map +1 -1
- package/dist/services/{core/task-manager.service.js → task-manager.service.js} +72 -78
- package/dist/services/task-manager.service.js.map +1 -0
- package/dist/services/validators/camera-service.validation.js +19 -0
- package/dist/services/validators/camera-service.validation.js.map +1 -0
- package/dist/services/validators/floor-service.validation.js +47 -36
- package/dist/services/validators/floor-service.validation.js.map +1 -1
- package/dist/services/validators/print-completion-service.validation.js +22 -9
- package/dist/services/validators/print-completion-service.validation.js.map +1 -1
- package/dist/services/validators/printer-service.validation.js +112 -29
- package/dist/services/validators/printer-service.validation.js.map +1 -1
- package/dist/services/validators/settings-service.validation.js +78 -66
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/services/validators/user-service.validation.js +17 -16
- package/dist/services/validators/user-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +94 -51
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/shared/default-http-client.builder.js.map +1 -1
- package/dist/shared/load-controllers.js +20 -0
- package/dist/shared/load-controllers.js.map +1 -0
- package/dist/shared/runtime-settings.migration.js +46 -0
- package/dist/shared/runtime-settings.migration.js.map +1 -0
- package/dist/shared/websocket-rpc-extended.adapter.js +15 -14
- package/dist/shared/websocket-rpc-extended.adapter.js.map +1 -1
- package/dist/shared/websocket.adapter.js +4 -5
- package/dist/shared/websocket.adapter.js.map +1 -1
- package/dist/state/file-upload-tracker.cache.js +5 -4
- package/dist/state/file-upload-tracker.cache.js.map +1 -1
- package/dist/state/file.cache.js +1 -1
- package/dist/state/file.cache.js.map +1 -1
- package/dist/state/floor.store.js +6 -6
- package/dist/state/floor.store.js.map +1 -1
- package/dist/state/printer-events.cache.js +21 -22
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/printer-files.store.js +6 -8
- package/dist/state/printer-files.store.js.map +1 -1
- package/dist/state/printer-socket.store.js +27 -50
- package/dist/state/printer-socket.store.js.map +1 -1
- package/dist/state/printer-thumbnail.cache.js +5 -9
- package/dist/state/printer-thumbnail.cache.js.map +1 -1
- package/dist/state/printer.cache.js +14 -12
- package/dist/state/printer.cache.js.map +1 -1
- package/dist/state/settings.store.js +74 -50
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/socket-io.gateway.js +39 -36
- package/dist/state/socket-io.gateway.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +20 -15
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/dist/state/validation/create-test-printer.validation.js +13 -11
- package/dist/state/validation/create-test-printer.validation.js.map +1 -1
- package/dist/task.presets.js.map +1 -1
- package/dist/tasks/boot.task.js +14 -19
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/client-bundle.task.js +1 -3
- package/dist/tasks/client-bundle.task.js.map +1 -1
- package/dist/tasks/print-completion.socketio.task.js +27 -28
- package/dist/tasks/print-completion.socketio.task.js.map +1 -1
- package/dist/tasks/printer-file-clean.task.js +6 -10
- package/dist/tasks/printer-file-clean.task.js.map +1 -1
- package/dist/tasks/printer-websocket-restore.task.js +3 -14
- package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
- package/dist/tasks/printer-websocket.task.js +2 -14
- package/dist/tasks/printer-websocket.task.js.map +1 -1
- package/dist/tasks/socketio.task.js +6 -33
- package/dist/tasks/socketio.task.js.map +1 -1
- package/dist/tasks/software-update.task.js +1 -1
- package/dist/tasks/software-update.task.js.map +1 -1
- package/dist/tasks.js +3 -3
- package/dist/tasks.js.map +1 -1
- package/dist/utils/array.util.js.map +1 -1
- package/dist/utils/cache/key-diff.cache.js.map +1 -1
- package/dist/utils/env.utils.js +0 -2
- package/dist/utils/env.utils.js.map +1 -1
- package/dist/utils/normalize-url.js +3 -2
- package/dist/utils/normalize-url.js.map +1 -1
- package/dist/utils/printer-type.utils.js.map +1 -1
- package/dist/utils/time.utils.js +7 -17
- package/dist/utils/time.utils.js.map +1 -1
- package/dist/utils/url.utils.js +3 -4
- package/dist/utils/url.utils.js.map +1 -1
- package/package.json +44 -47
- package/tsconfig.json +2 -1
- package/.yarn/releases/yarn-4.7.0.cjs +0 -935
- package/dist/consoles/check-ports.js +0 -170
- package/dist/consoles/check-ports.js.map +0 -1
- package/dist/consoles/http-file-receiver.console.js +0 -81
- package/dist/consoles/http-file-receiver.console.js.map +0 -1
- package/dist/consoles/sqlite-torm.js +0 -31
- package/dist/consoles/sqlite-torm.js.map +0 -1
- package/dist/consoles/upload-test.js +0 -52
- package/dist/consoles/upload-test.js.map +0 -1
- package/dist/controllers/plugin-firmware-update.controller.js +0 -234
- package/dist/controllers/plugin-firmware-update.controller.js.map +0 -1
- package/dist/entities/base.entity.js +0 -29
- package/dist/entities/base.entity.js.map +0 -1
- package/dist/entities/printer-file.entity.js +0 -140
- package/dist/entities/printer-file.entity.js.map +0 -1
- package/dist/handlers/cache-manager.js +0 -18
- package/dist/handlers/cache-manager.js.map +0 -1
- package/dist/models/PrinterFile.js +0 -44
- package/dist/models/PrinterFile.js.map +0 -1
- package/dist/services/core/task-manager.service.js.map +0 -1
- package/dist/services/octoprint/dto/plugin.dto.js.map +0 -1
- package/dist/services/octoprint/plugin-base.service.js +0 -101
- package/dist/services/octoprint/plugin-base.service.js.map +0 -1
- package/dist/services/octoprint/plugin-firmware-update.service.js +0 -100
- package/dist/services/octoprint/plugin-firmware-update.service.js.map +0 -1
- package/dist/services/octoprint/plugin-repository.cache.js +0 -46
- package/dist/services/octoprint/plugin-repository.cache.js.map +0 -1
- package/dist/utils/benchmark.util.js +0 -39
- package/dist/utils/benchmark.util.js.map +0 -1
- package/dist/utils/is-docker.js +0 -40
- package/dist/utils/is-docker.js.map +0 -1
- package/dist/utils/metric.utils.js +0 -35
- package/dist/utils/metric.utils.js.map +0 -1
|
@@ -2,36 +2,44 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
get: all[name]
|
|
9
|
-
});
|
|
10
|
-
}
|
|
11
|
-
_export(exports, {
|
|
12
|
-
AuthController: function() {
|
|
5
|
+
Object.defineProperty(exports, "AuthController", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
13
8
|
return AuthController;
|
|
14
|
-
},
|
|
15
|
-
default: function() {
|
|
16
|
-
return _default;
|
|
17
9
|
}
|
|
18
10
|
});
|
|
19
11
|
const _awilixexpress = require("awilix-express");
|
|
20
12
|
const _runtimeexceptions = require("../exceptions/runtime.exceptions");
|
|
21
13
|
const _serverconstants = require("../server.constants");
|
|
22
|
-
const _validators = require("../handlers/validators");
|
|
23
|
-
const _usercontrollervalidation = require("./validation/user-controller.validation");
|
|
24
14
|
const _authcontrollervalidation = require("./validation/auth-controller.validation");
|
|
25
15
|
const _authenticate = require("../middleware/authenticate");
|
|
16
|
+
const _settingsstore = require("../state/settings.store");
|
|
17
|
+
const _loggerfactory = require("../handlers/logger-factory");
|
|
18
|
+
const _express = require("express");
|
|
19
|
+
const _userserviceinterface = require("../services/interfaces/user-service.interface");
|
|
20
|
+
const _authserviceinterface = require("../services/interfaces/auth.service.interface");
|
|
21
|
+
const _roleserviceinterface = require("../services/interfaces/role-service.interface");
|
|
26
22
|
const _demomiddleware = require("../middleware/demo.middleware");
|
|
23
|
+
const _configservice = require("../services/core/config.service");
|
|
24
|
+
const _usercontrollervalidation = require("./validation/user-controller.validation");
|
|
25
|
+
const _validators = require("../handlers/validators");
|
|
26
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
27
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
28
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
29
|
+
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;
|
|
30
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
31
|
+
}
|
|
32
|
+
function _ts_metadata(k, v) {
|
|
33
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
34
|
+
}
|
|
27
35
|
class AuthController {
|
|
28
36
|
authService;
|
|
29
37
|
settingsStore;
|
|
30
38
|
userService;
|
|
31
39
|
roleService;
|
|
32
|
-
logger;
|
|
33
40
|
configService;
|
|
34
|
-
|
|
41
|
+
logger;
|
|
42
|
+
constructor(loggerFactory, authService, settingsStore, userService, roleService, configService){
|
|
35
43
|
this.authService = authService;
|
|
36
44
|
this.settingsStore = settingsStore;
|
|
37
45
|
this.userService = userService;
|
|
@@ -91,7 +99,7 @@ class AuthController {
|
|
|
91
99
|
});
|
|
92
100
|
}
|
|
93
101
|
async refreshLogin(req, res) {
|
|
94
|
-
const { refreshToken } = await (0, _validators.validateMiddleware)(req, _authcontrollervalidation.
|
|
102
|
+
const { refreshToken } = await (0, _validators.validateMiddleware)(req, _authcontrollervalidation.refreshTokenSchema);
|
|
95
103
|
this.logger.debug(`Refresh login attempt from IP ${req.ip} and user-agent ${req.headers["user-agent"]}`);
|
|
96
104
|
const idToken = await this.authService.renewLoginByRefreshToken(refreshToken);
|
|
97
105
|
return res.send({
|
|
@@ -113,7 +121,7 @@ class AuthController {
|
|
|
113
121
|
if (!registrationEnabled) {
|
|
114
122
|
throw new _runtimeexceptions.BadRequestException("Registration is disabled. Cant register user");
|
|
115
123
|
}
|
|
116
|
-
const { username, password } = await (0, _validators.validateMiddleware)(req, _usercontrollervalidation.
|
|
124
|
+
const { username, password } = await (0, _validators.validateMiddleware)(req, _usercontrollervalidation.registerUserSchema);
|
|
117
125
|
if (username.toLowerCase().includes("admin") || username.toLowerCase().includes("root") || username.toLowerCase() === "demo") {
|
|
118
126
|
throw new _runtimeexceptions.BadRequestException("Username is not allowed");
|
|
119
127
|
}
|
|
@@ -131,14 +139,96 @@ class AuthController {
|
|
|
131
139
|
res.send(userDto);
|
|
132
140
|
}
|
|
133
141
|
}
|
|
134
|
-
|
|
135
|
-
|
|
142
|
+
_ts_decorate([
|
|
143
|
+
(0, _awilixexpress.POST)(),
|
|
144
|
+
(0, _awilixexpress.route)("/login"),
|
|
145
|
+
_ts_metadata("design:type", Function),
|
|
146
|
+
_ts_metadata("design:paramtypes", [
|
|
147
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
148
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
149
|
+
]),
|
|
150
|
+
_ts_metadata("design:returntype", Promise)
|
|
151
|
+
], AuthController.prototype, "login", null);
|
|
152
|
+
_ts_decorate([
|
|
153
|
+
(0, _awilixexpress.GET)(),
|
|
154
|
+
(0, _awilixexpress.route)("/login-required"),
|
|
155
|
+
_ts_metadata("design:type", Function),
|
|
156
|
+
_ts_metadata("design:paramtypes", [
|
|
157
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
158
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
159
|
+
]),
|
|
160
|
+
_ts_metadata("design:returntype", Promise)
|
|
161
|
+
], AuthController.prototype, "getLoginRequired", null);
|
|
162
|
+
_ts_decorate([
|
|
163
|
+
(0, _awilixexpress.POST)(),
|
|
164
|
+
(0, _awilixexpress.route)("/verify"),
|
|
165
|
+
(0, _awilixexpress.before)([
|
|
136
166
|
(0, _authenticate.authenticate)()
|
|
137
|
-
]
|
|
138
|
-
|
|
139
|
-
|
|
167
|
+
]),
|
|
168
|
+
_ts_metadata("design:type", Function),
|
|
169
|
+
_ts_metadata("design:paramtypes", [
|
|
170
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
171
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
172
|
+
]),
|
|
173
|
+
_ts_metadata("design:returntype", Promise)
|
|
174
|
+
], AuthController.prototype, "verifyLogin", null);
|
|
175
|
+
_ts_decorate([
|
|
176
|
+
(0, _awilixexpress.POST)(),
|
|
177
|
+
(0, _awilixexpress.route)("/needs-password-change"),
|
|
178
|
+
_ts_metadata("design:type", Function),
|
|
179
|
+
_ts_metadata("design:paramtypes", [
|
|
180
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
181
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
182
|
+
]),
|
|
183
|
+
_ts_metadata("design:returntype", Promise)
|
|
184
|
+
], AuthController.prototype, "needsPasswordChange", null);
|
|
185
|
+
_ts_decorate([
|
|
186
|
+
(0, _awilixexpress.POST)(),
|
|
187
|
+
(0, _awilixexpress.route)("/refresh"),
|
|
188
|
+
_ts_metadata("design:type", Function),
|
|
189
|
+
_ts_metadata("design:paramtypes", [
|
|
190
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
191
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
192
|
+
]),
|
|
193
|
+
_ts_metadata("design:returntype", Promise)
|
|
194
|
+
], AuthController.prototype, "refreshLogin", null);
|
|
195
|
+
_ts_decorate([
|
|
196
|
+
(0, _awilixexpress.POST)(),
|
|
197
|
+
(0, _awilixexpress.route)("/logout"),
|
|
198
|
+
(0, _awilixexpress.before)([
|
|
140
199
|
(0, _authenticate.authenticate)()
|
|
141
|
-
]
|
|
142
|
-
|
|
200
|
+
]),
|
|
201
|
+
_ts_metadata("design:type", Function),
|
|
202
|
+
_ts_metadata("design:paramtypes", [
|
|
203
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
204
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
205
|
+
]),
|
|
206
|
+
_ts_metadata("design:returntype", Promise)
|
|
207
|
+
], AuthController.prototype, "logout", null);
|
|
208
|
+
_ts_decorate([
|
|
209
|
+
(0, _awilixexpress.POST)(),
|
|
210
|
+
(0, _awilixexpress.route)("/register"),
|
|
211
|
+
(0, _awilixexpress.before)([
|
|
212
|
+
_demomiddleware.demoUserNotAllowed
|
|
213
|
+
]),
|
|
214
|
+
_ts_metadata("design:type", Function),
|
|
215
|
+
_ts_metadata("design:paramtypes", [
|
|
216
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
217
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
218
|
+
]),
|
|
219
|
+
_ts_metadata("design:returntype", Promise)
|
|
220
|
+
], AuthController.prototype, "register", null);
|
|
221
|
+
AuthController = _ts_decorate([
|
|
222
|
+
(0, _awilixexpress.route)(_serverconstants.AppConstants.apiRoute + "/auth"),
|
|
223
|
+
_ts_metadata("design:type", Function),
|
|
224
|
+
_ts_metadata("design:paramtypes", [
|
|
225
|
+
typeof _loggerfactory.ILoggerFactory === "undefined" ? Object : _loggerfactory.ILoggerFactory,
|
|
226
|
+
typeof _authserviceinterface.IAuthService === "undefined" ? Object : _authserviceinterface.IAuthService,
|
|
227
|
+
typeof _settingsstore.SettingsStore === "undefined" ? Object : _settingsstore.SettingsStore,
|
|
228
|
+
typeof _userserviceinterface.IUserService === "undefined" ? Object : _userserviceinterface.IUserService,
|
|
229
|
+
typeof _roleserviceinterface.IRoleService === "undefined" ? Object : _roleserviceinterface.IRoleService,
|
|
230
|
+
typeof _configservice.IConfigService === "undefined" ? Object : _configservice.IConfigService
|
|
231
|
+
])
|
|
232
|
+
], AuthController);
|
|
143
233
|
|
|
144
234
|
//# sourceMappingURL=auth.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/auth.controller.ts"],"names":["AuthController","
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/auth.controller.ts"],"names":["AuthController","logger","constructor","loggerFactory","authService","settingsStore","userService","roleService","configService","name","login","req","res","debug","ip","headers","tokens","loginUser","body","username","password","send","getLoginRequired","loginRequired","registration","isRegistrationEnabled","wizardState","getWizardState","isDemoMode","wizardCompleted","verifyLogin","success","needsPasswordChange","isLoginRequired","authenticated","isAuthenticated","user","refreshLogin","refreshToken","validateMiddleware","refreshTokenSchema","idToken","renewLoginByRefreshToken","token","logout","end","jwtToken","authorization","replace","undefined","userId","id","logoutUserId","register","registrationEnabled","BadRequestException","registerUserSchema","toLowerCase","includes","roles","getAppDefaultRoleIds","result","isDemoUser","isRootUser","isVerified","userDto","toDto","authenticate","demoUserNotAllowed","AppConstants","apiRoute"],"mappings":"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"}
|
|
@@ -2,18 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
get: all[name]
|
|
9
|
-
});
|
|
10
|
-
}
|
|
11
|
-
_export(exports, {
|
|
12
|
-
BatchCallController: function() {
|
|
5
|
+
Object.defineProperty(exports, "BatchCallController", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
13
8
|
return BatchCallController;
|
|
14
|
-
},
|
|
15
|
-
default: function() {
|
|
16
|
-
return _default;
|
|
17
9
|
}
|
|
18
10
|
});
|
|
19
11
|
const _awilixexpress = require("awilix-express");
|
|
@@ -22,50 +14,129 @@ const _batchcontrollervalidation = require("./validation/batch-controller.valida
|
|
|
22
14
|
const _serverconstants = require("../server.constants");
|
|
23
15
|
const _authenticate = require("../middleware/authenticate");
|
|
24
16
|
const _authorizationconstants = require("../constants/authorization.constants");
|
|
17
|
+
const _batchcallservice = require("../services/core/batch-call.service");
|
|
18
|
+
const _express = require("express");
|
|
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
|
+
}
|
|
25
28
|
class BatchCallController {
|
|
26
29
|
batchCallService;
|
|
27
30
|
isTypeormMode;
|
|
28
|
-
constructor(
|
|
31
|
+
constructor(batchCallService, isTypeormMode){
|
|
29
32
|
this.batchCallService = batchCallService;
|
|
30
33
|
this.isTypeormMode = isTypeormMode;
|
|
31
34
|
}
|
|
32
35
|
async batchSettingsGet(req, res) {
|
|
33
|
-
const { printerIds } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.
|
|
36
|
+
const { printerIds } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.batchPrinterSchema)(this.isTypeormMode));
|
|
34
37
|
const results = await this.batchCallService.batchSettingsGet(printerIds);
|
|
35
38
|
res.send(results);
|
|
36
39
|
}
|
|
37
40
|
async batchConnectUsb(req, res) {
|
|
38
|
-
const { printerIds } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.
|
|
41
|
+
const { printerIds } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.batchPrinterSchema)(this.isTypeormMode));
|
|
39
42
|
const results = await this.batchCallService.batchConnectUsb(printerIds);
|
|
40
43
|
res.send(results);
|
|
41
44
|
}
|
|
42
45
|
async batchConnectSocket(req, res) {
|
|
43
|
-
const { printerIds } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.
|
|
46
|
+
const { printerIds } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.batchPrinterSchema)(this.isTypeormMode));
|
|
44
47
|
this.batchCallService.batchConnectSocket(printerIds);
|
|
45
48
|
res.send({});
|
|
46
49
|
}
|
|
47
50
|
async getLastPrintedFiles(req, res) {
|
|
48
|
-
const { printerIds } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.
|
|
51
|
+
const { printerIds } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.batchPrinterSchema)(this.isTypeormMode));
|
|
49
52
|
const files = await this.batchCallService.getBatchPrinterReprintFile(printerIds);
|
|
50
53
|
res.send(files);
|
|
51
54
|
}
|
|
52
55
|
async batchReprintFiles(req, res) {
|
|
53
|
-
const { prints } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.
|
|
56
|
+
const { prints } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.executeBatchRePrinterSchema)(this.isTypeormMode));
|
|
54
57
|
const files = await this.batchCallService.batchReprintCalls(prints);
|
|
55
58
|
res.send(files);
|
|
56
59
|
}
|
|
57
60
|
async batchTogglePrintersEnabled(req, res) {
|
|
58
|
-
const { printerIds, enabled } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.
|
|
61
|
+
const { printerIds, enabled } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.batchPrintersEnabledSchema)(this.isTypeormMode));
|
|
59
62
|
const results = await this.batchCallService.batchTogglePrintersEnabled(printerIds, enabled);
|
|
60
63
|
res.send(results);
|
|
61
64
|
}
|
|
62
65
|
}
|
|
63
|
-
|
|
64
|
-
(0,
|
|
65
|
-
(0,
|
|
66
|
-
|
|
67
|
-
|
|
66
|
+
_ts_decorate([
|
|
67
|
+
(0, _awilixexpress.POST)(),
|
|
68
|
+
(0, _awilixexpress.route)("/settings/get"),
|
|
69
|
+
_ts_metadata("design:type", Function),
|
|
70
|
+
_ts_metadata("design:paramtypes", [
|
|
71
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
72
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
73
|
+
]),
|
|
74
|
+
_ts_metadata("design:returntype", Promise)
|
|
75
|
+
], BatchCallController.prototype, "batchSettingsGet", null);
|
|
76
|
+
_ts_decorate([
|
|
77
|
+
(0, _awilixexpress.POST)(),
|
|
78
|
+
(0, _awilixexpress.route)("/connect/usb"),
|
|
79
|
+
_ts_metadata("design:type", Function),
|
|
80
|
+
_ts_metadata("design:paramtypes", [
|
|
81
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
82
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
83
|
+
]),
|
|
84
|
+
_ts_metadata("design:returntype", Promise)
|
|
85
|
+
], BatchCallController.prototype, "batchConnectUsb", null);
|
|
86
|
+
_ts_decorate([
|
|
87
|
+
(0, _awilixexpress.POST)(),
|
|
88
|
+
(0, _awilixexpress.route)("/connect/socket"),
|
|
89
|
+
_ts_metadata("design:type", Function),
|
|
90
|
+
_ts_metadata("design:paramtypes", [
|
|
91
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
92
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
93
|
+
]),
|
|
94
|
+
_ts_metadata("design:returntype", Promise)
|
|
95
|
+
], BatchCallController.prototype, "batchConnectSocket", null);
|
|
96
|
+
_ts_decorate([
|
|
97
|
+
(0, _awilixexpress.POST)(),
|
|
98
|
+
(0, _awilixexpress.route)("/reprint/list"),
|
|
99
|
+
_ts_metadata("design:type", Function),
|
|
100
|
+
_ts_metadata("design:paramtypes", [
|
|
101
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
102
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
103
|
+
]),
|
|
104
|
+
_ts_metadata("design:returntype", Promise)
|
|
105
|
+
], BatchCallController.prototype, "getLastPrintedFiles", null);
|
|
106
|
+
_ts_decorate([
|
|
107
|
+
(0, _awilixexpress.POST)(),
|
|
108
|
+
(0, _awilixexpress.route)("/reprint/execute"),
|
|
109
|
+
_ts_metadata("design:type", Function),
|
|
110
|
+
_ts_metadata("design:paramtypes", [
|
|
111
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
112
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
113
|
+
]),
|
|
114
|
+
_ts_metadata("design:returntype", Promise)
|
|
115
|
+
], BatchCallController.prototype, "batchReprintFiles", null);
|
|
116
|
+
_ts_decorate([
|
|
117
|
+
(0, _awilixexpress.POST)(),
|
|
118
|
+
(0, _awilixexpress.route)("/toggle-enabled"),
|
|
119
|
+
_ts_metadata("design:type", Function),
|
|
120
|
+
_ts_metadata("design:paramtypes", [
|
|
121
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
122
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
123
|
+
]),
|
|
124
|
+
_ts_metadata("design:returntype", Promise)
|
|
125
|
+
], BatchCallController.prototype, "batchTogglePrintersEnabled", null);
|
|
126
|
+
BatchCallController = _ts_decorate([
|
|
127
|
+
(0, _awilixexpress.route)(_serverconstants.AppConstants.apiRoute + "/batch"),
|
|
128
|
+
(0, _awilixexpress.before)([
|
|
129
|
+
(0, _authenticate.authenticate)(),
|
|
130
|
+
(0, _authenticate.authorizeRoles)([
|
|
131
|
+
_authorizationconstants.ROLES.ADMIN,
|
|
132
|
+
_authorizationconstants.ROLES.OPERATOR
|
|
133
|
+
])
|
|
134
|
+
]),
|
|
135
|
+
_ts_metadata("design:type", Function),
|
|
136
|
+
_ts_metadata("design:paramtypes", [
|
|
137
|
+
typeof _batchcallservice.BatchCallService === "undefined" ? Object : _batchcallservice.BatchCallService,
|
|
138
|
+
Boolean
|
|
68
139
|
])
|
|
69
|
-
]
|
|
140
|
+
], BatchCallController);
|
|
70
141
|
|
|
71
142
|
//# sourceMappingURL=batch-call.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/batch-call.controller.ts"],"names":["BatchCallController","
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/batch-call.controller.ts"],"names":["BatchCallController","constructor","batchCallService","isTypeormMode","batchSettingsGet","req","res","printerIds","validateInput","body","batchPrinterSchema","results","send","batchConnectUsb","batchConnectSocket","getLastPrintedFiles","files","getBatchPrinterReprintFile","batchReprintFiles","prints","executeBatchRePrinterSchema","batchReprintCalls","batchTogglePrintersEnabled","enabled","batchPrintersEnabledSchema","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR"],"mappings":";;;;+BAeaA;;;eAAAA;;;+BAfuB;4BACN;2CAKvB;iCACsB;8BACgB;wCACvB;kCACW;yBACC;;;;;;;;;;AAI3B,MAAMA;;;IACXC,YACE,AAAiBC,gBAAkC,EACnD,AAAiBC,aAAsB,CACvC;aAFiBD,mBAAAA;aACAC,gBAAAA;IAChB;IAEH,MAEMC,iBAAiBC,GAAY,EAAEC,GAAa,EAAE;QAClD,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEC,IAAAA,6CAAkB,EAAC,IAAI,CAACP,aAAa;QAC1F,MAAMQ,UAAU,MAAM,IAAI,CAACT,gBAAgB,CAACE,gBAAgB,CAACG;QAC7DD,IAAIM,IAAI,CAACD;IACX;IAEA,MAEME,gBAAgBR,GAAY,EAAEC,GAAa,EAAE;QACjD,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEC,IAAAA,6CAAkB,EAAC,IAAI,CAACP,aAAa;QAC1F,MAAMQ,UAAU,MAAM,IAAI,CAACT,gBAAgB,CAACW,eAAe,CAACN;QAC5DD,IAAIM,IAAI,CAACD;IACX;IAEA,MAEMG,mBAAmBT,GAAY,EAAEC,GAAa,EAAE;QACpD,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEC,IAAAA,6CAAkB,EAAC,IAAI,CAACP,aAAa;QAC1F,IAAI,CAACD,gBAAgB,CAACY,kBAAkB,CAACP;QACzCD,IAAIM,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMG,oBAAoBV,GAAY,EAAEC,GAAa,EAAE;QACrD,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEC,IAAAA,6CAAkB,EAAC,IAAI,CAACP,aAAa;QAC1F,MAAMa,QAAQ,MAAM,IAAI,CAACd,gBAAgB,CAACe,0BAA0B,CAACV;QACrED,IAAIM,IAAI,CAACI;IACX;IAEA,MAEME,kBAAkBb,GAAY,EAAEC,GAAa,EAAE;QACnD,MAAM,EAAEa,MAAM,EAAE,GAAG,MAAMX,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEW,IAAAA,sDAA2B,EAAC,IAAI,CAACjB,aAAa;QAC/F,MAAMa,QAAQ,MAAM,IAAI,CAACd,gBAAgB,CAACmB,iBAAiB,CAACF;QAC5Db,IAAIM,IAAI,CAACI;IACX;IAEA,MAEMM,2BAA2BjB,GAAY,EAAEC,GAAa,EAAE;QAC5D,MAAM,EAAEC,UAAU,EAAEgB,OAAO,EAAE,GAAG,MAAMf,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEe,IAAAA,qDAA0B,EAAC,IAAI,CAACrB,aAAa;QAC3G,MAAMQ,UAAU,MAAM,IAAI,CAACT,gBAAgB,CAACoB,0BAA0B,CAACf,YAAYgB;QACnFjB,IAAIM,IAAI,CAACD;IACX;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BAvDOc,6BAAY,CAACC,QAAQ,GAAG;;QACtBC,IAAAA,0BAAY;QAAIC,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,KAAK;YAAED,6BAAK,CAACE,QAAQ;SAAC"}
|
|
@@ -10,11 +10,11 @@ Object.defineProperty(exports, "CameraStreamController", {
|
|
|
10
10
|
});
|
|
11
11
|
const _awilixroutercore = require("awilix-router-core");
|
|
12
12
|
const _serverconstants = require("../server.constants");
|
|
13
|
-
const _validators = require("../handlers/validators");
|
|
14
|
-
const _genericvalidation = require("./validation/generic.validation");
|
|
15
13
|
const _authenticate = require("../middleware/authenticate");
|
|
16
14
|
const _express = require("express");
|
|
15
|
+
const _camerastreamserviceinterface = require("../services/interfaces/camera-stream.service.interface");
|
|
17
16
|
const _authorizationconstants = require("../constants/authorization.constants");
|
|
17
|
+
const _paramconvertermiddleware = require("../middleware/param-converter.middleware");
|
|
18
18
|
function _ts_decorate(decorators, target, key, desc) {
|
|
19
19
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
20
20
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -26,18 +26,15 @@ function _ts_metadata(k, v) {
|
|
|
26
26
|
}
|
|
27
27
|
class CameraStreamController {
|
|
28
28
|
cameraStreamService;
|
|
29
|
-
|
|
30
|
-
constructor({ cameraStreamService, isTypeormMode }){
|
|
29
|
+
constructor(cameraStreamService){
|
|
31
30
|
this.cameraStreamService = cameraStreamService;
|
|
32
|
-
this.isTypeormMode = isTypeormMode;
|
|
33
31
|
}
|
|
34
32
|
async list(req, res) {
|
|
35
33
|
const result = await this.cameraStreamService.list();
|
|
36
34
|
res.send(result.map((item)=>this.cameraStreamService.toDto(item)));
|
|
37
35
|
}
|
|
38
36
|
async get(req, res) {
|
|
39
|
-
const
|
|
40
|
-
const result = await this.cameraStreamService.get(id);
|
|
37
|
+
const result = await this.cameraStreamService.get(req.local.id);
|
|
41
38
|
res.send(this.cameraStreamService.toDto(result));
|
|
42
39
|
}
|
|
43
40
|
async create(req, res) {
|
|
@@ -45,13 +42,11 @@ class CameraStreamController {
|
|
|
45
42
|
res.send(this.cameraStreamService.toDto(result));
|
|
46
43
|
}
|
|
47
44
|
async update(req, res) {
|
|
48
|
-
const
|
|
49
|
-
const result = await this.cameraStreamService.update(id, req.body);
|
|
45
|
+
const result = await this.cameraStreamService.update(req.local.id, req.body);
|
|
50
46
|
res.send(this.cameraStreamService.toDto(result));
|
|
51
47
|
}
|
|
52
48
|
async delete(req, res) {
|
|
53
|
-
|
|
54
|
-
await this.cameraStreamService.delete(id);
|
|
49
|
+
await this.cameraStreamService.delete(req.local.id);
|
|
55
50
|
res.send();
|
|
56
51
|
}
|
|
57
52
|
}
|
|
@@ -68,6 +63,9 @@ _ts_decorate([
|
|
|
68
63
|
_ts_decorate([
|
|
69
64
|
(0, _awilixroutercore.GET)(),
|
|
70
65
|
(0, _awilixroutercore.route)("/:id"),
|
|
66
|
+
(0, _awilixroutercore.before)([
|
|
67
|
+
(0, _paramconvertermiddleware.ParamId)("id")
|
|
68
|
+
]),
|
|
71
69
|
_ts_metadata("design:type", Function),
|
|
72
70
|
_ts_metadata("design:paramtypes", [
|
|
73
71
|
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
@@ -88,6 +86,9 @@ _ts_decorate([
|
|
|
88
86
|
_ts_decorate([
|
|
89
87
|
(0, _awilixroutercore.PUT)(),
|
|
90
88
|
(0, _awilixroutercore.route)("/:id"),
|
|
89
|
+
(0, _awilixroutercore.before)([
|
|
90
|
+
(0, _paramconvertermiddleware.ParamId)("id")
|
|
91
|
+
]),
|
|
91
92
|
_ts_metadata("design:type", Function),
|
|
92
93
|
_ts_metadata("design:paramtypes", [
|
|
93
94
|
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
@@ -98,6 +99,9 @@ _ts_decorate([
|
|
|
98
99
|
_ts_decorate([
|
|
99
100
|
(0, _awilixroutercore.DELETE)(),
|
|
100
101
|
(0, _awilixroutercore.route)("/:id"),
|
|
102
|
+
(0, _awilixroutercore.before)([
|
|
103
|
+
(0, _paramconvertermiddleware.ParamId)("id")
|
|
104
|
+
]),
|
|
101
105
|
_ts_metadata("design:type", Function),
|
|
102
106
|
_ts_metadata("design:paramtypes", [
|
|
103
107
|
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
@@ -116,7 +120,7 @@ CameraStreamController = _ts_decorate([
|
|
|
116
120
|
]),
|
|
117
121
|
_ts_metadata("design:type", Function),
|
|
118
122
|
_ts_metadata("design:paramtypes", [
|
|
119
|
-
Object
|
|
123
|
+
typeof _camerastreamserviceinterface.ICameraStreamService === "undefined" ? Object : _camerastreamserviceinterface.ICameraStreamService
|
|
120
124
|
])
|
|
121
125
|
], CameraStreamController);
|
|
122
126
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/camera-stream.controller.ts"],"names":["CameraStreamController","
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/camera-stream.controller.ts"],"names":["CameraStreamController","constructor","cameraStreamService","list","req","res","result","send","map","item","toDto","get","local","id","create","body","update","delete","ParamId","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN"],"mappings":";;;;+BAUaA;;;eAAAA;;;kCAVyC;iCACzB;8BACgB;yBACX;8CACG;wCACf;0CACE;;;;;;;;;;AAIjB,MAAMA;;IACXC,YAAY,AAAiBC,mBAAyC,CAAE;aAA3CA,sBAAAA;IAA4C;IACzE,MAEMC,KAAKC,GAAY,EAAEC,GAAa,EAAE;QACtC,MAAMC,SAAS,MAAM,IAAI,CAACJ,mBAAmB,CAACC,IAAI;QAClDE,IAAIE,IAAI,CAACD,OAAOE,GAAG,CAAC,CAACC,OAAS,IAAI,CAACP,mBAAmB,CAACQ,KAAK,CAACD;IAC/D;IAEA,MAGME,IAAIP,GAAY,EAAEC,GAAa,EAAE;QACrC,MAAMC,SAAS,MAAM,IAAI,CAACJ,mBAAmB,CAACS,GAAG,CAACP,IAAIQ,KAAK,CAACC,EAAE;QAC9DR,IAAIE,IAAI,CAAC,IAAI,CAACL,mBAAmB,CAACQ,KAAK,CAACJ;IAC1C;IAEA,MAEMQ,OAAOV,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAMC,SAAS,MAAM,IAAI,CAACJ,mBAAmB,CAACY,MAAM,CAACV,IAAIW,IAAI;QAC7DV,IAAIE,IAAI,CAAC,IAAI,CAACL,mBAAmB,CAACQ,KAAK,CAACJ;IAC1C;IAEA,MAGMU,OAAOZ,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAMC,SAAS,MAAM,IAAI,CAACJ,mBAAmB,CAACc,MAAM,CAACZ,IAAIQ,KAAK,CAACC,EAAE,EAAET,IAAIW,IAAI;QAC3EV,IAAIE,IAAI,CAAC,IAAI,CAACL,mBAAmB,CAACQ,KAAK,CAACJ;IAC1C;IAEA,MAGMW,OAAOb,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAM,IAAI,CAACH,mBAAmB,CAACe,MAAM,CAACb,IAAIQ,KAAK,CAACC,EAAE;QAClDR,IAAIE,IAAI;IACV;AACF;;;;;;;;;;;;;;;QA5BWW,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;;;;;;;;;;;QAeRA,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QAQRA,IAAAA,iCAAO,EAAC;;;;;;;;;;oCApCTC,6BAAY,CAACC,QAAQ,CAAC,cAAc;;QACrCC,IAAAA,0BAAY;QAAIC,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,QAAQ;YAAED,6BAAK,CAACE,KAAK;SAAC"}
|