@fdm-monster/server 2.0.0 → 2.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.env.template +2 -0
- package/.yarn/install-state.gz +0 -0
- package/README.md +22 -3
- package/RELEASE_NOTES.MD +38 -0
- package/dist/constants/authorization.constants.js +12 -3
- package/dist/constants/authorization.constants.js.map +1 -1
- package/dist/constants/server-settings.constants.js +4 -2
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/container.js +2 -0
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +1 -0
- package/dist/container.tokens.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/printer-maintenance-log.controller.js +174 -0
- package/dist/controllers/printer-maintenance-log.controller.js.map +1 -0
- 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/data-source.js +8 -8
- package/dist/data-source.js.map +1 -1
- package/dist/entities/index.js +4 -0
- package/dist/entities/index.js.map +1 -1
- package/dist/entities/print-job.entity.js +5 -1
- package/dist/entities/print-job.entity.js.map +1 -1
- package/dist/entities/printer-maintenance-log.entity.js +142 -0
- package/dist/entities/printer-maintenance-log.entity.js.map +1 -0
- package/dist/entities/printer.entity.js +2 -1
- package/dist/entities/printer.entity.js.map +1 -1
- package/dist/entities/settings.entity.js.map +1 -1
- package/dist/handlers/logging/file-logging.transport.js +2 -2
- package/dist/handlers/logging/file-logging.transport.js.map +1 -1
- package/dist/index.js +11 -5
- package/dist/index.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/migrations/1767909428129-AddPrinterMaintenanceLog.js +52 -0
- package/dist/migrations/1767909428129-AddPrinterMaintenanceLog.js.map +1 -0
- package/dist/server.constants.js +13 -9
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js +7 -4
- package/dist/server.core.js.map +1 -1
- package/dist/server.env.js +13 -32
- package/dist/server.env.js.map +1 -1
- package/dist/server.host.js +1 -1
- package/dist/server.host.js.map +1 -1
- package/dist/services/bambu/bambu-ftp.adapter.js +1 -1
- package/dist/services/bambu/bambu-ftp.adapter.js.map +1 -1
- package/dist/services/core/client-bundle.service.js +10 -11
- package/dist/services/core/client-bundle.service.js.map +1 -1
- package/dist/services/core/config.service.js +3 -5
- package/dist/services/core/config.service.js.map +1 -1
- package/dist/services/core/logs-manager.service.js +9 -10
- package/dist/services/core/logs-manager.service.js.map +1 -1
- package/dist/services/core/multer.service.js +2 -2
- package/dist/services/core/multer.service.js.map +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 +4 -3
- package/dist/services/file-storage.service.js.map +1 -1
- package/dist/services/interfaces/printer-maintenance-log.dto.js +6 -0
- package/dist/services/interfaces/printer-maintenance-log.dto.js.map +1 -0
- package/dist/services/interfaces/printer.dto.js.map +1 -1
- package/dist/services/orm/printer-maintenance-log.service.js +151 -0
- package/dist/services/orm/printer-maintenance-log.service.js.map +1 -0
- package/dist/services/orm/printer.service.js +8 -2
- package/dist/services/orm/printer.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/typeorm/typeorm.service.js +5 -5
- package/dist/services/typeorm/typeorm.service.js.map +1 -1
- package/dist/services/validators/printer-maintenance-log.validation.js +41 -0
- package/dist/services/validators/printer-maintenance-log.validation.js.map +1 -0
- package/dist/services/validators/printer-service.validation.js +2 -3
- package/dist/services/validators/printer-service.validation.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/dist/utils/env.utils.js +5 -4
- package/dist/utils/env.utils.js.map +1 -1
- package/dist/utils/fs.utils.js +37 -11
- package/dist/utils/fs.utils.js.map +1 -1
- package/dist/utils/swagger/swagger.js +1 -1
- package/dist/utils/swagger/swagger.js.map +1 -1
- package/install.sh +559 -0
- package/package.json +6 -6
|
@@ -9,17 +9,15 @@ Object.defineProperty(exports, "ConfigService", {
|
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
const _serverconstants = require("../../server.constants");
|
|
12
|
+
const _envutils = require("../../utils/env.utils");
|
|
12
13
|
class ConfigService {
|
|
13
14
|
get(key, defaultValue) {
|
|
14
|
-
|
|
15
|
-
return defaultValue;
|
|
16
|
-
}
|
|
17
|
-
return process.env[key];
|
|
15
|
+
return (0, _envutils.getEnvOrDefault)(key, defaultValue);
|
|
18
16
|
}
|
|
19
17
|
getOrThrow(key) {
|
|
20
18
|
const val = this.get(key);
|
|
21
19
|
if (!val) {
|
|
22
|
-
throw Error(`Environment variable with key ${key} was not defined.`);
|
|
20
|
+
throw new Error(`Environment variable with key ${key} was not defined.`);
|
|
23
21
|
}
|
|
24
22
|
}
|
|
25
23
|
isDemoMode() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/config.service.ts"],"names":["ConfigService","get","key","defaultValue","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/config.service.ts"],"names":["ConfigService","get","key","defaultValue","getEnvOrDefault","getOrThrow","val","Error","isDemoMode","AppConstants","OVERRIDE_IS_DEMO_MODE"],"mappings":";;;;+BAWaA;;;eAAAA;;;iCAXgB;0BACG;AAUzB,MAAMA;IACXC,IAAOC,GAAW,EAAEC,YAAgB,EAAE;QACpC,OAAOC,IAAAA,yBAAe,EAACF,KAAKC;IAC9B;IAEAE,WAAWH,GAAW,EAAE;QACtB,MAAMI,MAAM,IAAI,CAACL,GAAG,CAACC;QACrB,IAAI,CAACI,KAAK;YACR,MAAM,IAAIC,MAAM,CAAC,8BAA8B,EAAEL,IAAI,iBAAiB,CAAC;QACzE;IACF;IAEAM,aAAa;QACX,OAAO,IAAI,CAACP,GAAG,CAASQ,6BAAY,CAACC,qBAAqB,EAAE,aAAa;IAC3E;AACF"}
|
|
@@ -9,12 +9,11 @@ Object.defineProperty(exports, "LogDumpService", {
|
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
const _admzip = /*#__PURE__*/ _interop_require_default(require("adm-zip"));
|
|
12
|
-
const
|
|
13
|
-
const
|
|
14
|
-
const _fsutils = require("../../utils/fs.utils");
|
|
12
|
+
const _nodepath = require("node:path");
|
|
13
|
+
const _nodefs = require("node:fs");
|
|
15
14
|
const _serverconstants = require("../../server.constants");
|
|
16
15
|
const _timeutils = require("../../utils/time.utils");
|
|
17
|
-
const
|
|
16
|
+
const _fsutils = require("../../utils/fs.utils");
|
|
18
17
|
function _interop_require_default(obj) {
|
|
19
18
|
return obj && obj.__esModule ? obj : {
|
|
20
19
|
default: obj
|
|
@@ -27,8 +26,8 @@ class LogDumpService {
|
|
|
27
26
|
}
|
|
28
27
|
async deleteOlderThanWeekAndMismatchingLogFiles() {
|
|
29
28
|
this.logger.log("Cleaning log files");
|
|
30
|
-
const path = (0,
|
|
31
|
-
const dirEntries = (0,
|
|
29
|
+
const path = (0, _nodepath.join)((0, _fsutils.getMediaPath)(), _serverconstants.AppConstants.defaultLogsFolder);
|
|
30
|
+
const dirEntries = (0, _nodefs.readdirSync)(path, {
|
|
32
31
|
withFileTypes: true
|
|
33
32
|
});
|
|
34
33
|
const files = dirEntries.filter((dirent)=>dirent.isFile()).map((dirent)=>dirent.name);
|
|
@@ -52,7 +51,7 @@ class LogDumpService {
|
|
|
52
51
|
let removedWrongFormatFilesCount = 0;
|
|
53
52
|
for (const file of removedFilesNotInFormat){
|
|
54
53
|
try {
|
|
55
|
-
(0, _nodefs.rmSync)((0,
|
|
54
|
+
(0, _nodefs.rmSync)((0, _nodepath.join)(path, file));
|
|
56
55
|
removedWrongFormatFilesCount++;
|
|
57
56
|
} catch (err) {
|
|
58
57
|
this.logger.warn(`Failed to delete log file`);
|
|
@@ -61,7 +60,7 @@ class LogDumpService {
|
|
|
61
60
|
let removedOutdatedFilesCount = 0;
|
|
62
61
|
for (const file of removedFilesOutdated){
|
|
63
62
|
try {
|
|
64
|
-
(0, _nodefs.rmSync)((0,
|
|
63
|
+
(0, _nodefs.rmSync)((0, _nodepath.join)(path, file));
|
|
65
64
|
removedOutdatedFilesCount++;
|
|
66
65
|
} catch (err) {
|
|
67
66
|
this.logger.warn(`Failed to delete log file`);
|
|
@@ -76,9 +75,9 @@ class LogDumpService {
|
|
|
76
75
|
async dumpZip() {
|
|
77
76
|
this.logger.log("Dumping logs as ZIP");
|
|
78
77
|
const zip = new _admzip.default();
|
|
79
|
-
const path = (0,
|
|
78
|
+
const path = (0, _nodepath.join)((0, _fsutils.getMediaPath)(), _serverconstants.AppConstants.defaultLogsFolder);
|
|
80
79
|
zip.addLocalFolder(path, "/logs", (filename)=>filename.endsWith(".log"));
|
|
81
|
-
const outputPath = (0,
|
|
80
|
+
const outputPath = (0, _nodepath.join)((0, _fsutils.getMediaPath)(), _serverconstants.AppConstants.defaultLogZipsFolder, `logs-${_serverconstants.AppConstants.serverRepoName}.zip`);
|
|
82
81
|
zip.writeZip(outputPath);
|
|
83
82
|
return outputPath;
|
|
84
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/logs-manager.service.ts"],"names":["LogDumpService","logger","loggerFactory","name","deleteOlderThanWeekAndMismatchingLogFiles","log","path","join","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/logs-manager.service.ts"],"names":["LogDumpService","logger","loggerFactory","name","deleteOlderThanWeekAndMismatchingLogFiles","log","path","join","getMediaPath","AppConstants","defaultLogsFolder","dirEntries","readdirSync","withFileTypes","files","filter","dirent","isFile","map","startingFormat","logAppName","removedFilesNotInFormat","f","endsWith","startsWith","removedFilesOutdated","matchesFormat","strippedFilename","replace","isParsableDate","warn","date","Date","now","diff","getTime","diffDays","length","removedWrongFormatFilesCount","file","rmSync","err","removedOutdatedFilesCount","dumpZip","zip","AdmZip","addLocalFolder","filename","outputPath","defaultLogZipsFolder","serverRepoName","writeZip"],"mappings":"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"}
|
|
@@ -67,7 +67,7 @@ class MulterService {
|
|
|
67
67
|
return this.fileUploadTrackerCache.addUploadTracker(multerFile, printerId);
|
|
68
68
|
}
|
|
69
69
|
clearUploadsFolder() {
|
|
70
|
-
const fileUploadsPath = (0, _nodepath.join)((0, _fsutils.
|
|
70
|
+
const fileUploadsPath = (0, _nodepath.join)((0, _fsutils.getMediaPath)(), _serverconstants.AppConstants.defaultFileUploadsStorage);
|
|
71
71
|
if (!(0, _nodefs.existsSync)(fileUploadsPath)) return;
|
|
72
72
|
const files = (0, _nodefs.readdirSync)(fileUploadsPath, {
|
|
73
73
|
withFileTypes: true
|
|
@@ -119,7 +119,7 @@ class MulterService {
|
|
|
119
119
|
getMulterFileFilter(storeAsFile = true) {
|
|
120
120
|
return (0, _multer.default)({
|
|
121
121
|
storage: storeAsFile ? (0, _multer.diskStorage)({
|
|
122
|
-
destination: (0, _nodepath.join)((0, _fsutils.
|
|
122
|
+
destination: (0, _nodepath.join)((0, _fsutils.getMediaPath)(), _serverconstants.AppConstants.defaultFileUploadsStorage)
|
|
123
123
|
}) : (0, _multer.memoryStorage)()
|
|
124
124
|
}).any();
|
|
125
125
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/multer.service.ts"],"names":["MulterService","logger","loggerFactory","fileUploadTrackerCache","name","startTrackingSession","multerFile","printerId","addUploadTracker","clearUploadsFolder","fileUploadsPath","join","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/multer.service.ts"],"names":["MulterService","logger","loggerFactory","fileUploadTrackerCache","name","startTrackingSession","multerFile","printerId","addUploadTracker","clearUploadsFolder","fileUploadsPath","join","getMediaPath","AppConstants","defaultFileUploadsStorage","existsSync","files","readdirSync","withFileTypes","filter","item","isDirectory","map","file","rmSync","error","errorSummary","clearUploadedFile","path","warn","getMulterGCodeFileFilter","storeAsFile","getMulterFileFilter","multerLoadFileAsync","req","res","fileExtensions","Promise","resolve","reject","err","validateUploadedFiles","allowedExtensions","length","ext","extname","originalname","toLowerCase","includes","e","ValidationException","multer","storage","diskStorage","destination","memoryStorage","any","getSessions","getUploads"],"mappings":"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"}
|
|
@@ -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":"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"}
|
|
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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"}
|
|
@@ -68,7 +68,7 @@ class FileStorageService {
|
|
|
68
68
|
constructor(loggerFactory, typeormService){
|
|
69
69
|
this.printJobRepository = typeormService.getDataSource().getRepository(_printjobentity.PrintJob);
|
|
70
70
|
this.logger = loggerFactory(FileStorageService.name);
|
|
71
|
-
this.storageBasePath = (0, _nodepath.join)((0, _fsutils.
|
|
71
|
+
this.storageBasePath = (0, _nodepath.join)((0, _fsutils.getMediaPath)(), _serverconstants.AppConstants.defaultPrintFilesStorage);
|
|
72
72
|
}
|
|
73
73
|
async ensureStorageDirectories() {
|
|
74
74
|
try {
|
|
@@ -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","getMediaPath","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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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/printer-maintenance-log.dto.ts"],"names":[],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/interfaces/printer.dto.ts"],"names":["CreatePrinterDto","PrinterDto","name","apiKey","printerURL","printerType","id","enabled","disabledReason","dateAdded","username","password"],"mappings":";;;;;;;;;;;QAEaA;eAAAA;;QAOAC;eAAAA;;;AAPN,MAAMD;IACXE,KAAa;IACbC,OAAgB;IAChBC,WAAmB;IACnBC,YAAyB;AAC3B;AAEO,MAAMJ;IACXK,GAAW;IACXJ,KAAa;IACbK,QAAiB;IACjBC,
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/printer.dto.ts"],"names":["CreatePrinterDto","PrinterDto","name","apiKey","printerURL","printerType","id","enabled","disabledReason","dateAdded","username","password"],"mappings":";;;;;;;;;;;QAEaA;eAAAA;;QAOAC;eAAAA;;;AAPN,MAAMD;IACXE,KAAa;IACbC,OAAgB;IAChBC,WAAmB;IACnBC,YAAyB;AAC3B;AAEO,MAAMJ;IACXK,GAAW;IACXJ,KAAa;IACbK,QAAiB;IACjBC,eAA8B;IAC9BC,UAAmB;IACnBN,OAAgB;IAChBO,SAAkB;IAClBC,SAAkB;IAClBP,WAAmB;IACnBC,YAAoB;AACtB"}
|
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "PrinterMaintenanceLogService", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return PrinterMaintenanceLogService;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _printermaintenancelogentity = require("../../entities/printer-maintenance-log.entity");
|
|
12
|
+
const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
|
|
13
|
+
class PrinterMaintenanceLogService {
|
|
14
|
+
printerService;
|
|
15
|
+
logger;
|
|
16
|
+
repository;
|
|
17
|
+
constructor(loggerFactory, typeormService, printerService){
|
|
18
|
+
this.printerService = printerService;
|
|
19
|
+
this.logger = loggerFactory(PrinterMaintenanceLogService.name);
|
|
20
|
+
this.repository = typeormService.getDataSource().getRepository(_printermaintenancelogentity.PrinterMaintenanceLog);
|
|
21
|
+
}
|
|
22
|
+
toDto(entity) {
|
|
23
|
+
return {
|
|
24
|
+
id: entity.id,
|
|
25
|
+
createdAt: entity.createdAt,
|
|
26
|
+
createdBy: entity.createdBy,
|
|
27
|
+
createdByUserId: entity.createdByUserId,
|
|
28
|
+
printerId: entity.printerId,
|
|
29
|
+
printerName: entity.printerName,
|
|
30
|
+
printerUrl: entity.printerUrl,
|
|
31
|
+
metadata: entity.metadata,
|
|
32
|
+
completed: entity.completed,
|
|
33
|
+
completedAt: entity.completedAt,
|
|
34
|
+
completedByUserId: entity.completedByUserId,
|
|
35
|
+
completedBy: entity.completedBy
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
async create(dto, userId, username) {
|
|
39
|
+
const printer = await this.printerService.get(dto.printerId);
|
|
40
|
+
const existingLog = await this.repository.findOne({
|
|
41
|
+
where: {
|
|
42
|
+
printerId: dto.printerId,
|
|
43
|
+
completed: false
|
|
44
|
+
}
|
|
45
|
+
});
|
|
46
|
+
if (existingLog) {
|
|
47
|
+
throw new _runtimeexceptions.BadRequestException(`Printer ${printer.name} already has an active maintenance log`);
|
|
48
|
+
}
|
|
49
|
+
const log = this.repository.create({
|
|
50
|
+
printerId: dto.printerId,
|
|
51
|
+
printerName: printer.name,
|
|
52
|
+
printerUrl: printer.printerURL,
|
|
53
|
+
metadata: dto.metadata,
|
|
54
|
+
createdBy: username,
|
|
55
|
+
createdByUserId: userId,
|
|
56
|
+
completed: false
|
|
57
|
+
});
|
|
58
|
+
await this.repository.save(log);
|
|
59
|
+
await this.printerService.updateDisabledReason(dto.printerId, this.buildDisabledReasonFromMetadata(dto.metadata));
|
|
60
|
+
return log;
|
|
61
|
+
}
|
|
62
|
+
async complete(logId, dto, userId, username) {
|
|
63
|
+
const log = await this.repository.findOne({
|
|
64
|
+
where: {
|
|
65
|
+
id: logId
|
|
66
|
+
}
|
|
67
|
+
});
|
|
68
|
+
if (!log) {
|
|
69
|
+
throw new _runtimeexceptions.NotFoundException(`Maintenance log with id ${logId} not found`);
|
|
70
|
+
}
|
|
71
|
+
if (log.completed) {
|
|
72
|
+
throw new _runtimeexceptions.BadRequestException(`Maintenance log ${logId} is already completed`);
|
|
73
|
+
}
|
|
74
|
+
log.metadata = {
|
|
75
|
+
...log.metadata,
|
|
76
|
+
completionNotes: dto.completionNotes
|
|
77
|
+
};
|
|
78
|
+
log.completed = true;
|
|
79
|
+
log.completedAt = new Date();
|
|
80
|
+
log.completedBy = username;
|
|
81
|
+
log.completedByUserId = userId;
|
|
82
|
+
await this.repository.save(log);
|
|
83
|
+
if (log.printerId) {
|
|
84
|
+
await this.printerService.updateDisabledReason(log.printerId, null);
|
|
85
|
+
}
|
|
86
|
+
return log;
|
|
87
|
+
}
|
|
88
|
+
async get(logId) {
|
|
89
|
+
const log = await this.repository.findOne({
|
|
90
|
+
where: {
|
|
91
|
+
id: logId
|
|
92
|
+
}
|
|
93
|
+
});
|
|
94
|
+
if (!log) {
|
|
95
|
+
throw new _runtimeexceptions.NotFoundException(`Maintenance log with id ${logId} not found`);
|
|
96
|
+
}
|
|
97
|
+
return log;
|
|
98
|
+
}
|
|
99
|
+
async getActiveByPrinterId(printerId) {
|
|
100
|
+
return this.repository.findOne({
|
|
101
|
+
where: {
|
|
102
|
+
printerId,
|
|
103
|
+
completed: false
|
|
104
|
+
}
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
async list(filters) {
|
|
108
|
+
const { printerId, completed, page = 1, pageSize = 20 } = filters;
|
|
109
|
+
const queryBuilder = this.repository.createQueryBuilder("log");
|
|
110
|
+
if (printerId !== undefined) {
|
|
111
|
+
queryBuilder.andWhere("log.printerId = :printerId", {
|
|
112
|
+
printerId
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
if (completed !== undefined) {
|
|
116
|
+
queryBuilder.andWhere("log.completed = :completed", {
|
|
117
|
+
completed
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
queryBuilder.orderBy("log.createdAt", "DESC");
|
|
121
|
+
queryBuilder.skip((page - 1) * pageSize);
|
|
122
|
+
queryBuilder.take(pageSize);
|
|
123
|
+
const [logs, total] = await queryBuilder.getManyAndCount();
|
|
124
|
+
return {
|
|
125
|
+
logs,
|
|
126
|
+
total
|
|
127
|
+
};
|
|
128
|
+
}
|
|
129
|
+
async delete(logId) {
|
|
130
|
+
const log = await this.get(logId);
|
|
131
|
+
if (!log.completed && log.printerId) {
|
|
132
|
+
await this.printerService.updateDisabledReason(log.printerId, null);
|
|
133
|
+
}
|
|
134
|
+
await this.repository.delete(logId);
|
|
135
|
+
}
|
|
136
|
+
buildDisabledReasonFromMetadata(metadata) {
|
|
137
|
+
const parts = [];
|
|
138
|
+
if (metadata.cause) {
|
|
139
|
+
parts.push(metadata.cause);
|
|
140
|
+
}
|
|
141
|
+
if (metadata.partsInvolved && metadata.partsInvolved.length > 0) {
|
|
142
|
+
parts.push(`Parts: ${metadata.partsInvolved.join(", ")}`);
|
|
143
|
+
}
|
|
144
|
+
if (metadata.notes) {
|
|
145
|
+
parts.push(metadata.notes);
|
|
146
|
+
}
|
|
147
|
+
return parts.join(" - ") || "Under maintenance";
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
//# sourceMappingURL=printer-maintenance-log.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/printer-maintenance-log.service.ts"],"names":["PrinterMaintenanceLogService","logger","repository","loggerFactory","typeormService","printerService","name","getDataSource","getRepository","PrinterMaintenanceLog","toDto","entity","id","createdAt","createdBy","createdByUserId","printerId","printerName","printerUrl","metadata","completed","completedAt","completedByUserId","completedBy","create","dto","userId","username","printer","get","existingLog","findOne","where","BadRequestException","log","printerURL","save","updateDisabledReason","buildDisabledReasonFromMetadata","complete","logId","NotFoundException","completionNotes","Date","getActiveByPrinterId","list","filters","page","pageSize","queryBuilder","createQueryBuilder","undefined","andWhere","orderBy","skip","take","logs","total","getManyAndCount","delete","parts","cause","push","partsInvolved","length","join","notes"],"mappings":"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"}
|
|
@@ -115,12 +115,18 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
|
|
|
115
115
|
});
|
|
116
116
|
}
|
|
117
117
|
}
|
|
118
|
-
updateDisabledReason(printerId, disabledReason) {
|
|
118
|
+
async updateDisabledReason(printerId, disabledReason) {
|
|
119
|
+
await (0, _validators.validateInput)({
|
|
120
|
+
disabledReason
|
|
121
|
+
}, _printerservicevalidation.updatePrinterDisabledReasonSchema);
|
|
119
122
|
return this.update(printerId, {
|
|
120
123
|
disabledReason
|
|
121
124
|
});
|
|
122
125
|
}
|
|
123
|
-
updateEnabled(printerId, enabled) {
|
|
126
|
+
async updateEnabled(printerId, enabled) {
|
|
127
|
+
await (0, _validators.validateInput)({
|
|
128
|
+
enabled
|
|
129
|
+
}, _printerservicevalidation.updatePrinterEnabledSchema);
|
|
124
130
|
return this.update(printerId, {
|
|
125
131
|
enabled
|
|
126
132
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/printer.service.ts"],"names":["PrinterService","BaseService","Printer","PrinterDto","CreatePrinterDto","logger","loggerFactory","typeormService","eventEmitter2","name","toDto","entity","id","enabled","disabledReason","dateAdded","apiKey","username","password","printerURL","printerType","list","repository","find","order","create","newPrinter","emitEvent","mergedPrinter","validateAndDefault","Date","now","printer","emit","printerEvents","printerCreated","update","printerId","partial","get","normalizeUrl","defaultProtocol","defaultHttpProtocol","Object","assign","validateInput","createPrinterSchema","updatedPrinter","printerUpdated","batchImport","printers","length","log","newPrinters","createdPrinter","push","batchPrinterCreated","delete","printersDeleted","printerIds","deleteMany","updateDisabledReason","updateEnabled","updateFeedRate","feedRate","updateFlowRate","flowRate"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/printer.service.ts"],"names":["PrinterService","BaseService","Printer","PrinterDto","CreatePrinterDto","logger","loggerFactory","typeormService","eventEmitter2","name","toDto","entity","id","enabled","disabledReason","dateAdded","apiKey","username","password","printerURL","printerType","list","repository","find","order","create","newPrinter","emitEvent","mergedPrinter","validateAndDefault","Date","now","printer","emit","printerEvents","printerCreated","update","printerId","partial","get","normalizeUrl","defaultProtocol","defaultHttpProtocol","Object","assign","validateInput","createPrinterSchema","updatedPrinter","printerUpdated","batchImport","printers","length","log","newPrinters","createdPrinter","push","batchPrinterCreated","delete","printersDeleted","printerIds","deleteMany","updateDisabledReason","updatePrinterDisabledReasonSchema","updateEnabled","updatePrinterEnabledSchema","updateFeedRate","feedRate","updateFlowRate","flowRate"],"mappings":"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"}
|