@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
package/dist/state/file.cache.js
CHANGED
|
@@ -8,9 +8,7 @@ Object.defineProperty(exports, "FileCache", {
|
|
|
8
8
|
return FileCache;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
const _findpredicateutils = require("../utils/find-predicate.utils");
|
|
12
11
|
const _runtimeexceptions = require("../exceptions/runtime.exceptions");
|
|
13
|
-
const _serviceconstants = require("../constants/service.constants");
|
|
14
12
|
class FileCache {
|
|
15
13
|
printerFileStorage = {};
|
|
16
14
|
totalFileCount = 0;
|
|
@@ -18,45 +16,23 @@ class FileCache {
|
|
|
18
16
|
constructor({ loggerFactory }){
|
|
19
17
|
this.logger = loggerFactory(FileCache.name);
|
|
20
18
|
}
|
|
21
|
-
|
|
22
|
-
this.cachePrinterStorage(printerId, storage);
|
|
23
|
-
this.cachePrinterFiles(printerId, fileList);
|
|
24
|
-
}
|
|
25
|
-
cachePrinterFiles(printerId, fileList) {
|
|
26
|
-
const printerFileStorage = this.getPrinterFileStorage(printerId);
|
|
27
|
-
printerFileStorage.fileList = fileList;
|
|
28
|
-
this.updateCacheFileRefCount();
|
|
29
|
-
}
|
|
30
|
-
cachePrinterStorage(printerId, storage) {
|
|
31
|
-
const printerFileStorage = this.getPrinterFileStorage(printerId);
|
|
32
|
-
printerFileStorage.storage = storage;
|
|
33
|
-
this.updateCacheFileRefCount();
|
|
34
|
-
}
|
|
35
|
-
getPrinterFileStorage(printerId) {
|
|
19
|
+
cachePrinterFiles(printerId, files) {
|
|
36
20
|
if (!printerId) {
|
|
37
21
|
throw new Error("File Cache cant get a null/undefined printer id");
|
|
38
22
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
fileStorage = this.printerFileStorage[printerId] = {
|
|
42
|
-
fileList: (0, _serviceconstants.getFileListDefault)(),
|
|
43
|
-
storage: undefined
|
|
44
|
-
};
|
|
45
|
-
}
|
|
46
|
-
return fileStorage;
|
|
23
|
+
this.printerFileStorage[printerId] = files;
|
|
24
|
+
this.updateCacheFileRefCount();
|
|
47
25
|
}
|
|
48
26
|
getPrinterFiles(printerId) {
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
const fileStorage = this.getPrinterFileStorage(printerId);
|
|
54
|
-
return fileStorage?.storage;
|
|
27
|
+
if (!printerId) {
|
|
28
|
+
throw new Error("File Cache cant get a null/undefined printer id");
|
|
29
|
+
}
|
|
30
|
+
return this.printerFileStorage[printerId];
|
|
55
31
|
}
|
|
56
32
|
updateCacheFileRefCount() {
|
|
57
33
|
let totalFiles = 0;
|
|
58
34
|
for (const storage of Object.values(this.printerFileStorage)){
|
|
59
|
-
totalFiles += storage
|
|
35
|
+
totalFiles += storage?.length || 0;
|
|
60
36
|
}
|
|
61
37
|
if (totalFiles !== this.totalFileCount) {
|
|
62
38
|
this.totalFileCount = totalFiles;
|
|
@@ -77,13 +53,14 @@ class FileCache {
|
|
|
77
53
|
this.logger.log(`Purged printerId '${printerId}' file cache`);
|
|
78
54
|
}
|
|
79
55
|
purgeFile(printerId, filePath) {
|
|
80
|
-
const
|
|
81
|
-
|
|
56
|
+
const files = this.getPrinterFiles(printerId);
|
|
57
|
+
if (!files) return;
|
|
58
|
+
const fileIndex = files.findIndex((f)=>f.path === filePath);
|
|
82
59
|
if (fileIndex === -1) {
|
|
83
60
|
this.logger.warn(`A file removal was ordered but this file was not found in files cache for printer Id ${printerId}`, filePath);
|
|
84
61
|
return this.logger.log("File was not found in cached printer fileList");
|
|
85
62
|
}
|
|
86
|
-
|
|
63
|
+
files.splice(fileIndex, 1);
|
|
87
64
|
this.logger.log(`File ${filePath} was removed`);
|
|
88
65
|
}
|
|
89
66
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/file.cache.ts"],"names":["FileCache","printerFileStorage","totalFileCount","logger","constructor","loggerFactory","name","
|
|
1
|
+
{"version":3,"sources":["../../src/state/file.cache.ts"],"names":["FileCache","printerFileStorage","totalFileCount","logger","constructor","loggerFactory","name","cachePrinterFiles","printerId","files","Error","updateCacheFileRefCount","getPrinterFiles","totalFiles","storage","Object","values","length","log","purgePrinterId","ValidationException","fileStorage","warn","purgeFile","filePath","fileIndex","findIndex","f","path","splice"],"mappings":";;;;+BAOaA;;;eAAAA;;;mCAPuB;AAO7B,MAAMA;IACHC,qBAAwE,CAAC,EAAE;IAC3EC,iBAAiB,EAAE;IAEnBC,OAAsB;IAE9BC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACF,MAAM,GAAGE,cAAcL,UAAUM,IAAI;IAC5C;IAEAC,kBAAkBC,SAAiB,EAAEC,KAAwC,EAAE;QAC7E,IAAI,CAACD,WAAW;YACd,MAAM,IAAIE,MAAM;QAClB;QACA,IAAI,CAACT,kBAAkB,CAACO,UAAU,GAAGC;QACrC,IAAI,CAACE,uBAAuB;IAC9B;IAEAC,gBAAgBJ,SAAiB,EAAE;QACjC,IAAI,CAACA,WAAW;YACd,MAAM,IAAIE,MAAM;QAClB;QACA,OAAO,IAAI,CAACT,kBAAkB,CAACO,UAAU;IAC3C;IAEAG,0BAA0B;QACxB,IAAIE,aAAa;QACjB,KAAK,MAAMC,WAAWC,OAAOC,MAAM,CAAC,IAAI,CAACf,kBAAkB,EAAG;YAC5DY,cAAcC,SAASG,UAAU;QACnC;QAEA,IAAIJ,eAAe,IAAI,CAACX,cAAc,EAAE;YACtC,IAAI,CAACA,cAAc,GAAGW;YACtB,IAAI,CAACV,MAAM,CAACe,GAAG,CAAC,CAAC,eAAe,EAAE,IAAI,CAAChB,cAAc,CAAC,gCAAgC,CAAC;QACzF;QAEA,OAAOW;IACT;IAEAM,eAAeX,SAAiB,EAAE;QAChC,IAAI,CAACA,WAAW;YACd,MAAM,IAAIY,sCAAmB,CAAC;QAChC;QAEA,MAAMC,cAAc,IAAI,CAACpB,kBAAkB,CAACO,UAAU;QAEtD,IAAI,CAACa,aAAa;YAChB,IAAI,CAAClB,MAAM,CAACmB,IAAI,CAAC;YACjB;QACF;QAEA,OAAO,IAAI,CAACrB,kBAAkB,CAACO,UAAU;QAEzC,IAAI,CAACL,MAAM,CAACe,GAAG,CAAC,CAAC,kBAAkB,EAAEV,UAAU,YAAY,CAAC;IAC9D;IAEAe,UAAUf,SAAiB,EAAEgB,QAAgB,EAAE;QAC7C,MAAMf,QAAQ,IAAI,CAACG,eAAe,CAACJ;QACnC,IAAI,CAACC,OAAO;QAEZ,MAAMgB,YAAYhB,MAAMiB,SAAS,CAAC,CAACC,IAAMA,EAAEC,IAAI,KAAKJ;QACpD,IAAIC,cAAc,CAAC,GAAG;YAEpB,IAAI,CAACtB,MAAM,CAACmB,IAAI,CACd,CAAC,qFAAqF,EAAEd,UAAU,CAAC,EACnGgB;YAGF,OAAO,IAAI,CAACrB,MAAM,CAACe,GAAG,CAAC;QACzB;QAEAT,MAAMoB,MAAM,CAACJ,WAAW;QACxB,IAAI,CAACtB,MAAM,CAACe,GAAG,CAAC,CAAC,KAAK,EAAEM,SAAS,YAAY,CAAC;IAChD;AACF"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "PrinterConnectionCache", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return PrinterConnectionCache;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _keydiffcache = require("../utils/cache/key-diff.cache");
|
|
12
|
+
class PrinterConnectionCache extends _keydiffcache.KeyDiffCache {
|
|
13
|
+
async getPrinterConnection(printerId, connection) {
|
|
14
|
+
await this.setKeyValue(printerId, connection);
|
|
15
|
+
}
|
|
16
|
+
async setPrinterConnection(printerId, connection) {
|
|
17
|
+
await this.setKeyValue(printerId, connection);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
//# sourceMappingURL=printer-connection.cache.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/state/printer-connection.cache.ts"],"names":["PrinterConnectionCache","KeyDiffCache","getPrinterConnection","printerId","connection","setKeyValue","setPrinterConnection"],"mappings":";;;;+BAMaA;;;eAAAA;;;8BAJgB;AAItB,MAAMA,+BAA+BC,0BAAY;IACtD,MAAMC,qBAAqBC,SAAiB,EAAEC,UAAyB,EAAE;QACvE,MAAM,IAAI,CAACC,WAAW,CAACF,WAAWC;IACpC;IAEA,MAAME,qBAAqBH,SAAiB,EAAEC,UAAyB,EAAE;QACvE,MAAM,IAAI,CAACC,WAAW,CAACF,WAAWC;IACpC;AACF"}
|
|
@@ -23,7 +23,7 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
|
|
|
23
23
|
this.subscribeToEvents();
|
|
24
24
|
}
|
|
25
25
|
get _debugMode() {
|
|
26
|
-
return this.settingsStore.
|
|
26
|
+
return this.settingsStore.getSettingsSensitive()?.server?.debugSettings?.debugSocketMessages;
|
|
27
27
|
}
|
|
28
28
|
async getPrinterSocketEvents(id) {
|
|
29
29
|
return this.keyValueStore[id];
|
|
@@ -32,6 +32,9 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
|
|
|
32
32
|
let ref = await this.getValue(printerId);
|
|
33
33
|
if (!ref) {
|
|
34
34
|
ref = {
|
|
35
|
+
connected: null,
|
|
36
|
+
reauthRequired: null,
|
|
37
|
+
slicingProgress: null,
|
|
35
38
|
current: null,
|
|
36
39
|
history: null,
|
|
37
40
|
timelapse: null,
|
|
@@ -42,7 +45,7 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
|
|
|
42
45
|
}
|
|
43
46
|
return ref;
|
|
44
47
|
}
|
|
45
|
-
async setEvent(printerId, label,
|
|
48
|
+
async setEvent(printerId, label, payload) {
|
|
46
49
|
const ref = await this.getOrCreateEvents(printerId);
|
|
47
50
|
ref[label] = {
|
|
48
51
|
payload,
|
|
@@ -50,9 +53,12 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
|
|
|
50
53
|
};
|
|
51
54
|
await this.setKeyValue(printerId, ref);
|
|
52
55
|
}
|
|
53
|
-
async
|
|
56
|
+
async setSubstate(printerId, label, substateName, payload) {
|
|
54
57
|
const ref = await this.getOrCreateEvents(printerId);
|
|
55
|
-
ref[label]
|
|
58
|
+
if (!ref[label]) {
|
|
59
|
+
ref[label] = {};
|
|
60
|
+
}
|
|
61
|
+
ref[label][substateName] = {
|
|
56
62
|
payload,
|
|
57
63
|
receivedAt: Date.now()
|
|
58
64
|
};
|
|
@@ -68,15 +74,15 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
|
|
|
68
74
|
async onPrinterSocketMessage(e) {
|
|
69
75
|
const printerId = e.printerId;
|
|
70
76
|
if (e.event !== "plugin" && e.event !== "event") {
|
|
71
|
-
await this.setEvent(printerId, e.event,
|
|
77
|
+
await this.setEvent(printerId, e.event, e.event === "history" ? this.pruneHistoryPayload(e.payload) : e.payload);
|
|
72
78
|
if (this._debugMode) {
|
|
73
79
|
this.logger.log(`Message '${e.event}' received, size ${(0, _metricutils.formatKB)(e.payload)}`, e.printerId);
|
|
74
80
|
}
|
|
75
81
|
} else if (e.event === "plugin") {
|
|
76
|
-
await this.
|
|
82
|
+
await this.setSubstate(printerId, "plugin", e.payload.plugin, e.payload);
|
|
77
83
|
} else if (e.event === "event") {
|
|
78
84
|
const eventType = e.payload.type;
|
|
79
|
-
await this.
|
|
85
|
+
await this.setSubstate(printerId, "event", eventType, e.payload.payload);
|
|
80
86
|
if (this._debugMode) {
|
|
81
87
|
this.logger.log(`Event '${eventType}' received`, e.printerId);
|
|
82
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/printer-events.cache.ts"],"names":["PrinterEventsCache","KeyDiffCache","logger","eventEmitter2","settingsStore","constructor","loggerFactory","name","subscribeToEvents","_debugMode","
|
|
1
|
+
{"version":3,"sources":["../../src/state/printer-events.cache.ts"],"names":["PrinterEventsCache","KeyDiffCache","logger","eventEmitter2","settingsStore","constructor","loggerFactory","name","subscribeToEvents","_debugMode","getSettingsSensitive","server","debugSettings","debugSocketMessages","getPrinterSocketEvents","id","keyValueStore","getOrCreateEvents","printerId","ref","getValue","connected","reauthRequired","slicingProgress","current","history","timelapse","event","plugin","setKeyValue","setEvent","label","payload","receivedAt","Date","now","setSubstate","substateName","handlePrintersDeleted","printerIds","deleteKeysBatch","on","e","onPrinterSocketMessage","printerEvents","printersDeleted","bind","pruneHistoryPayload","log","formatKB","eventType","type","logs","temps","messages"],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ Object.defineProperty(exports, "PrinterFilesStore", {
|
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
const _runtimeexceptions = require("../exceptions/runtime.exceptions");
|
|
12
|
+
const _errorutils = require("../utils/error.utils");
|
|
12
13
|
class PrinterFilesStore {
|
|
13
14
|
printerCache;
|
|
14
15
|
printerFilesService;
|
|
@@ -26,21 +27,18 @@ class PrinterFilesStore {
|
|
|
26
27
|
const printers = await this.printerCache.listCachedPrinters(true);
|
|
27
28
|
for (let printer of printers){
|
|
28
29
|
try {
|
|
29
|
-
const
|
|
30
|
-
this.fileCache.
|
|
30
|
+
const printerFiles = await this.printerFilesService.getPrinterFiles(printer.id);
|
|
31
|
+
this.fileCache.cachePrinterFiles(printer.id, printerFiles);
|
|
31
32
|
} catch (e) {
|
|
32
|
-
this.logger.error("Files store failed to reconstruct files from database.",
|
|
33
|
+
this.logger.error("Files store failed to reconstruct files from database.", (0, _errorutils.errorSummary)(e));
|
|
33
34
|
}
|
|
34
35
|
}
|
|
35
36
|
}
|
|
36
37
|
async eagerLoadPrinterFiles(printerId, recursive) {
|
|
37
38
|
const loginDto = await this.printerCache.getLoginDtoAsync(printerId);
|
|
38
|
-
const
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
});
|
|
42
|
-
await this.updatePrinterFiles(printerId, response.data);
|
|
43
|
-
return response;
|
|
39
|
+
const normalizedFiles = await this.octoPrintApiService.getLocalFiles(loginDto, recursive);
|
|
40
|
+
await this.updatePrinterFiles(printerId, normalizedFiles);
|
|
41
|
+
return normalizedFiles;
|
|
44
42
|
}
|
|
45
43
|
getFiles(printerId) {
|
|
46
44
|
return this.fileCache.getPrinterFiles(printerId);
|
|
@@ -48,9 +46,9 @@ class PrinterFilesStore {
|
|
|
48
46
|
getOutdatedFiles(printerId, ageDaysMax) {
|
|
49
47
|
if (!ageDaysMax) throw new _runtimeexceptions.ValidationException("ageDaysMax property is required to get printer's outdated files");
|
|
50
48
|
const printerFiles = this.getFiles(printerId);
|
|
51
|
-
if (!printerFiles?.
|
|
49
|
+
if (!printerFiles?.length) return [];
|
|
52
50
|
const nowTimestampSeconds = Date.now() / 1000;
|
|
53
|
-
return printerFiles.
|
|
51
|
+
return printerFiles.filter((file)=>!!file.date && file.date + ageDaysMax * 86400 < nowTimestampSeconds);
|
|
54
52
|
}
|
|
55
53
|
async deleteOutdatedFiles(printerId, ageDaysMax) {
|
|
56
54
|
const failedFiles = [];
|
|
@@ -99,15 +97,13 @@ class PrinterFilesStore {
|
|
|
99
97
|
}
|
|
100
98
|
async appendOrSetPrinterFile(printerId, addedFile) {
|
|
101
99
|
const printer = await this.printerCache.getCachedPrinterOrThrowAsync(printerId);
|
|
102
|
-
const
|
|
103
|
-
await this.fileCache.cachePrinterFiles(printer.id,
|
|
104
|
-
await this.printerFilesService.setPrinterLastPrintedFile(printer.id, lastPrintedFile.fileName);
|
|
105
|
-
}
|
|
106
|
-
async setExistingFileForPrint(printerId, filePath) {
|
|
107
|
-
await this.printerFilesService.setPrinterLastPrintedFile(printerId, filePath);
|
|
100
|
+
const files = await this.printerFilesService.appendOrReplaceFile(printer.id, addedFile);
|
|
101
|
+
await this.fileCache.cachePrinterFiles(printer.id, files);
|
|
108
102
|
}
|
|
109
103
|
async deleteFile(printerId, filePath, throwError) {
|
|
110
|
-
const serviceActionResult = await this.printerFilesService.
|
|
104
|
+
const serviceActionResult = await this.printerFilesService.deletePrinterFiles(printerId, [
|
|
105
|
+
filePath
|
|
106
|
+
], throwError);
|
|
111
107
|
this.fileCache.purgeFile(printerId, filePath);
|
|
112
108
|
return {
|
|
113
109
|
service: serviceActionResult
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/printer-files.store.ts"],"names":["PrinterFilesStore","printerCache","printerFilesService","fileCache","octoPrintApiService","logger","constructor","loggerFactory","name","loadFilesStore","printers","listCachedPrinters","printer","
|
|
1
|
+
{"version":3,"sources":["../../src/state/printer-files.store.ts"],"names":["PrinterFilesStore","printerCache","printerFilesService","fileCache","octoPrintApiService","logger","constructor","loggerFactory","name","loadFilesStore","printers","listCachedPrinters","printer","printerFiles","getPrinterFiles","id","cachePrinterFiles","e","error","errorSummary","eagerLoadPrinterFiles","printerId","recursive","loginDto","getLoginDtoAsync","normalizedFiles","getLocalFiles","updatePrinterFiles","getFiles","getOutdatedFiles","ageDaysMax","ValidationException","length","nowTimestampSeconds","Date","now","filter","file","date","deleteOutdatedFiles","failedFiles","succeededFiles","nonRecursiveFiles","printerLogin","getCachedPrinterOrThrowAsync","deleteFileOrFolder","path","push","log","purgePrinterFiles","printerState","clearFiles","purgePrinterId","purgeFiles","allPrinters","files","printerFileList","updateFiles","appendOrSetPrinterFile","addedFile","appendOrReplaceFile","deleteFile","filePath","throwError","serviceActionResult","deletePrinterFiles","purgeFile","service"],"mappings":"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"}
|
|
@@ -84,7 +84,7 @@ class PrinterSocketStore {
|
|
|
84
84
|
promisesReauth.push(promise);
|
|
85
85
|
}
|
|
86
86
|
} catch (e) {
|
|
87
|
-
if (this.settingsStore.
|
|
87
|
+
if (this.settingsStore.getDebugSettingsSensitive()?.debugSocketSetup) {
|
|
88
88
|
this.logger.log("Failed to reauth printer socket", (0, _errorutils.errorSummary)(e));
|
|
89
89
|
}
|
|
90
90
|
(0, _node.captureException)(e);
|
|
@@ -96,7 +96,7 @@ class PrinterSocketStore {
|
|
|
96
96
|
for (const socket of Object.values(this.printerSocketAdaptersById)){
|
|
97
97
|
try {
|
|
98
98
|
if (socket.needsSetup() || socket.needsReopen()) {
|
|
99
|
-
if (this.settingsStore.
|
|
99
|
+
if (this.settingsStore.getDebugSettingsSensitive()?.debugSocketSetup) {
|
|
100
100
|
this.logger.log(`Reopening socket for printerId '${socket.printerId}' (setup: ${socket.needsSetup()}, reopen: ${socket.needsReopen()})`);
|
|
101
101
|
}
|
|
102
102
|
socketSetupRequested++;
|
|
@@ -108,7 +108,7 @@ class PrinterSocketStore {
|
|
|
108
108
|
promisesOpenSocket.push(promise);
|
|
109
109
|
}
|
|
110
110
|
} catch (e) {
|
|
111
|
-
if (this.settingsStore.
|
|
111
|
+
if (this.settingsStore.getDebugSettingsSensitive()?.debugSocketSetup) {
|
|
112
112
|
this.logger.log(`Failed to setup printer socket ${(0, _errorutils.errorSummary)(e)}`);
|
|
113
113
|
}
|
|
114
114
|
(0, _node.captureException)(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/printer-socket.store.ts"],"names":["PrinterSocketStore","socketIoGateway","socketFactory","eventEmitter2","printerCache","printerSocketAdaptersById","logger","configService","settingsStore","constructor","loggerFactory","name","subscribeToEvents","getSocketStatesById","socketStatesById","Object","values","forEach","s","printerId","socket","socketState","api","apiState","loadPrinterSockets","loadCache","printerDocs","listCachedPrinters","doc","handlePrinterCreated","printer","e","error","errorSummary","log","keys","length","listPrinterSockets","reconnectOctoPrint","id","getPrinterSocket","close","resetSocketState","reconnectPrinterSockets","reauthRequested","socketSetupRequested","socketStates","apiStates","promisesReauth","failedSocketsReauth","needsReauth","promise","reauthSession","catch","_","push","
|
|
1
|
+
{"version":3,"sources":["../../src/state/printer-socket.store.ts"],"names":["PrinterSocketStore","socketIoGateway","socketFactory","eventEmitter2","printerCache","printerSocketAdaptersById","logger","configService","settingsStore","constructor","loggerFactory","name","subscribeToEvents","getSocketStatesById","socketStatesById","Object","values","forEach","s","printerId","socket","socketState","api","apiState","loadPrinterSockets","loadCache","printerDocs","listCachedPrinters","doc","handlePrinterCreated","printer","e","error","errorSummary","log","keys","length","listPrinterSockets","reconnectOctoPrint","id","getPrinterSocket","close","resetSocketState","reconnectPrinterSockets","reauthRequested","socketSetupRequested","socketStates","apiStates","promisesReauth","failedSocketsReauth","needsReauth","promise","reauthSession","catch","_","push","getDebugSettingsSensitive","debugSocketSetup","captureException","Promise","all","promisesOpenSocket","failedSocketReopened","needsSetup","needsReopen","setupSocketSession","then","open","keySocket","valSocket","keyApi","valApi","reauth","socketSetup","handleBatchPrinterCreated","printers","p","createOrUpdateSocket","handlePrinterUpdated","enabled","foundAdapter","toString","deleteSocket","createInstance","registerCredentials","loginDto","apiKey","printerURL","protocol","handlePrintersDeleted","printerIds","on","printerEvents","printerCreated","bind","printersDeleted","printerUpdated","batchPrinterCreated"],"mappings":"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"}
|
|
@@ -33,6 +33,9 @@ class PrinterCache extends _keydiffcache.KeyDiffCache {
|
|
|
33
33
|
await this.setKeyValuesBatch(keyValues, true);
|
|
34
34
|
return dtos;
|
|
35
35
|
}
|
|
36
|
+
async countDisabledPrinters() {
|
|
37
|
+
return (await this.getAllValues()).filter((p)=>!p.enabled).length;
|
|
38
|
+
}
|
|
36
39
|
async listCachedPrinters(includeDisabled = false) {
|
|
37
40
|
const printers = await this.getAllValues();
|
|
38
41
|
if (!includeDisabled) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/printer.cache.ts"],"names":["PrinterCache","KeyDiffCache","printerService","eventEmitter2","constructor","on","printerEvents","batchPrinterCreated","handleBatchPrinterCreated","bind","printerCreated","handlePrinterCreatedOrUpdated","printerUpdated","printersDeleted","handlePrintersDeleted","loadCache","printerDocs","list","dtos","mapArray","keyValues","map","p","key","getId","value","setKeyValuesBatch","
|
|
1
|
+
{"version":3,"sources":["../../src/state/printer.cache.ts"],"names":["PrinterCache","KeyDiffCache","printerService","eventEmitter2","constructor","on","printerEvents","batchPrinterCreated","handleBatchPrinterCreated","bind","printerCreated","handlePrinterCreatedOrUpdated","printerUpdated","printersDeleted","handlePrintersDeleted","loadCache","printerDocs","list","dtos","mapArray","keyValues","map","p","key","getId","value","setKeyValuesBatch","countDisabledPrinters","getAllValues","filter","enabled","length","listCachedPrinters","includeDisabled","printers","getCachedPrinterOrThrowAsync","id","printer","getValue","NotFoundException","getCachedPrinterOrThrow","keyValueStore","getNameAsync","name","getName","getLoginDtoAsync","printerURL","apiKey","getLoginDto","mappedPrinters","printerDto","setKeyValue","printerIds","deleteKeysBatch","toString","entities","entity","toUnsafeDto"],"mappings":"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"}
|
|
@@ -52,6 +52,9 @@ class SettingsStore {
|
|
|
52
52
|
}
|
|
53
53
|
});
|
|
54
54
|
}
|
|
55
|
+
getDebugSettingsSensitive() {
|
|
56
|
+
return this.getSettingsSensitive()[_serversettingsconstants.serverSettingsKey].debugSettings;
|
|
57
|
+
}
|
|
55
58
|
async loadSettings() {
|
|
56
59
|
this.settings = await this.settingsService.getOrCreate();
|
|
57
60
|
await this.processSentryEnabled();
|
|
@@ -168,7 +171,12 @@ class SettingsStore {
|
|
|
168
171
|
this.logger.log("Disabling Sentry for remote diagnostics");
|
|
169
172
|
}
|
|
170
173
|
if ((0, _envutils.isTestEnvironment)()) return;
|
|
171
|
-
(0, _node.getCurrentHub)().getClient()
|
|
174
|
+
const client = (0, _node.getCurrentHub)().getClient();
|
|
175
|
+
if (!client) {
|
|
176
|
+
this.logger.warn("Could not apply Sentry. Was the SDK initialized?");
|
|
177
|
+
return;
|
|
178
|
+
}
|
|
179
|
+
client.getOptions().enabled = sentryEnabled;
|
|
172
180
|
}
|
|
173
181
|
}
|
|
174
182
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","settingsService","logger","settings","constructor","loggerFactory","name","getSettings","InternalServerException","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","debugSettings","whitelistEnabled","whitelistedIpAddresses","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","updateCredentialSettings","jwtSecret","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","getServerSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","patchWizardSettings","wizardCompletedAt","Date","setRegistrationEnabled","patchServerSettings","getLoginRequired","setLoginRequired","setWhitelist","updateServerSettings","serverSettings","updateTimeoutSettings","timeoutSettings","patchFileCleanSettings","fileClean","credentialSettings","patchCredentialSettings","setSentryDiagnosticsEnabled","updateFrontendSettings","frontendSettings","sentryEnabled","log","isTestEnvironment","getCurrentHub","getClient","getOptions","enabled"],"mappings":";;;;+BAwBaA;;;eAAAA;;;mCAxB2B;yCAQjC;sBACuB;0BACI;iCACL;AAatB,MAAMA;IACHC,gBAAkC;IAClCC,OAAsB;IACtBC,WAA6B,KAAK;IAE1CC,YAAY,EAAEH,eAAe,EAAEI,aAAa,EAAwE,CAAE;QACpH,IAAI,CAACJ,eAAe,GAAGA;QACvB,IAAI,CAACC,MAAM,GAAGG,cAAcL,cAAcM,IAAI;IAChD;IAEAC,cAAc;QACZ,MAAMJ,WAAW,IAAI,CAACA,QAAQ;QAC9B,IAAI,CAACA,UAAU,MAAM,IAAIK,0CAAuB,CAAC;QACjD,OAAOC,OAAOC,MAAM,CAAC;YAEnB,CAACC,0CAAiB,CAAC,EAAE;gBACnBC,eAAeT,QAAQ,CAACQ,0CAAiB,CAAC,CAACC,aAAa;gBACxDC,cAAcV,QAAQ,CAACQ,0CAAiB,CAAC,CAACE,YAAY;gBACtDC,0BAA0BX,QAAQ,CAACQ,0CAAiB,CAAC,CAACG,wBAAwB;YAChF;YACA,CAACC,yCAAgB,CAAC,EAAEZ,QAAQ,CAACY,yCAAgB,CAAC;YAC9C,CAACC,2CAAkB,CAAC,EAAEb,QAAQ,CAACa,2CAAkB,CAAC;YAClD,CAACC,4CAAmB,CAAC,EAAEd,QAAQ,CAACc,4CAAmB,CAAC;YACpD,CAACC,0CAAiB,CAAC,EAAEf,QAAQ,CAACe,0CAAiB,CAAC;QAClD;IACF;IAEAC,uBAAuB;QACrB,MAAMhB,WAAW,IAAI,CAACA,QAAQ;QAC9B,IAAI,CAACA,UAAU,MAAM,IAAIK,0CAAuB,CAAC;QACjD,OAAOC,OAAOC,MAAM,CAAC;YACnB,CAACU,8CAAqB,CAAC,EAAE;gBACvBC,cAAclB,QAAQ,CAACiB,8CAAqB,CAAC,CAACC,YAAY;gBAC1DC,sBAAsBnB,QAAQ,CAACiB,8CAAqB,CAAC,CAACE,oBAAoB;gBAC1EC,oBAAoBpB,QAAQ,CAACiB,8CAAqB,CAAC,CAACG,kBAAkB;YACxE;YACA,CAACZ,0CAAiB,CAAC,EAAE;gBACnBa,eAAerB,QAAQ,CAACQ,0CAAiB,CAAC,CAACa,aAAa;gBACxDC,kBAAkBtB,QAAQ,CAACQ,0CAAiB,CAAC,CAACc,gBAAgB;gBAC9DC,wBAAwBvB,QAAQ,CAACQ,0CAAiB,CAAC,CAACe,sBAAsB;YAC5E;QACF;IACF;IAEA,
|
|
1
|
+
{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","settingsService","logger","settings","constructor","loggerFactory","name","getSettings","InternalServerException","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","debugSettings","whitelistEnabled","whitelistedIpAddresses","getDebugSettingsSensitive","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","updateCredentialSettings","jwtSecret","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","getServerSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","patchWizardSettings","wizardCompletedAt","Date","setRegistrationEnabled","patchServerSettings","getLoginRequired","setLoginRequired","setWhitelist","updateServerSettings","serverSettings","updateTimeoutSettings","timeoutSettings","patchFileCleanSettings","fileClean","credentialSettings","patchCredentialSettings","setSentryDiagnosticsEnabled","updateFrontendSettings","frontendSettings","sentryEnabled","log","isTestEnvironment","client","getCurrentHub","getClient","warn","getOptions","enabled"],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ Object.defineProperty(exports, "TestPrinterSocketStore", {
|
|
|
8
8
|
return TestPrinterSocketStore;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
const _promises = require("timers/promises");
|
|
11
|
+
const _promises = require("node:timers/promises");
|
|
12
12
|
const _validators = require("../handlers/validators");
|
|
13
13
|
const _createtestprintervalidation = require("./validation/create-test-printer.validation");
|
|
14
14
|
const _octoprintsockioadapter = require("../services/octoprint/octoprint-sockio.adapter");
|
package/dist/task.presets.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/task.presets.ts"],"names":["TASK_PRESETS","PERIODIC","periodic","logFirstCompletion","runImmediately","PERIODIC_DISABLED","disabled","PERIODIC_2500MS","milliseconds","RUNONCE","runOnce","RUNDELAYED","runDelayed","seconds"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../src/task.presets.ts"],"names":["TASK_PRESETS","PERIODIC","periodic","logFirstCompletion","runImmediately","PERIODIC_DISABLED","disabled","PERIODIC_2500MS","milliseconds","RUNONCE","runOnce","RUNDELAYED","runDelayed","seconds"],"mappings":";;;;+BAuBaA;;;eAAAA;;;AAAN,MAAMA;IACX,OAAOC,WAAyB;QAC9BC,UAAU;QACVC,oBAAoB;QACpBC,gBAAgB;IAClB,EAAE;IAEF,OAAOC,oBAAkC;QACvC,GAAG,IAAI,CAACJ,QAAQ;QAChBG,gBAAgB;QAChBE,UAAU;IACZ,EAAE;IAEF,OAAOC,kBAAgC;QACrC,GAAG,IAAI,CAACN,QAAQ;QAChBO,cAAc;IAChB,EAAE;IAEF,OAAOC,UAAwB;QAC7BC,SAAS;QACTP,oBAAoB;QACpBC,gBAAgB;IAClB,EAAE;IAEF,OAAOO,aAA2B;QAChCC,YAAY;QACZT,oBAAoB;QACpBC,gBAAgB;QAChBS,SAAS;IACX,EAAE;AACJ"}
|
package/dist/tasks/boot.task.js
CHANGED
|
@@ -70,7 +70,10 @@ class BootTask {
|
|
|
70
70
|
pluginFirmwareUpdateService;
|
|
71
71
|
clientBundleService;
|
|
72
72
|
configService;
|
|
73
|
-
|
|
73
|
+
isTypeormMode;
|
|
74
|
+
typeormService;
|
|
75
|
+
constructor({ loggerFactory, serverTasks, settingsService, settingsStore, multerService, printerSocketStore, printerFilesStore, permissionService, roleService, userService, taskManagerService, pluginRepositoryCache, floorStore, pluginFirmwareUpdateService, clientBundleService, configService, typeormService, isTypeormMode }){
|
|
76
|
+
this.isTypeormMode = isTypeormMode;
|
|
74
77
|
this.logger = loggerFactory(BootTask.name);
|
|
75
78
|
this.serverTasks = serverTasks;
|
|
76
79
|
this.settingsService = settingsService;
|
|
@@ -87,6 +90,7 @@ class BootTask {
|
|
|
87
90
|
this.pluginFirmwareUpdateService = pluginFirmwareUpdateService;
|
|
88
91
|
this.clientBundleService = clientBundleService;
|
|
89
92
|
this.configService = configService;
|
|
93
|
+
this.typeormService = typeormService;
|
|
90
94
|
}
|
|
91
95
|
async runOnce() {
|
|
92
96
|
this.taskManagerService.registerJobOrTask(this.serverTasks.SERVER_BOOT_TASK);
|
|
@@ -94,19 +98,23 @@ class BootTask {
|
|
|
94
98
|
await this.run();
|
|
95
99
|
}
|
|
96
100
|
async run() {
|
|
97
|
-
|
|
98
|
-
await this.createConnection();
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
101
|
+
if (this.isTypeormMode) {
|
|
102
|
+
await this.typeormService.createConnection();
|
|
103
|
+
} else {
|
|
104
|
+
try {
|
|
105
|
+
await this.createConnection();
|
|
106
|
+
await this.migrateDatabase();
|
|
107
|
+
} catch (e) {
|
|
108
|
+
if (e instanceof _mongoose.default.Error) {
|
|
109
|
+
if (!e.message.includes("Can't call `openUri()` on an active connection with different connection strings.")) {
|
|
110
|
+
if (e.message.includes("ECONNREFUSED")) {
|
|
111
|
+
this.logger.error("Database connection timed-out. Retrying in 5000.");
|
|
112
|
+
} else {
|
|
113
|
+
this.logger.error(`Database connection error: ${e.message}`);
|
|
114
|
+
}
|
|
115
|
+
this.taskManagerService.scheduleDisabledJob(_containertokens.DITokens.bootTask, false);
|
|
116
|
+
return;
|
|
107
117
|
}
|
|
108
|
-
this.taskManagerService.scheduleDisabledJob(_containertokens.DITokens.bootTask, false);
|
|
109
|
-
return;
|
|
110
118
|
}
|
|
111
119
|
}
|
|
112
120
|
}
|
|
@@ -185,13 +193,17 @@ class BootTask {
|
|
|
185
193
|
await this.settingsStore.setWizardCompleted(1);
|
|
186
194
|
}
|
|
187
195
|
async createConnection() {
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
196
|
+
if (this.isTypeormMode) {
|
|
197
|
+
await (0, _mongoose.connect)((0, _serverenv.fetchMongoDBConnectionString)(), {
|
|
198
|
+
serverSelectionTimeoutMS: 1500
|
|
199
|
+
});
|
|
200
|
+
await (0, _mongoose.syncIndexes)();
|
|
201
|
+
}
|
|
192
202
|
}
|
|
193
203
|
async migrateDatabase() {
|
|
194
|
-
|
|
204
|
+
if (this.isTypeormMode) {
|
|
205
|
+
await (0, _serverenv.runMigrations)(_mongoose.default.connection.db, _mongoose.default.connection.getClient());
|
|
206
|
+
}
|
|
195
207
|
}
|
|
196
208
|
}
|
|
197
209
|
|