@fdm-monster/server 1.5.0-rc1 → 1.5.0-rc2
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 +6 -3
- package/.gitattributes +1 -1
- package/.swcrc +0 -0
- package/CODE_OF_CONDUCT.md +0 -0
- package/CONTRIBUTING.md +0 -0
- package/LICENSE +0 -0
- package/README.md +0 -0
- package/SECURITY.md +0 -0
- package/dist/constants/authorization.constants.js +0 -0
- package/dist/constants/authorization.constants.js.map +0 -0
- package/dist/constants/event.constants.js +0 -0
- package/dist/constants/event.constants.js.map +0 -0
- package/dist/constants/http-status-codes.constants.js +0 -0
- package/dist/constants/http-status-codes.constants.js.map +0 -0
- package/dist/constants/server-settings.constants.js +0 -0
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/constants/service.constants.js +0 -0
- package/dist/constants/service.constants.js.map +0 -0
- package/dist/container.js +0 -0
- package/dist/container.js.map +0 -0
- package/dist/container.tokens.js +0 -0
- package/dist/container.tokens.js.map +0 -0
- package/dist/controllers/auth.controller.js +2 -1
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/batch-call.controller.js +0 -0
- package/dist/controllers/batch-call.controller.js.map +0 -0
- package/dist/controllers/camera-stream.controller.js +0 -0
- package/dist/controllers/camera-stream.controller.js.map +0 -0
- package/dist/controllers/custom-gcode.controller.js +0 -0
- package/dist/controllers/custom-gcode.controller.js.map +0 -0
- package/dist/controllers/first-time-setup.controller.js +10 -1
- package/dist/controllers/first-time-setup.controller.js.map +1 -1
- package/dist/controllers/floor.controller.js +0 -0
- package/dist/controllers/floor.controller.js.map +0 -0
- package/dist/controllers/plugin-firmware-update.controller.js +0 -0
- package/dist/controllers/plugin-firmware-update.controller.js.map +0 -0
- package/dist/controllers/print-completion.controller.js +0 -0
- package/dist/controllers/print-completion.controller.js.map +0 -0
- package/dist/controllers/printer-files.controller.js +0 -0
- package/dist/controllers/printer-files.controller.js.map +0 -0
- package/dist/controllers/printer-settings.controller.js +0 -0
- package/dist/controllers/printer-settings.controller.js.map +0 -0
- package/dist/controllers/printer.controller.js +0 -0
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +3 -1
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +0 -0
- package/dist/controllers/server-public.controller.js.map +0 -0
- package/dist/controllers/settings.controller.js +91 -7
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/controllers/user.controller.js +8 -12
- package/dist/controllers/user.controller.js.map +1 -1
- package/dist/controllers/validation/auth-controller.validation.js +0 -0
- package/dist/controllers/validation/auth-controller.validation.js.map +0 -0
- package/dist/controllers/validation/batch-controller.validation.js +0 -0
- package/dist/controllers/validation/batch-controller.validation.js.map +0 -0
- package/dist/controllers/validation/generic.validation.js +0 -0
- package/dist/controllers/validation/generic.validation.js.map +0 -0
- package/dist/controllers/validation/printer-controller.validation.js +0 -0
- package/dist/controllers/validation/printer-controller.validation.js.map +0 -0
- package/dist/controllers/validation/printer-files-controller.validation.js +0 -0
- package/dist/controllers/validation/printer-files-controller.validation.js.map +0 -0
- package/dist/controllers/validation/printer-settings-controller.validation.js +0 -0
- package/dist/controllers/validation/printer-settings-controller.validation.js.map +0 -0
- package/dist/controllers/validation/setting.validation.js +1 -1
- package/dist/controllers/validation/setting.validation.js.map +0 -0
- package/dist/controllers/validation/user-controller.validation.js +0 -0
- package/dist/controllers/validation/user-controller.validation.js.map +0 -0
- package/dist/exceptions/job.exceptions.js +0 -0
- package/dist/exceptions/job.exceptions.js.map +0 -0
- package/dist/exceptions/runtime.exceptions.js +9 -0
- package/dist/exceptions/runtime.exceptions.js.map +1 -1
- package/dist/handlers/cache-manager.js +0 -0
- package/dist/handlers/cache-manager.js.map +0 -0
- package/dist/handlers/event-emitter.js +0 -0
- package/dist/handlers/event-emitter.js.map +0 -0
- package/dist/handlers/logger-factory.js +0 -0
- package/dist/handlers/logger-factory.js.map +0 -0
- package/dist/handlers/logger.js +0 -0
- package/dist/handlers/logger.js.map +0 -0
- package/dist/handlers/validators.js +6 -1
- package/dist/handlers/validators.js.map +1 -1
- package/dist/index.js +0 -0
- package/dist/index.js.map +0 -0
- package/dist/middleware/authenticate.js +0 -0
- package/dist/middleware/authenticate.js.map +0 -0
- package/dist/middleware/database.js +0 -0
- package/dist/middleware/database.js.map +0 -0
- package/dist/middleware/demo.middleware.js +43 -0
- package/dist/middleware/demo.middleware.js.map +1 -0
- package/dist/middleware/exception.handler.js +7 -1
- package/dist/middleware/exception.handler.js.map +1 -1
- package/dist/middleware/global.middleware.js +27 -3
- package/dist/middleware/global.middleware.js.map +1 -1
- package/dist/middleware/passport.js +0 -0
- package/dist/middleware/passport.js.map +0 -0
- package/dist/middleware/printer.js +0 -0
- package/dist/middleware/printer.js.map +0 -0
- package/dist/models/Auth/Permission.js +0 -0
- package/dist/models/Auth/Permission.js.map +0 -0
- package/dist/models/Auth/RefreshToken.js +0 -0
- package/dist/models/Auth/RefreshToken.js.map +0 -0
- package/dist/models/Auth/Role.js +0 -0
- package/dist/models/Auth/Role.js.map +0 -0
- package/dist/models/Auth/User.js +0 -0
- package/dist/models/Auth/User.js.map +0 -0
- package/dist/models/CameraStream.js +5 -35
- package/dist/models/CameraStream.js.map +1 -1
- package/dist/models/CustomGcode.js +0 -0
- package/dist/models/CustomGcode.js.map +0 -0
- package/dist/models/Floor.js +0 -0
- package/dist/models/Floor.js.map +0 -0
- package/dist/models/FloorPrinter.js +0 -0
- package/dist/models/FloorPrinter.js.map +0 -0
- package/dist/models/PrintCompletion.js +0 -0
- package/dist/models/PrintCompletion.js.map +0 -0
- package/dist/models/Printer.js +0 -0
- package/dist/models/Printer.js.map +0 -0
- package/dist/models/Settings.js +0 -0
- package/dist/models/Settings.js.map +0 -0
- package/dist/models/index.js +0 -0
- package/dist/models/index.js.map +0 -0
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js +0 -0
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js.map +0 -0
- package/dist/mongo-migrations/20210907173950-printers-enabled.js +0 -0
- package/dist/mongo-migrations/20210907173950-printers-enabled.js.map +0 -0
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js +0 -0
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js.map +0 -0
- package/dist/mongo-migrations/20230414141005-floor-remove-groupinfloor.js +0 -0
- package/dist/mongo-migrations/20230414141005-floor-remove-groupinfloor.js.map +0 -0
- package/dist/mongo-migrations/20230427202911-printer-remove-sortindex.js +0 -0
- package/dist/mongo-migrations/20230427202911-printer-remove-sortindex.js.map +0 -0
- package/dist/mongo-migrations/20230716065316-user-remove-name.js +0 -0
- package/dist/mongo-migrations/20230716065316-user-remove-name.js.map +0 -0
- package/dist/server.constants.js +7 -4
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js +4 -2
- package/dist/server.core.js.map +1 -1
- package/dist/server.env.js +3 -1
- package/dist/server.env.js.map +1 -1
- package/dist/server.host.js +0 -0
- package/dist/server.host.js.map +0 -0
- package/dist/services/authentication/auth.service.js +3 -0
- package/dist/services/authentication/auth.service.js.map +1 -1
- package/dist/services/authentication/jwt.service.js +0 -0
- package/dist/services/authentication/jwt.service.js.map +0 -0
- package/dist/services/authentication/permission.service.js +0 -0
- package/dist/services/authentication/permission.service.js.map +0 -0
- package/dist/services/authentication/refresh-token.service.js +3 -3
- package/dist/services/authentication/refresh-token.service.js.map +1 -1
- package/dist/services/authentication/role.service.js +0 -0
- package/dist/services/authentication/role.service.js.map +0 -0
- package/dist/services/authentication/user.service.js +2 -1
- package/dist/services/authentication/user.service.js.map +1 -1
- package/dist/services/batch-call.service.js +0 -0
- package/dist/services/batch-call.service.js.map +0 -0
- package/dist/services/camera-stream.service.js +2 -15
- package/dist/services/camera-stream.service.js.map +1 -1
- package/dist/services/core/client-bundle.service.js +0 -0
- package/dist/services/core/client-bundle.service.js.map +0 -0
- package/dist/services/core/config.service.js +4 -0
- package/dist/services/core/config.service.js.map +1 -1
- package/dist/services/core/github.service.js +0 -0
- package/dist/services/core/github.service.js.map +0 -0
- package/dist/services/core/logs-manager.service.js +0 -0
- package/dist/services/core/logs-manager.service.js.map +0 -0
- package/dist/services/core/monsterpi.service.js +0 -0
- package/dist/services/core/monsterpi.service.js.map +0 -0
- package/dist/services/core/multer.service.js +0 -0
- package/dist/services/core/multer.service.js.map +0 -0
- package/dist/services/core/server-release.service.js +0 -0
- package/dist/services/core/server-release.service.js.map +0 -0
- package/dist/services/core/server-update.service.js +0 -0
- package/dist/services/core/server-update.service.js.map +0 -0
- package/dist/services/core/task-manager.service.js +0 -0
- package/dist/services/core/task-manager.service.js.map +0 -0
- package/dist/services/core/yaml.service.js +0 -0
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/custom-gcode.service.js +0 -0
- package/dist/services/custom-gcode.service.js.map +0 -0
- package/dist/services/floor.service.js +0 -0
- package/dist/services/floor.service.js.map +0 -0
- package/dist/services/influxdb-v2/influx-db-v2-base.service.js +0 -0
- package/dist/services/influxdb-v2/influx-db-v2-base.service.js.map +0 -0
- package/dist/services/interfaces/auth.service.interface.js +0 -0
- package/dist/services/interfaces/auth.service.interface.js.map +0 -0
- package/dist/services/interfaces/camera-stream.dto.js +11 -47
- package/dist/services/interfaces/camera-stream.dto.js.map +1 -1
- package/dist/services/interfaces/camera-stream.service.interface.js +0 -0
- package/dist/services/interfaces/camera-stream.service.interface.js.map +0 -0
- package/dist/services/interfaces/custom-gcode.dto.js +0 -0
- package/dist/services/interfaces/custom-gcode.dto.js.map +0 -0
- package/dist/services/interfaces/custom-gcode.service.interface.js +0 -0
- package/dist/services/interfaces/custom-gcode.service.interface.js.map +0 -0
- package/dist/services/interfaces/floor.dto.js +0 -0
- package/dist/services/interfaces/floor.dto.js.map +0 -0
- package/dist/services/interfaces/floor.service.interface.js +0 -0
- package/dist/services/interfaces/floor.service.interface.js.map +0 -0
- package/dist/services/interfaces/gcode-analysis.dto.js +0 -0
- package/dist/services/interfaces/gcode-analysis.dto.js.map +0 -0
- package/dist/services/interfaces/jwt.service.interface.js +0 -0
- package/dist/services/interfaces/jwt.service.interface.js.map +0 -0
- package/dist/services/interfaces/login.dto.js +0 -0
- package/dist/services/interfaces/login.dto.js.map +0 -0
- package/dist/services/interfaces/page.interface.js +0 -0
- package/dist/services/interfaces/page.interface.js.map +0 -0
- package/dist/services/interfaces/permission.dto.js +0 -0
- package/dist/services/interfaces/permission.dto.js.map +0 -0
- package/dist/services/interfaces/permission.service.interface.js +0 -0
- package/dist/services/interfaces/permission.service.interface.js.map +0 -0
- package/dist/services/interfaces/printer-file.dto.js +0 -0
- package/dist/services/interfaces/printer-file.dto.js.map +0 -0
- package/dist/services/interfaces/printer-files.service.interface.js +0 -0
- package/dist/services/interfaces/printer-files.service.interface.js.map +0 -0
- package/dist/services/interfaces/printer.dto.js +0 -0
- package/dist/services/interfaces/printer.dto.js.map +0 -0
- package/dist/services/interfaces/printer.service.interface.js +0 -0
- package/dist/services/interfaces/printer.service.interface.js.map +0 -0
- package/dist/services/{orm/printer.service.interface.js → interfaces/refresh-token.service.interface.js} +1 -1
- package/dist/services/interfaces/refresh-token.service.interface.js.map +1 -0
- package/dist/services/interfaces/role-service.interface.js +0 -0
- package/dist/services/interfaces/role-service.interface.js.map +0 -0
- package/dist/services/interfaces/settings.dto.js +2 -3
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/interfaces/settings.service.interface.js +0 -0
- package/dist/services/interfaces/settings.service.interface.js.map +0 -0
- package/dist/services/interfaces/user-service.interface.js +0 -0
- package/dist/services/interfaces/user-service.interface.js.map +0 -0
- package/dist/services/interfaces/user.dto.js +0 -0
- package/dist/services/interfaces/user.dto.js.map +0 -0
- package/dist/services/octoprint/constants/firmware-update-settings.constants.js +0 -0
- package/dist/services/octoprint/constants/firmware-update-settings.constants.js.map +0 -0
- package/dist/services/octoprint/constants/octoprint-service.constants.js +0 -0
- package/dist/services/octoprint/constants/octoprint-service.constants.js.map +0 -0
- package/dist/services/octoprint/constants/octoprint-websocket.constants.js +0 -0
- package/dist/services/octoprint/constants/octoprint-websocket.constants.js.map +0 -0
- package/dist/services/octoprint/octoprint-api.routes.js +0 -0
- package/dist/services/octoprint/octoprint-api.routes.js.map +0 -0
- package/dist/services/octoprint/octoprint-api.service.js +0 -0
- package/dist/services/octoprint/octoprint-api.service.js.map +0 -0
- package/dist/services/octoprint/octoprint-sockio.adapter.js +0 -0
- package/dist/services/octoprint/octoprint-sockio.adapter.js.map +0 -0
- package/dist/services/octoprint/plugin-base.service.js +0 -0
- package/dist/services/octoprint/plugin-base.service.js.map +0 -0
- package/dist/services/octoprint/plugin-firmware-update.service.js +0 -0
- package/dist/services/octoprint/plugin-firmware-update.service.js.map +0 -0
- package/dist/services/octoprint/plugin-repository.cache.js +0 -0
- package/dist/services/octoprint/plugin-repository.cache.js.map +0 -0
- package/dist/services/octoprint/socket.factory.js +0 -0
- package/dist/services/octoprint/socket.factory.js.map +0 -0
- package/dist/services/octoprint/utils/api.utils.js +0 -0
- package/dist/services/octoprint/utils/api.utils.js.map +0 -0
- package/dist/services/print-completion.service.js +0 -0
- package/dist/services/print-completion.service.js.map +0 -0
- package/dist/services/printer-files.service.js +0 -0
- package/dist/services/printer-files.service.js.map +0 -0
- package/dist/services/printer.service.js +0 -0
- package/dist/services/printer.service.js.map +0 -0
- package/dist/services/settings.service.js +38 -2
- package/dist/services/settings.service.js.map +1 -1
- package/dist/services/validators/floor-service.validation.js +0 -0
- package/dist/services/validators/floor-service.validation.js.map +0 -0
- package/dist/services/validators/print-completion-service.validation.js +0 -0
- package/dist/services/validators/print-completion-service.validation.js.map +0 -0
- package/dist/services/validators/printer-service.validation.js +0 -0
- package/dist/services/validators/printer-service.validation.js.map +0 -0
- package/dist/services/validators/settings-service.validation.js +18 -8
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/services/validators/user-service.validation.js +2 -1
- package/dist/services/validators/user-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +0 -0
- package/dist/services/validators/yaml-service.validation.js.map +0 -0
- package/dist/shared.constants.js +0 -0
- package/dist/shared.constants.js.map +0 -0
- package/dist/state/file-upload-tracker.cache.js +0 -0
- package/dist/state/file-upload-tracker.cache.js.map +0 -0
- package/dist/state/file.cache.js +0 -0
- package/dist/state/file.cache.js.map +0 -0
- package/dist/state/files.store.js +0 -0
- package/dist/state/files.store.js.map +0 -0
- package/dist/state/floor.store.js +0 -0
- package/dist/state/floor.store.js.map +0 -0
- package/dist/state/printer-events.cache.js +0 -0
- package/dist/state/printer-events.cache.js.map +0 -0
- package/dist/state/printer-socket.store.js +0 -0
- package/dist/state/printer-socket.store.js.map +0 -0
- package/dist/state/printer.cache.js +0 -0
- package/dist/state/printer.cache.js.map +0 -0
- package/dist/state/settings.store.js +27 -4
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/socket-io.gateway.js +0 -0
- package/dist/state/socket-io.gateway.js.map +0 -0
- package/dist/state/test-printer-socket.store.js +3 -0
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/dist/state/validation/create-test-printer.validation.js +0 -0
- package/dist/state/validation/create-test-printer.validation.js.map +0 -0
- package/dist/task.presets.js +0 -0
- package/dist/task.presets.js.map +0 -0
- package/dist/tasks/boot.task.js +15 -11
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/client-bundle.task.js +0 -0
- package/dist/tasks/client-bundle.task.js.map +0 -0
- package/dist/tasks/print-completion.socketio.task.js +0 -0
- package/dist/tasks/print-completion.socketio.task.js.map +0 -0
- package/dist/tasks/printer-file-clean.task.js +0 -0
- package/dist/tasks/printer-file-clean.task.js.map +0 -0
- package/dist/tasks/printer-websocket-restore.task.js +0 -0
- package/dist/tasks/printer-websocket-restore.task.js.map +0 -0
- package/dist/tasks/printer-websocket.task.js +0 -0
- package/dist/tasks/printer-websocket.task.js.map +0 -0
- package/dist/tasks/socketio.task.js +0 -0
- package/dist/tasks/socketio.task.js.map +0 -0
- package/dist/tasks/software-update.task.js +0 -0
- package/dist/tasks/software-update.task.js.map +0 -0
- package/dist/tasks.js +0 -0
- package/dist/tasks.js.map +0 -0
- package/dist/types/express/index.d.js +0 -0
- package/dist/types/express/index.d.js.map +0 -0
- package/dist/utils/array.util.js +0 -0
- package/dist/utils/array.util.js.map +0 -0
- package/dist/utils/benchmark.util.js +0 -0
- package/dist/utils/benchmark.util.js.map +0 -0
- package/dist/utils/cache/key-diff.cache.js +0 -0
- package/dist/utils/cache/key-diff.cache.js.map +0 -0
- package/dist/utils/correlation-token.util.js +0 -0
- package/dist/utils/correlation-token.util.js.map +0 -0
- package/dist/utils/crypto.utils.js +0 -0
- package/dist/utils/crypto.utils.js.map +0 -0
- package/dist/utils/env.utils.js +6 -0
- package/dist/utils/env.utils.js.map +1 -1
- package/dist/utils/error.utils.js +0 -0
- package/dist/utils/error.utils.js.map +0 -0
- package/dist/utils/find-predicate.utils.js +0 -0
- package/dist/utils/find-predicate.utils.js.map +0 -0
- package/dist/utils/fs.utils.js +0 -0
- package/dist/utils/fs.utils.js.map +0 -0
- package/dist/utils/is-docker.js +0 -0
- package/dist/utils/is-docker.js.map +0 -0
- package/dist/utils/mapper.utils.js +0 -0
- package/dist/utils/mapper.utils.js.map +0 -0
- package/dist/utils/metric.utils.js +0 -0
- package/dist/utils/metric.utils.js.map +0 -0
- package/dist/utils/normalize-url.js +0 -0
- package/dist/utils/normalize-url.js.map +0 -0
- package/dist/utils/semver.utils.js +0 -0
- package/dist/utils/semver.utils.js.map +0 -0
- package/dist/utils/time.utils.js +0 -0
- package/dist/utils/time.utils.js.map +0 -0
- package/dist/utils/url.utils.js +0 -0
- package/dist/utils/url.utils.js.map +0 -0
- package/dist/utils/websocket.adapter.js +0 -0
- package/dist/utils/websocket.adapter.js.map +0 -0
- package/migrate-mongo-config.js +0 -0
- package/package.json +18 -13
- package/src/index.ts +0 -0
- package/tsconfig.json +0 -0
- package/.env +0 -19
- package/.idea/codeStyles/Project.xml +0 -85
- package/.idea/codeStyles/codeStyleConfig.xml +0 -5
- package/.idea/dbnavigator.xml +0 -574
- package/.idea/fdm-monster.iml +0 -16
- package/.idea/inspectionProfiles/Project_Default.xml +0 -22
- package/.idea/jsLibraryMappings.xml +0 -6
- package/.idea/modules.xml +0 -12
- package/.idea/prettier.xml +0 -6
- package/.idea/vcs.xml +0 -17
- package/dist/@type/express/index.d.js +0 -7
- package/dist/@type/express/index.d.js.map +0 -1
- package/dist/migrations/1696187882312-PrinterFile.js +0 -40
- package/dist/migrations/1696187882312-PrinterFile.js.map +0 -1
- package/dist/models/ServerSettings.js +0 -168
- package/dist/models/ServerSettings.js.map +0 -1
- package/dist/nodemon_restart_trigger.js +0 -4
- package/dist/nodemon_restart_trigger.js.map +0 -1
- package/dist/services/orm/floor.service.interface.js +0 -73
- package/dist/services/orm/floor.service.interface.js.map +0 -1
- package/dist/services/orm/printer.service.interface.js.map +0 -1
- package/dist/services/yaml.service.js +0 -278
- package/dist/services/yaml.service.js.map +0 -1
- package/nodemon_restart_trigger.js +0 -1
package/dist/server.env.js
CHANGED
|
@@ -65,7 +65,9 @@ function _interop_require_wildcard(obj, nodeInterop) {
|
|
|
65
65
|
if (cache && cache.has(obj)) {
|
|
66
66
|
return cache.get(obj);
|
|
67
67
|
}
|
|
68
|
-
var newObj = {
|
|
68
|
+
var newObj = {
|
|
69
|
+
__proto__: null
|
|
70
|
+
};
|
|
69
71
|
var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
|
|
70
72
|
for(var key in obj){
|
|
71
73
|
if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
|
package/dist/server.env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/server.env.ts"],"names":["ensureMongoDBConnectionStringSet","ensurePortSet","fetchMongoDBConnectionString","fetchServerPort","isEnvProd","runMigrations","setupEnvConfig","setupSentry","logger","Logger","instructionsReferralURL","packageJsonPath","join","superRootPath","dotEnvPath","isEnvTest","process","env","AppConstants","NODE_ENV_KEY","defaultTestEnv","defaultProductionEnv","ensureNodeEnvSet","environment","knownEnvNames","includes","newEnvName","warn","log","ensureEnvNpmVersionSet","packageJsonVersion","require","version","VERSION_KEY","NON_NPM_MODE_KEY","debug","removePm2Service","reason","error","execSync","pm2ServiceName","setupPackageJsonVersionOrThrow","result","verifyPackageJsonRequirements","isPm2","Error","printInstructionsURL","MONGO_KEY","defaultMongoStringUnauthenticated","port","SERVER_PORT_KEY","Number","isNaN","parseInt","defaultServerPort","toString","dbConnectionString","sentryDsnToken","getEnvOrDefault","sentryCustomDsnToken","sentryCustomDsnDefault","Sentry","init","dsn","NODE_ENV","release","npm_package_version","enabled","tracesSampleRate","isProductionEnvironment","on","e","message","errorSummary","captureException","skipDotEnv","config","path","db","client","migrationsStatus","status","pendingMigrations","filter","m","appliedAt","length","migrationResult","up"],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../src/server.env.ts"],"names":["ensureMongoDBConnectionStringSet","ensurePortSet","fetchMongoDBConnectionString","fetchServerPort","isEnvProd","runMigrations","setupEnvConfig","setupSentry","logger","Logger","instructionsReferralURL","packageJsonPath","join","superRootPath","dotEnvPath","isEnvTest","process","env","AppConstants","NODE_ENV_KEY","defaultTestEnv","defaultProductionEnv","ensureNodeEnvSet","environment","knownEnvNames","includes","newEnvName","warn","log","ensureEnvNpmVersionSet","packageJsonVersion","require","version","VERSION_KEY","NON_NPM_MODE_KEY","debug","removePm2Service","reason","error","execSync","pm2ServiceName","setupPackageJsonVersionOrThrow","result","verifyPackageJsonRequirements","isPm2","Error","printInstructionsURL","MONGO_KEY","defaultMongoStringUnauthenticated","port","SERVER_PORT_KEY","Number","isNaN","parseInt","defaultServerPort","toString","dbConnectionString","sentryDsnToken","getEnvOrDefault","sentryCustomDsnToken","sentryCustomDsnDefault","Sentry","init","dsn","NODE_ENV","release","npm_package_version","enabled","tracesSampleRate","isProductionEnvironment","on","e","message","errorSummary","captureException","skipDotEnv","config","path","db","client","migrationsStatus","status","pendingMigrations","filter","m","appliedAt","length","migrationResult","up"],"mappings":"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"}
|
package/dist/server.host.js
CHANGED
|
File without changes
|
package/dist/server.host.js.map
CHANGED
|
File without changes
|
|
@@ -103,6 +103,9 @@ class AuthService {
|
|
|
103
103
|
}
|
|
104
104
|
async getValidRefreshToken(refreshToken, throwNotFoundError = true) {
|
|
105
105
|
const userRefreshToken = await this.refreshTokenService.getRefreshToken(refreshToken, throwNotFoundError);
|
|
106
|
+
if (!userRefreshToken) {
|
|
107
|
+
return null;
|
|
108
|
+
}
|
|
106
109
|
if (Date.now() > userRefreshToken.expiresAt) {
|
|
107
110
|
await this.refreshTokenService.deleteRefreshTokenByUserId(userRefreshToken.userId.toString());
|
|
108
111
|
throw new _runtimeexceptions.AuthenticationError("Refresh token expired, login required");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/authentication/auth.service.ts"],"names":["AuthService","logger","userService","jwtService","settingsStore","refreshTokenService","blacklistedJwtCache","constructor","loggerFactory","name","loginUser","username","password","userDoc","findRawByUsername","AuthenticationError","result","comparePasswordHash","passwordHash","userId","id","toString","token","signJwtToken","purgeOutdatedRefreshTokensByUserId","purgeBlacklistedJwtCache","refreshToken","createRefreshTokenForUserId","logoutUserId","jwtToken","deleteRefreshTokenByUserId","length","createdAt","Date","now","jwtExpiresIn","getCredentialSettings","keys","Object","key","err","error","logoutUserRefreshToken","userRefreshToken","getValidRefreshToken","renewLoginByRefreshToken","increaseRefreshTokenAttemptsUsed","isJwtTokenBlacklisted","throwNotFoundError","getRefreshToken","expiresAt","refreshTokenAttempts","attemptsUsed","refreshAttemptsUsed","updateRefreshTokenAttempts","user","getUser","needsPasswordChange","PasswordChangeRequiredError","isVerified"],"mappings":"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
|
|
1
|
+
{"version":3,"sources":["../../../src/services/authentication/auth.service.ts"],"names":["AuthService","logger","userService","jwtService","settingsStore","refreshTokenService","blacklistedJwtCache","constructor","loggerFactory","name","loginUser","username","password","userDoc","findRawByUsername","AuthenticationError","result","comparePasswordHash","passwordHash","userId","id","toString","token","signJwtToken","purgeOutdatedRefreshTokensByUserId","purgeBlacklistedJwtCache","refreshToken","createRefreshTokenForUserId","logoutUserId","jwtToken","deleteRefreshTokenByUserId","length","createdAt","Date","now","jwtExpiresIn","getCredentialSettings","keys","Object","key","err","error","logoutUserRefreshToken","userRefreshToken","getValidRefreshToken","renewLoginByRefreshToken","increaseRefreshTokenAttemptsUsed","isJwtTokenBlacklisted","throwNotFoundError","getRefreshToken","expiresAt","refreshTokenAttempts","attemptsUsed","refreshAttemptsUsed","updateRefreshTokenAttempts","user","getUser","needsPasswordChange","PasswordChangeRequiredError","isVerified"],"mappings":"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"}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -34,13 +34,13 @@ class RefreshTokenService {
|
|
|
34
34
|
async createRefreshTokenForUserId(userId) {
|
|
35
35
|
const { refreshTokenExpiry } = await this.settingsStore.getCredentialSettings();
|
|
36
36
|
const refreshToken = (0, _uuid.v4)();
|
|
37
|
+
const timespan = refreshTokenExpiry ?? _serverconstants.AppConstants.DEFAULT_REFRESH_TOKEN_EXPIRY;
|
|
37
38
|
if (!refreshTokenExpiry) {
|
|
38
|
-
this.logger.warn(
|
|
39
|
+
this.logger.warn(`Refresh token expiry not set in Settings:credentials, using default ${timespan} seconds}`);
|
|
39
40
|
}
|
|
40
|
-
const timespan = refreshTokenExpiry ?? _serverconstants.AppConstants.DEFAULT_REFRESH_TOKEN_EXPIRY;
|
|
41
41
|
await _models.RefreshToken.create({
|
|
42
42
|
userId,
|
|
43
|
-
expiresAt: Date.now() + timespan,
|
|
43
|
+
expiresAt: Date.now() + timespan * 1000,
|
|
44
44
|
refreshToken,
|
|
45
45
|
refreshAttemptsUsed: 0
|
|
46
46
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/authentication/refresh-token.service.ts"],"names":["RefreshTokenService","settingsStore","logger","constructor","loggerFactory","name","getRefreshToken","refreshToken","throwNotFoundError","userRefreshToken","RefreshToken","findOne","AuthenticationError","createRefreshTokenForUserId","userId","refreshTokenExpiry","getCredentialSettings","uuidv4","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/authentication/refresh-token.service.ts"],"names":["RefreshTokenService","settingsStore","logger","constructor","loggerFactory","name","getRefreshToken","refreshToken","throwNotFoundError","userRefreshToken","RefreshToken","findOne","AuthenticationError","createRefreshTokenForUserId","userId","refreshTokenExpiry","getCredentialSettings","uuidv4","timespan","AppConstants","DEFAULT_REFRESH_TOKEN_EXPIRY","warn","create","expiresAt","Date","now","refreshAttemptsUsed","updateRefreshTokenAttempts","updateOne","new","purgeOutdatedRefreshTokensByUserId","result","deleteMany","$lt","deletedCount","debug","purgeAllOutdatedRefreshTokens","deleteRefreshTokenByUserId","deleteRefreshToken","deleteOne"],"mappings":";;;;+BAWaA;;;eAAAA;;;wBATgB;sBACA;iCACA;mCAIO;AAG7B,MAAMA;IACHC,cAA6B;IAC7BC,OAAsB;IAC9BC,YAAY,EAAEC,aAAa,EAAEH,aAAa,EAAmE,CAAE;QAC7G,IAAI,CAACC,MAAM,GAAGE,cAAcJ,oBAAoBK,IAAI;QACpD,IAAI,CAACJ,aAAa,GAAGA;IACvB;IAEA,MAAMK,gBAAgBC,YAAoB,EAAEC,qBAAqB,IAAI,EAAiC;QACpG,MAAMC,mBAAmB,MAAMC,oBAAY,CAACC,OAAO,CAAC;YAClDJ;QACF;QACA,IAAI,CAACE,kBAAkB;YACrB,IAAID,oBAAoB;gBACtB,MAAM,IAAII,sCAAmB,CAAC;YAChC;YACA,OAAO;QACT;QACA,OAAOH;IACT;IAEA,MAAMI,4BAA4BC,MAAmB,EAAmB;QACtE,MAAM,EAAEC,kBAAkB,EAAE,GAAG,MAAM,IAAI,CAACd,aAAa,CAACe,qBAAqB;QAC7E,MAAMT,eAAeU,IAAAA,QAAM;QAE3B,MAAMC,WAAWH,sBAAsBI,6BAAY,CAACC,4BAA4B;QAChF,IAAI,CAACL,oBAAoB;YACvB,IAAI,CAACb,MAAM,CAACmB,IAAI,CAAC,CAAC,oEAAoE,EAAEH,SAAS,SAAS,CAAC;QAC7G;QAEA,MAAMR,oBAAY,CAACY,MAAM,CAAC;YACxBR;YACAS,WAAWC,KAAKC,GAAG,KAAKP,WAAW;YACnCX;YACAmB,qBAAqB;QACvB;QAEA,OAAOnB;IACT;IAEA,MAAMoB,2BAA2BpB,YAAoB,EAAEmB,mBAA2B,EAAE;QAClF,MAAM,IAAI,CAACpB,eAAe,CAACC;QAE3B,MAAMG,oBAAY,CAACkB,SAAS,CAC1B;YACErB;QACF,GACA;YACEmB;QACF,GACA;YACEG,KAAK;QACP;IAEJ;IAEA,MAAMC,mCAAmChB,MAAmB,EAAE;QAC5D,MAAMiB,SAAS,MAAMrB,oBAAY,CAACsB,UAAU,CAAC;YAC3ClB;YACAS,WAAW;gBACTU,KAAKT,KAAKC,GAAG;YACf;QACF;QAEA,IAAIM,OAAOG,YAAY,EAAE;YACvB,IAAI,CAAChC,MAAM,CAACiC,KAAK,CAAC,CAAC,QAAQ,EAAEJ,OAAOG,YAAY,CAAC,wCAAwC,EAAEpB,OAAO,CAAC;QACrG;IACF;IAEA,MAAMsB,gCAAgC;QACpC,MAAML,SAAS,MAAMrB,oBAAY,CAACsB,UAAU,CAAC;YAC3CT,WAAW;gBACTU,KAAKT,KAAKC,GAAG;YACf;QACF;QAEA,IAAIM,OAAOG,YAAY,EAAE;YACvB,IAAI,CAAChC,MAAM,CAACiC,KAAK,CAAC,CAAC,QAAQ,EAAEJ,OAAOG,YAAY,CAAC,8BAA8B,CAAC;QAClF;IACF;IAEA,MAAMG,2BAA2BvB,MAAmB,EAAiB;QACnE,MAAMiB,SAAS,MAAMrB,oBAAY,CAACsB,UAAU,CAAC;YAC3ClB;QACF;QAEA,IAAIiB,OAAOG,YAAY,EAAE;YACvB,IAAI,CAAChC,MAAM,CAACiC,KAAK,CAAC,CAAC,QAAQ,EAAEJ,OAAOG,YAAY,CAAC,qBAAqB,CAAC;QACzE;IACF;IAEA,MAAMI,mBAAmB/B,YAAoB,EAAiB;QAC5D,MAAMwB,SAAS,MAAMrB,oBAAY,CAAC6B,SAAS,CAAC;YAC1ChC;QACF;QAEA,oBAAoB;QACpB,IAAIwB,OAAOG,YAAY,EAAE;YACvB,IAAI,CAAChC,MAAM,CAACiC,KAAK,CAAC,CAAC,QAAQ,EAAEJ,OAAOG,YAAY,CAAC,qBAAqB,CAAC;QACzE;IACF;AACF"}
|
|
File without changes
|
|
File without changes
|
|
@@ -138,12 +138,13 @@ class UserService {
|
|
|
138
138
|
await user.save();
|
|
139
139
|
}
|
|
140
140
|
async register(input) {
|
|
141
|
-
const { username, password, roles, isDemoUser, isRootUser, needsPasswordChange } = await (0, _validators.validateInput)(input, _userservicevalidation.registerUserRules);
|
|
141
|
+
const { username, password, roles, isDemoUser, isRootUser, needsPasswordChange, isVerified } = await (0, _validators.validateInput)(input, _userservicevalidation.registerUserRules);
|
|
142
142
|
const passwordHash = (0, _cryptoutils.hashPassword)(password);
|
|
143
143
|
return await _models.User.create({
|
|
144
144
|
username,
|
|
145
145
|
passwordHash,
|
|
146
146
|
roles,
|
|
147
|
+
isVerified: isVerified ?? false,
|
|
147
148
|
isDemoUser: isDemoUser ?? false,
|
|
148
149
|
isRootUser: isRootUser ?? false,
|
|
149
150
|
needsPasswordChange: needsPasswordChange ?? true
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/authentication/user.service.ts"],"names":["UserService","roleService","constructor","toDto","user","id","createdAt","isVerified","isDemoUser","isRootUser","username","needsPasswordChange","roles","map","r","toString","listUsers","limit","User","find","findUserByRoleId","roleId","$in","getDemoUserId","findOne","findRawByUsername","getUser","userId","findById","NotFoundException","getUserRoles","setUserRoleIds","roleIds","getManyRoles","Array","from","Set","save","deleteUser","role","getRoleByName","ROLES","ADMIN","includes","administrators","length","InternalServerException","findByIdAndDelete","updateUsernameById","newUsername","updatePasswordById","oldPassword","newPassword","comparePasswordHash","passwordHash","password","validateInput","newPasswordRules","hashPassword","updatePasswordUnsafe","setIsRootUserById","setVerifiedById","register","input","registerUserRules","create"],"mappings":"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
|
|
1
|
+
{"version":3,"sources":["../../../src/services/authentication/user.service.ts"],"names":["UserService","roleService","constructor","toDto","user","id","createdAt","isVerified","isDemoUser","isRootUser","username","needsPasswordChange","roles","map","r","toString","listUsers","limit","User","find","findUserByRoleId","roleId","$in","getDemoUserId","findOne","findRawByUsername","getUser","userId","findById","NotFoundException","getUserRoles","setUserRoleIds","roleIds","getManyRoles","Array","from","Set","save","deleteUser","role","getRoleByName","ROLES","ADMIN","includes","administrators","length","InternalServerException","findByIdAndDelete","updateUsernameById","newUsername","updatePasswordById","oldPassword","newPassword","comparePasswordHash","passwordHash","password","validateInput","newPasswordRules","hashPassword","updatePasswordUnsafe","setIsRootUserById","setVerifiedById","register","input","registerUserRules","create"],"mappings":"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"}
|
|
File without changes
|
|
File without changes
|
|
@@ -15,20 +15,7 @@ const _runtimeexceptions = require("../exceptions/runtime.exceptions");
|
|
|
15
15
|
const createCameraStreamRules = {
|
|
16
16
|
printerId: "mongoId",
|
|
17
17
|
streamURL: "required|httpurl",
|
|
18
|
-
|
|
19
|
-
"settings.aspectRatio": [
|
|
20
|
-
"required",
|
|
21
|
-
"string",
|
|
22
|
-
[
|
|
23
|
-
"in",
|
|
24
|
-
"16:9",
|
|
25
|
-
"4:3",
|
|
26
|
-
"1:1"
|
|
27
|
-
]
|
|
28
|
-
],
|
|
29
|
-
"settings.rotationClockwise": "required|integer|in:0,90,180,270",
|
|
30
|
-
"settings.flipHorizontal": "required|boolean",
|
|
31
|
-
"settings.flipVertical": "required|boolean"
|
|
18
|
+
name: "required|string"
|
|
32
19
|
};
|
|
33
20
|
class CameraStreamService {
|
|
34
21
|
model = _models.CameraStream;
|
|
@@ -72,7 +59,7 @@ class CameraStreamService {
|
|
|
72
59
|
id: entity.id,
|
|
73
60
|
streamURL: entity.streamURL,
|
|
74
61
|
printerId: entity.printerId === null ? null : entity.printerId?.toString(),
|
|
75
|
-
|
|
62
|
+
name: entity.name
|
|
76
63
|
};
|
|
77
64
|
}
|
|
78
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/camera-stream.service.ts"],"names":["CameraStreamService","createCameraStreamRules","printerId","streamURL","
|
|
1
|
+
{"version":3,"sources":["../../src/services/camera-stream.service.ts"],"names":["CameraStreamService","createCameraStreamRules","printerId","streamURL","name","model","CameraStream","printerCache","constructor","list","find","get","id","throwError","cameraStream","findById","NotFoundException","create","data","input","validateInput","getCachedPrinterOrThrow","delete","findByIdAndDelete","update","updateInput","updateOne","toDto","entity","toString"],"mappings":";;;;+BAgBaA;;;eAAAA;;;wBAhBgB;4BACC;mCACI;AAOlC,gDAAgD;AAChD,MAAMC,0BAA0B;IAC9BC,WAAW;IACXC,WAAW;IACXC,MAAM;AACR;AAEO,MAAMJ;IACXK,QAAQC,oBAAY,CAAC;IACrBC,aAA2B;IAE3BC,YAAY,EAAED,YAAY,EAAkC,CAAE;QAC5D,IAAI,CAACA,YAAY,GAAGA;IACtB;IAEA,MAAME,OAAO;QACX,OAAO,IAAI,CAACJ,KAAK,CAACK,IAAI;IACxB;IAEA,MAAMC,IAAIC,EAAe,EAAEC,aAAa,IAAI,EAAE;QAC5C,MAAMC,eAAe,MAAM,IAAI,CAACT,KAAK,CAACU,QAAQ,CAACH;QAC/C,IAAI,CAACE,gBAAgBD,YAAY;YAC/B,MAAM,IAAIG,oCAAiB,CAAC,CAAC,cAAc,EAAEJ,GAAG,gBAAgB,CAAC,EAAE;QACrE;QAEA,OAAOE;IACT;IAEA,MAAMG,OAAOC,IAAwC,EAAE;QACrD,MAAMC,QAAQ,MAAMC,IAAAA,yBAAa,EAACF,MAAMjB;QACxC,IAAIkB,MAAMjB,SAAS,EAAE;YACnB,MAAM,IAAI,CAACK,YAAY,CAACc,uBAAuB,CAACF,MAAMjB,SAAS;QACjE;QACA,OAAO,IAAI,CAACG,KAAK,CAACY,MAAM,CAACE;IAC3B;IAEA,MAAMG,OAAOV,EAAe,EAAE;QAC5B,OAAO,IAAI,CAACP,KAAK,CAACkB,iBAAiB,CAACX;IACtC;IAEA,MAAMY,OAAOZ,EAAe,EAAEO,KAAyC,EAAE;QACvE,MAAM,IAAI,CAACR,GAAG,CAACC;QACf,MAAMa,cAAc,MAAML,IAAAA,yBAAa,EAACD,OAAOlB;QAC/C,IAAIkB,MAAMjB,SAAS,EAAE;YACnB,MAAM,IAAI,CAACK,YAAY,CAACc,uBAAuB,CAACF,MAAMjB,SAAS;QACjE;QACA,MAAM,IAAI,CAACG,KAAK,CAACqB,SAAS,CAAC;YAAEd;QAAG,GAAGa;QACnC,OAAO,IAAI,CAACd,GAAG,CAACC;IAClB;IAEAe,MAAMC,MAAqB,EAAgC;QACzD,OAAO;YACLhB,IAAIgB,OAAOhB,EAAE;YACbT,WAAWyB,OAAOzB,SAAS;YAC3BD,WAAW0B,OAAO1B,SAAS,KAAK,OAAO,OAAO0B,OAAO1B,SAAS,EAAE2B;YAChEzB,MAAMwB,OAAOxB,IAAI;QACnB;IACF;AACF"}
|
|
File without changes
|
|
File without changes
|
|
@@ -8,6 +8,7 @@ Object.defineProperty(exports, "ConfigService", {
|
|
|
8
8
|
return ConfigService;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
+
const _serverconstants = require("../../server.constants");
|
|
11
12
|
class ConfigService {
|
|
12
13
|
get(key, defaultValue) {
|
|
13
14
|
if (!Object.keys(process.env).includes(key) || !process.env[key]?.length) {
|
|
@@ -21,6 +22,9 @@ class ConfigService {
|
|
|
21
22
|
throw Error(`Environment variable with key ${key} was not defined.`);
|
|
22
23
|
}
|
|
23
24
|
}
|
|
25
|
+
isDemoMode() {
|
|
26
|
+
return this.get(_serverconstants.AppConstants.OVERRIDE_IS_DEMO_MODE, "false") === "true";
|
|
27
|
+
}
|
|
24
28
|
}
|
|
25
29
|
|
|
26
30
|
//# sourceMappingURL=config.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/config.service.ts"],"names":["ConfigService","get","key","defaultValue","Object","keys","process","env","includes","length","getOrThrow","val","Error"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/config.service.ts"],"names":["ConfigService","get","key","defaultValue","Object","keys","process","env","includes","length","getOrThrow","val","Error","isDemoMode","AppConstants","OVERRIDE_IS_DEMO_MODE"],"mappings":";;;;+BAUaA;;;eAAAA;;;iCAVgB;AAUtB,MAAMA;IACXC,IAAIC,GAAW,EAAEC,YAAqB,EAAE;QACtC,IAAI,CAACC,OAAOC,IAAI,CAACC,QAAQC,GAAG,EAAEC,QAAQ,CAACN,QAAQ,CAACI,QAAQC,GAAG,CAACL,IAAI,EAAEO,QAAQ;YACxE,OAAON;QACT;QACA,OAAOG,QAAQC,GAAG,CAACL,IAAI;IACzB;IAEAQ,WAAWR,GAAW,EAAE;QACtB,MAAMS,MAAM,IAAI,CAACV,GAAG,CAACC;QACrB,IAAI,CAACS,KAAK;YACR,MAAMC,MAAM,CAAC,8BAA8B,EAAEV,IAAI,iBAAiB,CAAC;QACrE;IACF;IAEAW,aAAa;QACX,OAAO,IAAI,CAACZ,GAAG,CAACa,6BAAY,CAACC,qBAAqB,EAAE,aAAa;IACnE;AACF"}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/yaml.service.ts"],"names":["YamlService","floorStore","floorService","printerService","printerCache","serverVersion","logger","constructor","loggerFactory","name","importPrintersAndFloors","yamlBuffer","importSpec","load","exportPrinters","exportFloorGrid","exportFloors","config","printer","printers","settingsAppearance","printerName","importData","validateInput","importPrintersFloorsYamlRules","floor","floors","importPrinterPositionsRules","log","updateByPropertyPrinters","insertPrinters","analysePrintersUpsert","printerComparisonStrategiesByPriority","updateByPropertyFloors","insertFloors","analyseFloorsUpsert","floorComparisonStrategiesByPriority","length","printerIdMap","newPrinter","state","create","id","updatePrinterSpec","updateId","printerId","update","value","floorIdMap","newFloor","knownPrinters","floorPosition","knownPrinterId","push","updateFloorSpec","floorId","updatedFloor","loadStore","upsertPrinters","comparisonStrategies","existingPrinters","list","names","map","p","toLowerCase","urls","printerURL","ids","toString","strategy","comparedName","foundIndex","findIndex","n","upsertFloors","comparisonStrategy","existingFloors","floorLevels","comparedProperty","exportPrintersAndFloors","options","input","exportPrintersFloorsYamlRules","dumpedObject","version","process","env","npm_package_version","exportedAt","Date","apiKey","getLoginDto","stepSize","disabledReason","enabled","dateAdded","listCache","f","dumpedFloor","fPrinterId","x","y","dump"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/yaml.service.ts"],"names":["YamlService","floorStore","floorService","printerService","printerCache","serverVersion","logger","constructor","loggerFactory","name","importPrintersAndFloors","yamlBuffer","importSpec","load","exportPrinters","exportFloorGrid","exportFloors","config","printer","printers","settingsAppearance","printerName","importData","validateInput","importPrintersFloorsYamlRules","floor","floors","importPrinterPositionsRules","log","updateByPropertyPrinters","insertPrinters","analysePrintersUpsert","printerComparisonStrategiesByPriority","updateByPropertyFloors","insertFloors","analyseFloorsUpsert","floorComparisonStrategiesByPriority","length","printerIdMap","newPrinter","state","create","id","updatePrinterSpec","updateId","printerId","update","value","floorIdMap","newFloor","knownPrinters","floorPosition","knownPrinterId","push","updateFloorSpec","floorId","updatedFloor","loadStore","upsertPrinters","comparisonStrategies","existingPrinters","list","names","map","p","toLowerCase","urls","printerURL","ids","toString","strategy","comparedName","foundIndex","findIndex","n","upsertFloors","comparisonStrategy","existingFloors","floorLevels","comparedProperty","exportPrintersAndFloors","options","input","exportPrintersFloorsYamlRules","dumpedObject","version","process","env","npm_package_version","exportedAt","Date","apiKey","getLoginDto","stepSize","disabledReason","enabled","dateAdded","listCache","f","dumpedFloor","fPrinterId","x","y","dump"],"mappings":"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"}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -12,9 +12,6 @@ _export(exports, {
|
|
|
12
12
|
CameraStreamDto: function() {
|
|
13
13
|
return CameraStreamDto;
|
|
14
14
|
},
|
|
15
|
-
CameraStreamSettingsDto: function() {
|
|
16
|
-
return CameraStreamSettingsDto;
|
|
17
|
-
},
|
|
18
15
|
CreateCameraStreamDto: function() {
|
|
19
16
|
return CreateCameraStreamDto;
|
|
20
17
|
},
|
|
@@ -34,76 +31,43 @@ function _ts_metadata(k, v) {
|
|
|
34
31
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
35
32
|
}
|
|
36
33
|
class CameraStreamDto extends _sharedconstants.IdDto {
|
|
34
|
+
name;
|
|
37
35
|
streamURL;
|
|
38
36
|
printerId;
|
|
39
|
-
settings;
|
|
40
|
-
}
|
|
41
|
-
class CameraStreamSettingsDto {
|
|
42
|
-
aspectRatio;
|
|
43
|
-
rotationClockwise;
|
|
44
|
-
flipHorizontal;
|
|
45
|
-
flipVertical;
|
|
46
37
|
}
|
|
47
|
-
_ts_decorate([
|
|
48
|
-
(0, _classvalidator.IsNotEmpty)(),
|
|
49
|
-
(0, _classvalidator.IsIn)([
|
|
50
|
-
"16:9",
|
|
51
|
-
"4:3",
|
|
52
|
-
"1:1"
|
|
53
|
-
]),
|
|
54
|
-
_ts_metadata("design:type", String)
|
|
55
|
-
], CameraStreamSettingsDto.prototype, "aspectRatio", void 0);
|
|
56
|
-
_ts_decorate([
|
|
57
|
-
(0, _classvalidator.IsDefined)(),
|
|
58
|
-
(0, _classvalidator.IsIn)([
|
|
59
|
-
0,
|
|
60
|
-
90,
|
|
61
|
-
180,
|
|
62
|
-
270
|
|
63
|
-
]),
|
|
64
|
-
_ts_metadata("design:type", Number)
|
|
65
|
-
], CameraStreamSettingsDto.prototype, "rotationClockwise", void 0);
|
|
66
|
-
_ts_decorate([
|
|
67
|
-
(0, _classvalidator.IsDefined)(),
|
|
68
|
-
_ts_metadata("design:type", Boolean)
|
|
69
|
-
], CameraStreamSettingsDto.prototype, "flipHorizontal", void 0);
|
|
70
|
-
_ts_decorate([
|
|
71
|
-
(0, _classvalidator.IsDefined)(),
|
|
72
|
-
_ts_metadata("design:type", Boolean)
|
|
73
|
-
], CameraStreamSettingsDto.prototype, "flipVertical", void 0);
|
|
74
38
|
class CreateCameraStreamDto {
|
|
75
39
|
streamURL;
|
|
40
|
+
name;
|
|
76
41
|
printerId;
|
|
77
|
-
settings;
|
|
78
42
|
}
|
|
79
43
|
_ts_decorate([
|
|
80
44
|
(0, _classvalidator.IsNotEmpty)(),
|
|
81
45
|
_ts_metadata("design:type", String)
|
|
82
46
|
], CreateCameraStreamDto.prototype, "streamURL", void 0);
|
|
47
|
+
_ts_decorate([
|
|
48
|
+
(0, _classvalidator.IsNotEmpty)(),
|
|
49
|
+
_ts_metadata("design:type", String)
|
|
50
|
+
], CreateCameraStreamDto.prototype, "name", void 0);
|
|
83
51
|
_ts_decorate([
|
|
84
52
|
(0, _classvalidator.IsOptional)(),
|
|
85
53
|
_ts_metadata("design:type", typeof KeyType === "undefined" ? Object : KeyType)
|
|
86
54
|
], CreateCameraStreamDto.prototype, "printerId", void 0);
|
|
87
|
-
_ts_decorate([
|
|
88
|
-
(0, _classvalidator.IsDefined)(),
|
|
89
|
-
_ts_metadata("design:type", typeof CameraStreamSettingsDto === "undefined" ? Object : CameraStreamSettingsDto)
|
|
90
|
-
], CreateCameraStreamDto.prototype, "settings", void 0);
|
|
91
55
|
class UpdateCameraStreamDto {
|
|
92
56
|
streamURL;
|
|
57
|
+
name;
|
|
93
58
|
printerId;
|
|
94
|
-
settings;
|
|
95
59
|
}
|
|
96
60
|
_ts_decorate([
|
|
97
61
|
(0, _classvalidator.IsNotEmpty)(),
|
|
98
62
|
_ts_metadata("design:type", String)
|
|
99
63
|
], UpdateCameraStreamDto.prototype, "streamURL", void 0);
|
|
64
|
+
_ts_decorate([
|
|
65
|
+
(0, _classvalidator.IsNotEmpty)(),
|
|
66
|
+
_ts_metadata("design:type", String)
|
|
67
|
+
], UpdateCameraStreamDto.prototype, "name", void 0);
|
|
100
68
|
_ts_decorate([
|
|
101
69
|
(0, _classvalidator.IsOptional)(),
|
|
102
70
|
_ts_metadata("design:type", typeof KeyType === "undefined" ? Object : KeyType)
|
|
103
71
|
], UpdateCameraStreamDto.prototype, "printerId", void 0);
|
|
104
|
-
_ts_decorate([
|
|
105
|
-
(0, _classvalidator.IsDefined)(),
|
|
106
|
-
_ts_metadata("design:type", typeof CameraStreamSettingsDto === "undefined" ? Object : CameraStreamSettingsDto)
|
|
107
|
-
], UpdateCameraStreamDto.prototype, "settings", void 0);
|
|
108
72
|
|
|
109
73
|
//# sourceMappingURL=camera-stream.dto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/interfaces/camera-stream.dto.ts"],"names":["CameraStreamDto","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/camera-stream.dto.ts"],"names":["CameraStreamDto","CreateCameraStreamDto","UpdateCameraStreamDto","IdDto","name","streamURL","printerId","IsNotEmpty","IsOptional"],"mappings":";;;;;;;;;;;IAGaA,eAAe;eAAfA;;IAMAC,qBAAqB;eAArBA;;IASAC,qBAAqB;eAArBA;;;iCAlBS;gCACkC;;;;;;;;;;AAEjD,MAAMF,wBAAiCG,sBAAK;IACjDC,KAAa;IACbC,UAAkB;IAClBC,UAAmB;AACrB;AAEO,MAAML;IAEXI,UAAkB;IAElBD,KAAa;IAEbE,UAAoB;AACtB;;IANGC,IAAAA,0BAAU;;GADAN;;IAGVM,IAAAA,0BAAU;;GAHAN;;IAKVO,IAAAA,0BAAU;uCACC,mCAAA;GANDP;AASN,MAAMC;IAEXG,UAAkB;IAElBD,KAAa;IAEbE,UAAmB;AACrB;;IANGC,IAAAA,0BAAU;;GADAL;;IAGVK,IAAAA,0BAAU;;GAHAL;;IAKVM,IAAAA,0BAAU;uCACA,mCAAA;GANAN"}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/refresh-token.service.interface.ts"],"names":[],"mappings":""}
|
|
File without changes
|
|
File without changes
|
|
@@ -17,16 +17,15 @@ _export(exports, {
|
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
19
|
const _serversettingsconstants = require("../../constants/server-settings.constants");
|
|
20
|
-
const _sharedconstants = require("../../shared.constants");
|
|
21
20
|
class IpWhitelistSettingsDto {
|
|
22
21
|
whitelistedIpAddresses;
|
|
23
22
|
whitelistEnabled;
|
|
24
23
|
}
|
|
25
|
-
class SettingsDto
|
|
24
|
+
class SettingsDto {
|
|
26
25
|
[_serversettingsconstants.serverSettingsKey];
|
|
27
26
|
[_serversettingsconstants.wizardSettingKey];
|
|
28
27
|
[_serversettingsconstants.frontendSettingKey];
|
|
29
|
-
[
|
|
28
|
+
// [credentialSettingsKey]: CredentialSettingsDto;
|
|
30
29
|
[_serversettingsconstants.fileCleanSettingKey];
|
|
31
30
|
[_serversettingsconstants.timeoutSettingKey];
|
|
32
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/interfaces/settings.dto.ts"],"names":["IpWhitelistSettingsDto","SettingsDto","whitelistedIpAddresses","whitelistEnabled","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/settings.dto.ts"],"names":["IpWhitelistSettingsDto","SettingsDto","whitelistedIpAddresses","whitelistEnabled","serverSettingsKey","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey"],"mappings":";;;;;;;;;;;IAmBaA,sBAAsB;eAAtBA;;IA2CAC,WAAW;eAAXA;;;yCAvDN;AAYA,MAAMD;IACXE,uBAAiC;IACjCC,iBAA0B;AAC5B;AAwCO,MAAMF;IACX,CAACG,0CAAiB,CAAC,CAAoB;IACvC,CAACC,yCAAgB,CAAC,CAAoB;IACtC,CAACC,2CAAkB,CAAC,CAAsB;IAC1C,kDAAkD;IAClD,CAACC,4CAAmB,CAAC,CAAuB;IAC5C,CAACC,0CAAiB,CAAC,CAAqB;AAC1C"}
|
|
File without changes
|
|
File without changes
|