@fdm-monster/server 1.9.4 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.env.template +8 -7
- package/.yarn/install-state.gz +0 -0
- package/CONTRIBUTING.md +5 -5
- package/README.md +9 -8
- package/RELEASE_NOTES.MD +52 -0
- package/SECURITY.md +1 -1
- package/biome.json +8 -5
- package/dist/consoles/download-github-releases.js +3 -3
- package/dist/consoles/launch-http-servers.js +4 -4
- package/dist/consoles/launch-http-servers.js.map +1 -1
- package/dist/consoles/mock-bambu.server.js +50 -30
- package/dist/consoles/mock-bambu.server.js.map +1 -1
- package/dist/consoles/mock-camera/default-image.js +13 -0
- package/dist/consoles/mock-camera/default-image.js.map +1 -0
- package/dist/consoles/mock-camera/mock-camera.server.js +160 -0
- package/dist/consoles/mock-camera/mock-camera.server.js.map +1 -0
- package/dist/consoles/mock-octoprint.server.js +281 -73
- package/dist/consoles/mock-octoprint.server.js.map +1 -1
- package/dist/consoles/mock-prusalink.server.js +17 -17
- package/dist/consoles/mock-prusalink.server.js.map +1 -1
- package/dist/consoles/typeorm-create.js +135 -0
- package/dist/consoles/typeorm-create.js.map +1 -0
- package/dist/consoles/typeorm-generate.js +8 -8
- package/dist/consoles/typeorm-generate.js.map +1 -1
- package/dist/consoles/utils/api-messages.js.map +1 -1
- package/dist/constants/authorization.constants.js +25 -31
- package/dist/constants/authorization.constants.js.map +1 -1
- package/dist/constants/event.constants.js.map +1 -1
- package/dist/constants/server-settings.constants.js +3 -19
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/container.js +43 -59
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +9 -6
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/auth.controller.js +1 -1
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/batch-call.controller.js +7 -25
- package/dist/controllers/batch-call.controller.js.map +1 -1
- package/dist/controllers/file-storage.controller.js +248 -0
- package/dist/controllers/file-storage.controller.js.map +1 -0
- package/dist/controllers/first-time-setup.controller.js +6 -5
- package/dist/controllers/first-time-setup.controller.js.map +1 -1
- package/dist/controllers/floor.controller.js +12 -12
- package/dist/controllers/floor.controller.js.map +1 -1
- package/dist/controllers/metrics.controller.js.map +1 -1
- package/dist/controllers/print-job.controller.js +666 -0
- package/dist/controllers/print-job.controller.js.map +1 -0
- package/dist/controllers/print-queue.controller.js +375 -0
- package/dist/controllers/print-queue.controller.js.map +1 -0
- package/dist/controllers/printer-files.controller.js +88 -59
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer-settings.controller.js +0 -21
- package/dist/controllers/printer-settings.controller.js.map +1 -1
- package/dist/controllers/{printer-group.controller.js → printer-tag.controller.js} +51 -34
- package/dist/controllers/printer-tag.controller.js.map +1 -0
- package/dist/controllers/printer.controller.js +21 -7
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +2 -1
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +11 -15
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/controllers/settings.controller.js +0 -68
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/controllers/slicer-compat.controller.js +216 -0
- package/dist/controllers/slicer-compat.controller.js.map +1 -0
- package/dist/controllers/user.controller.js +8 -12
- package/dist/controllers/user.controller.js.map +1 -1
- package/dist/controllers/validation/batch-controller.validation.js +13 -13
- package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
- package/dist/controllers/validation/generic.validation.js +4 -8
- package/dist/controllers/validation/generic.validation.js.map +1 -1
- package/dist/controllers/validation/printer-files-controller.validation.js +2 -2
- package/dist/controllers/validation/user-controller.validation.js +14 -9
- package/dist/controllers/validation/user-controller.validation.js.map +1 -1
- package/dist/data-source.js +25 -12
- package/dist/data-source.js.map +1 -1
- package/dist/entities/camera-stream.entity.js +2 -1
- package/dist/entities/camera-stream.entity.js.map +1 -1
- package/dist/entities/floor.entity.js +3 -5
- package/dist/entities/floor.entity.js.map +1 -1
- package/dist/entities/index.js +15 -11
- package/dist/entities/index.js.map +1 -1
- package/dist/entities/print-job.entity.js +195 -0
- package/dist/entities/print-job.entity.js.map +1 -0
- package/dist/entities/{printer-group.entity.js → printer-tag.entity.js} +17 -17
- package/dist/entities/printer-tag.entity.js.map +1 -0
- package/dist/entities/printer.entity.js +4 -10
- package/dist/entities/printer.entity.js.map +1 -1
- package/dist/entities/settings.entity.js +3 -12
- package/dist/entities/settings.entity.js.map +1 -1
- package/dist/entities/{group.entity.js → tag.entity.js} +15 -8
- package/dist/entities/tag.entity.js.map +1 -0
- package/dist/handlers/logging/file-logging.transport.js.map +1 -1
- package/dist/handlers/logging/static.logger.js.map +1 -1
- package/dist/index.js +8 -2
- package/dist/index.js.map +1 -1
- package/dist/middleware/authenticate.js +4 -4
- package/dist/middleware/authenticate.js.map +1 -1
- package/dist/middleware/database.js +1 -1
- package/dist/middleware/exception.filter.js +114 -90
- package/dist/middleware/exception.filter.js.map +1 -1
- package/dist/middleware/global.middleware.js +10 -18
- package/dist/middleware/global.middleware.js.map +1 -1
- package/dist/middleware/param-converter.middleware.js +5 -13
- package/dist/middleware/param-converter.middleware.js.map +1 -1
- package/dist/middleware/passport.js +2 -2
- package/dist/middleware/passport.js.map +1 -1
- package/dist/middleware/printer-resolver.js.map +1 -1
- package/dist/middleware/printer.js +3 -2
- package/dist/middleware/printer.js.map +1 -1
- package/dist/middleware/socketio.middleware.js.map +1 -1
- package/dist/migrations/1745141688926-AddPrinterUsernamePassword.js +1 -1
- package/dist/migrations/1745141688926-AddPrinterUsernamePassword.js.map +1 -1
- package/dist/migrations/1766576698569-DropPermissions.js +28 -0
- package/dist/migrations/1766576698569-DropPermissions.js.map +1 -0
- package/dist/migrations/1767278216516-ChangeCameraPrinterOnDeleteSetNull.js +186 -0
- package/dist/migrations/1767278216516-ChangeCameraPrinterOnDeleteSetNull.js.map +1 -0
- package/dist/migrations/1767279607392-DropCustomGcode.js +31 -0
- package/dist/migrations/1767279607392-DropCustomGcode.js.map +1 -0
- package/dist/migrations/1767291804417-DropPrintCompletions.js +37 -0
- package/dist/migrations/1767291804417-DropPrintCompletions.js.map +1 -0
- package/dist/migrations/1767352862576-DropSettingsFileClean.js +88 -0
- package/dist/migrations/1767352862576-DropSettingsFileClean.js.map +1 -0
- package/dist/migrations/1767355639023-ChangeFloorLevelToOrder.js +107 -0
- package/dist/migrations/1767355639023-ChangeFloorLevelToOrder.js.map +1 -0
- package/dist/migrations/1767370191762-ChangeFloorNonUniqueOrder.js +62 -0
- package/dist/migrations/1767370191762-ChangeFloorNonUniqueOrder.js.map +1 -0
- package/dist/migrations/1767432108916-RenameGroupToTag.js +86 -0
- package/dist/migrations/1767432108916-RenameGroupToTag.js.map +1 -0
- package/dist/migrations/1767451444137-AddPrintJob.js +207 -0
- package/dist/migrations/1767451444137-AddPrintJob.js.map +1 -0
- package/dist/server.constants.js +9 -17
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js +3 -7
- package/dist/server.core.js.map +1 -1
- package/dist/server.env.js +4 -49
- package/dist/server.env.js.map +1 -1
- package/dist/server.host.js +26 -44
- package/dist/server.host.js.map +1 -1
- package/dist/services/authentication/auth.service.js.map +1 -1
- package/dist/services/authentication/jwt.service.js.map +1 -1
- package/dist/services/bambu/bambu-ftp.adapter.js +3 -3
- package/dist/services/bambu/bambu-ftp.adapter.js.map +1 -1
- package/dist/services/bambu/bambu-mqtt.adapter.js +74 -77
- package/dist/services/bambu/bambu-mqtt.adapter.js.map +1 -1
- package/dist/services/bambu/bambu.client.js.map +1 -1
- package/dist/services/bambu.api.js +11 -0
- package/dist/services/bambu.api.js.map +1 -1
- package/dist/services/core/batch-call.service.js +0 -25
- package/dist/services/core/batch-call.service.js.map +1 -1
- package/dist/services/core/multer.service.js +5 -9
- package/dist/services/core/multer.service.js.map +1 -1
- package/dist/services/core/yaml.service.js +219 -187
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/file-analysis.service.js +146 -0
- package/dist/services/file-analysis.service.js.map +1 -0
- package/dist/services/file-storage.service.js +386 -0
- package/dist/services/file-storage.service.js.map +1 -0
- package/dist/services/interfaces/camera-stream.dto.js +2 -2
- package/dist/services/interfaces/camera-stream.dto.js.map +1 -1
- package/dist/services/interfaces/floor.dto.js +3 -3
- package/dist/services/interfaces/floor.dto.js.map +1 -1
- package/dist/services/interfaces/{printer-group.dto.js → printer-tag.dto.js} +9 -8
- package/dist/services/interfaces/printer-tag.dto.js.map +1 -0
- package/dist/services/interfaces/{print-completion.interface.js → printer-tag.service.interface.js} +1 -1
- package/dist/services/interfaces/{printer-group.service.interface.js.map → printer-tag.service.interface.js.map} +1 -1
- package/dist/services/interfaces/printer.dto.js +2 -2
- package/dist/services/interfaces/printer.dto.js.map +1 -1
- package/dist/services/interfaces/refresh-token.dto.js.map +1 -1
- package/dist/services/interfaces/role.dto.js.map +1 -1
- package/dist/services/interfaces/settings.dto.js +0 -1
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/interfaces/{group.dto.js → tag.dto.js} +1 -1
- package/dist/services/interfaces/tag.dto.js.map +1 -0
- package/dist/services/interfaces/user.dto.js.map +1 -1
- package/dist/services/moonraker/constants/moonraker-event.dto.js.map +1 -1
- package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
- package/dist/services/moonraker/moonraker.client.js.map +1 -1
- package/dist/services/moonraker.api.js +3 -0
- package/dist/services/moonraker.api.js.map +1 -1
- package/dist/services/octoprint/dto/files/gcode-analysis.dto.js.map +1 -0
- package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.routes.js +0 -7
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -1
- package/dist/services/octoprint/octoprint.client.js +0 -4
- package/dist/services/octoprint/octoprint.client.js.map +1 -1
- package/dist/services/octoprint.api.js +3 -0
- package/dist/services/octoprint.api.js.map +1 -1
- package/dist/services/orm/base.service.js.map +1 -1
- package/dist/services/orm/camera-stream.service.js.map +1 -1
- package/dist/services/orm/floor-position.service.js.map +1 -1
- package/dist/services/orm/floor.service.js +12 -19
- package/dist/services/orm/floor.service.js.map +1 -1
- package/dist/services/orm/permission.service.js +3 -54
- package/dist/services/orm/permission.service.js.map +1 -1
- package/dist/services/orm/print-job.service.js +539 -0
- package/dist/services/orm/print-job.service.js.map +1 -0
- package/dist/services/orm/printer-tag.service.js +120 -0
- package/dist/services/orm/printer-tag.service.js.map +1 -0
- package/dist/services/orm/printer.service.js.map +1 -1
- package/dist/services/orm/refresh-token.service.js.map +1 -1
- package/dist/services/orm/role.service.js +25 -39
- package/dist/services/orm/role.service.js.map +1 -1
- package/dist/services/orm/settings.service.js +4 -15
- package/dist/services/orm/settings.service.js.map +1 -1
- package/dist/services/orm/user.service.js +17 -13
- package/dist/services/orm/user.service.js.map +1 -1
- package/dist/services/print-file-downloader.service.js +169 -0
- package/dist/services/print-file-downloader.service.js.map +1 -0
- package/dist/services/print-queue.service.js +268 -0
- package/dist/services/print-queue.service.js.map +1 -0
- package/dist/services/printer-api.factory.js +1 -1
- package/dist/services/printer-api.factory.js.map +1 -1
- package/dist/services/printer-api.interface.js.map +1 -1
- package/dist/services/prusa-link/constants/prusalink-event.dto.js.map +1 -1
- package/dist/services/prusa-link/prusa-link-http-polling.adapter.js +1 -3
- package/dist/services/prusa-link/prusa-link-http-polling.adapter.js.map +1 -1
- package/dist/services/prusa-link/prusa-link.api.js +4 -1
- package/dist/services/prusa-link/prusa-link.api.js.map +1 -1
- package/dist/services/prusa-link/utils/prusa-link-http-client.builder.js.map +1 -1
- package/dist/services/validators/floor-service.validation.js +25 -31
- package/dist/services/validators/floor-service.validation.js.map +1 -1
- package/dist/services/validators/print-job.validation.js +31 -0
- package/dist/services/validators/print-job.validation.js.map +1 -0
- package/dist/services/validators/settings-service.validation.js +0 -22
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/services/validators/user-service.validation.js +15 -10
- package/dist/services/validators/user-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +8 -14
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/shared/load-controllers.js +2 -1
- package/dist/shared/load-controllers.js.map +1 -1
- package/dist/shared/runtime-settings.migration.js +1 -11
- package/dist/shared/runtime-settings.migration.js.map +1 -1
- package/dist/shared/websocket-rpc-extended.adapter.js +13 -4
- package/dist/shared/websocket-rpc-extended.adapter.js.map +1 -1
- package/dist/shared/websocket.adapter.js.map +1 -1
- package/dist/state/file-upload-tracker.cache.js.map +1 -1
- package/dist/state/file.cache.js +6 -6
- package/dist/state/file.cache.js.map +1 -1
- package/dist/state/floor.store.js +3 -10
- package/dist/state/floor.store.js.map +1 -1
- package/dist/state/printer-events.cache.js +180 -20
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/printer-files.store.js.map +1 -1
- package/dist/state/printer-socket.store.js +25 -20
- package/dist/state/printer-socket.store.js.map +1 -1
- package/dist/state/printer-thumbnail.cache.js +98 -188
- package/dist/state/printer-thumbnail.cache.js.map +1 -1
- package/dist/state/printer.cache.js +3 -13
- package/dist/state/printer.cache.js.map +1 -1
- package/dist/state/settings.store.js +4 -42
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/socket-io.gateway.js +1 -1
- package/dist/state/socket-io.gateway.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +6 -3
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/dist/tasks/boot.task.js +11 -91
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/print-job-analysis.task.js +116 -0
- package/dist/tasks/print-job-analysis.task.js.map +1 -0
- package/dist/tasks/printer-files-load.task.js +29 -0
- package/dist/tasks/printer-files-load.task.js.map +1 -0
- package/dist/tasks/socketio.task.js +1 -1
- package/dist/tasks/socketio.task.js.map +1 -1
- package/dist/tasks.js +3 -2
- package/dist/tasks.js.map +1 -1
- package/dist/utils/cache/key-diff.cache.js +20 -61
- package/dist/utils/cache/key-diff.cache.js.map +1 -1
- package/dist/utils/parsers/3mf.parser.js +337 -0
- package/dist/utils/parsers/3mf.parser.js.map +1 -0
- package/dist/utils/parsers/bgcode.parser.js +223 -0
- package/dist/utils/parsers/bgcode.parser.js.map +1 -0
- package/dist/utils/parsers/gcode.parser.js +254 -0
- package/dist/utils/parsers/gcode.parser.js.map +1 -0
- package/dist/utils/swagger/decorators.js +39 -0
- package/dist/utils/swagger/decorators.js.map +1 -0
- package/dist/utils/swagger/generator.js +196 -0
- package/dist/utils/swagger/generator.js.map +1 -0
- package/dist/utils/swagger/swagger.js +93 -0
- package/dist/utils/swagger/swagger.js.map +1 -0
- package/package.json +24 -30
- package/dist/controllers/custom-gcode.controller.js +0 -150
- package/dist/controllers/custom-gcode.controller.js.map +0 -1
- package/dist/controllers/print-completion.controller.js +0 -118
- package/dist/controllers/print-completion.controller.js.map +0 -1
- package/dist/controllers/printer-group.controller.js.map +0 -1
- package/dist/entities/custom-gcode.entity.js +0 -49
- package/dist/entities/custom-gcode.entity.js.map +0 -1
- package/dist/entities/group.entity.js.map +0 -1
- package/dist/entities/permission.entity.js +0 -37
- package/dist/entities/permission.entity.js.map +0 -1
- package/dist/entities/print-completion.entity.js +0 -90
- package/dist/entities/print-completion.entity.js.map +0 -1
- package/dist/entities/printer-group.entity.js.map +0 -1
- package/dist/models/Auth/Permission.js +0 -20
- package/dist/models/Auth/Permission.js.map +0 -1
- package/dist/models/Auth/RefreshToken.js +0 -41
- package/dist/models/Auth/RefreshToken.js.map +0 -1
- package/dist/models/Auth/Role.js +0 -20
- package/dist/models/Auth/Role.js.map +0 -1
- package/dist/models/Auth/User.js +0 -49
- package/dist/models/Auth/User.js.map +0 -1
- package/dist/models/CameraStream.js +0 -49
- package/dist/models/CameraStream.js.map +0 -1
- package/dist/models/CustomGcode.js +0 -28
- package/dist/models/CustomGcode.js.map +0 -1
- package/dist/models/Floor.js +0 -33
- package/dist/models/Floor.js.map +0 -1
- package/dist/models/FloorPrinter.js +0 -38
- package/dist/models/FloorPrinter.js.map +0 -1
- package/dist/models/PrintCompletion.js +0 -40
- package/dist/models/PrintCompletion.js.map +0 -1
- package/dist/models/Printer.js +0 -78
- package/dist/models/Printer.js.map +0 -1
- package/dist/models/Settings.js +0 -150
- package/dist/models/Settings.js.map +0 -1
- package/dist/models/index.js +0 -54
- package/dist/models/index.js.map +0 -1
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js +0 -45
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js.map +0 -1
- package/dist/mongo-migrations/20210907173950-printers-enabled.js +0 -35
- package/dist/mongo-migrations/20210907173950-printers-enabled.js.map +0 -1
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js +0 -35
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js.map +0 -1
- package/dist/mongo-migrations/20230414141005-floor-remove-groupinfloor.js +0 -60
- package/dist/mongo-migrations/20230414141005-floor-remove-groupinfloor.js.map +0 -1
- package/dist/mongo-migrations/20230427202911-printer-remove-sortindex.js +0 -30
- package/dist/mongo-migrations/20230427202911-printer-remove-sortindex.js.map +0 -1
- package/dist/mongo-migrations/20230716065316-user-remove-name.js +0 -30
- package/dist/mongo-migrations/20230716065316-user-remove-name.js.map +0 -1
- package/dist/mongo-migrations/20231111081809-printer-flatten-name.js +0 -35
- package/dist/mongo-migrations/20231111081809-printer-flatten-name.js.map +0 -1
- package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js +0 -41
- package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js.map +0 -1
- package/dist/mongo-migrations/20231202183902-printer-files-simpler.js +0 -41
- package/dist/mongo-migrations/20231202183902-printer-files-simpler.js.map +0 -1
- package/dist/services/interfaces/custom-gcode.dto.js +0 -18
- package/dist/services/interfaces/custom-gcode.dto.js.map +0 -1
- package/dist/services/interfaces/custom-gcode.service.interface.js +0 -6
- package/dist/services/interfaces/custom-gcode.service.interface.js.map +0 -1
- package/dist/services/interfaces/gcode-analysis.dto.js.map +0 -1
- package/dist/services/interfaces/group.dto.js.map +0 -1
- package/dist/services/interfaces/permission.dto.js +0 -16
- package/dist/services/interfaces/permission.dto.js.map +0 -1
- package/dist/services/interfaces/print-completion-context.dto.js +0 -6
- package/dist/services/interfaces/print-completion-context.dto.js.map +0 -1
- package/dist/services/interfaces/print-completion.dto.js +0 -38
- package/dist/services/interfaces/print-completion.dto.js.map +0 -1
- package/dist/services/interfaces/print-completion.interface.js.map +0 -1
- package/dist/services/interfaces/printer-group.dto.js.map +0 -1
- package/dist/services/interfaces/printer-group.service.interface.js +0 -6
- package/dist/services/mongoose/camera-stream.service.js +0 -67
- package/dist/services/mongoose/camera-stream.service.js.map +0 -1
- package/dist/services/mongoose/custom-gcode.service.js +0 -50
- package/dist/services/mongoose/custom-gcode.service.js.map +0 -1
- package/dist/services/mongoose/floor.service.js +0 -139
- package/dist/services/mongoose/floor.service.js.map +0 -1
- package/dist/services/mongoose/permission.service.js +0 -73
- package/dist/services/mongoose/permission.service.js.map +0 -1
- package/dist/services/mongoose/print-completion.service.js +0 -134
- package/dist/services/mongoose/print-completion.service.js.map +0 -1
- package/dist/services/mongoose/print-completion.shared.js +0 -59
- package/dist/services/mongoose/print-completion.shared.js.map +0 -1
- package/dist/services/mongoose/printer.service.js +0 -216
- package/dist/services/mongoose/printer.service.js.map +0 -1
- package/dist/services/mongoose/refresh-token.service.js +0 -104
- package/dist/services/mongoose/refresh-token.service.js.map +0 -1
- package/dist/services/mongoose/role.service.js +0 -132
- package/dist/services/mongoose/role.service.js.map +0 -1
- package/dist/services/mongoose/settings.service.js +0 -124
- package/dist/services/mongoose/settings.service.js.map +0 -1
- package/dist/services/mongoose/user.service.js +0 -180
- package/dist/services/mongoose/user.service.js.map +0 -1
- package/dist/services/orm/custom-gcode.service.js +0 -42
- package/dist/services/orm/custom-gcode.service.js.map +0 -1
- package/dist/services/orm/print-completion.service.js +0 -87
- package/dist/services/orm/print-completion.service.js.map +0 -1
- package/dist/services/orm/printer-group.service.js +0 -109
- package/dist/services/orm/printer-group.service.js.map +0 -1
- package/dist/services/validators/camera-service.validation.js +0 -19
- package/dist/services/validators/camera-service.validation.js.map +0 -1
- package/dist/services/validators/print-completion-service.validation.js +0 -33
- package/dist/services/validators/print-completion-service.validation.js.map +0 -1
- package/dist/shared.constants.js +0 -15
- package/dist/shared.constants.js.map +0 -1
- package/dist/tasks/print-completion.socketio.task.js +0 -91
- package/dist/tasks/print-completion.socketio.task.js.map +0 -1
- package/dist/tasks/printer-file-clean.task.js +0 -74
- package/dist/tasks/printer-file-clean.task.js.map +0 -1
- package/migrate-mongo-config.js +0 -45
- /package/dist/services/{interfaces → octoprint/dto/files}/gcode-analysis.dto.js +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/entities/camera-stream.entity.ts"],"names":["CameraStream","id","streamURL","name","printer","printerId","aspectRatio","rotationClockwise","flipHorizontal","flipVertical","Printer","nullable","unique","default"],"mappings":";;;;+BAIaA;;;eAAAA;;;yBAJ0E;+BAC/D;;;;;;;;;;AAGjB,MAAMA;IAEXC,GAAW;IAGXC,UAAkB;IAGlBC,KAAa;IAIbC,QAA4B;IAE5BC,UAAyB;IAGzBC,YAAoB;IAGpBC,kBAA0B;IAG1BC,eAAwB;IAGxBC,aAAsB;AACxB;;;;;;;;;;;;;;+BAjBkBC,sBAAO;QAAIC,UAAU;;;
|
|
1
|
+
{"version":3,"sources":["../../src/entities/camera-stream.entity.ts"],"names":["CameraStream","id","streamURL","name","printer","printerId","aspectRatio","rotationClockwise","flipHorizontal","flipVertical","Printer","nullable","onDelete","unique","default"],"mappings":";;;;+BAIaA;;;eAAAA;;;yBAJ0E;+BAC/D;;;;;;;;;;AAGjB,MAAMA;IAEXC,GAAW;IAGXC,UAAkB;IAGlBC,KAAa;IAIbC,QAA4B;IAE5BC,UAAyB;IAGzBC,YAAoB;IAGpBC,kBAA0B;IAG1BC,eAAwB;IAGxBC,aAAsB;AACxB;;;;;;;;;;;;;;+BAjBkBC,sBAAO;QAAIC,UAAU;QAAMC,UAAU;;;QACvCT,MAAM;;;;;;QAEVQ,UAAU;QAAME,QAAQ;;;;;;QAGxBF,UAAU;QAAOG,SAAS;;;;;;QAG1BH,UAAU;QAAOG,SAAS;;;;;;QAG1BH,UAAU;QAAOG,SAAS;;;;;;QAG1BH,UAAU;QAAOG,SAAS"}
|
|
@@ -22,7 +22,7 @@ function _ts_metadata(k, v) {
|
|
|
22
22
|
class Floor {
|
|
23
23
|
id;
|
|
24
24
|
name;
|
|
25
|
-
|
|
25
|
+
order;
|
|
26
26
|
printers;
|
|
27
27
|
}
|
|
28
28
|
_ts_decorate([
|
|
@@ -34,11 +34,9 @@ _ts_decorate([
|
|
|
34
34
|
_ts_metadata("design:type", String)
|
|
35
35
|
], Floor.prototype, "name", void 0);
|
|
36
36
|
_ts_decorate([
|
|
37
|
-
(0, _typeorm.Column)(
|
|
38
|
-
unique: true
|
|
39
|
-
}),
|
|
37
|
+
(0, _typeorm.Column)(),
|
|
40
38
|
_ts_metadata("design:type", Number)
|
|
41
|
-
], Floor.prototype, "
|
|
39
|
+
], Floor.prototype, "order", void 0);
|
|
42
40
|
_ts_decorate([
|
|
43
41
|
(0, _typeorm.OneToMany)(()=>_floorpositionentity.FloorPosition, (gp)=>gp.floor, {
|
|
44
42
|
eager: true
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/entities/floor.entity.ts"],"names":["Floor","id","name","
|
|
1
|
+
{"version":3,"sources":["../../src/entities/floor.entity.ts"],"names":["Floor","id","name","order","printers","FloorPosition","gp","floor","eager"],"mappings":";;;;+BAIaA;;;eAAAA;;;yBAJ+D;qCAC9C;;;;;;;;;;AAGvB,MAAMA;IAEXC,GAAW;IAGXC,KAAa;IAGbC,MAAc;IAOdC,SAAoC;AACtC;;;;;;;;;;;;;;gCALUC,kCAAa,GAClBC,KAAOA,GAAGC,KAAK;QACdC,OAAO"}
|
package/dist/entities/index.js
CHANGED
|
@@ -12,24 +12,21 @@ _export(exports, {
|
|
|
12
12
|
get CameraStream () {
|
|
13
13
|
return _camerastreamentity.CameraStream;
|
|
14
14
|
},
|
|
15
|
-
get CustomGcode () {
|
|
16
|
-
return _customgcodeentity.CustomGcode;
|
|
17
|
-
},
|
|
18
15
|
get Floor () {
|
|
19
16
|
return _floorentity.Floor;
|
|
20
17
|
},
|
|
21
18
|
get FloorPosition () {
|
|
22
19
|
return _floorpositionentity.FloorPosition;
|
|
23
20
|
},
|
|
24
|
-
get
|
|
25
|
-
return
|
|
26
|
-
},
|
|
27
|
-
get PrintCompletion () {
|
|
28
|
-
return _printcompletionentity.PrintCompletion;
|
|
21
|
+
get PrintJob () {
|
|
22
|
+
return _printjobentity.PrintJob;
|
|
29
23
|
},
|
|
30
24
|
get Printer () {
|
|
31
25
|
return _printerentity.Printer;
|
|
32
26
|
},
|
|
27
|
+
get PrinterTag () {
|
|
28
|
+
return _printertagentity.PrinterTag;
|
|
29
|
+
},
|
|
33
30
|
get RefreshToken () {
|
|
34
31
|
return _refreshtokenentity.RefreshToken;
|
|
35
32
|
},
|
|
@@ -39,20 +36,27 @@ _export(exports, {
|
|
|
39
36
|
get Settings () {
|
|
40
37
|
return _settingsentity.Settings;
|
|
41
38
|
},
|
|
39
|
+
get Tag () {
|
|
40
|
+
return _tagentity.Tag;
|
|
41
|
+
},
|
|
42
42
|
get User () {
|
|
43
43
|
return _userentity.User;
|
|
44
|
+
},
|
|
45
|
+
get UserRole () {
|
|
46
|
+
return _userroleentity.UserRole;
|
|
44
47
|
}
|
|
45
48
|
});
|
|
46
49
|
const _userentity = require("./user.entity");
|
|
47
|
-
const _permissionentity = require("./permission.entity");
|
|
48
50
|
const _camerastreamentity = require("./camera-stream.entity");
|
|
49
|
-
const _customgcodeentity = require("./custom-gcode.entity");
|
|
50
51
|
const _floorentity = require("./floor.entity");
|
|
51
52
|
const _floorpositionentity = require("./floor-position.entity");
|
|
52
53
|
const _printerentity = require("./printer.entity");
|
|
53
54
|
const _roleentity = require("./role.entity");
|
|
55
|
+
const _userroleentity = require("./user-role.entity");
|
|
54
56
|
const _settingsentity = require("./settings.entity");
|
|
55
|
-
const _printcompletionentity = require("./print-completion.entity");
|
|
56
57
|
const _refreshtokenentity = require("./refresh-token.entity");
|
|
58
|
+
const _printertagentity = require("./printer-tag.entity");
|
|
59
|
+
const _tagentity = require("./tag.entity");
|
|
60
|
+
const _printjobentity = require("./print-job.entity");
|
|
57
61
|
|
|
58
62
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/entities/index.ts"],"names":["CameraStream","
|
|
1
|
+
{"version":3,"sources":["../../src/entities/index.ts"],"names":["CameraStream","Floor","FloorPosition","PrintJob","Printer","PrinterTag","RefreshToken","Role","Settings","Tag","User","UserRole"],"mappings":";;;;;;;;;;;QACSA;eAAAA,gCAAY;;QACZC;eAAAA,kBAAK;;QACLC;eAAAA,kCAAa;;QAQbC;eAAAA,wBAAQ;;QAPRC;eAAAA,sBAAO;;QAKPC;eAAAA,4BAAU;;QADVC;eAAAA,gCAAY;;QAHZC;eAAAA,gBAAI;;QAEJC;eAAAA,wBAAQ;;QAGRC;eAAAA,cAAG;;QAVHC;eAAAA,gBAAI;;QAMJC;eAAAA,wBAAQ;;;4BANI;oCACQ;6BACP;qCACQ;+BACN;4BACH;gCACI;gCACA;oCACI;kCACF;2BACP;gCACK"}
|
|
@@ -0,0 +1,195 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "PrintJob", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return PrintJob;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _typeorm = require("typeorm");
|
|
12
|
+
const _printerentity = require("./printer.entity");
|
|
13
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
14
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
15
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
16
|
+
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;
|
|
17
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
18
|
+
}
|
|
19
|
+
function _ts_metadata(k, v) {
|
|
20
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
21
|
+
}
|
|
22
|
+
class PrintJob {
|
|
23
|
+
id;
|
|
24
|
+
printer;
|
|
25
|
+
printerId;
|
|
26
|
+
printerName;
|
|
27
|
+
fileName;
|
|
28
|
+
fileStorageId;
|
|
29
|
+
fileFormat;
|
|
30
|
+
fileSize;
|
|
31
|
+
fileHash;
|
|
32
|
+
createdAt;
|
|
33
|
+
updatedAt;
|
|
34
|
+
analyzedAt;
|
|
35
|
+
startedAt;
|
|
36
|
+
endedAt;
|
|
37
|
+
status;
|
|
38
|
+
analysisState;
|
|
39
|
+
statusReason;
|
|
40
|
+
progress;
|
|
41
|
+
metadata;
|
|
42
|
+
statistics;
|
|
43
|
+
queuePosition;
|
|
44
|
+
queueGroup;
|
|
45
|
+
}
|
|
46
|
+
_ts_decorate([
|
|
47
|
+
(0, _typeorm.PrimaryGeneratedColumn)(),
|
|
48
|
+
_ts_metadata("design:type", Number)
|
|
49
|
+
], PrintJob.prototype, "id", void 0);
|
|
50
|
+
_ts_decorate([
|
|
51
|
+
(0, _typeorm.ManyToOne)(()=>_printerentity.Printer, {
|
|
52
|
+
onDelete: "SET NULL"
|
|
53
|
+
}),
|
|
54
|
+
_ts_metadata("design:type", typeof _printerentity.Printer === "undefined" ? Object : _printerentity.Printer)
|
|
55
|
+
], PrintJob.prototype, "printer", void 0);
|
|
56
|
+
_ts_decorate([
|
|
57
|
+
(0, _typeorm.Column)({
|
|
58
|
+
nullable: true
|
|
59
|
+
}),
|
|
60
|
+
_ts_metadata("design:type", Object)
|
|
61
|
+
], PrintJob.prototype, "printerId", void 0);
|
|
62
|
+
_ts_decorate([
|
|
63
|
+
(0, _typeorm.Column)({
|
|
64
|
+
type: "varchar",
|
|
65
|
+
nullable: true
|
|
66
|
+
}),
|
|
67
|
+
_ts_metadata("design:type", Object)
|
|
68
|
+
], PrintJob.prototype, "printerName", void 0);
|
|
69
|
+
_ts_decorate([
|
|
70
|
+
(0, _typeorm.Column)({
|
|
71
|
+
type: "varchar",
|
|
72
|
+
nullable: false
|
|
73
|
+
}),
|
|
74
|
+
_ts_metadata("design:type", String)
|
|
75
|
+
], PrintJob.prototype, "fileName", void 0);
|
|
76
|
+
_ts_decorate([
|
|
77
|
+
(0, _typeorm.Column)({
|
|
78
|
+
type: "varchar",
|
|
79
|
+
nullable: true
|
|
80
|
+
}),
|
|
81
|
+
_ts_metadata("design:type", Object)
|
|
82
|
+
], PrintJob.prototype, "fileStorageId", void 0);
|
|
83
|
+
_ts_decorate([
|
|
84
|
+
(0, _typeorm.Column)({
|
|
85
|
+
type: "varchar",
|
|
86
|
+
nullable: true
|
|
87
|
+
}),
|
|
88
|
+
_ts_metadata("design:type", Object)
|
|
89
|
+
], PrintJob.prototype, "fileFormat", void 0);
|
|
90
|
+
_ts_decorate([
|
|
91
|
+
(0, _typeorm.Column)({
|
|
92
|
+
type: "int",
|
|
93
|
+
nullable: true
|
|
94
|
+
}),
|
|
95
|
+
_ts_metadata("design:type", Object)
|
|
96
|
+
], PrintJob.prototype, "fileSize", void 0);
|
|
97
|
+
_ts_decorate([
|
|
98
|
+
(0, _typeorm.Column)({
|
|
99
|
+
type: "varchar",
|
|
100
|
+
nullable: true
|
|
101
|
+
}),
|
|
102
|
+
_ts_metadata("design:type", Object)
|
|
103
|
+
], PrintJob.prototype, "fileHash", void 0);
|
|
104
|
+
_ts_decorate([
|
|
105
|
+
(0, _typeorm.CreateDateColumn)(),
|
|
106
|
+
_ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
|
|
107
|
+
], PrintJob.prototype, "createdAt", void 0);
|
|
108
|
+
_ts_decorate([
|
|
109
|
+
(0, _typeorm.UpdateDateColumn)(),
|
|
110
|
+
_ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
|
|
111
|
+
], PrintJob.prototype, "updatedAt", void 0);
|
|
112
|
+
_ts_decorate([
|
|
113
|
+
(0, _typeorm.Column)({
|
|
114
|
+
type: Date,
|
|
115
|
+
nullable: true
|
|
116
|
+
}),
|
|
117
|
+
_ts_metadata("design:type", Object)
|
|
118
|
+
], PrintJob.prototype, "analyzedAt", void 0);
|
|
119
|
+
_ts_decorate([
|
|
120
|
+
(0, _typeorm.Column)({
|
|
121
|
+
type: Date,
|
|
122
|
+
nullable: true
|
|
123
|
+
}),
|
|
124
|
+
_ts_metadata("design:type", Object)
|
|
125
|
+
], PrintJob.prototype, "startedAt", void 0);
|
|
126
|
+
_ts_decorate([
|
|
127
|
+
(0, _typeorm.Column)({
|
|
128
|
+
type: Date,
|
|
129
|
+
nullable: true
|
|
130
|
+
}),
|
|
131
|
+
_ts_metadata("design:type", Object)
|
|
132
|
+
], PrintJob.prototype, "endedAt", void 0);
|
|
133
|
+
_ts_decorate([
|
|
134
|
+
(0, _typeorm.Column)({
|
|
135
|
+
type: "varchar",
|
|
136
|
+
nullable: false,
|
|
137
|
+
default: "PENDING"
|
|
138
|
+
}),
|
|
139
|
+
_ts_metadata("design:type", typeof PrintJobStatus === "undefined" ? Object : PrintJobStatus)
|
|
140
|
+
], PrintJob.prototype, "status", void 0);
|
|
141
|
+
_ts_decorate([
|
|
142
|
+
(0, _typeorm.Column)({
|
|
143
|
+
type: "varchar",
|
|
144
|
+
nullable: false,
|
|
145
|
+
default: "NOT_ANALYZED"
|
|
146
|
+
}),
|
|
147
|
+
_ts_metadata("design:type", typeof AnalysisState === "undefined" ? Object : AnalysisState)
|
|
148
|
+
], PrintJob.prototype, "analysisState", void 0);
|
|
149
|
+
_ts_decorate([
|
|
150
|
+
(0, _typeorm.Column)({
|
|
151
|
+
type: "varchar",
|
|
152
|
+
nullable: true
|
|
153
|
+
}),
|
|
154
|
+
_ts_metadata("design:type", Object)
|
|
155
|
+
], PrintJob.prototype, "statusReason", void 0);
|
|
156
|
+
_ts_decorate([
|
|
157
|
+
(0, _typeorm.Column)({
|
|
158
|
+
type: "float",
|
|
159
|
+
nullable: true
|
|
160
|
+
}),
|
|
161
|
+
_ts_metadata("design:type", Object)
|
|
162
|
+
], PrintJob.prototype, "progress", void 0);
|
|
163
|
+
_ts_decorate([
|
|
164
|
+
(0, _typeorm.Column)({
|
|
165
|
+
type: "json",
|
|
166
|
+
nullable: true
|
|
167
|
+
}),
|
|
168
|
+
_ts_metadata("design:type", Object)
|
|
169
|
+
], PrintJob.prototype, "metadata", void 0);
|
|
170
|
+
_ts_decorate([
|
|
171
|
+
(0, _typeorm.Column)({
|
|
172
|
+
type: "json",
|
|
173
|
+
nullable: true
|
|
174
|
+
}),
|
|
175
|
+
_ts_metadata("design:type", Object)
|
|
176
|
+
], PrintJob.prototype, "statistics", void 0);
|
|
177
|
+
_ts_decorate([
|
|
178
|
+
(0, _typeorm.Column)({
|
|
179
|
+
type: "int",
|
|
180
|
+
nullable: true
|
|
181
|
+
}),
|
|
182
|
+
_ts_metadata("design:type", Object)
|
|
183
|
+
], PrintJob.prototype, "queuePosition", void 0);
|
|
184
|
+
_ts_decorate([
|
|
185
|
+
(0, _typeorm.Column)({
|
|
186
|
+
type: "varchar",
|
|
187
|
+
nullable: true
|
|
188
|
+
}),
|
|
189
|
+
_ts_metadata("design:type", Object)
|
|
190
|
+
], PrintJob.prototype, "queueGroup", void 0);
|
|
191
|
+
PrintJob = _ts_decorate([
|
|
192
|
+
(0, _typeorm.Entity)()
|
|
193
|
+
], PrintJob);
|
|
194
|
+
|
|
195
|
+
//# sourceMappingURL=print-job.entity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/entities/print-job.entity.ts"],"names":["PrintJob","id","printer","printerId","printerName","fileName","fileStorageId","fileFormat","fileSize","fileHash","createdAt","updatedAt","analyzedAt","startedAt","endedAt","status","analysisState","statusReason","progress","metadata","statistics","queuePosition","queueGroup","Printer","onDelete","nullable","type","Date","default"],"mappings":";;;;+BAwJaA;;;eAAAA;;;yBAxJyF;+BAC9E;;;;;;;;;;AAuJjB,MAAMA;IAEXC,GAAW;IAGXC,QAAkB;IAGlBC,UAAyB;IAGzBC,YAA2B;IAI3BC,SAAiB;IAGjBC,cAA6B;IAG7BC,WAAkC;IAGlCC,SAAwB;IAGxBC,SAAwB;IAIxBC,UAAgB;IAGhBC,UAAgB;IAGhBC,WAAwB;IAGxBC,UAAuB;IAGvBC,QAAqB;IAIrBC,OAAuB;IAGvBC,cAA6B;IAG7BC,aAA4B;IAI5BC,SAAwB;IAIxBC,SAAkC;IAIlCC,WAAmC;IAInCC,cAA6B;IAG7BC,WAA0B;AAC5B;;;;;;gCArEmBC,sBAAO;QAAIC,UAAU;;;;;;QAG5BC,UAAU;;;;;;QAGVC,MAAM;QAAWD,UAAU;;;;;;QAI3BC,MAAM;QAAWD,UAAU;;;;;;QAG3BC,MAAM;QAAWD,UAAU;;;;;;QAG3BC,MAAM;QAAWD,UAAU;;;;;;QAG3BC,MAAM;QAAOD,UAAU;;;;;;QAGvBC,MAAM;QAAWD,UAAU;;;;;;;;;;;;;;QAU3BC,MAAMC;QAAMF,UAAU;;;;;;QAGtBC,MAAMC;QAAMF,UAAU;;;;;;QAGtBC,MAAMC;QAAMF,UAAU;;;;;;QAItBC,MAAM;QAAWD,UAAU;QAAOG,SAAS;;;;;;QAG3CF,MAAM;QAAWD,UAAU;QAAOG,SAAS;;;;;;QAG3CF,MAAM;QAAWD,UAAU;;;;;;QAI3BC,MAAM;QAASD,UAAU;;;;;;QAIzBC,MAAM;QAAQD,UAAU;;;;;;QAIxBC,MAAM;QAAQD,UAAU;;;;;;QAIxBC,MAAM;QAAOD,UAAU;;;;;;QAGvBC,MAAM;QAAWD,UAAU"}
|
|
@@ -2,15 +2,15 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
Object.defineProperty(exports, "
|
|
5
|
+
Object.defineProperty(exports, "PrinterTag", {
|
|
6
6
|
enumerable: true,
|
|
7
7
|
get: function() {
|
|
8
|
-
return
|
|
8
|
+
return PrinterTag;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
const _typeorm = require("typeorm");
|
|
12
12
|
const _printerentity = require("./printer.entity");
|
|
13
|
-
const
|
|
13
|
+
const _tagentity = require("./tag.entity");
|
|
14
14
|
function _ts_decorate(decorators, target, key, desc) {
|
|
15
15
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
16
16
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -20,17 +20,17 @@ function _ts_decorate(decorators, target, key, desc) {
|
|
|
20
20
|
function _ts_metadata(k, v) {
|
|
21
21
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
22
22
|
}
|
|
23
|
-
class
|
|
23
|
+
class PrinterTag {
|
|
24
24
|
id;
|
|
25
25
|
printer;
|
|
26
26
|
printerId;
|
|
27
|
-
|
|
28
|
-
|
|
27
|
+
tag;
|
|
28
|
+
tagId;
|
|
29
29
|
}
|
|
30
30
|
_ts_decorate([
|
|
31
31
|
(0, _typeorm.PrimaryGeneratedColumn)(),
|
|
32
32
|
_ts_metadata("design:type", Number)
|
|
33
|
-
],
|
|
33
|
+
], PrinterTag.prototype, "id", void 0);
|
|
34
34
|
_ts_decorate([
|
|
35
35
|
(0, _typeorm.ManyToOne)(()=>_printerentity.Printer, {
|
|
36
36
|
onDelete: "CASCADE",
|
|
@@ -40,31 +40,31 @@ _ts_decorate([
|
|
|
40
40
|
name: "printerId"
|
|
41
41
|
}),
|
|
42
42
|
_ts_metadata("design:type", typeof _typeorm.Relation === "undefined" ? Object : _typeorm.Relation)
|
|
43
|
-
],
|
|
43
|
+
], PrinterTag.prototype, "printer", void 0);
|
|
44
44
|
_ts_decorate([
|
|
45
45
|
(0, _typeorm.Column)(),
|
|
46
46
|
_ts_metadata("design:type", Number)
|
|
47
|
-
],
|
|
47
|
+
], PrinterTag.prototype, "printerId", void 0);
|
|
48
48
|
_ts_decorate([
|
|
49
|
-
(0, _typeorm.ManyToOne)(()=>
|
|
49
|
+
(0, _typeorm.ManyToOne)(()=>_tagentity.Tag, {
|
|
50
50
|
onDelete: "CASCADE",
|
|
51
51
|
nullable: false
|
|
52
52
|
}),
|
|
53
53
|
(0, _typeorm.JoinColumn)({
|
|
54
|
-
name: "
|
|
54
|
+
name: "tagId"
|
|
55
55
|
}),
|
|
56
56
|
_ts_metadata("design:type", typeof _typeorm.Relation === "undefined" ? Object : _typeorm.Relation)
|
|
57
|
-
],
|
|
57
|
+
], PrinterTag.prototype, "tag", void 0);
|
|
58
58
|
_ts_decorate([
|
|
59
59
|
(0, _typeorm.Column)(),
|
|
60
60
|
_ts_metadata("design:type", Number)
|
|
61
|
-
],
|
|
62
|
-
|
|
61
|
+
], PrinterTag.prototype, "tagId", void 0);
|
|
62
|
+
PrinterTag = _ts_decorate([
|
|
63
63
|
(0, _typeorm.Entity)(),
|
|
64
64
|
(0, _typeorm.Unique)([
|
|
65
65
|
"printerId",
|
|
66
|
-
"
|
|
66
|
+
"tagId"
|
|
67
67
|
])
|
|
68
|
-
],
|
|
68
|
+
], PrinterTag);
|
|
69
69
|
|
|
70
|
-
//# sourceMappingURL=printer-
|
|
70
|
+
//# sourceMappingURL=printer-tag.entity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/entities/printer-tag.entity.ts"],"names":["PrinterTag","id","printer","printerId","tag","tagId","Printer","onDelete","nullable","name","Tag"],"mappings":";;;;+BAMaA;;;eAAAA;;;yBANmF;+BACxE;2BACJ;;;;;;;;;;AAIb,MAAMA;IAEXC,GAAW;IAIXC,QAA2B;IAG3BC,UAAkB;IAIlBC,IAAmB;IAGnBC,MAAc;AAChB;;;;;;gCAbmBC,sBAAO;QAAIC,UAAU;QAAWC,UAAU;;;QAC7CC,MAAM;;;;;;;;;gCAMHC,cAAG;QAAIH,UAAU;QAAWC,UAAU;;;QACzCC,MAAM;;;;;;;;;;;QAbb;QAAa"}
|
|
@@ -10,8 +10,7 @@ Object.defineProperty(exports, "Printer", {
|
|
|
10
10
|
});
|
|
11
11
|
const _classvalidator = require("class-validator");
|
|
12
12
|
const _typeorm = require("typeorm");
|
|
13
|
-
const
|
|
14
|
-
const _printergroupentity = require("./printer-group.entity");
|
|
13
|
+
const _printertagentity = require("./printer-tag.entity");
|
|
15
14
|
const _printerapiinterface = require("../services/printer-api.interface");
|
|
16
15
|
function _ts_decorate(decorators, target, key, desc) {
|
|
17
16
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
@@ -33,8 +32,7 @@ class Printer {
|
|
|
33
32
|
enabled;
|
|
34
33
|
disabledReason;
|
|
35
34
|
assignee;
|
|
36
|
-
|
|
37
|
-
printerGroups;
|
|
35
|
+
printerTags;
|
|
38
36
|
dateAdded;
|
|
39
37
|
feedRate;
|
|
40
38
|
flowRate;
|
|
@@ -102,13 +100,9 @@ _ts_decorate([
|
|
|
102
100
|
_ts_metadata("design:type", String)
|
|
103
101
|
], Printer.prototype, "assignee", void 0);
|
|
104
102
|
_ts_decorate([
|
|
105
|
-
(0, _typeorm.OneToMany)(()=>
|
|
103
|
+
(0, _typeorm.OneToMany)(()=>_printertagentity.PrinterTag, (pc)=>pc.printer),
|
|
106
104
|
_ts_metadata("design:type", Array)
|
|
107
|
-
], Printer.prototype, "
|
|
108
|
-
_ts_decorate([
|
|
109
|
-
(0, _typeorm.OneToMany)(()=>_printergroupentity.PrinterGroup, (pc)=>pc.printer),
|
|
110
|
-
_ts_metadata("design:type", Array)
|
|
111
|
-
], Printer.prototype, "printerGroups", void 0);
|
|
105
|
+
], Printer.prototype, "printerTags", void 0);
|
|
112
106
|
_ts_decorate([
|
|
113
107
|
(0, _typeorm.CreateDateColumn)({
|
|
114
108
|
type: "int"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/entities/printer.entity.ts"],"names":["Printer","id","name","printerURL","printerType","apiKey","username","password","enabled","disabledReason","assignee","
|
|
1
|
+
{"version":3,"sources":["../../src/entities/printer.entity.ts"],"names":["Printer","id","name","printerURL","printerType","apiKey","username","password","enabled","disabledReason","assignee","printerTags","dateAdded","feedRate","flowRate","default","OctoprintType","nullable","PrinterTag","pc","printer","type"],"mappings":";;;;+BAMaA;;;eAAAA;;;gCANkB;yBAC+D;kCACnE;qCACG;;;;;;;;;;AAGvB,MAAMA;IAEXC,GAAW;IAGXC,KAAa;IAGbC,WAAmB;IAGnBC,YAAoB;IAIpBC,OAAe;IAIfC,SAAiB;IAIjBC,SAAiB;IAMjBC,QAAiB;IAKjBC,eAAwB;IAKxBC,SAAkB;IAMlBC,YAAoC;IAGpCC,UAAkB;IAGlBC,SAAkB;IAGlBC,SAAkB;AACpB;;;;;;;;;;;;;;;QA7CYC,SAASC,kCAAa;QAAEC,UAAU;;;;;;QAGlCF,SAAS;QAAIE,UAAU;;;;;;;QAIvBF,SAAS;QAAIE,UAAU;;;;;;;QAIvBF,SAAS;QAAIE,UAAU;;;;;;;QAK/BA,UAAU;QACVF,SAAS;;;;;;QAKTE,UAAU;;;;;;QAKVA,UAAU;;;;;gCAKJC,4BAAU,GACfC,KAAOA,GAAGC,OAAO;;;;;QAIAC,MAAM;;;;;;QAGhBJ,UAAU;;;;;;QAGVA,UAAU"}
|
|
@@ -19,13 +19,12 @@ function _ts_decorate(decorators, target, key, desc) {
|
|
|
19
19
|
function _ts_metadata(k, v) {
|
|
20
20
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
21
21
|
}
|
|
22
|
-
var _key, _key1, _key2, _key3, _key4
|
|
22
|
+
var _key, _key1, _key2, _key3, _key4;
|
|
23
23
|
_key = _serversettingsconstants.serverSettingsKey;
|
|
24
24
|
_key1 = _serversettingsconstants.credentialSettingsKey;
|
|
25
25
|
_key2 = _serversettingsconstants.wizardSettingKey;
|
|
26
|
-
_key3 = _serversettingsconstants.
|
|
27
|
-
_key4 = _serversettingsconstants.
|
|
28
|
-
_key5 = _serversettingsconstants.timeoutSettingKey;
|
|
26
|
+
_key3 = _serversettingsconstants.frontendSettingKey;
|
|
27
|
+
_key4 = _serversettingsconstants.timeoutSettingKey;
|
|
29
28
|
class Settings {
|
|
30
29
|
id;
|
|
31
30
|
[_key];
|
|
@@ -33,7 +32,6 @@ class Settings {
|
|
|
33
32
|
[_key2];
|
|
34
33
|
[_key3];
|
|
35
34
|
[_key4];
|
|
36
|
-
[_key5];
|
|
37
35
|
}
|
|
38
36
|
_ts_decorate([
|
|
39
37
|
(0, _typeorm.PrimaryGeneratedColumn)(),
|
|
@@ -74,13 +72,6 @@ _ts_decorate([
|
|
|
74
72
|
}),
|
|
75
73
|
_ts_metadata("design:type", Object)
|
|
76
74
|
], Settings.prototype, _key4, void 0);
|
|
77
|
-
_ts_decorate([
|
|
78
|
-
(0, _typeorm.Column)({
|
|
79
|
-
type: "simple-json",
|
|
80
|
-
nullable: false
|
|
81
|
-
}),
|
|
82
|
-
_ts_metadata("design:type", Object)
|
|
83
|
-
], Settings.prototype, _key5, void 0);
|
|
84
75
|
Settings = _ts_decorate([
|
|
85
76
|
(0, _typeorm.Entity)()
|
|
86
77
|
], Settings);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/entities/settings.entity.ts"],"names":["Settings","serverSettingsKey","credentialSettingsKey","wizardSettingKey","
|
|
1
|
+
{"version":3,"sources":["../../src/entities/settings.entity.ts"],"names":["Settings","serverSettingsKey","credentialSettingsKey","wizardSettingKey","frontendSettingKey","timeoutSettingKey","id","type","nullable"],"mappings":";;;;+BAUaA;;;eAAAA;;;yCAJN;yBACgD;;;;;;;;;;IAQrD,MAUA,OAQA,OAOA,OAQA;AAjCA,OAACC,0CAAiB;AAUlB,QAACC,8CAAqB;AAQtB,QAACC,yCAAgB;AAOjB,QAACC,2CAAkB;AAQnB,QAACC,0CAAiB;AAtCb,MAAML;IAEXM,GAAW;IAGX,CAAA,KAAmB,CAOjB;IAGF,CAAA,MAAuB,CAKrB;IAGF,CAAA,MAAkB,CAIhB;IAGF,CAAA,MAAoB,CAKlB;IAGF,CAAA,MAAmB,CAGjB;AACJ;;;;;;;QAtCYC,MAAM;QAAeC,UAAU;;;uBACzC;;;QASUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAOUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAOUD,MAAM;QAAeC,UAAU;;;uBACzC"}
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
Object.defineProperty(exports, "
|
|
5
|
+
Object.defineProperty(exports, "Tag", {
|
|
6
6
|
enumerable: true,
|
|
7
7
|
get: function() {
|
|
8
|
-
return
|
|
8
|
+
return Tag;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
const _typeorm = require("typeorm");
|
|
@@ -19,21 +19,28 @@ function _ts_decorate(decorators, target, key, desc) {
|
|
|
19
19
|
function _ts_metadata(k, v) {
|
|
20
20
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
21
21
|
}
|
|
22
|
-
class
|
|
22
|
+
class Tag {
|
|
23
23
|
id;
|
|
24
24
|
name;
|
|
25
|
+
color;
|
|
25
26
|
}
|
|
26
27
|
_ts_decorate([
|
|
27
28
|
(0, _typeorm.PrimaryGeneratedColumn)(),
|
|
28
29
|
_ts_metadata("design:type", Number)
|
|
29
|
-
],
|
|
30
|
+
], Tag.prototype, "id", void 0);
|
|
30
31
|
_ts_decorate([
|
|
31
32
|
(0, _typeorm.Column)(),
|
|
32
33
|
(0, _classvalidator.Length)(1),
|
|
33
34
|
_ts_metadata("design:type", String)
|
|
34
|
-
],
|
|
35
|
-
|
|
35
|
+
], Tag.prototype, "name", void 0);
|
|
36
|
+
_ts_decorate([
|
|
37
|
+
(0, _typeorm.Column)({
|
|
38
|
+
nullable: true
|
|
39
|
+
}),
|
|
40
|
+
_ts_metadata("design:type", String)
|
|
41
|
+
], Tag.prototype, "color", void 0);
|
|
42
|
+
Tag = _ts_decorate([
|
|
36
43
|
(0, _typeorm.Entity)()
|
|
37
|
-
],
|
|
44
|
+
], Tag);
|
|
38
45
|
|
|
39
|
-
//# sourceMappingURL=
|
|
46
|
+
//# sourceMappingURL=tag.entity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/entities/tag.entity.ts"],"names":["Tag","id","name","color","nullable"],"mappings":";;;;+BAIaA;;;eAAAA;;;yBAJ0C;gCAChC;;;;;;;;;;AAGhB,MAAMA;IAEXC,GAAW;IAIXC,KAAa;IAGbC,MAAc;AAChB;;;;;;;;;;;;QAFYC,UAAU"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/handlers/logging/file-logging.transport.ts"],"names":["createFileLoggingTransport","options","enabled","date","DateTime","now","toISODate","logFilePath","join","superRootPath","AppConstants","defaultLogsFolder","logAppName","winston","transports","File","level","isTest","filename","maxsize","maxFiles"],"mappings":";;;;+BAWgBA;;;eAAAA;;;uBAXS;sBACJ;yBACS;iCACD;gEACT;;;;;;AAOb,SAASA,2BAA2BC,OAA0B;IACnE,IAAI,CAACA,QAAQC,OAAO,EAAE;QACpB;IACF;IAEA,MAAMC,OAAOC,eAAQ,CAACC,GAAG,GAAGC,SAAS;IACrC,MAAMC,cAAcC,IAAAA,UAAI,
|
|
1
|
+
{"version":3,"sources":["../../../src/handlers/logging/file-logging.transport.ts"],"names":["createFileLoggingTransport","options","enabled","date","DateTime","now","toISODate","logFilePath","join","superRootPath","AppConstants","defaultLogsFolder","logAppName","winston","transports","File","level","isTest","filename","maxsize","maxFiles"],"mappings":";;;;+BAWgBA;;;eAAAA;;;uBAXS;sBACJ;yBACS;iCACD;gEACT;;;;;;AAOb,SAASA,2BAA2BC,OAA0B;IACnE,IAAI,CAACA,QAAQC,OAAO,EAAE;QACpB;IACF;IAEA,MAAMC,OAAOC,eAAQ,CAACC,GAAG,GAAGC,SAAS;IACrC,MAAMC,cAAcC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIC,6BAAY,CAACC,iBAAiB,EAAE,GAAGD,6BAAY,CAACE,UAAU,CAAC,CAAC,EAAET,KAAK,IAAI,CAAC;IAElH,OAAO,IAAIU,gBAAO,CAACC,UAAU,CAACC,IAAI,CAAC;QACjCC,OAAOf,QAAQgB,MAAM,GAAG,SAAS;QACjCC,UAAUX;QACVY,SAAS;QACTC,UAAU;IACZ;AACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/handlers/logging/static.logger.ts"],"names":["createStaticLogger","getStaticLogger","logContextClassProperty","staticLogger","levelMap","error","warn","info","debug","http","verbose","silly","Error","config","isProd","process","env","AppConstants","NODE_ENV_KEY","defaultProductionEnv","isTest","defaultTestEnv","effectiveLogLevel","lokiTransport","createLokiLoggingTransport","logLevel","extraWinstonTransports","push","fileLoggerTransport","createFileLoggingTransport","enabled","enableFileLogs","winston","createLogger","transports","Console","level","format","combine","isDevelopmentEnvironment","ENABLE_COLORED_LOGS_KEY","rawLevel","colorize","colors","message","all","printf","now","Date","timestamp","toISOString","split","toTimeString","getMilliseconds","toString","padStart","levelAbbr","substring","toUpperCase","gray","reset","numberRegex","coloredMessage","replace","match","serviceName","logEntry","meta","metaString","JSON","stringify","coloredMeta","pascalCaseMeta","Object","entries","reduce","acc","key","value","pascalKey","charAt","slice"],"mappings":";;;;;;;;;;;QAiCgBA;eAAAA;;QARAC;eAAAA;;QAFHC;eAAAA;;;gEAvBO;oEACA;iCACS;sCACc;sCACA;0BACF;;;;;;AAEzC,IAAIC,eAAsC;AAM1C,MAAMC,WAAmC;IACvCC,OAAO;IACPC,MAAM;IACNC,MAAM;IACNC,OAAO;IACPC,MAAM;IACNC,SAAS;IACTC,OAAO;AACT;AAEO,MAAMT,0BAA0B;AAEhC,SAASD;IACd,IAAI,CAACE,cAAc;QACjB,MAAM,IAAIS,MAAM;IAClB;IAEA,OAAOT;AACT;AAEO,SAASH,mBAAmBa,MAA0B;IAC3D,IAAIV,cAAc;QAChB;IACF;IAEA,MAAMW,SAASC,oBAAO,CAACC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC,KAAKD,6BAAY,CAACE,oBAAoB;IAC3F,MAAMC,SAASL,oBAAO,CAACC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC,KAAKD,6BAAY,CAACI,cAAc;IAErF,MAAMC,oBAAoBR,UAAUM,SAAS,SAAS;IAEtD,MAAMG,gBAAgBC,IAAAA,gDAA0B,EAAC;QAC/CC,UAAUH;IACZ;IAEA,MAAMI,yBAA8C,EAAE;IACtD,IAAIH,eAAe;QACjBG,uBAAuBC,IAAI,CAACJ;IAC9B;IAEA,MAAMK,sBAAsBC,IAAAA,gDAA0B,EAAC;QACrDC,SAASjB,OAAOkB,cAAc;QAC9BX;IACF;IACA,IAAIQ,qBAAqB;QACvBF,uBAAuBC,IAAI,CAACC;IAC9B;IAEAzB,eAAe6B,gBAAO,CAACC,YAAY,CAAC;QAClCC,YAAY;eACPR;YAEH,IAAIM,gBAAO,CAACE,UAAU,CAACC,OAAO,CAAC;gBAC7BC,OAAOd;gBACPe,QAAQL,gBAAO,CAACK,MAAM,CAACC,OAAO,
|
|
1
|
+
{"version":3,"sources":["../../../src/handlers/logging/static.logger.ts"],"names":["createStaticLogger","getStaticLogger","logContextClassProperty","staticLogger","levelMap","error","warn","info","debug","http","verbose","silly","Error","config","isProd","process","env","AppConstants","NODE_ENV_KEY","defaultProductionEnv","isTest","defaultTestEnv","effectiveLogLevel","lokiTransport","createLokiLoggingTransport","logLevel","extraWinstonTransports","push","fileLoggerTransport","createFileLoggingTransport","enabled","enableFileLogs","winston","createLogger","transports","Console","level","format","combine","isDevelopmentEnvironment","ENABLE_COLORED_LOGS_KEY","rawLevel","colorize","colors","message","all","printf","now","Date","timestamp","toISOString","split","toTimeString","getMilliseconds","toString","padStart","levelAbbr","substring","toUpperCase","gray","reset","numberRegex","coloredMessage","replace","match","serviceName","logEntry","meta","metaString","JSON","stringify","coloredMeta","pascalCaseMeta","Object","entries","reduce","acc","key","value","pascalKey","charAt","slice"],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -8,11 +8,11 @@ const _servercore = require("./server.core");
|
|
|
8
8
|
const _containertokens = require("./container.tokens");
|
|
9
9
|
const _dotenv = require("dotenv");
|
|
10
10
|
const _logger = require("./handlers/logger");
|
|
11
|
-
const
|
|
11
|
+
const _nodepath = require("node:path");
|
|
12
12
|
const _fsutils = require("./utils/fs.utils");
|
|
13
13
|
const _staticlogger = require("./handlers/logging/static.logger");
|
|
14
14
|
(0, _dotenv.config)({
|
|
15
|
-
path: (0,
|
|
15
|
+
path: (0, _nodepath.join)((0, _fsutils.superRootPath)(), "./.env")
|
|
16
16
|
});
|
|
17
17
|
(0, _staticlogger.createStaticLogger)({
|
|
18
18
|
enableFileLogs: true
|
|
@@ -20,6 +20,12 @@ const _staticlogger = require("./handlers/logging/static.logger");
|
|
|
20
20
|
const logger = new _logger.LoggerService("FDM-Environment");
|
|
21
21
|
logger.log("✓ Parsed environment with (optional) .env file, created static logger");
|
|
22
22
|
(0, _serverenv.setupEnvConfig)();
|
|
23
|
+
process.on("uncaughtException", (err)=>{
|
|
24
|
+
logger.error("Uncaught exception", err);
|
|
25
|
+
});
|
|
26
|
+
process.on("unhandledRejection", (reason)=>{
|
|
27
|
+
logger.error("Unhandled promise rejection", reason);
|
|
28
|
+
});
|
|
23
29
|
(0, _servercore.setupServer)().then(({ httpServer, container })=>{
|
|
24
30
|
container.resolve(_containertokens.DITokens.serverHost).boot(httpServer).catch(async (e)=>{
|
|
25
31
|
console.error("Server has crashed unintentionally - please report this", e);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.ts"],"names":["config","path","join","superRootPath","createStaticLogger","enableFileLogs","logger","Logger","log","setupEnvConfig","setupServer","then","httpServer","container","resolve","DITokens","serverHost","boot","catch","e","console","
|
|
1
|
+
{"version":3,"sources":["../src/index.ts"],"names":["config","path","join","superRootPath","createStaticLogger","enableFileLogs","logger","Logger","log","setupEnvConfig","process","on","err","error","reason","setupServer","then","httpServer","container","resolve","DITokens","serverHost","boot","catch","e","console","captureException","flush","exit"],"mappings":";;;;sBAAwC;2BACT;4BACH;iCACH;wBAEF;wBACiB;0BACnB;yBACS;8BACK;AAEnCA,IAAAA,cAAM,EAAC;IAAEC,MAAMC,IAAAA,cAAI,EAACC,IAAAA,sBAAa,KAAI;AAAU;AAC/CC,IAAAA,gCAAkB,EAAC;IAAEC,gBAAgB;AAAK;AAE1C,MAAMC,SAAS,IAAIC,qBAAM,CAAC;AAC1BD,OAAOE,GAAG,CAAC;AAEXC,IAAAA,yBAAc;AAEdC,QAAQC,EAAE,CAAC,qBAAqB,CAACC;IAC/BN,OAAOO,KAAK,CAAC,sBAAsBD;AACrC;AAEAF,QAAQC,EAAE,CAAC,sBAAsB,CAACG;IAChCR,OAAOO,KAAK,CAAC,+BAA+BC;AAC9C;AAEAC,IAAAA,uBAAW,IAAGC,IAAI,CAAC,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE;IAC3CA,UACGC,OAAO,CAAaC,yBAAQ,CAACC,UAAU,EACvCC,IAAI,CAACL,YACLM,KAAK,CAAC,OAAOC;QACZC,QAAQZ,KAAK,CAAC,2DAA2DW;QAEzEE,IAAAA,sBAAgB,EAACF;QACjB,MAAMG,IAAAA,WAAK,EAAC;QACZjB,QAAQkB,IAAI,CAAC;IACf;AACJ"}
|
|
@@ -42,7 +42,7 @@ const authenticate = ()=>(0, _awilixexpress.inject)((authService, loggerFactory,
|
|
|
42
42
|
throw new _runtimeexceptions.AuthenticationError("Not authenticated", _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredAuthToken);
|
|
43
43
|
});
|
|
44
44
|
function permission(requiredPermission) {
|
|
45
|
-
return (0, _awilixexpress.inject)((permissionService, roleService)=>async (req,
|
|
45
|
+
return (0, _awilixexpress.inject)((permissionService, roleService)=>async (req, _res, next)=>{
|
|
46
46
|
const userRoles = req.roles;
|
|
47
47
|
if (!userRoles?.length) {
|
|
48
48
|
throw new _runtimeexceptions.AuthorizationError({
|
|
@@ -62,10 +62,10 @@ function permission(requiredPermission) {
|
|
|
62
62
|
next();
|
|
63
63
|
});
|
|
64
64
|
}
|
|
65
|
-
const authorizeRoles = (
|
|
66
|
-
if (!req.roles?.length || !roleService.authorizeRoles(
|
|
65
|
+
const authorizeRoles = (requiredRoles, subset = true)=>(0, _awilixexpress.inject)((roleService)=>async (req, res, next)=>{
|
|
66
|
+
if (!req.roles?.length || !roleService.authorizeRoles(requiredRoles, req.roles, subset)) {
|
|
67
67
|
throw new _runtimeexceptions.AuthorizationError({
|
|
68
|
-
roles
|
|
68
|
+
roles: requiredRoles
|
|
69
69
|
});
|
|
70
70
|
}
|
|
71
71
|
next();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/middleware/authenticate.ts"],"names":["authenticate","authorizeRoles","permission","inject","authService","loggerFactory","settingsStore","req","res","next","logger","isLoginRequired","getLoginRequired","user","needsPasswordChange","AuthenticationError","AUTH_ERROR_REASON","PasswordChangeRequired","bearer","headers","authorization","replace","undefined","length","isJwtTokenBlacklisted","LoginRequired","isAuthenticated","log","originalUrl","InvalidOrExpiredAuthToken","requiredPermission","permissionService","roleService","userRoles","roles","AuthorizationError","permissions","assignedPermissions","getRolesPermissions","authorizePermission","subset"],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../src/middleware/authenticate.ts"],"names":["authenticate","authorizeRoles","permission","inject","authService","loggerFactory","settingsStore","req","res","next","logger","isLoginRequired","getLoginRequired","user","needsPasswordChange","AuthenticationError","AUTH_ERROR_REASON","PasswordChangeRequired","bearer","headers","authorization","replace","undefined","length","isJwtTokenBlacklisted","LoginRequired","isAuthenticated","log","originalUrl","InvalidOrExpiredAuthToken","requiredPermission","permissionService","roleService","_res","userRoles","roles","AuthorizationError","permissions","assignedPermissions","getRolesPermissions","authorizePermission","requiredRoles","subset"],"mappings":";;;;;;;;;;;QAUaA;eAAAA;;QAkDAC;eAAAA;;QAnBGC;eAAAA;;;+BAzCO;mCACiC;wCAEI;AAOrD,MAAMF,eAAe,IAC1BG,IAAAA,qBAAM,EACJ,CAACC,aAA0BC,eAA+BC,gBACxD,OAAOC,KAAcC,KAAeC;YAClC,MAAMC,SAASL,cAAc;YAE7B,MAAMM,kBAAkB,MAAML,cAAcM,gBAAgB;YAC5D,IAAI,CAACD,iBAAiB;gBACpB,OAAOF;YACT;YAGA,IAAIF,IAAIM,IAAI,EAAEC,qBAAqB;gBACjC,MAAM,IAAIC,sCAAmB,CAAC,4BAA4BC,yCAAiB,CAACC,sBAAsB;YACpG;YAGA,MAAMC,SAASX,IAAIY,OAAO,CAACC,aAAa,EAAEC,QAAQ,WAAW,OAAOC;YACpE,IAAI,CAAC,CAACJ,QAAQK,UAAUnB,YAAYoB,qBAAqB,CAACN,SAAS;gBACjE,MAAM,IAAIH,sCAAmB,CAAC,qBAAqBC,yCAAiB,CAACS,aAAa;YACpF;YAEA,IAAIlB,IAAImB,eAAe,IAAI;gBACzB,OAAOjB;YACT;YAEAC,OAAOiB,GAAG,CAAC,CAAC,6BAA6B,EAAEpB,IAAIqB,WAAW,EAAE;YAC5D,MAAM,IAAIb,sCAAmB,CAAC,qBAAqBC,yCAAiB,CAACa,yBAAyB;QAChG;AAGC,SAAS3B,WAAW4B,kBAAkC;IAC3D,OAAO3B,IAAAA,qBAAM,EACX,CAAC4B,mBAAuCC,cACtC,OAAOzB,KAAc0B,MAAgBxB;YACnC,MAAMyB,YAAY3B,IAAI4B,KAAK;YAC3B,IAAI,CAACD,WAAWX,QAAQ;gBACtB,MAAM,IAAIa,qCAAkB,CAAC;oBAAEC,aAAa;wBAACP;qBAAmB;gBAAC;YACnE;YAEA,MAAMQ,sBAAsBN,YAAYO,mBAAmB,CAACL;YAC5D,IAAI,CAACH,kBAAkBS,mBAAmB,CAACV,oBAAoBQ,sBAAsB;gBACnF,MAAM,IAAIF,qCAAkB,CAAC;oBAAEC,aAAa;wBAACP;qBAAmB;gBAAC;YACnE;YAEArB;QACF;AAEN;AAEO,MAAMR,iBAAiB,CAACwC,eAA2BC,SAAS,IAAI,GACrEvC,IAAAA,qBAAM,EAAC,CAAC6B,cAA8B,OAAOzB,KAAcC,KAAeC;YACxE,IAAI,CAACF,IAAI4B,KAAK,EAAEZ,UAAU,CAACS,YAAY/B,cAAc,CAACwC,eAAelC,IAAI4B,KAAK,EAAEO,SAAS;gBACvF,MAAM,IAAIN,qCAAkB,CAAC;oBAAED,OAAOM;gBAAc;YACtD;YAEAhC;QACF"}
|