@fdm-monster/server 1.7.5 → 1.8.0
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/.yarn/install-state.gz +0 -0
- package/.yarn/releases/{yarn-4.5.2.cjs → yarn-4.5.3.cjs} +80 -80
- package/.yarnrc.yml +1 -1
- package/README.md +3 -2
- package/RELEASE_NOTES.MD +27 -0
- package/dist/consoles/gcode-scanner-poc.console.js +52 -0
- package/dist/consoles/gcode-scanner-poc.console.js.map +1 -0
- package/dist/constants/server-settings.constants.js +4 -2
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/container.js +6 -6
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +4 -3
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/camera-stream.controller.js +79 -15
- package/dist/controllers/camera-stream.controller.js.map +1 -1
- package/dist/controllers/printer-files.controller.js +90 -10
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +5 -5
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/settings.controller.js +20 -1
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/entities/settings.entity.js.map +1 -1
- package/dist/middleware/printer.js.map +1 -1
- package/dist/models/Settings.js +10 -0
- package/dist/models/Settings.js.map +1 -1
- package/dist/server.constants.js +7 -1
- package/dist/server.constants.js.map +1 -1
- package/dist/services/core/multer.service.js +8 -8
- package/dist/services/core/multer.service.js.map +1 -1
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/mongoose/permission.service.js.map +1 -0
- package/dist/services/mongoose/refresh-token.service.js.map +1 -0
- package/dist/services/mongoose/role.service.js.map +1 -0
- package/dist/services/mongoose/settings.service.js +2 -1
- package/dist/services/mongoose/settings.service.js.map +1 -1
- package/dist/services/{authentication → mongoose}/user.service.js +2 -2
- package/dist/services/mongoose/user.service.js.map +1 -0
- package/dist/services/moonraker/moonraker-websocket.adapter.js +9 -5
- package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
- package/dist/services/moonraker/moonraker.client.js +7 -0
- package/dist/services/moonraker/moonraker.client.js.map +1 -1
- package/dist/services/moonraker.api.js +12 -0
- package/dist/services/moonraker.api.js.map +1 -1
- package/dist/services/octoprint/octoprint-websocket.adapter.js +8 -3
- package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -1
- package/dist/services/octoprint/octoprint.client.js +11 -0
- package/dist/services/octoprint/octoprint.client.js.map +1 -1
- package/dist/services/octoprint.api.js +14 -2
- package/dist/services/octoprint.api.js.map +1 -1
- package/dist/services/orm/settings.service.js +2 -1
- package/dist/services/orm/settings.service.js.map +1 -1
- package/dist/services/orm/user.service.js +38 -3
- package/dist/services/orm/user.service.js.map +1 -1
- package/dist/services/validators/settings-service.validation.js +10 -2
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +1 -1
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/shared/websocket-rpc-extended.adapter.js +0 -2
- package/dist/shared/websocket-rpc-extended.adapter.js.map +1 -1
- package/dist/shared/websocket.adapter.js +7 -0
- package/dist/shared/websocket.adapter.js.map +1 -1
- package/dist/state/printer-socket.store.js +3 -5
- package/dist/state/printer-socket.store.js.map +1 -1
- package/dist/state/printer-thumbnail.cache.js +226 -0
- package/dist/state/printer-thumbnail.cache.js.map +1 -0
- package/dist/state/settings.store.js +14 -2
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +2 -2
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/dist/tasks/boot.task.js +7 -1
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/utils/cache/key-diff.cache.js +0 -3
- package/dist/utils/cache/key-diff.cache.js.map +1 -1
- package/dist/utils/gcode.utils.js +48 -0
- package/dist/utils/gcode.utils.js.map +1 -0
- package/dist/utils/normalize-url.js +1 -1
- package/dist/utils/normalize-url.js.map +1 -1
- package/dist/utils/url.utils.js +5 -4
- package/dist/utils/url.utils.js.map +1 -1
- package/package.json +14 -15
- package/requests/printer-file/get-partial-file-moonraker.http +5 -0
- package/requests/printer-file/get-thumbnails.http +5 -0
- package/requests/printer-file/reload-printer-thumbnails.http +10 -0
- package/requests/printer-file/testfile.gcode +5665 -0
- package/requests/printer-file/upload-file.http +11 -0
- package/requests/printer-file/upload-slicer-file.http +11 -0
- package/requests/printers/list.http +5 -0
- package/dist/services/authentication/permission.service.js.map +0 -1
- package/dist/services/authentication/refresh-token.service.js.map +0 -1
- package/dist/services/authentication/role.service.js.map +0 -1
- package/dist/services/authentication/user.service.js.map +0 -1
- package/dist/services/influxdb-v2/influx-db-v2-base.service.js +0 -41
- package/dist/services/influxdb-v2/influx-db-v2-base.service.js.map +0 -1
- /package/dist/services/{authentication → mongoose}/permission.service.js +0 -0
- /package/dist/services/{authentication → mongoose}/refresh-token.service.js +0 -0
- /package/dist/services/{authentication → mongoose}/role.service.js +0 -0
|
@@ -17,6 +17,8 @@ const _runtimeexceptions = require("../exceptions/runtime.exceptions");
|
|
|
17
17
|
const _printer = require("../middleware/printer");
|
|
18
18
|
const _authorizationconstants = require("../constants/authorization.constants");
|
|
19
19
|
const _express = require("express");
|
|
20
|
+
const _node = require("@sentry/node");
|
|
21
|
+
const _errorutils = require("../utils/error.utils");
|
|
20
22
|
function _ts_decorate(decorators, target, key, desc) {
|
|
21
23
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
22
24
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -28,19 +30,23 @@ function _ts_metadata(k, v) {
|
|
|
28
30
|
}
|
|
29
31
|
class PrinterFilesController {
|
|
30
32
|
printerApi;
|
|
33
|
+
printerLogin;
|
|
34
|
+
printerThumbnailCache;
|
|
31
35
|
printerFilesStore;
|
|
32
36
|
settingsStore;
|
|
33
37
|
batchCallService;
|
|
34
38
|
multerService;
|
|
35
39
|
printerFileCleanTask;
|
|
36
40
|
logger;
|
|
37
|
-
constructor({ printerApi, printerFilesStore, batchCallService, printerFileCleanTask, settingsStore, loggerFactory, multerService }){
|
|
41
|
+
constructor({ printerApi, printerLogin, printerFilesStore, batchCallService, printerFileCleanTask, settingsStore, loggerFactory, multerService, printerThumbnailCache }){
|
|
38
42
|
this.printerApi = printerApi;
|
|
43
|
+
this.printerLogin = printerLogin;
|
|
39
44
|
this.printerFilesStore = printerFilesStore;
|
|
40
45
|
this.settingsStore = settingsStore;
|
|
41
46
|
this.printerFileCleanTask = printerFileCleanTask;
|
|
42
47
|
this.batchCallService = batchCallService;
|
|
43
48
|
this.multerService = multerService;
|
|
49
|
+
this.printerThumbnailCache = printerThumbnailCache;
|
|
44
50
|
this.logger = loggerFactory(PrinterFilesController.name);
|
|
45
51
|
}
|
|
46
52
|
getTrackedUploads(req, res) {
|
|
@@ -51,15 +57,40 @@ class PrinterFilesController {
|
|
|
51
57
|
await this.printerFilesStore.purgeFiles();
|
|
52
58
|
res.send();
|
|
53
59
|
}
|
|
60
|
+
async getThumbnails(req, res) {
|
|
61
|
+
const thumbnails = await this.printerThumbnailCache.getAllValues();
|
|
62
|
+
res.send(thumbnails);
|
|
63
|
+
}
|
|
54
64
|
async getFiles(req, res) {
|
|
55
65
|
const { currentPrinterId } = (0, _validators.getScopedPrinter)(req);
|
|
56
66
|
this.logger.log("Refreshing file storage (eager load)");
|
|
57
67
|
const files = await this.printerFilesStore.loadFiles(currentPrinterId);
|
|
58
68
|
res.send(files);
|
|
59
69
|
}
|
|
70
|
+
async reloadThumbnail(req, res) {
|
|
71
|
+
const { filePath } = await (0, _validators.validateInput)(req.body, _printerfilescontrollervalidation.startPrintFileRules);
|
|
72
|
+
try {
|
|
73
|
+
if (this.settingsStore.isThumbnailSupportEnabled()) {
|
|
74
|
+
await this.printerThumbnailCache.loadPrinterThumbnailRemote(this.printerLogin, req.params.id, filePath);
|
|
75
|
+
}
|
|
76
|
+
} catch (e) {
|
|
77
|
+
this.logger.error(`Unexpected error processing thumbnail ${(0, _errorutils.errorSummary)(e)}`);
|
|
78
|
+
(0, _node.captureException)(e);
|
|
79
|
+
}
|
|
80
|
+
res.send();
|
|
81
|
+
}
|
|
60
82
|
async startPrintFile(req, res) {
|
|
61
83
|
const { filePath } = await (0, _validators.validateInput)(req.body, _printerfilescontrollervalidation.startPrintFileRules);
|
|
62
|
-
|
|
84
|
+
const encodedFilePath = encodeURIComponent(filePath);
|
|
85
|
+
await this.printerApi.startPrint(encodedFilePath);
|
|
86
|
+
try {
|
|
87
|
+
if (this.settingsStore.isThumbnailSupportEnabled()) {
|
|
88
|
+
await this.printerThumbnailCache.loadPrinterThumbnailRemote(this.printerLogin, req.params.id, encodedFilePath);
|
|
89
|
+
}
|
|
90
|
+
} catch (e) {
|
|
91
|
+
this.logger.error(`Unexpected error processing thumbnail ${(0, _errorutils.errorSummary)(e)}`);
|
|
92
|
+
(0, _node.captureException)(e);
|
|
93
|
+
}
|
|
63
94
|
res.send();
|
|
64
95
|
}
|
|
65
96
|
async getFilesCache(req, res) {
|
|
@@ -69,7 +100,8 @@ class PrinterFilesController {
|
|
|
69
100
|
async downloadFile(req, res) {
|
|
70
101
|
this.logger.log(`Downloading file ${req.params.path}`);
|
|
71
102
|
const { path } = await (0, _validators.validateInput)(req.params, _printerfilescontrollervalidation.downloadFileRules);
|
|
72
|
-
const
|
|
103
|
+
const encodedFilePath = encodeURIComponent(path);
|
|
104
|
+
const response = await this.printerApi.downloadFile(encodedFilePath);
|
|
73
105
|
res.setHeader("Content-Type", response.headers["content-type"]);
|
|
74
106
|
res.setHeader("Content-Length", response.headers["content-length"]);
|
|
75
107
|
res.setHeader("Content-Disposition", response.headers["content-disposition"]);
|
|
@@ -81,7 +113,8 @@ class PrinterFilesController {
|
|
|
81
113
|
async deleteFileOrFolder(req, res) {
|
|
82
114
|
const { currentPrinterId } = (0, _validators.getScopedPrinter)(req);
|
|
83
115
|
const { path } = await (0, _validators.validateInput)(req.query, _printerfilescontrollervalidation.getFileRules);
|
|
84
|
-
const
|
|
116
|
+
const encodedFilePath = encodeURIComponent(path);
|
|
117
|
+
const result = await this.printerApi.deleteFile(encodedFilePath);
|
|
85
118
|
await this.printerFilesStore.deleteFile(currentPrinterId, path);
|
|
86
119
|
res.send(result);
|
|
87
120
|
}
|
|
@@ -92,7 +125,8 @@ class PrinterFilesController {
|
|
|
92
125
|
const nonRecursiveFiles = await this.printerApi.getFiles();
|
|
93
126
|
for (let file of nonRecursiveFiles){
|
|
94
127
|
try {
|
|
95
|
-
|
|
128
|
+
const encodedFilePath = encodeURIComponent(file.path);
|
|
129
|
+
await this.printerApi.deleteFile(encodedFilePath);
|
|
96
130
|
succeededFiles.push(file);
|
|
97
131
|
} catch (e) {
|
|
98
132
|
failedFiles.push(file);
|
|
@@ -104,19 +138,32 @@ class PrinterFilesController {
|
|
|
104
138
|
succeededFiles
|
|
105
139
|
});
|
|
106
140
|
}
|
|
107
|
-
async
|
|
141
|
+
async getPrinterThumbnail(req, res) {
|
|
142
|
+
const { currentPrinterId } = (0, _validators.getScopedPrinter)(req);
|
|
143
|
+
const printerThumbnail = await this.printerThumbnailCache.getValue(currentPrinterId.toString());
|
|
144
|
+
res.send(printerThumbnail);
|
|
145
|
+
}
|
|
146
|
+
async uploadPrinterFile(req, res) {
|
|
108
147
|
const { currentPrinterId } = (0, _validators.getScopedPrinter)(req);
|
|
109
|
-
const files = await this.multerService.multerLoadFileAsync(req, res,
|
|
148
|
+
const files = await this.multerService.multerLoadFileAsync(req, res, _serverconstants.AppConstants.defaultAcceptedGcodeExtensions, true);
|
|
110
149
|
if (!files?.length) {
|
|
111
150
|
throw new _runtimeexceptions.ValidationException({
|
|
112
|
-
error:
|
|
151
|
+
error: `No file was available for upload. Did you upload files with one of these extensions: ${_serverconstants.AppConstants.defaultAcceptedGcodeExtensions.join(", ")}?`
|
|
113
152
|
});
|
|
114
153
|
}
|
|
115
154
|
if (files.length > 1) {
|
|
116
155
|
throw new _runtimeexceptions.ValidationException({
|
|
117
|
-
error: "Only 1 .gcode file can be uploaded at a time
|
|
156
|
+
error: "Only 1 .gcode file can be uploaded at a time"
|
|
118
157
|
});
|
|
119
158
|
}
|
|
159
|
+
try {
|
|
160
|
+
if (this.settingsStore.isThumbnailSupportEnabled()) {
|
|
161
|
+
await this.printerThumbnailCache.loadPrinterThumbnailLocal(currentPrinterId, files[0].path);
|
|
162
|
+
}
|
|
163
|
+
} catch (e) {
|
|
164
|
+
this.logger.error(`Unexpected error processing thumbnail ${(0, _errorutils.errorSummary)(e)}`);
|
|
165
|
+
(0, _node.captureException)(e);
|
|
166
|
+
}
|
|
120
167
|
const fileCleanEnabled = this.settingsStore.isPreUploadFileCleanEnabled();
|
|
121
168
|
if (fileCleanEnabled) {
|
|
122
169
|
await this.printerFileCleanTask.cleanPrinterFiles(currentPrinterId);
|
|
@@ -150,6 +197,17 @@ _ts_decorate([
|
|
|
150
197
|
]),
|
|
151
198
|
_ts_metadata("design:returntype", Promise)
|
|
152
199
|
], PrinterFilesController.prototype, "purgeIndexedFiles", null);
|
|
200
|
+
_ts_decorate([
|
|
201
|
+
(0, _awilixexpress.GET)(),
|
|
202
|
+
(0, _awilixexpress.route)("/thumbnails"),
|
|
203
|
+
(0, _awilixexpress.before)((0, _authenticate.authorizePermission)(_authorizationconstants.PERMS.PrinterFiles.Get)),
|
|
204
|
+
_ts_metadata("design:type", Function),
|
|
205
|
+
_ts_metadata("design:paramtypes", [
|
|
206
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
207
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
208
|
+
]),
|
|
209
|
+
_ts_metadata("design:returntype", Promise)
|
|
210
|
+
], PrinterFilesController.prototype, "getThumbnails", null);
|
|
153
211
|
_ts_decorate([
|
|
154
212
|
(0, _awilixexpress.GET)(),
|
|
155
213
|
(0, _awilixexpress.route)("/:id"),
|
|
@@ -161,6 +219,17 @@ _ts_decorate([
|
|
|
161
219
|
]),
|
|
162
220
|
_ts_metadata("design:returntype", Promise)
|
|
163
221
|
], PrinterFilesController.prototype, "getFiles", null);
|
|
222
|
+
_ts_decorate([
|
|
223
|
+
(0, _awilixexpress.POST)(),
|
|
224
|
+
(0, _awilixexpress.route)("/:id/reload-thumbnail"),
|
|
225
|
+
(0, _awilixexpress.before)((0, _authenticate.authorizePermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)),
|
|
226
|
+
_ts_metadata("design:type", Function),
|
|
227
|
+
_ts_metadata("design:paramtypes", [
|
|
228
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
229
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
230
|
+
]),
|
|
231
|
+
_ts_metadata("design:returntype", Promise)
|
|
232
|
+
], PrinterFilesController.prototype, "reloadThumbnail", null);
|
|
164
233
|
_ts_decorate([
|
|
165
234
|
(0, _awilixexpress.POST)(),
|
|
166
235
|
(0, _awilixexpress.route)("/:id/select"),
|
|
@@ -217,6 +286,17 @@ _ts_decorate([
|
|
|
217
286
|
]),
|
|
218
287
|
_ts_metadata("design:returntype", Promise)
|
|
219
288
|
], PrinterFilesController.prototype, "clearPrinterFiles", null);
|
|
289
|
+
_ts_decorate([
|
|
290
|
+
(0, _awilixexpress.GET)(),
|
|
291
|
+
(0, _awilixexpress.route)("/:id/thumbnail"),
|
|
292
|
+
(0, _awilixexpress.before)((0, _authenticate.authorizePermission)(_authorizationconstants.PERMS.PrinterFiles.Get)),
|
|
293
|
+
_ts_metadata("design:type", Function),
|
|
294
|
+
_ts_metadata("design:paramtypes", [
|
|
295
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
296
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
297
|
+
]),
|
|
298
|
+
_ts_metadata("design:returntype", Promise)
|
|
299
|
+
], PrinterFilesController.prototype, "getPrinterThumbnail", null);
|
|
220
300
|
_ts_decorate([
|
|
221
301
|
(0, _awilixexpress.POST)(),
|
|
222
302
|
(0, _awilixexpress.route)("/:id/upload"),
|
|
@@ -227,7 +307,7 @@ _ts_decorate([
|
|
|
227
307
|
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
228
308
|
]),
|
|
229
309
|
_ts_metadata("design:returntype", Promise)
|
|
230
|
-
], PrinterFilesController.prototype, "
|
|
310
|
+
], PrinterFilesController.prototype, "uploadPrinterFile", null);
|
|
231
311
|
PrinterFilesController = _ts_decorate([
|
|
232
312
|
(0, _awilixexpress.route)(_serverconstants.AppConstants.apiRoute + "/printer-files"),
|
|
233
313
|
(0, _awilixexpress.before)([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/printer-files.controller.ts"],"names":["PrinterFilesController","printerApi","printerFilesStore","settingsStore","batchCallService","multerService","printerFileCleanTask","logger","constructor","loggerFactory","name","getTrackedUploads","req","res","sessions","getSessions","send","purgeIndexedFiles","purgeFiles","getFiles","currentPrinterId","getScopedPrinter","log","files","loadFiles","
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/printer-files.controller.ts"],"names":["PrinterFilesController","printerApi","printerLogin","printerThumbnailCache","printerFilesStore","settingsStore","batchCallService","multerService","printerFileCleanTask","logger","constructor","loggerFactory","name","getTrackedUploads","req","res","sessions","getSessions","send","purgeIndexedFiles","purgeFiles","getThumbnails","thumbnails","getAllValues","getFiles","currentPrinterId","getScopedPrinter","log","files","loadFiles","reloadThumbnail","filePath","validateInput","body","startPrintFileRules","isThumbnailSupportEnabled","loadPrinterThumbnailRemote","params","id","e","error","errorSummary","captureException","startPrintFile","encodedFilePath","encodeURIComponent","startPrint","getFilesCache","currentPrinter","downloadFile","path","downloadFileRules","response","setHeader","headers","length","data","pipe","deleteFileOrFolder","query","getFileRules","result","deleteFile","clearPrinterFiles","failedFiles","succeededFiles","nonRecursiveFiles","file","push","purgePrinterFiles","getPrinterThumbnail","printerThumbnail","getValue","toString","uploadPrinterFile","multerLoadFileAsync","AppConstants","defaultAcceptedGcodeExtensions","ValidationException","join","loadPrinterThumbnailLocal","fileCleanEnabled","isPreUploadFileCleanEnabled","cleanPrinterFiles","uploadedFile","token","startTrackingSession","uploadFile","PrinterFiles","Upload","Clear","Get","Actions","Delete","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","printerResolveMiddleware"],"mappings":"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"}
|
|
@@ -202,7 +202,7 @@ class PrinterController {
|
|
|
202
202
|
await printerApi.getVersion();
|
|
203
203
|
}
|
|
204
204
|
} catch (e) {
|
|
205
|
-
this.logger.log("
|
|
205
|
+
this.logger.log("Printer version test failed");
|
|
206
206
|
if (e instanceof _axios.AxiosError) {
|
|
207
207
|
this.logger.debug(e.message + " " + e.status + " " + e.response?.status);
|
|
208
208
|
switch(e.response?.status){
|
|
@@ -217,19 +217,19 @@ class PrinterController {
|
|
|
217
217
|
case 502:
|
|
218
218
|
case 503:
|
|
219
219
|
{
|
|
220
|
-
throw new _faileddependencyexception.FailedDependencyException("
|
|
220
|
+
throw new _faileddependencyexception.FailedDependencyException("Printer service unreachable", e.response?.status);
|
|
221
221
|
}
|
|
222
222
|
default:
|
|
223
223
|
{
|
|
224
224
|
if (!e.response?.status) {
|
|
225
|
-
throw new _faileddependencyexception.FailedDependencyException(`Reaching
|
|
225
|
+
throw new _faileddependencyexception.FailedDependencyException(`Reaching Printer service failed without status (code ${e.code})`);
|
|
226
226
|
} else {
|
|
227
|
-
throw new _faileddependencyexception.FailedDependencyException(`Reaching
|
|
227
|
+
throw new _faileddependencyexception.FailedDependencyException(`Reaching Printer service failed with status (code ${e.code})`, e.response?.status);
|
|
228
228
|
}
|
|
229
229
|
}
|
|
230
230
|
}
|
|
231
231
|
}
|
|
232
|
-
throw new _runtimeexceptions.InternalServerException(`Could not call
|
|
232
|
+
throw new _runtimeexceptions.InternalServerException(`Could not call Printer service, internal problem`, e.stack);
|
|
233
233
|
}
|
|
234
234
|
}
|
|
235
235
|
async setFeedRate(req, res) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/printer.controller.ts"],"names":["PrinterController","printerApiFactory","printerSocketStore","testPrinterSocketStore","printerService","printerCache","printerEventsCache","taskManagerService","printerApi","octoprintClient","moonrakerClient","pluginRepositoryCache","floorStore","multerService","logger","constructor","loggerFactory","name","list","req","res","send","listCachedPrinters","create","newPrinter","body","query","forceSave","testPrintApiConnection","createdPrinter","getCachedPrinterOrThrowAsync","id","createBatch","importResult","batchImport","getPluginList","pluginList","getCache","getPrinter","currentPrinterId","getScopedPrinter","getPrinterSocketInfo","getPrinterSocketEvents","update","updatedPrinter","delete","result","removePrinterFromAnyFloor","updateEnabled","data","validateMiddleware","updatePrinterEnabledRule","enabled","updatePrinterDisabledReason","updatePrinterDisabledReasonRules","updateDisabledReason","disabledReason","updateConnectionSettings","inputData","updatePrinterConnectionSettingRules","newEntity","printerURL","apiKey","printerType","refreshPrinterSocket","reconnectOctoPrint","deletePrinterSocketEvents","testConnection","length","normalizeURLWithProtocol","testPrinterApiRules","correlationToken","generateCorrelationToken","log","setupTestPrinter","e","failure","error","toString","getPrinterLoginDetails","printerLogin","sendSerialConnectCommand","connect","sendSerialDisconnectCommand","disconnect","movePrintHead","homeAxes","pausePrint","resumePrint","cancelPrint","restartServer","inputLoginDto","validateInput","getVersion","AxiosError","debug","message","status","response","FailedDependencyException","code","InternalServerException","stack","setFeedRate","feedRateRules","updateFeedRate","feedRate","setFlowRate","flowRateRules","updateFlowRate","flowRate","getPrinterPluginList","getPluginManagerPlugins","getOctoPrintBackupOverview","backupOverview","getBackupOverview","listOctoPrintBackups","getBackups","createOctoPrintBackup","exclude","createOctoPrintBackupRules","createBackup","downloadOctoPrintBackup","fileName","getOctoPrintBackupRules","dataStream","getDownloadBackupStream","pipe","restoreOctoPrintBackup","files","multerLoadFileAsync","forwardRestoreBackupFileStream","buffer","deleteOctoPrintBackup","deleteBackup","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware"],"mappings":";;;;+BAyCaA;;;eAAAA;;;+BAzC2C;0BACf;8BACI;4BACuB;6CAU7D;iCACsB;yBACY;sCACA;wCACnB;yBAWY;uBAGP;2CACe;mCACF;;;;;;;;;;AAQjC,MAAMA;IACXC,kBAAqC;IACrCC,mBAAuC;IACvCC,uBAA+C;IAC/CC,eAAgC;IAChCC,aAA2B;IAC3BC,mBAAuC;IACvCC,mBAAuC;IACvCC,WAAwB;IACxBC,gBAAiC;IACjCC,gBAAiC;IACjCC,sBAA6C;IAC7CC,WAAuB;IACvBC,cAA6B;IAC7BC,OAAsB;IAEtBC,YAAY,EACVd,iBAAiB,EACjBC,kBAAkB,EAClBC,sBAAsB,EACtBC,cAAc,EACdC,YAAY,EACZC,kBAAkB,EAClBC,kBAAkB,EAClBS,aAAa,EACbR,UAAU,EACVE,eAAe,EACfD,eAAe,EACfE,qBAAqB,EACrBC,UAAU,EACVC,aAAa,EAgBd,CAAE;QACD,IAAI,CAACC,MAAM,GAAGE,cAAchB,kBAAkBiB,IAAI;QAClD,IAAI,CAAChB,iBAAiB,GAAGA;QACzB,IAAI,CAACI,YAAY,GAAGA;QACpB,IAAI,CAACC,kBAAkB,GAAGA;QAC1B,IAAI,CAACF,cAAc,GAAGA;QACtB,IAAI,CAACF,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,sBAAsB,GAAGA;QAC9B,IAAI,CAACI,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,UAAU,GAAGA;QAClB,IAAI,CAACC,eAAe,GAAGA;QACvB,IAAI,CAACC,eAAe,GAAGA;QACvB,IAAI,CAACC,qBAAqB,GAAGA;QAC7B,IAAI,CAACC,UAAU,GAAGA;QAClB,IAAI,CAACC,aAAa,GAAGA;IACvB;IAEA,MAEMK,KAAKC,GAAY,EAAEC,GAAa,EAAE;QACtCA,IAAIC,IAAI,CAAC,MAAM,IAAI,CAAChB,YAAY,CAACiB,kBAAkB,CAAC;IACtD;IAEA,MAEMC,OAAOJ,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAMI,aAAaL,IAAIM,IAAI;QAC3B,IAAIN,IAAIO,KAAK,CAACC,SAAS,KAAK,QAAQ;YAClC,MAAM,IAAI,CAACC,sBAAsB,CAACJ;QACpC;QAGA,MAAMK,iBAAiB,MAAM,IAAI,CAACzB,cAAc,CAACmB,MAAM,CAACC;QACxDJ,IAAIC,IAAI,CAAC,MAAM,IAAI,CAAChB,YAAY,CAACyB,4BAA4B,CAACD,eAAeE,EAAE;IACjF;IAEA,MAEMC,YAAYb,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAMa,eAAe,MAAM,IAAI,CAAC7B,cAAc,CAAC8B,WAAW,CAACf,IAAIM,IAAI;QACnEL,IAAIC,IAAI,CAACY;IACX;IAKA,MAEME,cAAchB,GAAY,EAAEC,GAAa,EAAE;QAC/C,MAAMgB,aAAa,IAAI,CAACzB,qBAAqB,CAAC0B,QAAQ;QACtDjB,IAAIC,IAAI,CAACe;IACX;IAEA,MAEME,WAAWnB,GAAY,EAAEC,GAAa,EAAE;QAC5C,MAAM,EAAEmB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACrB;QAC9CC,IAAIC,IAAI,CAAC,MAAM,IAAI,CAAChB,YAAY,CAACyB,4BAA4B,CAACS;IAChE;IAEA,MAEME,qBAAqBtB,GAAY,EAAEC,GAAa,EAAE;QACtD,MAAM,EAAEmB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACrB;QAC9CC,IAAIC,IAAI,CAAC,MAAM,IAAI,CAACf,kBAAkB,CAACoC,sBAAsB,CAACH;IAChE;IAEA,MAEMI,OAAOxB,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAMO,YAAYR,IAAIO,KAAK,CAACC,SAAS,KAAK;QAG1C,MAAM,EAAEY,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACrB;QAC9C,MAAMyB,iBAAiBzB,IAAIM,IAAI;QAC/B,IAAI,CAACE,WAAW;YACd,MAAM,IAAI,CAACC,sBAAsB,CAACgB;QACpC;QAEA,MAAM,IAAI,CAACxC,cAAc,CAACuC,MAAM,CAACJ,kBAAkBK;QACnDxB,IAAIC,IAAI,CAAC,MAAM,IAAI,CAAChB,YAAY,CAACyB,4BAA4B,CAACS;IAChE;IAEA,MAEMM,OAAO1B,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAM,EAAEmB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACrB;QAC9C,MAAM2B,SAAS,MAAM,IAAI,CAAC1C,cAAc,CAACyC,MAAM,CAACN;QAChD,MAAM,IAAI,CAAC3B,UAAU,CAACmC,yBAAyB,CAACR;QAChDnB,IAAIC,IAAI,CAACyB;IACX;IAEA,MAEME,cAAc7B,GAAY,EAAEC,GAAa,EAAE;QAC/C,MAAM,EAAEmB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACrB;QAC9C,MAAM8B,OAAO,MAAMC,IAAAA,8BAAkB,EAAC/B,KAAKgC,qDAAwB;QACnE,MAAM,IAAI,CAAC/C,cAAc,CAAC4C,aAAa,CAACT,kBAAkBU,KAAKG,OAAO;QACtEhC,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMgC,4BAA4BlC,GAAY,EAAEC,GAAa,EAAE;QAC7D,MAAM,EAAEmB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACrB;QAC9C,MAAM8B,OAAO,MAAMC,IAAAA,8BAAkB,EAAC/B,KAAKmC,6DAAgC;QAC3E,MAAM,IAAI,CAAClD,cAAc,CAACmD,oBAAoB,CAAChB,kBAAkBU,KAAKO,cAAc;QACpFpC,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMoC,yBAAyBtC,GAAY,EAAEC,GAAa,EAAE;QAC1D,MAAM,EAAEmB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACrB;QAC9C,MAAMuC,YAAY,MAAMR,IAAAA,8BAAkB,EAAC/B,KAAKwC,gEAAmC;QAEnF,IAAIxC,IAAIO,KAAK,CAACC,SAAS,KAAK,QAAQ;YAClC,MAAM,IAAI,CAACC,sBAAsB,CAAC8B;QACpC;QAEA,MAAME,YAAY,MAAM,IAAI,CAACxD,cAAc,CAACqD,wBAAwB,CAAClB,kBAAkBmB;QACvFtC,IAAIC,IAAI,CAAC;YACPwC,YAAYD,UAAUC,UAAU;YAChCC,QAAQF,UAAUE,MAAM;YACxBC,aAAaH,UAAUG,WAAW;QACpC;IACF;IAEA,MAEMC,qBAAqB7C,GAAY,EAAEC,GAAa,EAAE;QACtD,MAAM,EAAEmB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACrB;QAC9C,IAAI,CAACjB,kBAAkB,CAAC+D,kBAAkB,CAAC1B;QAC3C,MAAM,IAAI,CAACjC,kBAAkB,CAAC4D,yBAAyB,CAAC3B;QACxDnB,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEM8C,eAAehD,GAAY,EAAEC,GAAa,EAAE;QAChD,IAAID,IAAIM,IAAI,CAACoC,UAAU,EAAEO,QAAQ;YAC/BjD,IAAIM,IAAI,CAACoC,UAAU,GAAGQ,IAAAA,kCAAwB,EAAClD,IAAIM,IAAI,CAACoC,UAAU;QACpE;QACA,MAAMrC,aAAa,MAAM0B,IAAAA,8BAAkB,EAAC/B,KAAKmD,gDAAmB;QACpE9C,WAAW+C,gBAAgB,GAAGC,IAAAA,8CAAwB;QACtD,IAAI,CAAC1D,MAAM,CAAC2D,GAAG,CAAC,CAAC,uCAAuC,EAAEjD,WAAW+C,gBAAgB,EAAE;QAGvF,IAAI;YACF,MAAM,IAAI,CAACpE,sBAAsB,CAACuE,gBAAgB,CAAClD;QACrD,EAAE,OAAOmD,GAAG;YACVvD,IAAIC,IAAI,CAAC;gBAAEkD,kBAAkB/C,WAAW+C,gBAAgB;gBAAEK,SAAS;gBAAMC,OAAOF,EAAEG,QAAQ;YAAG;YAC7F;QACF;QACA1D,IAAIC,IAAI,CAAC;YAAEkD,kBAAkB/C,WAAW+C,gBAAgB;QAAC;IAC3D;IAEA,MAEMQ,uBAAuB5D,GAAY,EAAEC,GAAa,EAAE;QACxD,MAAM,EAAE4D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACrB;QAC1CC,IAAIC,IAAI,CAAC2D;IACX;IAEA,MAEMC,yBAAyB9D,GAAY,EAAEC,GAAa,EAAE;QAC1D,MAAM,IAAI,CAACZ,UAAU,CAAC0E,OAAO;QAC7B9D,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEM8D,4BAA4BhE,GAAY,EAAEC,GAAa,EAAE;QAC7D,MAAM,IAAI,CAACZ,UAAU,CAAC4E,UAAU;QAChChE,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAGMgE,cAAclE,GAAY,EAAEC,GAAa,EAAE;QAC/C,MAAM,IAAI,CAACZ,UAAU,CAAC6E,aAAa,CAAClE,IAAIM,IAAI;QAC5CL,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMiE,SAASnE,GAAY,EAAEC,GAAa,EAAE;QAC1C,MAAM,IAAI,CAACZ,UAAU,CAAC8E,QAAQ,CAACnE,IAAIM,IAAI;QACvCL,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMkE,WAAWpE,GAAY,EAAEC,GAAa,EAAE;QAC5C,MAAM,IAAI,CAACZ,UAAU,CAAC+E,UAAU;QAChCnE,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMmE,YAAYrE,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAM,IAAI,CAACZ,UAAU,CAACgF,WAAW;QACjCpE,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAGMoE,YAAYtE,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAM,IAAI,CAACZ,UAAU,CAACiF,WAAW;QACjCrE,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAGMqE,cAAcvE,GAAY,EAAEC,GAAa,EAAE;QAC/C,MAAM,IAAI,CAACZ,UAAU,CAACkF,aAAa;QACnCtE,IAAIC,IAAI;IACV;IAEA,MAAcO,uBAAuB+D,aAAuB,EAAE;QAC5D,MAAMC,IAAAA,yBAAa,EAACD,eAAehC,gEAAmC;QACtE,IAAI;YACF,IAAI,IAAI,CAACnD,UAAU,EAAE;gBACnB,MAAM,IAAI,CAACA,UAAU,CAACqF,UAAU;YAClC,OAAO;gBACL,MAAMrF,aAAa,IAAI,CAACP,iBAAiB,CAACuC,gBAAgB,CAACmD;gBAC3D,MAAMnF,WAAWqF,UAAU;YAC7B;QACF,EAAE,OAAOlB,GAAG;YACV,IAAI,CAAC7D,MAAM,CAAC2D,GAAG,CAAC;YAEhB,IAAIE,aAAamB,iBAAU,EAAE;gBAC3B,IAAI,CAAChF,MAAM,CAACiF,KAAK,CAACpB,EAAEqB,OAAO,GAAG,MAAMrB,EAAEsB,MAAM,GAAG,MAAMtB,EAAEuB,QAAQ,EAAED;gBACjE,OAAQtB,EAAEuB,QAAQ,EAAED;oBAClB,KAAK;wBAEH;oBACF,KAAK;oBACL,KAAK;wBAAK;4BACR,MAAM,IAAIE,oDAAyB,CAAC,yBAAyBxB,EAAEuB,QAAQ,EAAED;wBAC3E;oBACA,KAAK;oBACL,KAAK;oBACL,KAAK;wBAAK;4BACR,MAAM,IAAIE,oDAAyB,CAAC,yBAAyBxB,EAAEuB,QAAQ,EAAED;wBAC3E;oBACA;wBAAS;4BACP,IAAI,CAACtB,EAAEuB,QAAQ,EAAED,QAAQ;gCAKvB,MAAM,IAAIE,oDAAyB,CAAC,CAAC,+CAA+C,EAAExB,EAAEyB,IAAI,CAAC,CAAC,CAAC;4BACjG,OAAO;gCACL,MAAM,IAAID,oDAAyB,CAAC,CAAC,4CAA4C,EAAExB,EAAEyB,IAAI,CAAC,CAAC,CAAC,EAAEzB,EAAEuB,QAAQ,EAAED;4BAC5G;wBACF;gBACF;YACF;YAEA,MAAM,IAAII,0CAAuB,CAAC,CAAC,0CAA0C,CAAC,EAAE,AAAC1B,EAAY2B,KAAK;QACpG;IACF;IAEA,MAEMC,YAAYpF,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAM,EAAEmB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACrB;QAC9C,MAAM8B,OAAO,MAAMC,IAAAA,8BAAkB,EAAC/B,KAAKqF,0CAAa;QAExD,MAAM,IAAI,CAACpG,cAAc,CAACqG,cAAc,CAAClE,kBAAkBU,KAAKyD,QAAQ;QACxEtF,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMsF,YAAYxF,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAM,EAAEmB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACrB;QAC9C,MAAM8B,OAAO,MAAMC,IAAAA,8BAAkB,EAAC/B,KAAKyF,0CAAa;QACxD,MAAM,IAAI,CAACxG,cAAc,CAACyG,cAAc,CAACtE,kBAAkBU,KAAK6D,QAAQ;QACxE1F,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEM0F,qBAAqB5F,GAAY,EAAEC,GAAa,EAAE;QAEtD,MAAM,EAAE4D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACrB;QAC1C,MAAMiB,aAAa,MAAM,IAAI,CAAC3B,eAAe,CAACuG,uBAAuB,CAAChC;QACtE5D,IAAIC,IAAI,CAACe;IACX;IAEA,MAEM6E,2BAA2B9F,GAAY,EAAEC,GAAa,EAAE;QAC5D,MAAM,EAAE4D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACrB;QAC1C,MAAM+F,iBAAiB,MAAM,IAAI,CAACzG,eAAe,CAAC0G,iBAAiB,CAACnC;QACpE5D,IAAIC,IAAI,CAAC6F;IACX;IAEA,MAEME,qBAAqBjG,GAAY,EAAEC,GAAa,EAAE;QACtD,MAAM,EAAE4D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACrB;QAC1C,MAAM+F,iBAAiB,MAAM,IAAI,CAACzG,eAAe,CAAC4G,UAAU,CAACrC;QAC7D5D,IAAIC,IAAI,CAAC6F;IACX;IAEA,MAEMI,sBAAsBnG,GAAY,EAAEC,GAAa,EAAE;QACvD,MAAM,EAAE4D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACrB;QAC1C,MAAM,EAAEoG,OAAO,EAAE,GAAG,MAAMrE,IAAAA,8BAAkB,EAAC/B,KAAKqG,uDAA0B;QAC5E,MAAMtB,WAAW,MAAM,IAAI,CAACzF,eAAe,CAACgH,YAAY,CAACzC,cAAcuC;QACvEnG,IAAIC,IAAI,CAAC6E;IACX;IAEA,MAEMwB,wBAAwBvG,GAAY,EAAEC,GAAa,EAAE;QACzD,MAAM,EAAE4D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACrB;QAC1C,MAAM,EAAEwG,QAAQ,EAAE,GAAG,MAAMzE,IAAAA,8BAAkB,EAAC/B,KAAKyG,oDAAuB;QAC1E,MAAMC,aAAa,MAAM,IAAI,CAACpH,eAAe,CAACqH,uBAAuB,CAAC9C,cAAc2C;QACpFE,WAAWE,IAAI,CAAC3G;IAClB;IAEA,MAEM4G,uBAAuB7G,GAAY,EAAEC,GAAa,EAAE;QACxD,MAAM,EAAE4D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACrB;QAC1C,MAAM8G,QAAQ,MAAM,IAAI,CAACpH,aAAa,CAACqH,mBAAmB,CAAC/G,KAAKC,KAAK,MAAM;QAC3E,MAAM8E,WAAW,MAAM,IAAI,CAACzF,eAAe,CAAC0H,8BAA8B,CAACnD,cAAciD,KAAK,CAAC,EAAE,CAACG,MAAM;QACxGhH,IAAIC,IAAI,CAAC6E,SAASjD,IAAI;IACxB;IAEA,MAEMoF,sBAAsBlH,GAAY,EAAEC,GAAa,EAAE;QACvD,MAAM,EAAE4D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACrB;QAC1C,MAAM,EAAEwG,QAAQ,EAAE,GAAG,MAAMzE,IAAAA,8BAAkB,EAAC/B,KAAKyG,oDAAuB;QAC1E,MAAM1B,WAAW,MAAM,IAAI,CAACzF,eAAe,CAAC6H,YAAY,CAACtD,cAAc2C;QACvEvG,IAAIC,IAAI,CAAC6E;IACX;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BA3YOqC,6BAAY,CAACC,QAAQ,GAAG;;QACtBC,IAAAA,0BAAY;QAAIC,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,QAAQ;YAAED,6BAAK,CAACE,KAAK;SAAC;QAAGC,IAAAA,iCAAwB"}
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/printer.controller.ts"],"names":["PrinterController","printerApiFactory","printerSocketStore","testPrinterSocketStore","printerService","printerCache","printerEventsCache","taskManagerService","printerApi","octoprintClient","moonrakerClient","pluginRepositoryCache","floorStore","multerService","logger","constructor","loggerFactory","name","list","req","res","send","listCachedPrinters","create","newPrinter","body","query","forceSave","testPrintApiConnection","createdPrinter","getCachedPrinterOrThrowAsync","id","createBatch","importResult","batchImport","getPluginList","pluginList","getCache","getPrinter","currentPrinterId","getScopedPrinter","getPrinterSocketInfo","getPrinterSocketEvents","update","updatedPrinter","delete","result","removePrinterFromAnyFloor","updateEnabled","data","validateMiddleware","updatePrinterEnabledRule","enabled","updatePrinterDisabledReason","updatePrinterDisabledReasonRules","updateDisabledReason","disabledReason","updateConnectionSettings","inputData","updatePrinterConnectionSettingRules","newEntity","printerURL","apiKey","printerType","refreshPrinterSocket","reconnectOctoPrint","deletePrinterSocketEvents","testConnection","length","normalizeURLWithProtocol","testPrinterApiRules","correlationToken","generateCorrelationToken","log","setupTestPrinter","e","failure","error","toString","getPrinterLoginDetails","printerLogin","sendSerialConnectCommand","connect","sendSerialDisconnectCommand","disconnect","movePrintHead","homeAxes","pausePrint","resumePrint","cancelPrint","restartServer","inputLoginDto","validateInput","getVersion","AxiosError","debug","message","status","response","FailedDependencyException","code","InternalServerException","stack","setFeedRate","feedRateRules","updateFeedRate","feedRate","setFlowRate","flowRateRules","updateFlowRate","flowRate","getPrinterPluginList","getPluginManagerPlugins","getOctoPrintBackupOverview","backupOverview","getBackupOverview","listOctoPrintBackups","getBackups","createOctoPrintBackup","exclude","createOctoPrintBackupRules","createBackup","downloadOctoPrintBackup","fileName","getOctoPrintBackupRules","dataStream","getDownloadBackupStream","pipe","restoreOctoPrintBackup","files","multerLoadFileAsync","forwardRestoreBackupFileStream","buffer","deleteOctoPrintBackup","deleteBackup","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware"],"mappings":";;;;+BAyCaA;;;eAAAA;;;+BAzC2C;0BACf;8BACI;4BACuB;6CAU7D;iCACsB;yBACY;sCACA;wCACnB;yBAWY;uBAGP;2CACe;mCACF;;;;;;;;;;AAQjC,MAAMA;IACXC,kBAAqC;IACrCC,mBAAuC;IACvCC,uBAA+C;IAC/CC,eAAgC;IAChCC,aAA2B;IAC3BC,mBAAuC;IACvCC,mBAAuC;IACvCC,WAAwB;IACxBC,gBAAiC;IACjCC,gBAAiC;IACjCC,sBAA6C;IAC7CC,WAAuB;IACvBC,cAA6B;IAC7BC,OAAsB;IAEtBC,YAAY,EACVd,iBAAiB,EACjBC,kBAAkB,EAClBC,sBAAsB,EACtBC,cAAc,EACdC,YAAY,EACZC,kBAAkB,EAClBC,kBAAkB,EAClBS,aAAa,EACbR,UAAU,EACVE,eAAe,EACfD,eAAe,EACfE,qBAAqB,EACrBC,UAAU,EACVC,aAAa,EAgBd,CAAE;QACD,IAAI,CAACC,MAAM,GAAGE,cAAchB,kBAAkBiB,IAAI;QAClD,IAAI,CAAChB,iBAAiB,GAAGA;QACzB,IAAI,CAACI,YAAY,GAAGA;QACpB,IAAI,CAACC,kBAAkB,GAAGA;QAC1B,IAAI,CAACF,cAAc,GAAGA;QACtB,IAAI,CAACF,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,sBAAsB,GAAGA;QAC9B,IAAI,CAACI,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,UAAU,GAAGA;QAClB,IAAI,CAACC,eAAe,GAAGA;QACvB,IAAI,CAACC,eAAe,GAAGA;QACvB,IAAI,CAACC,qBAAqB,GAAGA;QAC7B,IAAI,CAACC,UAAU,GAAGA;QAClB,IAAI,CAACC,aAAa,GAAGA;IACvB;IAEA,MAEMK,KAAKC,GAAY,EAAEC,GAAa,EAAE;QACtCA,IAAIC,IAAI,CAAC,MAAM,IAAI,CAAChB,YAAY,CAACiB,kBAAkB,CAAC;IACtD;IAEA,MAEMC,OAAOJ,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAMI,aAAaL,IAAIM,IAAI;QAC3B,IAAIN,IAAIO,KAAK,CAACC,SAAS,KAAK,QAAQ;YAClC,MAAM,IAAI,CAACC,sBAAsB,CAACJ;QACpC;QAGA,MAAMK,iBAAiB,MAAM,IAAI,CAACzB,cAAc,CAACmB,MAAM,CAACC;QACxDJ,IAAIC,IAAI,CAAC,MAAM,IAAI,CAAChB,YAAY,CAACyB,4BAA4B,CAACD,eAAeE,EAAE;IACjF;IAEA,MAEMC,YAAYb,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAMa,eAAe,MAAM,IAAI,CAAC7B,cAAc,CAAC8B,WAAW,CAACf,IAAIM,IAAI;QACnEL,IAAIC,IAAI,CAACY;IACX;IAKA,MAEME,cAAchB,GAAY,EAAEC,GAAa,EAAE;QAC/C,MAAMgB,aAAa,IAAI,CAACzB,qBAAqB,CAAC0B,QAAQ;QACtDjB,IAAIC,IAAI,CAACe;IACX;IAEA,MAEME,WAAWnB,GAAY,EAAEC,GAAa,EAAE;QAC5C,MAAM,EAAEmB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACrB;QAC9CC,IAAIC,IAAI,CAAC,MAAM,IAAI,CAAChB,YAAY,CAACyB,4BAA4B,CAACS;IAChE;IAEA,MAEME,qBAAqBtB,GAAY,EAAEC,GAAa,EAAE;QACtD,MAAM,EAAEmB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACrB;QAC9CC,IAAIC,IAAI,CAAC,MAAM,IAAI,CAACf,kBAAkB,CAACoC,sBAAsB,CAACH;IAChE;IAEA,MAEMI,OAAOxB,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAMO,YAAYR,IAAIO,KAAK,CAACC,SAAS,KAAK;QAG1C,MAAM,EAAEY,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACrB;QAC9C,MAAMyB,iBAAiBzB,IAAIM,IAAI;QAC/B,IAAI,CAACE,WAAW;YACd,MAAM,IAAI,CAACC,sBAAsB,CAACgB;QACpC;QAEA,MAAM,IAAI,CAACxC,cAAc,CAACuC,MAAM,CAACJ,kBAAkBK;QACnDxB,IAAIC,IAAI,CAAC,MAAM,IAAI,CAAChB,YAAY,CAACyB,4BAA4B,CAACS;IAChE;IAEA,MAEMM,OAAO1B,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAM,EAAEmB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACrB;QAC9C,MAAM2B,SAAS,MAAM,IAAI,CAAC1C,cAAc,CAACyC,MAAM,CAACN;QAChD,MAAM,IAAI,CAAC3B,UAAU,CAACmC,yBAAyB,CAACR;QAChDnB,IAAIC,IAAI,CAACyB;IACX;IAEA,MAEME,cAAc7B,GAAY,EAAEC,GAAa,EAAE;QAC/C,MAAM,EAAEmB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACrB;QAC9C,MAAM8B,OAAO,MAAMC,IAAAA,8BAAkB,EAAC/B,KAAKgC,qDAAwB;QACnE,MAAM,IAAI,CAAC/C,cAAc,CAAC4C,aAAa,CAACT,kBAAkBU,KAAKG,OAAO;QACtEhC,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMgC,4BAA4BlC,GAAY,EAAEC,GAAa,EAAE;QAC7D,MAAM,EAAEmB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACrB;QAC9C,MAAM8B,OAAO,MAAMC,IAAAA,8BAAkB,EAAC/B,KAAKmC,6DAAgC;QAC3E,MAAM,IAAI,CAAClD,cAAc,CAACmD,oBAAoB,CAAChB,kBAAkBU,KAAKO,cAAc;QACpFpC,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMoC,yBAAyBtC,GAAY,EAAEC,GAAa,EAAE;QAC1D,MAAM,EAAEmB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACrB;QAC9C,MAAMuC,YAAY,MAAMR,IAAAA,8BAAkB,EAAC/B,KAAKwC,gEAAmC;QAEnF,IAAIxC,IAAIO,KAAK,CAACC,SAAS,KAAK,QAAQ;YAClC,MAAM,IAAI,CAACC,sBAAsB,CAAC8B;QACpC;QAEA,MAAME,YAAY,MAAM,IAAI,CAACxD,cAAc,CAACqD,wBAAwB,CAAClB,kBAAkBmB;QACvFtC,IAAIC,IAAI,CAAC;YACPwC,YAAYD,UAAUC,UAAU;YAChCC,QAAQF,UAAUE,MAAM;YACxBC,aAAaH,UAAUG,WAAW;QACpC;IACF;IAEA,MAEMC,qBAAqB7C,GAAY,EAAEC,GAAa,EAAE;QACtD,MAAM,EAAEmB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACrB;QAC9C,IAAI,CAACjB,kBAAkB,CAAC+D,kBAAkB,CAAC1B;QAC3C,MAAM,IAAI,CAACjC,kBAAkB,CAAC4D,yBAAyB,CAAC3B;QACxDnB,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEM8C,eAAehD,GAAY,EAAEC,GAAa,EAAE;QAChD,IAAID,IAAIM,IAAI,CAACoC,UAAU,EAAEO,QAAQ;YAC/BjD,IAAIM,IAAI,CAACoC,UAAU,GAAGQ,IAAAA,kCAAwB,EAAClD,IAAIM,IAAI,CAACoC,UAAU;QACpE;QACA,MAAMrC,aAAa,MAAM0B,IAAAA,8BAAkB,EAAC/B,KAAKmD,gDAAmB;QACpE9C,WAAW+C,gBAAgB,GAAGC,IAAAA,8CAAwB;QACtD,IAAI,CAAC1D,MAAM,CAAC2D,GAAG,CAAC,CAAC,uCAAuC,EAAEjD,WAAW+C,gBAAgB,EAAE;QAGvF,IAAI;YACF,MAAM,IAAI,CAACpE,sBAAsB,CAACuE,gBAAgB,CAAClD;QACrD,EAAE,OAAOmD,GAAG;YACVvD,IAAIC,IAAI,CAAC;gBAAEkD,kBAAkB/C,WAAW+C,gBAAgB;gBAAEK,SAAS;gBAAMC,OAAOF,EAAEG,QAAQ;YAAG;YAC7F;QACF;QACA1D,IAAIC,IAAI,CAAC;YAAEkD,kBAAkB/C,WAAW+C,gBAAgB;QAAC;IAC3D;IAEA,MAEMQ,uBAAuB5D,GAAY,EAAEC,GAAa,EAAE;QACxD,MAAM,EAAE4D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACrB;QAC1CC,IAAIC,IAAI,CAAC2D;IACX;IAEA,MAEMC,yBAAyB9D,GAAY,EAAEC,GAAa,EAAE;QAC1D,MAAM,IAAI,CAACZ,UAAU,CAAC0E,OAAO;QAC7B9D,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEM8D,4BAA4BhE,GAAY,EAAEC,GAAa,EAAE;QAC7D,MAAM,IAAI,CAACZ,UAAU,CAAC4E,UAAU;QAChChE,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAGMgE,cAAclE,GAAY,EAAEC,GAAa,EAAE;QAC/C,MAAM,IAAI,CAACZ,UAAU,CAAC6E,aAAa,CAAClE,IAAIM,IAAI;QAC5CL,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMiE,SAASnE,GAAY,EAAEC,GAAa,EAAE;QAC1C,MAAM,IAAI,CAACZ,UAAU,CAAC8E,QAAQ,CAACnE,IAAIM,IAAI;QACvCL,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMkE,WAAWpE,GAAY,EAAEC,GAAa,EAAE;QAC5C,MAAM,IAAI,CAACZ,UAAU,CAAC+E,UAAU;QAChCnE,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMmE,YAAYrE,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAM,IAAI,CAACZ,UAAU,CAACgF,WAAW;QACjCpE,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAGMoE,YAAYtE,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAM,IAAI,CAACZ,UAAU,CAACiF,WAAW;QACjCrE,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAGMqE,cAAcvE,GAAY,EAAEC,GAAa,EAAE;QAC/C,MAAM,IAAI,CAACZ,UAAU,CAACkF,aAAa;QACnCtE,IAAIC,IAAI;IACV;IAEA,MAAcO,uBAAuB+D,aAAuB,EAAE;QAC5D,MAAMC,IAAAA,yBAAa,EAACD,eAAehC,gEAAmC;QACtE,IAAI;YACF,IAAI,IAAI,CAACnD,UAAU,EAAE;gBACnB,MAAM,IAAI,CAACA,UAAU,CAACqF,UAAU;YAClC,OAAO;gBACL,MAAMrF,aAAa,IAAI,CAACP,iBAAiB,CAACuC,gBAAgB,CAACmD;gBAC3D,MAAMnF,WAAWqF,UAAU;YAC7B;QACF,EAAE,OAAOlB,GAAG;YACV,IAAI,CAAC7D,MAAM,CAAC2D,GAAG,CAAC;YAEhB,IAAIE,aAAamB,iBAAU,EAAE;gBAC3B,IAAI,CAAChF,MAAM,CAACiF,KAAK,CAACpB,EAAEqB,OAAO,GAAG,MAAMrB,EAAEsB,MAAM,GAAG,MAAMtB,EAAEuB,QAAQ,EAAED;gBACjE,OAAQtB,EAAEuB,QAAQ,EAAED;oBAClB,KAAK;wBAEH;oBACF,KAAK;oBACL,KAAK;wBAAK;4BACR,MAAM,IAAIE,oDAAyB,CAAC,yBAAyBxB,EAAEuB,QAAQ,EAAED;wBAC3E;oBACA,KAAK;oBACL,KAAK;oBACL,KAAK;wBAAK;4BACR,MAAM,IAAIE,oDAAyB,CAAC,+BAA+BxB,EAAEuB,QAAQ,EAAED;wBACjF;oBACA;wBAAS;4BACP,IAAI,CAACtB,EAAEuB,QAAQ,EAAED,QAAQ;gCAKvB,MAAM,IAAIE,oDAAyB,CAAC,CAAC,qDAAqD,EAAExB,EAAEyB,IAAI,CAAC,CAAC,CAAC;4BACvG,OAAO;gCACL,MAAM,IAAID,oDAAyB,CACjC,CAAC,kDAAkD,EAAExB,EAAEyB,IAAI,CAAC,CAAC,CAAC,EAC9DzB,EAAEuB,QAAQ,EAAED;4BAEhB;wBACF;gBACF;YACF;YAEA,MAAM,IAAII,0CAAuB,CAAC,CAAC,gDAAgD,CAAC,EAAE,AAAC1B,EAAY2B,KAAK;QAC1G;IACF;IAEA,MAEMC,YAAYpF,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAM,EAAEmB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACrB;QAC9C,MAAM8B,OAAO,MAAMC,IAAAA,8BAAkB,EAAC/B,KAAKqF,0CAAa;QAExD,MAAM,IAAI,CAACpG,cAAc,CAACqG,cAAc,CAAClE,kBAAkBU,KAAKyD,QAAQ;QACxEtF,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMsF,YAAYxF,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAM,EAAEmB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACrB;QAC9C,MAAM8B,OAAO,MAAMC,IAAAA,8BAAkB,EAAC/B,KAAKyF,0CAAa;QACxD,MAAM,IAAI,CAACxG,cAAc,CAACyG,cAAc,CAACtE,kBAAkBU,KAAK6D,QAAQ;QACxE1F,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEM0F,qBAAqB5F,GAAY,EAAEC,GAAa,EAAE;QAEtD,MAAM,EAAE4D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACrB;QAC1C,MAAMiB,aAAa,MAAM,IAAI,CAAC3B,eAAe,CAACuG,uBAAuB,CAAChC;QACtE5D,IAAIC,IAAI,CAACe;IACX;IAEA,MAEM6E,2BAA2B9F,GAAY,EAAEC,GAAa,EAAE;QAC5D,MAAM,EAAE4D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACrB;QAC1C,MAAM+F,iBAAiB,MAAM,IAAI,CAACzG,eAAe,CAAC0G,iBAAiB,CAACnC;QACpE5D,IAAIC,IAAI,CAAC6F;IACX;IAEA,MAEME,qBAAqBjG,GAAY,EAAEC,GAAa,EAAE;QACtD,MAAM,EAAE4D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACrB;QAC1C,MAAM+F,iBAAiB,MAAM,IAAI,CAACzG,eAAe,CAAC4G,UAAU,CAACrC;QAC7D5D,IAAIC,IAAI,CAAC6F;IACX;IAEA,MAEMI,sBAAsBnG,GAAY,EAAEC,GAAa,EAAE;QACvD,MAAM,EAAE4D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACrB;QAC1C,MAAM,EAAEoG,OAAO,EAAE,GAAG,MAAMrE,IAAAA,8BAAkB,EAAC/B,KAAKqG,uDAA0B;QAC5E,MAAMtB,WAAW,MAAM,IAAI,CAACzF,eAAe,CAACgH,YAAY,CAACzC,cAAcuC;QACvEnG,IAAIC,IAAI,CAAC6E;IACX;IAEA,MAEMwB,wBAAwBvG,GAAY,EAAEC,GAAa,EAAE;QACzD,MAAM,EAAE4D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACrB;QAC1C,MAAM,EAAEwG,QAAQ,EAAE,GAAG,MAAMzE,IAAAA,8BAAkB,EAAC/B,KAAKyG,oDAAuB;QAC1E,MAAMC,aAAa,MAAM,IAAI,CAACpH,eAAe,CAACqH,uBAAuB,CAAC9C,cAAc2C;QACpFE,WAAWE,IAAI,CAAC3G;IAClB;IAEA,MAEM4G,uBAAuB7G,GAAY,EAAEC,GAAa,EAAE;QACxD,MAAM,EAAE4D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACrB;QAC1C,MAAM8G,QAAQ,MAAM,IAAI,CAACpH,aAAa,CAACqH,mBAAmB,CAAC/G,KAAKC,KAAK,MAAM;QAC3E,MAAM8E,WAAW,MAAM,IAAI,CAACzF,eAAe,CAAC0H,8BAA8B,CAACnD,cAAciD,KAAK,CAAC,EAAE,CAACG,MAAM;QACxGhH,IAAIC,IAAI,CAAC6E,SAASjD,IAAI;IACxB;IAEA,MAEMoF,sBAAsBlH,GAAY,EAAEC,GAAa,EAAE;QACvD,MAAM,EAAE4D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACrB;QAC1C,MAAM,EAAEwG,QAAQ,EAAE,GAAG,MAAMzE,IAAAA,8BAAkB,EAAC/B,KAAKyG,oDAAuB;QAC1E,MAAM1B,WAAW,MAAM,IAAI,CAACzF,eAAe,CAAC6H,YAAY,CAACtD,cAAc2C;QACvEvG,IAAIC,IAAI,CAAC6E;IACX;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BA9YOqC,6BAAY,CAACC,QAAQ,GAAG;;QACtBC,IAAAA,0BAAY;QAAIC,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,QAAQ;YAAED,6BAAK,CAACE,KAAK;SAAC;QAAGC,IAAAA,iCAAwB"}
|
|
@@ -31,13 +31,15 @@ class SettingsController {
|
|
|
31
31
|
printerService;
|
|
32
32
|
configService;
|
|
33
33
|
serverVersion;
|
|
34
|
-
|
|
34
|
+
printerThumbnailCache;
|
|
35
|
+
constructor({ settingsStore, printerCache, printerService, serverVersion, loggerFactory, configService, printerThumbnailCache }){
|
|
35
36
|
this.settingsStore = settingsStore;
|
|
36
37
|
this.logger = loggerFactory(SettingsController.name);
|
|
37
38
|
this.serverVersion = serverVersion;
|
|
38
39
|
this.configService = configService;
|
|
39
40
|
this.printerCache = printerCache;
|
|
40
41
|
this.printerService = printerService;
|
|
42
|
+
this.printerThumbnailCache = printerThumbnailCache;
|
|
41
43
|
}
|
|
42
44
|
getSettings(req, res) {
|
|
43
45
|
let connection;
|
|
@@ -76,6 +78,16 @@ class SettingsController {
|
|
|
76
78
|
}
|
|
77
79
|
res.send(result);
|
|
78
80
|
}
|
|
81
|
+
async updateThumbnailSupport(req, res) {
|
|
82
|
+
const { enabled } = await (0, _validators.validateInput)(req.body, _settingsservicevalidation.thumbnailSupportRules);
|
|
83
|
+
const result = await this.settingsStore.setExperimentalThumbnailSupport(enabled);
|
|
84
|
+
if (enabled) {
|
|
85
|
+
await this.printerThumbnailCache.loadCache();
|
|
86
|
+
} else {
|
|
87
|
+
await this.printerThumbnailCache.resetCache();
|
|
88
|
+
}
|
|
89
|
+
res.send(result);
|
|
90
|
+
}
|
|
79
91
|
async updateClientSupport(req, res) {
|
|
80
92
|
const { enabled } = await (0, _validators.validateInput)(req.body, _settingsservicevalidation.clientNextRules);
|
|
81
93
|
const result = await this.settingsStore.setExperimentalClientSupport(enabled);
|
|
@@ -137,6 +149,13 @@ const _default = (0, _awilixexpress.createController)(SettingsController).prefix
|
|
|
137
149
|
]),
|
|
138
150
|
_demomiddleware.demoUserNotAllowed
|
|
139
151
|
]
|
|
152
|
+
}).put("/experimental-thumbnail-support", "updateThumbnailSupport", {
|
|
153
|
+
before: [
|
|
154
|
+
(0, _authenticate.authorizeRoles)([
|
|
155
|
+
_authorizationconstants.ROLES.ADMIN
|
|
156
|
+
]),
|
|
157
|
+
_demomiddleware.demoUserNotAllowed
|
|
158
|
+
]
|
|
140
159
|
}).put("/experimental-client-support", "updateClientSupport", {
|
|
141
160
|
before: [
|
|
142
161
|
(0, _authenticate.authorizeRoles)([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/settings.controller.ts"],"names":["SettingsController","settingsStore","logger","printerCache","printerService","configService","serverVersion","constructor","loggerFactory","name","getSettings","req","res","connection","clientIp","socket","remoteAddress","version","e","warn","settings","send","getSettingsSensitive","updateSentryDiagnosticsEnabled","enabled","validateInput","body","sentryDiagnosticsEnabledRules","result","setSentryDiagnosticsEnabled","updateMoonrakerSupport","moonrakerSupportRules","setExperimentalMoonrakerSupport","printers","listCachedPrinters","klipperPrinters","filter","p","printerType","MoonrakerType","printer","updateEnabled","id","updateClientSupport","clientNextRules","setExperimentalClientSupport","updateFrontendSettings","validatedInput","frontendSettingsUpdateRules","updateServerSettings","serverSettingsUpdateRules","updateLoginRequiredSettings","loginRequired","setLoginRequired","updateRegistrationEnabledSettings","registrationEnabled","setRegistrationEnabled","updateCredentialSettings","credentialSettingPatchRules","updateFileCleanSettings","fileCleanSettingsUpdateRules","patchFileCleanSettings","updateTimeoutSettings","timeoutSettingsUpdateRules","createController","prefix","AppConstants","apiRoute","before","authenticate","get","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","patch","demoUserNotAllowedInterceptor","put"],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/settings.controller.ts"],"names":["SettingsController","settingsStore","logger","printerCache","printerService","configService","serverVersion","printerThumbnailCache","constructor","loggerFactory","name","getSettings","req","res","connection","clientIp","socket","remoteAddress","version","e","warn","settings","send","getSettingsSensitive","updateSentryDiagnosticsEnabled","enabled","validateInput","body","sentryDiagnosticsEnabledRules","result","setSentryDiagnosticsEnabled","updateMoonrakerSupport","moonrakerSupportRules","setExperimentalMoonrakerSupport","printers","listCachedPrinters","klipperPrinters","filter","p","printerType","MoonrakerType","printer","updateEnabled","id","updateThumbnailSupport","thumbnailSupportRules","setExperimentalThumbnailSupport","loadCache","resetCache","updateClientSupport","clientNextRules","setExperimentalClientSupport","updateFrontendSettings","validatedInput","frontendSettingsUpdateRules","updateServerSettings","serverSettingsUpdateRules","updateLoginRequiredSettings","loginRequired","setLoginRequired","updateRegistrationEnabledSettings","registrationEnabled","setRegistrationEnabled","updateCredentialSettings","credentialSettingPatchRules","updateFileCleanSettings","fileCleanSettingsUpdateRules","patchFileCleanSettings","updateTimeoutSettings","timeoutSettingsUpdateRules","createController","prefix","AppConstants","apiRoute","before","authenticate","get","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","patch","demoUserNotAllowedInterceptor","put"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/entities/settings.entity.ts"],"names":["Settings","serverSettingsKey","credentialSettingsKey","wizardSettingKey","printerFileCleanSettingKey","frontendSettingKey","timeoutSettingKey","BaseEntity","id","type","nullable"],"mappings":";;;;+BAYaA;;;eAAAA;;;yCALN;yBACgD;4BAC5B;;;;;;;;;;IAQzB,
|
|
1
|
+
{"version":3,"sources":["../../src/entities/settings.entity.ts"],"names":["Settings","serverSettingsKey","credentialSettingsKey","wizardSettingKey","printerFileCleanSettingKey","frontendSettingKey","timeoutSettingKey","BaseEntity","id","type","nullable"],"mappings":";;;;+BAYaA;;;eAAAA;;;yCALN;yBACgD;4BAC5B;;;;;;;;;;IAQzB,MAkBA,OAQA,OAOA,OAOA,OAQA;AAhDA,OAACC,0CAAiB;AAkBlB,QAACC,8CAAqB;AAQtB,QAACC,yCAAgB;AAOjB,QAACC,mDAA0B;AAO3B,QAACC,2CAAkB;AAQnB,QAACC,0CAAiB;AArDb,MAAMN,iBAAiBO,sBAAU;IAEtCC,GAAY;IAGZ,CAAA,KAAmB,CAejB;IAGF,CAAA,MAAuB,CAKrB;IAGF,CAAA,MAAkB,CAIhB;IAGF,CAAA,MAA4B,CAI1B;IAGF,CAAA,MAAoB,CAKlB;IAGF,CAAA,MAAmB,CAEjB;AACJ;;;;;;;QApDYC,MAAM;QAAeC,UAAU;;;uBACzC;;;QAiBUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAOUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAOUD,MAAM;QAAeC,UAAU;;;uBACzC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/middleware/printer.ts"],"names":["currentPrinterToken","printerApiToken","printerIdToken","printerLoginToken","printerResolveMiddleware","key","req","res","next","printerCache","container","resolve","DITokens","settingsService","settingsStore","moonrakerEnabled","getServerSettings","experimentalMoonrakerSupport","scopedPrinter","undefined","loginDto","printerId","params","getCachedPrinterOrThrow","getLoginDto","register","asValue","octoprintApiInstance","octoprintApi","printerType","OctoprintType","MoonrakerType","moonrakerInstance","moonrakerApi"],"mappings":";;;;;;;;;;;IAWaA,mBAAmB;eAAnBA;;IADAC,eAAe;eAAfA;;IADAC,cAAc;eAAdA;;IAGAC,iBAAiB;eAAjBA;;IAEAC,wBAAwB;eAAxBA;;;
|
|
1
|
+
{"version":3,"sources":["../../src/middleware/printer.ts"],"names":["currentPrinterToken","printerApiToken","printerIdToken","printerLoginToken","printerResolveMiddleware","key","req","res","next","printerCache","container","resolve","DITokens","settingsService","settingsStore","moonrakerEnabled","getServerSettings","experimentalMoonrakerSupport","scopedPrinter","undefined","loginDto","printerId","params","getCachedPrinterOrThrow","getLoginDto","register","asValue","octoprintApiInstance","octoprintApi","printerType","OctoprintType","MoonrakerType","moonrakerInstance","moonrakerApi"],"mappings":";;;;;;;;;;;IAWaA,mBAAmB;eAAnBA;;IADAC,eAAe;eAAfA;;IADAC,cAAc;eAAdA;;IAGAC,iBAAiB;eAAjBA;;IAEAC,wBAAwB;eAAxBA;;;wBAdW;iCACC;qCAIoB;AAItC,MAAMF,iBAAiB;AACvB,MAAMD,kBAAkB;AACxB,MAAMD,sBAAsB;AAC5B,MAAMG,oBAAoB;AAE1B,MAAMC,2BAA2B,CAACC,MAAM,IAAI;IACjD,OAAO,CAACC,KAAcC,KAAeC;QACnC,MAAMC,eAAeH,IAAII,SAAS,CAACC,OAAO,CAAeC,yBAAQ,CAACH,YAAY;QAC9E,MAAMI,kBAAkBP,IAAII,SAAS,CAACC,OAAO,CAAMC,yBAAQ,CAACE,aAAa;QACzE,MAAMC,mBAAmBF,gBAAgBG,iBAAiB,GAAGC,4BAA4B;QAEzF,IAAIC,gBAAgBC;QACpB,IAAIC,WAAWD;QAEf,MAAME,YAAYf,IAAIgB,MAAM,CAACjB,IAAI;QACjC,IAAIgB,WAAW;YACbH,gBAAgBT,aAAac,uBAAuB,CAACF;YACrDD,WAAWX,aAAae,WAAW,CAACH;YAEpCf,IAAII,SAAS,CAACe,QAAQ,CAAC;gBACrB,CAACzB,oBAAoB,EAAE0B,IAAAA,eAAO,EAACR;gBAC/B,CAACf,kBAAkB,EAAEuB,IAAAA,eAAO,EAACN;gBAC7B,CAAClB,eAAe,EAAEwB,IAAAA,eAAO,EAACL;YAC5B;YAEA,MAAMM,uBAAuBrB,IAAII,SAAS,CAACC,OAAO,CAAeC,yBAAQ,CAACgB,YAAY;YACtF,OAAQV,cAAcW,WAAW;gBAC/B,KAAKC,kCAAa;oBAChBxB,IAAII,SAAS,CAACe,QAAQ,CAAC;wBACrB,CAACxB,gBAAgB,EAAEyB,IAAAA,eAAO,EAACC;oBAC7B;oBACA;gBACF,KAAKI,kCAAa;oBAChB,MAAMC,oBAAoB1B,IAAII,SAAS,CAACC,OAAO,CAAeC,yBAAQ,CAACqB,YAAY;oBACnF3B,IAAII,SAAS,CAACe,QAAQ,CAAC;wBACrB,CAACxB,gBAAgB,EAAEc,mBAAmBW,IAAAA,eAAO,EAACM,qBAAqBN,IAAAA,eAAO,EAACP;oBAC7E;oBACA;YACJ;QACF,OAAO;YACLb,IAAII,SAAS,CAACe,QAAQ,CAAC;gBACrB,CAACzB,oBAAoB,EAAE0B,IAAAA,eAAO,EAACP;gBAC/B,CAAChB,kBAAkB,EAAEuB,IAAAA,eAAO,EAACP;gBAC7B,CAACjB,eAAe,EAAEwB,IAAAA,eAAO,EAACP;gBAC1B,CAAClB,gBAAgB,EAAEyB,IAAAA,eAAO,EAACP;YAC7B;QACF;QAEAX;IACF;AACF"}
|
package/dist/models/Settings.js
CHANGED
|
@@ -135,6 +135,11 @@ const SettingsSchema = new _mongoose.Schema({
|
|
|
135
135
|
type: Boolean,
|
|
136
136
|
default: false,
|
|
137
137
|
required: true
|
|
138
|
+
},
|
|
139
|
+
experimentalThumbnailSupport: {
|
|
140
|
+
type: Boolean,
|
|
141
|
+
default: false,
|
|
142
|
+
required: true
|
|
138
143
|
}
|
|
139
144
|
},
|
|
140
145
|
[_serversettingsconstants.frontendSettingKey]: {
|
|
@@ -152,6 +157,11 @@ const SettingsSchema = new _mongoose.Schema({
|
|
|
152
157
|
type: Boolean,
|
|
153
158
|
default: false,
|
|
154
159
|
required: false
|
|
160
|
+
},
|
|
161
|
+
tilePreferCancelOverQuickStop: {
|
|
162
|
+
type: Boolean,
|
|
163
|
+
default: false,
|
|
164
|
+
required: false
|
|
155
165
|
}
|
|
156
166
|
},
|
|
157
167
|
[_serversettingsconstants.timeoutSettingKey]: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/models/Settings.ts"],"names":["Settings","SettingsSchema","Schema","wizardSettingKey","wizardCompleted","type","Boolean","default","required","wizardCompletedAt","Date","wizardVersion","Number","printerFileCleanSettingKey","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","credentialSettingsKey","jwtSecret","String","minlength","trim","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","createdAt","now","updatedAt","serverSettingsKey","sentryDiagnosticsEnabled","debugSettings","debugSocketIoEvents","debugSocketReconnect","debugSocketRetries","debugSocketSetup","debugSocketMessages","debugSocketIoBandwidth","loginRequired","registration","experimentalMoonrakerSupport","experimentalClientSupport","frontendSettingKey","gridCols","gridRows","largeTiles","timeoutSettingKey","apiTimeout","model"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../src/models/Settings.ts"],"names":["Settings","SettingsSchema","Schema","wizardSettingKey","wizardCompleted","type","Boolean","default","required","wizardCompletedAt","Date","wizardVersion","Number","printerFileCleanSettingKey","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","credentialSettingsKey","jwtSecret","String","minlength","trim","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","createdAt","now","updatedAt","serverSettingsKey","sentryDiagnosticsEnabled","debugSettings","debugSocketIoEvents","debugSocketReconnect","debugSocketRetries","debugSocketSetup","debugSocketMessages","debugSocketIoBandwidth","loginRequired","registration","experimentalMoonrakerSupport","experimentalClientSupport","experimentalThumbnailSupport","frontendSettingKey","gridCols","gridRows","largeTiles","tilePreferCancelOverQuickStop","timeoutSettingKey","apiTimeout","model"],"mappings":";;;;+BAyOaA;;;eAAAA;;;0BAzOiB;yCAQvB;AA8DP,MAAMC,iBAAiB,IAAIC,gBAAM,CAAY;IAC3C,CAACC,yCAAgB,CAAC,EAAE;QAClBC,iBAAiB;YACfC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAC,mBAAmB;YACjBJ,MAAMK;YACNH,SAAS;YACTC,UAAU;QACZ;QACAG,eAAe;YACbN,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACK,mDAA0B,CAAC,EAAE;QAC5BC,gCAAgC;YAC9BT,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAO,0BAA0B;YACxBV,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAQ,iCAAiC;YAC/BX,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACS,8CAAqB,CAAC,EAAE;QACvBZ,MAAM;YACJa,WAAW;gBACTb,MAAMc;gBACNC,WAAW;gBACXC,MAAM;gBACNb,UAAU;YACZ;YACAc,cAAc;gBACZjB,MAAMO;gBACNJ,UAAU;YACZ;YACAe,sBAAsB;gBACpBlB,MAAMO;gBACNJ,UAAU;YACZ;YACAgB,oBAAoB;gBAClBnB,MAAMO;gBACNJ,UAAU;YACZ;YACAiB,WAAW;gBACTpB,MAAMK;gBACNH,SAASG,KAAKgB,GAAG;gBACjBlB,UAAU;YACZ;YACAmB,WAAW;gBACTtB,MAAMK;gBACNH,SAASG,KAAKgB,GAAG;gBACjBlB,UAAU;YACZ;QACF;QACAA,UAAU;IACZ;IACA,CAACoB,0CAAiB,CAAC,EAAE;QACnBC,0BAA0B;YACxBxB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAsB,eAAe;YACbC,qBAAqB;gBACnB1B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACAwB,sBAAsB;gBACpB3B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACAyB,oBAAoB;gBAClB5B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA0B,kBAAkB;gBAChB7B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA2B,qBAAqB;gBACnB9B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA4B,wBAAwB;gBACtB/B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;QACF;QACA6B,eAAe;YACbhC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACA8B,cAAc;YACZjC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACA+B,8BAA8B;YAC5BlC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAgC,2BAA2B;YACzBnC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAiC,8BAA8B;YAC5BpC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACkC,2CAAkB,CAAC,EAAE;QACpBC,UAAU;YACRtC,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACAoC,UAAU;YACRvC,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACAqC,YAAY;YACVxC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAsC,+BAA+B;YAC7BzC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACuC,0CAAiB,CAAC,EAAE;QACnBC,YAAY;YACV3C,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;AACF;AAEO,MAAMR,WAAWiD,IAAAA,eAAK,EAAC,kBAAkBhD"}
|
package/dist/server.constants.js
CHANGED
|
@@ -23,6 +23,12 @@ const AppConstants = {
|
|
|
23
23
|
defaultLogZipsFolder: "./media/log-zips",
|
|
24
24
|
defaultClientBundleStorage: "./media/client-dist",
|
|
25
25
|
defaultClientBundleZipsStorage: "./media/client-dist-zips",
|
|
26
|
+
defaultPrinterThumbnailsStorage: "./media/printer-thumbnails",
|
|
27
|
+
defaultFileUploadsStorage: "./media/file-uploads",
|
|
28
|
+
defaultAcceptedGcodeExtensions: [
|
|
29
|
+
".gcode",
|
|
30
|
+
".bgcode"
|
|
31
|
+
],
|
|
26
32
|
defaultServerPort: 4000,
|
|
27
33
|
defaultMongoStringUnauthenticated: "mongodb://127.0.0.1:27017/fdm-monster",
|
|
28
34
|
apiRoute: "/api",
|
|
@@ -65,7 +71,7 @@ const AppConstants = {
|
|
|
65
71
|
githubUrl: "https://github.com/fdm-monster/fdm-monster",
|
|
66
72
|
orgName: "fdm-monster",
|
|
67
73
|
currentWizardVersion: 1,
|
|
68
|
-
defaultClientMinimum: "1.
|
|
74
|
+
defaultClientMinimum: "1.8.0",
|
|
69
75
|
influxUrl: "INFLUX_URL",
|
|
70
76
|
influxToken: "INFLUX_TOKEN",
|
|
71
77
|
influxOrg: "INFLUX_ORG",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NON_NPM_MODE_KEY","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","serverRepoName","clientPackageName","clientRepoName","clientNextPackageName","clientNextRepoName","githubUrl","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,kBAAkB;IAClBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,WAAW;IACXC,eAAe;IACfC,eAAe;IAEfC,gBAAgB;IAChBC,YAAY;IAGZC,0BAA0B;IAC1BC,mBAAmB;IACnBC,sBAAsB;IAEtBC,4BAA4B;IAC5BC,gCAAgC;IAChCC,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,yBAAyB;IAEzBC,+BAA+B;IAE/BC,yBAAyB;IAEzBC,yBAAyB;IAEzBC,qBAAqB;IAErBC,yBAAyB;IACzBC,wBAAwB,KAAK;IAE7BC,gCAAgC,CAAC;IAEjCC,8BAA8B,KAAK,KAAK,KAAK;IAE7CC,qBAAqB;IACrBC,oBAAoB;IAEpBC,uBAAuB;IACvBC,sBAAsB;IAEtBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,oBAAoB;IACpBC,mBAAmB;IAEnBC,uBAAuB;IACvBC,gBAAgB;IAChBC,sBAAsB;IACtBC,eAAe;QAAC;QAAe;QAAc;KAAO;IACpDC,YAAY;IACZC,mBAAmB;IACnBC,gBAAgB;IAChBC,mBAAmB;IACnBC,gBAAgB;IAChBC,uBAAuB;IACvBC,oBAAoB;IACpBC,WAAW;IACXC,SAAS;IAETC,sBAAsB;IACtBC,sBAAsB;IAEtBC,WAAW;IACXC,aAAa;IACbC,WAAW;IACXC,cAAc;IAGdC,kCAAkC;IAClCC,2BAA2B;IAC3BC,sBAAsB;IACtBC,0BAA0B;IAC1BC,gCAAgC;IAChCC,oCAAoC;IAGpCC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAGnBC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBAAwB;IAExBC,gBAAgB;IAEhBC,6BAA6B;IAC7BC,kCAAkC;AACpC"}
|
|
1
|
+
{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NON_NPM_MODE_KEY","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultPrinterThumbnailsStorage","defaultFileUploadsStorage","defaultAcceptedGcodeExtensions","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","serverRepoName","clientPackageName","clientRepoName","clientNextPackageName","clientNextRepoName","githubUrl","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,kBAAkB;IAClBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,WAAW;IACXC,eAAe;IACfC,eAAe;IAEfC,gBAAgB;IAChBC,YAAY;IAGZC,0BAA0B;IAC1BC,mBAAmB;IACnBC,sBAAsB;IAEtBC,4BAA4B;IAC5BC,gCAAgC;IAChCC,iCAAiC;IACjCC,2BAA2B;IAC3BC,gCAAgC;QAAC;QAAU;KAAU;IACrDC,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,yBAAyB;IAEzBC,+BAA+B;IAE/BC,yBAAyB;IAEzBC,yBAAyB;IAEzBC,qBAAqB;IAErBC,yBAAyB;IACzBC,wBAAwB,KAAK;IAE7BC,gCAAgC,CAAC;IAEjCC,8BAA8B,KAAK,KAAK,KAAK;IAE7CC,qBAAqB;IACrBC,oBAAoB;IAEpBC,uBAAuB;IACvBC,sBAAsB;IAEtBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,oBAAoB;IACpBC,mBAAmB;IAEnBC,uBAAuB;IACvBC,gBAAgB;IAChBC,sBAAsB;IACtBC,eAAe;QAAC;QAAe;QAAc;KAAO;IACpDC,YAAY;IACZC,mBAAmB;IACnBC,gBAAgB;IAChBC,mBAAmB;IACnBC,gBAAgB;IAChBC,uBAAuB;IACvBC,oBAAoB;IACpBC,WAAW;IACXC,SAAS;IAETC,sBAAsB;IACtBC,sBAAsB;IAEtBC,WAAW;IACXC,aAAa;IACbC,WAAW;IACXC,cAAc;IAGdC,kCAAkC;IAClCC,2BAA2B;IAC3BC,sBAAsB;IACtBC,0BAA0B;IAC1BC,gCAAgC;IAChCC,oCAAoC;IAGpCC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAGnBC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBAAwB;IAExBC,gBAAgB;IAEhBC,6BAA6B;IAC7BC,kCAAkC;AACpC"}
|
|
@@ -72,29 +72,29 @@ class MulterService {
|
|
|
72
72
|
});
|
|
73
73
|
}
|
|
74
74
|
getMulterGCodeFileFilter(storeAsFile = true) {
|
|
75
|
-
return this.getMulterFileFilter(
|
|
75
|
+
return this.getMulterFileFilter(_serverconstants.AppConstants.defaultAcceptedGcodeExtensions, storeAsFile);
|
|
76
76
|
}
|
|
77
|
-
async multerLoadFileAsync(req, res,
|
|
78
|
-
return await new Promise((resolve, reject)=>this.getMulterFileFilter(
|
|
77
|
+
async multerLoadFileAsync(req, res, fileExtensions, storeAsFile = true) {
|
|
78
|
+
return await new Promise((resolve, reject)=>this.getMulterFileFilter(fileExtensions, storeAsFile)(req, res, (err)=>{
|
|
79
79
|
if (err) {
|
|
80
80
|
return reject(err);
|
|
81
81
|
}
|
|
82
82
|
resolve(req.files);
|
|
83
83
|
}));
|
|
84
84
|
}
|
|
85
|
-
getMulterFileFilter(
|
|
85
|
+
getMulterFileFilter(fileExtensions, storeAsFile = true) {
|
|
86
86
|
return (0, _multer.default)({
|
|
87
87
|
storage: storeAsFile ? _multer.default.diskStorage({
|
|
88
88
|
destination: (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder)
|
|
89
89
|
}) : _multer.default.memoryStorage(),
|
|
90
|
-
fileFilter: this.multerFileFilter(
|
|
90
|
+
fileFilter: this.multerFileFilter(fileExtensions)
|
|
91
91
|
}).any();
|
|
92
92
|
}
|
|
93
|
-
multerFileFilter(
|
|
93
|
+
multerFileFilter(extensions) {
|
|
94
94
|
return (req, file, callback)=>{
|
|
95
95
|
const ext = (0, _path.extname)(file.originalname);
|
|
96
|
-
if (
|
|
97
|
-
return callback(new Error(`Only files with
|
|
96
|
+
if (extensions?.length && !extensions.includes(ext?.toLowerCase())) {
|
|
97
|
+
return callback(new Error(`Only files with extensions ${extensions} are allowed`));
|
|
98
98
|
}
|
|
99
99
|
return callback(null, true);
|
|
100
100
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/multer.service.ts"],"names":["MulterService","fileUploadTrackerCache","httpClient","constructor","getNewestFile","collection","dirPath","collectionPath","files","orderRecentFiles","latestFile","length","undefined","join","file","clearUploadsFolder","fileStoragePath","superRootPath","AppConstants","defaultFileStorageFolder","existsSync","readdirSync","withFileTypes","filter","item","isDirectory","map","name","unlink","err","fileExists","downloadFilename","downloadPath","downloadFile","downloadUrl","downloadFolder","mkdirSync","recursive","fileStream","createWriteStream","res","get","Promise","resolve","reject","write","data","on","getMulterGCodeFileFilter","storeAsFile","getMulterFileFilter","multerLoadFileAsync","req","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/multer.service.ts"],"names":["MulterService","fileUploadTrackerCache","httpClient","constructor","getNewestFile","collection","dirPath","collectionPath","files","orderRecentFiles","latestFile","length","undefined","join","file","clearUploadsFolder","fileStoragePath","superRootPath","AppConstants","defaultFileStorageFolder","existsSync","readdirSync","withFileTypes","filter","item","isDirectory","map","name","unlink","err","fileExists","downloadFilename","downloadPath","downloadFile","downloadUrl","downloadFolder","mkdirSync","recursive","fileStream","createWriteStream","res","get","Promise","resolve","reject","write","data","on","getMulterGCodeFileFilter","storeAsFile","getMulterFileFilter","defaultAcceptedGcodeExtensions","multerLoadFileAsync","req","fileExtensions","multer","storage","diskStorage","destination","memoryStorage","fileFilter","multerFileFilter","any","extensions","callback","ext","extname","originalname","includes","toLowerCase","Error","startTrackingSession","multerFile","addUploadTracker","getSessions","getUploads","dir","lstatSync","isFile","mtime","sort","a","b","getTime"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/interfaces/settings.dto.ts"],"names":["SettingsDto","serverSettingsKey","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/settings.dto.ts"],"names":["SettingsDto","serverSettingsKey","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey"],"mappings":";;;;+BA0DaA;;;eAAAA;;;yCApDN;AAoDA,MAAMA;IACX,CAACC,0CAAiB,CAAC,CAAoB;IACvC,CAACC,yCAAgB,CAAC,CAAoB;IACtC,CAACC,2CAAkB,CAAC,CAAsB;IAE1C,CAACC,mDAA0B,CAAC,CAAuB;IACnD,CAACC,0CAAiB,CAAC,CAAqB;AAC1C"}
|