@fdm-monster/server 1.6.1 → 1.6.2
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 +1 -1
- package/.yarn/install-state.gz +0 -0
- package/.yarn/releases/{yarn-4.1.0.cjs → yarn-4.1.1.cjs} +162 -162
- package/.yarnrc.yml +1 -1
- package/CONTRIBUTING.md +1 -1
- package/README.md +14 -4
- package/RELEASE_NOTES.MD +24 -0
- package/dist/consoles/moonraker-test.console.js +3 -0
- package/dist/consoles/moonraker-test.console.js.map +1 -0
- package/dist/consoles/sqlite-torm.js.map +1 -1
- package/dist/consoles/typeorm-generate.js.map +1 -1
- package/dist/consoles/typeorm-migrate.js.map +1 -1
- package/dist/consoles/upload-test.js.map +1 -1
- package/dist/constants/authorization.constants.js.map +1 -1
- package/dist/constants/event.constants.js.map +1 -1
- package/dist/constants/http-status-codes.constants.js.map +1 -1
- package/dist/constants/server-settings.constants.js +1 -1
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/constants/service.constants.js.map +1 -1
- package/dist/container.js +2 -0
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +1 -0
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/auth.controller.js +9 -11
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/batch-call.controller.js.map +1 -1
- package/dist/controllers/camera-stream.controller.js.map +1 -1
- package/dist/controllers/custom-gcode.controller.js.map +1 -1
- package/dist/controllers/dto/update-client-dist.dto.js.map +1 -1
- package/dist/controllers/first-time-setup.controller.js.map +1 -1
- package/dist/controllers/floor.controller.js.map +1 -1
- package/dist/controllers/plugin-firmware-update.controller.js +1 -2
- package/dist/controllers/plugin-firmware-update.controller.js.map +1 -1
- package/dist/controllers/print-completion.controller.js.map +1 -1
- package/dist/controllers/printer-files.controller.js +1 -2
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer-group.controller.js.map +1 -1
- package/dist/controllers/printer-settings.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +58 -14
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +8 -2
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +5 -2
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/controllers/settings.controller.js +17 -8
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/controllers/user.controller.js +1 -1
- package/dist/controllers/user.controller.js.map +1 -1
- package/dist/controllers/validation/auth-controller.validation.js.map +1 -1
- package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
- package/dist/controllers/validation/generic.validation.js.map +1 -1
- package/dist/controllers/validation/printer-controller.validation.js.map +1 -1
- package/dist/controllers/validation/printer-files-controller.validation.js.map +1 -1
- package/dist/controllers/validation/printer-settings-controller.validation.js.map +1 -1
- package/dist/controllers/validation/setting.validation.js.map +1 -1
- package/dist/controllers/validation/user-controller.validation.js.map +1 -1
- package/dist/data-source.js +2 -3
- package/dist/data-source.js.map +1 -1
- package/dist/entities/base.entity.js.map +1 -1
- package/dist/entities/camera-stream.entity.js.map +1 -1
- package/dist/entities/custom-gcode.entity.js.map +1 -1
- package/dist/entities/floor-position.entity.js.map +1 -1
- package/dist/entities/floor.entity.js.map +1 -1
- package/dist/entities/group.entity.js.map +1 -1
- package/dist/entities/index.js.map +1 -1
- package/dist/entities/permission.entity.js.map +1 -1
- package/dist/entities/print-completion.entity.js.map +1 -1
- package/dist/entities/printer-file.entity.js.map +1 -1
- package/dist/entities/printer-group.entity.js.map +1 -1
- package/dist/entities/printer.entity.js.map +1 -1
- package/dist/entities/refresh-token.entity.js.map +1 -1
- package/dist/entities/role.entity.js.map +1 -1
- package/dist/entities/settings.entity.js.map +1 -1
- package/dist/entities/user-role.entity.js.map +1 -1
- package/dist/entities/user.entity.js.map +1 -1
- package/dist/exceptions/failed-dependency.exception.js +20 -0
- package/dist/exceptions/failed-dependency.exception.js.map +1 -0
- package/dist/exceptions/job.exceptions.js.map +1 -1
- package/dist/exceptions/runtime.exceptions.js +3 -1
- package/dist/exceptions/runtime.exceptions.js.map +1 -1
- package/dist/handlers/cache-manager.js.map +1 -1
- package/dist/handlers/event-emitter.js.map +1 -1
- package/dist/handlers/logger-factory.js.map +1 -1
- package/dist/handlers/logger.js.map +1 -1
- package/dist/handlers/validators.js.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/middleware/authenticate.js +1 -2
- package/dist/middleware/authenticate.js.map +1 -1
- package/dist/middleware/database.js.map +1 -1
- package/dist/middleware/demo.middleware.js.map +1 -1
- package/dist/middleware/exception.filter.js +9 -0
- package/dist/middleware/exception.filter.js.map +1 -1
- package/dist/middleware/global.middleware.js +4 -4
- package/dist/middleware/global.middleware.js.map +1 -1
- package/dist/middleware/passport.js.map +1 -1
- package/dist/middleware/printer.js.map +1 -1
- package/dist/migrations/1706829146617-InitSqlite.js.map +1 -1
- package/dist/migrations/1707494762198-PrinterGroup.js.map +1 -1
- package/dist/migrations/1708465930665-ChangePrintCompletionDeletePrinterCascade.js.map +1 -1
- package/dist/models/Auth/Permission.js.map +1 -1
- package/dist/models/Auth/RefreshToken.js.map +1 -1
- package/dist/models/Auth/Role.js.map +1 -1
- package/dist/models/Auth/User.js.map +1 -1
- package/dist/models/CameraStream.js.map +1 -1
- package/dist/models/CustomGcode.js.map +1 -1
- package/dist/models/Floor.js.map +1 -1
- package/dist/models/FloorPrinter.js.map +1 -1
- package/dist/models/PrintCompletion.js.map +1 -1
- package/dist/models/Printer.js.map +1 -1
- package/dist/models/PrinterFile.js.map +1 -1
- package/dist/models/Settings.js.map +1 -1
- package/dist/models/index.js.map +1 -1
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js.map +1 -1
- package/dist/mongo-migrations/20210907173950-printers-enabled.js.map +1 -1
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js.map +1 -1
- package/dist/mongo-migrations/20230414141005-floor-remove-groupinfloor.js.map +1 -1
- package/dist/mongo-migrations/20230427202911-printer-remove-sortindex.js.map +1 -1
- package/dist/mongo-migrations/20230716065316-user-remove-name.js.map +1 -1
- package/dist/mongo-migrations/20231111081809-printer-flatten-name.js.map +1 -1
- package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js.map +1 -1
- package/dist/mongo-migrations/20231202183902-printer-files-simpler.js.map +1 -1
- package/dist/server.constants.js +1 -1
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js.map +1 -1
- package/dist/server.env.js +3 -3
- package/dist/server.env.js.map +1 -1
- package/dist/server.host.js +3 -1
- package/dist/server.host.js.map +1 -1
- package/dist/services/authentication/auth.service.js +2 -0
- package/dist/services/authentication/auth.service.js.map +1 -1
- package/dist/services/authentication/jwt.service.js.map +1 -1
- package/dist/services/authentication/permission.service.js +2 -2
- package/dist/services/authentication/permission.service.js.map +1 -1
- package/dist/services/authentication/refresh-token.service.js.map +1 -1
- package/dist/services/authentication/role.service.js +7 -9
- package/dist/services/authentication/role.service.js.map +1 -1
- package/dist/services/authentication/user.service.js +5 -5
- package/dist/services/authentication/user.service.js.map +1 -1
- package/dist/services/batch-call.service.js +2 -0
- package/dist/services/batch-call.service.js.map +1 -1
- package/dist/services/camera-stream.service.js +1 -1
- package/dist/services/camera-stream.service.js.map +1 -1
- package/dist/services/core/client-bundle.service.js +8 -2
- package/dist/services/core/client-bundle.service.js.map +1 -1
- package/dist/services/core/config.service.js.map +1 -1
- package/dist/services/core/github.service.js +3 -0
- package/dist/services/core/github.service.js.map +1 -1
- package/dist/services/core/logs-manager.service.js +3 -3
- package/dist/services/core/logs-manager.service.js.map +1 -1
- package/dist/services/core/monsterpi.service.js.map +1 -1
- package/dist/services/core/multer.service.js.map +1 -1
- package/dist/services/core/server-release.service.js +15 -15
- package/dist/services/core/server-release.service.js.map +1 -1
- package/dist/services/core/server-update.service.js.map +1 -1
- package/dist/services/core/task-manager.service.js.map +1 -1
- package/dist/services/core/yaml.service.js +37 -13
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/custom-gcode.service.js +1 -1
- package/dist/services/custom-gcode.service.js.map +1 -1
- package/dist/services/floor.service.js +7 -17
- package/dist/services/floor.service.js.map +1 -1
- package/dist/services/influxdb-v2/influx-db-v2-base.service.js.map +1 -1
- package/dist/services/interfaces/auth.service.interface.js.map +1 -1
- package/dist/services/interfaces/camera-stream.dto.js.map +1 -1
- package/dist/services/interfaces/camera-stream.service.interface.js.map +1 -1
- package/dist/services/interfaces/custom-gcode.dto.js.map +1 -1
- package/dist/services/interfaces/custom-gcode.service.interface.js.map +1 -1
- package/dist/services/interfaces/floor.dto.js.map +1 -1
- package/dist/services/interfaces/floor.service.interface.js.map +1 -1
- package/dist/services/interfaces/gcode-analysis.dto.js.map +1 -1
- package/dist/services/interfaces/group.dto.js.map +1 -1
- package/dist/services/interfaces/jwt.service.interface.js.map +1 -1
- package/dist/services/interfaces/login.dto.js.map +1 -1
- package/dist/services/interfaces/page.interface.js.map +1 -1
- package/dist/services/interfaces/permission.dto.js.map +1 -1
- package/dist/services/interfaces/permission.service.interface.js.map +1 -1
- package/dist/services/interfaces/print-completion-context.dto.js.map +1 -1
- package/dist/services/interfaces/print-completion.dto.js.map +1 -1
- package/dist/services/interfaces/print-completion.interface.js.map +1 -1
- package/dist/services/interfaces/printer-file.dto.js.map +1 -1
- package/dist/services/interfaces/printer-files.service.interface.js.map +1 -1
- package/dist/services/interfaces/printer-group.dto.js.map +1 -1
- package/dist/services/interfaces/printer-group.service.interface.js.map +1 -1
- package/dist/services/interfaces/printer.dto.js.map +1 -1
- package/dist/services/interfaces/printer.service.interface.js.map +1 -1
- package/dist/services/interfaces/refresh-token.dto.js.map +1 -1
- package/dist/services/interfaces/refresh-token.service.interface.js.map +1 -1
- package/dist/services/interfaces/role-service.interface.js.map +1 -1
- package/dist/services/interfaces/role.dto.js.map +1 -1
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/interfaces/settings.service.interface.js.map +1 -1
- package/dist/services/interfaces/user-role.dto.js.map +1 -1
- package/dist/services/interfaces/user-service.interface.js.map +1 -1
- package/dist/services/interfaces/user.dto.js.map +1 -1
- package/dist/services/moonraker/dto/access/access-info.dto.js +6 -0
- package/dist/services/moonraker/dto/access/access-info.dto.js.map +1 -0
- package/dist/services/moonraker/dto/access/access-login-refresh.dto.js +6 -0
- package/dist/services/moonraker/dto/access/access-login-refresh.dto.js.map +1 -0
- package/dist/services/moonraker/dto/access/access-login-result.dto.js +6 -0
- package/dist/services/moonraker/dto/access/access-login-result.dto.js.map +1 -0
- package/dist/services/moonraker/dto/access/access-user-result.dto.js +6 -0
- package/dist/services/moonraker/dto/access/access-user-result.dto.js.map +1 -0
- package/dist/services/moonraker/dto/access/access-user.dto.js +6 -0
- package/dist/services/moonraker/dto/access/access-user.dto.js.map +1 -0
- package/dist/services/moonraker/dto/action-result.dto.js +6 -0
- package/dist/services/moonraker/dto/action-result.dto.js.map +1 -0
- package/dist/services/moonraker/dto/database/database-namespace-item.dto.js +6 -0
- package/dist/services/moonraker/dto/database/database-namespace-item.dto.js.map +1 -0
- package/dist/services/moonraker/dto/database/database-namespace-list.dto.js +6 -0
- package/dist/services/moonraker/dto/database/database-namespace-list.dto.js.map +1 -0
- package/dist/services/moonraker/dto/gcode-help.dto.js +6 -0
- package/dist/services/moonraker/dto/gcode-help.dto.js.map +1 -0
- package/dist/services/moonraker/dto/gcode-store.dto.js +6 -0
- package/dist/services/moonraker/dto/gcode-store.dto.js.map +1 -0
- package/dist/services/moonraker/dto/job-queue/enqueue-job.dto.js +6 -0
- package/dist/services/moonraker/dto/job-queue/enqueue-job.dto.js.map +1 -0
- package/dist/services/moonraker/dto/job-queue/job-queue-status.dto.js +6 -0
- package/dist/services/moonraker/dto/job-queue/job-queue-status.dto.js.map +1 -0
- package/dist/services/moonraker/dto/machine/machine-device-power-device-state.dto.js +6 -0
- package/dist/services/moonraker/dto/machine/machine-device-power-device-state.dto.js.map +1 -0
- package/dist/services/moonraker/dto/machine/machine-device-power-devices.dto.js +6 -0
- package/dist/services/moonraker/dto/machine/machine-device-power-devices.dto.js.map +1 -0
- package/dist/services/moonraker/dto/machine/machine-peripherals-canbus.dto.js +6 -0
- package/dist/services/moonraker/dto/machine/machine-peripherals-canbus.dto.js.map +1 -0
- package/dist/services/moonraker/dto/machine/machine-peripherals-serial.dto.js +6 -0
- package/dist/services/moonraker/dto/machine/machine-peripherals-serial.dto.js.map +1 -0
- package/dist/services/moonraker/dto/machine/machine-peripherals-usb.dto.js +6 -0
- package/dist/services/moonraker/dto/machine/machine-peripherals-usb.dto.js.map +1 -0
- package/dist/services/moonraker/dto/machine/machine-peripherals-video.dto.js +6 -0
- package/dist/services/moonraker/dto/machine/machine-peripherals-video.dto.js.map +1 -0
- package/dist/services/moonraker/dto/machine/machine-system-info.dto.js +6 -0
- package/dist/services/moonraker/dto/machine/machine-system-info.dto.js.map +1 -0
- package/dist/services/moonraker/dto/machine/machine-update-status.dto.js +6 -0
- package/dist/services/moonraker/dto/machine/machine-update-status.dto.js.map +1 -0
- package/dist/services/moonraker/dto/machine/machine-wled-strips.dto.js +6 -0
- package/dist/services/moonraker/dto/machine/machine-wled-strips.dto.js.map +1 -0
- package/dist/services/moonraker/dto/notifier-list.dto.js +6 -0
- package/dist/services/moonraker/dto/notifier-list.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/extruder.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/extruder.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/gcode-move.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/gcode-move.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/printer-objects-list.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/printer-objects-list.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/printer-objects-query.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/printer-objects-query.dto.js.map +1 -0
- package/dist/services/moonraker/dto/objects/toolhead.dto.js +6 -0
- package/dist/services/moonraker/dto/objects/toolhead.dto.js.map +1 -0
- package/dist/services/moonraker/dto/octoprint-compat/api-job.dto.js +6 -0
- package/dist/services/moonraker/dto/octoprint-compat/api-job.dto.js.map +1 -0
- package/dist/services/moonraker/dto/octoprint-compat/api-login.dto.js +6 -0
- package/dist/services/moonraker/dto/octoprint-compat/api-login.dto.js.map +1 -0
- package/dist/services/moonraker/dto/octoprint-compat/api-printer.dto.js +6 -0
- package/dist/services/moonraker/dto/octoprint-compat/api-printer.dto.js.map +1 -0
- package/dist/services/moonraker/dto/octoprint-compat/api-profiles.dto.js +6 -0
- package/dist/services/moonraker/dto/octoprint-compat/api-profiles.dto.js.map +1 -0
- package/dist/services/moonraker/dto/octoprint-compat/api-settings.dto.js +6 -0
- package/dist/services/moonraker/dto/octoprint-compat/api-settings.dto.js.map +1 -0
- package/dist/services/moonraker/dto/octoprint-compat/api-version.dto.js +6 -0
- package/dist/services/moonraker/dto/octoprint-compat/api-version.dto.js.map +1 -0
- package/dist/services/moonraker/dto/octoprint-compat/server-version.dto.js +6 -0
- package/dist/services/moonraker/dto/octoprint-compat/server-version.dto.js.map +1 -0
- package/dist/services/moonraker/dto/printer-info.dto.js +6 -0
- package/dist/services/moonraker/dto/printer-info.dto.js.map +1 -0
- package/dist/services/moonraker/dto/printer-query-endstops.dto.js +6 -0
- package/dist/services/moonraker/dto/printer-query-endstops.dto.js.map +1 -0
- package/dist/services/moonraker/dto/process-stats.dto.js +6 -0
- package/dist/services/moonraker/dto/process-stats.dto.js.map +1 -0
- package/dist/services/moonraker/dto/result.dto.js +15 -0
- package/dist/services/moonraker/dto/result.dto.js.map +1 -0
- package/dist/services/moonraker/dto/rollover-logs.dto.js +6 -0
- package/dist/services/moonraker/dto/rollover-logs.dto.js.map +1 -0
- package/dist/services/moonraker/dto/rpc/json-rpc-error.dto.js +6 -0
- package/dist/services/moonraker/dto/rpc/json-rpc-error.dto.js.map +1 -0
- package/dist/services/moonraker/dto/rpc/json-rpc-request.dto.js +6 -0
- package/dist/services/moonraker/dto/rpc/json-rpc-request.dto.js.map +1 -0
- package/dist/services/moonraker/dto/rpc/json-rpc-response.dto.js +6 -0
- package/dist/services/moonraker/dto/rpc/json-rpc-response.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server/server-config.dto.js +6 -0
- package/dist/services/moonraker/dto/server/server-config.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server/server-info.dto.js +6 -0
- package/dist/services/moonraker/dto/server/server-info.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-announcements/announcement-action.dto.js +6 -0
- package/dist/services/moonraker/dto/server-announcements/announcement-action.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-announcements/announcement-entry-id.dto.js +6 -0
- package/dist/services/moonraker/dto/server-announcements/announcement-entry-id.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-announcements/announcement-feeds.dto.js +6 -0
- package/dist/services/moonraker/dto/server-announcements/announcement-feeds.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-announcements/announcement-list.dto.js +6 -0
- package/dist/services/moonraker/dto/server-announcements/announcement-list.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-files/server-file-directory-action.dto.js +6 -0
- package/dist/services/moonraker/dto/server-files/server-file-directory-action.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-files/server-file-directory-info.dto.js +6 -0
- package/dist/services/moonraker/dto/server-files/server-file-directory-info.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-files/server-file-metadata.dto.js +6 -0
- package/dist/services/moonraker/dto/server-files/server-file-metadata.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-files/server-file-root.dto.js +6 -0
- package/dist/services/moonraker/dto/server-files/server-file-root.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-files/server-file-thumbnail.dto.js +6 -0
- package/dist/services/moonraker/dto/server-files/server-file-thumbnail.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-files/server-file-zip-action.dto.js +6 -0
- package/dist/services/moonraker/dto/server-files/server-file-zip-action.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-files/server-file.dto.js +6 -0
- package/dist/services/moonraker/dto/server-files/server-file.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-history/history-job.dto.js +6 -0
- package/dist/services/moonraker/dto/server-history/history-job.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-history/history-last-totals.dto.js +6 -0
- package/dist/services/moonraker/dto/server-history/history-last-totals.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-history/history-list.dto.js +6 -0
- package/dist/services/moonraker/dto/server-history/history-list.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-history/history-totals.dto.js +6 -0
- package/dist/services/moonraker/dto/server-history/history-totals.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-sensors/sensor-info.dto.js +6 -0
- package/dist/services/moonraker/dto/server-sensors/sensor-info.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-sensors/sensor-list.dto.js +6 -0
- package/dist/services/moonraker/dto/server-sensors/sensor-list.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-sensors/sensor-measurements.dto.js +6 -0
- package/dist/services/moonraker/dto/server-sensors/sensor-measurements.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-webcams/webcam-item.dto.js +6 -0
- package/dist/services/moonraker/dto/server-webcams/webcam-item.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-webcams/webcam-list.dto.js +6 -0
- package/dist/services/moonraker/dto/server-webcams/webcam-list.dto.js.map +1 -0
- package/dist/services/moonraker/dto/server-webcams/webcam-test.dto.js +6 -0
- package/dist/services/moonraker/dto/server-webcams/webcam-test.dto.js.map +1 -0
- package/dist/services/moonraker/dto/spoolman/spoolman-active-spool.dto.js +6 -0
- package/dist/services/moonraker/dto/spoolman/spoolman-active-spool.dto.js.map +1 -0
- package/dist/services/moonraker/dto/spoolman/spoolman-proxy-request.dto.js +6 -0
- package/dist/services/moonraker/dto/spoolman/spoolman-proxy-request.dto.js.map +1 -0
- package/dist/services/moonraker/dto/spoolman/spoolman-response.dto.js +6 -0
- package/dist/services/moonraker/dto/spoolman/spoolman-response.dto.js.map +1 -0
- package/dist/services/moonraker/dto/spoolman/spoolman-status.dto.js +6 -0
- package/dist/services/moonraker/dto/spoolman/spoolman-status.dto.js.map +1 -0
- package/dist/services/moonraker/dto/sudo-info.dto.js +6 -0
- package/dist/services/moonraker/dto/sudo-info.dto.js.map +1 -0
- package/dist/services/moonraker/dto/sudo-response.dto.js +6 -0
- package/dist/services/moonraker/dto/sudo-response.dto.js.map +1 -0
- package/dist/services/moonraker/dto/temperature-store.dto.js +6 -0
- package/dist/services/moonraker/dto/temperature-store.dto.js.map +1 -0
- package/dist/services/moonraker/moonraker-subscription.client.js +33 -0
- package/dist/services/moonraker/moonraker-subscription.client.js.map +1 -0
- package/dist/services/moonraker/moonraker.client.js +507 -0
- package/dist/services/moonraker/moonraker.client.js.map +1 -0
- package/dist/services/octoprint/constants/firmware-update-settings.constants.js.map +1 -1
- package/dist/services/octoprint/constants/octoprint-service.constants.js +0 -31
- package/dist/services/octoprint/constants/octoprint-service.constants.js.map +1 -1
- package/dist/services/octoprint/constants/octoprint-websocket.constants.js.map +1 -1
- package/dist/services/octoprint/dto/connection-state.dto.js.map +1 -1
- package/dist/services/octoprint/dto/connection.dto.js.map +1 -1
- package/dist/services/octoprint/dto/octoprint-currentuser.dto.js.map +1 -1
- package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -1
- package/dist/services/octoprint/dto/octoprint-file.dto.js.map +1 -1
- package/dist/services/octoprint/dto/octoprint-files.dto.js.map +1 -1
- package/dist/services/octoprint/dto/octoprint-session.dto.js.map +1 -1
- package/dist/services/octoprint/dto/octoprint-settings.dto.js.map +1 -1
- package/dist/services/octoprint/dto/octoprint-system-info.dto.js.map +1 -1
- package/dist/services/octoprint/dto/state.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/connection-message.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/current-message.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/event-message.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/event.type.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/client-authed.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/client-closed.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/client-opened.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/dwelling.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/file-added.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/file-deselected.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/file-removed.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/folder-added.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/home.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/metadata-analysis-finished.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/metadata-analysis-started.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/metadata-statistics-updated.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/position-update.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/print-cancelled.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/print-cancelling.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/print-done.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/print-failed.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/print-paused.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/print-resumed.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/print-started.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/printer-state-changed.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/transfer-done.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/transfer-started.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/updated-files.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/upload.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/user-logged-in.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/events/z-change.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/history-message.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/plugin-message.dto.js.map +1 -1
- package/dist/services/octoprint/dto/websocket-output/timelapse-message.dto.js.map +1 -1
- package/dist/services/octoprint/models/octoprint-file.dto.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.routes.js +2 -0
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.service.js +17 -6
- package/dist/services/octoprint/octoprint-api.service.js.map +1 -1
- package/dist/services/octoprint/octoprint-sockio.adapter.js +5 -5
- package/dist/services/octoprint/octoprint-sockio.adapter.js.map +1 -1
- package/dist/services/octoprint/plugin-base.service.js.map +1 -1
- package/dist/services/octoprint/plugin-firmware-update.service.js +1 -1
- package/dist/services/octoprint/plugin-firmware-update.service.js.map +1 -1
- package/dist/services/octoprint/plugin-repository.cache.js +1 -1
- package/dist/services/octoprint/plugin-repository.cache.js.map +1 -1
- package/dist/services/octoprint/socket.factory.js.map +1 -1
- package/dist/services/octoprint/utils/api.utils.js.map +1 -1
- package/dist/services/octoprint/utils/file.utils.js.map +1 -1
- package/dist/services/orm/base.interface.js.map +1 -1
- package/dist/services/orm/base.service.js +8 -5
- package/dist/services/orm/base.service.js.map +1 -1
- package/dist/services/orm/camera-stream.service.js +1 -1
- package/dist/services/orm/camera-stream.service.js.map +1 -1
- package/dist/services/orm/custom-gcode.service.js +1 -1
- package/dist/services/orm/custom-gcode.service.js.map +1 -1
- package/dist/services/orm/floor-position.service.js +3 -2
- package/dist/services/orm/floor-position.service.js.map +1 -1
- package/dist/services/orm/floor.service.js +36 -15
- package/dist/services/orm/floor.service.js.map +1 -1
- package/dist/services/orm/permission.service.js +2 -2
- package/dist/services/orm/permission.service.js.map +1 -1
- package/dist/services/orm/print-completion.service.js.map +1 -1
- package/dist/services/orm/printer-files.service.js +4 -3
- package/dist/services/orm/printer-files.service.js.map +1 -1
- package/dist/services/orm/printer-group.service.js.map +1 -1
- package/dist/services/orm/printer.service.js +2 -2
- package/dist/services/orm/printer.service.js.map +1 -1
- package/dist/services/orm/refresh-token.service.js +4 -4
- package/dist/services/orm/refresh-token.service.js.map +1 -1
- package/dist/services/orm/role.service.js +10 -10
- package/dist/services/orm/role.service.js.map +1 -1
- package/dist/services/orm/settings.service.js.map +1 -1
- package/dist/services/orm/user-role.service.js.map +1 -1
- package/dist/services/orm/user.service.js.map +1 -1
- package/dist/services/orm-migration.service.js.map +1 -1
- package/dist/services/print-completion.service.js.map +1 -1
- package/dist/services/print-completion.shared.js.map +1 -1
- package/dist/services/printer-files.service.js +1 -1
- package/dist/services/printer-files.service.js.map +1 -1
- package/dist/services/printer.service.js +4 -19
- package/dist/services/printer.service.js.map +1 -1
- package/dist/services/settings.service.js.map +1 -1
- package/dist/services/typeorm/typeorm.service.js.map +1 -1
- package/dist/services/validators/floor-service.validation.js.map +1 -1
- package/dist/services/validators/print-completion-service.validation.js.map +1 -1
- package/dist/services/validators/printer-service.validation.js.map +1 -1
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/services/validators/user-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/shared/dtos/printer-login.dto.js.map +1 -1
- package/dist/shared/websocket.adapter.js.map +1 -1
- package/dist/shared.constants.js.map +1 -1
- package/dist/state/file-upload-tracker.cache.js +1 -1
- package/dist/state/file-upload-tracker.cache.js.map +1 -1
- package/dist/state/file.cache.js +3 -3
- package/dist/state/file.cache.js.map +1 -1
- package/dist/state/floor.store.js.map +1 -1
- package/dist/state/printer-connection.cache.js.map +1 -1
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/printer-files.store.js +5 -3
- package/dist/state/printer-files.store.js.map +1 -1
- package/dist/state/printer-socket.store.js +4 -3
- package/dist/state/printer-socket.store.js.map +1 -1
- package/dist/state/printer.cache.js +2 -2
- package/dist/state/printer.cache.js.map +1 -1
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/socket-io.gateway.js +2 -2
- package/dist/state/socket-io.gateway.js.map +1 -1
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/dist/state/validation/create-test-printer.validation.js.map +1 -1
- package/dist/task.presets.js.map +1 -1
- package/dist/tasks/boot.task.js +0 -1
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/client-bundle.task.js.map +1 -1
- package/dist/tasks/print-completion.socketio.task.js.map +1 -1
- package/dist/tasks/printer-file-clean.task.js +2 -2
- package/dist/tasks/printer-file-clean.task.js.map +1 -1
- package/dist/tasks/printer-state-update-poll.task.js.map +1 -1
- package/dist/tasks/printer-websocket-restore.task.js +5 -3
- package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
- package/dist/tasks/printer-websocket.task.js.map +1 -1
- package/dist/tasks/socketio.task.js.map +1 -1
- package/dist/tasks/software-update.task.js.map +1 -1
- package/dist/tasks.js.map +1 -1
- package/dist/types/express/index.d.js.map +1 -1
- package/dist/utils/array.util.js.map +1 -1
- package/dist/utils/benchmark.util.js.map +1 -1
- package/dist/utils/cache/key-diff.cache.js.map +1 -1
- package/dist/utils/correlation-token.util.js.map +1 -1
- package/dist/utils/crypto.utils.js.map +1 -1
- package/dist/utils/env.utils.js.map +1 -1
- package/dist/utils/error.utils.js.map +1 -1
- package/dist/utils/fs.utils.js.map +1 -1
- package/dist/utils/is-docker.js.map +1 -1
- package/dist/utils/metric.utils.js.map +1 -1
- package/dist/utils/normalize-url.js.map +1 -1
- package/dist/utils/semver.utils.js.map +1 -1
- package/dist/utils/time.utils.js.map +1 -1
- package/dist/utils/url.utils.js.map +1 -1
- package/package.json +29 -29
|
@@ -160,6 +160,7 @@ class BatchCallService {
|
|
|
160
160
|
reprintState: 2
|
|
161
161
|
});
|
|
162
162
|
} catch (e) {
|
|
163
|
+
(0, _node.captureException)(e);
|
|
163
164
|
return resolve({
|
|
164
165
|
connectionState: null,
|
|
165
166
|
printerId,
|
|
@@ -184,6 +185,7 @@ class BatchCallService {
|
|
|
184
185
|
time: Date.now() - time
|
|
185
186
|
};
|
|
186
187
|
}).catch((e)=>{
|
|
188
|
+
(0, _node.captureException)(e);
|
|
187
189
|
return {
|
|
188
190
|
failure: true,
|
|
189
191
|
error: e.message,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/batch-call.service.ts"],"names":["BatchCallService","ReprintState","octoPrintApiService","printerSocketStore","printerCache","printerEventsCache","printerFilesStore","printerService","logger","constructor","loggerFactory","name","batchTogglePrintersEnabled","printerIds","enabled","promises","printerId","promise","printerDto","getValue","time","Date","now","disabledReason","length","updateEnabled","then","success","catch","e","failure","error","message","push","Promise","all","batchConnectSocket","reconnectOctoPrint","captureException","errorSummary","batchSettingsGet","printerLogin","getLoginDtoAsync","getSettings","r","value","batchConnectUsb","command","connectCommand","sendConnectionCommand","getBatchPrinterReprintFile","resolve","_","login","files","getLocalFiles","filter","f","prints","last","date","connected","getConnection","connectionState","current","state","reprintState","file","batchReprintCalls","printerIdFileList","printerIdFile","path","selectPrintFile"],"mappings":"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
|
|
1
|
+
{"version":3,"sources":["../../src/services/batch-call.service.ts"],"names":["BatchCallService","ReprintState","octoPrintApiService","printerSocketStore","printerCache","printerEventsCache","printerFilesStore","printerService","logger","constructor","loggerFactory","name","batchTogglePrintersEnabled","printerIds","enabled","promises","printerId","promise","printerDto","getValue","time","Date","now","disabledReason","length","updateEnabled","then","success","catch","e","failure","error","message","push","Promise","all","batchConnectSocket","reconnectOctoPrint","captureException","errorSummary","batchSettingsGet","printerLogin","getLoginDtoAsync","getSettings","r","value","batchConnectUsb","command","connectCommand","sendConnectionCommand","getBatchPrinterReprintFile","resolve","_","login","files","getLocalFiles","filter","f","prints","last","date","connected","getConnection","connectionState","current","state","reprintState","file","batchReprintCalls","printerIdFileList","printerIdFile","path","selectPrintFile"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
|
|
@@ -28,7 +28,7 @@ class CameraStreamService {
|
|
|
28
28
|
async get(id, throwError = true) {
|
|
29
29
|
const cameraStream = await this.model.findById(id);
|
|
30
30
|
if (!cameraStream && throwError) {
|
|
31
|
-
throw new _runtimeexceptions.NotFoundException(`Floor with
|
|
31
|
+
throw new _runtimeexceptions.NotFoundException(`Floor with provided id does not exist`, "CameraStream");
|
|
32
32
|
}
|
|
33
33
|
return cameraStream;
|
|
34
34
|
}
|
|
@@ -1 +1 @@
|
|
|
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;AAQlC,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,
|
|
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"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAgBaA;;;eAAAA;;;wBAhBgB;4BACC;mCACI;AAQlC,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,qCAAqC,CAAC,EAAE;QACvE;QAEA,OAAOF;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,MAAM,IAAI,CAACP,KAAK,CAACkB,iBAAiB,CAACX;IACrC;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"}
|
|
@@ -18,6 +18,7 @@ const _serverconstants = require("../../server.constants");
|
|
|
18
18
|
const _semver = require("semver");
|
|
19
19
|
const _errorutils = require("../../utils/error.utils");
|
|
20
20
|
const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
|
|
21
|
+
const _octokit = require("octokit");
|
|
21
22
|
function _interop_require_default(obj) {
|
|
22
23
|
return obj && obj.__esModule ? obj : {
|
|
23
24
|
default: obj
|
|
@@ -55,8 +56,13 @@ class ClientBundleService {
|
|
|
55
56
|
releases: result.data
|
|
56
57
|
};
|
|
57
58
|
} catch (e) {
|
|
58
|
-
|
|
59
|
-
|
|
59
|
+
if (e instanceof _octokit.RequestError) {
|
|
60
|
+
this.logger.error(`Github OctoKit error ${(0, _errorutils.errorSummary)(e)}`);
|
|
61
|
+
throw new _runtimeexceptions.ExternalServiceError({
|
|
62
|
+
error: "Github OctoKit error: " + e.message
|
|
63
|
+
}, "GitHub");
|
|
64
|
+
}
|
|
65
|
+
throw new _runtimeexceptions.InternalServerException("Something went wrong with the request to Github");
|
|
60
66
|
}
|
|
61
67
|
}
|
|
62
68
|
async shouldUpdateWithReason(overrideAutoUpdate, minimumVersion, requestedVersion, allowDowngrade) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/client-bundle.service.ts"],"names":["ClientBundleService","githubService","configService","logger","constructor","loggerFactory","name","clientPackageJsonPath","join","superRootPath","AppConstants","defaultClientBundleStorage","clientIndexHtmlPath","getReleases","githubOwner","orgName","githubRepo","clientRepoName","result","latestResult","getLatestRelease","minimum","tag_name","defaultClientMinimum","current","getClientVersion","latest","data","releases","e","error","errorSummary","ExternalServiceError","shouldUpdateWithReason","overrideAutoUpdate","minimumVersion","requestedVersion","allowDowngrade","clientAutoUpdate","enableClientDistAutoUpdateKey","existingClientVersion","shouldUpdate","currentVersion","targetVersion","reason","getMaximumOfVersionsSafe","doesClientIndexHtmlExist","satisfiesMinimumVersion","checkVersionSatisfiesMinimum","clientOutdated","clientOutdatedResponse","minimumComparison","compare","newComparison","isDowngrade","downloadClientUpdate","releaseTag","release","getClientBundleRelease","log","assets","length","map","a","assetName","asset","find","NotFoundException","assetId","id","downloadPath","downloadClientBundleZip","extractClientBundleZip","getReleaseByTag","assetResult","requestAsset","dir","defaultClientBundleZipsStorage","ensureDirExists","path","writeFileSync","Buffer","from","downloadedZipPath","distPath","zip","AdmZip","debug","fileOrDir","readdir","rm","force","recursive","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/client-bundle.service.ts"],"names":["ClientBundleService","githubService","configService","logger","constructor","loggerFactory","name","clientPackageJsonPath","join","superRootPath","AppConstants","defaultClientBundleStorage","clientIndexHtmlPath","getReleases","githubOwner","orgName","githubRepo","clientRepoName","result","latestResult","getLatestRelease","minimum","tag_name","defaultClientMinimum","current","getClientVersion","latest","data","releases","e","RequestError","error","errorSummary","ExternalServiceError","message","InternalServerException","shouldUpdateWithReason","overrideAutoUpdate","minimumVersion","requestedVersion","allowDowngrade","clientAutoUpdate","enableClientDistAutoUpdateKey","existingClientVersion","shouldUpdate","currentVersion","targetVersion","reason","getMaximumOfVersionsSafe","doesClientIndexHtmlExist","satisfiesMinimumVersion","checkVersionSatisfiesMinimum","clientOutdated","clientOutdatedResponse","minimumComparison","compare","newComparison","isDowngrade","downloadClientUpdate","releaseTag","release","getClientBundleRelease","log","assets","length","map","a","assetName","asset","find","NotFoundException","assetId","id","downloadPath","downloadClientBundleZip","extractClientBundleZip","getReleaseByTag","assetResult","requestAsset","dir","defaultClientBundleZipsStorage","ensureDirExists","path","writeFileSync","Buffer","from","downloadedZipPath","distPath","zip","AdmZip","debug","fileOrDir","readdir","rm","force","recursive","stack","extractAllTo","indexHtmlPath","existsSync","packageJsonPath","packageJsonFound","require","cache","undefined","json","version"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
|
|
@@ -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","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"}
|
|
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"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;","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"}
|
|
@@ -20,6 +20,9 @@ class GithubService {
|
|
|
20
20
|
const result = await this.octokitService.auth();
|
|
21
21
|
return result?.type === "token";
|
|
22
22
|
}
|
|
23
|
+
async getRateLimit() {
|
|
24
|
+
return this.octokitService.rest.rateLimit.get();
|
|
25
|
+
}
|
|
23
26
|
async getLatestRelease(owner, repo) {
|
|
24
27
|
try {
|
|
25
28
|
return await this.octokitService.rest.repos.getLatestRelease({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/github.service.ts"],"names":["GithubService","octokitService","logger","constructor","loggerFactory","name","wasAuthenticated","result","auth","type","getLatestRelease","owner","repo","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/github.service.ts"],"names":["GithubService","octokitService","logger","constructor","loggerFactory","name","wasAuthenticated","result","auth","type","getRateLimit","rest","rateLimit","get","getLatestRelease","owner","repo","repos","e","status","NotFoundException","getReleases","listReleases","getReleaseByTag","tag","catch","requestAsset","assetId","request","headers","Accept","asset_id"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAKaA;;;eAAAA;;;mCALqB;AAK3B,MAAMA;IACXC,eAAwB;IACxBC,OAAsB;IAEtBC,YAAY,EAAEC,aAAa,EAAEH,cAAc,EAA8D,CAAE;QACzG,IAAI,CAACC,MAAM,GAAGE,cAAcJ,cAAcK,IAAI,EAAE;QAChD,IAAI,CAACJ,cAAc,GAAGA;IACxB;IAEA,MAAMK,mBAAmB;QACvB,MAAMC,SAAS,MAAM,IAAI,CAACN,cAAc,CAACO,IAAI;QAC7C,OAAOD,QAAQE,SAAS;IAC1B;IAEA,MAAMC,eAAe;QACnB,OAAO,IAAI,CAACT,cAAc,CAACU,IAAI,CAACC,SAAS,CAACC,GAAG;IAC/C;IAEA,MAAMC,iBAAiBC,KAAa,EAAEC,IAAY,EAAE;QAClD,IAAI;YACF,OAAO,MAAM,IAAI,CAACf,cAAc,CAACU,IAAI,CAACM,KAAK,CAACH,gBAAgB,CAAC;gBAC3DC;gBACAC;YACF;QACF,EAAE,OAAOE,GAAG;YACV,IAAIA,GAAGb,SAAS,eAAea,EAAEC,MAAM,IAAI,KAAK;gBAC9C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,6BAA6B,CAAC;YAC7D;YAEA,MAAMF;QACR;IACF;IAEA,MAAMG,YAAYN,KAAa,EAAEC,IAAY,EAAE;QAC7C,IAAI;YACF,OAAO,MAAM,IAAI,CAACf,cAAc,CAACU,IAAI,CAACM,KAAK,CAACK,YAAY,CAAC;gBACvDP;gBACAC;YACF;QACF,EAAE,OAAOE,GAAG;YACV,IAAIA,GAAGb,SAAS,eAAea,EAAEC,MAAM,IAAI,KAAK;gBAC9C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,uBAAuB,CAAC;YACvD;YAEA,MAAMF;QACR;IACF;IAEA,MAAMK,gBAAgBR,KAAa,EAAEC,IAAY,EAAEQ,GAAW,EAAE;QAC9D,OAAO,MAAM,IAAI,CAACvB,cAAc,CAACU,IAAI,CAACM,KAAK,CACxCM,eAAe,CAAC;YACfR;YACAC;YACAQ;QACF,GACCC,KAAK,CAAC,CAACP;YACN,IAAIA,EAAEb,IAAI,KAAK,eAAea,EAAEC,MAAM,IAAI,KAAK;gBAC7C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,gCAAgC,EAAEI,IAAI,CAAC;YACtE;YAEA,MAAMN;QACR;IACJ;IAEA,MAAMQ,aAAaX,KAAa,EAAEC,IAAY,EAAEW,OAAY,EAAE;QAC5D,OAAO,MAAM,IAAI,CAAC1B,cAAc,CAC7B2B,OAAO,CAAC,qDAAqD;YAC5DC,SAAS;gBACPC,QAAQ;YACV;YACAf;YACAC;YACAe,UAAUJ;QACZ,GACCF,KAAK,CAAC,CAACP;YACN,IAAIA,EAAEb,IAAI,KAAK,eAAea,EAAEC,MAAM,IAAI,KAAK;gBAC7C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,6BAA6B,EAAEO,QAAQ,CAAC;YACvE;YAEA,MAAMT;QACR;IACJ;AACF"}
|
|
@@ -39,7 +39,7 @@ class LogDumpService {
|
|
|
39
39
|
const strippedFilename = f.replace(".log", "").replace(startingFormat, "");
|
|
40
40
|
const date = new Date(strippedFilename);
|
|
41
41
|
if (!(0, _timeutils.isValidDate)(date)) {
|
|
42
|
-
this.logger.warn(
|
|
42
|
+
this.logger.warn("Failed to parse date from log file, removing it as outdated");
|
|
43
43
|
return true;
|
|
44
44
|
}
|
|
45
45
|
const now = new Date();
|
|
@@ -54,7 +54,7 @@ class LogDumpService {
|
|
|
54
54
|
(0, _fs.unlinkSync)((0, _path.join)(path, file));
|
|
55
55
|
removedWrongFormatFilesCount++;
|
|
56
56
|
} catch (err) {
|
|
57
|
-
this.logger.warn(`Failed to delete log file
|
|
57
|
+
this.logger.warn(`Failed to delete log file`);
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
let removedOutdatedFilesCount = 0;
|
|
@@ -63,7 +63,7 @@ class LogDumpService {
|
|
|
63
63
|
(0, _fs.unlinkSync)((0, _path.join)(path, file));
|
|
64
64
|
removedOutdatedFilesCount++;
|
|
65
65
|
} catch (err) {
|
|
66
|
-
this.logger.warn(`Failed to delete log file
|
|
66
|
+
this.logger.warn(`Failed to delete log file`);
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
69
|
this.logger.log(`Removed ${removedWrongFormatFilesCount + removedOutdatedFilesCount} log file(s)`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/logs-manager.service.ts"],"names":["LogDumpService","logger","constructor","loggerFactory","name","deleteOlderThanWeekAndMismatchingLogFiles","log","path","join","superRootPath","AppConstants","defaultLogsFolder","dirEntries","readdirSync","withFileTypes","files","filter","dirent","isFile","map","startingFormat","logAppName","removedFilesNotInFormat","f","endsWith","startsWith","removedFilesOutdated","matchesFormat","strippedFilename","replace","date","Date","isValidDate","warn","now","diff","getTime","diffDays","length","removedWrongFormatFilesCount","file","unlinkSync","err","removedOutdatedFilesCount","dumpZip","zip","AdmZip","addLocalFolder","outputPath","defaultLogZipsFolder","serverRepoName","writeZip"],"mappings":";;;;+BASaA;;;eAAAA;;;iDATM;sBACE;oBACmB;yBACV;iCACD;2BACD;;;;;;AAIrB,MAAMA;IACXC,OAAsB;IAEtBC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACF,MAAM,GAAGE,cAAcH,eAAeI,IAAI;IACjD;IAEA,MAAMC,4CAA4C;QAChD,IAAI,CAACJ,MAAM,CAACK,GAAG,CAAC;QAChB,MAAMC,OAAOC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIC,6BAAY,CAACC,iBAAiB;QACjE,MAAMC,aAAaC,IAAAA,eAAW,EAACN,MAAM;YAAEO,eAAe;QAAK;QAC3D,MAAMC,QAAQH,WAAWI,MAAM,CAAC,CAACC,SAAWA,OAAOC,MAAM,IAAIC,GAAG,CAAC,CAACF,SAAWA,OAAOb,IAAI;QAGxF,MAAMgB,iBAAiB,CAAC,EAAEV,6BAAY,CAACW,UAAU,CAAC,CAAC,CAAC;QACpD,MAAMC,0BAA0BP,MAAMC,MAAM,CAAC,CAACO,IAAMA,EAAEC,QAAQ,CAAC,WAAW,CAACD,EAAEE,UAAU,CAACL;QACxF,MAAMM,uBAAuBX,MAAMC,MAAM,CAAC,CAACO;YACzC,MAAMI,gBAAgBJ,EAAEC,QAAQ,CAAC,WAAWD,EAAEE,UAAU,CAACL;YACzD,IAAI,CAACO,eAAe,OAAO;YAE3B,MAAMC,mBAAmBL,EAAEM,OAAO,CAAC,QAAQ,IAAIA,OAAO,CAACT,gBAAgB;YACvE,MAAMU,OAAO,IAAIC,KAAKH;YACtB,IAAI,CAACI,IAAAA,sBAAW,EAACF,OAAO;gBACtB,IAAI,CAAC7B,MAAM,CAACgC,IAAI,CAAC
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/logs-manager.service.ts"],"names":["LogDumpService","logger","constructor","loggerFactory","name","deleteOlderThanWeekAndMismatchingLogFiles","log","path","join","superRootPath","AppConstants","defaultLogsFolder","dirEntries","readdirSync","withFileTypes","files","filter","dirent","isFile","map","startingFormat","logAppName","removedFilesNotInFormat","f","endsWith","startsWith","removedFilesOutdated","matchesFormat","strippedFilename","replace","date","Date","isValidDate","warn","now","diff","getTime","diffDays","length","removedWrongFormatFilesCount","file","unlinkSync","err","removedOutdatedFilesCount","dumpZip","zip","AdmZip","addLocalFolder","outputPath","defaultLogZipsFolder","serverRepoName","writeZip"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/monsterpi.service.ts"],"names":["MonsterPiService","monsterPiVersion","logger","fileLocation","AppConstants","monsterPiFilePath","constructor","loggerFactory","name","getMonsterPiVersionSafe","fileExists","existsSync","contents","readFileSync","toString","replaceAll","e","warn","captureException"],"mappings":";;;;+BAKaA;;;eAAAA;;;sBALoB;oBACQ;iCACZ;AAGtB,MAAMA;IACXC,mBAAkC,KAAK;IACvCC,OAAO;IACCC,eAAeC,6BAAY,CAACC,iBAAiB,CAAC;IAEtDC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACL,MAAM,GAAGK,cAAcP,iBAAiBQ,IAAI;IACnD;IAEAC,0BAA0B;QACxB,MAAMC,aAAaC,IAAAA,cAAU,EAAC,IAAI,CAACR,YAAY;QAC/C,IAAI,CAACO,YAAY;YACf,OAAO;QACT;QAEA,IAAI;YACF,MAAME,WAAWC,IAAAA,gBAAY,EAAC,IAAI,CAACV,YAAY;YAC/C,IAAI,CAACF,gBAAgB,GAAGW,SAASE,QAAQ,GAAGC,UAAU,CAAC,KAAK;YAC5D,OAAO,IAAI,CAACd,gBAAgB;QAC9B,EAAE,OAAOe,GAAG;YACV,IAAI,CAACd,MAAM,CAACe,IAAI,CAAC;YACjBC,IAAAA,sBAAgB,EAACF;QACnB;QACA,OAAO;IACT;AACF"}
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/monsterpi.service.ts"],"names":["MonsterPiService","monsterPiVersion","logger","fileLocation","AppConstants","monsterPiFilePath","constructor","loggerFactory","name","getMonsterPiVersionSafe","fileExists","existsSync","contents","readFileSync","toString","replaceAll","e","warn","captureException"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAKaA;;;eAAAA;;;sBALoB;oBACQ;iCACZ;AAGtB,MAAMA;IACXC,mBAAkC,KAAK;IACvCC,OAAO;IACCC,eAAeC,6BAAY,CAACC,iBAAiB,CAAC;IAEtDC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACL,MAAM,GAAGK,cAAcP,iBAAiBQ,IAAI;IACnD;IAEAC,0BAA0B;QACxB,MAAMC,aAAaC,IAAAA,cAAU,EAAC,IAAI,CAACR,YAAY;QAC/C,IAAI,CAACO,YAAY;YACf,OAAO;QACT;QAEA,IAAI;YACF,MAAME,WAAWC,IAAAA,gBAAY,EAAC,IAAI,CAACV,YAAY;YAC/C,IAAI,CAACF,gBAAgB,GAAGW,SAASE,QAAQ,GAAGC,UAAU,CAAC,KAAK;YAC5D,OAAO,IAAI,CAACd,gBAAgB;QAC9B,EAAE,OAAOe,GAAG;YACV,IAAI,CAACd,MAAM,CAACe,IAAI,CAAC;YACjBC,IAAAA,sBAAgB,EAACF;QACnB;QACA,OAAO;IACT;AACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/multer.service.ts"],"names":["MulterService","fileUploadTrackerCache","httpClient","constructor","getNewestFile","collection","dirPath","collectionPath","files","orderRecentFiles","latestFile","length","undefined","join","file","clearUploadsFolder","fileStoragePath","superRootPath","AppConstants","defaultFileStorageFolder","existsSync","readdirSync","withFileTypes","filter","item","isDirectory","map","name","unlink","err","fileExists","downloadFilename","downloadPath","downloadFile","downloadUrl","downloadFolder","mkdirSync","recursive","fileStream","createWriteStream","res","get","Promise","resolve","reject","write","data","on","getMulterGCodeFileFilter","storeAsFile","getMulterFileFilter","multerLoadFileAsync","req","fileExtension","multer","storage","diskStorage","destination","memoryStorage","fileFilter","multerFileFilter","any","extension","callback","ext","extname","originalname","Error","startTrackingSession","multerFile","addUploadTracker","getSessions","getUploads","dir","lstatSync","isFile","mtime","sort","a","b","getTime"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/multer.service.ts"],"names":["MulterService","fileUploadTrackerCache","httpClient","constructor","getNewestFile","collection","dirPath","collectionPath","files","orderRecentFiles","latestFile","length","undefined","join","file","clearUploadsFolder","fileStoragePath","superRootPath","AppConstants","defaultFileStorageFolder","existsSync","readdirSync","withFileTypes","filter","item","isDirectory","map","name","unlink","err","fileExists","downloadFilename","downloadPath","downloadFile","downloadUrl","downloadFolder","mkdirSync","recursive","fileStream","createWriteStream","res","get","Promise","resolve","reject","write","data","on","getMulterGCodeFileFilter","storeAsFile","getMulterFileFilter","multerLoadFileAsync","req","fileExtension","multer","storage","diskStorage","destination","memoryStorage","fileFilter","multerFileFilter","any","extension","callback","ext","extname","originalname","Error","startTrackingSession","multerFile","addUploadTracker","getSessions","getUploads","dir","lstatSync","isFile","mtime","sort","a","b","getTime"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
|
|
@@ -9,7 +9,6 @@ Object.defineProperty(exports, "ServerReleaseService", {
|
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
const _semver = _interop_require_default(require("semver"));
|
|
12
|
-
const _logger = require("../../handlers/logger");
|
|
13
12
|
const _serverconstants = require("../../server.constants");
|
|
14
13
|
function _interop_require_default(obj) {
|
|
15
14
|
return obj && obj.__esModule ? obj : {
|
|
@@ -24,18 +23,19 @@ class ServerReleaseService {
|
|
|
24
23
|
updateAvailable = null;
|
|
25
24
|
latestRelease = null;
|
|
26
25
|
installedRelease = null;
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
constructor({ serverVersion, githubService }){
|
|
30
|
-
this
|
|
26
|
+
logger;
|
|
27
|
+
serverVersion;
|
|
28
|
+
constructor({ serverVersion, githubService, loggerFactory }){
|
|
29
|
+
this.serverVersion = serverVersion;
|
|
31
30
|
this.githubService = githubService;
|
|
31
|
+
this.logger = loggerFactory(ServerReleaseService.name);
|
|
32
32
|
}
|
|
33
33
|
getState() {
|
|
34
34
|
return {
|
|
35
35
|
airGapped: this.airGapped,
|
|
36
36
|
latestRelease: this.latestRelease,
|
|
37
37
|
installedRelease: this.installedRelease,
|
|
38
|
-
serverVersion: this
|
|
38
|
+
serverVersion: this.serverVersion,
|
|
39
39
|
installedReleaseFound: this.installedReleaseFound,
|
|
40
40
|
updateAvailable: this.updateAvailable,
|
|
41
41
|
synced: this.synced
|
|
@@ -54,10 +54,10 @@ class ServerReleaseService {
|
|
|
54
54
|
const latestRelease = latestResponse.data;
|
|
55
55
|
this.airGapped = !releases?.length;
|
|
56
56
|
if (!releases?.length) {
|
|
57
|
-
this
|
|
57
|
+
this.logger.warn("Latest release check failed because releases from github empty");
|
|
58
58
|
return;
|
|
59
59
|
}
|
|
60
|
-
const currentlyInstalledRelease = this
|
|
60
|
+
const currentlyInstalledRelease = this.serverVersion;
|
|
61
61
|
this.installedRelease = {
|
|
62
62
|
tag_name: currentlyInstalledRelease
|
|
63
63
|
};
|
|
@@ -77,29 +77,29 @@ class ServerReleaseService {
|
|
|
77
77
|
if (!latestReleaseTag) {
|
|
78
78
|
return;
|
|
79
79
|
}
|
|
80
|
-
const packageVersion = this
|
|
80
|
+
const packageVersion = this.serverVersion;
|
|
81
81
|
if (!this.installedReleaseFound) {
|
|
82
|
-
this
|
|
82
|
+
this.logger.log(`\x1b[36mCurrent release tag not found in github releases.\x1b[0m
|
|
83
83
|
Here's github's latest released: \x1b[32m${latestReleaseTag}\x1b[0m
|
|
84
84
|
Here's your release tag: \x1b[32m${packageVersion}\x1b[0m
|
|
85
85
|
Thanks for using FDM Monster!`);
|
|
86
86
|
return;
|
|
87
87
|
} else {
|
|
88
|
-
this
|
|
88
|
+
this.logger.log(`\x1b[36mCurrent release was found in github releases.\x1b[0m
|
|
89
89
|
Here's github's latest released: \x1b[32m${latestReleaseTag}\x1b[0m
|
|
90
90
|
Here's your release tag: \x1b[32m${packageVersion}\x1b[0m
|
|
91
91
|
Thanks for using FDM Monster!`);
|
|
92
92
|
}
|
|
93
93
|
if (!!packageVersion && latestReleaseState.updateAvailable) {
|
|
94
94
|
if (!!this.airGapped) {
|
|
95
|
-
this
|
|
95
|
+
this.logger.warn(`Installed release: ${packageVersion}. Skipping update check (air-gapped/disconnected from internet)`);
|
|
96
96
|
} else {
|
|
97
|
-
this
|
|
97
|
+
this.logger.log(`Update available! New version: ${latestReleaseTag} (prerelease: ${latestRelease.prerelease})`);
|
|
98
98
|
}
|
|
99
99
|
} else if (!packageVersion) {
|
|
100
|
-
return this
|
|
100
|
+
return this.logger.error("Cant check release as package.json version environment variable is not set. Make sure FDM Server is run from a 'package.json' or NPM context.");
|
|
101
101
|
} else {
|
|
102
|
-
return this
|
|
102
|
+
return this.logger.log(`Installed release: ${packageVersion}. You are up to date!`);
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
105
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/server-release.service.ts"],"names":["ServerReleaseService","airGapped","githubService","synced","installedReleaseFound","updateAvailable","latestRelease","installedRelease","logger","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/server-release.service.ts"],"names":["ServerReleaseService","airGapped","githubService","synced","installedReleaseFound","updateAvailable","latestRelease","installedRelease","logger","serverVersion","constructor","loggerFactory","name","getState","syncLatestRelease","wasAuthenticated","owner","AppConstants","orgName","repo","serverRepoName","response","getReleases","latestResponse","getLatestRelease","releases","data","length","warn","currentlyInstalledRelease","tag_name","lastTagIsNewer","semver","gt","logServerVersionState","latestReleaseState","latestReleaseTag","packageVersion","log","prerelease","error"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/server-update.service.ts"],"names":["ServerUpdateService","simpleGitService","logger","constructor","loggerFactory","name","restartServer","isPm2","isNodemon","InternalServerException","execSync","AppConstants","pm2ServiceName","timeout","checkGitUpdates","isValidGitRepo","checkIsRepo","ValidationException","fetch","localRepoStatus","status","result","gitFolderFound","updateCheckSuccess","commitsBehind","behind","commitsAhead","ahead","filesModified","modified","length","pullStatus","warn","pullDetails","pull"],"mappings":";;;;+BAQaA;;;eAAAA;;;0BARoB;iCACJ;+BACJ;mCACoC;AAKtD,MAAMA;IACHC,iBAA4B;IAC5BC,OAAsB;IAE9BC,YAAY,EAAEF,gBAAgB,EAAEG,aAAa,EAAkE,CAAE;QAC/G,IAAI,CAACH,gBAAgB,GAAGA;QACxB,IAAI,CAACC,MAAM,GAAGE,cAAcJ,oBAAoBK,IAAI;IACtD;IAEA,MAAMC,gBAAgB;QACpB,IAAI,CAACC,IAAAA,eAAK,OAAM,CAACC,IAAAA,mBAAS,KAAI;YAE5B,MAAM,IAAIC,0CAAuB,CAAC;QACpC;QAEA,IAAIF,IAAAA,eAAK,KAAI;YACXG,IAAAA,uBAAQ,EAAC,CAAC,YAAY,EAAEC,6BAAY,CAACC,cAAc,CAAC,CAAC,EAAE;gBAAEC,SAAS;YAAK;YACvE,OAAO;QACT,OAAO,IAAIL,IAAAA,mBAAS,KAAI;YACtBE,IAAAA,uBAAQ,EAAC,qEAAqE;gBAC5EG,SAAS;YACX;YACA,OAAO;QACT;IACF;IAEA,MAAMC,kBAAkB;QACtB,IAAIC,iBAAiB,IAAI,CAACd,gBAAgB,CAACe,WAAW;QACtD,IAAI,CAACD,gBAAgB;YACnB,MAAM,IAAIE,sCAAmB,CAAC;QAChC;QAEA,MAAM,IAAI,CAAChB,gBAAgB,CAACiB,KAAK;QACjC,MAAMC,kBAAkB,MAAM,IAAI,CAAClB,gBAAgB,CAACmB,MAAM;QAE1D,IAAI,CAACD,iBAAiB;QAEtB,MAAME,SAAS;YACbC,gBAAgB;YAChBC,oBAAoB;YACpBC,eAAeL,gBAAgBM,MAAM;YACrCC,cAAcP,gBAAgBQ,KAAK;YACnCC,eAAeT,gBAAgBU,QAAQ,EAAEC;YACzCV,QAAQ;YACRW,YAAY;QACd;QAEA,IAAIZ,iBAAiBM,WAAW,GAAG;YACjCJ,OAAOD,MAAM,GAAG;YAChB,OAAOC;QACT;QAGA,IAAIF,iBAAiBU,UAAUC,SAAS,KAAKX,gBAAgBQ,KAAK,KAAK,GAAG;YACxEN,OAAOD,MAAM,GAAG;YAChB,OAAOC;QACT;QAEA,IAAI,CAACnB,MAAM,CAAC8B,IAAI,CAAC;QAEjB,MAAMC,cAAc,MAAM,IAAI,CAAChC,gBAAgB,CAACiC,IAAI;QACpDb,OAAOD,MAAM,GAAG;QAChBC,OAAOU,UAAU,GAAGE;QACpB,OAAOZ;IACT;AACF"}
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/server-update.service.ts"],"names":["ServerUpdateService","simpleGitService","logger","constructor","loggerFactory","name","restartServer","isPm2","isNodemon","InternalServerException","execSync","AppConstants","pm2ServiceName","timeout","checkGitUpdates","isValidGitRepo","checkIsRepo","ValidationException","fetch","localRepoStatus","status","result","gitFolderFound","updateCheckSuccess","commitsBehind","behind","commitsAhead","ahead","filesModified","modified","length","pullStatus","warn","pullDetails","pull"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAQaA;;;eAAAA;;;0BARoB;iCACJ;+BACJ;mCACoC;AAKtD,MAAMA;IACHC,iBAA4B;IAC5BC,OAAsB;IAE9BC,YAAY,EAAEF,gBAAgB,EAAEG,aAAa,EAAkE,CAAE;QAC/G,IAAI,CAACH,gBAAgB,GAAGA;QACxB,IAAI,CAACC,MAAM,GAAGE,cAAcJ,oBAAoBK,IAAI;IACtD;IAEA,MAAMC,gBAAgB;QACpB,IAAI,CAACC,IAAAA,eAAK,OAAM,CAACC,IAAAA,mBAAS,KAAI;YAE5B,MAAM,IAAIC,0CAAuB,CAAC;QACpC;QAEA,IAAIF,IAAAA,eAAK,KAAI;YACXG,IAAAA,uBAAQ,EAAC,CAAC,YAAY,EAAEC,6BAAY,CAACC,cAAc,CAAC,CAAC,EAAE;gBAAEC,SAAS;YAAK;YACvE,OAAO;QACT,OAAO,IAAIL,IAAAA,mBAAS,KAAI;YACtBE,IAAAA,uBAAQ,EAAC,qEAAqE;gBAC5EG,SAAS;YACX;YACA,OAAO;QACT;IACF;IAEA,MAAMC,kBAAkB;QACtB,IAAIC,iBAAiB,IAAI,CAACd,gBAAgB,CAACe,WAAW;QACtD,IAAI,CAACD,gBAAgB;YACnB,MAAM,IAAIE,sCAAmB,CAAC;QAChC;QAEA,MAAM,IAAI,CAAChB,gBAAgB,CAACiB,KAAK;QACjC,MAAMC,kBAAkB,MAAM,IAAI,CAAClB,gBAAgB,CAACmB,MAAM;QAE1D,IAAI,CAACD,iBAAiB;QAEtB,MAAME,SAAS;YACbC,gBAAgB;YAChBC,oBAAoB;YACpBC,eAAeL,gBAAgBM,MAAM;YACrCC,cAAcP,gBAAgBQ,KAAK;YACnCC,eAAeT,gBAAgBU,QAAQ,EAAEC;YACzCV,QAAQ;YACRW,YAAY;QACd;QAEA,IAAIZ,iBAAiBM,WAAW,GAAG;YACjCJ,OAAOD,MAAM,GAAG;YAChB,OAAOC;QACT;QAGA,IAAIF,iBAAiBU,UAAUC,SAAS,KAAKX,gBAAgBQ,KAAK,KAAK,GAAG;YACxEN,OAAOD,MAAM,GAAG;YAChB,OAAOC;QACT;QAEA,IAAI,CAACnB,MAAM,CAAC8B,IAAI,CAAC;QAEjB,MAAMC,cAAc,MAAM,IAAI,CAAChC,gBAAgB,CAACiC,IAAI;QACpDb,OAAOD,MAAM,GAAG;QAChBC,OAAOU,UAAU,GAAGE;QACpB,OAAOZ;IACT;AACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/task-manager.service.ts"],"names":["TaskManagerService","jobScheduler","taskStates","cradle","logger","constructor","container","DITokens","loggerFactory","name","toadScheduler","validateInput","taskId","workload","schedulerOptions","JobValidationException","prefix","resolvedService","e","AwilixResolutionError","stack","run","periodic","runOnce","runDelayed","disabled","milliseconds","seconds","minutes","hours","days","registerJobOrTask","id","task","asyncTaskCallbackOrToken","preset","error","timedTask","getSafeTimedTask","options","execute","delay","runTimeoutTaskInstance","scheduleEnabledPeriodicJob","scheduleDisabledJob","failIfEnabled","taskState","getTaskState","disableJob","failIfDisabled","isTaskDisabled","job","stop","deregisterTask","removeById","timeoutMs","log","setTimeout","handler","asyncHandler","timeTask","AsyncTask","getErrorHandler","started","Date","now","taskService","duration","logFirstCompletion","firstCompletion","registration","lastError","erroredlastError","time","stopSchedulerTasks","runImmediately","SimpleIntervalJob","addSimpleIntervalJob"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/task-manager.service.ts"],"names":["TaskManagerService","jobScheduler","taskStates","cradle","logger","constructor","container","DITokens","loggerFactory","name","toadScheduler","validateInput","taskId","workload","schedulerOptions","JobValidationException","prefix","resolvedService","e","AwilixResolutionError","stack","run","periodic","runOnce","runDelayed","disabled","milliseconds","seconds","minutes","hours","days","registerJobOrTask","id","task","asyncTaskCallbackOrToken","preset","error","timedTask","getSafeTimedTask","options","execute","delay","runTimeoutTaskInstance","scheduleEnabledPeriodicJob","scheduleDisabledJob","failIfEnabled","taskState","getTaskState","disableJob","failIfDisabled","isTaskDisabled","job","stop","deregisterTask","removeById","timeoutMs","log","setTimeout","handler","asyncHandler","timeTask","AsyncTask","getErrorHandler","started","Date","now","taskService","duration","logFirstCompletion","firstCompletion","registration","lastError","erroredlastError","time","stopSchedulerTasks","runImmediately","SimpleIntervalJob","addSimpleIntervalJob"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
|
|
@@ -85,15 +85,26 @@ class YamlService {
|
|
|
85
85
|
this.logger.log(`Performing update import printers (${updateByPropertyPrinters.length} printers)`);
|
|
86
86
|
for (const updatePrinterSpec of updateByPropertyPrinters){
|
|
87
87
|
const updateId = updatePrinterSpec.printerId;
|
|
88
|
-
const
|
|
88
|
+
const updatedPrinter = updatePrinterSpec.value;
|
|
89
|
+
if (typeof updateId === "string" && this.isTypeormMode) {
|
|
90
|
+
throw new Error("Cannot update a printer by string id in SQLite mode");
|
|
91
|
+
} else if (typeof updateId === "number" && !this.isTypeormMode) {
|
|
92
|
+
throw new Error("Cannot update a printer by number id in MongoDB mode");
|
|
93
|
+
}
|
|
94
|
+
const originalPrinterId = updatedPrinter.id;
|
|
95
|
+
delete updatePrinterSpec.value.id;
|
|
96
|
+
updatedPrinter.id = updateId;
|
|
97
|
+
const state = await this.printerService.update(updateId, updatedPrinter);
|
|
89
98
|
if (!updatePrinterSpec.printerId) {
|
|
90
99
|
throw new Error("Saved ID was empty");
|
|
91
100
|
}
|
|
92
|
-
printerIdMap[
|
|
101
|
+
printerIdMap[originalPrinterId] = state.id;
|
|
93
102
|
}
|
|
94
103
|
this.logger.log(`Performing pure create floors (${insertFloors.length} floors)`);
|
|
95
104
|
const floorIdMap = {};
|
|
96
105
|
for (const newFloor of insertFloors){
|
|
106
|
+
const originalFloorId = newFloor.id;
|
|
107
|
+
delete newFloor.id;
|
|
97
108
|
const knownPrinterPositions = [];
|
|
98
109
|
if (exportFloorGrid && exportPrinters) {
|
|
99
110
|
for (const floorPosition of newFloor.printers){
|
|
@@ -101,20 +112,29 @@ class YamlService {
|
|
|
101
112
|
if (!knownPrinterId) {
|
|
102
113
|
continue;
|
|
103
114
|
}
|
|
115
|
+
delete floorPosition.id;
|
|
116
|
+
delete floorPosition.floorId;
|
|
104
117
|
floorPosition.printerId = knownPrinterId;
|
|
105
118
|
knownPrinterPositions.push(floorPosition);
|
|
106
119
|
}
|
|
107
120
|
newFloor.printers = knownPrinterPositions;
|
|
108
121
|
}
|
|
109
|
-
const
|
|
122
|
+
const createdFloor = await this.floorStore.create({
|
|
110
123
|
...newFloor
|
|
111
124
|
});
|
|
112
|
-
floorIdMap[
|
|
125
|
+
floorIdMap[originalFloorId] = createdFloor.id;
|
|
113
126
|
}
|
|
114
127
|
this.logger.log(`Performing update of floors (${updateByPropertyFloors.length} floors)`);
|
|
115
128
|
for (const updateFloorSpec of updateByPropertyFloors){
|
|
116
129
|
const updateId = updateFloorSpec.floorId;
|
|
130
|
+
if (typeof updateId === "string" && this.isTypeormMode) {
|
|
131
|
+
throw new Error("Cannot update a floor by string id in SQLite mode");
|
|
132
|
+
} else if (typeof updateId === "number" && !this.isTypeormMode) {
|
|
133
|
+
throw new Error("Cannot update a floor by number id in MongoDB mode");
|
|
134
|
+
}
|
|
117
135
|
const updatedFloor = updateFloorSpec.value;
|
|
136
|
+
const originalFloorId = updatedFloor.id;
|
|
137
|
+
delete updatedFloor.id;
|
|
118
138
|
const knownPrinters = [];
|
|
119
139
|
if (exportFloorGrid && exportPrinters) {
|
|
120
140
|
for (const floorPosition of updatedFloor?.printers){
|
|
@@ -122,13 +142,17 @@ class YamlService {
|
|
|
122
142
|
if (!knownPrinterId) {
|
|
123
143
|
continue;
|
|
124
144
|
}
|
|
145
|
+
delete floorPosition.id;
|
|
146
|
+
delete floorPosition.floorId;
|
|
125
147
|
floorPosition.printerId = knownPrinterId;
|
|
126
148
|
knownPrinters.push(floorPosition);
|
|
127
149
|
}
|
|
150
|
+
updatedFloor.id = updateId;
|
|
128
151
|
updatedFloor.printers = knownPrinters;
|
|
129
152
|
}
|
|
130
|
-
const
|
|
131
|
-
|
|
153
|
+
const newFloor = await this.floorStore.update(updateId, updatedFloor);
|
|
154
|
+
console.log(JSON.stringify(newFloor, null, 2));
|
|
155
|
+
floorIdMap[originalFloorId] = newFloor.id;
|
|
132
156
|
}
|
|
133
157
|
await this.floorStore.loadStore();
|
|
134
158
|
this.logger.log(`Performing pure create groups (${insertGroups.length} groups)`);
|
|
@@ -142,7 +166,7 @@ class YamlService {
|
|
|
142
166
|
await this.printerGroupService.addPrinterToGroup(createdGroup.id, knownPrinterId);
|
|
143
167
|
}
|
|
144
168
|
}
|
|
145
|
-
this.logger.log(`Performing update of
|
|
169
|
+
this.logger.log(`Performing update of grouped printer links (${updateByNameGroups.length} groups)`);
|
|
146
170
|
for (const updateGroupSpec of updateByNameGroups){
|
|
147
171
|
const existingGroup = await this.printerGroupService.getGroupWithPrinters(updateGroupSpec.groupId);
|
|
148
172
|
const existingPrinterIds = existingGroup.printers.map((p)=>p.printerId);
|
|
@@ -184,7 +208,7 @@ class YamlService {
|
|
|
184
208
|
}
|
|
185
209
|
updateByPropertyPrinters.push({
|
|
186
210
|
strategy: "name",
|
|
187
|
-
printerId: ids[foundIndex],
|
|
211
|
+
printerId: this.isTypeormMode ? parseInt(ids[foundIndex]) : ids[foundIndex],
|
|
188
212
|
value: printer
|
|
189
213
|
});
|
|
190
214
|
break;
|
|
@@ -198,7 +222,7 @@ class YamlService {
|
|
|
198
222
|
}
|
|
199
223
|
updateByPropertyPrinters.push({
|
|
200
224
|
strategy: "url",
|
|
201
|
-
printerId: ids[foundIndex],
|
|
225
|
+
printerId: this.isTypeormMode ? parseInt(ids[foundIndex]) : ids[foundIndex],
|
|
202
226
|
value: printer
|
|
203
227
|
});
|
|
204
228
|
break;
|
|
@@ -212,7 +236,7 @@ class YamlService {
|
|
|
212
236
|
}
|
|
213
237
|
updateByPropertyPrinters.push({
|
|
214
238
|
strategy: "id",
|
|
215
|
-
printerId: ids[foundIndex],
|
|
239
|
+
printerId: this.isTypeormMode ? parseInt(ids[foundIndex]) : ids[foundIndex],
|
|
216
240
|
value: printer
|
|
217
241
|
});
|
|
218
242
|
break;
|
|
@@ -252,7 +276,7 @@ class YamlService {
|
|
|
252
276
|
}
|
|
253
277
|
updateByPropertyFloors.push({
|
|
254
278
|
strategy: "name",
|
|
255
|
-
floorId: ids[foundIndex],
|
|
279
|
+
floorId: this.isTypeormMode ? parseInt(ids[foundIndex]) : ids[foundIndex],
|
|
256
280
|
value: floor
|
|
257
281
|
});
|
|
258
282
|
break;
|
|
@@ -266,7 +290,7 @@ class YamlService {
|
|
|
266
290
|
}
|
|
267
291
|
updateByPropertyFloors.push({
|
|
268
292
|
strategy: "floor",
|
|
269
|
-
floorId: ids[foundIndex],
|
|
293
|
+
floorId: this.isTypeormMode ? parseInt(ids[foundIndex]) : ids[foundIndex],
|
|
270
294
|
value: floor
|
|
271
295
|
});
|
|
272
296
|
break;
|
|
@@ -280,7 +304,7 @@ class YamlService {
|
|
|
280
304
|
}
|
|
281
305
|
updateByPropertyFloors.push({
|
|
282
306
|
strategy: "id",
|
|
283
|
-
floorId: ids[foundIndex],
|
|
307
|
+
floorId: this.isTypeormMode ? parseInt(ids[foundIndex]) : ids[foundIndex],
|
|
284
308
|
value: floor
|
|
285
309
|
});
|
|
286
310
|
break;
|