@fdm-monster/server 2.0.0 → 2.0.1
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/RELEASE_NOTES.MD +14 -0
- package/dist/constants/server-settings.constants.js +4 -2
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/controllers/file-storage.controller.js +90 -19
- package/dist/controllers/file-storage.controller.js.map +1 -1
- package/dist/controllers/settings.controller.js +70 -2
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/controllers/slicer-compat.controller.js +4 -0
- package/dist/controllers/slicer-compat.controller.js.map +1 -1
- package/dist/entities/settings.entity.js.map +1 -1
- package/dist/middleware/slicer-api-key.middleware.js +29 -0
- package/dist/middleware/slicer-api-key.middleware.js.map +1 -0
- package/dist/server.constants.js +1 -1
- package/dist/services/core/yaml.service.js +23 -3
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/file-storage.service.js +3 -2
- package/dist/services/file-storage.service.js.map +1 -1
- package/dist/services/orm/settings.service.js +9 -2
- package/dist/services/orm/settings.service.js.map +1 -1
- package/dist/services/validators/settings-service.validation.js +23 -4
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +2 -0
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/shared/runtime-settings.migration.js +10 -0
- package/dist/shared/runtime-settings.migration.js.map +1 -1
- package/dist/state/settings.store.js +38 -5
- package/dist/state/settings.store.js.map +1 -1
- package/package.json +4 -4
package/.yarn/install-state.gz
CHANGED
|
Binary file
|
package/RELEASE_NOTES.MD
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# Develop
|
|
2
2
|
|
|
3
|
+
# FDM Monster 2.0.1
|
|
4
|
+
|
|
5
|
+
## Feat
|
|
6
|
+
|
|
7
|
+
- Add grid sorting option frontend settings
|
|
8
|
+
- YAML export now includes credential settings (jwtExpiresIn, refreshTokenAttempts, refreshTokenExpiry, slicerApiKey)
|
|
9
|
+
- YAML import now properly imports credential settings including slicerApiKey
|
|
10
|
+
- Ability to analyze/re-analyze file from Files page upload
|
|
11
|
+
|
|
12
|
+
## Fixes
|
|
13
|
+
|
|
14
|
+
- YAML import restores credentials using sensitive settings method in SettingsStore
|
|
15
|
+
- YAML export would not export printer username and password
|
|
16
|
+
|
|
3
17
|
# FDM Monster 2.0.0
|
|
4
18
|
|
|
5
19
|
## Feat
|
|
@@ -64,14 +64,16 @@ const credentialSettingsKey = "credentials";
|
|
|
64
64
|
const getDefaultCredentialSettings = ()=>({
|
|
65
65
|
jwtExpiresIn: _serverconstants.AppConstants.DEFAULT_JWT_EXPIRES_IN,
|
|
66
66
|
refreshTokenAttempts: _serverconstants.AppConstants.DEFAULT_REFRESH_TOKEN_ATTEMPTS,
|
|
67
|
-
refreshTokenExpiry: _serverconstants.AppConstants.DEFAULT_REFRESH_TOKEN_EXPIRY
|
|
67
|
+
refreshTokenExpiry: _serverconstants.AppConstants.DEFAULT_REFRESH_TOKEN_EXPIRY,
|
|
68
|
+
slicerApiKey: null
|
|
68
69
|
});
|
|
69
70
|
const frontendSettingKey = "frontend";
|
|
70
71
|
const getDefaultFrontendSettings = ()=>({
|
|
71
72
|
gridCols: 4,
|
|
72
73
|
gridRows: 2,
|
|
73
74
|
largeTiles: false,
|
|
74
|
-
tilePreferCancelOverQuickStop: false
|
|
75
|
+
tilePreferCancelOverQuickStop: false,
|
|
76
|
+
gridNameSortDirection: 'horizontal'
|
|
75
77
|
});
|
|
76
78
|
const timeoutSettingKey = "timeout";
|
|
77
79
|
const getDefaultTimeout = ()=>({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/constants/server-settings.constants.ts"],"names":["credentialSettingsKey","frontendSettingKey","getDefaultCredentialSettings","getDefaultFrontendSettings","getDefaultServerSettings","getDefaultSettings","getDefaultTimeout","getDefaultWizardSettings","serverSettingsKey","timeoutSettingKey","wizardSettingKey","wizardCompleted","wizardCompletedAt","wizardVersion","sentryDiagnosticsEnabled","loginRequired","registration","experimentalMoonrakerSupport","experimentalBambuSupport","experimentalPrusaLinkSupport","jwtExpiresIn","AppConstants","DEFAULT_JWT_EXPIRES_IN","refreshTokenAttempts","DEFAULT_REFRESH_TOKEN_ATTEMPTS","refreshTokenExpiry","DEFAULT_REFRESH_TOKEN_EXPIRY","gridCols","gridRows","largeTiles","tilePreferCancelOverQuickStop","apiTimeout","apiUploadTimeout","jwtSecret","uuidv4"],"mappings":";;;;;;;;;;;QA2BaA;eAAAA;;
|
|
1
|
+
{"version":3,"sources":["../../src/constants/server-settings.constants.ts"],"names":["credentialSettingsKey","frontendSettingKey","getDefaultCredentialSettings","getDefaultFrontendSettings","getDefaultServerSettings","getDefaultSettings","getDefaultTimeout","getDefaultWizardSettings","serverSettingsKey","timeoutSettingKey","wizardSettingKey","wizardCompleted","wizardCompletedAt","wizardVersion","sentryDiagnosticsEnabled","loginRequired","registration","experimentalMoonrakerSupport","experimentalBambuSupport","experimentalPrusaLinkSupport","jwtExpiresIn","AppConstants","DEFAULT_JWT_EXPIRES_IN","refreshTokenAttempts","DEFAULT_REFRESH_TOKEN_ATTEMPTS","refreshTokenExpiry","DEFAULT_REFRESH_TOKEN_EXPIRY","slicerApiKey","gridCols","gridRows","largeTiles","tilePreferCancelOverQuickStop","gridNameSortDirection","apiTimeout","apiUploadTimeout","jwtSecret","uuidv4"],"mappings":";;;;;;;;;;;QA2BaA;eAAAA;;QAYAC;eAAAA;;QAXAC;eAAAA;;QAYAC;eAAAA;;QAtBAC;eAAAA;;QAqCAC;eAAAA;;QANAC;eAAAA;;QAtCAC;eAAAA;;QAMAC;eAAAA;;QA+BAC;eAAAA;;QAtCAC;eAAAA;;;iCAVgB;sBAQA;AAEtB,MAAMA,mBAAmB;AACzB,MAAMH,2BAA2B,IAA0B,CAAA;QAChEI,iBAAiB;QACjBC,mBAAmB;QACnBC,eAAe;IACjB,CAAA;AAEO,MAAML,oBAAoB;AAC1B,MAAMJ,2BAA2B,IAA0B,CAAA;QAChEU,0BAA0B;QAC1BC,eAAe;QACfC,cAAc;QACdC,8BAA8B;QAC9BC,0BAA0B;QAC1BC,8BAA8B;IAChC,CAAA;AAEO,MAAMnB,wBAAwB;AAC9B,MAAME,+BAA+B,IAA8B,CAAA;QAExEkB,cAAcC,6BAAY,CAACC,sBAAsB;QAEjDC,sBAAsBF,6BAAY,CAACG,8BAA8B;QAEjEC,oBAAoBJ,6BAAY,CAACK,4BAA4B;QAE7DC,cAAc;IAChB,CAAA;AAEO,MAAM1B,qBAAqB;AAC3B,MAAME,6BAA6B,IAA4B,CAAA;QACpEyB,UAAU;QACVC,UAAU;QACVC,YAAY;QACZC,+BAA+B;QAC/BC,uBAAuB;IACzB,CAAA;AAEO,MAAMvB,oBAAoB;AAC1B,MAAMH,oBAAoB,IAA2B,CAAA;QAC1D2B,YAAY;QACZC,kBAAkB;IACpB,CAAA;AAGO,MAAM7B,qBAAqB,IAAO,CAAA;QACvC,CAACG,kBAAkB,EAAEJ;QACrB,CAACM,iBAAiB,EAAEH;QACpB,CAACP,sBAAsB,EAAE;YACvB,GAAGE,8BAA8B;YACjCiC,WAAWC,IAAAA,QAAM;QACnB;QACA,CAACnC,mBAAmB,EAAEE;QACtB,CAACM,kBAAkB,EAAEH;IACvB,CAAA"}
|
|
@@ -16,6 +16,9 @@ const _authorizationconstants = require("../constants/authorization.constants");
|
|
|
16
16
|
const _filestorageservice = require("../services/file-storage.service");
|
|
17
17
|
const _multerservice = require("../services/core/multer.service");
|
|
18
18
|
const _loggerfactory = require("../handlers/logger-factory");
|
|
19
|
+
const _fileanalysisservice = require("../services/file-analysis.service");
|
|
20
|
+
const _nodefs = require("node:fs");
|
|
21
|
+
const _nodepath = require("node:path");
|
|
19
22
|
function _ts_decorate(decorators, target, key, desc) {
|
|
20
23
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
21
24
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -28,10 +31,12 @@ function _ts_metadata(k, v) {
|
|
|
28
31
|
class FileStorageController {
|
|
29
32
|
fileStorageService;
|
|
30
33
|
multerService;
|
|
34
|
+
fileAnalysisService;
|
|
31
35
|
logger;
|
|
32
|
-
constructor(loggerFactory, fileStorageService, multerService){
|
|
36
|
+
constructor(loggerFactory, fileStorageService, multerService, fileAnalysisService){
|
|
33
37
|
this.fileStorageService = fileStorageService;
|
|
34
38
|
this.multerService = multerService;
|
|
39
|
+
this.fileAnalysisService = fileAnalysisService;
|
|
35
40
|
this.logger = loggerFactory(FileStorageController.name);
|
|
36
41
|
}
|
|
37
42
|
async listFiles(req, res) {
|
|
@@ -102,10 +107,49 @@ class FileStorageController {
|
|
|
102
107
|
});
|
|
103
108
|
}
|
|
104
109
|
}
|
|
110
|
+
async analyzeFile(req, res) {
|
|
111
|
+
const { fileStorageId } = req.params;
|
|
112
|
+
try {
|
|
113
|
+
const filePath = this.fileStorageService.getFilePath(fileStorageId);
|
|
114
|
+
const fileExists = await this.fileStorageService.fileExists(fileStorageId);
|
|
115
|
+
if (!fileExists) {
|
|
116
|
+
res.status(404).send({
|
|
117
|
+
error: "File not found"
|
|
118
|
+
});
|
|
119
|
+
return;
|
|
120
|
+
}
|
|
121
|
+
this.logger.log(`Analyzing file: ${fileStorageId}`);
|
|
122
|
+
const existingMetadata = await this.fileStorageService.loadMetadata(fileStorageId);
|
|
123
|
+
const analysisResult = await this.fileAnalysisService.analyzeFile(filePath);
|
|
124
|
+
const metadata = analysisResult.metadata;
|
|
125
|
+
const thumbnails = analysisResult.thumbnails;
|
|
126
|
+
this.logger.log(`Analysis complete for ${fileStorageId}: format=${metadata.fileFormat}, layers=${metadata.totalLayers}, time=${metadata.gcodePrintTimeSeconds}s, thumbnails=${thumbnails.length}`);
|
|
127
|
+
const fileHash = await this.fileStorageService.calculateFileHash(filePath);
|
|
128
|
+
const originalFileName = existingMetadata?._originalFileName || fileStorageId;
|
|
129
|
+
metadata.fileName = originalFileName;
|
|
130
|
+
let thumbnailMetadata = [];
|
|
131
|
+
if (thumbnails.length > 0) {
|
|
132
|
+
thumbnailMetadata = await this.fileStorageService.saveThumbnails(fileStorageId, thumbnails);
|
|
133
|
+
this.logger.log(`Saved ${thumbnailMetadata.length} thumbnails for ${fileStorageId}`);
|
|
134
|
+
}
|
|
135
|
+
await this.fileStorageService.saveMetadata(fileStorageId, metadata, fileHash, originalFileName, thumbnailMetadata);
|
|
136
|
+
res.send({
|
|
137
|
+
message: "File analyzed successfully",
|
|
138
|
+
fileStorageId,
|
|
139
|
+
metadata,
|
|
140
|
+
thumbnailCount: thumbnails.length
|
|
141
|
+
});
|
|
142
|
+
} catch (error) {
|
|
143
|
+
this.logger.error(`Failed to analyze file ${fileStorageId}: ${error}`);
|
|
144
|
+
res.status(500).send({
|
|
145
|
+
error: `Failed to analyze file: ${error}`
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
}
|
|
105
149
|
async getThumbnail(req, res) {
|
|
106
150
|
const { fileStorageId, index } = req.params;
|
|
107
|
-
const thumbnailIndex = parseInt(index);
|
|
108
|
-
if (isNaN(thumbnailIndex)) {
|
|
151
|
+
const thumbnailIndex = Number.parseInt(index);
|
|
152
|
+
if (Number.isNaN(thumbnailIndex)) {
|
|
109
153
|
res.status(400).send({
|
|
110
154
|
error: "Invalid thumbnail index"
|
|
111
155
|
});
|
|
@@ -119,7 +163,6 @@ class FileStorageController {
|
|
|
119
163
|
});
|
|
120
164
|
return;
|
|
121
165
|
}
|
|
122
|
-
const isPNG = thumbnail[0] === 0x89 && thumbnail[1] === 0x50 && thumbnail[2] === 0x4E && thumbnail[3] === 0x47;
|
|
123
166
|
const isJPG = thumbnail[0] === 0xFF && thumbnail[1] === 0xD8;
|
|
124
167
|
let contentType = 'image/png';
|
|
125
168
|
if (isJPG) contentType = 'image/jpeg';
|
|
@@ -155,22 +198,39 @@ class FileStorageController {
|
|
|
155
198
|
return;
|
|
156
199
|
}
|
|
157
200
|
const file = files[0];
|
|
158
|
-
const
|
|
159
|
-
const
|
|
160
|
-
this.logger.log(`Uploaded file ${file.originalname} as ${fileStorageId}`);
|
|
201
|
+
const ext = (0, _nodepath.extname)(file.originalname);
|
|
202
|
+
const tempPathWithExt = file.path + ext;
|
|
161
203
|
try {
|
|
162
|
-
|
|
163
|
-
this.
|
|
164
|
-
|
|
165
|
-
this.
|
|
204
|
+
(0, _nodefs.copyFileSync)(file.path, tempPathWithExt);
|
|
205
|
+
const fileHash = await this.fileStorageService.calculateFileHash(tempPathWithExt);
|
|
206
|
+
this.logger.log(`Analyzing file: ${file.originalname} (ext: ${ext})`);
|
|
207
|
+
const analysisResult = await this.fileAnalysisService.analyzeFile(tempPathWithExt);
|
|
208
|
+
const metadata = analysisResult.metadata;
|
|
209
|
+
const thumbnails = analysisResult.thumbnails;
|
|
210
|
+
this.logger.log(`Analysis complete: format=${metadata.fileFormat}, layers=${metadata.totalLayers}, ` + `time=${metadata.gcodePrintTimeSeconds}s, filament=${metadata.filamentUsedGrams}g, ` + `thumbnails=${thumbnails.length}`);
|
|
211
|
+
const fileStorageId = await this.fileStorageService.saveFile(file, fileHash);
|
|
212
|
+
this.logger.log(`Uploaded file ${file.originalname} as ${fileStorageId}`);
|
|
213
|
+
let thumbnailMetadata = [];
|
|
214
|
+
if (thumbnails.length > 0) {
|
|
215
|
+
thumbnailMetadata = await this.fileStorageService.saveThumbnails(fileStorageId, thumbnails);
|
|
216
|
+
this.logger.log(`Saved ${thumbnailMetadata.length} thumbnail(s) for ${fileStorageId}`);
|
|
217
|
+
}
|
|
218
|
+
await this.fileStorageService.saveMetadata(fileStorageId, metadata, fileHash, file.originalname, thumbnailMetadata);
|
|
219
|
+
this.logger.log(`Saved metadata JSON for ${fileStorageId}`);
|
|
220
|
+
res.send({
|
|
221
|
+
message: "File uploaded successfully",
|
|
222
|
+
fileStorageId,
|
|
223
|
+
fileName: file.originalname,
|
|
224
|
+
fileSize: file.size,
|
|
225
|
+
fileHash,
|
|
226
|
+
metadata,
|
|
227
|
+
thumbnailCount: thumbnails.length
|
|
228
|
+
});
|
|
229
|
+
} finally{
|
|
230
|
+
if ((0, _nodefs.existsSync)(tempPathWithExt)) {
|
|
231
|
+
(0, _nodefs.unlinkSync)(tempPathWithExt);
|
|
232
|
+
}
|
|
166
233
|
}
|
|
167
|
-
res.send({
|
|
168
|
-
message: "File uploaded successfully",
|
|
169
|
-
fileStorageId,
|
|
170
|
-
fileName: file.originalname,
|
|
171
|
-
fileSize: file.size,
|
|
172
|
-
fileHash
|
|
173
|
-
});
|
|
174
234
|
} catch (error) {
|
|
175
235
|
this.logger.error(`Failed to upload file: ${error}`);
|
|
176
236
|
res.status(500).send({
|
|
@@ -208,6 +268,16 @@ _ts_decorate([
|
|
|
208
268
|
]),
|
|
209
269
|
_ts_metadata("design:returntype", Promise)
|
|
210
270
|
], FileStorageController.prototype, "deleteFile", null);
|
|
271
|
+
_ts_decorate([
|
|
272
|
+
(0, _awilixexpress.POST)(),
|
|
273
|
+
(0, _awilixexpress.route)("/:fileStorageId/analyze"),
|
|
274
|
+
_ts_metadata("design:type", Function),
|
|
275
|
+
_ts_metadata("design:paramtypes", [
|
|
276
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
277
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
278
|
+
]),
|
|
279
|
+
_ts_metadata("design:returntype", Promise)
|
|
280
|
+
], FileStorageController.prototype, "analyzeFile", null);
|
|
211
281
|
_ts_decorate([
|
|
212
282
|
(0, _awilixexpress.GET)(),
|
|
213
283
|
(0, _awilixexpress.route)("/:fileStorageId/thumbnail/:index"),
|
|
@@ -241,7 +311,8 @@ FileStorageController = _ts_decorate([
|
|
|
241
311
|
_ts_metadata("design:paramtypes", [
|
|
242
312
|
typeof _loggerfactory.ILoggerFactory === "undefined" ? Object : _loggerfactory.ILoggerFactory,
|
|
243
313
|
typeof _filestorageservice.FileStorageService === "undefined" ? Object : _filestorageservice.FileStorageService,
|
|
244
|
-
typeof _multerservice.MulterService === "undefined" ? Object : _multerservice.MulterService
|
|
314
|
+
typeof _multerservice.MulterService === "undefined" ? Object : _multerservice.MulterService,
|
|
315
|
+
typeof _fileanalysisservice.FileAnalysisService === "undefined" ? Object : _fileanalysisservice.FileAnalysisService
|
|
245
316
|
])
|
|
246
317
|
], FileStorageController);
|
|
247
318
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/file-storage.controller.ts"],"names":["FileStorageController","logger","loggerFactory","fileStorageService","multerService","name","listFiles","req","res","files","listAllFiles","send","map","file","fileStorageId","fileName","fileFormat","fileSize","fileHash","createdAt","thumbnailCount","thumbnailsUrl","metadata","totalCount","length","error","status","getFileMetadata","params","getFileInfo","deleteFile","log","message","getThumbnail","index","thumbnailIndex","parseInt","isNaN","thumbnail","
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/file-storage.controller.ts"],"names":["FileStorageController","logger","loggerFactory","fileStorageService","multerService","fileAnalysisService","name","listFiles","req","res","files","listAllFiles","send","map","file","fileStorageId","fileName","fileFormat","fileSize","fileHash","createdAt","thumbnailCount","thumbnailsUrl","metadata","totalCount","length","error","status","getFileMetadata","params","getFileInfo","deleteFile","log","message","analyzeFile","filePath","getFilePath","fileExists","existingMetadata","loadMetadata","analysisResult","thumbnails","totalLayers","gcodePrintTimeSeconds","calculateFileHash","originalFileName","_originalFileName","thumbnailMetadata","saveThumbnails","saveMetadata","getThumbnail","index","thumbnailIndex","Number","parseInt","isNaN","thumbnail","isJPG","contentType","setHeader","uploadFile","acceptedExtensions","multerLoadFileAsync","ext","extname","originalname","tempPathWithExt","path","copyFileSync","filamentUsedGrams","saveFile","size","existsSync","unlinkSync","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR"],"mappings":"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"}
|
|
@@ -124,8 +124,8 @@ class SettingsController {
|
|
|
124
124
|
res.send(result);
|
|
125
125
|
}
|
|
126
126
|
async updateCredentialSettings(req, res) {
|
|
127
|
-
const validatedInput = await (0, _validators.validateInput)(req.body, _settingsservicevalidation.
|
|
128
|
-
await this.settingsStore.
|
|
127
|
+
const validatedInput = await (0, _validators.validateInput)(req.body, _settingsservicevalidation.credentialCoreSettingUpdateSchema);
|
|
128
|
+
await this.settingsStore.updateCoreCredentialSettings(validatedInput);
|
|
129
129
|
res.send();
|
|
130
130
|
}
|
|
131
131
|
async updateTimeoutSettings(req, res) {
|
|
@@ -133,6 +133,26 @@ class SettingsController {
|
|
|
133
133
|
const result = await this.settingsStore.updateTimeoutSettings(validatedInput);
|
|
134
134
|
res.send(result);
|
|
135
135
|
}
|
|
136
|
+
async getSlicerApiKey(req, res) {
|
|
137
|
+
const apiKey = this.settingsStore.getSlicerApiKey();
|
|
138
|
+
res.send({
|
|
139
|
+
slicerApiKey: apiKey
|
|
140
|
+
});
|
|
141
|
+
}
|
|
142
|
+
async regenerateSlicerApiKey(req, res) {
|
|
143
|
+
const newApiKey = await this.settingsStore.generateSlicerApiKey();
|
|
144
|
+
this.logger.log("Slicer API key regenerated");
|
|
145
|
+
res.send({
|
|
146
|
+
slicerApiKey: newApiKey
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
async deleteSlicerApiKey(req, res) {
|
|
150
|
+
await this.settingsStore.deleteSlicerApiKey();
|
|
151
|
+
this.logger.log("Slicer API key deleted");
|
|
152
|
+
res.send({
|
|
153
|
+
slicerApiKey: null
|
|
154
|
+
});
|
|
155
|
+
}
|
|
136
156
|
}
|
|
137
157
|
_ts_decorate([
|
|
138
158
|
(0, _awilixexpress.GET)(),
|
|
@@ -294,6 +314,54 @@ _ts_decorate([
|
|
|
294
314
|
]),
|
|
295
315
|
_ts_metadata("design:returntype", Promise)
|
|
296
316
|
], SettingsController.prototype, "updateTimeoutSettings", null);
|
|
317
|
+
_ts_decorate([
|
|
318
|
+
(0, _awilixexpress.GET)(),
|
|
319
|
+
(0, _awilixexpress.route)("/slicer-api-key"),
|
|
320
|
+
(0, _awilixexpress.before)([
|
|
321
|
+
(0, _authenticate.authorizeRoles)([
|
|
322
|
+
_authorizationconstants.ROLES.ADMIN
|
|
323
|
+
]),
|
|
324
|
+
_demomiddleware.demoUserNotAllowed
|
|
325
|
+
]),
|
|
326
|
+
_ts_metadata("design:type", Function),
|
|
327
|
+
_ts_metadata("design:paramtypes", [
|
|
328
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
329
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
330
|
+
]),
|
|
331
|
+
_ts_metadata("design:returntype", Promise)
|
|
332
|
+
], SettingsController.prototype, "getSlicerApiKey", null);
|
|
333
|
+
_ts_decorate([
|
|
334
|
+
(0, _awilixexpress.POST)(),
|
|
335
|
+
(0, _awilixexpress.route)("/slicer-api-key/regenerate"),
|
|
336
|
+
(0, _awilixexpress.before)([
|
|
337
|
+
(0, _authenticate.authorizeRoles)([
|
|
338
|
+
_authorizationconstants.ROLES.ADMIN
|
|
339
|
+
]),
|
|
340
|
+
_demomiddleware.demoUserNotAllowed
|
|
341
|
+
]),
|
|
342
|
+
_ts_metadata("design:type", Function),
|
|
343
|
+
_ts_metadata("design:paramtypes", [
|
|
344
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
345
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
346
|
+
]),
|
|
347
|
+
_ts_metadata("design:returntype", Promise)
|
|
348
|
+
], SettingsController.prototype, "regenerateSlicerApiKey", null);
|
|
349
|
+
_ts_decorate([
|
|
350
|
+
(0, _awilixexpress.DELETE)(),
|
|
351
|
+
(0, _awilixexpress.route)("/slicer-api-key"),
|
|
352
|
+
(0, _awilixexpress.before)([
|
|
353
|
+
(0, _authenticate.authorizeRoles)([
|
|
354
|
+
_authorizationconstants.ROLES.ADMIN
|
|
355
|
+
]),
|
|
356
|
+
_demomiddleware.demoUserNotAllowed
|
|
357
|
+
]),
|
|
358
|
+
_ts_metadata("design:type", Function),
|
|
359
|
+
_ts_metadata("design:paramtypes", [
|
|
360
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
361
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
362
|
+
]),
|
|
363
|
+
_ts_metadata("design:returntype", Promise)
|
|
364
|
+
], SettingsController.prototype, "deleteSlicerApiKey", null);
|
|
297
365
|
SettingsController = _ts_decorate([
|
|
298
366
|
(0, _awilixexpress.route)(_serverconstants.AppConstants.apiRoute + "/settings"),
|
|
299
367
|
(0, _awilixexpress.before)([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/settings.controller.ts"],"names":["SettingsController","logger","loggerFactory","serverVersion","printerCache","printerService","settingsStore","printerThumbnailCache","name","getSettings","req","res","connection","clientIp","socket","remoteAddress","version","e","warn","settings","send","getSettingsSensitive","updateSentryDiagnosticsEnabled","enabled","validateInput","body","sentryDiagnosticsEnabledSchema","result","setSentryDiagnosticsEnabled","updateMoonrakerSupport","moonrakerSupportSchema","setExperimentalMoonrakerSupport","printers","listCachedPrinters","klipperPrinters","filter","p","printerType","MoonrakerType","printer","updateEnabled","id","updatePrusaLinkSupport","prusaLinkSupportSchema","setExperimentalPrusaLinkSupport","prusaLinkPrinters","PrusaLinkType","updateBambuSupport","bambuSupportSchema","setExperimentalBambuSupport","bambuPrinters","BambuType","updateFrontendSettings","validatedInput","frontendSettingsUpdateSchema","updateLoginRequiredSettings","loginRequired","loginRequiredSchema","setLoginRequired","updateRegistrationEnabledSettings","registrationEnabled","registrationEnabledSchema","setRegistrationEnabled","updateCredentialSettings","
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/settings.controller.ts"],"names":["SettingsController","logger","loggerFactory","serverVersion","printerCache","printerService","settingsStore","printerThumbnailCache","name","getSettings","req","res","connection","clientIp","socket","remoteAddress","version","e","warn","settings","send","getSettingsSensitive","updateSentryDiagnosticsEnabled","enabled","validateInput","body","sentryDiagnosticsEnabledSchema","result","setSentryDiagnosticsEnabled","updateMoonrakerSupport","moonrakerSupportSchema","setExperimentalMoonrakerSupport","printers","listCachedPrinters","klipperPrinters","filter","p","printerType","MoonrakerType","printer","updateEnabled","id","updatePrusaLinkSupport","prusaLinkSupportSchema","setExperimentalPrusaLinkSupport","prusaLinkPrinters","PrusaLinkType","updateBambuSupport","bambuSupportSchema","setExperimentalBambuSupport","bambuPrinters","BambuType","updateFrontendSettings","validatedInput","frontendSettingsUpdateSchema","updateLoginRequiredSettings","loginRequired","loginRequiredSchema","setLoginRequired","updateRegistrationEnabledSettings","registrationEnabled","registrationEnabledSchema","setRegistrationEnabled","updateCredentialSettings","credentialCoreSettingUpdateSchema","updateCoreCredentialSettings","updateTimeoutSettings","timeoutSettingsUpdateSchema","getSlicerApiKey","apiKey","slicerApiKey","regenerateSlicerApiKey","newApiKey","generateSlicerApiKey","log","deleteSlicerApiKey","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","AppConstants","apiRoute","authenticate"],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ const _fileanalysisservice = require("../services/file-analysis.service");
|
|
|
15
15
|
const _multerservice = require("../services/core/multer.service");
|
|
16
16
|
const _loggerfactory = require("../handlers/logger-factory");
|
|
17
17
|
const _serverconstants = require("../server.constants");
|
|
18
|
+
const _slicerapikeymiddleware = require("../middleware/slicer-api-key.middleware");
|
|
18
19
|
function _ts_decorate(decorators, target, key, desc) {
|
|
19
20
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
20
21
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -204,6 +205,9 @@ _ts_decorate([
|
|
|
204
205
|
], SlicerCompatController.prototype, "getServer", null);
|
|
205
206
|
SlicerCompatController = _ts_decorate([
|
|
206
207
|
(0, _awilixexpress.route)("/api"),
|
|
208
|
+
(0, _awilixexpress.before)([
|
|
209
|
+
(0, _slicerapikeymiddleware.slicerApiKeyAuth)()
|
|
210
|
+
]),
|
|
207
211
|
_ts_metadata("design:type", Function),
|
|
208
212
|
_ts_metadata("design:paramtypes", [
|
|
209
213
|
typeof _loggerfactory.ILoggerFactory === "undefined" ? Object : _loggerfactory.ILoggerFactory,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/slicer-compat.controller.ts"],"names":["SlicerCompatController","logger","loggerFactory","fileStorageService","fileAnalysisService","multerService","name","getVersion","req","res","send","api","server","text","uploadFile","files","acceptedExtensions","AppConstants","defaultAcceptedGcodeExtensions","defaultAcceptedBambuExtensions","multerLoadFileAsync","length","status","error","file","print","body","select","log","originalname","fileHash","calculateFileHash","path","fileStorageId","saveFile","filePath","getFilePath","metadata","thumbnails","analysisResult","analyzeFile","thumbnailMetadata","saveThumbnails","saveMetadata","analysisError","clearUploadedFile","e","local","origin","refs","resource","download","done","_fdmMonster","analyzed","Object","keys","thumbnailCount","printTime","gcodePrintTimeSeconds","filament","filamentUsedGrams","listFiles","listAllFiles","knownFiles","map","_originalFileName","fileName","type","typePath","fileFormat","gcodeAnalysis","estimatedPrintTime","tool0","filamentUsedMm","volume","filamentUsedCm3","undefined","date","Math","floor","createdAt","getTime","size","fileSize","free","total","getServer","version","safemode"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/slicer-compat.controller.ts"],"names":["SlicerCompatController","logger","loggerFactory","fileStorageService","fileAnalysisService","multerService","name","getVersion","req","res","send","api","server","text","uploadFile","files","acceptedExtensions","AppConstants","defaultAcceptedGcodeExtensions","defaultAcceptedBambuExtensions","multerLoadFileAsync","length","status","error","file","print","body","select","log","originalname","fileHash","calculateFileHash","path","fileStorageId","saveFile","filePath","getFilePath","metadata","thumbnails","analysisResult","analyzeFile","thumbnailMetadata","saveThumbnails","saveMetadata","analysisError","clearUploadedFile","e","local","origin","refs","resource","download","done","_fdmMonster","analyzed","Object","keys","thumbnailCount","printTime","gcodePrintTimeSeconds","filament","filamentUsedGrams","listFiles","listAllFiles","knownFiles","map","_originalFileName","fileName","type","typePath","fileFormat","gcodeAnalysis","estimatedPrintTime","tool0","filamentUsedMm","volume","filamentUsedCm3","undefined","date","Math","floor","createdAt","getTime","size","fileSize","free","total","getServer","version","safemode","slicerApiKeyAuth"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/entities/settings.entity.ts"],"names":["Settings","serverSettingsKey","credentialSettingsKey","wizardSettingKey","frontendSettingKey","timeoutSettingKey","id","type","nullable"],"mappings":";;;;+BAUaA;;;eAAAA;;;yCAJN;yBACgD;;;;;;;;;;IAQrD,MAUA,
|
|
1
|
+
{"version":3,"sources":["../../src/entities/settings.entity.ts"],"names":["Settings","serverSettingsKey","credentialSettingsKey","wizardSettingKey","frontendSettingKey","timeoutSettingKey","id","type","nullable"],"mappings":";;;;+BAUaA;;;eAAAA;;;yCAJN;yBACgD;;;;;;;;;;IAQrD,MAUA,OASA,OAOA,OASA;AAnCA,OAACC,0CAAiB;AAUlB,QAACC,8CAAqB;AAStB,QAACC,yCAAgB;AAOjB,QAACC,2CAAkB;AASnB,QAACC,0CAAiB;AAxCb,MAAML;IAEXM,GAAW;IAGX,CAAA,KAAmB,CAOjB;IAGF,CAAA,MAAuB,CAMrB;IAGF,CAAA,MAAkB,CAIhB;IAGF,CAAA,MAAoB,CAMlB;IAGF,CAAA,MAAmB,CAGjB;AACJ;;;;;;;QAxCYC,MAAM;QAAeC,UAAU;;;uBACzC;;;QASUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAQUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAQUD,MAAM;QAAeC,UAAU;;;uBACzC"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "slicerApiKeyAuth", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return slicerApiKeyAuth;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _awilixexpress = require("awilix-express");
|
|
12
|
+
const _runtimeexceptions = require("../exceptions/runtime.exceptions");
|
|
13
|
+
const slicerApiKeyAuth = ()=>(0, _awilixexpress.inject)((loggerFactory, settingsStore)=>async (req, res, next)=>{
|
|
14
|
+
const logger = loggerFactory("Middleware:slicerApiKeyAuth");
|
|
15
|
+
const apiKey = req.headers["x-api-key"];
|
|
16
|
+
if (!apiKey?.length) {
|
|
17
|
+
throw new _runtimeexceptions.AuthenticationError("Header x-api-key is missing");
|
|
18
|
+
}
|
|
19
|
+
const isValid = settingsStore.validateSlicerApiKey(apiKey);
|
|
20
|
+
if (isValid) {
|
|
21
|
+
logger.log(`Slicer API key authentication successful for ${req.originalUrl}`);
|
|
22
|
+
req.slicerApiKeyAuthenticated = true;
|
|
23
|
+
return next();
|
|
24
|
+
}
|
|
25
|
+
logger.warn(`Invalid slicer API key provided for ${req.originalUrl}`);
|
|
26
|
+
throw new _runtimeexceptions.AuthenticationError("Header x-api-key is wrong");
|
|
27
|
+
});
|
|
28
|
+
|
|
29
|
+
//# sourceMappingURL=slicer-api-key.middleware.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/middleware/slicer-api-key.middleware.ts"],"names":["slicerApiKeyAuth","inject","loggerFactory","settingsStore","req","res","next","logger","apiKey","headers","length","AuthenticationError","isValid","validateSlicerApiKey","log","originalUrl","slicerApiKeyAuthenticated","warn"],"mappings":";;;;+BAaaA;;;eAAAA;;;+BAbU;mCAIa;AAS7B,MAAMA,mBAAmB,IAC9BC,IAAAA,qBAAM,EACJ,CAACC,eAA+BC,gBAC9B,OAAOC,KAAcC,KAAeC;YAClC,MAAMC,SAASL,cAAc;YAE7B,MAAMM,SAASJ,IAAIK,OAAO,CAAC,YAAY;YAEvC,IAAI,CAACD,QAAQE,QAAQ;gBACnB,MAAM,IAAIC,sCAAmB,CAAC;YAChC;YAEA,MAAMC,UAAUT,cAAcU,oBAAoB,CAACL;YACnD,IAAII,SAAS;gBACXL,OAAOO,GAAG,CAAC,CAAC,6CAA6C,EAAEV,IAAIW,WAAW,EAAE;gBAE3EX,IAAYY,yBAAyB,GAAG;gBACzC,OAAOV;YACT;YAEAC,OAAOU,IAAI,CAAC,CAAC,oCAAoC,EAAEb,IAAIW,WAAW,EAAE;YACpE,MAAM,IAAIJ,sCAAmB,CAAC;QAChC"}
|
package/dist/server.constants.js
CHANGED
|
@@ -72,7 +72,7 @@ const AppConstants = {
|
|
|
72
72
|
githubUrl: "https://github.com/fdm-monster/fdm-monster",
|
|
73
73
|
orgName: "fdm-monster",
|
|
74
74
|
currentWizardVersion: 1,
|
|
75
|
-
defaultClientMinimum: "2.1.
|
|
75
|
+
defaultClientMinimum: "2.1.5",
|
|
76
76
|
defaultWebsocketHandshakeTimeout: 3000,
|
|
77
77
|
defaultSocketThrottleRate: 1,
|
|
78
78
|
debugSocketStatesKey: "DEBUG_SOCKET_STATES",
|
|
@@ -226,6 +226,21 @@ class YamlService {
|
|
|
226
226
|
this.logger.log(`Marking wizard as completed with version: ${importedWizardVersion}`);
|
|
227
227
|
await this.settingsStore.setWizardCompleted(importedWizardVersion);
|
|
228
228
|
}
|
|
229
|
+
if (settings.credential) {
|
|
230
|
+
const { jwtExpiresIn, refreshTokenAttempts, refreshTokenExpiry, slicerApiKey } = settings.credential;
|
|
231
|
+
if (jwtExpiresIn || refreshTokenAttempts || refreshTokenExpiry) {
|
|
232
|
+
await this.settingsStore.updateCoreCredentialSettings({
|
|
233
|
+
jwtExpiresIn: jwtExpiresIn ?? (await this.settingsStore.getCredentialSettings()).jwtExpiresIn,
|
|
234
|
+
refreshTokenAttempts: refreshTokenAttempts ?? (await this.settingsStore.getCredentialSettings()).refreshTokenAttempts,
|
|
235
|
+
refreshTokenExpiry: refreshTokenExpiry ?? (await this.settingsStore.getCredentialSettings()).refreshTokenExpiry
|
|
236
|
+
});
|
|
237
|
+
this.logger.log("Imported credential settings");
|
|
238
|
+
}
|
|
239
|
+
if (slicerApiKey) {
|
|
240
|
+
await this.settingsStore.setSlicerApiKey(slicerApiKey);
|
|
241
|
+
this.logger.log("Imported slicer API key");
|
|
242
|
+
}
|
|
243
|
+
}
|
|
229
244
|
await this.settingsStore.loadSettings();
|
|
230
245
|
this.logger.log("Settings imported successfully");
|
|
231
246
|
}
|
|
@@ -429,7 +444,7 @@ class YamlService {
|
|
|
429
444
|
const printers = await this.printerService.list();
|
|
430
445
|
dumpedObject.printers = printers.map((p)=>{
|
|
431
446
|
const printerId = p.id;
|
|
432
|
-
const { apiKey } = this.printerCache.getLoginDto(printerId);
|
|
447
|
+
const { apiKey, username, password } = this.printerCache.getLoginDto(printerId);
|
|
433
448
|
return {
|
|
434
449
|
id: printerId,
|
|
435
450
|
disabledReason: p.disabledReason,
|
|
@@ -438,7 +453,9 @@ class YamlService {
|
|
|
438
453
|
dateAdded: p.dateAdded,
|
|
439
454
|
name: p.name,
|
|
440
455
|
printerURL: p.printerURL,
|
|
441
|
-
apiKey
|
|
456
|
+
apiKey,
|
|
457
|
+
username,
|
|
458
|
+
password
|
|
442
459
|
};
|
|
443
460
|
});
|
|
444
461
|
}
|
|
@@ -479,7 +496,10 @@ class YamlService {
|
|
|
479
496
|
});
|
|
480
497
|
}
|
|
481
498
|
if (exportSettings) {
|
|
482
|
-
dumpedObject.settings =
|
|
499
|
+
dumpedObject.settings = {
|
|
500
|
+
...this.settingsStore.getSettings(),
|
|
501
|
+
...this.settingsStore.getSettingsSensitive()
|
|
502
|
+
};
|
|
483
503
|
}
|
|
484
504
|
if (exportUsers) {
|
|
485
505
|
const users = await this.userService.listUsers(1000);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/yaml.service.ts"],"names":["YamlService","logger","loggerFactory","printerTagService","printerService","printerCache","floorStore","floorService","userService","roleService","settingsStore","name","importYaml","yamlBuffer","importSpec","load","databaseTypeSqlite","databaseType","exportPrinters","exportFloorGrid","exportSettings","exportUsers","config","normalizeYamlData","importData","validateInput","importPrintersFloorsYamlSchema","hasSystemData","validateSystemTablesEmpty","settings","log","importSettings","users","length","importUsers","floors","floor","importPrinterPositionsSchema","updateByPropertyPrinters","insertPrinters","analysePrintersUpsert","printers","printerComparisonStrategiesByPriority","updateByPropertyFloors","insertFloors","analyseFloorsUpsert","floorComparisonStrategiesByPriority","updateByNameTags","insertTags","analyseUpsertTags","tags","printerIdMap","newPrinter","state","create","id","Error","JSON","stringify","error","updatePrinterSpec","updateId","printerId","updatedPrinter","value","originalPrinterId","update","floorIdMap","newFloor","originalFloorId","knownPrinterPositions","floorPosition","knownPrinterId","floorId","push","createdFloor","updateFloorSpec","updatedFloor","knownPrinters","loadStore","tag","createdTag","createTag","color","printer","addPrinterToTag","updateTagSpec","existingTag","getPrintersByTag","tagId","existingPrinterIds","map","p","wantedTargetPrinterIds","filter","unwantedId","eid","includes","removePrinterFromTag","nonExistingNewId","server","updateServerSettings","timeout","updateTimeoutSettings","frontend","updateFrontendSettings","wizard","wizardCompleted","importedWizardVersion","wizardVersion","setWizardCompleted","loadSettings","allRoles","roles","user","Number","parseInt","roleNames","roleName","some","r","register","username","password","isRootUser","isDemoUser","isVerified","needsPasswordChange","updatePasswordHashUnsafeByUsername","passwordHash","errors","getWizardSettings","existingSettings","getSettings","Object","keys","existingUsers","listUsers","join","upsertPrinters","comparisonStrategies","existingPrinters","list","names","toLowerCase","urls","printerURL","ids","toString","strategy","comparedName","foundIndex","findIndex","n","upsertFloors","comparisonStrategy","existingFloors","floorLevels","order","comparedProperty","upsertTags","existingTags","listTags","exportYaml","options","input","exportPrintersFloorsYamlSchema","exportFloors","exportTags","dumpedObject","version","process","env","npm_package_version","exportedAt","Date","undefined","user_roles","apiKey","getLoginDto","disabledReason","enabled","printerType","dateAdded","listCache","f","dumpedFloor","fPrinterId","x","y","t","u","userDto","toDto","createdAt","dump","printerName","settingsAppearance","OctoprintType","MoonrakerType","PrusaLinkType","BambuType","groups","exportGroups"],"mappings":";;;;+BAqBaA;;;eAAAA;;;4BArBiB;uCAMvB;wBACoB;qCAQ4C;AAMhE,MAAMA;;;;;;;;;IACMC,OAAsB;IAEvC,YACEC,aAA6B,EAC7B,AAAiBC,iBAAqC,EACtD,AAAiBC,cAA+B,EAChD,AAAiBC,YAA0B,EAC3C,AAAiBC,UAAsB,EACvC,AAAiBC,YAA2B,EAC5C,AAAiBC,WAAyB,EAC1C,AAAiBC,WAAyB,EAC1C,AAAiBC,aAA4B,CAC7C;aARiBP,oBAAAA;aACAC,iBAAAA;aACAC,eAAAA;aACAC,aAAAA;aACAC,eAAAA;aACAC,cAAAA;aACAC,cAAAA;aACAC,gBAAAA;QAEjB,IAAI,CAACT,MAAM,GAAGC,cAAcF,YAAYW,IAAI;IAC9C;IAEA,MAAMC,WAAWC,UAAkB,EAAE;QACnC,MAAMC,aAAc,MAAMC,IAAAA,YAAI,EAACF;QAC/B,MAAMG,qBAAqBF,WAAWG,YAAY,KAAK;QACvD,MAAM,EAAEC,cAAc,EAAEC,eAAe,EAAEC,cAAc,EAAEC,WAAW,EAAE,GAAGP,WAAWQ,MAAM;QAG1F,IAAI,CAACC,iBAAiB,CAACT,YAAYE;QAEnC,MAAMQ,aAAa,MAAMC,IAAAA,yBAAa,EAACX,YAAYY,qDAA8B;QAGjF,MAAMC,gBAAgBP,kBAAkBC;QACxC,IAAIM,eAAe;YACjB,MAAM,IAAI,CAACC,yBAAyB,CAACd;YAGrC,IAAIM,kBAAkBN,WAAWe,QAAQ,EAAE;gBACzC,IAAI,CAAC5B,MAAM,CAAC6B,GAAG,CAAC;gBAChB,MAAM,IAAI,CAACC,cAAc,CAACjB,WAAWe,QAAQ;YAC/C;YAEA,IAAIR,eAAeP,WAAWkB,KAAK,IAAIlB,WAAWkB,KAAK,CAACC,MAAM,GAAG,GAAG;gBAClE,IAAI,CAAChC,MAAM,CAAC6B,GAAG,CAAC,CAAC,iBAAiB,EAAEhB,WAAWkB,KAAK,CAACC,MAAM,CAAC,OAAO,CAAC;gBACpE,MAAM,IAAI,CAACC,WAAW,CAACpB,WAAWkB,KAAK,EAAEhB;YAC3C;QACF;QAGA,IAAIG,mBAAmBK,WAAWW,MAAM,EAAEF,QAAQ;YAChD,KAAK,MAAMG,SAASZ,WAAWW,MAAM,CAAE;gBACrC,MAAMV,IAAAA,yBAAa,EAACW,OAAOC,mDAA4B;YACzD;QACF;QAEA,IAAI,CAACpC,MAAM,CAAC6B,GAAG,CAAC;QAChB,MAAM,EAAEQ,wBAAwB,EAAEC,cAAc,EAAE,GAAG,MAAM,IAAI,CAACC,qBAAqB,CACnFhB,WAAWiB,QAAQ,IAAI,EAAE,EACzBjB,WAAWF,MAAM,CAACoB,qCAAqC;QAGzD,IAAI,CAACzC,MAAM,CAAC6B,GAAG,CAAC;QAChB,MAAM,EAAEa,sBAAsB,EAAEC,YAAY,EAAE,GAAG,MAAM,IAAI,CAACC,mBAAmB,CAC7ErB,WAAWW,MAAM,IAAI,EAAE,EACvBX,WAAWF,MAAM,CAACwB,mCAAmC;QAGvD,IAAI,CAAC7C,MAAM,CAAC6B,GAAG,CAAC;QAChB,MAAM,EAAEiB,gBAAgB,EAAEC,UAAU,EAAE,GAAG,MAAM,IAAI,CAACC,iBAAiB,CAACzB,WAAW0B,IAAI,IAAI,EAAE;QAE3F,IAAI,CAACjD,MAAM,CAAC6B,GAAG,CAAC,CAAC,iCAAiC,EAAES,eAAeN,MAAM,CAAC,UAAU,CAAC;QACrF,MAAMkB,eAAwC,CAAC;QAC/C,KAAK,MAAMC,cAAcb,eAAgB;YACvC,IAAI;gBACF,MAAMc,QAAQ,MAAM,IAAI,CAACjD,cAAc,CAACkD,MAAM,CAAC;oBAAE,GAAGF,UAAU;gBAAC;gBAC/D,IAAI,CAACA,WAAWG,EAAE,EAAE;oBAClB,MAAM,IAAIC,MAAM,CAAC,mBAAmB,EAAEC,KAAKC,SAAS,CAACN,aAAa;gBACpE;gBACAD,YAAY,CAACC,WAAWG,EAAE,CAAC,GAAGF,MAAME,EAAE;YACxC,EAAE,OAAOI,OAAO;gBACd,IAAI,CAAC1D,MAAM,CAAC0D,KAAK,CAAC,CAAC,yBAAyB,EAAEP,WAAWzC,IAAI,CAAC,CAAC,CAAC,EAAEgD;YAEpE;QACF;QAEA,IAAI,CAAC1D,MAAM,CAAC6B,GAAG,CAAC,CAAC,mCAAmC,EAAEQ,yBAAyBL,MAAM,CAAC,UAAU,CAAC;QACjG,KAAK,MAAM2B,qBAAqBtB,yBAA0B;YACxD,IAAI;gBACF,MAAMuB,WAAWD,kBAAkBE,SAAS;gBAC5C,MAAMC,iBAAiBH,kBAAkBI,KAAK;gBAC9C,IAAI,OAAOH,aAAa,UAAU;oBAChC,MAAM,IAAIL,MAAM;gBAClB;gBAEA,MAAMS,oBAAoBF,eAAeR,EAAE;gBAC3C,OAAOK,kBAAkBI,KAAK,CAACT,EAAE;gBAEjCQ,eAAeR,EAAE,GAAGM;gBACpB,MAAMR,QAAQ,MAAM,IAAI,CAACjD,cAAc,CAAC8D,MAAM,CAACL,UAAUE;gBACzD,IAAI,CAACH,kBAAkBE,SAAS,EAAE;oBAChC,MAAM,IAAIN,MAAM;gBAClB;gBAEAL,YAAY,CAACc,kBAAkB,GAAGZ,MAAME,EAAE;YAC5C,EAAE,OAAOI,OAAO;gBACd,IAAI,CAAC1D,MAAM,CAAC0D,KAAK,CAAC,CAAC,yBAAyB,EAAEC,kBAAkBI,KAAK,CAACrD,IAAI,CAAC,CAAC,CAAC,EAAEgD;YAEjF;QACF;QAEA,IAAI,CAAC1D,MAAM,CAAC6B,GAAG,CAAC,CAAC,+BAA+B,EAAEc,aAAaX,MAAM,CAAC,QAAQ,CAAC;QAC/E,MAAMkC,aAAsC,CAAC;QAC7C,KAAK,MAAMC,YAAYxB,aAAc;YACnC,IAAI;gBACF,MAAMyB,kBAAkBD,SAASb,EAAE;gBACnC,OAAOa,SAASb,EAAE;gBAGlB,MAAMe,wBAAwB,EAAE;gBAEhC,IAAInD,mBAAmBD,gBAAgB;oBACrC,KAAK,MAAMqD,iBAAiBH,SAAS3B,QAAQ,CAAE;wBAC7C,MAAM+B,iBAAiBrB,YAAY,CAACoB,cAAcT,SAAS,CAAC;wBAE5D,IAAI,CAACU,gBAAgB;4BACnB;wBACF;wBAEA,OAAOD,cAAchB,EAAE;wBACvB,OAAOgB,cAAcE,OAAO;wBAC5BF,cAAcT,SAAS,GAAGU;wBAC1BF,sBAAsBI,IAAI,CAACH;oBAC7B;oBACAH,SAAS3B,QAAQ,GAAG6B;gBACtB;gBAEA,MAAMK,eAAe,MAAM,IAAI,CAACrE,UAAU,CAACgD,MAAM,CAAC;oBAAE,GAAGc,QAAQ;gBAAC;gBAChED,UAAU,CAACE,gBAAgB,GAAGM,aAAapB,EAAE;YAC/C,EAAE,OAAOI,OAAO;gBACd,IAAI,CAAC1D,MAAM,CAAC0D,KAAK,CAAC,CAAC,uBAAuB,EAAES,SAASzD,IAAI,CAAC,CAAC,CAAC,EAAEgD;YAEhE;QACF;QAEA,IAAI,CAAC1D,MAAM,CAAC6B,GAAG,CAAC,CAAC,6BAA6B,EAAEa,uBAAuBV,MAAM,CAAC,QAAQ,CAAC;QACvF,KAAK,MAAM2C,mBAAmBjC,uBAAwB;YACpD,IAAI;gBACF,MAAMkB,WAAWe,gBAAgBH,OAAO;gBAExC,IAAI,OAAOZ,aAAa,UAAU;oBAChC,MAAM,IAAIL,MAAM;gBAClB;gBAEA,MAAMqB,eAAeD,gBAAgBZ,KAAK;gBAC1C,MAAMK,kBAAkBQ,aAAatB,EAAE;gBACvC,OAAOsB,aAAatB,EAAE;gBAEtB,MAAMuB,gBAAgB,EAAE;gBACxB,IAAI3D,mBAAmBD,gBAAgB;oBACrC,KAAK,MAAMqD,iBAAiBM,cAAcpC,SAAU;wBAClD,MAAM+B,iBAAiBrB,YAAY,CAACoB,cAAcT,SAAS,CAAC;wBAE5D,IAAI,CAACU,gBAAgB;4BACnB;wBACF;wBAGA,OAAOD,cAAchB,EAAE;wBACvB,OAAOgB,cAAcE,OAAO;wBAC5BF,cAAcT,SAAS,GAAGU;wBAC1BD,cAAcE,OAAO,GAAGZ;wBACxBiB,cAAcJ,IAAI,CAACH;oBACrB;oBACAM,aAAatB,EAAE,GAAGM;oBAClBgB,aAAapC,QAAQ,GAAGqC;gBAC1B;gBACA,MAAMV,WAAW,MAAM,IAAI,CAAC9D,UAAU,CAAC4D,MAAM,CAACL,UAAUgB;gBACxDV,UAAU,CAACE,gBAAgB,GAAGD,SAASb,EAAE;YAC3C,EAAE,OAAOI,OAAO;gBACd,IAAI,CAAC1D,MAAM,CAAC0D,KAAK,CAAC,CAAC,uBAAuB,EAAEiB,gBAAgBZ,KAAK,CAACrD,IAAI,CAAC,CAAC,CAAC,EAAEgD;YAE7E;QACF;QAEA,MAAM,IAAI,CAACrD,UAAU,CAACyE,SAAS;QAE/B,IAAI,CAAC9E,MAAM,CAAC6B,GAAG,CAAC,CAAC,6BAA6B,EAAEkB,WAAWf,MAAM,CAAC,MAAM,CAAC;QACzE,KAAK,MAAM+C,OAAOhC,WAAY;YAC5B,IAAI;gBACF,MAAMiC,aAAa,MAAM,IAAI,CAAC9E,iBAAiB,CAAC+E,SAAS,CAAC;oBACxDvE,MAAMqE,IAAIrE,IAAI;oBACdwE,OAAOH,IAAIG,KAAK;gBAClB;gBACA,KAAK,MAAMC,WAAWJ,IAAIvC,QAAQ,CAAE;oBAClC,MAAM+B,iBAAiBrB,YAAY,CAACiC,QAAQtB,SAAS,CAAC;oBAEtD,IAAI,CAACU,gBAAgB;oBACrB,IAAI;wBACF,MAAM,IAAI,CAACrE,iBAAiB,CAACkF,eAAe,CAACJ,WAAW1B,EAAE,EAAEiB;oBAC9D,EAAE,OAAOb,OAAO;wBACd,IAAI,CAAC1D,MAAM,CAAC0D,KAAK,CAAC,CAAC,sBAAsB,EAAEa,eAAe,QAAQ,EAAEQ,IAAIrE,IAAI,CAAC,CAAC,CAAC,EAAEgD;oBAEnF;gBACF;YACF,EAAE,OAAOA,OAAO;gBACd,IAAI,CAAC1D,MAAM,CAAC0D,KAAK,CAAC,CAAC,qBAAqB,EAAEqB,IAAIrE,IAAI,CAAC,CAAC,CAAC,EAAEgD;YAEzD;QACF;QAEA,IAAI,CAAC1D,MAAM,CAAC6B,GAAG,CAAC,CAAC,wCAAwC,EAAEiB,iBAAiBd,MAAM,CAAC,MAAM,CAAC;QAC1F,KAAK,MAAMqD,iBAAiBvC,iBAAkB;YAC5C,IAAI;gBACF,MAAMwC,cAAc,MAAM,IAAI,CAACpF,iBAAiB,CAACqF,gBAAgB,CAACF,cAAcG,KAAK;gBACrF,MAAMC,qBAAqBH,YAAY9C,QAAQ,CAACkD,GAAG,CAAC,CAACC,IAAMA,EAAE9B,SAAS;gBACtE,MAAM+B,yBAAyB,AAACP,cAActB,KAAK,CAACvB,QAAQ,CACzDqD,MAAM,CAAC,CAACF,IAAM,CAAC,CAACzC,YAAY,CAACyC,EAAE9B,SAAS,CAAC,EACzC6B,GAAG,CAAC,CAACC,IAAMzC,YAAY,CAACyC,EAAE9B,SAAS,CAAC;gBAEvC,KAAK,MAAMiC,cAAcL,mBAAmBI,MAAM,CAAC,CAACE,MAAQ,CAACH,uBAAuBI,QAAQ,CAACD,MAAO;oBAClG,IAAI;wBACF,MAAM,IAAI,CAAC7F,iBAAiB,CAAC+F,oBAAoB,CAACX,YAAYhC,EAAE,EAAEwC;oBACpE,EAAE,OAAOpC,OAAO;wBACd,IAAI,CAAC1D,MAAM,CAAC0D,KAAK,CAAC,CAAC,yBAAyB,EAAEoC,WAAW,UAAU,EAAER,YAAY5E,IAAI,CAAC,CAAC,CAAC,EAAEgD;oBAE5F;gBACF;gBACA,KAAK,MAAMwC,oBAAoBN,uBAAuBC,MAAM,CAAC,CAACE,MAAQ,CAACN,mBAAmBO,QAAQ,CAACD,MAAO;oBACxG,IAAI;wBACF,MAAM,IAAI,CAAC7F,iBAAiB,CAACkF,eAAe,CAACE,YAAYhC,EAAE,EAAE4C;oBAC/D,EAAE,OAAOxC,OAAO;wBACd,IAAI,CAAC1D,MAAM,CAAC0D,KAAK,CAAC,CAAC,sBAAsB,EAAEwC,iBAAiB,QAAQ,EAAEZ,YAAY5E,IAAI,CAAC,CAAC,CAAC,EAAEgD;oBAE7F;gBACF;YACF,EAAE,OAAOA,OAAO;gBACd,IAAI,CAAC1D,MAAM,CAAC0D,KAAK,CAAC,CAAC,qBAAqB,EAAE2B,cAActB,KAAK,CAACrD,IAAI,CAAC,CAAC,CAAC,EAAEgD;YAEzE;QACF;QAEA,OAAO;YACLrB;YACAK;YACAJ;YACAK;YACAO;YACAgB;QACF;IACF;IAEA,MAAMpC,eAAeF,QAAa,EAAE;QAElC,IAAIA,SAASuE,MAAM,EAAE;YACnB,MAAM,IAAI,CAAC1F,aAAa,CAAC2F,oBAAoB,CAACxE,SAASuE,MAAM;QAC/D;QACA,IAAIvE,SAASyE,OAAO,EAAE;YACpB,MAAM,IAAI,CAAC5F,aAAa,CAAC6F,qBAAqB,CAAC1E,SAASyE,OAAO;QACjE;QACA,IAAIzE,SAAS2E,QAAQ,EAAE;YACrB,MAAM,IAAI,CAAC9F,aAAa,CAAC+F,sBAAsB,CAAC5E,SAAS2E,QAAQ;QACnE;QAEA,IAAI3E,SAAS6E,MAAM,EAAEC,iBAAiB;YACpC,MAAMC,wBAAgC/E,SAAS6E,MAAM,CAACG,aAAa;YACnE,IAAI,CAAC5G,MAAM,CAAC6B,GAAG,CAAC,CAAC,0CAA0C,EAAE8E,uBAAuB;YACpF,MAAM,IAAI,CAAClG,aAAa,CAACoG,kBAAkB,CAACF;QAC9C;QAEA,MAAM,IAAI,CAAClG,aAAa,CAACqG,YAAY;QACrC,IAAI,CAAC9G,MAAM,CAAC6B,GAAG,CAAC;IAClB;IAEA,MAAMI,YAAYF,KAAY,EAAEhB,kBAA2B,EAAE;QAC3D,MAAMgG,WAAW,IAAI,CAACvG,WAAW,CAACwG,KAAK;QAEvC,KAAK,MAAMC,QAAQlF,MAAO;YAExB,IAAIhB,sBAAsB,OAAOkG,KAAK3D,EAAE,KAAK,UAAU;gBACrD2D,KAAK3D,EAAE,GAAG4D,OAAOC,QAAQ,CAACF,KAAK3D,EAAE;YACnC;YAGA,MAAM8D,YAAY,AAACH,CAAAA,KAAKD,KAAK,IAAI,EAAE,AAAD,EAAGnB,MAAM,CAAC,CAACwB,WAAqBN,SAASO,IAAI,CAAC,CAACC,IAAMA,EAAE7G,IAAI,KAAK2G;YAGlG,MAAM,IAAI,CAAC9G,WAAW,CAACiH,QAAQ,CAAC;gBAC9BC,UAAUR,KAAKQ,QAAQ;gBACvBC,UAAU;gBACVV,OAAOI;gBACPO,YAAYV,KAAKU,UAAU,IAAI;gBAC/BC,YAAYX,KAAKW,UAAU,IAAI;gBAC/BC,YAAYZ,KAAKY,UAAU,IAAI;gBAC/BC,qBAAqBb,KAAKa,mBAAmB,IAAI;YACnD;YAGA,MAAM,IAAI,CAACvH,WAAW,CAACwH,kCAAkC,CAACd,KAAKQ,QAAQ,EAAER,KAAKe,YAAY;QAC5F;QACA,IAAI,CAAChI,MAAM,CAAC6B,GAAG,CAAC,CAAC,SAAS,EAAEE,MAAMC,MAAM,CAAC,MAAM,CAAC;IAClD;IAEA,MAAML,0BAA0Bd,UAA4B,EAAE;QAC5D,MAAMoH,SAAmB,EAAE;QAG3B,MAAMvB,kBAAkB,IAAI,CAACjG,aAAa,CAACyH,iBAAiB,IAAIxB;QAChE,IAAI,CAACA,iBAAiB;YACpB;QACF;QAEA,IAAI7F,WAAWe,QAAQ,IAAIf,WAAWQ,MAAM,CAACF,cAAc,EAAE;YAC3D,MAAMgH,mBAAmB,IAAI,CAAC1H,aAAa,CAAC2H,WAAW;YACvD,IAAID,oBAAoBE,OAAOC,IAAI,CAACH,kBAAkBnG,MAAM,GAAG,GAAG;gBAChEiG,OAAOxD,IAAI,CAAC;YACd;QACF;QAEA,IAAI5D,WAAWkB,KAAK,IAAIlB,WAAWkB,KAAK,CAACC,MAAM,GAAG,KAAKnB,WAAWQ,MAAM,CAACD,WAAW,EAAE;YACpF,MAAMmH,gBAAgB,MAAM,IAAI,CAAChI,WAAW,CAACiI,SAAS,CAAC;YACvD,IAAID,cAAcvG,MAAM,GAAG,GAAG;gBAC5BiG,OAAOxD,IAAI,CAAC;YACd;QACF;QAEA,IAAIwD,OAAOjG,MAAM,GAAG,GAAG;YACrB,MAAM,IAAIuB,MAAM,CAAC,2BAA2B,EAAE0E,OAAOQ,IAAI,CAAC,OAAO;QACnE;IACF;IAEA,MAAMlG,sBAAsBmG,cAAqB,EAAEC,oBAA8B,EAAE;QACjF,MAAMC,mBAAmB,MAAM,IAAI,CAACzI,cAAc,CAAC0I,IAAI;QAEvD,MAAMC,QAAQF,iBAAiBlD,GAAG,CAAC,CAACC,IAAMA,EAAEjF,IAAI,CAACqI,WAAW;QAC5D,MAAMC,OAAOJ,iBAAiBlD,GAAG,CAAC,CAACC,IAAMA,EAAEsD,UAAU;QACrD,MAAMC,MAAMN,iBAAiBlD,GAAG,CAAC,CAACC,IAAMA,EAAErC,EAAE,CAAC6F,QAAQ;QAErD,MAAM7G,iBAAiB,EAAE;QACzB,MAAMD,2BAA2B,EAAE;QACnC,KAAK,MAAM8C,WAAWuD,eAAgB;YACpC,KAAK,MAAMU,YAAY;mBAAIT;gBAAsB;aAAM,CAAE;gBACvD,IAAIS,aAAa,QAAQ;oBACvB,MAAMC,eAAelE,QAAQzE,IAAI,CAACqI,WAAW;oBAC7C,MAAMO,aAAaR,MAAMS,SAAS,CAAC,CAACC,IAAMA,MAAMH;oBAChD,IAAIC,eAAe,CAAC,GAAG;wBACrB,IAAI,CAACJ,GAAG,CAACI,WAAW,EAAE;4BACpB,MAAM,IAAI/F,MAAM;wBAClB;wBACAlB,yBAAyBoC,IAAI,CAAC;4BAC5B2E,UAAU;4BACVvF,WAAWqD,OAAOC,QAAQ,CAAC+B,GAAG,CAACI,WAAW;4BAC1CvF,OAAOoB;wBACT;wBACA;oBACF;gBACF,OAAO,IAAIiE,aAAa,OAAO;oBAC7B,MAAMC,eAAelE,QAAQ8D,UAAU,CAACF,WAAW;oBACnD,MAAMO,aAAaN,KAAKO,SAAS,CAAC,CAACC,IAAMA,MAAMH;oBAC/C,IAAIC,eAAe,CAAC,GAAG;wBACrB,IAAI,CAACJ,GAAG,CAACI,WAAW,EAAE;4BACpB,MAAM,IAAI/F,MAAM;wBAClB;wBACAlB,yBAAyBoC,IAAI,CAAC;4BAC5B2E,UAAU;4BACVvF,WAAWqD,OAAOC,QAAQ,CAAC+B,GAAG,CAACI,WAAW;4BAC1CvF,OAAOoB;wBACT;wBACA;oBACF;gBACF,OAAO,IAAIiE,aAAa,OAAO;oBAC7B,IAAI,CAACjE,QAAQ7B,EAAE,EAAE;wBACf,MAAM,IAAIC,MAAMC,KAAKC,SAAS,CAAC0B;oBACjC;oBACA7C,eAAemC,IAAI,CAACU;oBACpB;gBACF;YACF;QACF;QAEA,OAAO;YACL9C;YACAC;QACF;IACF;IAEA,MAAMM,oBAAoB6G,YAAmB,EAAEC,kBAA0B,EAAE;QACzE,MAAMC,iBAAiB,MAAM,IAAI,CAACrJ,YAAY,CAACuI,IAAI;QACnD,MAAMC,QAAQa,eAAejE,GAAG,CAAC,CAACC,IAAMA,EAAEjF,IAAI,CAACqI,WAAW;QAC1D,MAAMa,cAAcD,eAAejE,GAAG,CAAC,CAACC,IAAMA,EAAEkE,KAAK;QACrD,MAAMX,MAAMS,eAAejE,GAAG,CAAC,CAACC,IAAMA,EAAErC,EAAE,CAAC6F,QAAQ;QAEnD,MAAMxG,eAAe,EAAE;QACvB,MAAMD,yBAAyB,EAAE;QACjC,KAAK,MAAMP,SAASsH,aAAc;YAChC,KAAK,MAAML,YAAY;gBAACM;gBAAoB;aAAM,CAAE;gBAClD,IAAIN,aAAa,QAAQ;oBACvB,MAAMU,mBAAmB3H,MAAMzB,IAAI,CAACqI,WAAW;oBAC/C,MAAMO,aAAaR,MAAMS,SAAS,CAAC,CAACC,IAAMA,MAAMM;oBAChD,IAAIR,eAAe,CAAC,GAAG;wBACrB,IAAI,CAACJ,GAAG,CAACI,WAAW,EAAE;4BACpB,MAAM,IAAI/F,MAAM;wBAClB;wBACAb,uBAAuB+B,IAAI,CAAC;4BAC1B2E,UAAU;4BACV5E,SAAS0C,OAAOC,QAAQ,CAAC+B,GAAG,CAACI,WAAW;4BACxCvF,OAAO5B;wBACT;wBACA;oBACF;gBACF,OAAO,IAAIiH,aAAa,SAAS;oBAC/B,MAAMU,mBAAmB3H,MAAM0H,KAAK;oBACpC,MAAMP,aAAaM,YAAYL,SAAS,CAAC,CAACC,IAAMA,MAAMM;oBACtD,IAAIR,eAAe,CAAC,GAAG;wBACrB,IAAI,CAACJ,GAAG,CAACI,WAAW,EAAE;4BACpB,MAAM,IAAI/F,MAAM;wBAClB;wBACAb,uBAAuB+B,IAAI,CAAC;4BAC1B2E,UAAU;4BACV5E,SAAS0C,OAAOC,QAAQ,CAAC+B,GAAG,CAACI,WAAW;4BACxCvF,OAAO5B;wBACT;wBACA;oBACF;gBACF,OAAO,IAAIiH,aAAa,OAAO;oBAC7BzG,aAAa8B,IAAI,CAACtC;oBAClB;gBACF;YACF;QACF;QAEA,OAAO;YACLO;YACAC;QACF;IACF;IAEA,MAAMK,kBAAkB+G,UAAiB,EAAE;QACzC,IAAI,CAACA,YAAY/H,QAAQ;YACvB,OAAO;gBACLc,kBAAkB,EAAE;gBACpBC,YAAY,EAAE;YAChB;QACF;QAEA,MAAMiH,eAAe,MAAM,IAAI,CAAC9J,iBAAiB,CAAC+J,QAAQ;QAC1D,MAAMnB,QAAQkB,aAAatE,GAAG,CAAC,CAACC,IAAMA,EAAEjF,IAAI,CAACqI,WAAW;QACxD,MAAMG,MAAMc,aAAatE,GAAG,CAAC,CAACC,IAAMA,EAAErC,EAAE,CAAC6F,QAAQ;QAEjD,MAAMpG,aAAa,EAAE;QACrB,MAAMD,mBAAmB,EAAE;QAC3B,KAAK,MAAMiC,OAAOgF,WAAY;YAC5B,MAAMD,mBAAmB/E,IAAIrE,IAAI,CAACqI,WAAW;YAC7C,MAAMO,aAAaR,MAAMS,SAAS,CAAC,CAACC,IAAMA,MAAMM;YAChD,IAAIR,eAAe,CAAC,GAAG;gBACrB,IAAI,CAACJ,GAAG,CAACI,WAAW,EAAE;oBACpB,MAAM,IAAI/F,MAAM;gBAClB;gBACAT,iBAAiB2B,IAAI,CAAC;oBACpB2E,UAAU;oBACV5D,OAAO0B,OAAOC,QAAQ,CAAC+B,GAAG,CAACI,WAAW;oBACtCvF,OAAOgB;gBACT;gBACA;YACF,OAAO;gBACLhC,WAAW0B,IAAI,CAACM;YAClB;QACF;QAEA,OAAO;YACLhC;YACAD;QACF;IACF;IAEA,MAAMoH,WAAWC,OAAuD,EAAE;QACxE,MAAMC,QAAQ,MAAM5I,IAAAA,yBAAa,EAAC2I,SAASE,qDAA8B;QAEzE,MAAM,EAAEC,YAAY,EAAErJ,cAAc,EAAEC,eAAe,EAAEqJ,UAAU,EAAEpJ,cAAc,EAAEC,WAAW,EAAE,GAAGgJ;QAEnG,MAAMI,eAAe;YACnBC,SAASC,QAAQC,GAAG,CAACC,mBAAmB;YACxCC,YAAY,IAAIC;YAChB9J,cAAc;YACdK,QAAQ+I;YACR5H,UAAUuI;YACV7I,QAAQ6I;YACR9H,MAAM8H;YACNnJ,UAAUmJ;YACVhJ,OAAOgJ;YACPC,YAAYD;QACd;QAEA,IAAI9J,gBAAgB;YAClB,MAAMuB,WAAW,MAAM,IAAI,CAACrC,cAAc,CAAC0I,IAAI;YAC/C2B,aAAahI,QAAQ,GAAGA,SAASkD,GAAG,CAAC,CAACC;gBACpC,MAAM9B,YAAY8B,EAAErC,EAAE;gBACtB,MAAM,EAAE2H,MAAM,EAAE,GAAG,IAAI,CAAC7K,YAAY,CAAC8K,WAAW,CAACrH;gBACjD,OAAO;oBACLP,IAAIO;oBACJsH,gBAAgBxF,EAAEwF,cAAc;oBAChCC,SAASzF,EAAEyF,OAAO;oBAClBC,aAAa1F,EAAE0F,WAAW;oBAC1BC,WAAW3F,EAAE2F,SAAS;oBACtB5K,MAAMiF,EAAEjF,IAAI;oBACZuI,YAAYtD,EAAEsD,UAAU;oBACxBgC;gBACF;YACF;QACF;QAEA,IAAIX,cAAc;YAChB,MAAMpI,SAAS,MAAM,IAAI,CAAC7B,UAAU,CAACkL,SAAS;YAC9Cf,aAAatI,MAAM,GAAGA,OAAOwD,GAAG,CAAC,CAAC8F;gBAChC,MAAMC,cAAc;oBAClBnI,IAAIkI,EAAElI,EAAE;oBACRuG,OAAO2B,EAAE3B,KAAK;oBACdnJ,MAAM8K,EAAE9K,IAAI;oBACZ8B,UAAUuI;gBACZ;gBAEA,IAAI7J,iBAAiB;oBACnBuK,YAAYjJ,QAAQ,GAAGgJ,EAAEhJ,QAAQ,CAACkD,GAAG,CAAC,CAACC;wBACrC,MAAM+F,aAAa/F,EAAE9B,SAAS;wBAC9B,OAAO;4BACLA,WAAW6H;4BACXC,GAAGhG,EAAEgG,CAAC;4BACNC,GAAGjG,EAAEiG,CAAC;wBACR;oBACF;gBACF;gBAEA,OAAOH;YACT;QACF;QAEA,IAAIlB,YAAY;YACd,MAAMtH,OAAO,MAAM,IAAI,CAAC/C,iBAAiB,CAAC+J,QAAQ;YAClDO,aAAavH,IAAI,GAAGA,KAAKyC,GAAG,CAAC,CAACmG;gBAC5B,OAAO;oBACLnL,MAAMmL,EAAEnL,IAAI;oBACZ4C,IAAIuI,EAAEvI,EAAE;oBACRd,UAAUqJ,EAAErJ,QAAQ,CAACkD,GAAG,CAAC,CAACC;wBACxB,OAAO;4BACL9B,WAAW8B,EAAE9B,SAAS;wBACxB;oBACF;gBACF;YACF;QACF;QAEA,IAAI1C,gBAAgB;YAClBqJ,aAAa5I,QAAQ,GAAG,IAAI,CAACnB,aAAa,CAAC2H,WAAW;QACxD;QAEA,IAAIhH,aAAa;YACf,MAAMW,QAAQ,MAAM,IAAI,CAACxB,WAAW,CAACiI,SAAS,CAAC;YAE/CgC,aAAazI,KAAK,GAAGA,MAAM2D,GAAG,CAAC,CAACoG;gBAC9B,MAAMC,UAAU,IAAI,CAACxL,WAAW,CAACyL,KAAK,CAACF;gBACvC,OAAO;oBACLxI,IAAIyI,QAAQzI,EAAE;oBACdmE,UAAUsE,QAAQtE,QAAQ;oBAC1BG,YAAYmE,QAAQnE,UAAU;oBAC9BD,YAAYoE,QAAQpE,UAAU;oBAC9BE,YAAYkE,QAAQlE,UAAU;oBAC9BC,qBAAqBiE,QAAQjE,mBAAmB;oBAChDE,cAAc8D,EAAE9D,YAAY;oBAC5BiE,WAAWF,QAAQE,SAAS;oBAC5BjF,OAAO+E,QAAQ/E,KAAK;gBACtB;YACF;QACF;QAEA,OAAOkF,IAAAA,YAAI,EAAC1B,cAAc,CAAC;IAC7B;IAEQlJ,kBAAkBT,UAA4B,EAAEE,kBAA2B,EAAE;QAEnF,KAAK,MAAMoE,WAAWtE,WAAW2B,QAAQ,CAAE;YAEzC,IAAI,CAAC2C,QAAQzE,IAAI,IAAIyE,QAAQgH,WAAW,EAAE;gBACxChH,QAAQzE,IAAI,GAAGyE,QAAQgH,WAAW;gBAClC,OAAOhH,QAAQgH,WAAW;YAC5B;YAEA,IAAIhH,QAAQiH,kBAAkB,EAAE1L,MAAM;gBACpCyE,QAAQzE,IAAI,GAAGyE,QAAQiH,kBAAkB,EAAE1L;gBAC3C,OAAOyE,QAAQiH,kBAAkB,EAAE1L;YACrC;YAEA,IAAIK,sBAAsB,OAAOoE,QAAQ7B,EAAE,KAAK,UAAU;gBACxD6B,QAAQ7B,EAAE,GAAG4D,OAAOC,QAAQ,CAAChC,QAAQ7B,EAAE;YACzC;YAGA,IAAI,CAAC;gBAAC+I,kCAAa;gBAAEC,kCAAa;gBAAEC,kCAAa;gBAAEC,8BAAS;aAAC,CAACxG,QAAQ,CAACb,QAAQkG,WAAW,GAAG;gBAC3FlG,QAAQkG,WAAW,GAAGgB,kCAAa;YACrC;QACF;QAGA,KAAK,MAAMlK,SAAStB,WAAWqB,MAAM,CAAE;YAErC,IAAIC,MAAMA,KAAK,KAAK4I,aAAa5I,MAAM0H,KAAK,KAAKkB,WAAW;gBAC1D5I,MAAM0H,KAAK,GAAG1H,MAAMA,KAAK;gBACzB,OAAOA,MAAMA,KAAK;YACpB;YAGA,IAAIpB,oBAAoB;gBACtB,IAAI,OAAOoB,MAAMmB,EAAE,KAAK,UAAU;oBAChCnB,MAAMmB,EAAE,GAAG4D,OAAOC,QAAQ,CAAChF,MAAMmB,EAAE;gBACrC;gBAEA,KAAK,MAAM6B,WAAWhD,MAAMK,QAAQ,CAAE;oBACpC,IAAI,OAAO2C,QAAQtB,SAAS,KAAK,UAAU;wBACzCsB,QAAQtB,SAAS,GAAGqD,OAAOC,QAAQ,CAAChC,QAAQtB,SAAS;oBACvD;gBACF;YACF;QACF;QAGA,IAAI,AAAChD,WAAmB4L,MAAM,IAAI,CAAC5L,WAAWoC,IAAI,EAAE;YAClDpC,WAAWoC,IAAI,GAAG,AAACpC,WAAmB4L,MAAM;YAC5C,OAAO,AAAC5L,WAAmB4L,MAAM;QACnC;QAGA,IAAI,AAAC5L,WAAWQ,MAAM,CAASqL,YAAY,KAAK3B,aAAalK,WAAWQ,MAAM,CAACkJ,UAAU,KAAKQ,WAAW;YACtGlK,WAAWQ,MAAM,CAASkJ,UAAU,GAAG,AAAC1J,WAAWQ,MAAM,CAASqL,YAAY;YAC/E,OAAO,AAAC7L,WAAWQ,MAAM,CAASqL,YAAY;QAChD;IACF;AACF"}
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/yaml.service.ts"],"names":["YamlService","logger","loggerFactory","printerTagService","printerService","printerCache","floorStore","floorService","userService","roleService","settingsStore","name","importYaml","yamlBuffer","importSpec","load","databaseTypeSqlite","databaseType","exportPrinters","exportFloorGrid","exportSettings","exportUsers","config","normalizeYamlData","importData","validateInput","importPrintersFloorsYamlSchema","hasSystemData","validateSystemTablesEmpty","settings","log","importSettings","users","length","importUsers","floors","floor","importPrinterPositionsSchema","updateByPropertyPrinters","insertPrinters","analysePrintersUpsert","printers","printerComparisonStrategiesByPriority","updateByPropertyFloors","insertFloors","analyseFloorsUpsert","floorComparisonStrategiesByPriority","updateByNameTags","insertTags","analyseUpsertTags","tags","printerIdMap","newPrinter","state","create","id","Error","JSON","stringify","error","updatePrinterSpec","updateId","printerId","updatedPrinter","value","originalPrinterId","update","floorIdMap","newFloor","originalFloorId","knownPrinterPositions","floorPosition","knownPrinterId","floorId","push","createdFloor","updateFloorSpec","updatedFloor","knownPrinters","loadStore","tag","createdTag","createTag","color","printer","addPrinterToTag","updateTagSpec","existingTag","getPrintersByTag","tagId","existingPrinterIds","map","p","wantedTargetPrinterIds","filter","unwantedId","eid","includes","removePrinterFromTag","nonExistingNewId","server","updateServerSettings","timeout","updateTimeoutSettings","frontend","updateFrontendSettings","wizard","wizardCompleted","importedWizardVersion","wizardVersion","setWizardCompleted","credential","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","slicerApiKey","updateCoreCredentialSettings","getCredentialSettings","setSlicerApiKey","loadSettings","allRoles","roles","user","Number","parseInt","roleNames","roleName","some","r","register","username","password","isRootUser","isDemoUser","isVerified","needsPasswordChange","updatePasswordHashUnsafeByUsername","passwordHash","errors","getWizardSettings","existingSettings","getSettings","Object","keys","existingUsers","listUsers","join","upsertPrinters","comparisonStrategies","existingPrinters","list","names","toLowerCase","urls","printerURL","ids","toString","strategy","comparedName","foundIndex","findIndex","n","upsertFloors","comparisonStrategy","existingFloors","floorLevels","order","comparedProperty","upsertTags","existingTags","listTags","exportYaml","options","input","exportPrintersFloorsYamlSchema","exportFloors","exportTags","dumpedObject","version","process","env","npm_package_version","exportedAt","Date","undefined","user_roles","apiKey","getLoginDto","disabledReason","enabled","printerType","dateAdded","listCache","f","dumpedFloor","fPrinterId","x","y","t","getSettingsSensitive","u","userDto","toDto","createdAt","dump","printerName","settingsAppearance","OctoprintType","MoonrakerType","PrusaLinkType","BambuType","groups","exportGroups"],"mappings":"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"}
|
|
@@ -284,9 +284,10 @@ class FileStorageService {
|
|
|
284
284
|
try {
|
|
285
285
|
const buffer = Buffer.from(thumb.data, 'base64');
|
|
286
286
|
await (0, _promises.writeFile)(thumbPath, buffer);
|
|
287
|
+
const relativePath = _nodepath.default.relative(this.storageBasePath, thumbPath);
|
|
287
288
|
savedThumbnails.push({
|
|
288
289
|
index: i,
|
|
289
|
-
path:
|
|
290
|
+
path: relativePath,
|
|
290
291
|
filename,
|
|
291
292
|
width: thumb.width || 0,
|
|
292
293
|
height: thumb.height || 0,
|
|
@@ -368,7 +369,7 @@ class FileStorageService {
|
|
|
368
369
|
const ext = (0, _nodepath.extname)(filePath).substring(1);
|
|
369
370
|
return {
|
|
370
371
|
fileStorageId,
|
|
371
|
-
fileName: metadata?.
|
|
372
|
+
fileName: metadata?._originalFileName || (0, _nodepath.basename)(filePath),
|
|
372
373
|
fileFormat: ext,
|
|
373
374
|
fileSize: stats.size,
|
|
374
375
|
fileHash: metadata?._fileHash || '',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/file-storage.service.ts"],"names":["FileStorageService","printJobRepository","logger","storageBasePath","STORAGE_SUBDIRS","loggerFactory","typeormService","getDataSource","getRepository","PrintJob","name","join","superRootPath","AppConstants","defaultPrintFilesStorage","ensureStorageDirectories","mkdir","recursive","subdir","error","readFile","fileStorageId","filePath","getFilePath","readFileSync","saveFile","file","fileHash","fileExt","extname","originalname","toLowerCase","fileId","nameHash","createHash","update","digest","substring","crypto","randomUUID","includes","targetDir","targetPath","path","rename","buffer","writeFile","Error","log","getFile","findFilePath","deleteFile","warn","unlink","metadataPath","debug","thumbnailDir","replace","rm","force","ext","fullPath","existsSync","calculateFileHash","fileBuffer","hashSum","getDeterministicId","fileName","dirPath","files","readdir","matchingFile","find","f","startsWith","fileExists","findDuplicateByHash","findOne","where","order","createdAt","saveMetadata","metadata","originalFileName","thumbnailMetadata","existingOriginalFileName","existingThumbnails","existingContent","existing","JSON","parse","_originalFileName","_thumbnails","metadataWithMeta","_fileHash","_analyzedAt","Date","toISOString","_fileStorageId","stringify","thumbnailMeta","length","loadMetadata","content","hasMetadata","access","saveThumbnails","thumbnails","savedThumbnails","i","thumb","data","format","filename","thumbPath","Buffer","from","push","index","width","height","size","getThumbnail","listThumbnails","filter","sort","a","b","localeCompare","listAllFiles","dirFiles","endsWith","stats","stat","_fileName","fileFormat","fileSize","birthtime","thumbnailCount","getTime","getFileInfo","basename"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../src/services/file-storage.service.ts"],"names":["FileStorageService","printJobRepository","logger","storageBasePath","STORAGE_SUBDIRS","loggerFactory","typeormService","getDataSource","getRepository","PrintJob","name","join","superRootPath","AppConstants","defaultPrintFilesStorage","ensureStorageDirectories","mkdir","recursive","subdir","error","readFile","fileStorageId","filePath","getFilePath","readFileSync","saveFile","file","fileHash","fileExt","extname","originalname","toLowerCase","fileId","nameHash","createHash","update","digest","substring","crypto","randomUUID","includes","targetDir","targetPath","path","rename","buffer","writeFile","Error","log","getFile","findFilePath","deleteFile","warn","unlink","metadataPath","debug","thumbnailDir","replace","rm","force","ext","fullPath","existsSync","calculateFileHash","fileBuffer","hashSum","getDeterministicId","fileName","dirPath","files","readdir","matchingFile","find","f","startsWith","fileExists","findDuplicateByHash","findOne","where","order","createdAt","saveMetadata","metadata","originalFileName","thumbnailMetadata","existingOriginalFileName","existingThumbnails","existingContent","existing","JSON","parse","_originalFileName","_thumbnails","metadataWithMeta","_fileHash","_analyzedAt","Date","toISOString","_fileStorageId","stringify","thumbnailMeta","length","loadMetadata","content","hasMetadata","access","saveThumbnails","thumbnails","savedThumbnails","i","thumb","data","format","filename","thumbPath","Buffer","from","relativePath","relative","push","index","width","height","size","getThumbnail","listThumbnails","filter","sort","a","b","localeCompare","listAllFiles","dirFiles","endsWith","stats","stat","_fileName","fileFormat","fileSize","birthtime","thumbnailCount","getTime","getFileInfo","basename"],"mappings":"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"}
|
|
@@ -48,8 +48,8 @@ class SettingsService extends (0, _baseservice.BaseService)(_entities.Settings,
|
|
|
48
48
|
await this.update(entity.id, entity);
|
|
49
49
|
return entity;
|
|
50
50
|
}
|
|
51
|
-
async
|
|
52
|
-
const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.
|
|
51
|
+
async updateCoreCredentialSettings(update) {
|
|
52
|
+
const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.credentialCoreSettingUpdateSchema);
|
|
53
53
|
const entity = await this.getOrCreate();
|
|
54
54
|
entity[_serversettingsconstants.credentialSettingsKey].refreshTokenExpiry = validatedInput.refreshTokenExpiry;
|
|
55
55
|
entity[_serversettingsconstants.credentialSettingsKey].refreshTokenAttempts = validatedInput.refreshTokenAttempts;
|
|
@@ -57,6 +57,13 @@ class SettingsService extends (0, _baseservice.BaseService)(_entities.Settings,
|
|
|
57
57
|
await this.update(entity.id, entity);
|
|
58
58
|
return entity;
|
|
59
59
|
}
|
|
60
|
+
async updateSlicerApiKey(update) {
|
|
61
|
+
const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.slicerApiKeyUpdateSchema);
|
|
62
|
+
const entity = await this.getOrCreate();
|
|
63
|
+
entity[_serversettingsconstants.credentialSettingsKey].slicerApiKey = validatedInput.slicerApiKey;
|
|
64
|
+
await this.update(entity.id, entity);
|
|
65
|
+
return entity;
|
|
66
|
+
}
|
|
60
67
|
async updateFrontendSettings(update) {
|
|
61
68
|
const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.frontendSettingsUpdateSchema);
|
|
62
69
|
const entity = await this.getOrCreate();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/settings.service.ts"],"names":["SettingsService","BaseService","Settings","SettingsDto","toDto","entity","serverSettingsKey","frontendSettingKey","wizardSettingKey","timeoutSettingKey","getOrCreate","settings","getOptional","migrateSettingsRuntime","settingsId","id","update","create","getDefaultSettings","updateServerSettings","validatedInput","validateInput","serverSettingsUpdateSchema","updateJwtSecretCredentialSetting","jwtSecretCredentialSettingUpdateSchema","credentialSettingsKey","jwtSecret","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/settings.service.ts"],"names":["SettingsService","BaseService","Settings","SettingsDto","toDto","entity","serverSettingsKey","frontendSettingKey","wizardSettingKey","timeoutSettingKey","getOrCreate","settings","getOptional","migrateSettingsRuntime","settingsId","id","update","create","getDefaultSettings","updateServerSettings","validatedInput","validateInput","serverSettingsUpdateSchema","updateJwtSecretCredentialSetting","jwtSecretCredentialSettingUpdateSchema","credentialSettingsKey","jwtSecret","updateCoreCredentialSettings","credentialCoreSettingUpdateSchema","refreshTokenExpiry","refreshTokenAttempts","jwtExpiresIn","updateSlicerApiKey","slicerApiKeyUpdateSchema","slicerApiKey","updateFrontendSettings","frontendSettingsUpdateSchema","updateTimeoutSettings","timeoutSettingsUpdateSchema","updateWizardSettings","wizardUpdateSchema","settingsList","repository","find","take","length"],"mappings":"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"}
|
|
@@ -12,8 +12,11 @@ _export(exports, {
|
|
|
12
12
|
get bambuSupportSchema () {
|
|
13
13
|
return bambuSupportSchema;
|
|
14
14
|
},
|
|
15
|
-
get
|
|
16
|
-
return
|
|
15
|
+
get credentialCoreSettingUpdateSchema () {
|
|
16
|
+
return credentialCoreSettingUpdateSchema;
|
|
17
|
+
},
|
|
18
|
+
get credentialSettingSchema () {
|
|
19
|
+
return credentialSettingSchema;
|
|
17
20
|
},
|
|
18
21
|
get frontendSettingsUpdateSchema () {
|
|
19
22
|
return frontendSettingsUpdateSchema;
|
|
@@ -33,6 +36,9 @@ _export(exports, {
|
|
|
33
36
|
get serverSettingsUpdateSchema () {
|
|
34
37
|
return serverSettingsUpdateSchema;
|
|
35
38
|
},
|
|
39
|
+
get slicerApiKeyUpdateSchema () {
|
|
40
|
+
return slicerApiKeyUpdateSchema;
|
|
41
|
+
},
|
|
36
42
|
get timeoutSettingsUpdateSchema () {
|
|
37
43
|
return timeoutSettingsUpdateSchema;
|
|
38
44
|
},
|
|
@@ -58,16 +64,29 @@ const frontendSettingsUpdateSchema = _zod.z.object({
|
|
|
58
64
|
gridCols: _zod.z.number().int().min(1),
|
|
59
65
|
gridRows: _zod.z.number().int().min(1),
|
|
60
66
|
largeTiles: _zod.z.boolean(),
|
|
61
|
-
tilePreferCancelOverQuickStop: _zod.z.boolean()
|
|
67
|
+
tilePreferCancelOverQuickStop: _zod.z.boolean(),
|
|
68
|
+
gridNameSortDirection: _zod.z.enum([
|
|
69
|
+
'horizontal',
|
|
70
|
+
'vertical'
|
|
71
|
+
]).optional()
|
|
62
72
|
});
|
|
63
73
|
const jwtSecretCredentialSettingUpdateSchema = _zod.z.object({
|
|
64
74
|
jwtSecret: _zod.z.string().min(10)
|
|
65
75
|
});
|
|
66
|
-
const
|
|
76
|
+
const credentialSettingSchema = _zod.z.object({
|
|
77
|
+
jwtExpiresIn: _zod.z.number().int().min((0, _envutils.isProductionEnvironment)() ? 120 : 0).max((0, _envutils.isProductionEnvironment)() ? 7200 : Infinity),
|
|
78
|
+
refreshTokenAttempts: _zod.z.number().int().min(-1),
|
|
79
|
+
refreshTokenExpiry: _zod.z.number().int().min((0, _envutils.isProductionEnvironment)() ? 240 : 0),
|
|
80
|
+
slicerApiKey: _zod.z.string().nullable()
|
|
81
|
+
});
|
|
82
|
+
const credentialCoreSettingUpdateSchema = _zod.z.object({
|
|
67
83
|
jwtExpiresIn: _zod.z.number().int().min((0, _envutils.isProductionEnvironment)() ? 120 : 0).max((0, _envutils.isProductionEnvironment)() ? 7200 : Infinity),
|
|
68
84
|
refreshTokenAttempts: _zod.z.number().int().min(-1),
|
|
69
85
|
refreshTokenExpiry: _zod.z.number().int().min((0, _envutils.isProductionEnvironment)() ? 240 : 0)
|
|
70
86
|
});
|
|
87
|
+
const slicerApiKeyUpdateSchema = _zod.z.object({
|
|
88
|
+
slicerApiKey: _zod.z.string().nullable()
|
|
89
|
+
});
|
|
71
90
|
const wizardUpdateSchema = _zod.z.object({
|
|
72
91
|
wizardCompleted: _zod.z.boolean(),
|
|
73
92
|
wizardCompletedAt: _zod.z.date().nullable(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/validators/settings-service.validation.ts"],"names":["bambuSupportSchema","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/validators/settings-service.validation.ts"],"names":["bambuSupportSchema","credentialCoreSettingUpdateSchema","credentialSettingSchema","frontendSettingsUpdateSchema","jwtSecretCredentialSettingUpdateSchema","moonrakerSupportSchema","prusaLinkSupportSchema","sentryDiagnosticsEnabledSchema","serverSettingsUpdateSchema","slicerApiKeyUpdateSchema","timeoutSettingsUpdateSchema","wizardUpdateSchema","z","object","registration","boolean","loginRequired","experimentalMoonrakerSupport","experimentalBambuSupport","experimentalPrusaLinkSupport","sentryDiagnosticsEnabled","apiTimeout","number","int","min","apiUploadTimeout","gridCols","gridRows","largeTiles","tilePreferCancelOverQuickStop","gridNameSortDirection","enum","optional","jwtSecret","string","jwtExpiresIn","isProductionEnvironment","max","Infinity","refreshTokenAttempts","refreshTokenExpiry","slicerApiKey","nullable","wizardCompleted","wizardCompletedAt","date","wizardVersion","enabled"],"mappings":"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"}
|
|
@@ -92,6 +92,8 @@ const importPrintersFloorsYamlSchema = _zod.z.object({
|
|
|
92
92
|
printerURL: _printerservicevalidation.printerUrlValidator,
|
|
93
93
|
printerType: _printerservicevalidation.printerTypeValidator,
|
|
94
94
|
apiKey: _printerservicevalidation.printerApiKeyValidator,
|
|
95
|
+
username: _printerservicevalidation.printerUsernameValidator.optional(),
|
|
96
|
+
password: _printerservicevalidation.printerPasswordValidator.optional(),
|
|
95
97
|
enabled: _printerservicevalidation.printerEnabledValidator,
|
|
96
98
|
name: _printerservicevalidation.printerNameValidator,
|
|
97
99
|
printerName: _zod.z.string().optional(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlSchema","importPrinterPositionsSchema","importPrintersFloorsYamlSchema","numberOrStringIdValidator","printerPositionsSchema","z","object","exportPrinters","boolean","exportFloorGrid","exportFloors","exportTags","exportGroups","optional","exportSettings","default","exportUsers","printerComparisonStrategiesByPriority","array","string","refine","val","includes","min","floorComparisonStrategiesByPriority","notes","union","number","printerId","floorId","x","xValidator","y","yValidator","printers","version","exportedAt","date","databaseType","enum","config","id","printerURL","printerUrlValidator","printerType","printerTypeValidator","apiKey","printerApiKeyValidator","enabled","printerEnabledValidator","name","printerNameValidator","printerName","settingsAppearance","floors","order","floorOrderValidator","floor","floorNameValidator","tags","color","settings","any","users","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlSchema","importPrinterPositionsSchema","importPrintersFloorsYamlSchema","numberOrStringIdValidator","printerPositionsSchema","z","object","exportPrinters","boolean","exportFloorGrid","exportFloors","exportTags","exportGroups","optional","exportSettings","default","exportUsers","printerComparisonStrategiesByPriority","array","string","refine","val","includes","min","floorComparisonStrategiesByPriority","notes","union","number","printerId","floorId","x","xValidator","y","yValidator","printers","version","exportedAt","date","databaseType","enum","config","id","printerURL","printerUrlValidator","printerType","printerTypeValidator","apiKey","printerApiKeyValidator","username","printerUsernameValidator","password","printerPasswordValidator","enabled","printerEnabledValidator","name","printerNameValidator","printerName","settingsAppearance","floors","order","floorOrderValidator","floor","floorNameValidator","tags","color","settings","any","users","isDemoUser","isRootUser","isVerified","needsPasswordChange","passwordHash","createdAt","roles"],"mappings":"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"}
|
|
@@ -27,6 +27,16 @@ function migrateSettingsRuntime(knownSettings) {
|
|
|
27
27
|
...(0, _serversettingsconstants.getDefaultCredentialSettings)(),
|
|
28
28
|
jwtSecret: (0, _uuid.v4)()
|
|
29
29
|
};
|
|
30
|
+
if (entity[_serversettingsconstants.frontendSettingKey]) {
|
|
31
|
+
const defaultFrontendSettings = (0, _serversettingsconstants.getDefaultFrontendSettings)();
|
|
32
|
+
entity[_serversettingsconstants.frontendSettingKey] = {
|
|
33
|
+
gridCols: entity[_serversettingsconstants.frontendSettingKey].gridCols ?? defaultFrontendSettings.gridCols,
|
|
34
|
+
gridRows: entity[_serversettingsconstants.frontendSettingKey].gridRows ?? defaultFrontendSettings.gridRows,
|
|
35
|
+
largeTiles: entity[_serversettingsconstants.frontendSettingKey].largeTiles ?? defaultFrontendSettings.largeTiles,
|
|
36
|
+
tilePreferCancelOverQuickStop: entity[_serversettingsconstants.frontendSettingKey].tilePreferCancelOverQuickStop ?? defaultFrontendSettings.tilePreferCancelOverQuickStop,
|
|
37
|
+
gridNameSortDirection: entity[_serversettingsconstants.frontendSettingKey].gridNameSortDirection ?? defaultFrontendSettings.gridNameSortDirection
|
|
38
|
+
};
|
|
39
|
+
}
|
|
30
40
|
if (entity[_serversettingsconstants.serverSettingsKey]) {
|
|
31
41
|
const defaultServerSettings = (0, _serversettingsconstants.getDefaultServerSettings)();
|
|
32
42
|
entity[_serversettingsconstants.serverSettingsKey] = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/shared/runtime-settings.migration.ts"],"names":["migrateSettingsRuntime","knownSettings","entity","wizardSettingKey","getDefaultWizardSettings","timeoutSettingKey","getDefaultTimeout","defaultTimeoutSettings","apiTimeout","apiUploadTimeout","serverSettingsKey","getDefaultServerSettings","frontendSettingKey","getDefaultFrontendSettings","credentialSettingsKey","getDefaultCredentialSettings","jwtSecret","uuidv4","defaultServerSettings","loginRequired","registration","experimentalMoonrakerSupport","experimentalPrusaLinkSupport","experimentalBambuSupport","sentryDiagnosticsEnabled"],"mappings":";;;;+BAegBA;;;eAAAA;;;yCAJT;sBACsB;AAGtB,SAASA,uBAAuBC,aAAgC;IACrE,MAAMC,SAASD;IAEfC,MAAM,CAACC,yCAAgB,CAAC,KAAKC,IAAAA,iDAAwB;IACrDF,MAAM,CAACG,0CAAiB,CAAC,KAAKC,IAAAA,0CAAiB;IAE/C,IAAIJ,MAAM,CAACG,0CAAiB,CAAC,EAAE;QAC7B,MAAME,yBAAyBD,IAAAA,0CAAiB;QAChDJ,MAAM,CAACG,0CAAiB,CAAC,GAAG;YAC1BG,YAAYN,MAAM,CAACG,0CAAiB,CAAC,CAACG,UAAU,IAAID,uBAAuBC,UAAU;YACrFC,kBAAkBP,MAAM,CAACG,0CAAiB,CAAC,CAACI,gBAAgB,IAAIF,uBAAuBE,gBAAgB;QACzG;IACF;IAEAP,MAAM,CAACQ,0CAAiB,CAAC,KAAKC,IAAAA,iDAAwB;IACtDT,MAAM,CAACU,2CAAkB,CAAC,KAAKC,IAAAA,mDAA0B;IACzDX,MAAM,CAACY,8CAAqB,CAAC,KAAK;QAChC,GAAGC,IAAAA,qDAA4B,GAAE;QAEjCC,WAAWC,IAAAA,QAAM;IACnB;IAEA,IAAIf,MAAM,CAACQ,0CAAiB,CAAC,EAAE;QAC7B,
|
|
1
|
+
{"version":3,"sources":["../../src/shared/runtime-settings.migration.ts"],"names":["migrateSettingsRuntime","knownSettings","entity","wizardSettingKey","getDefaultWizardSettings","timeoutSettingKey","getDefaultTimeout","defaultTimeoutSettings","apiTimeout","apiUploadTimeout","serverSettingsKey","getDefaultServerSettings","frontendSettingKey","getDefaultFrontendSettings","credentialSettingsKey","getDefaultCredentialSettings","jwtSecret","uuidv4","defaultFrontendSettings","gridCols","gridRows","largeTiles","tilePreferCancelOverQuickStop","gridNameSortDirection","defaultServerSettings","loginRequired","registration","experimentalMoonrakerSupport","experimentalPrusaLinkSupport","experimentalBambuSupport","sentryDiagnosticsEnabled"],"mappings":";;;;+BAegBA;;;eAAAA;;;yCAJT;sBACsB;AAGtB,SAASA,uBAAuBC,aAAgC;IACrE,MAAMC,SAASD;IAEfC,MAAM,CAACC,yCAAgB,CAAC,KAAKC,IAAAA,iDAAwB;IACrDF,MAAM,CAACG,0CAAiB,CAAC,KAAKC,IAAAA,0CAAiB;IAE/C,IAAIJ,MAAM,CAACG,0CAAiB,CAAC,EAAE;QAC7B,MAAME,yBAAyBD,IAAAA,0CAAiB;QAChDJ,MAAM,CAACG,0CAAiB,CAAC,GAAG;YAC1BG,YAAYN,MAAM,CAACG,0CAAiB,CAAC,CAACG,UAAU,IAAID,uBAAuBC,UAAU;YACrFC,kBAAkBP,MAAM,CAACG,0CAAiB,CAAC,CAACI,gBAAgB,IAAIF,uBAAuBE,gBAAgB;QACzG;IACF;IAEAP,MAAM,CAACQ,0CAAiB,CAAC,KAAKC,IAAAA,iDAAwB;IACtDT,MAAM,CAACU,2CAAkB,CAAC,KAAKC,IAAAA,mDAA0B;IACzDX,MAAM,CAACY,8CAAqB,CAAC,KAAK;QAChC,GAAGC,IAAAA,qDAA4B,GAAE;QAEjCC,WAAWC,IAAAA,QAAM;IACnB;IAEA,IAAIf,MAAM,CAACU,2CAAkB,CAAC,EAAE;QAC9B,MAAMM,0BAA0BL,IAAAA,mDAA0B;QAG1DX,MAAM,CAACU,2CAAkB,CAAC,GAAG;YAC3BO,UAAUjB,MAAM,CAACU,2CAAkB,CAAC,CAACO,QAAQ,IAAID,wBAAwBC,QAAQ;YACjFC,UAAUlB,MAAM,CAACU,2CAAkB,CAAC,CAACQ,QAAQ,IAAIF,wBAAwBE,QAAQ;YACjFC,YAAYnB,MAAM,CAACU,2CAAkB,CAAC,CAACS,UAAU,IAAIH,wBAAwBG,UAAU;YACvFC,+BAA+BpB,MAAM,CAACU,2CAAkB,CAAC,CAACU,6BAA6B,IAAIJ,wBAAwBI,6BAA6B;YAChJC,uBAAuBrB,MAAM,CAACU,2CAAkB,CAAC,CAACW,qBAAqB,IAAIL,wBAAwBK,qBAAqB;QAC1H;IACF;IAEA,IAAIrB,MAAM,CAACQ,0CAAiB,CAAC,EAAE;QAC7B,MAAMc,wBAAwBb,IAAAA,iDAAwB;QAGtDT,MAAM,CAACQ,0CAAiB,CAAC,GAAG;YAC1Be,eAAevB,MAAM,CAACQ,0CAAiB,CAAC,CAACe,aAAa,IAAID,sBAAsBC,aAAa;YAC7FC,cAAcxB,MAAM,CAACQ,0CAAiB,CAAC,CAACgB,YAAY,IAAIF,sBAAsBE,YAAY;YAC1FC,8BACEzB,MAAM,CAACQ,0CAAiB,CAAC,CAACiB,4BAA4B,IAAIH,sBAAsBG,4BAA4B;YAC9GC,8BACE1B,MAAM,CAACQ,0CAAiB,CAAC,CAACkB,4BAA4B,IAAIJ,sBAAsBI,4BAA4B;YAC9GC,0BACE3B,MAAM,CAACQ,0CAAiB,CAAC,CAACmB,wBAAwB,IAAIL,sBAAsBK,wBAAwB;YACtGC,0BACE5B,MAAM,CAACQ,0CAAiB,CAAC,CAACoB,wBAAwB,IAAIN,sBAAsBM,wBAAwB;QACxG;IACF;IAEA,OAAO5B;AACT"}
|
|
@@ -13,6 +13,7 @@ const _serversettingsconstants = require("../constants/server-settings.constants
|
|
|
13
13
|
const _node = require("@sentry/node");
|
|
14
14
|
const _envutils = require("../utils/env.utils");
|
|
15
15
|
const _serverconstants = require("../server.constants");
|
|
16
|
+
const _uuid = require("uuid");
|
|
16
17
|
class SettingsStore {
|
|
17
18
|
settingsService;
|
|
18
19
|
logger;
|
|
@@ -45,9 +46,13 @@ class SettingsStore {
|
|
|
45
46
|
[_serversettingsconstants.credentialSettingsKey]: {
|
|
46
47
|
jwtExpiresIn: settings[_serversettingsconstants.credentialSettingsKey].jwtExpiresIn,
|
|
47
48
|
refreshTokenAttempts: settings[_serversettingsconstants.credentialSettingsKey].refreshTokenAttempts,
|
|
48
|
-
refreshTokenExpiry: settings[_serversettingsconstants.credentialSettingsKey].refreshTokenExpiry
|
|
49
|
+
refreshTokenExpiry: settings[_serversettingsconstants.credentialSettingsKey].refreshTokenExpiry,
|
|
50
|
+
slicerApiKey: settings[_serversettingsconstants.credentialSettingsKey].slicerApiKey
|
|
49
51
|
},
|
|
50
52
|
[_serversettingsconstants.serverSettingsKey]: {
|
|
53
|
+
loginRequired: settings[_serversettingsconstants.serverSettingsKey].loginRequired,
|
|
54
|
+
registration: settings[_serversettingsconstants.serverSettingsKey].registration,
|
|
55
|
+
sentryDiagnosticsEnabled: settings[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled,
|
|
51
56
|
experimentalMoonrakerSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
|
|
52
57
|
experimentalPrusaLinkSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalPrusaLinkSupport,
|
|
53
58
|
experimentalBambuSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalBambuSupport
|
|
@@ -75,7 +80,7 @@ class SettingsStore {
|
|
|
75
80
|
});
|
|
76
81
|
}
|
|
77
82
|
if (overrideJwtExpiresIn?.length) {
|
|
78
|
-
await this.
|
|
83
|
+
await this.updateCoreCredentialSettings({
|
|
79
84
|
refreshTokenExpiry: credentialSettings.refreshTokenExpiry,
|
|
80
85
|
refreshTokenAttempts: credentialSettings.refreshTokenAttempts,
|
|
81
86
|
jwtExpiresIn: Number.parseInt(overrideJwtExpiresIn)
|
|
@@ -142,14 +147,14 @@ class SettingsStore {
|
|
|
142
147
|
this.settings = await this.settingsService.updateTimeoutSettings(timeoutSettings);
|
|
143
148
|
return this.getSettings();
|
|
144
149
|
}
|
|
145
|
-
async
|
|
146
|
-
this.settings = await this.settingsService.
|
|
150
|
+
async updateCoreCredentialSettings(credentialSettings) {
|
|
151
|
+
this.settings = await this.settingsService.updateCoreCredentialSettings(credentialSettings);
|
|
147
152
|
}
|
|
148
153
|
async setRefreshTokenSettings({ refreshTokenAttempts, refreshTokenExpiry }) {
|
|
149
154
|
this.throwIfSettingsUnset();
|
|
150
155
|
this.settings[_serversettingsconstants.credentialSettingsKey].refreshTokenAttempts = refreshTokenAttempts;
|
|
151
156
|
this.settings[_serversettingsconstants.credentialSettingsKey].refreshTokenExpiry = refreshTokenExpiry;
|
|
152
|
-
await this.
|
|
157
|
+
await this.updateCoreCredentialSettings(this.settings[_serversettingsconstants.credentialSettingsKey]);
|
|
153
158
|
}
|
|
154
159
|
async setSentryDiagnosticsEnabled(sentryDiagnosticsEnabled) {
|
|
155
160
|
this.throwIfSettingsUnset();
|
|
@@ -180,6 +185,34 @@ class SettingsStore {
|
|
|
180
185
|
this.settings = await this.settingsService.updateFrontendSettings(frontendSettings);
|
|
181
186
|
return this.getSettings();
|
|
182
187
|
}
|
|
188
|
+
getSlicerApiKey() {
|
|
189
|
+
this.throwIfSettingsUnset();
|
|
190
|
+
return this.settings[_serversettingsconstants.credentialSettingsKey].slicerApiKey;
|
|
191
|
+
}
|
|
192
|
+
async generateSlicerApiKey() {
|
|
193
|
+
const newApiKey = (0, _uuid.v4)();
|
|
194
|
+
return this.setSlicerApiKey(newApiKey);
|
|
195
|
+
}
|
|
196
|
+
async setSlicerApiKey(apiKey) {
|
|
197
|
+
this.throwIfSettingsUnset();
|
|
198
|
+
this.settings = await this.settingsService.updateSlicerApiKey({
|
|
199
|
+
slicerApiKey: apiKey
|
|
200
|
+
});
|
|
201
|
+
return apiKey;
|
|
202
|
+
}
|
|
203
|
+
async deleteSlicerApiKey() {
|
|
204
|
+
this.throwIfSettingsUnset();
|
|
205
|
+
this.settings = await this.settingsService.updateSlicerApiKey({
|
|
206
|
+
slicerApiKey: null
|
|
207
|
+
});
|
|
208
|
+
}
|
|
209
|
+
validateSlicerApiKey(apiKey) {
|
|
210
|
+
const storedKey = this.getSlicerApiKey();
|
|
211
|
+
if (!storedKey) {
|
|
212
|
+
return false;
|
|
213
|
+
}
|
|
214
|
+
return storedKey === apiKey;
|
|
215
|
+
}
|
|
183
216
|
throwIfSettingsUnset() {
|
|
184
217
|
if (!this.settings) throw new _runtimeexceptions.InternalServerException("Could not check server settings (server settings not loaded)");
|
|
185
218
|
}
|
|
@@ -1 +1 @@
|
|
|
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","wizardSettingKey","frontendSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","credentialSettings","length","updateJwtSecretCredentialSetting","jwtSecret","
|
|
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","wizardSettingKey","frontendSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","slicerApiKey","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","credentialSettings","length","updateJwtSecretCredentialSetting","jwtSecret","updateCoreCredentialSettings","Number","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","getServerSettings","getTimeoutSettings","setWizardCompleted","version","updateWizardSettings","wizardCompletedAt","Date","getLoginRequired","setLoginRequired","updateServerSettings","setRegistrationEnabled","serverSettings","updateTimeoutSettings","timeoutSettings","setRefreshTokenSettings","setSentryDiagnosticsEnabled","setExperimentalMoonrakerSupport","setExperimentalPrusaLinkSupport","setExperimentalBambuSupport","updateFrontendSettings","frontendSettings","getSlicerApiKey","generateSlicerApiKey","newApiKey","uuidv4","setSlicerApiKey","apiKey","updateSlicerApiKey","deleteSlicerApiKey","validateSlicerApiKey","storedKey","InternalServerException","sentryEnabled","log","isTestEnvironment","client","getClient","warn","getOptions","enabled"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
},
|
|
7
7
|
"author": "David Zwart",
|
|
8
8
|
"license": "AGPL-3.0-or-later",
|
|
9
|
-
"version": "2.0.
|
|
9
|
+
"version": "2.0.1",
|
|
10
10
|
"bin": {
|
|
11
11
|
"fdm-monster": "dist/index.js",
|
|
12
12
|
"fdmm": "dist/index.js"
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
"tr46": "6.0.0"
|
|
61
61
|
},
|
|
62
62
|
"dependencies": {
|
|
63
|
-
"@fdm-monster/client-next": "2.1.
|
|
63
|
+
"@fdm-monster/client-next": "2.1.5",
|
|
64
64
|
"@octokit/plugin-throttling": "8.2.0",
|
|
65
65
|
"@sentry/node": "10.32.1",
|
|
66
66
|
"adm-zip": "0.5.16",
|
|
@@ -99,7 +99,7 @@
|
|
|
99
99
|
"uuid": "11.1.0",
|
|
100
100
|
"winston": "3.19.0",
|
|
101
101
|
"winston-loki": "6.1.3",
|
|
102
|
-
"ws": "8.
|
|
102
|
+
"ws": "8.19.0",
|
|
103
103
|
"zod": "3.25.76"
|
|
104
104
|
},
|
|
105
105
|
"devDependencies": {
|
|
@@ -133,7 +133,7 @@
|
|
|
133
133
|
"nock": "13.5.6",
|
|
134
134
|
"openapi3-ts": "4.5.0",
|
|
135
135
|
"selfsigned": "5.4.0",
|
|
136
|
-
"supertest": "7.
|
|
136
|
+
"supertest": "7.2.2",
|
|
137
137
|
"swagger-ui-dist": "5.31.0",
|
|
138
138
|
"ts-node": "10.9.2",
|
|
139
139
|
"tsconfig-paths": "4.2.0",
|