@fdm-monster/server 2.0.1 → 2.0.4

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.
Files changed (78) hide show
  1. package/.env.template +2 -1
  2. package/.yarn/install-state.gz +0 -0
  3. package/README.md +30 -13
  4. package/RELEASE_NOTES.MD +39 -0
  5. package/dist/consoles/mock-octoprint.server.js +1 -1
  6. package/dist/consoles/mock-octoprint.server.js.map +1 -1
  7. package/dist/constants/authorization.constants.js +12 -3
  8. package/dist/constants/authorization.constants.js.map +1 -1
  9. package/dist/container.js +2 -0
  10. package/dist/container.js.map +1 -1
  11. package/dist/container.tokens.js +1 -0
  12. package/dist/container.tokens.js.map +1 -1
  13. package/dist/controllers/printer-maintenance-log.controller.js +174 -0
  14. package/dist/controllers/printer-maintenance-log.controller.js.map +1 -0
  15. package/dist/data-source.js +8 -8
  16. package/dist/data-source.js.map +1 -1
  17. package/dist/entities/index.js +4 -0
  18. package/dist/entities/index.js.map +1 -1
  19. package/dist/entities/print-job.entity.js +5 -1
  20. package/dist/entities/print-job.entity.js.map +1 -1
  21. package/dist/entities/printer-maintenance-log.entity.js +142 -0
  22. package/dist/entities/printer-maintenance-log.entity.js.map +1 -0
  23. package/dist/entities/printer.entity.js +2 -1
  24. package/dist/entities/printer.entity.js.map +1 -1
  25. package/dist/handlers/logging/file-logging.transport.js +2 -2
  26. package/dist/handlers/logging/file-logging.transport.js.map +1 -1
  27. package/dist/index.js +11 -5
  28. package/dist/index.js.map +1 -1
  29. package/dist/migrations/1767909428129-AddPrinterMaintenanceLog.js +52 -0
  30. package/dist/migrations/1767909428129-AddPrinterMaintenanceLog.js.map +1 -0
  31. package/dist/server.constants.js +13 -9
  32. package/dist/server.constants.js.map +1 -1
  33. package/dist/server.core.js +7 -4
  34. package/dist/server.core.js.map +1 -1
  35. package/dist/server.env.js +13 -32
  36. package/dist/server.env.js.map +1 -1
  37. package/dist/server.host.js +1 -1
  38. package/dist/server.host.js.map +1 -1
  39. package/dist/services/bambu/bambu-ftp.adapter.js +1 -1
  40. package/dist/services/bambu/bambu-ftp.adapter.js.map +1 -1
  41. package/dist/services/core/client-bundle.service.js +10 -11
  42. package/dist/services/core/client-bundle.service.js.map +1 -1
  43. package/dist/services/core/config.service.js +3 -5
  44. package/dist/services/core/config.service.js.map +1 -1
  45. package/dist/services/core/logs-manager.service.js +9 -10
  46. package/dist/services/core/logs-manager.service.js.map +1 -1
  47. package/dist/services/core/multer.service.js +2 -2
  48. package/dist/services/core/multer.service.js.map +1 -1
  49. package/dist/services/core/yaml.service.js +8 -5
  50. package/dist/services/core/yaml.service.js.map +1 -1
  51. package/dist/services/file-storage.service.js +1 -1
  52. package/dist/services/file-storage.service.js.map +1 -1
  53. package/dist/services/interfaces/printer-maintenance-log.dto.js +6 -0
  54. package/dist/services/interfaces/printer-maintenance-log.dto.js.map +1 -0
  55. package/dist/services/interfaces/printer.dto.js.map +1 -1
  56. package/dist/services/orm/printer-maintenance-log.service.js +151 -0
  57. package/dist/services/orm/printer-maintenance-log.service.js.map +1 -0
  58. package/dist/services/orm/printer.service.js +15 -7
  59. package/dist/services/orm/printer.service.js.map +1 -1
  60. package/dist/services/typeorm/typeorm.service.js +5 -5
  61. package/dist/services/typeorm/typeorm.service.js.map +1 -1
  62. package/dist/services/validators/printer-maintenance-log.validation.js +41 -0
  63. package/dist/services/validators/printer-maintenance-log.validation.js.map +1 -0
  64. package/dist/services/validators/printer-service.validation.js +4 -5
  65. package/dist/services/validators/printer-service.validation.js.map +1 -1
  66. package/dist/services/validators/yaml-service.validation.js +6 -2
  67. package/dist/services/validators/yaml-service.validation.js.map +1 -1
  68. package/dist/state/test-printer-socket.store.js +2 -2
  69. package/dist/state/test-printer-socket.store.js.map +1 -1
  70. package/dist/tasks/print-job-analysis.task.js +0 -1
  71. package/dist/tasks/print-job-analysis.task.js.map +1 -1
  72. package/dist/utils/env.utils.js +5 -4
  73. package/dist/utils/env.utils.js.map +1 -1
  74. package/dist/utils/fs.utils.js +37 -11
  75. package/dist/utils/fs.utils.js.map +1 -1
  76. package/dist/utils/swagger/swagger.js +1 -1
  77. package/dist/utils/swagger/swagger.js.map +1 -1
  78. package/package.json +10 -11
@@ -93,7 +93,7 @@ class BambuFtpAdapter {
93
93
  }
94
94
  }
95
95
  getFileStoragePath(filename) {
96
- const storagePath = (0, _nodepath.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileUploadsStorage);
96
+ const storagePath = (0, _nodepath.join)((0, _fsutils.getMediaPath)(), _serverconstants.AppConstants.defaultFileUploadsStorage);
97
97
  if (!(0, _nodefs.existsSync)(storagePath)) {
98
98
  (0, _nodefs.mkdirSync)(storagePath, {
99
99
  recursive: true
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/services/bambu/bambu-ftp.adapter.ts"],"names":["BambuFtpAdapter","logger","ftpClient","host","accessCode","isConnecting","settingsStore","loggerFactory","eventEmitter2","name","connect","closed","debug","Error","sanitizedHost","sanitizeHost","sanitizedAccessCode","sanitizeAccessCode","timeout","getTimeoutSettings","apiTimeout","log","Client","ftp","verbose","access","port","user","password","secure","secureOptions","rejectUnauthorized","minVersion","maxVersion","error","cleanup","disconnect","close","listFiles","dirPath","ensureConnected","files","list","length","getFileStoragePath","filename","storagePath","join","superRootPath","AppConstants","defaultFileUploadsStorage","existsSync","mkdirSync","recursive","uploadFile","fileBuffer","progressToken","remotePath","tempPath","Date","now","writeFileSync","trackProgress","info","emit","uploadProgressEvent","loaded","bytes","total","bytesOverall","uploadFrom","uploadDoneEvent","uploadFailedEvent","message","unlinkSync","cleanupError","warn","downloadFile","localPath","downloadTo","downloadFileAsStream","split","pop","stream","createReadStream","on","deleteFile","remove","isConnected","trimmed","trim","ipv4Pattern","hostnamePattern","test","parts","map","Number","some","part","alphanumericPattern"],"mappings":"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"}
1
+ {"version":3,"sources":["../../../src/services/bambu/bambu-ftp.adapter.ts"],"names":["BambuFtpAdapter","logger","ftpClient","host","accessCode","isConnecting","settingsStore","loggerFactory","eventEmitter2","name","connect","closed","debug","Error","sanitizedHost","sanitizeHost","sanitizedAccessCode","sanitizeAccessCode","timeout","getTimeoutSettings","apiTimeout","log","Client","ftp","verbose","access","port","user","password","secure","secureOptions","rejectUnauthorized","minVersion","maxVersion","error","cleanup","disconnect","close","listFiles","dirPath","ensureConnected","files","list","length","getFileStoragePath","filename","storagePath","join","getMediaPath","AppConstants","defaultFileUploadsStorage","existsSync","mkdirSync","recursive","uploadFile","fileBuffer","progressToken","remotePath","tempPath","Date","now","writeFileSync","trackProgress","info","emit","uploadProgressEvent","loaded","bytes","total","bytesOverall","uploadFrom","uploadDoneEvent","uploadFailedEvent","message","unlinkSync","cleanupError","warn","downloadFile","localPath","downloadTo","downloadFileAsStream","split","pop","stream","createReadStream","on","deleteFile","remove","isConnected","trimmed","trim","ipv4Pattern","hostnamePattern","test","parts","map","Number","some","part","alphanumericPattern"],"mappings":"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"}
@@ -9,7 +9,7 @@ Object.defineProperty(exports, "ClientBundleService", {
9
9
  }
10
10
  });
11
11
  const _admzip = /*#__PURE__*/ _interop_require_default(require("adm-zip"));
12
- const _path = require("path");
12
+ const _nodepath = require("node:path");
13
13
  const _nodefs = require("node:fs");
14
14
  const _promises = require("node:fs/promises");
15
15
  const _fsutils = require("../../utils/fs.utils");
@@ -29,17 +29,16 @@ class ClientBundleService {
29
29
  logger;
30
30
  githubOwner = _serverconstants.AppConstants.orgName;
31
31
  githubRepo = _serverconstants.AppConstants.clientRepoName;
32
- storageRoot = (0, _fsutils.superRootPath)();
33
32
  minVersion = _serverconstants.AppConstants.defaultClientMinimum;
34
33
  constructor(loggerFactory, githubService){
35
34
  this.githubService = githubService;
36
35
  this.logger = loggerFactory(ClientBundleService.name);
37
36
  }
38
37
  get clientPackageJsonPath() {
39
- return (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultClientBundleStorage, "package.json");
38
+ return (0, _nodepath.join)((0, _fsutils.getMediaPath)(), _serverconstants.AppConstants.defaultClientBundleStorage, "package.json");
40
39
  }
41
40
  get clientIndexHtmlPath() {
42
- return (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultClientBundleStorage, "dist/index.html");
41
+ return (0, _nodepath.join)((0, _fsutils.getMediaPath)(), _serverconstants.AppConstants.defaultClientBundleStorage, "dist/index.html");
43
42
  }
44
43
  async getReleases() {
45
44
  try {
@@ -75,7 +74,7 @@ class ClientBundleService {
75
74
  return this.createResponse(false, existingVersion, minimumVersion, requestedVersion, null, "Client auto-update disabled, skipping");
76
75
  }
77
76
  if (!existingVersion || !this.doesClientIndexHtmlExist()) {
78
- const reason = !existingVersion ? "Client package.json does not exist" : "Client index.html could not be found";
77
+ const reason = existingVersion ? "Client index.html could not be found" : "Client package.json does not exist";
79
78
  return this.createResponse(true, existingVersion, minimumVersion, requestedVersion, (0, _semverutils.getMaximumOfVersionsSafe)(minimumVersion, requestedVersion), `${reason}, downloading new release`);
80
79
  }
81
80
  const meetsMinimum = (0, _semverutils.checkVersionSatisfiesMinimum)(existingVersion, minimumVersion);
@@ -124,19 +123,19 @@ class ClientBundleService {
124
123
  }
125
124
  async downloadZip(assetId, assetName) {
126
125
  const assetResult = await this.githubService.requestAsset(this.githubOwner, this.githubRepo, assetId);
127
- const dir = (0, _path.join)(this.storageRoot, _serverconstants.AppConstants.defaultClientBundleZipsStorage);
128
- (0, _fsutils.ensureDirExists)(dir);
129
- const path = (0, _path.join)(dir, assetName);
126
+ const distZipPath = (0, _nodepath.join)((0, _fsutils.getMediaPath)(), _serverconstants.AppConstants.defaultClientBundleZipsStorage);
127
+ (0, _fsutils.ensureDirExists)(distZipPath);
128
+ const path = (0, _nodepath.join)(distZipPath, assetName);
130
129
  (0, _nodefs.writeFileSync)(path, Buffer.from(assetResult.data));
131
- this.logger.log(`Downloaded client ZIP to ${dir}`);
130
+ this.logger.log(`Downloaded client ZIP to ${distZipPath}`);
132
131
  return path;
133
132
  }
134
133
  async extractZip(zipPath) {
135
- const distPath = (0, _path.join)(this.storageRoot, _serverconstants.AppConstants.defaultClientBundleStorage);
134
+ const distPath = (0, _nodepath.join)((0, _fsutils.getMediaPath)(), _serverconstants.AppConstants.defaultClientBundleStorage);
136
135
  (0, _fsutils.ensureDirExists)(distPath);
137
136
  this.logger.debug(`Clearing contents of ${distPath}`);
138
137
  for (const item of (await (0, _promises.readdir)(distPath))){
139
- const itemPath = (0, _path.join)(distPath, item);
138
+ const itemPath = (0, _nodepath.join)(distPath, item);
140
139
  await (0, _promises.rm)(itemPath, {
141
140
  force: true,
142
141
  recursive: true
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/services/core/client-bundle.service.ts"],"names":["ClientBundleService","logger","githubOwner","AppConstants","orgName","githubRepo","clientRepoName","storageRoot","superRootPath","minVersion","defaultClientMinimum","loggerFactory","githubService","name","clientPackageJsonPath","join","defaultClientBundleStorage","clientIndexHtmlPath","getReleases","releases","latestRelease","Promise","all","getLatestRelease","minimum","tag_name","current","getClientVersion","latest","data","e","RequestError","error","errorSummary","ExternalServiceError","message","InternalServerException","shouldUpdateWithReason","overrideAutoUpdate","minimumVersion","requestedVersion","allowDowngrade","clientAutoUpdate","enableClientDistAutoUpdateKey","existingVersion","createResponse","doesClientIndexHtmlExist","reason","getMaximumOfVersionsSafe","meetsMinimum","checkVersionSatisfiesMinimum","evaluateRequestedVersion","downloadClientUpdate","releaseTag","result","getReleaseByTag","release","assetName","asset","assets","find","a","NotFoundException","zipPath","downloadZip","id","extractZip","currentVersion","compare","versionComparison","shouldUpdate","targetVersion","assetId","assetResult","requestAsset","dir","defaultClientBundleZipsStorage","ensureDirExists","path","writeFileSync","Buffer","from","log","distPath","debug","item","readdir","itemPath","rm","force","recursive","catch","zip","AdmZip","extractAllTo","existsSync","require","cache","undefined","json","version"],"mappings":"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"}
1
+ {"version":3,"sources":["../../../src/services/core/client-bundle.service.ts"],"names":["ClientBundleService","logger","githubOwner","AppConstants","orgName","githubRepo","clientRepoName","minVersion","defaultClientMinimum","loggerFactory","githubService","name","clientPackageJsonPath","join","getMediaPath","defaultClientBundleStorage","clientIndexHtmlPath","getReleases","releases","latestRelease","Promise","all","getLatestRelease","minimum","tag_name","current","getClientVersion","latest","data","e","RequestError","error","errorSummary","ExternalServiceError","message","InternalServerException","shouldUpdateWithReason","overrideAutoUpdate","minimumVersion","requestedVersion","allowDowngrade","clientAutoUpdate","enableClientDistAutoUpdateKey","existingVersion","createResponse","doesClientIndexHtmlExist","reason","getMaximumOfVersionsSafe","meetsMinimum","checkVersionSatisfiesMinimum","evaluateRequestedVersion","downloadClientUpdate","releaseTag","result","getReleaseByTag","release","assetName","asset","assets","find","a","NotFoundException","zipPath","downloadZip","id","extractZip","currentVersion","compare","versionComparison","shouldUpdate","targetVersion","assetId","assetResult","requestAsset","distZipPath","defaultClientBundleZipsStorage","ensureDirExists","path","writeFileSync","Buffer","from","log","distPath","debug","item","readdir","itemPath","rm","force","recursive","catch","zip","AdmZip","extractAllTo","existsSync","require","cache","undefined","json","version"],"mappings":"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"}
@@ -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
- if (!Object.keys(process.env).includes(key) || !process.env[key]?.length) {
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","Object","keys","process","env","includes","length","getOrThrow","val","Error","isDemoMode","AppConstants","OVERRIDE_IS_DEMO_MODE"],"mappings":";;;;+BAUaA;;;eAAAA;;;iCAVgB;AAUtB,MAAMA;IACXC,IAAOC,GAAW,EAAEC,YAAgB,EAAE;QACpC,IAAI,CAACC,OAAOC,IAAI,CAACC,QAAQC,GAAG,EAAEC,QAAQ,CAACN,QAAQ,CAACI,QAAQC,GAAG,CAACL,IAAI,EAAEO,QAAQ;YACxE,OAAON;QACT;QACA,OAAOG,QAAQC,GAAG,CAACL,IAAI;IACzB;IAEAQ,WAAWR,GAAW,EAAE;QACtB,MAAMS,MAAM,IAAI,CAACV,GAAG,CAACC;QACrB,IAAI,CAACS,KAAK;YACR,MAAMC,MAAM,CAAC,8BAA8B,EAAEV,IAAI,iBAAiB,CAAC;QACrE;IACF;IAEAW,aAAa;QACX,OAAO,IAAI,CAACZ,GAAG,CAASa,6BAAY,CAACC,qBAAqB,EAAE,aAAa;IAC3E;AACF"}
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 _path = require("path");
13
- const _fs = require("fs");
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 _nodefs = require("node:fs");
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, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultLogsFolder);
31
- const dirEntries = (0, _fs.readdirSync)(path, {
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, _path.join)(path, file));
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, _path.join)(path, file));
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, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultLogsFolder);
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, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultLogZipsFolder, `logs-${_serverconstants.AppConstants.serverRepoName}.zip`);
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","superRootPath","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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"}
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":";;;;+BASaA;;;eAAAA;;;+DATM;0BACE;wBACe;iCACP;2BACE;yBAGF;;;;;;AAEtB,MAAMA;IACMC,OAAsB;IAEvC,YAAYC,aAA6B,CAAE;QACzC,IAAI,CAACD,MAAM,GAAGC,cAAcF,eAAeG,IAAI;IACjD;IAEA,MAAMC,4CAA4C;QAChD,IAAI,CAACH,MAAM,CAACI,GAAG,CAAC;QAChB,MAAMC,OAAOC,IAAAA,cAAI,EAACC,IAAAA,qBAAY,KAAIC,6BAAY,CAACC,iBAAiB;QAChE,MAAMC,aAAaC,IAAAA,mBAAW,EAACN,MAAM;YAAEO,eAAe;QAAK;QAC3D,MAAMC,QAAQH,WAAWI,MAAM,CAAC,CAACC,SAAWA,OAAOC,MAAM,IAAIC,GAAG,CAAC,CAACF,SAAWA,OAAOb,IAAI;QAGxF,MAAMgB,iBAAiB,GAAGV,6BAAY,CAACW,UAAU,CAAC,CAAC,CAAC;QACpD,MAAMC,0BAA0BP,MAAMC,MAAM,CAAC,CAACO,IAAMA,EAAEC,QAAQ,CAAC,WAAW,CAACD,EAAEE,UAAU,CAACL;QACxF,MAAMM,uBAAuBX,MAAMC,MAAM,CAAC,CAACO;YACzC,MAAMI,gBAAgBJ,EAAEC,QAAQ,CAAC,WAAWD,EAAEE,UAAU,CAACL;YACzD,IAAI,CAACO,eAAe,OAAO;YAE3B,MAAMC,mBAAmBL,EAAEM,OAAO,CAAC,QAAQ,IAAIA,OAAO,CAACT,gBAAgB;YACvE,IAAI,CAACU,IAAAA,yBAAc,EAACF,mBAAmB;gBACrC,IAAI,CAAC1B,MAAM,CAAC6B,IAAI,CAAC;gBACjB,OAAO;YACT;YAEA,MAAMC,OAAO,IAAIC,KAAKL;YACtB,MAAMM,MAAM,IAAID;YAChB,MAAME,OAAOD,IAAIE,OAAO,KAAKJ,KAAKI,OAAO;YACzC,MAAMC,WAAWF,OAAQ,CAAA,OAAO,OAAO,EAAC;YACxC,OAAOE,WAAW;QACpB;QAEA,IAAI,CAACnC,MAAM,CAACI,GAAG,CACb,CAAC,SAAS,EAAEgB,wBAAwBgB,MAAM,CAAC,qCAAqC,EAAElB,eAAe,gBAAgB,EAAEM,qBAAqBY,MAAM,CAAC,iCAAiC,CAAC;QAGnL,IAAIC,+BAA+B;QACnC,KAAK,MAAMC,QAAQlB,wBAAyB;YAC1C,IAAI;gBACFmB,IAAAA,cAAM,EAACjC,IAAAA,cAAI,EAACD,MAAMiC;gBAClBD;YACF,EAAE,OAAOG,KAAK;gBACZ,IAAI,CAACxC,MAAM,CAAC6B,IAAI,CAAC,CAAC,yBAAyB,CAAC;YAC9C;QACF;QAEA,IAAIY,4BAA4B;QAChC,KAAK,MAAMH,QAAQd,qBAAsB;YACvC,IAAI;gBACFe,IAAAA,cAAM,EAACjC,IAAAA,cAAI,EAACD,MAAMiC;gBAClBG;YACF,EAAE,OAAOD,KAAK;gBACZ,IAAI,CAACxC,MAAM,CAAC6B,IAAI,CAAC,CAAC,yBAAyB,CAAC;YAC9C;QACF;QAEA,IAAI,CAAC7B,MAAM,CAACI,GAAG,CAAC,CAAC,QAAQ,EAAEiC,+BAA+BI,0BAA0B,YAAY,CAAC;QACjG,OAAO;YACLJ;YACAI;QACF;IACF;IAEA,MAAMC,UAAU;QACd,IAAI,CAAC1C,MAAM,CAACI,GAAG,CAAC;QAChB,MAAMuC,MAAM,IAAIC,eAAM;QACtB,MAAMvC,OAAOC,IAAAA,cAAI,EAACC,IAAAA,qBAAY,KAAIC,6BAAY,CAACC,iBAAiB;QAChEkC,IAAIE,cAAc,CAACxC,MAAM,SAAS,CAACyC,WAAaA,SAASxB,QAAQ,CAAC;QAElE,MAAMyB,aAAazC,IAAAA,cAAI,EACrBC,IAAAA,qBAAY,KACZC,6BAAY,CAACwC,oBAAoB,EACjC,CAAC,KAAK,EAAExC,6BAAY,CAACyC,cAAc,CAAC,IAAI,CAAC;QAE3CN,IAAIO,QAAQ,CAACH;QACb,OAAOA;IACT;AACF"}
@@ -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.superRootPath)(), _serverconstants.AppConstants.defaultFileUploadsStorage);
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.superRootPath)(), _serverconstants.AppConstants.defaultFileUploadsStorage)
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","superRootPath","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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"}
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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"}
@@ -405,8 +405,10 @@ class YamlService {
405
405
  const updateByNameTags = [];
406
406
  for (const tag of upsertTags){
407
407
  const comparedProperty = tag.name.toLowerCase();
408
- const foundIndex = names.findIndex((n)=>n === comparedProperty);
409
- if (foundIndex !== -1) {
408
+ const foundIndex = names.indexOf(comparedProperty);
409
+ if (foundIndex === -1) {
410
+ insertTags.push(tag);
411
+ } else {
410
412
  if (!ids[foundIndex]) {
411
413
  throw new Error("IDS not found, tag name");
412
414
  }
@@ -416,8 +418,6 @@ class YamlService {
416
418
  value: tag
417
419
  });
418
420
  break;
419
- } else {
420
- insertTags.push(tag);
421
421
  }
422
422
  }
423
423
  return {
@@ -455,7 +455,10 @@ class YamlService {
455
455
  printerURL: p.printerURL,
456
456
  apiKey,
457
457
  username,
458
- password
458
+ password,
459
+ assignee: p.assignee,
460
+ flowRate: p.flowRate,
461
+ feedRate: p.feedRate
459
462
  };
460
463
  });
461
464
  }
@@ -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","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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"}
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","indexOf","exportYaml","options","input","exportPrintersFloorsYamlSchema","exportFloors","exportTags","dumpedObject","version","process","env","npm_package_version","exportedAt","Date","undefined","user_roles","apiKey","getLoginDto","disabledReason","enabled","printerType","dateAdded","assignee","flowRate","feedRate","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.superRootPath)(), _serverconstants.AppConstants.defaultPrintFilesStorage);
71
+ this.storageBasePath = (0, _nodepath.join)((0, _fsutils.getMediaPath)(), _serverconstants.AppConstants.defaultPrintFilesStorage);
72
72
  }
73
73
  async ensureStorageDirectories() {
74
74
  try {
@@ -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","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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"}
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,6 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", {
3
+ value: true
4
+ });
5
+
6
+ //# sourceMappingURL=printer-maintenance-log.dto.js.map
@@ -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,eAAwB;IACxBC,UAAmB;IACnBN,OAAgB;IAChBO,SAAkB;IAClBC,SAAkB;IAClBP,WAAmB;IACnBC,YAAoB;AACtB"}
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"}