@fdm-monster/server 1.5.4 → 1.6.0-rc2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.env.template +7 -0
- package/.gitattributes +2 -0
- package/.yarn/install-state.gz +0 -0
- package/.yarn/releases/yarn-4.1.0.cjs +893 -0
- package/.yarnrc.yml +4 -0
- package/README.md +3 -2
- package/dist/consoles/sqlite-torm.js +31 -0
- package/dist/consoles/sqlite-torm.js.map +1 -0
- package/dist/consoles/typeorm-generate.js +194 -0
- package/dist/consoles/typeorm-generate.js.map +1 -0
- package/dist/consoles/typeorm-migrate.js +48 -0
- package/dist/consoles/typeorm-migrate.js.map +1 -0
- package/dist/consoles/upload-test.js +52 -0
- package/dist/consoles/upload-test.js.map +1 -0
- package/dist/constants/event.constants.js.map +1 -1
- package/dist/constants/service.constants.js +3 -18
- package/dist/constants/service.constants.js.map +1 -1
- package/dist/container.js +64 -19
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +2 -0
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/batch-call.controller.js +10 -5
- package/dist/controllers/batch-call.controller.js.map +1 -1
- package/dist/controllers/custom-gcode.controller.js.map +1 -1
- package/dist/controllers/dto/update-client-dist.dto.js +38 -0
- package/dist/controllers/dto/update-client-dist.dto.js.map +1 -0
- package/dist/controllers/printer-files.controller.js +10 -49
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +1 -1
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +25 -6
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/validation/batch-controller.validation.js +9 -0
- package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
- package/dist/data-source.js +66 -0
- package/dist/data-source.js.map +1 -0
- package/dist/entities/base.entity.js +29 -0
- package/dist/entities/base.entity.js.map +1 -0
- package/dist/entities/camera-stream.entity.js +94 -0
- package/dist/entities/camera-stream.entity.js.map +1 -0
- package/dist/entities/custom-gcode.entity.js +50 -0
- package/dist/entities/custom-gcode.entity.js.map +1 -0
- package/dist/entities/floor-position.entity.js +78 -0
- package/dist/entities/floor-position.entity.js.map +1 -0
- package/dist/entities/floor.entity.js +53 -0
- package/dist/entities/floor.entity.js.map +1 -0
- package/dist/entities/index.js +58 -0
- package/dist/entities/index.js.map +1 -0
- package/dist/entities/permission.entity.js +38 -0
- package/dist/entities/permission.entity.js.map +1 -0
- package/dist/entities/print-completion.entity.js +91 -0
- package/dist/entities/print-completion.entity.js.map +1 -0
- package/dist/entities/printer-file.entity.js +140 -0
- package/dist/entities/printer-file.entity.js.map +1 -0
- package/dist/entities/printer.entity.js +105 -0
- package/dist/entities/printer.entity.js.map +1 -0
- package/dist/entities/refresh-token.entity.js +70 -0
- package/dist/entities/refresh-token.entity.js.map +1 -0
- package/dist/entities/role.entity.js +46 -0
- package/dist/entities/role.entity.js.map +1 -0
- package/dist/entities/settings.entity.js +89 -0
- package/dist/entities/settings.entity.js.map +1 -0
- package/dist/entities/user-role.entity.js +70 -0
- package/dist/entities/user-role.entity.js.map +1 -0
- package/dist/entities/user.entity.js +90 -0
- package/dist/entities/user.entity.js.map +1 -0
- package/dist/middleware/exception.filter.js +2 -1
- package/dist/middleware/exception.filter.js.map +1 -1
- package/dist/middleware/passport.js.map +1 -1
- package/dist/migrations/1706829146617-InitSqlite.js +670 -0
- package/dist/migrations/1706829146617-InitSqlite.js.map +1 -0
- package/dist/models/Floor.js.map +1 -1
- package/dist/models/Printer.js +4 -43
- package/dist/models/Printer.js.map +1 -1
- package/dist/models/PrinterFile.js +85 -0
- package/dist/models/PrinterFile.js.map +1 -0
- package/dist/models/index.js +4 -0
- package/dist/models/index.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 +4 -2
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js +10 -1
- package/dist/server.core.js.map +1 -1
- package/dist/server.host.js +11 -3
- package/dist/server.host.js.map +1 -1
- package/dist/services/batch-call.service.js +43 -20
- package/dist/services/batch-call.service.js.map +1 -1
- package/dist/services/core/client-bundle.service.js +92 -25
- package/dist/services/core/client-bundle.service.js.map +1 -1
- package/dist/services/core/github.service.js +18 -14
- package/dist/services/core/github.service.js.map +1 -1
- package/dist/services/core/multer.service.js +3 -3
- package/dist/services/core/multer.service.js.map +1 -1
- package/dist/services/core/task-manager.service.js +1 -1
- package/dist/services/core/task-manager.service.js.map +1 -1
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/floor.service.js +1 -1
- 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 +32 -4
- package/dist/services/interfaces/printer-file.dto.js.map +1 -1
- package/dist/services/octoprint/dto/connection-state.dto.js +21 -0
- package/dist/services/octoprint/dto/connection-state.dto.js.map +1 -0
- package/dist/services/{interfaces/print-completion.service.js → octoprint/dto/connection.dto.js} +1 -1
- package/dist/services/octoprint/dto/connection.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/octoprint/dto/octoprint-session.dto.js +6 -0
- 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/models/octoprint-file.dto.js +6 -0
- package/dist/services/octoprint/models/octoprint-file.dto.js.map +1 -0
- package/dist/services/octoprint/octoprint-api.routes.js +24 -18
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.service.js +201 -138
- package/dist/services/octoprint/octoprint-api.service.js.map +1 -1
- package/dist/services/octoprint/octoprint-sockio.adapter.js +72 -66
- package/dist/services/octoprint/octoprint-sockio.adapter.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/octoprint/utils/file.utils.js +44 -0
- package/dist/services/octoprint/utils/file.utils.js.map +1 -0
- 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 +72 -0
- package/dist/services/orm/base.service.js.map +1 -0
- package/dist/services/orm/camera-stream.service.js +25 -0
- package/dist/services/orm/camera-stream.service.js.map +1 -0
- package/dist/services/orm/custom-gcode.service.js +42 -0
- package/dist/services/orm/custom-gcode.service.js.map +1 -0
- package/dist/services/orm/floor-position.service.js +55 -0
- package/dist/services/orm/floor-position.service.js.map +1 -0
- package/dist/services/orm/floor.service.js +122 -0
- package/dist/services/orm/floor.service.js.map +1 -0
- package/dist/services/orm/permission.service.js +77 -0
- package/dist/services/orm/permission.service.js.map +1 -0
- package/dist/services/orm/print-completion.service.js +90 -0
- package/dist/services/orm/print-completion.service.js.map +1 -0
- package/dist/services/orm/printer-files.service.js +123 -0
- package/dist/services/orm/printer-files.service.js.map +1 -0
- package/dist/services/orm/printer.service.js +145 -0
- package/dist/services/orm/printer.service.js.map +1 -0
- package/dist/services/orm/refresh-token.service.js +107 -0
- package/dist/services/orm/refresh-token.service.js.map +1 -0
- package/dist/services/orm/role.service.js +131 -0
- package/dist/services/orm/role.service.js.map +1 -0
- package/dist/services/orm/settings.service.js +208 -0
- package/dist/services/orm/settings.service.js.map +1 -0
- package/dist/services/orm/user-role.service.js +55 -0
- package/dist/services/orm/user-role.service.js.map +1 -0
- package/dist/services/orm/user.service.js +146 -0
- package/dist/services/orm/user.service.js.map +1 -0
- package/dist/services/orm-migration.service.js +20 -0
- package/dist/services/orm-migration.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/printer-files.service.js +73 -49
- package/dist/services/printer-files.service.js.map +1 -1
- package/dist/services/printer.service.js +0 -2
- package/dist/services/printer.service.js.map +1 -1
- package/dist/services/typeorm/typeorm.service.js +48 -0
- package/dist/services/typeorm/typeorm.service.js.map +1 -0
- package/dist/shared/dtos/printer-login.dto.js +58 -0
- package/dist/shared/dtos/printer-login.dto.js.map +1 -0
- package/dist/{utils → shared}/websocket.adapter.js +3 -3
- package/dist/shared/websocket.adapter.js.map +1 -0
- package/dist/state/file-upload-tracker.cache.js.map +1 -1
- package/dist/state/file.cache.js +12 -35
- package/dist/state/file.cache.js.map +1 -1
- package/dist/state/printer-connection.cache.js +21 -0
- package/dist/state/printer-connection.cache.js.map +1 -0
- package/dist/state/printer-events.cache.js +13 -7
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/printer-files.store.js +14 -18
- package/dist/state/printer-files.store.js.map +1 -1
- package/dist/state/printer-socket.store.js +3 -3
- package/dist/state/printer-socket.store.js.map +1 -1
- package/dist/state/printer.cache.js +3 -0
- package/dist/state/printer.cache.js.map +1 -1
- package/dist/state/settings.store.js +9 -1
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +1 -1
- package/dist/task.presets.js.map +1 -1
- package/dist/tasks/boot.task.js +30 -18
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/print-completion.socketio.task.js +28 -19
- package/dist/tasks/print-completion.socketio.task.js.map +1 -1
- package/dist/tasks/printer-file-clean.task.js +14 -0
- package/dist/tasks/printer-file-clean.task.js.map +1 -1
- package/dist/tasks/printer-state-update-poll.task.js +89 -0
- package/dist/tasks/printer-state-update-poll.task.js.map +1 -0
- package/dist/tasks/printer-websocket-restore.task.js +4 -3
- package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
- package/dist/tasks/printer-websocket.task.js +1 -1
- package/dist/tasks/printer-websocket.task.js.map +1 -1
- package/dist/tasks.js +2 -1
- package/dist/tasks.js.map +1 -1
- package/dist/utils/env.utils.js +0 -10
- package/dist/utils/env.utils.js.map +1 -1
- package/dist/utils/semver.utils.js +19 -4
- package/dist/utils/semver.utils.js.map +1 -1
- package/package.json +58 -47
- 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.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../../../src/services/octoprint/dto/websocket-output/events/transfer-done.dto.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../../../src/services/octoprint/dto/websocket-output/events/transfer-started.dto.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../../../src/services/octoprint/dto/websocket-output/events/updated-files.dto.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../../../src/services/octoprint/dto/websocket-output/events/upload.dto.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../../../src/services/octoprint/dto/websocket-output/events/user-logged-in.dto.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../../../src/services/octoprint/dto/websocket-output/events/z-change.dto.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../../src/services/octoprint/dto/websocket-output/history-message.dto.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../../src/services/octoprint/dto/websocket-output/plugin-message.dto.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../../src/services/octoprint/dto/websocket-output/timelapse-message.dto.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../src/services/octoprint/models/octoprint-file.dto.ts"],"names":[],"mappings":""}
|
|
@@ -20,9 +20,9 @@ class OctoPrintRoutes {
|
|
|
20
20
|
apiFilesLocation = `${this.apiFiles}/local`;
|
|
21
21
|
apiConnection = `${this.apiBase}/connection`;
|
|
22
22
|
apiJob = `${this.apiBase}/job`;
|
|
23
|
-
|
|
24
|
-
apiPrinterBed = `${this.
|
|
25
|
-
apiPrinterCustomCommand = `${this.
|
|
23
|
+
apiPrinter = `${this.apiBase}/printer`;
|
|
24
|
+
apiPrinterBed = `${this.apiPrinter}/bed`;
|
|
25
|
+
apiPrinterCustomCommand = `${this.apiPrinter}/command`;
|
|
26
26
|
apiPrinterProfiles = `${this.apiBase}/printerprofiles`;
|
|
27
27
|
apiSystem = `${this.apiBase}/system`;
|
|
28
28
|
apiSystemInfo = `${this.apiSystem}/info`;
|
|
@@ -51,10 +51,10 @@ class OctoPrintRoutes {
|
|
|
51
51
|
pluginManagerPlugins = `${this.pluginManager}/plugins`;
|
|
52
52
|
pluginManagerExport = `${this.pluginManager}/export`;
|
|
53
53
|
pluginManagerOrphans = `${this.pluginManager}/orphans`;
|
|
54
|
-
|
|
55
|
-
|
|
54
|
+
settingsStore;
|
|
55
|
+
timeouts;
|
|
56
56
|
constructor({ settingsStore }){
|
|
57
|
-
this.
|
|
57
|
+
this.settingsStore = settingsStore;
|
|
58
58
|
}
|
|
59
59
|
get disconnectCommand() {
|
|
60
60
|
return {
|
|
@@ -91,6 +91,12 @@ class OctoPrintRoutes {
|
|
|
91
91
|
}
|
|
92
92
|
pluginManagerPlugin = (pluginName)=>`${this.pluginManager}/${pluginName}`;
|
|
93
93
|
pluginManagerRepository = (refresh = false)=>`${this.pluginManager}/repository?refresh=${refresh}`;
|
|
94
|
+
apiPrinterCurrent = (history, limit, exclude)=>{
|
|
95
|
+
exclude = exclude?.filter((e)=>!!e.length);
|
|
96
|
+
const excludeParam = exclude?.length ? `&exclude=${exclude?.join(",")}` : "";
|
|
97
|
+
const limitParam = !!limit ? "&limit=limit" : "";
|
|
98
|
+
return `${this.apiPrinter}?history=${!!history}${limitParam}${excludeParam}`;
|
|
99
|
+
};
|
|
94
100
|
apiFile = (path)=>`${this.apiFilesLocation}/${path}`;
|
|
95
101
|
apiGetFiles = (recursive = false)=>`${this.apiFiles}/local?recursive=${recursive}`;
|
|
96
102
|
apiSoftwareUpdateCheck = (force)=>`${this.octoPrintBase}plugin/softwareupdate/check${force ? "?force=true" : ""}`;
|
|
@@ -133,20 +139,20 @@ class OctoPrintRoutes {
|
|
|
133
139
|
url
|
|
134
140
|
};
|
|
135
141
|
}
|
|
136
|
-
|
|
137
|
-
const serverSettings = this.
|
|
138
|
-
this.
|
|
142
|
+
ensureTimeoutSettingsLoaded() {
|
|
143
|
+
const serverSettings = this.settingsStore.getSettings();
|
|
144
|
+
this.timeouts = {
|
|
139
145
|
...serverSettings[_serversettingsconstants.timeoutSettingKey]
|
|
140
146
|
};
|
|
141
|
-
if (!this.
|
|
147
|
+
if (!this.timeouts) {
|
|
142
148
|
throw new Error("OctoPrint API Service could not load timeout settings. settingsStore:Settings:timeout didnt return anything");
|
|
143
149
|
}
|
|
144
150
|
}
|
|
145
|
-
|
|
146
|
-
this.
|
|
151
|
+
prepareRequest(login, path, timeoutOverride, contentType = _octoprintserviceconstants.jsonContentType) {
|
|
152
|
+
this.ensureTimeoutSettingsLoaded();
|
|
147
153
|
const { apiKey, printerURL } = (0, _apiutils.validateLogin)(login);
|
|
148
154
|
let headers = (0, _apiutils.constructHeaders)(apiKey, contentType);
|
|
149
|
-
let timeout = timeoutOverride || this.
|
|
155
|
+
let timeout = timeoutOverride || this.timeouts.apiTimeout;
|
|
150
156
|
if (timeout <= 0) {
|
|
151
157
|
timeout = (0, _serversettingsconstants.getDefaultTimeout)().apiTimeout;
|
|
152
158
|
}
|
|
@@ -158,12 +164,12 @@ class OctoPrintRoutes {
|
|
|
158
164
|
}
|
|
159
165
|
};
|
|
160
166
|
}
|
|
161
|
-
|
|
162
|
-
this.
|
|
167
|
+
prepareAnonymousRequest(path, timeoutOverride, contentType = _octoprintserviceconstants.jsonContentType) {
|
|
168
|
+
this.ensureTimeoutSettingsLoaded();
|
|
163
169
|
let headers = {
|
|
164
170
|
[_octoprintserviceconstants.contentTypeHeaderKey]: contentType
|
|
165
171
|
};
|
|
166
|
-
let timeout = timeoutOverride || this.
|
|
172
|
+
let timeout = timeoutOverride || this.timeouts.apiTimeout;
|
|
167
173
|
if (timeout <= 0) {
|
|
168
174
|
timeout = (0, _serversettingsconstants.getDefaultTimeout)().apiTimeout;
|
|
169
175
|
}
|
|
@@ -175,8 +181,8 @@ class OctoPrintRoutes {
|
|
|
175
181
|
}
|
|
176
182
|
};
|
|
177
183
|
}
|
|
178
|
-
|
|
179
|
-
const { url, options } = this.
|
|
184
|
+
prepareJsonRequest(login, path, data, timeoutOverride) {
|
|
185
|
+
const { url, options } = this.prepareRequest(login, path, timeoutOverride);
|
|
180
186
|
let serializedData = data ? JSON.stringify(data) : undefined;
|
|
181
187
|
options.headers[_octoprintserviceconstants.contentTypeHeaderKey] = _octoprintserviceconstants.jsonContentType;
|
|
182
188
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/octoprint/octoprint-api.routes.ts"],"names":["OctoPrintRoutes","octoPrintBase","apiBase","apiSettingsPart","apiFiles","apiFilesLocation","apiConnection","apiJob","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/octoprint-api.routes.ts"],"names":["OctoPrintRoutes","octoPrintBase","apiBase","apiSettingsPart","apiFiles","apiFilesLocation","apiConnection","apiJob","apiPrinter","apiPrinterBed","apiPrinterCustomCommand","apiPrinterProfiles","apiSystem","apiSystemInfo","apiSystemCommands","apiSystemRestartCommand","apiUsers","apiLogin","apiPluginPiSupport","apiProfiles","apiTimelapse","apiPlugin","apiPluginManager","pluginsBase","pluginSoftwareUpdate","pluginSoftwareUpdateCheck","pluginSoftwareUpdateUpdate","pluginFirmwareUpdater","pluginFirmwareUpdaterStatus","pluginFirmwareUpdaterFlash","pluginBackupIndex","pluginBackupEndpoint","pluginBackupFile","filename","pluginBackupFileDownload","pluginBackupFileRestore","pluginManager","pluginManagerPlugins","pluginManagerExport","pluginManagerOrphans","settingsStore","timeouts","constructor","disconnectCommand","command","cancelJobCommand","pauseJobCommand","action","resumeJobCommand","connectCommand","getBedTargetCommand","targetTemperature","target","pluginManagerPlugin","pluginName","pluginManagerRepository","refresh","apiPrinterCurrent","history","limit","exclude","filter","e","length","excludeParam","join","limitParam","apiFile","path","apiGetFiles","recursive","apiSoftwareUpdateCheck","force","selectCommand","print","moveFileCommand","destination","printerNameSetting","name","appearance","gcodeAnalysisSetting","enabled","gcodeAnalysis","runAt","pluginFirmwareUpdaterSettings","subsettings","plugins","firmwareupdater","pluginManagerCommand","url","ensureTimeoutSettingsLoaded","serverSettings","getSettings","timeoutSettingKey","Error","prepareRequest","login","timeoutOverride","contentType","jsonContentType","apiKey","printerURL","validateLogin","headers","constructHeaders","timeout","apiTimeout","getDefaultTimeout","URL","normalizeUrl","href","options","prepareAnonymousRequest","contentTypeHeaderKey","prepareJsonRequest","data","serializedData","JSON","stringify","undefined"],"mappings":"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"}
|