@fdm-monster/server 1.5.3 → 1.6.0-rc1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.env.template +7 -0
- package/README.md +3 -2
- package/dist/consoles/upload-test.js +52 -0
- package/dist/consoles/upload-test.js.map +1 -0
- package/dist/constants/authorization.constants.js +0 -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 +62 -255
- package/dist/constants/http-status-codes.constants.js.map +1 -1
- package/dist/constants/server-settings.constants.js +0 -4
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/constants/service.constants.js +6 -21
- package/dist/constants/service.constants.js.map +1 -1
- package/dist/container.js +4 -10
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +1 -7
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/auth.controller.js +0 -2
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/custom-gcode.controller.js +1 -3
- package/dist/controllers/custom-gcode.controller.js.map +1 -1
- package/dist/controllers/floor.controller.js +0 -5
- package/dist/controllers/floor.controller.js.map +1 -1
- package/dist/controllers/plugin-firmware-update.controller.js +1 -3
- package/dist/controllers/plugin-firmware-update.controller.js.map +1 -1
- package/dist/controllers/print-completion.controller.js +1 -3
- package/dist/controllers/print-completion.controller.js.map +1 -1
- package/dist/controllers/printer-files.controller.js +18 -70
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +7 -25
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +0 -1
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +0 -1
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/controllers/settings.controller.js +0 -2
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/controllers/user.controller.js +1 -10
- package/dist/controllers/user.controller.js.map +1 -1
- package/dist/controllers/validation/setting.validation.js +0 -1
- package/dist/controllers/validation/setting.validation.js.map +1 -1
- package/dist/entities/base.entity.js +29 -0
- package/dist/entities/base.entity.js.map +1 -0
- package/dist/handlers/cache-manager.js +1 -1
- package/dist/handlers/cache-manager.js.map +1 -1
- package/dist/handlers/event-emitter.js +0 -7
- package/dist/handlers/event-emitter.js.map +1 -1
- package/dist/handlers/logger.js +1 -1
- package/dist/handlers/logger.js.map +1 -1
- package/dist/handlers/validators.js +1 -1
- package/dist/handlers/validators.js.map +1 -1
- package/dist/middleware/authenticate.js +0 -2
- package/dist/middleware/authenticate.js.map +1 -1
- package/dist/middleware/exception.filter.js +0 -1
- package/dist/middleware/exception.filter.js.map +1 -1
- package/dist/middleware/global.middleware.js +0 -4
- package/dist/middleware/global.middleware.js.map +1 -1
- package/dist/models/Auth/User.js +0 -2
- package/dist/models/Auth/User.js.map +1 -1
- package/dist/models/Printer.js +4 -46
- package/dist/models/Printer.js.map +1 -1
- package/dist/models/PrinterFile.js +81 -0
- package/dist/models/PrinterFile.js.map +1 -0
- package/dist/models/Settings.js +0 -1
- package/dist/models/Settings.js.map +1 -1
- package/dist/models/index.js +4 -0
- package/dist/models/index.js.map +1 -1
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js +0 -4
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js.map +1 -1
- package/dist/mongo-migrations/20210907173950-printers-enabled.js +0 -4
- package/dist/mongo-migrations/20210907173950-printers-enabled.js.map +1 -1
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js +0 -4
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js.map +1 -1
- package/dist/mongo-migrations/20231111081809-printer-flatten-name.js +0 -5
- package/dist/mongo-migrations/20231111081809-printer-flatten-name.js.map +1 -1
- package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js +0 -5
- package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js.map +1 -1
- package/dist/mongo-migrations/20231202183902-printer-files-simpler.js +41 -0
- package/dist/mongo-migrations/20231202183902-printer-files-simpler.js.map +1 -0
- package/dist/server.constants.js +1 -19
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js +6 -7
- package/dist/server.core.js.map +1 -1
- package/dist/server.env.js +4 -16
- package/dist/server.env.js.map +1 -1
- package/dist/server.host.js +3 -7
- package/dist/server.host.js.map +1 -1
- package/dist/services/authentication/auth.service.js +2 -20
- package/dist/services/authentication/auth.service.js.map +1 -1
- package/dist/services/authentication/jwt.service.js +0 -1
- package/dist/services/authentication/jwt.service.js.map +1 -1
- package/dist/services/authentication/refresh-token.service.js +0 -3
- package/dist/services/authentication/refresh-token.service.js.map +1 -1
- package/dist/services/authentication/user.service.js +0 -4
- package/dist/services/authentication/user.service.js.map +1 -1
- package/dist/services/batch-call.service.js +4 -8
- package/dist/services/batch-call.service.js.map +1 -1
- package/dist/services/camera-stream.service.js +0 -1
- package/dist/services/camera-stream.service.js.map +1 -1
- package/dist/services/core/client-bundle.service.js +1 -4
- package/dist/services/core/client-bundle.service.js.map +1 -1
- package/dist/services/core/logs-manager.service.js +1 -2
- package/dist/services/core/logs-manager.service.js.map +1 -1
- package/dist/services/core/multer.service.js +6 -9
- package/dist/services/core/multer.service.js.map +1 -1
- package/dist/services/core/server-release.service.js +4 -13
- package/dist/services/core/server-release.service.js.map +1 -1
- package/dist/services/core/server-update.service.js +0 -2
- package/dist/services/core/server-update.service.js.map +1 -1
- package/dist/services/core/task-manager.service.js +9 -22
- package/dist/services/core/task-manager.service.js.map +1 -1
- package/dist/services/core/yaml.service.js +0 -7
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/floor.service.js +2 -43
- package/dist/services/floor.service.js.map +1 -1
- package/dist/services/interfaces/print-completion.dto.js +0 -2
- package/dist/services/interfaces/print-completion.dto.js.map +1 -1
- package/dist/services/interfaces/print-completion.interface.js +6 -0
- package/dist/services/interfaces/{print-completion.service.js.map → print-completion.interface.js.map} +1 -1
- package/dist/services/interfaces/printer-file.dto.js +3 -1
- package/dist/services/interfaces/printer-file.dto.js.map +1 -1
- package/dist/services/interfaces/refresh-token.dto.js +0 -2
- package/dist/services/interfaces/refresh-token.dto.js.map +1 -1
- package/dist/services/interfaces/settings.dto.js +0 -1
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/octoprint/constants/octoprint-service.constants.js +0 -3
- package/dist/services/octoprint/constants/octoprint-service.constants.js.map +1 -1
- package/dist/services/octoprint/dto/connection-state.dto.js +46 -0
- package/dist/services/octoprint/dto/connection-state.dto.js.map +1 -0
- package/dist/services/octoprint/dto/octoprint-currentuser.dto.js +6 -0
- package/dist/services/octoprint/dto/octoprint-currentuser.dto.js.map +1 -0
- package/dist/services/octoprint/dto/octoprint-event.dto.js +41 -0
- package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -0
- package/dist/services/octoprint/dto/octoprint-file.dto.js +84 -0
- package/dist/services/octoprint/dto/octoprint-file.dto.js.map +1 -0
- package/dist/services/octoprint/dto/octoprint-files.dto.js +17 -0
- package/dist/services/octoprint/dto/octoprint-files.dto.js.map +1 -0
- package/dist/services/{interfaces/print-completion.service.js → octoprint/dto/octoprint-session.dto.js} +1 -1
- package/dist/services/octoprint/dto/octoprint-session.dto.js.map +1 -0
- package/dist/services/octoprint/dto/octoprint-settings.dto.js +29 -0
- package/dist/services/octoprint/dto/octoprint-settings.dto.js.map +1 -0
- package/dist/services/octoprint/dto/octoprint-system-info.dto.js +41 -0
- package/dist/services/octoprint/dto/octoprint-system-info.dto.js.map +1 -0
- package/dist/services/octoprint/dto/state.dto.js +38 -0
- package/dist/services/octoprint/dto/state.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/connection-message.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/connection-message.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/current-message.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/current-message.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/event-message.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/event-message.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/event.type.js +54 -0
- package/dist/services/octoprint/dto/websocket-output/event.type.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/client-authed.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/client-authed.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/client-closed.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/client-closed.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/client-opened.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/client-opened.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/dwelling.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/dwelling.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/file-added.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/file-added.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/file-deselected.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/file-deselected.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/file-removed.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/file-removed.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/folder-added.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/folder-added.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/home.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/home.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/metadata-analysis-finished.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/metadata-analysis-finished.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/metadata-analysis-started.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/metadata-analysis-started.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/metadata-statistics-updated.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/metadata-statistics-updated.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/position-update.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/position-update.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-cancelled.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-cancelled.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-cancelling.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-cancelling.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-done.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-done.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-failed.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-failed.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-paused.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-paused.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-resumed.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-resumed.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-started.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-started.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/printer-state-changed.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/printer-state-changed.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/transfer-done.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/transfer-done.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/transfer-started.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/transfer-started.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/updated-files.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/updated-files.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/upload.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/upload.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/user-logged-in.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/user-logged-in.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/z-change.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/z-change.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/history-message.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/history-message.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/plugin-message.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/plugin-message.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/timelapse-message.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/timelapse-message.dto.js.map +1 -0
- package/dist/services/octoprint/octoprint-api.routes.js +15 -17
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.service.js +189 -158
- package/dist/services/octoprint/octoprint-api.service.js.map +1 -1
- package/dist/services/octoprint/octoprint-sockio.adapter.js +50 -85
- package/dist/services/octoprint/octoprint-sockio.adapter.js.map +1 -1
- package/dist/services/octoprint/plugin-base.service.js +0 -1
- package/dist/services/octoprint/plugin-base.service.js.map +1 -1
- package/dist/services/octoprint/plugin-firmware-update.service.js +0 -3
- package/dist/services/octoprint/plugin-firmware-update.service.js.map +1 -1
- package/dist/services/octoprint/utils/api.utils.js +0 -35
- package/dist/services/octoprint/utils/api.utils.js.map +1 -1
- package/dist/services/orm/base.interface.js +6 -0
- package/dist/services/orm/base.interface.js.map +1 -0
- package/dist/services/orm/base.service.js +69 -0
- package/dist/services/orm/base.service.js.map +1 -0
- package/dist/services/print-completion.service.js +0 -1
- package/dist/services/print-completion.service.js.map +1 -1
- package/dist/services/print-completion.shared.js +0 -1
- package/dist/services/print-completion.shared.js.map +1 -1
- package/dist/services/printer-files.service.js +70 -53
- package/dist/services/printer-files.service.js.map +1 -1
- package/dist/services/printer.service.js +2 -15
- package/dist/services/printer.service.js.map +1 -1
- package/dist/services/settings.service.js +2 -8
- package/dist/services/settings.service.js.map +1 -1
- package/dist/services/validators/floor-service.validation.js +3 -3
- package/dist/services/validators/floor-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +0 -3
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/shared/dtos/printer-login.dto.js +58 -0
- package/dist/shared/dtos/printer-login.dto.js.map +1 -0
- package/dist/shared/websocket.adapter.js +59 -0
- package/dist/shared/websocket.adapter.js.map +1 -0
- package/dist/state/file-upload-tracker.cache.js +0 -1
- package/dist/state/file-upload-tracker.cache.js.map +1 -1
- package/dist/state/file.cache.js +19 -42
- package/dist/state/file.cache.js.map +1 -1
- package/dist/state/floor.store.js +0 -1
- package/dist/state/floor.store.js.map +1 -1
- package/dist/state/printer-events.cache.js +1 -3
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/{files.store.js → printer-files.store.js} +26 -43
- package/dist/state/printer-files.store.js.map +1 -0
- package/dist/state/printer-socket.store.js +7 -32
- package/dist/state/printer-socket.store.js.map +1 -1
- package/dist/state/printer.cache.js +0 -1
- package/dist/state/printer.cache.js.map +1 -1
- package/dist/state/settings.store.js +6 -3
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/socket-io.gateway.js +0 -2
- package/dist/state/socket-io.gateway.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +1 -7
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/dist/task.presets.js +0 -11
- package/dist/task.presets.js.map +1 -1
- package/dist/tasks/boot.task.js +6 -10
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/print-completion.socketio.task.js +13 -22
- package/dist/tasks/print-completion.socketio.task.js.map +1 -1
- package/dist/tasks/printer-file-clean.task.js +12 -20
- package/dist/tasks/printer-file-clean.task.js.map +1 -1
- package/dist/tasks/printer-websocket-restore.task.js +1 -5
- package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
- package/dist/tasks/printer-websocket.task.js +5 -15
- package/dist/tasks/printer-websocket.task.js.map +1 -1
- package/dist/tasks/socketio.task.js +0 -1
- package/dist/tasks/socketio.task.js.map +1 -1
- package/dist/tasks.js +0 -2
- package/dist/tasks.js.map +1 -1
- package/dist/types/express/index.d.js +0 -1
- package/dist/types/express/index.d.js.map +1 -1
- package/dist/utils/env.utils.js +1 -14
- package/dist/utils/env.utils.js.map +1 -1
- package/dist/utils/is-docker.js +1 -1
- package/dist/utils/is-docker.js.map +1 -1
- package/dist/utils/normalize-url.js +0 -35
- package/dist/utils/normalize-url.js.map +1 -1
- package/dist/utils/semver.utils.js +0 -1
- package/dist/utils/semver.utils.js.map +1 -1
- package/package.json +53 -43
- package/dist/state/files.store.js.map +0 -1
- package/dist/utils/find-predicate.utils.js +0 -18
- package/dist/utils/find-predicate.utils.js.map +0 -1
- package/dist/utils/websocket.adapter.js +0 -105
- package/dist/utils/websocket.adapter.js.map +0 -1
package/dist/container.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/container.ts"],"names":["configureContainer","container","createContainer","injectionMode","InjectionMode","PROXY","isSqlite","di","DITokens","register","serverTasks","asValue","ServerTasks","isTypeormMode","appDefaultRole","ROLES","ADMIN","appDefaultRoleNoLogin","serverVersion","asFunction","process","env","AppConstants","VERSION_KEY","socketFactory","asClass","SocketFactory","transient","serverHost","ServerHost","singleton","settingsStore","SettingsStore","settingsService","SettingsService","configService","ConfigService","authService","AuthService","refreshTokenService","RefreshTokenService","userService","UserService","roleService","RoleService","permissionService","PermissionService","jwtService","JwtService","loggerFactory","LoggerFactory","taskManagerService","TaskManagerService","toadScheduler","ToadScheduler","eventEmitter2","configureEventEmitter","cacheManager","configureCacheManager","serverReleaseService","ServerReleaseService","monsterPiService","MonsterPiService","serverUpdateService","ServerUpdateService","githubService","GithubService","octokitService","cradle","config","Octokit","auth","get","GITHUB_PAT","clientBundleService","ClientBundleService","logDumpService","LogDumpService","simpleGitService","simpleGit","httpClient","axios","create","maxBodyLength","maxContentLength","socketIoGateway","SocketIoGateway","multerService","MulterService","printerService","PrinterService","printerFilesService","PrinterFilesService","floorService","FloorService","yamlService","YamlService","printCompletionService","PrintCompletionService","octoPrintApiService","OctoPrintApiService","cameraStreamService","CameraStreamService","batchCallService","BatchCallService","pluginFirmwareUpdateService","PluginFirmwareUpdateService","octoPrintSockIoAdapter","OctoPrintSockIoAdapter","floorStore","FloorStore","pluginRepositoryCache","PluginRepositoryCache","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","
|
|
1
|
+
{"version":3,"sources":["../src/container.ts"],"names":["configureContainer","container","createContainer","injectionMode","InjectionMode","PROXY","isSqlite","di","DITokens","register","serverTasks","asValue","ServerTasks","isTypeormMode","appDefaultRole","ROLES","ADMIN","appDefaultRoleNoLogin","serverVersion","asFunction","process","env","AppConstants","VERSION_KEY","socketFactory","asClass","SocketFactory","transient","serverHost","ServerHost","singleton","settingsStore","SettingsStore","settingsService","SettingsService","configService","ConfigService","authService","AuthService","refreshTokenService","RefreshTokenService","userService","UserService","roleService","RoleService","permissionService","PermissionService","jwtService","JwtService","loggerFactory","LoggerFactory","taskManagerService","TaskManagerService","toadScheduler","ToadScheduler","eventEmitter2","configureEventEmitter","cacheManager","configureCacheManager","serverReleaseService","ServerReleaseService","monsterPiService","MonsterPiService","serverUpdateService","ServerUpdateService","githubService","GithubService","octokitService","cradle","config","Octokit","auth","get","GITHUB_PAT","clientBundleService","ClientBundleService","logDumpService","LogDumpService","simpleGitService","simpleGit","httpClient","axios","create","maxBodyLength","maxContentLength","socketIoGateway","SocketIoGateway","multerService","MulterService","printerService","PrinterService","printerFilesService","PrinterFilesService","floorService","FloorService","yamlService","YamlService","printCompletionService","PrintCompletionService","octoPrintApiService","OctoPrintApiService","cameraStreamService","CameraStreamService","batchCallService","BatchCallService","pluginFirmwareUpdateService","PluginFirmwareUpdateService","octoPrintSockIoAdapter","OctoPrintSockIoAdapter","floorStore","FloorStore","pluginRepositoryCache","PluginRepositoryCache","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","printerFilesStore","PrinterFilesStore","printerCache","PrinterCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","customGCodeService","CustomGcodeService","influxDbV2BaseService","InfluxDbV2BaseService","bootTask","BootTask","softwareUpdateTask","SoftwareUpdateTask","socketIoTask","SocketIoTask","clientDistDownloadTask","ClientDistDownloadTask","printCompletionSocketIoTask","PrintCompletionSocketIoTask","printerWebsocketTask","PrinterWebsocketTask","printerWebsocketRestoreTask","PrinterWebsocketRestoreTask","printerFileCleanTask","PrinterFileCleanTask"],"mappings":"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"}
|
package/dist/container.tokens.js
CHANGED
|
@@ -9,13 +9,11 @@ Object.defineProperty(exports, "DITokens", {
|
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
const DITokens = {
|
|
12
|
-
// Values
|
|
13
12
|
serverVersion: "serverVersion",
|
|
14
13
|
isTypeormMode: "isTypeormMode",
|
|
15
14
|
appDefaultRole: "appDefaultRole",
|
|
16
15
|
appDefaultRoleNoLogin: "appDefaultRoleNoLogin",
|
|
17
16
|
typeormService: "typeormService",
|
|
18
|
-
// Instances
|
|
19
17
|
serverHost: "serverHost",
|
|
20
18
|
loggerFactory: "loggerFactory",
|
|
21
19
|
httpClient: "httpClient",
|
|
@@ -58,20 +56,16 @@ const DITokens = {
|
|
|
58
56
|
systemInfoBundleService: "systemInfoBundleService",
|
|
59
57
|
printerFilesService: "printerFilesService",
|
|
60
58
|
customGCodeService: "customGCodeService",
|
|
61
|
-
// Stores/states
|
|
62
59
|
settingsStore: "settingsStore",
|
|
63
60
|
printerCache: "printerCache",
|
|
64
61
|
printerEventsCache: "printerEventsCache",
|
|
65
62
|
printerSocketStore: "printerSocketStore",
|
|
66
63
|
testPrinterSocketStore: "testPrinterSocketStore",
|
|
67
|
-
|
|
68
|
-
filesStore: "filesStore",
|
|
64
|
+
printerFilesStore: "printerFilesStore",
|
|
69
65
|
octoPrintSockIoAdapter: "octoPrintSockIoAdapter",
|
|
70
|
-
// Caches
|
|
71
66
|
floorStore: "floorStore",
|
|
72
67
|
fileCache: "fileCache",
|
|
73
68
|
fileUploadTrackerCache: "fileUploadTrackerCache",
|
|
74
|
-
// Tasks
|
|
75
69
|
serverTasks: "serverTasks",
|
|
76
70
|
bootTask: "bootTask",
|
|
77
71
|
softwareUpdateTask: "softwareUpdateTask",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/container.tokens.ts"],"names":["DITokens","serverVersion","isTypeormMode","appDefaultRole","appDefaultRoleNoLogin","typeormService","serverHost","loggerFactory","httpClient","socketIoGateway","simpleGitService","multerService","configService","taskManagerService","toadScheduler","eventEmitter2","cacheManager","printerService","floorPositionService","printCompletionService","floorService","yamlService","settingsService","serverReleaseService","monsterPiService","serverUpdateService","githubService","octokitService","clientBundleService","logDumpService","userTokenService","authService","refreshTokenService","userService","userRoleService","permissionService","jwtService","roleService","octoPrintApiService","cameraStreamService","socketFactory","batchCallService","pluginRepositoryCache","pluginFirmwareUpdateService","influxDbV2BaseService","systemInfoBundleService","printerFilesService","customGCodeService","settingsStore","printerCache","printerEventsCache","printerSocketStore","testPrinterSocketStore","
|
|
1
|
+
{"version":3,"sources":["../src/container.tokens.ts"],"names":["DITokens","serverVersion","isTypeormMode","appDefaultRole","appDefaultRoleNoLogin","typeormService","serverHost","loggerFactory","httpClient","socketIoGateway","simpleGitService","multerService","configService","taskManagerService","toadScheduler","eventEmitter2","cacheManager","printerService","floorPositionService","printCompletionService","floorService","yamlService","settingsService","serverReleaseService","monsterPiService","serverUpdateService","githubService","octokitService","clientBundleService","logDumpService","userTokenService","authService","refreshTokenService","userService","userRoleService","permissionService","jwtService","roleService","octoPrintApiService","cameraStreamService","socketFactory","batchCallService","pluginRepositoryCache","pluginFirmwareUpdateService","influxDbV2BaseService","systemInfoBundleService","printerFilesService","customGCodeService","settingsStore","printerCache","printerEventsCache","printerSocketStore","testPrinterSocketStore","printerFilesStore","octoPrintSockIoAdapter","floorStore","fileCache","fileUploadTrackerCache","serverTasks","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printCompletionSocketIoTask","printerWebsocketTask","printerWebsocketRestoreTask","printerFileCleanTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IAEtBC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAEhBC,YAAY;IACZC,eAAe;IACfC,YAAY;IACZC,iBAAiB;IACjBC,kBAAkB;IAClBC,eAAe;IACfC,eAAe;IACfC,oBAAoB;IACpBC,eAAe;IACfC,eAAe;IACfC,cAAc;IACdC,gBAAgB;IAChBC,sBAAsB;IACtBC,wBAAwB;IACxBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,sBAAsB;IACtBC,kBAAkB;IAClBC,qBAAqB;IACrBC,eAAe;IACfC,gBAAgB;IAChBC,qBAAqB;IACrBC,gBAAgB;IAChBC,kBAAkB;IAClBC,aAAa;IACbC,qBAAqB;IACrBC,aAAa;IACbC,iBAAiB;IACjBC,mBAAmB;IACnBC,YAAY;IACZC,aAAa;IACbC,qBAAqB;IACrBC,qBAAqB;IACrBC,eAAe;IACfC,kBAAkB;IAClBC,uBAAuB;IACvBC,6BAA6B;IAC7BC,uBAAuB;IACvBC,yBAAyB;IACzBC,qBAAqB;IACrBC,oBAAoB;IAEpBC,eAAe;IACfC,cAAc;IACdC,oBAAoB;IACpBC,oBAAoB;IACpBC,wBAAwB;IACxBC,mBAAmB;IACnBC,wBAAwB;IAExBC,YAAY;IACZC,WAAW;IACXC,wBAAwB;IAExBC,aAAa;IACbC,UAAU;IACVC,oBAAoB;IACpBC,wBAAwB;IACxBC,cAAc;IACdC,6BAA6B;IAC7BC,sBAAsB;IACtBC,6BAA6B;IAC7BC,sBAAsB;AACxB"}
|
|
@@ -99,7 +99,6 @@ class AuthController {
|
|
|
99
99
|
if (!isLoginRequired) {
|
|
100
100
|
return res.end();
|
|
101
101
|
}
|
|
102
|
-
// Get token from header
|
|
103
102
|
const jwtToken = req.headers.authorization?.replace("Bearer ", "") || undefined;
|
|
104
103
|
const userId = req.user.id;
|
|
105
104
|
await this.authService.logoutUserId(userId, jwtToken);
|
|
@@ -128,7 +127,6 @@ class AuthController {
|
|
|
128
127
|
needsPasswordChange: false,
|
|
129
128
|
isDemoUser: false,
|
|
130
129
|
isRootUser: false,
|
|
131
|
-
// An admin needs to verify the user first
|
|
132
130
|
isVerified: false
|
|
133
131
|
});
|
|
134
132
|
const userDto = this.userService.toDto(result);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/auth.controller.ts"],"names":["AuthController","authService","settingsStore","userService","roleService","logger","configService","constructor","loggerFactory","name","login","req","res","log","ip","headers","tokens","loginUser","body","username","password","send","getLoginRequired","loginRequired","registration","isRegistrationEnabled","wizardState","getWizardState","isDemoMode","verifyLogin","success","needsPasswordChange","isLoginRequired","authenticated","isAuthenticated","user","refreshLogin","refreshToken","validateMiddleware","refreshTokenRules","idToken","renewLoginByRefreshToken","token","logout","end","jwtToken","authorization","replace","undefined","userId","id","logoutUserId","register","registrationEnabled","BadRequestException","registerUserRules","toLowerCase","includes","roles","getAppDefaultRoleIds","result","isDemoUser","isRootUser","isVerified","userDto","toDto","createController","prefix","AppConstants","apiRoute","post","demoUserNotAllowedInterceptor","get","before","authenticate"],"mappings":"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
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/auth.controller.ts"],"names":["AuthController","authService","settingsStore","userService","roleService","logger","configService","constructor","loggerFactory","name","login","req","res","log","ip","headers","tokens","loginUser","body","username","password","send","getLoginRequired","loginRequired","registration","isRegistrationEnabled","wizardState","getWizardState","isDemoMode","verifyLogin","success","needsPasswordChange","isLoginRequired","authenticated","isAuthenticated","user","refreshLogin","refreshToken","validateMiddleware","refreshTokenRules","idToken","renewLoginByRefreshToken","token","logout","end","jwtToken","authorization","replace","undefined","userId","id","logoutUserId","register","registrationEnabled","BadRequestException","registerUserRules","toLowerCase","includes","roles","getAppDefaultRoleIds","result","isDemoUser","isRootUser","isVerified","userDto","toDto","createController","prefix","AppConstants","apiRoute","post","demoUserNotAllowedInterceptor","get","before","authenticate"],"mappings":"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"}
|
|
@@ -41,9 +41,7 @@ class CustomGcodeController {
|
|
|
41
41
|
const entity = await this.customGCodeService.get(id);
|
|
42
42
|
res.send(this.customGCodeService.toDto(entity));
|
|
43
43
|
}
|
|
44
|
-
|
|
45
|
-
* Sends gcode according to https://docs.octoprint.org/en/master/api/printer.html#send-an-arbitrary-command-to-the-printer
|
|
46
|
-
*/ async sendEmergencyM112(req, res) {
|
|
44
|
+
async sendEmergencyM112(req, res) {
|
|
47
45
|
const { printerLogin } = (0, _validators.getScopedPrinter)(req);
|
|
48
46
|
const response = await this.octoPrintApiService.sendCustomGCodeCommand(printerLogin, "M112");
|
|
49
47
|
res.send(response);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/custom-gcode.controller.ts"],"names":["CustomGcodeController","octoPrintApiService","customGCodeService","isTypeormMode","constructor","list","req","res","entities","send","map","e","toDto","get","id","validateInput","params","idRulesV2","entity","sendEmergencyM112","printerLogin","getScopedPrinter","response","sendCustomGCodeCommand","create","body","delete","update","updatedScript","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","post","printerResolveMiddleware","put"],"mappings":";;;;;;;;;;;IAWaA,qBAAqB;eAArBA;;IAyDb,OAQyB;eARzB;;;+BApEiC;8BACY;iCAChB;wCACP;4BAC0B;
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/custom-gcode.controller.ts"],"names":["CustomGcodeController","octoPrintApiService","customGCodeService","isTypeormMode","constructor","list","req","res","entities","send","map","e","toDto","get","id","validateInput","params","idRulesV2","entity","sendEmergencyM112","printerLogin","getScopedPrinter","response","sendCustomGCodeCommand","create","body","delete","update","updatedScript","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","post","printerResolveMiddleware","put"],"mappings":"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"}
|
|
@@ -30,31 +30,26 @@ class FloorController {
|
|
|
30
30
|
this.isTypeormMode = isTypeormMode;
|
|
31
31
|
}
|
|
32
32
|
async create(req, res) {
|
|
33
|
-
// Has internal validation
|
|
34
33
|
const floor = await this.floorStore.create(req.body);
|
|
35
34
|
res.send(floor);
|
|
36
35
|
}
|
|
37
36
|
async updateName(req, res) {
|
|
38
37
|
const { id: floorId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
|
|
39
|
-
// Has internal validation
|
|
40
38
|
const floor = await this.floorStore.updateName(floorId, req.body.name);
|
|
41
39
|
res.send(floor);
|
|
42
40
|
}
|
|
43
41
|
async updateFloorNumber(req, res) {
|
|
44
42
|
const { id: floorId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
|
|
45
|
-
// Has internal validation
|
|
46
43
|
const floor = await this.floorStore.updateFloorNumber(floorId, req.body.floor);
|
|
47
44
|
res.send(floor);
|
|
48
45
|
}
|
|
49
46
|
async addPrinterToFloor(req, res) {
|
|
50
47
|
const { id: floorId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
|
|
51
|
-
// Has internal validation
|
|
52
48
|
const floor = await this.floorStore.addOrUpdatePrinter(floorId, req.body);
|
|
53
49
|
res.send(floor);
|
|
54
50
|
}
|
|
55
51
|
async removePrinterFromFloor(req, res) {
|
|
56
52
|
const { id: floorId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
|
|
57
|
-
// Has internal validation
|
|
58
53
|
const floor = await this.floorStore.removePrinter(floorId, req.body.printerId);
|
|
59
54
|
res.send(floor);
|
|
60
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/floor.controller.ts"],"names":["FloorController","floorStore","isTypeormMode","constructor","create","req","res","floor","body","send","updateName","id","floorId","validateInput","params","idRulesV2","name","updateFloorNumber","addPrinterToFloor","addOrUpdatePrinter","removePrinterFromFloor","removePrinter","printerId","list","floors","listCache","get","getFloor","delete","createController","prefix","AppConstants","apiRoute","before","authenticate","withPermission","PERMS","PrinterFloors","List","Get","patch","Update","post","Delete","Create"],"mappings":";;;;;;;;;;;IAUaA,eAAe;eAAfA;;IAiEb,OAUmE;eAVnE;;;+BA3EiC;8BACY;iCAChB;4BACC;mCACJ;wCACJ;AAKf,MAAMA;IACHC,WAAuB;IACdC,cAAuB;IAExCC,YAAY,EAAEF,UAAU,EAAEC,aAAa,EAAsD,CAAE;QAC7F,IAAI,CAACD,UAAU,GAAGA;QAClB,IAAI,CAACC,aAAa,GAAGA;IACvB;IAEA,MAAME,OAAOC,GAAY,EAAEC,GAAa,EAAE;
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/floor.controller.ts"],"names":["FloorController","floorStore","isTypeormMode","constructor","create","req","res","floor","body","send","updateName","id","floorId","validateInput","params","idRulesV2","name","updateFloorNumber","addPrinterToFloor","addOrUpdatePrinter","removePrinterFromFloor","removePrinter","printerId","list","floors","listCache","get","getFloor","delete","createController","prefix","AppConstants","apiRoute","before","authenticate","withPermission","PERMS","PrinterFloors","List","Get","patch","Update","post","Delete","Create"],"mappings":"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"}
|
|
@@ -38,9 +38,7 @@ class PluginFirmwareUpdateController {
|
|
|
38
38
|
const result = await this.performScanOnPrinters();
|
|
39
39
|
res.send(result);
|
|
40
40
|
}
|
|
41
|
-
|
|
42
|
-
* Explicit query, use with care (to prevent Github rate limit)
|
|
43
|
-
*/ async syncFirmwareReleasesCache(req, res) {
|
|
41
|
+
async syncFirmwareReleasesCache(req, res) {
|
|
44
42
|
const releases = await this.pluginFirmwareUpdateService.queryGithubPrusaFirmwareReleasesCache();
|
|
45
43
|
res.send(releases);
|
|
46
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/plugin-firmware-update.controller.ts"],"names":["PluginFirmwareUpdateController","cacheKey","cacheManager","printerCache","pluginFirmwareUpdateService","logger","constructor","loggerFactory","name","listUpdateState","req","res","result","performScanOnPrinters","send","syncFirmwareReleasesCache","releases","queryGithubPrusaFirmwareReleasesCache","downloadFirmware","scanPrinterFirmwareVersions","isPluginInstalled","printerLogin","getScopedPrinter","isInstalled","installFirmwareUpdatePlugin","log","installPlugin","installing","getFirmwareUpdaterStatus","status","getPluginFirmwareStatus","configurePluginSettings","response","configureFirmwareUpdaterSettings","flashFirmware","currentPrinterId","flashPrusaFirmware","printers","listCachedPrinters","printerFirmwareStates","failureStates","printer","loginDto","getLoginDtoAsync","id","version","getPrinterFirmwareVersion","push","firmware","printerName","pluginInstalled","e","warn","error","firmwareStates","failures","set","ttl","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware","get","post"],"mappings":";;;;;;;;;;;IAeaA,8BAA8B;eAA9BA;;IA0Hb,OAWgD;eAXhD;;;+BAzIiC;iCACJ;8BACgB;wCACvB;yBACmB;4BACR;AAQjC,MAAMC,WAAW;AAEV,MAAMD;IACHE,aAAoB;IACpBC,aAA2B;IAC3BC,4BAAyD;IACzDC,OAAsB;IAE9BC,YAAY,EACVJ,YAAY,EACZC,YAAY,EACZC,2BAA2B,EAC3BG,aAAa,EAMd,CAAE;QACD,IAAI,CAACL,YAAY,GAAGA;QACpB,IAAI,CAACC,YAAY,GAAGA;QACpB,IAAI,CAACC,2BAA2B,GAAGA;QACnC,IAAI,CAACC,MAAM,GAAGE,cAAcP,+BAA+BQ,IAAI;IACjE;IAEA,MAAMC,gBAAgBC,GAAY,EAAEC,GAAa,EAAE;QACjD,MAAMC,SAAS,MAAM,IAAI,CAACC,qBAAqB;QAC/CF,IAAIG,IAAI,CAACF;IACX;
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/plugin-firmware-update.controller.ts"],"names":["PluginFirmwareUpdateController","cacheKey","cacheManager","printerCache","pluginFirmwareUpdateService","logger","constructor","loggerFactory","name","listUpdateState","req","res","result","performScanOnPrinters","send","syncFirmwareReleasesCache","releases","queryGithubPrusaFirmwareReleasesCache","downloadFirmware","scanPrinterFirmwareVersions","isPluginInstalled","printerLogin","getScopedPrinter","isInstalled","installFirmwareUpdatePlugin","log","installPlugin","installing","getFirmwareUpdaterStatus","status","getPluginFirmwareStatus","configurePluginSettings","response","configureFirmwareUpdaterSettings","flashFirmware","currentPrinterId","flashPrusaFirmware","printers","listCachedPrinters","printerFirmwareStates","failureStates","printer","loginDto","getLoginDtoAsync","id","version","getPrinterFirmwareVersion","push","firmware","printerName","pluginInstalled","e","warn","error","firmwareStates","failures","set","ttl","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware","get","post"],"mappings":"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"}
|
|
@@ -28,9 +28,7 @@ class PrintCompletionController {
|
|
|
28
28
|
this.printCompletionService = printCompletionService;
|
|
29
29
|
this.printCompletionSocketIoTask = printCompletionSocketIoTask;
|
|
30
30
|
}
|
|
31
|
-
|
|
32
|
-
* Not a production ready call, just for testing.
|
|
33
|
-
*/ async test(req, res) {
|
|
31
|
+
async test(req, res) {
|
|
34
32
|
const result = await this.printCompletionService.loadPrintContexts();
|
|
35
33
|
res.send(result);
|
|
36
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/print-completion.controller.ts"],"names":["PrintCompletionController","printCompletionService","printCompletionSocketIoTask","constructor","test","req","res","result","loadPrintContexts","send","contexts","findCorrelatedEntries","correlationId","validateInput","params","findPrintCompletion","list","completions","listGroupByPrinterStatus","createController","prefix","AppConstants","apiRoute","before","authenticate","get","withPermission","PERMS","PrintCompletion","List","Default"],"mappings":";;;;;;;;;;;IASaA,yBAAyB;eAAzBA;;IAwCb,OAMkG;eANlG;;;8BAjD6C;+BACZ;iCACJ;wCACP;4BACQ;AAKvB,MAAMA;IACHC,uBAAgD;IAChDC,4BAAyD;IAEjEC,YAAY,EACVF,sBAAsB,EACtBC,2BAA2B,EAI5B,CAAE;QACD,IAAI,CAACD,sBAAsB,GAAGA;QAC9B,IAAI,CAACC,2BAA2B,GAAGA;IACrC;
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/print-completion.controller.ts"],"names":["PrintCompletionController","printCompletionService","printCompletionSocketIoTask","constructor","test","req","res","result","loadPrintContexts","send","contexts","findCorrelatedEntries","correlationId","validateInput","params","findPrintCompletion","list","completions","listGroupByPrinterStatus","createController","prefix","AppConstants","apiRoute","before","authenticate","get","withPermission","PERMS","PrintCompletion","List","Default"],"mappings":";;;;;;;;;;;IASaA,yBAAyB;eAAzBA;;IAwCb,OAMkG;eANlG;;;8BAjD6C;+BACZ;iCACJ;wCACP;4BACQ;AAKvB,MAAMA;IACHC,uBAAgD;IAChDC,4BAAyD;IAEjEC,YAAY,EACVF,sBAAsB,EACtBC,2BAA2B,EAI5B,CAAE;QACD,IAAI,CAACD,sBAAsB,GAAGA;QAC9B,IAAI,CAACC,2BAA2B,GAAGA;IACrC;IAKA,MAAME,KAAKC,GAAY,EAAEC,GAAa,EAAE;QACtC,MAAMC,SAAS,MAAM,IAAI,CAACN,sBAAsB,CAACO,iBAAiB;QAClEF,IAAIG,IAAI,CAACF;IACX;IAEAG,SAASL,GAAY,EAAEC,GAAa,EAAE;QACpC,MAAMI,WAAW,IAAI,CAACR,2BAA2B,CAACQ,QAAQ;QAC1DJ,IAAIG,IAAI,CAACC;IACX;IAEA,MAAMC,sBAAsBN,GAAY,EAAEC,GAAa,EAAE;QACvD,MAAM,EAAEM,aAAa,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACR,IAAIS,MAAM,EAAE;YAAEF,eAAe;QAAkB;QAC7F,MAAML,SAAS,MAAM,IAAI,CAACN,sBAAsB,CAACc,mBAAmB,CAACH;QACrEN,IAAIG,IAAI,CAACF;IACX;IAEA,MAAMS,KAAKX,GAAY,EAAEC,GAAa,EAAE;QACtC,MAAMW,cAAc,MAAM,IAAI,CAAChB,sBAAsB,CAACiB,wBAAwB;QAC9EZ,IAAIG,IAAI,CAACQ;IACX;AACF;MAEA,WAAeE,IAAAA,+BAAgB,EAACnB,2BAC7BoB,MAAM,CAACC,6BAAY,CAACC,QAAQ,GAAG,qBAC/BC,MAAM,CAAC;IAACC,IAAAA,0BAAY;CAAG,EACvBC,GAAG,CAAC,KAAK,QAAQC,IAAAA,4BAAc,EAACC,6BAAK,CAACC,eAAe,CAACC,IAAI,GAC1DJ,GAAG,CAAC,SAAS,QAAQC,IAAAA,4BAAc,EAACC,6BAAK,CAACC,eAAe,CAACC,IAAI,GAC9DJ,GAAG,CAAC,aAAa,YAAYC,IAAAA,4BAAc,EAACC,6BAAK,CAACC,eAAe,CAACC,IAAI,GACtEJ,GAAG,CAAC,mBAAmB,yBAAyBC,IAAAA,4BAAc,EAACC,6BAAK,CAACC,eAAe,CAACE,OAAO"}
|
|
@@ -12,12 +12,10 @@ _export(exports, {
|
|
|
12
12
|
PrinterFilesController: function() {
|
|
13
13
|
return PrinterFilesController;
|
|
14
14
|
},
|
|
15
|
-
// prettier-ignore
|
|
16
15
|
default: function() {
|
|
17
16
|
return _default;
|
|
18
17
|
}
|
|
19
18
|
});
|
|
20
|
-
const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
|
|
21
19
|
const _awilixexpress = require("awilix-express");
|
|
22
20
|
const _authenticate = require("../middleware/authenticate");
|
|
23
21
|
const _validators = require("../handlers/validators");
|
|
@@ -27,13 +25,8 @@ const _batchcontrollervalidation = require("./validation/batch-controller.valida
|
|
|
27
25
|
const _runtimeexceptions = require("../exceptions/runtime.exceptions");
|
|
28
26
|
const _printer = require("../middleware/printer");
|
|
29
27
|
const _authorizationconstants = require("../constants/authorization.constants");
|
|
30
|
-
function _interop_require_default(obj) {
|
|
31
|
-
return obj && obj.__esModule ? obj : {
|
|
32
|
-
default: obj
|
|
33
|
-
};
|
|
34
|
-
}
|
|
35
28
|
class PrinterFilesController {
|
|
36
|
-
|
|
29
|
+
printerFilesStore;
|
|
37
30
|
settingsStore;
|
|
38
31
|
octoPrintApiService;
|
|
39
32
|
batchCallService;
|
|
@@ -41,8 +34,8 @@ class PrinterFilesController {
|
|
|
41
34
|
printerFileCleanTask;
|
|
42
35
|
logger;
|
|
43
36
|
isTypeormMode;
|
|
44
|
-
constructor({
|
|
45
|
-
this.
|
|
37
|
+
constructor({ printerFilesStore, octoPrintApiService, batchCallService, printerFileCleanTask, settingsStore, loggerFactory, multerService, isTypeormMode }){
|
|
38
|
+
this.printerFilesStore = printerFilesStore;
|
|
46
39
|
this.settingsStore = settingsStore;
|
|
47
40
|
this.printerFileCleanTask = printerFileCleanTask;
|
|
48
41
|
this.octoPrintApiService = octoPrintApiService;
|
|
@@ -59,19 +52,17 @@ class PrinterFilesController {
|
|
|
59
52
|
const { currentPrinterId } = (0, _validators.getScopedPrinter)(req);
|
|
60
53
|
const { recursive } = await (0, _validators.validateInput)(req.query, _printerfilescontrollervalidation.getFilesRules);
|
|
61
54
|
this.logger.log("Refreshing file storage by eager load");
|
|
62
|
-
const
|
|
63
|
-
|
|
55
|
+
const files = await this.printerFilesStore.eagerLoadPrinterFiles(currentPrinterId, recursive);
|
|
56
|
+
res.send(files);
|
|
64
57
|
}
|
|
65
|
-
|
|
66
|
-
* When the printer host is not reachable or is disabled the cache is still accessible
|
|
67
|
-
*/ async getFilesCache(req, res) {
|
|
58
|
+
async getFilesCache(req, res) {
|
|
68
59
|
const { currentPrinter } = (0, _validators.getScopedPrinter)(req);
|
|
69
|
-
const filesCache = await this.
|
|
60
|
+
const filesCache = await this.printerFilesStore.getFiles(currentPrinter.id);
|
|
70
61
|
res.send(filesCache);
|
|
71
62
|
}
|
|
72
63
|
async clearPrinterFiles(req, res) {
|
|
73
64
|
const { currentPrinterId, printerLogin } = (0, _validators.getScopedPrinter)(req);
|
|
74
|
-
const nonRecursiveFiles = await this.octoPrintApiService.
|
|
65
|
+
const nonRecursiveFiles = await this.octoPrintApiService.getLocalFiles(printerLogin, false);
|
|
75
66
|
const failedFiles = [];
|
|
76
67
|
const succeededFiles = [];
|
|
77
68
|
for (let file of nonRecursiveFiles.files){
|
|
@@ -82,50 +73,45 @@ class PrinterFilesController {
|
|
|
82
73
|
failedFiles.push(file);
|
|
83
74
|
}
|
|
84
75
|
}
|
|
85
|
-
await this.
|
|
76
|
+
await this.printerFilesStore.purgePrinterFiles(currentPrinterId);
|
|
86
77
|
res.send({
|
|
87
78
|
failedFiles,
|
|
88
79
|
succeededFiles
|
|
89
80
|
});
|
|
90
81
|
}
|
|
91
82
|
async purgeIndexedFiles(req, res) {
|
|
92
|
-
await this.
|
|
83
|
+
await this.printerFilesStore.purgeFiles();
|
|
93
84
|
res.send();
|
|
94
85
|
}
|
|
95
86
|
async moveFileOrFolder(req, res) {
|
|
96
87
|
const { printerLogin } = (0, _validators.getScopedPrinter)(req);
|
|
97
88
|
const { filePath: path, destination } = await (0, _validators.validateMiddleware)(req, _printerfilescontrollervalidation.moveFileOrFolderRules);
|
|
98
89
|
const result = await this.octoPrintApiService.moveFileOrFolder(printerLogin, path, destination);
|
|
99
|
-
// TODO Update file storage
|
|
100
90
|
res.send(result);
|
|
101
91
|
}
|
|
102
92
|
async createFolder(req, res) {
|
|
103
93
|
const { printerLogin } = (0, _validators.getScopedPrinter)(req);
|
|
104
94
|
const { path, foldername } = await (0, _validators.validateMiddleware)(req, _printerfilescontrollervalidation.createFolderRules);
|
|
105
95
|
const result = await this.octoPrintApiService.createFolder(printerLogin, path, foldername);
|
|
106
|
-
// TODO Update file storage
|
|
107
96
|
res.send(result);
|
|
108
97
|
}
|
|
109
98
|
async deleteFileOrFolder(req, res) {
|
|
110
99
|
const { currentPrinterId, printerLogin } = (0, _validators.getScopedPrinter)(req);
|
|
111
100
|
const { path } = await (0, _validators.validateInput)(req.query, _printerfilescontrollervalidation.getFileRules);
|
|
112
101
|
const result = await this.octoPrintApiService.deleteFileOrFolder(printerLogin, path);
|
|
113
|
-
await this.
|
|
102
|
+
await this.printerFilesStore.deleteFile(currentPrinterId, path, false);
|
|
114
103
|
this.logger.log(`File reference removed, printerId ${currentPrinterId}`, path);
|
|
115
104
|
res.send(result);
|
|
116
105
|
}
|
|
117
|
-
|
|
118
|
-
* @deprecated this API endpoint will be moved to /batch from BatchCallController in 1.6.0
|
|
119
|
-
*/ async batchReprintFiles(req, res) {
|
|
106
|
+
async batchReprintFiles(req, res) {
|
|
120
107
|
const { printerIds } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.batchPrinterRules)(this.isTypeormMode));
|
|
121
108
|
const results = await this.batchCallService.batchReprintCalls(printerIds);
|
|
122
109
|
res.send(results);
|
|
123
110
|
}
|
|
124
111
|
async selectAndPrintFile(req, res) {
|
|
125
|
-
const {
|
|
112
|
+
const { printerLogin } = (0, _validators.getScopedPrinter)(req);
|
|
126
113
|
const { filePath: path, print } = await (0, _validators.validateInput)(req.body, _printerfilescontrollervalidation.selectAndPrintFileRules);
|
|
127
114
|
const result = await this.octoPrintApiService.selectPrintFile(printerLogin, path, print);
|
|
128
|
-
await this.filesStore.setExistingFileForPrint(currentPrinterId, path);
|
|
129
115
|
res.send(result);
|
|
130
116
|
}
|
|
131
117
|
async uploadFile(req, res) {
|
|
@@ -142,59 +128,23 @@ class PrinterFilesController {
|
|
|
142
128
|
error: "Only 1 .gcode file can be uploaded at a time due to bandwidth restrictions"
|
|
143
129
|
});
|
|
144
130
|
}
|
|
145
|
-
// Multer has processed the remaining multipart data into the body as json
|
|
146
131
|
const { print, select } = await (0, _validators.validateInput)(req.body, _printerfilescontrollervalidation.fileUploadCommandsRules);
|
|
147
132
|
const uploadedFile = files[0];
|
|
148
|
-
// Perform specific file clean if configured
|
|
149
133
|
const fileCleanEnabled = this.settingsStore.isPreUploadFileCleanEnabled();
|
|
150
134
|
if (fileCleanEnabled) {
|
|
151
135
|
await this.printerFileCleanTask.cleanPrinterFiles(currentPrinterId);
|
|
152
136
|
}
|
|
153
|
-
const token = this.multerService.startTrackingSession(
|
|
137
|
+
const token = this.multerService.startTrackingSession(uploadedFile);
|
|
154
138
|
const response = await this.octoPrintApiService.uploadFileAsMultiPart(printerLogin, uploadedFile, {
|
|
155
139
|
print,
|
|
156
140
|
select
|
|
157
141
|
}, token);
|
|
158
|
-
if (response.success !== false) {
|
|
159
|
-
const
|
|
160
|
-
await this.
|
|
161
|
-
}
|
|
162
|
-
res.send(response);
|
|
163
|
-
}
|
|
164
|
-
/**
|
|
165
|
-
* This endpoint is not actively used. Its better to introduce a virtual file system (VFS) to be able to manage centralized uploads.
|
|
166
|
-
*/ async localUploadFile(req, res) {
|
|
167
|
-
const { currentPrinterId, printerLogin } = (0, _validators.getScopedPrinter)(req);
|
|
168
|
-
const { select, print, localLocation } = await (0, _validators.validateInput)(req.body, _printerfilescontrollervalidation.localFileUploadRules);
|
|
169
|
-
if (!localLocation.endsWith(".gcode")) {
|
|
170
|
-
throw new _runtimeexceptions.ValidationException({
|
|
171
|
-
localLocation: "The indicated file extension did not match '.gcode'"
|
|
172
|
-
});
|
|
173
|
-
}
|
|
174
|
-
if (!_fs.default.existsSync(localLocation)) {
|
|
175
|
-
throw new _runtimeexceptions.NotFoundException("The indicated file was not found.");
|
|
176
|
-
}
|
|
177
|
-
if (_fs.default.lstatSync(localLocation).isDirectory()) {
|
|
178
|
-
throw new _runtimeexceptions.ValidationException({
|
|
179
|
-
localLocation: "The indicated file was not correctly found."
|
|
180
|
-
});
|
|
181
|
-
}
|
|
182
|
-
const stream = _fs.default.createReadStream(localLocation);
|
|
183
|
-
const response = await this.octoPrintApiService.uploadFileAsMultiPart(printerLogin, stream, {
|
|
184
|
-
select,
|
|
185
|
-
print
|
|
186
|
-
});
|
|
187
|
-
// TODO update file cache with files store
|
|
188
|
-
if (response.success !== false) {
|
|
189
|
-
const newOrUpdatedFile = response.files.local;
|
|
190
|
-
await this.filesStore.appendOrSetPrinterFile(currentPrinterId, newOrUpdatedFile);
|
|
142
|
+
if (response.success !== false && response?.files?.local?.path?.length) {
|
|
143
|
+
const file = await this.octoPrintApiService.getFile(printerLogin, response?.files?.local?.path);
|
|
144
|
+
await this.printerFilesStore.appendOrSetPrinterFile(currentPrinterId, file);
|
|
191
145
|
}
|
|
192
146
|
res.send(response);
|
|
193
147
|
}
|
|
194
|
-
statusResponse(res, response) {
|
|
195
|
-
res.statusCode = response.status;
|
|
196
|
-
res.send(response.data);
|
|
197
|
-
}
|
|
198
148
|
}
|
|
199
149
|
const _default = (0, _awilixexpress.createController)(PrinterFilesController).prefix(_serverconstants.AppConstants.apiRoute + "/printer-files").before([
|
|
200
150
|
(0, _authenticate.authenticate)(),
|
|
@@ -203,8 +153,6 @@ const _default = (0, _awilixexpress.createController)(PrinterFilesController).pr
|
|
|
203
153
|
_authorizationconstants.ROLES.OPERATOR
|
|
204
154
|
]),
|
|
205
155
|
(0, _printer.printerResolveMiddleware)()
|
|
206
|
-
]).post("/purge", "purgeIndexedFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Clear)).get("/tracked-uploads", "getTrackedUploads", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Upload))
|
|
207
|
-
* @deprecated will be moved to /batch in 1.6.0
|
|
208
|
-
*/ .post("/batch/reprint-files", "batchReprintFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).get("/:id", "getFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Get)).get("/:id/cache", "getFilesCache", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Get)).post("/:id/local-upload", "localUploadFile", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Upload)).post("/:id/upload", "uploadFile", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Upload)).post("/:id/create-folder", "createFolder", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).post("/:id/select", "selectAndPrintFile", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).post("/:id/move", "moveFileOrFolder", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).delete("/:id", "deleteFileOrFolder", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Delete)).delete("/:id/clear", "clearPrinterFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Clear));
|
|
156
|
+
]).post("/purge", "purgeIndexedFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Clear)).get("/tracked-uploads", "getTrackedUploads", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Upload)).post("/batch/reprint-files", "batchReprintFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).get("/:id", "getFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Get)).get("/:id/cache", "getFilesCache", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Get)).post("/:id/upload", "uploadFile", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Upload)).post("/:id/create-folder", "createFolder", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).post("/:id/select", "selectAndPrintFile", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).post("/:id/move", "moveFileOrFolder", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).delete("/:id", "deleteFileOrFolder", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Delete)).delete("/:id/clear", "clearPrinterFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Clear));
|
|
209
157
|
|
|
210
158
|
//# sourceMappingURL=printer-files.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/printer-files.controller.ts"],"names":["PrinterFilesController","
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/printer-files.controller.ts"],"names":["PrinterFilesController","printerFilesStore","settingsStore","octoPrintApiService","batchCallService","multerService","printerFileCleanTask","logger","isTypeormMode","constructor","loggerFactory","name","getTrackedUploads","req","res","sessions","getSessions","send","getFiles","currentPrinterId","getScopedPrinter","recursive","validateInput","query","getFilesRules","log","files","eagerLoadPrinterFiles","getFilesCache","currentPrinter","filesCache","id","clearPrinterFiles","printerLogin","nonRecursiveFiles","getLocalFiles","failedFiles","succeededFiles","file","deleteFileOrFolder","path","push","e","purgePrinterFiles","purgeIndexedFiles","purgeFiles","moveFileOrFolder","filePath","destination","validateMiddleware","moveFileOrFolderRules","result","createFolder","foldername","createFolderRules","getFileRules","deleteFile","batchReprintFiles","printerIds","body","batchPrinterRules","results","batchReprintCalls","selectAndPrintFile","print","selectAndPrintFileRules","selectPrintFile","uploadFile","uploadFileRules","multerLoadFileAsync","length","ValidationException","error","select","fileUploadCommandsRules","uploadedFile","fileCleanEnabled","isPreUploadFileCleanEnabled","cleanPrinterFiles","token","startTrackingSession","response","uploadFileAsMultiPart","success","local","getFile","appendOrSetPrinterFile","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","printerResolveMiddleware","post","withPermission","PERMS","PrinterFiles","Clear","get","Upload","Actions","Get","delete","Delete"],"mappings":"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"}
|