@fdm-monster/server 1.9.4 → 2.0.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 +0 -4
- package/.yarn/install-state.gz +0 -0
- package/CONTRIBUTING.md +4 -4
- package/README.md +4 -4
- package/RELEASE_NOTES.MD +13 -0
- package/biome.json +8 -5
- package/dist/consoles/mock-bambu.server.js +17 -16
- package/dist/consoles/mock-bambu.server.js.map +1 -1
- package/dist/consoles/mock-octoprint.server.js.map +1 -1
- package/dist/consoles/mock-prusalink.server.js +6 -6
- package/dist/consoles/mock-prusalink.server.js.map +1 -1
- package/dist/consoles/utils/api-messages.js.map +1 -1
- package/dist/constants/authorization.constants.js +32 -25
- package/dist/constants/authorization.constants.js.map +1 -1
- package/dist/constants/event.constants.js.map +1 -1
- package/dist/constants/server-settings.constants.js +0 -1
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/container.js +30 -54
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +0 -1
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/auth.controller.js +1 -1
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/batch-call.controller.js +8 -11
- package/dist/controllers/batch-call.controller.js.map +1 -1
- package/dist/controllers/custom-gcode.controller.js +2 -5
- package/dist/controllers/custom-gcode.controller.js.map +1 -1
- package/dist/controllers/first-time-setup.controller.js +4 -4
- package/dist/controllers/first-time-setup.controller.js.map +1 -1
- package/dist/controllers/metrics.controller.js.map +1 -1
- package/dist/controllers/printer-files.controller.js +5 -3
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +6 -7
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +5 -13
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/controllers/user.controller.js +8 -12
- package/dist/controllers/user.controller.js.map +1 -1
- package/dist/controllers/validation/batch-controller.validation.js +13 -13
- package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
- package/dist/controllers/validation/generic.validation.js +4 -8
- package/dist/controllers/validation/generic.validation.js.map +1 -1
- package/dist/controllers/validation/printer-files-controller.validation.js +2 -2
- package/dist/controllers/validation/user-controller.validation.js +14 -9
- package/dist/controllers/validation/user-controller.validation.js.map +1 -1
- package/dist/data-source.js +6 -5
- package/dist/data-source.js.map +1 -1
- package/dist/entities/index.js +0 -4
- package/dist/entities/index.js.map +1 -1
- package/dist/entities/print-completion.entity.js.map +1 -1
- package/dist/entities/settings.entity.js.map +1 -1
- package/dist/handlers/logging/file-logging.transport.js.map +1 -1
- package/dist/handlers/logging/static.logger.js.map +1 -1
- package/dist/middleware/authenticate.js +4 -4
- package/dist/middleware/authenticate.js.map +1 -1
- package/dist/middleware/database.js +1 -1
- package/dist/middleware/global.middleware.js +4 -12
- package/dist/middleware/global.middleware.js.map +1 -1
- package/dist/middleware/param-converter.middleware.js +5 -13
- package/dist/middleware/param-converter.middleware.js.map +1 -1
- package/dist/middleware/passport.js +2 -2
- package/dist/middleware/passport.js.map +1 -1
- package/dist/middleware/printer-resolver.js.map +1 -1
- package/dist/middleware/printer.js +3 -2
- package/dist/middleware/printer.js.map +1 -1
- package/dist/middleware/socketio.middleware.js.map +1 -1
- package/dist/migrations/1745141688926-AddPrinterUsernamePassword.js +1 -1
- package/dist/migrations/1745141688926-AddPrinterUsernamePassword.js.map +1 -1
- package/dist/migrations/1766576698569-DropPermissions.js +28 -0
- package/dist/migrations/1766576698569-DropPermissions.js.map +1 -0
- package/dist/server.constants.js +1 -9
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js +3 -7
- package/dist/server.core.js.map +1 -1
- package/dist/server.env.js +4 -49
- package/dist/server.env.js.map +1 -1
- package/dist/server.host.js +3 -13
- package/dist/server.host.js.map +1 -1
- package/dist/services/authentication/auth.service.js.map +1 -1
- package/dist/services/authentication/jwt.service.js.map +1 -1
- package/dist/services/bambu/bambu-ftp.adapter.js +2 -2
- package/dist/services/bambu/bambu-ftp.adapter.js.map +1 -1
- package/dist/services/bambu/bambu-mqtt.adapter.js +1 -1
- package/dist/services/bambu/bambu-mqtt.adapter.js.map +1 -1
- package/dist/services/bambu/bambu.client.js.map +1 -1
- package/dist/services/bambu.api.js +11 -0
- package/dist/services/bambu.api.js.map +1 -1
- package/dist/services/core/batch-call.service.js.map +1 -1
- package/dist/services/core/multer.service.js.map +1 -1
- package/dist/services/core/yaml.service.js +20 -43
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/interfaces/camera-stream.dto.js +2 -2
- package/dist/services/interfaces/camera-stream.dto.js.map +1 -1
- package/dist/services/interfaces/custom-gcode.dto.js.map +1 -1
- package/dist/services/interfaces/floor.dto.js.map +1 -1
- package/dist/services/interfaces/print-completion.dto.js.map +1 -1
- package/dist/services/interfaces/printer-group.dto.js.map +1 -1
- package/dist/services/interfaces/printer.dto.js +2 -2
- package/dist/services/interfaces/printer.dto.js.map +1 -1
- package/dist/services/interfaces/refresh-token.dto.js.map +1 -1
- package/dist/services/interfaces/role.dto.js.map +1 -1
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/interfaces/user.dto.js.map +1 -1
- package/dist/services/moonraker/constants/moonraker-event.dto.js.map +1 -1
- package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
- package/dist/services/moonraker/moonraker.client.js.map +1 -1
- package/dist/services/moonraker.api.js +3 -0
- package/dist/services/moonraker.api.js.map +1 -1
- package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -1
- package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -1
- package/dist/services/octoprint.api.js +3 -0
- package/dist/services/octoprint.api.js.map +1 -1
- package/dist/services/orm/base.service.js.map +1 -1
- package/dist/services/orm/camera-stream.service.js.map +1 -1
- package/dist/services/orm/custom-gcode.service.js.map +1 -1
- package/dist/services/orm/floor-position.service.js.map +1 -1
- package/dist/services/orm/floor.service.js +4 -4
- package/dist/services/orm/floor.service.js.map +1 -1
- package/dist/services/orm/permission.service.js +3 -54
- package/dist/services/orm/permission.service.js.map +1 -1
- package/dist/services/orm/print-completion.service.js +2 -2
- package/dist/services/orm/print-completion.service.js.map +1 -1
- package/dist/services/orm/print-completion.shared.js.map +1 -0
- package/dist/services/orm/printer-group.service.js.map +1 -1
- package/dist/services/orm/printer.service.js.map +1 -1
- package/dist/services/orm/refresh-token.service.js.map +1 -1
- package/dist/services/orm/role.service.js +25 -39
- package/dist/services/orm/role.service.js.map +1 -1
- package/dist/services/orm/settings.service.js +4 -7
- package/dist/services/orm/settings.service.js.map +1 -1
- package/dist/services/orm/user.service.js +17 -13
- package/dist/services/orm/user.service.js.map +1 -1
- package/dist/services/printer-api.factory.js +1 -1
- package/dist/services/printer-api.factory.js.map +1 -1
- package/dist/services/printer-api.interface.js.map +1 -1
- package/dist/services/prusa-link/constants/prusalink-event.dto.js.map +1 -1
- package/dist/services/prusa-link/prusa-link-http-polling.adapter.js.map +1 -1
- package/dist/services/prusa-link/prusa-link.api.js +4 -1
- package/dist/services/prusa-link/prusa-link.api.js.map +1 -1
- package/dist/services/prusa-link/utils/prusa-link-http-client.builder.js.map +1 -1
- package/dist/services/validators/floor-service.validation.js +16 -22
- package/dist/services/validators/floor-service.validation.js.map +1 -1
- package/dist/services/validators/user-service.validation.js +15 -10
- package/dist/services/validators/user-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +1 -1
- package/dist/shared/runtime-settings.migration.js.map +1 -1
- package/dist/shared/websocket-rpc-extended.adapter.js +13 -4
- package/dist/shared/websocket-rpc-extended.adapter.js.map +1 -1
- package/dist/shared/websocket.adapter.js.map +1 -1
- package/dist/state/file-upload-tracker.cache.js.map +1 -1
- package/dist/state/file.cache.js +6 -6
- package/dist/state/file.cache.js.map +1 -1
- package/dist/state/floor.store.js +1 -1
- package/dist/state/floor.store.js.map +1 -1
- package/dist/state/printer-events.cache.js +1 -1
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/printer-files.store.js.map +1 -1
- package/dist/state/printer-socket.store.js +25 -20
- package/dist/state/printer-socket.store.js.map +1 -1
- package/dist/state/printer-thumbnail.cache.js +13 -18
- package/dist/state/printer-thumbnail.cache.js.map +1 -1
- package/dist/state/printer.cache.js +3 -13
- package/dist/state/printer.cache.js.map +1 -1
- package/dist/state/settings.store.js +2 -9
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +6 -3
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/dist/tasks/boot.task.js +5 -87
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/print-completion.socketio.task.js.map +1 -1
- package/dist/tasks/printer-file-clean.task.js.map +1 -1
- package/dist/utils/cache/key-diff.cache.js +20 -61
- package/dist/utils/cache/key-diff.cache.js.map +1 -1
- package/package.json +8 -18
- package/dist/entities/permission.entity.js +0 -37
- package/dist/entities/permission.entity.js.map +0 -1
- package/dist/models/Auth/Permission.js +0 -20
- package/dist/models/Auth/Permission.js.map +0 -1
- package/dist/models/Auth/RefreshToken.js +0 -41
- package/dist/models/Auth/RefreshToken.js.map +0 -1
- package/dist/models/Auth/Role.js +0 -20
- package/dist/models/Auth/Role.js.map +0 -1
- package/dist/models/Auth/User.js +0 -49
- package/dist/models/Auth/User.js.map +0 -1
- package/dist/models/CameraStream.js +0 -49
- package/dist/models/CameraStream.js.map +0 -1
- package/dist/models/CustomGcode.js +0 -28
- package/dist/models/CustomGcode.js.map +0 -1
- package/dist/models/Floor.js +0 -33
- package/dist/models/Floor.js.map +0 -1
- package/dist/models/FloorPrinter.js +0 -38
- package/dist/models/FloorPrinter.js.map +0 -1
- package/dist/models/PrintCompletion.js +0 -40
- package/dist/models/PrintCompletion.js.map +0 -1
- package/dist/models/Printer.js +0 -78
- package/dist/models/Printer.js.map +0 -1
- package/dist/models/Settings.js +0 -150
- package/dist/models/Settings.js.map +0 -1
- package/dist/models/index.js +0 -54
- package/dist/models/index.js.map +0 -1
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js +0 -45
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js.map +0 -1
- package/dist/mongo-migrations/20210907173950-printers-enabled.js +0 -35
- package/dist/mongo-migrations/20210907173950-printers-enabled.js.map +0 -1
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js +0 -35
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js.map +0 -1
- package/dist/mongo-migrations/20230414141005-floor-remove-groupinfloor.js +0 -60
- package/dist/mongo-migrations/20230414141005-floor-remove-groupinfloor.js.map +0 -1
- package/dist/mongo-migrations/20230427202911-printer-remove-sortindex.js +0 -30
- package/dist/mongo-migrations/20230427202911-printer-remove-sortindex.js.map +0 -1
- package/dist/mongo-migrations/20230716065316-user-remove-name.js +0 -30
- package/dist/mongo-migrations/20230716065316-user-remove-name.js.map +0 -1
- package/dist/mongo-migrations/20231111081809-printer-flatten-name.js +0 -35
- package/dist/mongo-migrations/20231111081809-printer-flatten-name.js.map +0 -1
- package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js +0 -41
- package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js.map +0 -1
- package/dist/mongo-migrations/20231202183902-printer-files-simpler.js +0 -41
- package/dist/mongo-migrations/20231202183902-printer-files-simpler.js.map +0 -1
- package/dist/services/interfaces/permission.dto.js +0 -16
- package/dist/services/interfaces/permission.dto.js.map +0 -1
- package/dist/services/mongoose/camera-stream.service.js +0 -67
- package/dist/services/mongoose/camera-stream.service.js.map +0 -1
- package/dist/services/mongoose/custom-gcode.service.js +0 -50
- package/dist/services/mongoose/custom-gcode.service.js.map +0 -1
- package/dist/services/mongoose/floor.service.js +0 -139
- package/dist/services/mongoose/floor.service.js.map +0 -1
- package/dist/services/mongoose/permission.service.js +0 -73
- package/dist/services/mongoose/permission.service.js.map +0 -1
- package/dist/services/mongoose/print-completion.service.js +0 -134
- package/dist/services/mongoose/print-completion.service.js.map +0 -1
- package/dist/services/mongoose/print-completion.shared.js.map +0 -1
- package/dist/services/mongoose/printer.service.js +0 -216
- package/dist/services/mongoose/printer.service.js.map +0 -1
- package/dist/services/mongoose/refresh-token.service.js +0 -104
- package/dist/services/mongoose/refresh-token.service.js.map +0 -1
- package/dist/services/mongoose/role.service.js +0 -132
- package/dist/services/mongoose/role.service.js.map +0 -1
- package/dist/services/mongoose/settings.service.js +0 -124
- package/dist/services/mongoose/settings.service.js.map +0 -1
- package/dist/services/mongoose/user.service.js +0 -180
- package/dist/services/mongoose/user.service.js.map +0 -1
- package/dist/services/validators/camera-service.validation.js +0 -19
- package/dist/services/validators/camera-service.validation.js.map +0 -1
- package/dist/services/validators/print-completion-service.validation.js +0 -33
- package/dist/services/validators/print-completion-service.validation.js.map +0 -1
- package/dist/shared.constants.js +0 -15
- package/dist/shared.constants.js.map +0 -1
- package/migrate-mongo-config.js +0 -45
- /package/dist/services/{mongoose → orm}/print-completion.shared.js +0 -0
|
@@ -40,7 +40,7 @@ class PrinterThumbnailCache extends _keydiffcache.KeyDiffCache {
|
|
|
40
40
|
this.eventEmitter2.on(_eventconstants.printerEvents.printersDeleted, this.handlePrintersDeleted.bind(this));
|
|
41
41
|
}
|
|
42
42
|
async resetCache() {
|
|
43
|
-
const keys =
|
|
43
|
+
const keys = Array.from(this.keyValueStore.keys());
|
|
44
44
|
await this.deleteKeysBatch(keys);
|
|
45
45
|
}
|
|
46
46
|
async loadCache() {
|
|
@@ -48,15 +48,12 @@ class PrinterThumbnailCache extends _keydiffcache.KeyDiffCache {
|
|
|
48
48
|
const printers = await this.printerCache.listCachedPrinters();
|
|
49
49
|
const baseFolder = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultPrinterThumbnailsStorage);
|
|
50
50
|
this.resetDiffs();
|
|
51
|
-
|
|
52
|
-
delete this.keyValueStore[key];
|
|
53
|
-
});
|
|
51
|
+
this.keyValueStore.clear();
|
|
54
52
|
for (const printer of printers){
|
|
55
|
-
const printerIdStr = printer.id.toString();
|
|
56
53
|
const thumbnailFile = (0, _path.join)(baseFolder, printer.id.toString() + ".dat");
|
|
57
54
|
if ((0, _nodefs.existsSync)(thumbnailFile)) {
|
|
58
55
|
const data = (0, _fs.readFileSync)(thumbnailFile, "utf8");
|
|
59
|
-
await this.setPrinterThumbnail(
|
|
56
|
+
await this.setPrinterThumbnail(printer.id, data);
|
|
60
57
|
}
|
|
61
58
|
}
|
|
62
59
|
}
|
|
@@ -78,32 +75,30 @@ class PrinterThumbnailCache extends _keydiffcache.KeyDiffCache {
|
|
|
78
75
|
}
|
|
79
76
|
async loadPrinterThumbnailRemote(login, printerId, file) {
|
|
80
77
|
if (!this.settingsStore.isThumbnailSupportEnabled()) return;
|
|
81
|
-
const id = printerId.toString();
|
|
82
78
|
try {
|
|
83
79
|
const thumbnailData = await this.extractRemoteThumbnailBase64(login, file);
|
|
84
|
-
await this.writeThumbnailFile(
|
|
85
|
-
await this.setPrinterThumbnail(
|
|
80
|
+
await this.writeThumbnailFile(printerId, thumbnailData);
|
|
81
|
+
await this.setPrinterThumbnail(printerId, thumbnailData);
|
|
86
82
|
return thumbnailData;
|
|
87
83
|
} catch (e) {
|
|
88
84
|
this.logger.error("Could not parse thumbnail, clearing printer thumbnail", e);
|
|
89
85
|
(0, _node.captureException)(e);
|
|
90
|
-
await this.removeThumbnailFile(
|
|
91
|
-
await this.unsetPrinterThumbnail(
|
|
86
|
+
await this.removeThumbnailFile(printerId);
|
|
87
|
+
await this.unsetPrinterThumbnail(printerId);
|
|
92
88
|
}
|
|
93
89
|
}
|
|
94
90
|
async loadPrinterThumbnailLocal(printerId, file) {
|
|
95
91
|
if (!this.settingsStore.isThumbnailSupportEnabled()) return;
|
|
96
|
-
const id = printerId.toString();
|
|
97
92
|
try {
|
|
98
93
|
const thumbnailData = await this.extractThumbnailBase64(file);
|
|
99
|
-
await this.writeThumbnailFile(
|
|
100
|
-
await this.setPrinterThumbnail(
|
|
94
|
+
await this.writeThumbnailFile(printerId, thumbnailData);
|
|
95
|
+
await this.setPrinterThumbnail(printerId, thumbnailData);
|
|
101
96
|
return thumbnailData;
|
|
102
97
|
} catch (e) {
|
|
103
98
|
this.logger.error("Could not parse thumbnail, clearing printer thumbnail", e);
|
|
104
99
|
(0, _node.captureException)(e);
|
|
105
|
-
await this.removeThumbnailFile(
|
|
106
|
-
await this.unsetPrinterThumbnail(
|
|
100
|
+
await this.removeThumbnailFile(printerId);
|
|
101
|
+
await this.unsetPrinterThumbnail(printerId);
|
|
107
102
|
}
|
|
108
103
|
}
|
|
109
104
|
async writeThumbnailFile(printerId, thumbnailData) {
|
|
@@ -113,13 +108,13 @@ class PrinterThumbnailCache extends _keydiffcache.KeyDiffCache {
|
|
|
113
108
|
return;
|
|
114
109
|
}
|
|
115
110
|
const baseFolder = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultPrinterThumbnailsStorage);
|
|
116
|
-
const thumbnailPath = (0, _path.join)(baseFolder, printerId + ".dat");
|
|
111
|
+
const thumbnailPath = (0, _path.join)(baseFolder, printerId.toString() + ".dat");
|
|
117
112
|
(0, _fsutils.ensureDirExists)(baseFolder);
|
|
118
113
|
await (0, _promises1.writeFile)(thumbnailPath, thumbnailData);
|
|
119
114
|
}
|
|
120
115
|
async removeThumbnailFile(printerId) {
|
|
121
116
|
const baseFolder = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultPrinterThumbnailsStorage);
|
|
122
|
-
const thumbnailPath = (0, _path.join)(baseFolder, printerId + ".dat");
|
|
117
|
+
const thumbnailPath = (0, _path.join)(baseFolder, printerId.toString() + ".dat");
|
|
123
118
|
if ((0, _nodefs.existsSync)(thumbnailPath)) {
|
|
124
119
|
(0, _nodefs.rmSync)(thumbnailPath);
|
|
125
120
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/printer-thumbnail.cache.ts"],"names":["PrinterThumbnailCache","gcodeMaxLinesToRead","KeyDiffCache","logger","loggerFactory","printerCache","printerApiFactory","eventEmitter2","settingsStore","name","on","printerEvents","printersDeleted","handlePrintersDeleted","bind","resetCache","keys","
|
|
1
|
+
{"version":3,"sources":["../../src/state/printer-thumbnail.cache.ts"],"names":["PrinterThumbnailCache","gcodeMaxLinesToRead","KeyDiffCache","logger","loggerFactory","printerCache","printerApiFactory","eventEmitter2","settingsStore","name","on","printerEvents","printersDeleted","handlePrintersDeleted","bind","resetCache","keys","Array","from","keyValueStore","deleteKeysBatch","loadCache","isThumbnailSupportEnabled","printers","listCachedPrinters","baseFolder","join","superRootPath","AppConstants","defaultPrinterThumbnailsStorage","resetDiffs","clear","printer","thumbnailFile","id","toString","existsSync","data","readFileSync","setPrinterThumbnail","event","printerId","printerIds","removeThumbnailFile","unsetPrinterThumbnail","imageData","setKeyValue","thumbnailBase64","deleteKeyValue","loadPrinterThumbnailRemote","login","file","thumbnailData","extractRemoteThumbnailBase64","writeThumbnailFile","e","error","captureException","loadPrinterThumbnailLocal","extractThumbnailBase64","length","thumbnailPath","ensureDirExists","writeFile","rmSync","lines","readRemoteGcodeLines","Error","collecting","currentThumbnailBase64","index","line","startsWith","includes","trim","replace","numberOfLines","fromEnd","endCondition","getScopedPrinter","fileData","getFile","fileSize","size","position","iterationsLeft","bytesToRead","Math","min","gcodeScanningChunkSize","start","end","remoteChunk","getFileChunk","chunkLines","split","concat","endIndex","findIndex","slice","gcodePath","fileStream","createReadStream","rl","createInterface","input","crlfDelay","Infinity","close","Buffer"],"mappings":"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"}
|
|
@@ -25,15 +25,12 @@ class PrinterCache extends _keydiffcache.KeyDiffCache {
|
|
|
25
25
|
const printerDocs = await this.printerService.list();
|
|
26
26
|
const dtos = this.mapArray(printerDocs);
|
|
27
27
|
const keyValues = dtos.map((p)=>({
|
|
28
|
-
key:
|
|
28
|
+
key: p.id,
|
|
29
29
|
value: p
|
|
30
30
|
}));
|
|
31
31
|
await this.setKeyValuesBatch(keyValues, true);
|
|
32
32
|
return dtos;
|
|
33
33
|
}
|
|
34
|
-
async countDisabledPrinters() {
|
|
35
|
-
return (await this.getAllValues()).filter((p)=>!p.enabled).length;
|
|
36
|
-
}
|
|
37
34
|
async listCachedPrinters(includeDisabled = false) {
|
|
38
35
|
const printers = await this.getAllValues();
|
|
39
36
|
if (!includeDisabled) {
|
|
@@ -49,7 +46,7 @@ class PrinterCache extends _keydiffcache.KeyDiffCache {
|
|
|
49
46
|
return printer;
|
|
50
47
|
}
|
|
51
48
|
getCachedPrinterOrThrow(id) {
|
|
52
|
-
const printer = this.keyValueStore
|
|
49
|
+
const printer = this.keyValueStore.get(id);
|
|
53
50
|
if (!printer) {
|
|
54
51
|
throw new _runtimeexceptions.NotFoundException(`Printer with provided id not found`);
|
|
55
52
|
}
|
|
@@ -59,10 +56,6 @@ class PrinterCache extends _keydiffcache.KeyDiffCache {
|
|
|
59
56
|
const printer = await this.getCachedPrinterOrThrowAsync(id);
|
|
60
57
|
return printer.name;
|
|
61
58
|
}
|
|
62
|
-
getName(id) {
|
|
63
|
-
const printer = this.getCachedPrinterOrThrow(id);
|
|
64
|
-
return printer.name;
|
|
65
|
-
}
|
|
66
59
|
async getLoginDtoAsync(id) {
|
|
67
60
|
const printer = await this.getCachedPrinterOrThrowAsync(id);
|
|
68
61
|
return {
|
|
@@ -86,7 +79,7 @@ class PrinterCache extends _keydiffcache.KeyDiffCache {
|
|
|
86
79
|
async handleBatchPrinterCreated(event) {
|
|
87
80
|
const mappedPrinters = this.mapArray(event.printers);
|
|
88
81
|
const keyValues = mappedPrinters.map((p)=>({
|
|
89
|
-
key:
|
|
82
|
+
key: p.id,
|
|
90
83
|
value: p
|
|
91
84
|
}));
|
|
92
85
|
await this.setKeyValuesBatch(keyValues, true);
|
|
@@ -98,9 +91,6 @@ class PrinterCache extends _keydiffcache.KeyDiffCache {
|
|
|
98
91
|
async handlePrintersDeleted(event) {
|
|
99
92
|
await this.deleteKeysBatch(event.printerIds, true);
|
|
100
93
|
}
|
|
101
|
-
getId(value) {
|
|
102
|
-
return value.id.toString();
|
|
103
|
-
}
|
|
104
94
|
mapArray(entities) {
|
|
105
95
|
return entities.map((p)=>{
|
|
106
96
|
return this.map(p);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/printer.cache.ts"],"names":["PrinterCache","KeyDiffCache","printerService","eventEmitter2","on","printerEvents","batchPrinterCreated","handleBatchPrinterCreated","bind","printerCreated","handlePrinterCreatedOrUpdated","printerUpdated","printersDeleted","handlePrintersDeleted","loadCache","printerDocs","list","dtos","mapArray","keyValues","map","p","key","
|
|
1
|
+
{"version":3,"sources":["../../src/state/printer.cache.ts"],"names":["PrinterCache","KeyDiffCache","printerService","eventEmitter2","on","printerEvents","batchPrinterCreated","handleBatchPrinterCreated","bind","printerCreated","handlePrinterCreatedOrUpdated","printerUpdated","printersDeleted","handlePrintersDeleted","loadCache","printerDocs","list","dtos","mapArray","keyValues","map","p","key","id","value","setKeyValuesBatch","listCachedPrinters","includeDisabled","printers","getAllValues","filter","enabled","getCachedPrinterOrThrowAsync","printer","getValue","NotFoundException","getCachedPrinterOrThrow","keyValueStore","get","getNameAsync","name","getLoginDtoAsync","printerURL","apiKey","username","password","printerType","getLoginDto","event","mappedPrinters","printerDto","setKeyValue","deleteKeysBatch","printerIds","entities","entity","toDto"],"mappings":";;;;+BAaaA;;;eAAAA;;;8BAbgB;gCAMtB;mCAC2B;AAM3B,MAAMA,qBAAqBC,0BAAY;;;IAC5C,YACE,AAAiBC,cAA+B,EAChD,AAAiBC,aAA4B,CAC7C;QACA,KAAK,SAHYD,iBAAAA,qBACAC,gBAAAA;QAIjB,IAAI,CAACA,aAAa,CAACC,EAAE,CAACC,6BAAa,CAACC,mBAAmB,EAAE,IAAI,CAACC,yBAAyB,CAACC,IAAI,CAAC,IAAI;QACjG,IAAI,CAACL,aAAa,CAACC,EAAE,CAACC,6BAAa,CAACI,cAAc,EAAE,IAAI,CAACC,6BAA6B,CAACF,IAAI,CAAC,IAAI;QAChG,IAAI,CAACL,aAAa,CAACC,EAAE,CAACC,6BAAa,CAACM,cAAc,EAAE,IAAI,CAACD,6BAA6B,CAACF,IAAI,CAAC,IAAI;QAChG,IAAI,CAACL,aAAa,CAACC,EAAE,CAACC,6BAAa,CAACO,eAAe,EAAE,IAAI,CAACC,qBAAqB,CAACL,IAAI,CAAC,IAAI;IAC3F;IAEA,MAAMM,YAAmC;QACvC,MAAMC,cAAc,MAAM,IAAI,CAACb,cAAc,CAACc,IAAI;QAClD,MAAMC,OAAO,IAAI,CAACC,QAAQ,CAACH;QAC3B,MAAMI,YAAYF,KAAKG,GAAG,CAAC,CAACC,IAAO,CAAA;gBAAEC,KAAKD,EAAEE,EAAE;gBAAEC,OAAOH;YAAE,CAAA;QACzD,MAAM,IAAI,CAACI,iBAAiB,CAACN,WAAW;QACxC,OAAOF;IACT;IAEA,MAAMS,mBAAmBC,kBAAkB,KAAK,EAAyB;QACvE,MAAMC,WAAW,MAAM,IAAI,CAACC,YAAY;QACxC,IAAI,CAACF,iBAAiB;YACpB,OAAOC,SAASE,MAAM,CAAC,CAACT,IAAMA,EAAEU,OAAO;QACzC;QACA,OAAOH;IACT;IAEA,MAAMI,6BAA6BT,EAAU,EAAuB;QAClE,MAAMU,UAAU,MAAM,IAAI,CAACC,QAAQ,CAACX;QACpC,IAAI,CAACU,SAAS;YACZ,MAAM,IAAIE,oCAAiB,CAAC,CAAC,kCAAkC,CAAC;QAClE;QACA,OAAOF;IACT;IAEAG,wBAAwBb,EAAU,EAAE;QAClC,MAAMU,UAAU,IAAI,CAACI,aAAa,CAACC,GAAG,CAACf;QACvC,IAAI,CAACU,SAAS;YACZ,MAAM,IAAIE,oCAAiB,CAAC,CAAC,kCAAkC,CAAC;QAClE;QACA,OAAOF;IACT;IAEA,MAAMM,aAAahB,EAAU,EAAE;QAC7B,MAAMU,UAAU,MAAM,IAAI,CAACD,4BAA4B,CAACT;QACxD,OAAOU,QAAQO,IAAI;IACrB;IAEA,MAAMC,iBAAiBlB,EAAU,EAAE;QACjC,MAAMU,UAAU,MAAM,IAAI,CAACD,4BAA4B,CAACT;QACxD,OAAO;YACLmB,YAAYT,QAAQS,UAAU;YAC9BC,QAAQV,QAAQU,MAAM;YACtBC,UAAUX,QAAQW,QAAQ;YAC1BC,UAAUZ,QAAQY,QAAQ;YAC1BC,aAAab,QAAQa,WAAW;QAClC;IACF;IAEAC,YAAYxB,EAAU,EAAE;QACtB,MAAMU,UAAU,IAAI,CAACG,uBAAuB,CAACb;QAC7C,OAAO;YACLmB,YAAYT,QAAQS,UAAU;YAC9BC,QAAQV,QAAQU,MAAM;YACtBG,aAAab,QAAQa,WAAW;YAChCF,UAAUX,QAAQW,QAAQ;YAC1BC,UAAUZ,QAAQY,QAAQ;QAC5B;IACF;IAEA,MAActC,0BAA0ByC,KAA+B,EAAE;QACvE,MAAMC,iBAAiB,IAAI,CAAC/B,QAAQ,CAAC8B,MAAMpB,QAAQ;QACnD,MAAMT,YAAY8B,eAAe7B,GAAG,CAAC,CAACC,IAAO,CAAA;gBAAEC,KAAKD,EAAEE,EAAE;gBAAEC,OAAOH;YAAE,CAAA;QACnE,MAAM,IAAI,CAACI,iBAAiB,CAACN,WAAW;IAC1C;IAEA,MAAcT,8BAA8BsC,KAA0B,EAAE;QACtE,MAAME,aAAa,IAAI,CAAC9B,GAAG,CAAC4B,MAAMf,OAAO;QACzC,MAAM,IAAI,CAACkB,WAAW,CAACD,WAAW3B,EAAE,EAAE2B,YAAY;IACpD;IAEA,MAAcrC,sBAAsBmC,KAA2B,EAAE;QAC/D,MAAM,IAAI,CAACI,eAAe,CAACJ,MAAMK,UAAU,EAAE;IAC/C;IAEQnC,SAASoC,QAAmB,EAAE;QACpC,OAAOA,SAASlC,GAAG,CAAC,CAACC;YACnB,OAAO,IAAI,CAACD,GAAG,CAACC;QAClB;IACF;IAEQD,IAAImC,MAAe,EAAc;QACvC,OAAO,IAAI,CAACrD,cAAc,CAACsD,KAAK,CAACD;IACnC;AACF"}
|
|
@@ -15,12 +15,10 @@ const _envutils = require("../utils/env.utils");
|
|
|
15
15
|
const _serverconstants = require("../server.constants");
|
|
16
16
|
class SettingsStore {
|
|
17
17
|
settingsService;
|
|
18
|
-
isTypeormMode;
|
|
19
18
|
logger;
|
|
20
19
|
settings = null;
|
|
21
|
-
constructor(loggerFactory, settingsService
|
|
20
|
+
constructor(loggerFactory, settingsService){
|
|
22
21
|
this.settingsService = settingsService;
|
|
23
|
-
this.isTypeormMode = isTypeormMode;
|
|
24
22
|
this.logger = loggerFactory(SettingsStore.name);
|
|
25
23
|
}
|
|
26
24
|
getSettings() {
|
|
@@ -34,7 +32,6 @@ class SettingsStore {
|
|
|
34
32
|
experimentalMoonrakerSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
|
|
35
33
|
experimentalPrusaLinkSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalPrusaLinkSupport,
|
|
36
34
|
experimentalBambuSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalBambuSupport,
|
|
37
|
-
experimentalTypeormSupport: this.isTypeormMode,
|
|
38
35
|
experimentalClientSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalClientSupport,
|
|
39
36
|
experimentalThumbnailSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalThumbnailSupport
|
|
40
37
|
},
|
|
@@ -57,7 +54,6 @@ class SettingsStore {
|
|
|
57
54
|
experimentalMoonrakerSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
|
|
58
55
|
experimentalPrusaLinkSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalPrusaLinkSupport,
|
|
59
56
|
experimentalBambuSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalBambuSupport,
|
|
60
|
-
experimentalTypeormSupport: this.isTypeormMode,
|
|
61
57
|
experimentalClientSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalClientSupport,
|
|
62
58
|
experimentalThumbnailSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalThumbnailSupport
|
|
63
59
|
}
|
|
@@ -87,7 +83,7 @@ class SettingsStore {
|
|
|
87
83
|
await this.updateCredentialSettings({
|
|
88
84
|
refreshTokenExpiry: credentialSettings.refreshTokenExpiry,
|
|
89
85
|
refreshTokenAttempts: credentialSettings.refreshTokenAttempts,
|
|
90
|
-
jwtExpiresIn: parseInt(overrideJwtExpiresIn)
|
|
86
|
+
jwtExpiresIn: Number.parseInt(overrideJwtExpiresIn)
|
|
91
87
|
});
|
|
92
88
|
}
|
|
93
89
|
this.settings[_serversettingsconstants.credentialSettingsKey] = await this.getCredentialSettings();
|
|
@@ -124,9 +120,6 @@ class SettingsStore {
|
|
|
124
120
|
getTimeoutSettings() {
|
|
125
121
|
return this.getSettings()[_serversettingsconstants.timeoutSettingKey];
|
|
126
122
|
}
|
|
127
|
-
getFrontendSettings() {
|
|
128
|
-
return this.getSettings()[_serversettingsconstants.frontendSettingKey];
|
|
129
|
-
}
|
|
130
123
|
getFileCleanSettings() {
|
|
131
124
|
return this.getSettings()[_serversettingsconstants.printerFileCleanSettingKey];
|
|
132
125
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","logger","settings","loggerFactory","settingsService","
|
|
1
|
+
{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","logger","settings","loggerFactory","settingsService","name","getSettings","throwIfSettingsUnset","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","experimentalMoonrakerSupport","experimentalPrusaLinkSupport","experimentalBambuSupport","experimentalClientSupport","experimentalThumbnailSupport","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","credentialSettings","length","updateJwtSecretCredentialSetting","jwtSecret","updateCredentialSettings","Number","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","isThumbnailSupportEnabled","getServerSettings","getTimeoutSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","updateWizardSettings","wizardCompletedAt","Date","getLoginRequired","setLoginRequired","updateServerSettings","setRegistrationEnabled","serverSettings","updateTimeoutSettings","timeoutSettings","updateFileCleanSettings","fileClean","setRefreshTokenSettings","setSentryDiagnosticsEnabled","setExperimentalMoonrakerSupport","setExperimentalPrusaLinkSupport","setExperimentalBambuSupport","setExperimentalThumbnailSupport","setExperimentalClientSupport","updateFrontendSettings","frontendSettings","InternalServerException","sentryEnabled","log","isTestEnvironment","client","getClient","warn","getOptions","enabled"],"mappings":"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"}
|
|
@@ -20,6 +20,8 @@ const _moonrakerconstants = require("../services/moonraker/constants/moonraker.c
|
|
|
20
20
|
const _bambumqttadapter = require("../services/bambu/bambu-mqtt.adapter");
|
|
21
21
|
const _prusalinkconstants = require("../services/prusa-link/constants/prusalink.constants");
|
|
22
22
|
const _eventconstants = require("../constants/event.constants");
|
|
23
|
+
const TEST_PRINTER_ID_BASE = 100000;
|
|
24
|
+
let testPrinterIdCounter = 0;
|
|
23
25
|
class TestPrinterSocketStore {
|
|
24
26
|
socketFactory;
|
|
25
27
|
socketIoGateway;
|
|
@@ -39,9 +41,10 @@ class TestPrinterSocketStore {
|
|
|
39
41
|
}
|
|
40
42
|
const validatedData = await (0, _validators.validateInput)(printer, _createtestprintervalidation.createTestPrinterSchema);
|
|
41
43
|
validatedData.enabled = true;
|
|
44
|
+
const testPrinterId = TEST_PRINTER_ID_BASE + ++testPrinterIdCounter;
|
|
42
45
|
this.testSocket = this.socketFactory.createInstance(printer.printerType);
|
|
43
46
|
this.testSocket.registerCredentials({
|
|
44
|
-
printerId:
|
|
47
|
+
printerId: testPrinterId,
|
|
45
48
|
loginDto: {
|
|
46
49
|
apiKey: printer.apiKey,
|
|
47
50
|
username: printer.username,
|
|
@@ -73,7 +76,7 @@ class TestPrinterSocketStore {
|
|
|
73
76
|
(0, _prusalinkconstants.prusaLinkEvent)(_octoprintwebsocketadapter.WsMessage.WS_ERROR)
|
|
74
77
|
];
|
|
75
78
|
const listener = ({ event, payload, printerId })=>{
|
|
76
|
-
if (printerId !==
|
|
79
|
+
if (printerId !== testPrinterId) {
|
|
77
80
|
return;
|
|
78
81
|
}
|
|
79
82
|
this.socketIoGateway.send("test-printer-state", {
|
|
@@ -123,7 +126,7 @@ class TestPrinterSocketStore {
|
|
|
123
126
|
}
|
|
124
127
|
this.eventEmitter2.emit(_eventconstants.printerEvents.printersDeleted, {
|
|
125
128
|
printerIds: [
|
|
126
|
-
|
|
129
|
+
testPrinterId
|
|
127
130
|
]
|
|
128
131
|
});
|
|
129
132
|
delete this.testSocket;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","logger","loggerFactory","socketFactory","socketIoGateway","eventEmitter2","name","setupTestPrinter","correlationToken","printer","close","validatedData","validateInput","createTestPrinterSchema","enabled","createInstance","printerType","registerCredentials","printerId","loginDto","apiKey","username","password","printerURL","testEvents","octoPrintEvent","WsMessage","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","moonrakerEvent","bambuEvent","prusaLinkEvent","listener","event","payload","send","forEach","te","on","log","setupSocketSession","promise","Promise","resolve","reject","error","open","_startTime","setInterval","warn","Error","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","e","errorSummary","captureException","disallowEmittingEvents","emit","printerEvents","printersDeleted","printerIds","off"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","TEST_PRINTER_ID_BASE","testPrinterIdCounter","testSocket","logger","loggerFactory","socketFactory","socketIoGateway","eventEmitter2","name","setupTestPrinter","correlationToken","printer","close","validatedData","validateInput","createTestPrinterSchema","enabled","testPrinterId","createInstance","printerType","registerCredentials","printerId","loginDto","apiKey","username","password","printerURL","testEvents","octoPrintEvent","WsMessage","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","moonrakerEvent","bambuEvent","prusaLinkEvent","listener","event","payload","send","forEach","te","on","log","setupSocketSession","promise","Promise","resolve","reject","error","open","_startTime","setInterval","warn","Error","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","e","errorSummary","captureException","disallowEmittingEvents","emit","printerEvents","printersDeleted","printerIds","off"],"mappings":"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"}
|
package/dist/tasks/boot.task.js
CHANGED
|
@@ -8,52 +8,9 @@ Object.defineProperty(exports, "BootTask", {
|
|
|
8
8
|
return BootTask;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
const _mongoose = /*#__PURE__*/ _interop_require_wildcard(require("mongoose"));
|
|
12
|
-
const _serverenv = require("../server.env");
|
|
13
11
|
const _containertokens = require("../container.tokens");
|
|
14
12
|
const _serverconstants = require("../server.constants");
|
|
15
13
|
const _tasks = require("../tasks");
|
|
16
|
-
function _getRequireWildcardCache(nodeInterop) {
|
|
17
|
-
if (typeof WeakMap !== "function") return null;
|
|
18
|
-
var cacheBabelInterop = new WeakMap();
|
|
19
|
-
var cacheNodeInterop = new WeakMap();
|
|
20
|
-
return (_getRequireWildcardCache = function(nodeInterop) {
|
|
21
|
-
return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
|
|
22
|
-
})(nodeInterop);
|
|
23
|
-
}
|
|
24
|
-
function _interop_require_wildcard(obj, nodeInterop) {
|
|
25
|
-
if (!nodeInterop && obj && obj.__esModule) {
|
|
26
|
-
return obj;
|
|
27
|
-
}
|
|
28
|
-
if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
|
|
29
|
-
return {
|
|
30
|
-
default: obj
|
|
31
|
-
};
|
|
32
|
-
}
|
|
33
|
-
var cache = _getRequireWildcardCache(nodeInterop);
|
|
34
|
-
if (cache && cache.has(obj)) {
|
|
35
|
-
return cache.get(obj);
|
|
36
|
-
}
|
|
37
|
-
var newObj = {
|
|
38
|
-
__proto__: null
|
|
39
|
-
};
|
|
40
|
-
var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
|
|
41
|
-
for(var key in obj){
|
|
42
|
-
if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
|
|
43
|
-
var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
|
|
44
|
-
if (desc && (desc.get || desc.set)) {
|
|
45
|
-
Object.defineProperty(newObj, key, desc);
|
|
46
|
-
} else {
|
|
47
|
-
newObj[key] = obj[key];
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
newObj.default = obj;
|
|
52
|
-
if (cache) {
|
|
53
|
-
cache.set(obj, newObj);
|
|
54
|
-
}
|
|
55
|
-
return newObj;
|
|
56
|
-
}
|
|
57
14
|
class BootTask {
|
|
58
15
|
taskManagerService;
|
|
59
16
|
settingsStore;
|
|
@@ -66,10 +23,9 @@ class BootTask {
|
|
|
66
23
|
floorStore;
|
|
67
24
|
configService;
|
|
68
25
|
typeormService;
|
|
69
|
-
isTypeormMode;
|
|
70
26
|
printerThumbnailCache;
|
|
71
27
|
logger;
|
|
72
|
-
constructor(loggerFactory, taskManagerService, settingsStore, multerService, printerSocketStore, printerFilesStore, permissionService, roleService, userService, floorStore, configService, typeormService,
|
|
28
|
+
constructor(loggerFactory, taskManagerService, settingsStore, multerService, printerSocketStore, printerFilesStore, permissionService, roleService, userService, floorStore, configService, typeormService, printerThumbnailCache){
|
|
73
29
|
this.taskManagerService = taskManagerService;
|
|
74
30
|
this.settingsStore = settingsStore;
|
|
75
31
|
this.multerService = multerService;
|
|
@@ -81,7 +37,6 @@ class BootTask {
|
|
|
81
37
|
this.floorStore = floorStore;
|
|
82
38
|
this.configService = configService;
|
|
83
39
|
this.typeormService = typeormService;
|
|
84
|
-
this.isTypeormMode = isTypeormMode;
|
|
85
40
|
this.printerThumbnailCache = printerThumbnailCache;
|
|
86
41
|
this.logger = loggerFactory(BootTask.name);
|
|
87
42
|
}
|
|
@@ -91,26 +46,7 @@ class BootTask {
|
|
|
91
46
|
await this.run();
|
|
92
47
|
}
|
|
93
48
|
async run() {
|
|
94
|
-
|
|
95
|
-
await this.typeormService.createConnection();
|
|
96
|
-
} else {
|
|
97
|
-
try {
|
|
98
|
-
await this.createConnection();
|
|
99
|
-
await this.migrateDatabase();
|
|
100
|
-
} catch (e) {
|
|
101
|
-
if (e instanceof _mongoose.default.Error) {
|
|
102
|
-
if (!e.message.includes("Can't call `openUri()` on an active connection with different connection strings.")) {
|
|
103
|
-
if (e.message.includes("ECONNREFUSED")) {
|
|
104
|
-
this.logger.error("Database connection timed-out. Retrying in 5000.");
|
|
105
|
-
} else {
|
|
106
|
-
this.logger.error(`Database connection error: ${e.message}`);
|
|
107
|
-
}
|
|
108
|
-
this.taskManagerService.scheduleDisabledJob(_containertokens.DITokens.bootTask, false);
|
|
109
|
-
return;
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
}
|
|
49
|
+
await this.typeormService.createConnection();
|
|
114
50
|
this.logger.log("Loading and synchronizing Server Settings");
|
|
115
51
|
await this.settingsStore.loadSettings();
|
|
116
52
|
this.logger.log("Synchronizing user permission and roles definition");
|
|
@@ -163,7 +99,6 @@ class BootTask {
|
|
|
163
99
|
const demoUsername = this.configService.get(_serverconstants.AppConstants.OVERRIDE_DEMO_USERNAME, _serverconstants.AppConstants.DEFAULT_DEMO_USERNAME);
|
|
164
100
|
const demoPassword = this.configService.get(_serverconstants.AppConstants.OVERRIDE_DEMO_PASSWORD, _serverconstants.AppConstants.DEFAULT_DEMO_PASSWORD);
|
|
165
101
|
const demoRole = this.configService.get(_serverconstants.AppConstants.OVERRIDE_DEMO_ROLE, _serverconstants.AppConstants.DEFAULT_DEMO_ROLE);
|
|
166
|
-
const adminRole = this.roleService.getRoleByName(demoRole);
|
|
167
102
|
const demoUserId = await this.userService.getDemoUserId();
|
|
168
103
|
if (!demoUserId) {
|
|
169
104
|
await this.userService.register({
|
|
@@ -174,7 +109,7 @@ class BootTask {
|
|
|
174
109
|
isRootUser: false,
|
|
175
110
|
needsPasswordChange: false,
|
|
176
111
|
roles: [
|
|
177
|
-
|
|
112
|
+
demoRole
|
|
178
113
|
]
|
|
179
114
|
});
|
|
180
115
|
this.logger.log("Created demo account");
|
|
@@ -182,29 +117,12 @@ class BootTask {
|
|
|
182
117
|
await this.userService.setVerifiedById(demoUserId, true);
|
|
183
118
|
await this.userService.setIsRootUserById(demoUserId, false);
|
|
184
119
|
await this.userService.updatePasswordUnsafeByUsername(demoUsername, demoPassword);
|
|
185
|
-
await this.userService.
|
|
186
|
-
|
|
120
|
+
await this.userService.setUserRoles(demoUserId, [
|
|
121
|
+
demoRole
|
|
187
122
|
]);
|
|
188
123
|
this.logger.log("Updated demo account");
|
|
189
124
|
}
|
|
190
125
|
}
|
|
191
|
-
async createConnection() {
|
|
192
|
-
if (!this.isTypeormMode) {
|
|
193
|
-
const envUrl = (0, _serverenv.fetchMongoDBConnectionString)();
|
|
194
|
-
if (!envUrl?.length) {
|
|
195
|
-
throw new Error("Mongodb connection string not set");
|
|
196
|
-
}
|
|
197
|
-
await (0, _mongoose.connect)(envUrl, {
|
|
198
|
-
serverSelectionTimeoutMS: 1500
|
|
199
|
-
});
|
|
200
|
-
await (0, _mongoose.syncIndexes)();
|
|
201
|
-
}
|
|
202
|
-
}
|
|
203
|
-
async migrateDatabase() {
|
|
204
|
-
if (!this.isTypeormMode) {
|
|
205
|
-
await (0, _serverenv.runMigrations)(_mongoose.default.connection.db, _mongoose.default.connection.getClient());
|
|
206
|
-
}
|
|
207
|
-
}
|
|
208
126
|
}
|
|
209
127
|
|
|
210
128
|
//# sourceMappingURL=boot.task.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","loggerFactory","taskManagerService","settingsStore","multerService","printerSocketStore","printerFilesStore","permissionService","roleService","userService","floorStore","configService","typeormService","
|
|
1
|
+
{"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","loggerFactory","taskManagerService","settingsStore","multerService","printerSocketStore","printerFilesStore","permissionService","roleService","userService","floorStore","configService","typeormService","printerThumbnailCache","name","runOnce","registerJobOrTask","ServerTasks","SERVER_BOOT_TASK","log","run","createConnection","loadSettings","syncPermissions","syncRoles","isDemoMode","warn","AppConstants","OVERRIDE_IS_DEMO_MODE","createOrUpdateDemoAccount","setLoginRequired","setRegistrationEnabled","loginRequired","get","OVERRIDE_LOGIN_REQUIRED","registrationEnabled","OVERRIDE_REGISTRATION_ENABLED","overrideJwtSecret","OVERRIDE_JWT_SECRET","overrideJwtExpiresIn","OVERRIDE_JWT_EXPIRES_IN","persistOptionalCredentialSettings","clearUploadsFolder","loadPrinterSockets","loadFilesStore","loadStore","loadCache","length","getAllValues","process","env","SAFEMODE_ENABLED","BOOT_TASKS","forEach","task","disableJob","DITokens","bootTask","demoUsername","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","demoPassword","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","demoRole","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","demoUserId","getDemoUserId","register","username","password","isDemoUser","isVerified","isRootUser","needsPasswordChange","roles","setVerifiedById","setIsRootUserById","updatePasswordUnsafeByUsername","setUserRoles"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/tasks/print-completion.socketio.task.ts"],"names":["PrintCompletionSocketIoTask","contextCache","logger","loggerFactory","eventEmitter2","printCompletionService","printerEventsCache","name","on","octoPrintWebsocketEvent","octoPrintEvent","handleMessage","contexts","event","printerId","log","completion","status","payload","type","fileName","createdAt","Date","now","completionLog","error","context","correlationId","EVENT_TYPES","EStop","PrintCancelling","PrintCancelled","Home","TransferStarted","TransferDone","Disconnecting","Disconnected","MetadataAnalysisStarted","MetadataAnalysisFinished","Error","setSubState","text","flags","operational","printing","ready","closedOrError","corrId","updateContext","PrintStarted","token","generateCorrelationToken","create","PrintFailed","PrintDone","emit","fdmMonsterPrinterStoppedEvent","undefined"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../src/tasks/print-completion.socketio.task.ts"],"names":["PrintCompletionSocketIoTask","contextCache","logger","loggerFactory","eventEmitter2","printCompletionService","printerEventsCache","name","on","octoPrintWebsocketEvent","octoPrintEvent","handleMessage","contexts","event","printerId","log","completion","status","payload","type","fileName","createdAt","Date","now","completionLog","error","context","correlationId","EVENT_TYPES","EStop","PrintCancelling","PrintCancelled","Home","TransferStarted","TransferDone","Disconnecting","Disconnected","MetadataAnalysisStarted","MetadataAnalysisFinished","Error","setSubState","text","flags","operational","printing","ready","closedOrError","corrId","updateContext","PrintStarted","token","generateCorrelationToken","create","PrintFailed","PrintDone","emit","fdmMonsterPrinterStoppedEvent","undefined"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/tasks/printer-file-clean.task.ts"],"names":["PrinterFileCleanTask","logger","loggerFactory","printerCache","printerFilesStore","settingsStore","name","ageDaysMaxSetting","getSettings","autoRemoveOldFilesCriteriumDays","run","printers","listCachedPrinters","fileCleanSettings","autoCleanAtBootEnabled","autoRemoveOldFilesAtBoot","log","length","errorPrinters","printer","loadFiles","id","e","push","error","outdatedFiles","getPrinterOutdatedFiles","cleanPrinterFiles","printerId","deleteOutdatedFiles","ageDaysMax","getOutdatedFiles","getFileCleanSettings"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../src/tasks/printer-file-clean.task.ts"],"names":["PrinterFileCleanTask","logger","loggerFactory","printerCache","printerFilesStore","settingsStore","name","ageDaysMaxSetting","getSettings","autoRemoveOldFilesCriteriumDays","run","printers","listCachedPrinters","fileCleanSettings","autoCleanAtBootEnabled","autoRemoveOldFilesAtBoot","log","length","errorPrinters","printer","loadFiles","id","e","push","error","outdatedFiles","getPrinterOutdatedFiles","cleanPrinterFiles","printerId","deleteOutdatedFiles","ageDaysMax","getOutdatedFiles","getFileCleanSettings"],"mappings":";;;;+BAWaA;;;eAAAA;;;AAAN,MAAMA;;;;IACXC,OAAsB;IAEtB,YACEC,aAA6B,EAC7B,AAAiBC,YAA0B,EAC3C,AAAiBC,iBAAoC,EACrD,AAAiBC,aAA4B,CAC7C;aAHiBF,eAAAA;aACAC,oBAAAA;aACAC,gBAAAA;QAEjB,IAAI,CAACJ,MAAM,GAAGC,cAAcF,qBAAqBM,IAAI;IACvD;IAEA,IAAYC,oBAAoB;QAC9B,OAAO,IAAI,CAACC,WAAW,GAAGC,+BAA+B;IAC3D;IAEA,MAAMC,MAAM;QACV,MAAMC,WAAW,MAAM,IAAI,CAACR,YAAY,CAACS,kBAAkB,CAAC;QAC5D,MAAMC,oBAAoB,IAAI,CAACL,WAAW;QAC1C,MAAMM,yBAAyBD,kBAAkBE,wBAAwB;QAEzE,IAAI;YACF,IAAID,wBAAwB;gBAC1B,IAAI,CAACb,MAAM,CAACe,GAAG,CACb,CAAC,kBAAkB,EAAEL,SAASM,MAAM,CAAC,6DAA6D,CAAC;YAEvG,OAAO;gBACL,IAAI,CAAChB,MAAM,CAACe,GAAG,CAAC,CAAC,6BAA6B,EAAEL,SAASM,MAAM,CAAC,UAAU,CAAC;YAC7E;YAEA,MAAMC,gBAAgB,EAAE;YACxB,KAAK,IAAIC,WAAWR,SAAU;gBAC5B,IAAI;oBACF,MAAM,IAAI,CAACP,iBAAiB,CAACgB,SAAS,CAACD,QAAQE,EAAE;gBACnD,EAAE,OAAOC,GAAG;oBACVJ,cAAcK,IAAI,CAAC;wBAAED;wBAAGH;oBAAQ;gBAClC;YACF;YACA,IAAID,cAAcD,MAAM,GAAG,GAAG;gBAC5B,IAAI,CAAChB,MAAM,CAACuB,KAAK,CACf,CAAC,0BAA0B,EAAEN,cAAcD,MAAM,CAAC,kEAAkE,CAAC;YAEzH;YAGA,KAAK,IAAIE,WAAWR,SAAU;gBAC5B,MAAMc,gBAAgB,IAAI,CAACC,uBAAuB,CAACP;gBACnD,IAAI,CAACM,eAAeR,QAAQ;gBAG5B,IAAI,CAAChB,MAAM,CAACe,GAAG,CAAC,CAAC,MAAM,EAAES,eAAeR,OAAO,qBAAqB,CAAC;gBAErE,IAAIH,wBAAwB;oBAC1B,MAAM,IAAI,CAACa,iBAAiB,CAACR,QAAQE,EAAE;gBACzC;YACF;QACF,SAAU;YACR,IAAI,CAACpB,MAAM,CAACe,GAAG,CAAC,CAAC,mCAAmC,CAAC;QACvD;IACF;IAEA,MAAMW,kBAAkBC,SAAiB,EAAE;QACzC,MAAM,IAAI,CAACxB,iBAAiB,CAACyB,mBAAmB,CAACD,WAAW,IAAI,CAACrB,iBAAiB;QAClF,MAAM,IAAI,CAACH,iBAAiB,CAACgB,SAAS,CAACQ;IACzC;IAEAF,wBAAwBP,OAAmB,EAAE;QAC3C,MAAMW,aAAa,IAAI,CAACvB,iBAAiB;QACzC,OAAO,IAAI,CAACH,iBAAiB,CAAC2B,gBAAgB,CAACZ,QAAQE,EAAE,EAAES;IAC7D;IAEQtB,cAAc;QACpB,OAAO,IAAI,CAACH,aAAa,CAAC2B,oBAAoB;IAChD;AACF"}
|