@fdm-monster/server 1.5.3 → 1.5.4

package/dist/services/core/client-bundle.service.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "ClientBundleService", {
         return ClientBundleService;
     }
 });
-const _admzip = /*#__PURE__*/ _interop_require_default(require("adm-zip"));
+const _admzip = _interop_require_default(require("adm-zip"));
 const _path = require("path");
 const _nodefs = require("node:fs");
 const _promises = require("node:fs/promises");
@@ -60,7 +60,6 @@ class ClientBundleService {
             };
         }
         const version = this.getClientVersion();
-        // If no package.json found, we should update to latest/minimum
         if (!version) {
             return {
                 shouldUpdate: true,
@@ -73,7 +72,6 @@ class ClientBundleService {
                 reason: `Client index.html does not exist, downloading new release`
             };
         }
-        // If no bundle found, this task should run to ensure one is downloaded
         const satisfiesMinimumVersion = (0, _semverutils.checkVersionSatisfiesMinimum)(version, minimumVersion);
         if (satisfiesMinimumVersion) {
             return {
@@ -143,7 +141,6 @@ class ClientBundleService {
     getClientVersion() {
         const packageJsonPath = this.clientPackageJsonPath;
         const packageJsonFound = (0, _nodefs.existsSync)(packageJsonPath);
-        // If no package.json found, we should update to latest/minimum
         if (!packageJsonFound) {
             return;
         }

package/dist/services/core/client-bundle.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/client-bundle.service.ts"],"names":["ClientBundleService","githubService","configService","logger","constructor","loggerFactory","name","clientPackageJsonPath","join","superRootPath","AppConstants","defaultClientBundleStorage","clientIndexHtmlPath","getReleases","githubOwner","orgName","githubRepo","clientRepoName","result","latestResult","getLatestRelease","minimum","tag_name","defaultClientMinimum","current","getClientVersion","latest","data","releases","shouldUpdateWithReason","overrideAutoUpdate","minimumVersion","clientAutoUpdate","enableClientDistAutoUpdateKey","shouldUpdate","reason","version","doesClientIndexHtmlExist","satisfiesMinimumVersion","checkVersionSatisfiesMinimum","downloadClientUpdate","releaseTag","release","getClientBundleRelease","log","assets","length","map","a","asset","find","assetId","id","downloadPath","downloadClientBundleZip","extractClientBundleZip","getReleaseByTag","assetName","assetResult","requestAsset","dir","defaultClientBundleZipsStorage","ensureDirExists","path","writeFileSync","Buffer","from","downloadedZipPath","zip","AdmZip","distPath","debug","fileOrDir","readdir","rm","force","recursive","e","error","message","stack","extractAllTo","indexHtmlPath","existsSync","packageJsonPath","packageJsonFound","require","cache","undefined","json"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/client-bundle.service.ts"],"names":["ClientBundleService","githubService","configService","logger","constructor","loggerFactory","name","clientPackageJsonPath","join","superRootPath","AppConstants","defaultClientBundleStorage","clientIndexHtmlPath","getReleases","githubOwner","orgName","githubRepo","clientRepoName","result","latestResult","getLatestRelease","minimum","tag_name","defaultClientMinimum","current","getClientVersion","latest","data","releases","shouldUpdateWithReason","overrideAutoUpdate","minimumVersion","clientAutoUpdate","enableClientDistAutoUpdateKey","shouldUpdate","reason","version","doesClientIndexHtmlExist","satisfiesMinimumVersion","checkVersionSatisfiesMinimum","downloadClientUpdate","releaseTag","release","getClientBundleRelease","log","assets","length","map","a","asset","find","assetId","id","downloadPath","downloadClientBundleZip","extractClientBundleZip","getReleaseByTag","assetName","assetResult","requestAsset","dir","defaultClientBundleZipsStorage","ensureDirExists","path","writeFileSync","Buffer","from","downloadedZipPath","zip","AdmZip","distPath","debug","fileOrDir","readdir","rm","force","recursive","e","error","message","stack","extractAllTo","indexHtmlPath","existsSync","packageJsonPath","packageJsonFound","require","cache","undefined","json"],"mappings":";;;;+BAYaA;;;eAAAA;;;iDAZM;sBACE;wBACqB;0BACd;yBACmB;6BACF;iCAChB;;;;;;AAMtB,MAAMA;IACXC,cAA6B;IAC7BC,cAA6B;IAC7BC,OAAsB;IAEtBC,YAAY,EACVH,aAAa,EACbC,aAAa,EACbG,aAAa,EAKd,CAAE;QACD,IAAI,CAACJ,aAAa,GAAGA;QACrB,IAAI,CAACC,aAAa,GAAGA;QACrB,IAAI,CAACC,MAAM,GAAGE,cAAcL,oBAAoBM,IAAI;IACtD;IAEA,IAAIC,wBAAwB;QAC1B,OAAOC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIC,6BAAY,CAACC,0BAA0B,EAAE;IACxE;IAEA,IAAIC,sBAAsB;QACxB,OAAOJ,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIC,6BAAY,CAACC,0BAA0B,EAAE;IACxE;IAEA,MAAME,cAAc;QAClB,MAAMC,cAAcJ,6BAAY,CAACK,OAAO;QACxC,MAAMC,aAAaN,6BAAY,CAACO,cAAc;QAC9C,MAAMC,SAAS,MAAM,IAAI,CAACjB,aAAa,CAACY,WAAW,CAACC,aAAaE;QACjE,MAAMG,eAAe,MAAM,IAAI,CAAClB,aAAa,CAACmB,gBAAgB,CAACN,aAAaE;QAC5E,OAAO;YACLK,SAAS;gBACPC,UAAUZ,6BAAY,CAACa,oBAAoB;YAC7C;YACAC,SAAS;gBACPF,UAAU,IAAI,CAACG,gBAAgB;YACjC;YACAC,QAAQP,aAAaQ,IAAI;YACzBC,UAAUV,OAAOS,IAAI;QACvB;IACF;IAEA,MAAME,uBACJC,kBAA2B,EAC3BC,cAAsB,EAC8B;QACpD,MAAMC,mBAAmBtB,6BAAY,CAACuB,6BAA6B;QACnE,IAAI,CAACD,oBAAoB,CAACF,oBAAoB;YAC5C,OAAO;gBACLI,cAAc;gBACdC,QAAQ;YACV;QACF;QAEA,MAAMC,UAAU,IAAI,CAACX,gBAAgB;QAErC,IAAI,CAACW,SAAS;YACZ,OAAO;gBACLF,cAAc;gBACdC,QAAQ,CAAC,2DAA2D,CAAC;YACvE;QACF;QAEA,IAAI,CAAC,IAAI,CAACE,wBAAwB,IAAI;YACpC,OAAO;gBACLH,cAAc;gBACdC,QAAQ,CAAC,yDAAyD,CAAC;YACrE;QACF;QAGA,MAAMG,0BAA0BC,IAAAA,yCAA4B,EAACH,SAASL;QACtE,IAAIO,yBAAyB;YAC3B,OAAO;gBACLJ,cAAc;gBACdC,QAAQ,CAAC,iCAAiC,EAAEJ,eAAe,UAAU,CAAC;YACxE;QACF;QAEA,OAAO;YACLG,cAAc;YACdC,QAAQ,CAAC,sBAAsB,EAAEC,QAAQ,kCAAkC,EAAEL,eAAe,yBAAyB,CAAC;QACxH;IACF;IAEA,MAAMS,qBAAqBC,UAAkB,EAAiB;QAC5D,MAAMC,UAAU,MAAM,IAAI,CAACC,sBAAsB,CAACF;QAClD,IAAI,CAACtC,MAAM,CAACyC,GAAG,CACb,CAAC,UAAU,EAAEF,QAAQG,MAAM,CAACC,MAAM,CAAC,sBAAsB,EAAEJ,QAAQpC,IAAI,CAAC,GAAG,EAAEoC,QAAQG,MAAM,CAACE,GAAG,CAAC,CAACC,IAAMA,EAAE1C,IAAI,EAAE,CAAC;QAGlH,MAAM2C,QAAQP,QAAQG,MAAM,CAACK,IAAI,CAAC,CAACF,IAAMA,EAAE1C,IAAI,KAAK,CAAC,YAAY,EAAEoC,QAAQpB,QAAQ,CAAC,IAAI,CAAC;QACzF,MAAM6B,UAAUF,MAAMG,EAAE;QACxB,MAAMC,eAAe,MAAM,IAAI,CAACC,uBAAuB,CAACH,SAASF,MAAM3C,IAAI;QAC3E,MAAM,IAAI,CAACiD,sBAAsB,CAACF;IACpC;IAEA,MAAcV,uBAAuBF,UAAkB,EAA8B;QACnF,MAAM3B,cAAcJ,6BAAY,CAACK,OAAO;QACxC,MAAMC,aAAaN,6BAAY,CAACO,cAAc;QAE9C,MAAMC,SAAS,MAAM,IAAI,CAACjB,aAAa,CAACuD,eAAe,CAAC1C,aAAaE,YAAYyB;QACjF,OAAOvB,OAAOS,IAAI;IACpB;IAEA,MAAc2B,wBAAwBH,OAAY,EAAEM,SAAiB,EAAyB;QAC5F,MAAM3C,cAAcJ,6BAAY,CAACK,OAAO;QACxC,MAAMC,aAAaN,6BAAY,CAACO,cAAc;QAC9C,MAAMyC,cAAc,MAAM,IAAI,CAACzD,aAAa,CAAC0D,YAAY,CAAC7C,aAAaE,YAAYmC;QACnF,MAAMS,MAAMpD,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIC,6BAAY,CAACmD,8BAA8B;QAC7EC,IAAAA,wBAAe,EAACF;QAChB,IAAI,CAACzD,MAAM,CAACyC,GAAG,CAAC,CAAC,kCAAkC,EAAEgB,IAAI,yBAAyB,CAAC;QACnF,MAAMG,OAAOvD,IAAAA,UAAI,EAACoD,KAAKH;QACvBO,IAAAA,qBAAa,EAACD,MAAME,OAAOC,IAAI,CAACR,YAAY/B,IAAI;QAEhD,OAAOoC;IACT;IAEA,MAAcR,uBAAuBY,iBAAyB,EAAiB;QAC7E,MAAMC,MAAM,IAAIC,eAAM,CAACF;QAEvB,MAAMG,WAAW9D,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIC,6BAAY,CAACC,0BAA0B;QAC9EmD,IAAAA,wBAAe,EAACQ;QAEhB,IAAI,CAACnE,MAAM,CAACoE,KAAK,CAAC,CAAC,qBAAqB,EAAED,SAAS,CAAC;QACpD,KAAK,MAAME,aAAa,CAAA,MAAMC,IAAAA,iBAAO,EAACH,SAAQ,EAAG;YAC/C,IAAI,CAACnE,MAAM,CAACyC,GAAG,CAAC,CAAC,4BAA4B,EAAE0B,SAAS,CAAC,EAAEE,UAAU,wBAAwB,CAAC;YAC9F,IAAI;gBACF,MAAME,IAAAA,YAAE,EAAClE,IAAAA,UAAI,EAAC8D,UAAUE,YAAY;oBAAEG,OAAO;oBAAMC,WAAW;gBAAK;YACrE,EAAE,OAAOC,GAAG;gBACV,IAAI,CAAC1E,MAAM,CAAC2E,KAAK,CAAC,CAAC,EAAED,EAAEE,OAAO,CAAC,CAAC,EAAEF,EAAEG,KAAK,CAAC,CAAC;gBAC3C,MAAMH;YACR;QACF;QACA,IAAI;YACFT,IAAIa,YAAY,CAACzE,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIC,6BAAY,CAACC,0BAA0B;QAChF,EAAE,OAAOkE,GAAG;YACV,IAAI,CAAC1E,MAAM,CAAC2E,KAAK,CAAC,CAAC,iBAAiB,EAAED,EAAEE,OAAO,CAAC,CAAC,EAAEF,EAAEG,KAAK,CAAC,CAAC;YAC5D,MAAMH;QACR;QACA,IAAI,CAAC1E,MAAM,CAACyC,GAAG,CAAC,CAAC,sCAAsC,EAAE0B,SAAS,CAAC;IACrE;IAEQjC,2BAAoC;QAC1C,MAAM6C,gBAAgB,IAAI,CAACtE,mBAAmB;QAC9C,OAAOuE,IAAAA,kBAAU,EAACD;IACpB;IAEQzD,mBAAkC;QACxC,MAAM2D,kBAAkB,IAAI,CAAC7E,qBAAqB;QAClD,MAAM8E,mBAAmBF,IAAAA,kBAAU,EAACC;QAEpC,IAAI,CAACC,kBAAkB;YACrB;QACF;QAEAC,QAAQC,KAAK,CAACH,gBAAgB,GAAGI;QACjC,MAAMC,OAAOH,QAAQF;QACrB,OAAOK,MAAMrD;IACf;AACF"}

package/dist/services/core/logs-manager.service.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "LogDumpService", {
         return LogDumpService;
     }
 });
-const _admzip = /*#__PURE__*/ _interop_require_default(require("adm-zip"));
+const _admzip = _interop_require_default(require("adm-zip"));
 const _path = require("path");
 const _fs = require("fs");
 const _fsutils = require("../../utils/fs.utils");
@@ -31,7 +31,6 @@ class LogDumpService {
             withFileTypes: true
         });
         const files = dirEntries.filter((dirent)=>dirent.isFile()).map((dirent)=>dirent.name);
-        // Filter only log files that are not in the format of logs/<app-name>-<date>.log
         const startingFormat = `${_serverconstants.AppConstants.logAppName}-`;
         const removedFilesNotInFormat = files.filter((f)=>f.endsWith(".log") && !f.startsWith(startingFormat));
         const removedFilesOutdated = files.filter((f)=>{

package/dist/services/core/logs-manager.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/logs-manager.service.ts"],"names":["LogDumpService","logger","constructor","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","date","Date","isValidDate","warn","now","diff","getTime","diffDays","length","removedWrongFormatFilesCount","file","unlinkSync","err","removedOutdatedFilesCount","dumpZip","zip","AdmZip","addLocalFolder","outputPath","defaultLogZipsFolder","serverRepoName","writeZip"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/logs-manager.service.ts"],"names":["LogDumpService","logger","constructor","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","date","Date","isValidDate","warn","now","diff","getTime","diffDays","length","removedWrongFormatFilesCount","file","unlinkSync","err","removedOutdatedFilesCount","dumpZip","zip","AdmZip","addLocalFolder","outputPath","defaultLogZipsFolder","serverRepoName","writeZip"],"mappings":"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"}

package/dist/services/core/multer.service.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "MulterService", {
         return MulterService;
     }
 });
-const _multer = /*#__PURE__*/ _interop_require_default(require("multer"));
+const _multer = _interop_require_default(require("multer"));
 const _path = require("path");
 const _fs = require("fs");
 const _fsutils = require("../../utils/fs.utils");
@@ -39,7 +39,7 @@ class MulterService {
         }).filter((item)=>!item.isDirectory()).map((item)=>item.name);
         for (const file of files){
             (0, _fs.unlink)((0, _path.join)(fileStoragePath, file), (err)=>{
-                /* istanbul ignore next */ if (err) throw err;
+                if (err) throw err;
             });
         }
     }
@@ -105,10 +105,7 @@ class MulterService {
     getSessions() {
         return this.fileUploadTrackerCache.getUploads();
     }
-    /**
-   *@param dir
-   * @returns {{file: *, mtime: Date}[]}
-   */ orderRecentFiles = (dir)=>{
+    orderRecentFiles = (dir)=>{
         return (0, _fs.readdirSync)(dir).filter((file)=>(0, _fs.lstatSync)((0, _path.join)(dir, file)).isFile()).map((file)=>({
                 file,
                 mtime: (0, _fs.lstatSync)((0, _path.join)(dir, file)).mtime

package/dist/services/core/multer.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/multer.service.ts"],"names":["MulterService","fileUploadTrackerCache","httpClient","constructor","getNewestFile","collection","dirPath","collectionPath","files","orderRecentFiles","latestFile","length","undefined","join","file","clearUploadsFolder","fileStoragePath","superRootPath","AppConstants","defaultFileStorageFolder","existsSync","readdirSync","withFileTypes","filter","item","isDirectory","map","name","unlink","err","fileExists","downloadFilename","downloadPath","downloadFile","downloadUrl","downloadFolder","mkdirSync","recursive","fileStream","createWriteStream","res","get","Promise","resolve","reject","write","data","on","getMulterGCodeFileFilter","storeAsFile","getMulterFileFilter","multerLoadFileAsync","req","fileExtension","multer","storage","diskStorage","destination","memoryStorage","fileFilter","multerFileFilter","any","extension","callback","ext","extname","originalname","Error","startTrackingSession","multerFile","addUploadTracker","getSessions","getUploads","dir","lstatSync","isFile","mtime","sort","a","b","getTime"],"mappings":";;;;+BAQaA;;;eAAAA;;;+DARM;sBACW;oBAC2D;yBAC3D;iCACD;;;;;;AAItB,MAAMA;IACXC,uBAA+C;IAC/CC,WAAwB;IAExBC,YAAY,EACVF,sBAAsB,EACtBC,UAAU,EAIX,CAAE;QACD,IAAI,CAACD,sBAAsB,GAAGA;QAC9B,IAAI,CAACC,UAAU,GAAGA;IACpB;IAEAE,cAAcC,UAAU,EAAE;QACxB,MAAMC,UAAU,IAAI,CAACC,cAAc,CAACF;QACpC,MAAMG,QAAQ,IAAI,CAACC,gBAAgB,CAACH;QACpC,MAAMI,aAAaF,MAAMG,MAAM,GAAGH,KAAK,CAAC,EAAE,GAAGI;QAC7C,OAAOF,aAAaG,IAAAA,UAAI,EAACP,SAASI,WAAWI,IAAI,IAAIF;IACvD;IAEAG,qBAAqB;QACnB,MAAMC,kBAAkBH,IAAAA,UAAI,EAACI,IAAAA,sBAAa,KAAIC,6BAAY,CAACC,wBAAwB;QACnF,IAAI,CAACC,IAAAA,cAAU,EAACJ,kBAAkB;QAElC,MAAMR,QAAQa,IAAAA,eAAW,EAACL,iBAAiB;YAAEM,eAAe;QAAK,GAC9DC,MAAM,CAAC,CAACC,OAAS,CAACA,KAAKC,WAAW,IAClCC,GAAG,CAAC,CAACF,OAASA,KAAKG,IAAI;QAE1B,KAAK,MAAMb,QAAQN,MAAO;YACxBoB,IAAAA,UAAM,EAACf,IAAAA,UAAI,EAACG,iBAAiBF,OAAO,CAACe;gBACnC,wBAAwB,GACxB,IAAIA,KAAK,MAAMA;YACjB;QACF;IACF;IAEAC,WAAWC,gBAAgB,EAAE1B,UAAU,EAAE;QACvC,MAAM2B,eAAenB,IAAAA,UAAI,EAACI,IAAAA,sBAAa,KAAIC,6BAAY,CAACC,wBAAwB,EAAEd,YAAY0B;QAC9F,OAAOX,IAAAA,cAAU,EAACY;IACpB;IAEA,MAAMC,aAAaC,WAAW,EAAEH,gBAAgB,EAAE1B,UAAU,EAAE;QAC5D,MAAM8B,iBAAiBtB,IAAAA,UAAI,EAACI,IAAAA,sBAAa,KAAIC,6BAAY,CAACC,wBAAwB,EAAEd;QACpF,IAAI,CAACe,IAAAA,cAAU,EAACe,iBAAiB;YAC/BC,IAAAA,aAAS,EAACD,gBAAgB;gBAAEE,WAAW;YAAK;QAC9C;QACA,MAAML,eAAenB,IAAAA,UAAI,EAACI,IAAAA,sBAAa,KAAIC,6BAAY,CAACC,wBAAwB,EAAEd,YAAY0B;QAC9F,MAAMO,aAAaC,IAAAA,qBAAiB,EAACP;QAErC,MAAMQ,MAAM,MAAM,IAAI,CAACtC,UAAU,CAACuC,GAAG,CAACP;QACtC,OAAO,MAAM,IAAIQ,QAAQ,CAACC,SAASC;YACjCN,WAAWO,KAAK,CAACL,IAAIM,IAAI;YACzBR,WAAWS,EAAE,CAAC,SAAS,CAAClB;gBACtB,OAAOe,OAAOf;YAChB;YACAS,WAAWS,EAAE,CAAC,UAAU;gBACtB,OAAOJ;YACT;YACAL,WAAWS,EAAE,CAAC,SAAS;gBACrB,OAAOJ;YACT;YACAA;QACF;IACF;IAEAK,yBAAyBC,cAAc,IAAI,EAAE;QAC3C,OAAO,IAAI,CAACC,mBAAmB,CAAC,UAAUD;IAC5C;IAEA,MAAME,oBAAoBC,GAAG,EAAEZ,GAAG,EAAEa,aAAa,EAAEJ,cAAc,IAAI,EAAE;QACrE,OAAO,MAAM,IAAIP,QAAQ,CAACC,SAASC,SACjC,IAAI,CAACM,mBAAmB,CAACG,eAAeJ,aAAaG,KAAKZ,KAAK,CAACX;gBAC9D,IAAIA,KAAK;oBACP,OAAOe,OAAOf;gBAChB;gBACAc,QAAQS,IAAI5C,KAAK;YACnB;IAEJ;IAEA0C,oBAAoBG,aAAa,EAAEJ,cAAc,IAAI,EAAE;QACrD,OAAOK,IAAAA,eAAM,EAAC;YACZC,SAASN,cACLK,eAAM,CAACE,WAAW,CAAC;gBACjBC,aAAa5C,IAAAA,UAAI,EAACI,IAAAA,sBAAa,KAAIC,6BAAY,CAACC,wBAAwB;YAC1E,KACAmC,eAAM,CAACI,aAAa;YACxBC,YAAY,IAAI,CAACC,gBAAgB,CAACP;QACpC,GAAGQ,GAAG;IACR;IAEAD,iBAAiBE,SAAS,EAAE;QAC1B,OAAO,CAACV,KAAKtC,MAAMiD;YACjB,MAAMC,MAAMC,IAAAA,aAAO,EAACnD,KAAKoD,YAAY;YACrC,IAAIJ,WAAWnD,UAAUqD,QAAQF,WAAW;gBAC1C,OAAOC,SAAS,IAAII,MAAM,CAAC,0BAA0B,EAAEL,UAAU,YAAY,CAAC;YAChF;YACA,OAAOC,SAAS,MAAM;QACxB;IACF;IAEAK,qBAAqBC,UAAU,EAAE;QAC/B,OAAO,IAAI,CAACpE,sBAAsB,CAACqE,gBAAgB,CAACD;IACtD;IAEAE,cAAc;QACZ,OAAO,IAAI,CAACtE,sBAAsB,CAACuE,UAAU;IAC/C;IAEA;;;GAGC,GACD,AAAQ/D,mBAAmB,CAACgE;QAC1B,OAAOpD,IAAAA,eAAW,EAACoD,KAChBlD,MAAM,CAAC,CAACT,OAAS4D,IAAAA,aAAS,EAAC7D,IAAAA,UAAI,EAAC4D,KAAK3D,OAAO6D,MAAM,IAClDjD,GAAG,CAAC,CAACZ,OAAU,CAAA;gBAAEA;gBAAM8D,OAAOF,IAAAA,aAAS,EAAC7D,IAAAA,UAAI,EAAC4D,KAAK3D,OAAO8D,KAAK;YAAC,CAAA,GAC/DC,IAAI,CAAC,CAACC,GAAGC,IAAMA,EAAEH,KAAK,CAACI,OAAO,KAAKF,EAAEF,KAAK,CAACI,OAAO;IACvD,EAAE;IAEMzE,eAAeF,UAAU,EAAU;QACzC,OAAOQ,IAAAA,UAAI,EAACI,IAAAA,sBAAa,KAAIC,6BAAY,CAACC,wBAAwB,EAAEd;IACtE;AACF"}
+{"version":3,"sources":["../../../src/services/core/multer.service.ts"],"names":["MulterService","fileUploadTrackerCache","httpClient","constructor","getNewestFile","collection","dirPath","collectionPath","files","orderRecentFiles","latestFile","length","undefined","join","file","clearUploadsFolder","fileStoragePath","superRootPath","AppConstants","defaultFileStorageFolder","existsSync","readdirSync","withFileTypes","filter","item","isDirectory","map","name","unlink","err","fileExists","downloadFilename","downloadPath","downloadFile","downloadUrl","downloadFolder","mkdirSync","recursive","fileStream","createWriteStream","res","get","Promise","resolve","reject","write","data","on","getMulterGCodeFileFilter","storeAsFile","getMulterFileFilter","multerLoadFileAsync","req","fileExtension","multer","storage","diskStorage","destination","memoryStorage","fileFilter","multerFileFilter","any","extension","callback","ext","extname","originalname","Error","startTrackingSession","multerFile","addUploadTracker","getSessions","getUploads","dir","lstatSync","isFile","mtime","sort","a","b","getTime"],"mappings":";;;;+BAQaA;;;eAAAA;;;iDARM;sBACW;oBAC2D;yBAC3D;iCACD;;;;;;AAItB,MAAMA;IACXC,uBAA+C;IAC/CC,WAAwB;IAExBC,YAAY,EACVF,sBAAsB,EACtBC,UAAU,EAIX,CAAE;QACD,IAAI,CAACD,sBAAsB,GAAGA;QAC9B,IAAI,CAACC,UAAU,GAAGA;IACpB;IAEAE,cAAcC,UAAU,EAAE;QACxB,MAAMC,UAAU,IAAI,CAACC,cAAc,CAACF;QACpC,MAAMG,QAAQ,IAAI,CAACC,gBAAgB,CAACH;QACpC,MAAMI,aAAaF,MAAMG,MAAM,GAAGH,KAAK,CAAC,EAAE,GAAGI;QAC7C,OAAOF,aAAaG,IAAAA,UAAI,EAACP,SAASI,WAAWI,IAAI,IAAIF;IACvD;IAEAG,qBAAqB;QACnB,MAAMC,kBAAkBH,IAAAA,UAAI,EAACI,IAAAA,sBAAa,KAAIC,6BAAY,CAACC,wBAAwB;QACnF,IAAI,CAACC,IAAAA,cAAU,EAACJ,kBAAkB;QAElC,MAAMR,QAAQa,IAAAA,eAAW,EAACL,iBAAiB;YAAEM,eAAe;QAAK,GAC9DC,MAAM,CAAC,CAACC,OAAS,CAACA,KAAKC,WAAW,IAClCC,GAAG,CAAC,CAACF,OAASA,KAAKG,IAAI;QAE1B,KAAK,MAAMb,QAAQN,MAAO;YACxBoB,IAAAA,UAAM,EAACf,IAAAA,UAAI,EAACG,iBAAiBF,OAAO,CAACe;gBAEnC,IAAIA,KAAK,MAAMA;YACjB;QACF;IACF;IAEAC,WAAWC,gBAAgB,EAAE1B,UAAU,EAAE;QACvC,MAAM2B,eAAenB,IAAAA,UAAI,EAACI,IAAAA,sBAAa,KAAIC,6BAAY,CAACC,wBAAwB,EAAEd,YAAY0B;QAC9F,OAAOX,IAAAA,cAAU,EAACY;IACpB;IAEA,MAAMC,aAAaC,WAAW,EAAEH,gBAAgB,EAAE1B,UAAU,EAAE;QAC5D,MAAM8B,iBAAiBtB,IAAAA,UAAI,EAACI,IAAAA,sBAAa,KAAIC,6BAAY,CAACC,wBAAwB,EAAEd;QACpF,IAAI,CAACe,IAAAA,cAAU,EAACe,iBAAiB;YAC/BC,IAAAA,aAAS,EAACD,gBAAgB;gBAAEE,WAAW;YAAK;QAC9C;QACA,MAAML,eAAenB,IAAAA,UAAI,EAACI,IAAAA,sBAAa,KAAIC,6BAAY,CAACC,wBAAwB,EAAEd,YAAY0B;QAC9F,MAAMO,aAAaC,IAAAA,qBAAiB,EAACP;QAErC,MAAMQ,MAAM,MAAM,IAAI,CAACtC,UAAU,CAACuC,GAAG,CAACP;QACtC,OAAO,MAAM,IAAIQ,QAAQ,CAACC,SAASC;YACjCN,WAAWO,KAAK,CAACL,IAAIM,IAAI;YACzBR,WAAWS,EAAE,CAAC,SAAS,CAAClB;gBACtB,OAAOe,OAAOf;YAChB;YACAS,WAAWS,EAAE,CAAC,UAAU;gBACtB,OAAOJ;YACT;YACAL,WAAWS,EAAE,CAAC,SAAS;gBACrB,OAAOJ;YACT;YACAA;QACF;IACF;IAEAK,yBAAyBC,cAAc,IAAI,EAAE;QAC3C,OAAO,IAAI,CAACC,mBAAmB,CAAC,UAAUD;IAC5C;IAEA,MAAME,oBAAoBC,GAAG,EAAEZ,GAAG,EAAEa,aAAa,EAAEJ,cAAc,IAAI,EAAE;QACrE,OAAO,MAAM,IAAIP,QAAQ,CAACC,SAASC,SACjC,IAAI,CAACM,mBAAmB,CAACG,eAAeJ,aAAaG,KAAKZ,KAAK,CAACX;gBAC9D,IAAIA,KAAK;oBACP,OAAOe,OAAOf;gBAChB;gBACAc,QAAQS,IAAI5C,KAAK;YACnB;IAEJ;IAEA0C,oBAAoBG,aAAa,EAAEJ,cAAc,IAAI,EAAE;QACrD,OAAOK,IAAAA,eAAM,EAAC;YACZC,SAASN,cACLK,eAAM,CAACE,WAAW,CAAC;gBACjBC,aAAa5C,IAAAA,UAAI,EAACI,IAAAA,sBAAa,KAAIC,6BAAY,CAACC,wBAAwB;YAC1E,KACAmC,eAAM,CAACI,aAAa;YACxBC,YAAY,IAAI,CAACC,gBAAgB,CAACP;QACpC,GAAGQ,GAAG;IACR;IAEAD,iBAAiBE,SAAS,EAAE;QAC1B,OAAO,CAACV,KAAKtC,MAAMiD;YACjB,MAAMC,MAAMC,IAAAA,aAAO,EAACnD,KAAKoD,YAAY;YACrC,IAAIJ,WAAWnD,UAAUqD,QAAQF,WAAW;gBAC1C,OAAOC,SAAS,IAAII,MAAM,CAAC,0BAA0B,EAAEL,UAAU,YAAY,CAAC;YAChF;YACA,OAAOC,SAAS,MAAM;QACxB;IACF;IAEAK,qBAAqBC,UAAU,EAAE;QAC/B,OAAO,IAAI,CAACpE,sBAAsB,CAACqE,gBAAgB,CAACD;IACtD;IAEAE,cAAc;QACZ,OAAO,IAAI,CAACtE,sBAAsB,CAACuE,UAAU;IAC/C;IAMQ/D,mBAAmB,CAACgE;QAC1B,OAAOpD,IAAAA,eAAW,EAACoD,KAChBlD,MAAM,CAAC,CAACT,OAAS4D,IAAAA,aAAS,EAAC7D,IAAAA,UAAI,EAAC4D,KAAK3D,OAAO6D,MAAM,IAClDjD,GAAG,CAAC,CAACZ,OAAU,CAAA;gBAAEA;gBAAM8D,OAAOF,IAAAA,aAAS,EAAC7D,IAAAA,UAAI,EAAC4D,KAAK3D,OAAO8D,KAAK;YAAC,CAAA,GAC/DC,IAAI,CAAC,CAACC,GAAGC,IAAMA,EAAEH,KAAK,CAACI,OAAO,KAAKF,EAAEF,KAAK,CAACI,OAAO;IACvD,EAAE;IAEMzE,eAAeF,UAAU,EAAU;QACzC,OAAOQ,IAAAA,UAAI,EAACI,IAAAA,sBAAa,KAAIC,6BAAY,CAACC,wBAAwB,EAAEd;IACtE;AACF"}

package/dist/services/core/server-release.service.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "ServerReleaseService", {
         return ServerReleaseService;
     }
 });
-const _semver = /*#__PURE__*/ _interop_require_default(require("semver"));
+const _semver = _interop_require_default(require("semver"));
 const _logger = require("../../handlers/logger");
 const _serverconstants = require("../../server.constants");
 function _interop_require_default(obj) {
@@ -24,9 +24,7 @@ class ServerReleaseService {
     updateAvailable = null;
     latestRelease = null;
     installedRelease = null;
-    /**
-   * @type {LoggerService}
-   */ #logger = new _logger.LoggerService(ServerReleaseService.name);
+    #logger = new _logger.LoggerService(ServerReleaseService.name);
     #serverVersion;
     constructor({ serverVersion, githubService }){
         this.#serverVersion = serverVersion;
@@ -43,9 +41,7 @@ class ServerReleaseService {
             synced: this.synced
         };
     }
-    /**
-   * Connection-safe acquire data about the installed and latest releases.
-   */ async syncLatestRelease() {
+    async syncLatestRelease() {
         if (!await this.githubService.wasAuthenticated()) {
             return;
         }
@@ -56,7 +52,6 @@ class ServerReleaseService {
         this.synced = true;
         const releases = response.data;
         const latestRelease = latestResponse.data;
-        // Connection timeout results in airGapped state
         this.airGapped = !releases?.length;
         if (!releases?.length) {
             this.#logger.warn("Latest release check failed because releases from github empty");
@@ -72,18 +67,14 @@ class ServerReleaseService {
             this.updateAvailable = false;
             return;
         }
-        // If the installed release is unknown/unstable, no update should be triggered
         const lastTagIsNewer = _semver.default.gt(this.latestRelease.tag_name, this.installedRelease.tag_name, true);
         this.updateAvailable = this.installedReleaseFound && lastTagIsNewer;
     }
-    /**
-   * Logs whether a firmware update is ready
-   */ logServerVersionState() {
+    logServerVersionState() {
         const latestReleaseState = this.getState();
         const latestRelease = latestReleaseState?.latestRelease;
         const latestReleaseTag = latestRelease?.tag_name;
         if (!latestReleaseTag) {
-            // Tests only, silence it
             return;
         }
         const packageVersion = this.#serverVersion;

package/dist/services/core/server-release.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/server-release.service.ts"],"names":["ServerReleaseService","airGapped","githubService","synced","installedReleaseFound","updateAvailable","latestRelease","installedRelease","logger","LoggerService","name","serverVersion","constructor","getState","syncLatestRelease","wasAuthenticated","owner","AppConstants","orgName","repo","serverRepoName","response","getReleases","latestResponse","getLatestRelease","releases","data","length","warn","currentlyInstalledRelease","tag_name","lastTagIsNewer","semver","gt","logServerVersionState","latestReleaseState","latestReleaseTag","packageVersion","log","prerelease","error"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/server-release.service.ts"],"names":["ServerReleaseService","airGapped","githubService","synced","installedReleaseFound","updateAvailable","latestRelease","installedRelease","logger","LoggerService","name","serverVersion","constructor","getState","syncLatestRelease","wasAuthenticated","owner","AppConstants","orgName","repo","serverRepoName","response","getReleases","latestResponse","getLatestRelease","releases","data","length","warn","currentlyInstalledRelease","tag_name","lastTagIsNewer","semver","gt","logServerVersionState","latestReleaseState","latestReleaseTag","packageVersion","log","prerelease","error"],"mappings":"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"}

package/dist/services/core/server-update.service.js

@@ -21,7 +21,6 @@ class ServerUpdateService {
     }
     async restartServer() {
         if (!(0, _envutils.isPm2)() && !(0, _envutils.isNodemon)()) {
-            // No daemon/overlay to trigger restart
             throw new _runtimeexceptions.InternalServerException("Restart requested, but no daemon was available to perform this action");
         }
         if ((0, _envutils.isPm2)()) {
@@ -57,7 +56,6 @@ class ServerUpdateService {
             result.status = "No commits to pull";
             return result;
         }
-        // Either something was not ignored properly or we are in unstable/dev mode
         if (localRepoStatus?.modified?.length > 0 || localRepoStatus.ahead !== 0) {
             result.status = "Files were modified or the repo was commits ahead - cannot pull safely";
             return result;

package/dist/services/core/server-update.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/server-update.service.ts"],"names":["ServerUpdateService","simpleGitService","logger","constructor","loggerFactory","name","restartServer","isPm2","isNodemon","InternalServerException","execSync","AppConstants","pm2ServiceName","timeout","checkGitUpdates","isValidGitRepo","checkIsRepo","ValidationException","fetch","localRepoStatus","status","result","gitFolderFound","updateCheckSuccess","commitsBehind","behind","commitsAhead","ahead","filesModified","modified","length","pullStatus","warn","pullDetails","pull"],"mappings":";;;;+BAQaA;;;eAAAA;;;0BARoB;iCACJ;+BACJ;mCACoC;AAKtD,MAAMA;IACHC,iBAA4B;IAC5BC,OAAsB;IAE9BC,YAAY,EAAEF,gBAAgB,EAAEG,aAAa,EAAkE,CAAE;QAC/G,IAAI,CAACH,gBAAgB,GAAGA;QACxB,IAAI,CAACC,MAAM,GAAGE,cAAcJ,oBAAoBK,IAAI;IACtD;IAEA,MAAMC,gBAAgB;QACpB,IAAI,CAACC,IAAAA,eAAK,OAAM,CAACC,IAAAA,mBAAS,KAAI;YAC5B,uCAAuC;YACvC,MAAM,IAAIC,0CAAuB,CAAC;QACpC;QAEA,IAAIF,IAAAA,eAAK,KAAI;YACXG,IAAAA,uBAAQ,EAAC,CAAC,YAAY,EAAEC,6BAAY,CAACC,cAAc,CAAC,CAAC,EAAE;gBAAEC,SAAS;YAAK;YACvE,OAAO;QACT,OAAO,IAAIL,IAAAA,mBAAS,KAAI;YACtBE,IAAAA,uBAAQ,EAAC,qEAAqE;gBAC5EG,SAAS;YACX;YACA,OAAO;QACT;IACF;IAEA,MAAMC,kBAAkB;QACtB,IAAIC,iBAAiB,IAAI,CAACd,gBAAgB,CAACe,WAAW;QACtD,IAAI,CAACD,gBAAgB;YACnB,MAAM,IAAIE,sCAAmB,CAAC;QAChC;QAEA,MAAM,IAAI,CAAChB,gBAAgB,CAACiB,KAAK;QACjC,MAAMC,kBAAkB,MAAM,IAAI,CAAClB,gBAAgB,CAACmB,MAAM;QAE1D,IAAI,CAACD,iBAAiB;QAEtB,MAAME,SAAS;YACbC,gBAAgB;YAChBC,oBAAoB;YACpBC,eAAeL,gBAAgBM,MAAM;YACrCC,cAAcP,gBAAgBQ,KAAK;YACnCC,eAAeT,gBAAgBU,QAAQ,EAAEC;YACzCV,QAAQ;YACRW,YAAY;QACd;QAEA,IAAIZ,iBAAiBM,WAAW,GAAG;YACjCJ,OAAOD,MAAM,GAAG;YAChB,OAAOC;QACT;QAEA,2EAA2E;QAC3E,IAAIF,iBAAiBU,UAAUC,SAAS,KAAKX,gBAAgBQ,KAAK,KAAK,GAAG;YACxEN,OAAOD,MAAM,GAAG;YAChB,OAAOC;QACT;QAEA,IAAI,CAACnB,MAAM,CAAC8B,IAAI,CAAC;QAEjB,MAAMC,cAAc,MAAM,IAAI,CAAChC,gBAAgB,CAACiC,IAAI;QACpDb,OAAOD,MAAM,GAAG;QAChBC,OAAOU,UAAU,GAAGE;QACpB,OAAOZ;IACT;AACF"}
+{"version":3,"sources":["../../../src/services/core/server-update.service.ts"],"names":["ServerUpdateService","simpleGitService","logger","constructor","loggerFactory","name","restartServer","isPm2","isNodemon","InternalServerException","execSync","AppConstants","pm2ServiceName","timeout","checkGitUpdates","isValidGitRepo","checkIsRepo","ValidationException","fetch","localRepoStatus","status","result","gitFolderFound","updateCheckSuccess","commitsBehind","behind","commitsAhead","ahead","filesModified","modified","length","pullStatus","warn","pullDetails","pull"],"mappings":";;;;+BAQaA;;;eAAAA;;;0BARoB;iCACJ;+BACJ;mCACoC;AAKtD,MAAMA;IACHC,iBAA4B;IAC5BC,OAAsB;IAE9BC,YAAY,EAAEF,gBAAgB,EAAEG,aAAa,EAAkE,CAAE;QAC/G,IAAI,CAACH,gBAAgB,GAAGA;QACxB,IAAI,CAACC,MAAM,GAAGE,cAAcJ,oBAAoBK,IAAI;IACtD;IAEA,MAAMC,gBAAgB;QACpB,IAAI,CAACC,IAAAA,eAAK,OAAM,CAACC,IAAAA,mBAAS,KAAI;YAE5B,MAAM,IAAIC,0CAAuB,CAAC;QACpC;QAEA,IAAIF,IAAAA,eAAK,KAAI;YACXG,IAAAA,uBAAQ,EAAC,CAAC,YAAY,EAAEC,6BAAY,CAACC,cAAc,CAAC,CAAC,EAAE;gBAAEC,SAAS;YAAK;YACvE,OAAO;QACT,OAAO,IAAIL,IAAAA,mBAAS,KAAI;YACtBE,IAAAA,uBAAQ,EAAC,qEAAqE;gBAC5EG,SAAS;YACX;YACA,OAAO;QACT;IACF;IAEA,MAAMC,kBAAkB;QACtB,IAAIC,iBAAiB,IAAI,CAACd,gBAAgB,CAACe,WAAW;QACtD,IAAI,CAACD,gBAAgB;YACnB,MAAM,IAAIE,sCAAmB,CAAC;QAChC;QAEA,MAAM,IAAI,CAAChB,gBAAgB,CAACiB,KAAK;QACjC,MAAMC,kBAAkB,MAAM,IAAI,CAAClB,gBAAgB,CAACmB,MAAM;QAE1D,IAAI,CAACD,iBAAiB;QAEtB,MAAME,SAAS;YACbC,gBAAgB;YAChBC,oBAAoB;YACpBC,eAAeL,gBAAgBM,MAAM;YACrCC,cAAcP,gBAAgBQ,KAAK;YACnCC,eAAeT,gBAAgBU,QAAQ,EAAEC;YACzCV,QAAQ;YACRW,YAAY;QACd;QAEA,IAAIZ,iBAAiBM,WAAW,GAAG;YACjCJ,OAAOD,MAAM,GAAG;YAChB,OAAOC;QACT;QAGA,IAAIF,iBAAiBU,UAAUC,SAAS,KAAKX,gBAAgBQ,KAAK,KAAK,GAAG;YACxEN,OAAOD,MAAM,GAAG;YAChB,OAAOC;QACT;QAEA,IAAI,CAACnB,MAAM,CAAC8B,IAAI,CAAC;QAEjB,MAAMC,cAAc,MAAM,IAAI,CAAChC,gBAAgB,CAACiC,IAAI;QACpDb,OAAOD,MAAM,GAAG;QAChBC,OAAOU,UAAU,GAAGE;QACpB,OAAOZ;IACT;AACF"}

package/dist/services/core/task-manager.service.js

@@ -24,7 +24,7 @@ class TaskManagerService {
     }
     validateInput(taskId, workload, schedulerOptions) {
         if (!taskId) {
-            throw new _jobexceptions.JobValidationException("Task ID was not provided. Cant register task or schedule job.");
+            throw new _jobexceptions.JobValidationException("Task ID was not provided. Cant register task or schedule job.", taskId);
         }
         const prefix = `Job '${workload?.name || "anonymous"}' with ID '${taskId}'`;
         if (!!this.taskStates[taskId]) {
@@ -55,18 +55,13 @@ class TaskManagerService {
             throw new _jobexceptions.JobValidationException(`Only tasks of type 'periodic' can be disabled at boot.`, taskId);
         }
         if (schedulerOptions?.runDelayed && !schedulerOptions.milliseconds && !schedulerOptions.seconds) {
-            // Require milliseconds, minutes, hours or days
             throw new _jobexceptions.JobValidationException(`Provide a delayed timing parameter (milliseconds|seconds)'`, taskId);
         }
         if (schedulerOptions?.periodic && !schedulerOptions.milliseconds && !schedulerOptions.seconds && !schedulerOptions.minutes && !schedulerOptions.hours && !schedulerOptions.days) {
-            // Require milliseconds, minutes, hours or days
             throw new _jobexceptions.JobValidationException(`Provide a periodic timing parameter (milliseconds|seconds|minutes|hours|days)'`, taskId);
         }
     }
-    /**
-   * Create a recurring job
-   * Tip: use the options properties `runImmediately` and `seconds/milliseconds/minutes/hours/days`
-   */ registerJobOrTask({ id: taskId, task: asyncTaskCallbackOrToken, preset: schedulerOptions }) {
+    registerJobOrTask({ id: taskId, task: asyncTaskCallbackOrToken, preset: schedulerOptions }) {
         try {
             this.validateInput(taskId, asyncTaskCallbackOrToken, schedulerOptions);
         } catch (e) {
@@ -84,20 +79,15 @@ class TaskManagerService {
             const delay = (schedulerOptions.milliseconds || 0) + (schedulerOptions.seconds || 0) * 1000;
             this.runTimeoutTaskInstance(taskId, delay);
         } else {
-            // This must be 'periodic'
             this.#scheduleEnabledPeriodicJob(taskId);
         }
     }
-    /**
-   * Enable the job which must be disabled at boot. Handy for conditional, heavy or long-running non-critical tasks
-   * @param taskId
-   * @param failIfEnabled throws when the job is already running
-   */ scheduleDisabledJob(taskId, failIfEnabled = true) {
+    scheduleDisabledJob(taskId, failIfEnabled = true) {
         const taskState = this.getTaskState(taskId);
         const schedulerOptions = taskState?.options;
         if (schedulerOptions?.disabled !== true) {
             if (failIfEnabled) {
-                throw new _jobexceptions.JobValidationException(`The requested task with ID ${taskId} was not explicitly disabled and must be running already.`);
+                throw new _jobexceptions.JobValidationException(`The requested task with ID ${taskId} was not explicitly disabled and must be running already.`, taskId);
             }
             return;
         }
@@ -107,13 +97,12 @@ class TaskManagerService {
     disableJob(taskId, failIfDisabled = true) {
         if (this.isTaskDisabled(taskId)) {
             if (failIfDisabled) {
-                throw new _jobexceptions.JobValidationException("Cant disable a job which is already disabled");
+                throw new _jobexceptions.JobValidationException("Cant disable a job which is already disabled", taskId);
             }
             return;
         }
         const taskState = this.getTaskState(taskId);
         taskState.options.disabled = true;
-        // TODO this does not seem to work as intended #https://github.com/fdm-monster/fdm-monster/issues/1071
         taskState.job.stop();
     }
     isTaskDisabled(taskId) {
@@ -127,7 +116,7 @@ class TaskManagerService {
     getTaskState(taskId) {
         const taskState = this.taskStates[taskId];
         if (!taskState) {
-            throw new _jobexceptions.JobValidationException(`The requested task with ID ${taskId} was not registered`);
+            throw new _jobexceptions.JobValidationException(`The requested task with ID ${taskId} was not registered`, taskId);
         }
         return taskState;
     }
@@ -167,20 +156,18 @@ class TaskManagerService {
             this.logger.error(`Task '${taskId}' threw an exception:` + error.stack);
         };
     }
-    /**
-   * Stops the tasks which were registered
-   */ stopSchedulerTasks() {
+    stopSchedulerTasks() {
         this.jobScheduler.stop();
     }
     #scheduleEnabledPeriodicJob(taskId) {
         const taskState = this.getTaskState(taskId);
         if (!taskState?.timedTask || !taskState?.options) {
-            throw new _jobexceptions.JobValidationException(`The requested task with ID ${taskId} was not registered properly ('timedTask' or 'options' missing).`);
+            throw new _jobexceptions.JobValidationException(`The requested task with ID ${taskId} was not registered properly ('timedTask' or 'options' missing).`, taskId);
         }
         const schedulerOptions = taskState?.options;
         const timedTask = taskState.timedTask;
         if (!schedulerOptions?.periodic) {
-            throw new _jobexceptions.JobValidationException(`The requested task with ID ${taskId} is not periodic and cannot be enabled.`);
+            throw new _jobexceptions.JobValidationException(`The requested task with ID ${taskId} is not periodic and cannot be enabled.`, taskId);
         }
         if (!schedulerOptions.disabled) {
             this.logger.log(`Task '${taskId}' was scheduled (runImmediately: ${!!schedulerOptions.runImmediately}).`);

package/dist/services/core/task-manager.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/task-manager.service.ts"],"names":["TaskManagerService","jobScheduler","taskStates","cradle","logger","constructor","container","DITokens","loggerFactory","name","toadScheduler","validateInput","taskId","workload","schedulerOptions","JobValidationException","prefix","resolvedService","e","AwilixResolutionError","stack","run","periodic","runOnce","runDelayed","disabled","milliseconds","seconds","minutes","hours","days","registerJobOrTask","id","task","asyncTaskCallbackOrToken","preset","error","timedTask","getSafeTimedTask","options","execute","delay","runTimeoutTaskInstance","scheduleEnabledPeriodicJob","scheduleDisabledJob","failIfEnabled","taskState","getTaskState","disableJob","failIfDisabled","isTaskDisabled","job","stop","deregisterTask","removeById","timeoutMs","log","setTimeout","handler","asyncHandler","timeTask","AsyncTask","getErrorHandler","started","Date","now","taskService","duration","logFirstCompletion","firstCompletion","registration","lastError","erroredlastError","time","stopSchedulerTasks","runImmediately","SimpleIntervalJob","addSimpleIntervalJob"],"mappings":";;;;+BASaA;;;eAAAA;;;+BAT+C;wBACtB;+BACC;iCACd;AAMlB,MAAMA;IACXC,aAA4B;IAC5BC,aAAa,CAAC,EAAE;IAERC,OAAY;IACZC,OAAsB;IAE9BC,YAAYC,SAAc,CAAE;QAC1B,IAAI,CAACH,MAAM,GAAGG;QACd,IAAI,CAACF,MAAM,GAAGE,SAAS,CAACC,yBAAQ,CAACC,aAAa,CAAC,CAACR,mBAAmBS,IAAI;QACvE,IAAI,CAACR,YAAY,GAAGK,SAAS,CAACC,yBAAQ,CAACG,aAAa,CAAC;IACvD;IAEAC,cAAcC,MAAc,EAAEC,QAAQ,EAAEC,gBAAgB,EAAE;QACxD,IAAI,CAACF,QAAQ;YACX,MAAM,IAAIG,qCAAsB,CAAC;QACnC;QACA,MAAMC,SAAS,CAAC,KAAK,EAAEH,UAAUJ,QAAQ,YAAY,WAAW,EAAEG,OAAO,CAAC,CAAC;QAC3E,IAAI,CAAC,CAAC,IAAI,CAACV,UAAU,CAACU,OAAO,EAAE;YAC7B,MAAM,IAAIG,qCAAsB,CAAC,CAAC,EAAEC,OAAO,mDAAmD,CAAC,EAAEJ;QACnG;QAEA,IAAI,OAAOC,aAAa,YAAY;YAClC,IAAI,OAAOA,aAAa,UAAU;gBAChC,MAAM,IAAIE,qCAAsB,CAC9B,CAAC,EAAEC,OAAO,4EAA4E,CAAC,EACvFJ;YAEJ;YAEA,IAAIK;YACJ,IAAI;gBACFA,kBAAkB,IAAI,CAACd,MAAM,CAACU,SAAS;YACzC,EAAE,OAAOK,GAAG;gBACV,IAAIA,aAAaC,6BAAqB,EAAE;oBACtC,MAAM,IAAIJ,qCAAsB,CAC9B,CAAC,EAAEC,OAAO,6GAA6G,CAAC,GACtHE,EAAEE,KAAK,EACTR;gBAEJ,OAAO;oBACL,MAAM,IAAIG,qCAAsB,CAC9B,CAAC,EAAEC,OAAO,uEAAuE,CAAC,GAAGE,EAAEE,KAAK,EAC5FR;gBAEJ;YACF;YAEA,IAAI,OAAOK,iBAAiBI,QAAQ,YAAY;gBAC9C,MAAM,IAAIN,qCAAsB,CAAC,CAAC,EAAEC,OAAO,6DAA6D,CAAC,EAAEJ;YAC7G;QACF;QAEA,IAAI,CAACE,kBAAkBQ,YAAY,CAACR,kBAAkBS,WAAW,CAACT,kBAAkBU,YAAY;YAC9F,MAAM,IAAIT,qCAAsB,CAAC,CAAC,wDAAwD,CAAC,EAAEH;QAC/F;QACA,IAAI,CAACE,kBAAkBQ,YAAY,CAAC,CAACR,iBAAiBW,QAAQ,EAAE;YAC9D,MAAM,IAAIV,qCAAsB,CAAC,CAAC,sDAAsD,CAAC,EAAEH;QAC7F;QACA,IAAIE,kBAAkBU,cAAc,CAACV,iBAAiBY,YAAY,IAAI,CAACZ,iBAAiBa,OAAO,EAAE;YAC/F,+CAA+C;YAC/C,MAAM,IAAIZ,qCAAsB,CAAC,CAAC,0DAA0D,CAAC,EAAEH;QACjG;QACA,IACEE,kBAAkBQ,YAClB,CAACR,iBAAiBY,YAAY,IAC9B,CAACZ,iBAAiBa,OAAO,IACzB,CAACb,iBAAiBc,OAAO,IACzB,CAACd,iBAAiBe,KAAK,IACvB,CAACf,iBAAiBgB,IAAI,EACtB;YACA,+CAA+C;YAC/C,MAAM,IAAIf,qCAAsB,CAAC,CAAC,8EAA8E,CAAC,EAAEH;QACrH;IACF;IAEA;;;GAGC,GACDmB,kBAAkB,EAAEC,IAAIpB,MAAM,EAAEqB,MAAMC,wBAAwB,EAAEC,QAAQrB,gBAAgB,EAAE,EAAE;QAC1F,IAAI;YACF,IAAI,CAACH,aAAa,CAACC,QAAQsB,0BAA0BpB;QACvD,EAAE,OAAOI,GAAG;YACV,IAAI,CAACd,MAAM,CAACgC,KAAK,CAAClB,EAAEE,KAAK,EAAEN;YAC3B;QACF;QAEA,MAAMuB,YAAY,IAAI,CAACC,gBAAgB,CAAC1B,QAAQsB;QAEhD,IAAI,CAAChC,UAAU,CAACU,OAAO,GAAG;YACxB2B,SAASzB;YACTuB;QACF;QAEA,IAAIvB,iBAAiBS,OAAO,EAAE;YAC5Bc,UAAUG,OAAO;QACnB,OAAO,IAAI1B,iBAAiBU,UAAU,EAAE;YACtC,MAAMiB,QAAQ,AAAC3B,CAAAA,iBAAiBY,YAAY,IAAI,CAAA,IAAK,AAACZ,CAAAA,iBAAiBa,OAAO,IAAI,CAAA,IAAK;YACvF,IAAI,CAACe,sBAAsB,CAAC9B,QAAQ6B;QACtC,OAAO;YACL,0BAA0B;YAC1B,IAAI,CAAC,CAACE,0BAA0B,CAAC/B;QACnC;IACF;IAEA;;;;GAIC,GACDgC,oBAAoBhC,MAAM,EAAEiC,gBAAgB,IAAI,EAAE;QAChD,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACnC;QACpC,MAAME,mBAAmBgC,WAAWP;QACpC,IAAIzB,kBAAkBW,aAAa,MAAM;YACvC,IAAIoB,eAAe;gBACjB,MAAM,IAAI9B,qCAAsB,CAC9B,CAAC,2BAA2B,EAAEH,OAAO,yDAAyD,CAAC;YAEnG;YACA;QACF;QAEAkC,UAAUP,OAAO,CAACd,QAAQ,GAAG;QAE7B,IAAI,CAAC,CAACkB,0BAA0B,CAAC/B;IACnC;IAEAoC,WAAWpC,MAAM,EAAEqC,iBAAiB,IAAI,EAAE;QACxC,IAAI,IAAI,CAACC,cAAc,CAACtC,SAAS;YAC/B,IAAIqC,gBAAgB;gBAClB,MAAM,IAAIlC,qCAAsB,CAAC;YACnC;YACA;QACF;QAEA,MAAM+B,YAAY,IAAI,CAACC,YAAY,CAACnC;QACpCkC,UAAUP,OAAO,CAACd,QAAQ,GAAG;QAC7B,sGAAsG;QACtGqB,UAAUK,GAAG,CAACC,IAAI;IACpB;IAEAF,eAAetC,MAAM,EAAE;QACrB,OAAO,CAAC,CAAC,IAAI,CAACmC,YAAY,CAACnC,QAAQ2B,OAAO,CAACd,QAAQ;IACrD;IAEA4B,eAAezC,MAAM,EAAE;QACrB,IAAI,CAACmC,YAAY,CAACnC;QAElB,OAAO,IAAI,CAACV,UAAU,CAACU,OAAO;QAC9B,IAAI,CAACX,YAAY,CAACqD,UAAU,CAAC1C;IAC/B;IAEAmC,aAAanC,MAAM,EAAE;QACnB,MAAMkC,YAAY,IAAI,CAAC5C,UAAU,CAACU,OAAO;QACzC,IAAI,CAACkC,WAAW;YACd,MAAM,IAAI/B,qCAAsB,CAAC,CAAC,2BAA2B,EAAEH,OAAO,mBAAmB,CAAC;QAC5F;QACA,OAAOkC;IACT;IAEAJ,uBAAuB9B,MAAM,EAAE2C,SAAS,EAAE;QACxC,MAAMT,YAAY,IAAI,CAACC,YAAY,CAACnC;QACpC,IAAI,CAACR,MAAM,CAACoD,GAAG,CAAC,CAAC,qBAAqB,EAAE5C,OAAO,IAAI,EAAE2C,UAAU,EAAE,CAAC;QAClEE,WAAW,IAAMX,UAAUT,SAAS,CAACG,OAAO,IAAIe,WAAW3C;IAC7D;IAEA0B,iBAAiB1B,MAAM,EAAE8C,OAAO,EAAE;QAChC,MAAMC,eAAe;YACnB,MAAM,IAAI,CAACC,QAAQ,CAAChD,QAAQ8C;QAC9B;QAEA,OAAO,IAAIG,wBAAS,CAACjD,QAAQ+C,cAAc,IAAI,CAACG,eAAe,CAAClD;IAClE;IAEA,MAAMgD,SAAShD,MAAM,EAAE8C,OAAO,EAAE;QAC9B,IAAIZ,YAAY,IAAI,CAAC5C,UAAU,CAACU,OAAO;QACvCkC,UAAUiB,OAAO,GAAGC,KAAKC,GAAG;QAC5B,IAAI,OAAOP,YAAY,UAAU;YAC/B,MAAMQ,cAAc,IAAI,CAAC/D,MAAM,CAACuD,QAAQ;YACxC,MAAMQ,YAAY7C,GAAG;QACvB,OAAO;YACL,MAAMqC;QACR;QACAZ,UAAUqB,QAAQ,GAAGH,KAAKC,GAAG,KAAKnB,UAAUiB,OAAO;QAEnD,IAAIjB,UAAUP,OAAO,EAAE6B,uBAAuB,SAAS,CAACtB,WAAWuB,iBAAiB;YAClF,IAAI,CAACjE,MAAM,CAACoD,GAAG,CAAC,CAAC,MAAM,EAAE5C,OAAO,6BAA6B,EAAEkC,UAAUqB,QAAQ,CAAC,EAAE,CAAC;YACrFrB,UAAUuB,eAAe,GAAGL,KAAKC,GAAG;QACtC;IACF;IAEAH,gBAAgBlD,MAAM,EAAE;QACtB,OAAO,CAACwB;YACN,MAAMkC,eAAe,IAAI,CAACpE,UAAU,CAACU,OAAO;YAE5C,IAAI,CAAC0D,aAAaC,SAAS,EACzBD,aAAaE,gBAAgB,GAAG;gBAC9BC,MAAMT,KAAKC,GAAG;gBACd7B;YACF;YAEF,IAAI,CAAChC,MAAM,CAACgC,KAAK,CAAC,CAAC,MAAM,EAAExB,OAAO,qBAAqB,CAAC,GAAGwB,MAAMhB,KAAK;QACxE;IACF;IAEA;;GAEC,GACDsD,qBAAqB;QACnB,IAAI,CAACzE,YAAY,CAACmD,IAAI;IACxB;IAEA,CAACT,0BAA0B,CAAC/B,MAAM;QAChC,MAAMkC,YAAY,IAAI,CAACC,YAAY,CAACnC;QACpC,IAAI,CAACkC,WAAWT,aAAa,CAACS,WAAWP,SAAS;YAChD,MAAM,IAAIxB,qCAAsB,CAC9B,CAAC,2BAA2B,EAAEH,OAAO,gEAAgE,CAAC;QAE1G;QACA,MAAME,mBAAmBgC,WAAWP;QACpC,MAAMF,YAAYS,UAAUT,SAAS;QACrC,IAAI,CAACvB,kBAAkBQ,UAAU;YAC/B,MAAM,IAAIP,qCAAsB,CAAC,CAAC,2BAA2B,EAAEH,OAAO,uCAAuC,CAAC;QAChH;QACA,IAAI,CAACE,iBAAiBW,QAAQ,EAAE;YAC9B,IAAI,CAACrB,MAAM,CAACoD,GAAG,CAAC,CAAC,MAAM,EAAE5C,OAAO,iCAAiC,EAAE,CAAC,CAACE,iBAAiB6D,cAAc,CAAC,EAAE,CAAC;YACxG,MAAMxB,MAAM,IAAIyB,gCAAiB,CAAC9D,kBAAkBuB;YACpDS,UAAUK,GAAG,GAAGA;YAChB,IAAI,CAAClD,YAAY,CAAC4E,oBAAoB,CAAC1B;QACzC,OAAO;YACL,IAAI,CAAC/C,MAAM,CAACoD,GAAG,CAAC,CAAC,MAAM,EAAE5C,OAAO,8CAA8C,CAAC;QACjF;IACF;AACF"}
+{"version":3,"sources":["../../../src/services/core/task-manager.service.ts"],"names":["TaskManagerService","jobScheduler","taskStates","cradle","logger","constructor","container","DITokens","loggerFactory","name","toadScheduler","validateInput","taskId","workload","schedulerOptions","JobValidationException","prefix","resolvedService","e","AwilixResolutionError","stack","run","periodic","runOnce","runDelayed","disabled","milliseconds","seconds","minutes","hours","days","registerJobOrTask","id","task","asyncTaskCallbackOrToken","preset","error","timedTask","getSafeTimedTask","options","execute","delay","runTimeoutTaskInstance","scheduleEnabledPeriodicJob","scheduleDisabledJob","failIfEnabled","taskState","getTaskState","disableJob","failIfDisabled","isTaskDisabled","job","stop","deregisterTask","removeById","timeoutMs","log","setTimeout","handler","asyncHandler","timeTask","AsyncTask","getErrorHandler","started","Date","now","taskService","duration","logFirstCompletion","firstCompletion","registration","lastError","erroredlastError","time","stopSchedulerTasks","runImmediately","SimpleIntervalJob","addSimpleIntervalJob"],"mappings":"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"}

package/dist/services/core/yaml.service.js

@@ -32,12 +32,10 @@ class YamlService {
         const importSpec = await (0, _jsyaml.load)(yamlBuffer);
         const { exportPrinters, exportFloorGrid, exportFloors } = importSpec?.config;
         for (const printer of importSpec.printers){
-            // old export bug
             if (!printer.name && printer.printerName) {
                 printer.name = printer.printerName;
                 delete printer.printerName;
             }
-            // 1.5.2 schema
             if (printer.settingsAppearance?.name) {
                 printer.name = printer.settingsAppearance?.name;
                 delete printer.settingsAppearance?.name;
@@ -56,7 +54,6 @@ class YamlService {
             }
         }
         const importData = await (0, _validators.validateInput)(importSpec, (0, _yamlservicevalidation.importPrintersFloorsYamlRules)(exportPrinters, exportFloorGrid, exportFloors, this.isTypeormMode));
-        // Nested validation is manual (for now)
         if (!!exportFloorGrid) {
             for (let floor of importData.floors){
                 await (0, _validators.validateInput)(floor, _yamlservicevalidation.importPrinterPositionsRules);
@@ -81,12 +78,10 @@ class YamlService {
         this.logger.log(`Performing pure create floors (${insertFloors.length} floors)`);
         const floorIdMap = {};
         for (const newFloor of insertFloors){
-            // Replace printerIds with newly mapped IDs
             const knownPrinters = [];
             if (exportFloorGrid && exportPrinters) {
                 for (const floorPosition of newFloor.printers){
                     const knownPrinterId = printerIdMap[floorPosition.printerId];
-                    // If the ID was not mapped, this position is considered discarded
                     if (!knownPrinterId) continue;
                     floorPosition.printerId = knownPrinterId;
                     knownPrinters.push(floorPosition);
@@ -103,9 +98,7 @@ class YamlService {
             const knownPrinters = [];
             if (exportFloorGrid && exportPrinters) {
                 for (const floorPosition of updatedFloor?.printers){
-                    // TODO check this works from MongoDB to SQLite
                     const knownPrinterId = printerIdMap[floorPosition.printerId];
-                    // If the ID was not mapped, this position is considered discarded
                     if (!knownPrinterId) continue;
                     floorPosition.printerId = knownPrinterId;
                     knownPrinters.push(floorPosition);

package/dist/services/core/yaml.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/yaml.service.ts"],"names":["YamlService","floorStore","floorService","printerService","printerCache","serverVersion","logger","isTypeormMode","constructor","loggerFactory","name","importPrintersAndFloors","yamlBuffer","importSpec","load","exportPrinters","exportFloorGrid","exportFloors","config","printer","printers","printerName","settingsAppearance","id","floor","floors","importData","validateInput","importPrintersFloorsYamlRules","importPrinterPositionsRules","log","updateByPropertyPrinters","insertPrinters","analysePrintersUpsert","printerComparisonStrategiesByPriority","updateByPropertyFloors","insertFloors","analyseFloorsUpsert","floorComparisonStrategiesByPriority","length","printerIdMap","newPrinter","state","create","updatePrinterSpec","updateId","printerId","update","value","floorIdMap","newFloor","knownPrinters","floorPosition","knownPrinterId","push","updateFloorSpec","floorId","updatedFloor","loadStore","upsertPrinters","comparisonStrategies","existingPrinters","list","names","map","p","toLowerCase","urls","printerURL","ids","toString","strategy","comparedName","foundIndex","findIndex","n","upsertFloors","comparisonStrategy","existingFloors","floorLevels","comparedProperty","exportPrintersAndFloors","options","input","exportPrintersFloorsYamlRules","dumpedObject","version","process","env","npm_package_version","exportedAt","Date","databaseType","apiKey","getLoginDto","stepSize","disabledReason","enabled","dateAdded","listCache","f","dumpedFloor","fPrinterId","x","y","dump"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/yaml.service.ts"],"names":["YamlService","floorStore","floorService","printerService","printerCache","serverVersion","logger","isTypeormMode","constructor","loggerFactory","name","importPrintersAndFloors","yamlBuffer","importSpec","load","exportPrinters","exportFloorGrid","exportFloors","config","printer","printers","printerName","settingsAppearance","id","floor","floors","importData","validateInput","importPrintersFloorsYamlRules","importPrinterPositionsRules","log","updateByPropertyPrinters","insertPrinters","analysePrintersUpsert","printerComparisonStrategiesByPriority","updateByPropertyFloors","insertFloors","analyseFloorsUpsert","floorComparisonStrategiesByPriority","length","printerIdMap","newPrinter","state","create","updatePrinterSpec","updateId","printerId","update","value","floorIdMap","newFloor","knownPrinters","floorPosition","knownPrinterId","push","updateFloorSpec","floorId","updatedFloor","loadStore","upsertPrinters","comparisonStrategies","existingPrinters","list","names","map","p","toLowerCase","urls","printerURL","ids","toString","strategy","comparedName","foundIndex","findIndex","n","upsertFloors","comparisonStrategy","existingFloors","floorLevels","comparedProperty","exportPrintersAndFloors","options","input","exportPrintersFloorsYamlRules","dumpedObject","version","process","env","npm_package_version","exportedAt","Date","databaseType","apiKey","getLoginDto","stepSize","disabledReason","enabled","dateAdded","listCache","f","dumpedFloor","fPrinterId","x","y","dump"],"mappings":"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"}

package/dist/services/floor.service.js

@@ -32,48 +32,12 @@ class FloorService {
                 }))
         };
     }
-    /**
-   * Lists the floors present in the database.
-   */ async list(patchPositions = true) {
+    async list(patchPositions = true) {
         const printers = await this.printerCache.listCachedPrinters(true);
-        // const printerIds = printers.map((p) => p.id);
         const floors = await _Floor.Floor.find({});
         if (!patchPositions) {
             return floors;
         }
-        // TODO this does more harm than good
-        // for (const floor of floors) {
-        //   if (!floor.printers?.length) continue;
-        // const removedPositionPrinterIds: MongoIdType[] = [];
-        // TODO this is prone to collisions
-        // const positionsKnown: { [k: string]: any } = {};
-        // for (const fp of floor.printers) {
-        //   // Remove orphans
-        //   const stringPrinterId = fp.printerId.toString();
-        //   const printerExists = printerIds.includes(stringPrinterId);
-        //   if (!printerExists) {
-        //     removedPositionPrinterIds.push(stringPrinterId);
-        //     continue;
-        //   }
-        //
-        //   // Remove duplicate position, keeping the last added one
-        //   const xyPos = positionsKnown[`${fp.x}${fp.y}`];
-        //   if (!!xyPos) {
-        //     removedPositionPrinterIds.push(xyPos.printerId);
-        //   }
-        //
-        //   // Keep last floor printer
-        //   positionsKnown[`${fp.x}${fp.y}`] = fp;
-        // }
-        //
-        // if (removedPositionPrinterIds?.length) {
-        //   floor.printers = floor.printers.filter((fp) => !removedPositionPrinterIds.includes(fp.printerId));
-        //   await floor.save();
-        //   this.logger.warn(
-        //     `Found ${removedPositionPrinterIds} (floor printerIds) to be in need of removal for floor (duplicate position or non-existing printer)`
-        //   );
-        // }
-        // }
         return floors;
     }
     async get(floorId, throwError = true) {
@@ -91,9 +55,7 @@ class FloorService {
             floor: 1
         });
     }
-    /**
-   * Stores a new floor into the database.
-   */ async create(floor) {
+    async create(floor) {
         const validatedInput = await (0, _validators.validateInput)(floor, _floorservicevalidation.createFloorRules);
         return _Floor.Floor.create(validatedInput);
     }
@@ -146,9 +108,7 @@ class FloorService {
     async addOrUpdatePrinter(floorId, printerInFloor) {
         const floor = await this.get(floorId, true);
         const validInput = await (0, _validators.validateInput)(printerInFloor, (0, _floorservicevalidation.printerInFloorRules)(false));
-        // Ensure printer exists
         await this.printerCache.getCachedPrinterOrThrowAsync(validInput.printerId);
-        // Ensure position is not taken twice
         floor.printers = floor.printers.filter((pif)=>!(pif.x === printerInFloor.x && pif.y === printerInFloor.y));
         const foundPrinterInFloorIndex = floor.printers.findIndex((pif)=>pif.printerId.toString() === validInput.printerId);
         if (foundPrinterInFloorIndex !== -1) {
@@ -164,7 +124,6 @@ class FloorService {
         const validInput = await (0, _validators.validateInput)({
             printerId
         }, (0, _floorservicevalidation.removePrinterInFloorRules)(false));
-        // Ensure printer exists
         await this.printerCache.getCachedPrinterOrThrowAsync(validInput.printerId);
         const foundPrinterInFloorIndex = floor.printers.findIndex((pif)=>pif.printerId.toString() === validInput.printerId);
         if (foundPrinterInFloorIndex === -1) return floor;

package/dist/services/floor.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/floor.service.ts"],"names":["FloorService","printerCache","logger","constructor","loggerFactory","name","toDto","floor","id","printers","map","p","x","y","printerId","toString","floorId","list","patchPositions","listCachedPrinters","floors","Floor","find","get","throwError","findOne","_id","NotFoundException","createDefaultFloor","create","validatedInput","validateInput","createFloorRules","update","input","existingFloor","updateFloorRules","save","updateName","floorName","updateFloorNameRules","updateLevel","level","validLevel","updateFloorNumberRules","getFloorsOfPrinterId","$elemMatch","deletePrinterFromAnyFloor","updateMany","$pull","$in","addOrUpdatePrinter","printerInFloor","validInput","printerInFloorRules","getCachedPrinterOrThrowAsync","filter","pif","foundPrinterInFloorIndex","findIndex","push","removePrinter","removePrinterInFloorRules","splice","delete","deleteOne"],"mappings":"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"}
+{"version":3,"sources":["../../src/services/floor.service.ts"],"names":["FloorService","printerCache","logger","constructor","loggerFactory","name","toDto","floor","id","printers","map","p","x","y","printerId","toString","floorId","list","patchPositions","listCachedPrinters","floors","Floor","find","get","throwError","findOne","_id","NotFoundException","createDefaultFloor","create","validatedInput","validateInput","createFloorRules","update","input","existingFloor","updateFloorRules","save","updateName","floorName","updateFloorNameRules","updateLevel","level","validLevel","updateFloorNumberRules","getFloorsOfPrinterId","$elemMatch","deletePrinterFromAnyFloor","updateMany","$pull","$in","addOrUpdatePrinter","printerInFloor","validInput","printerInFloorRules","getCachedPrinterOrThrowAsync","filter","pif","foundPrinterInFloorIndex","findIndex","push","removePrinter","removePrinterInFloorRules","splice","delete","deleteOne"],"mappings":"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"}

package/dist/services/interfaces/refresh-token.dto.js

@@ -12,8 +12,6 @@ class RefreshTokenDto {
     id;
     userId;
     expiresAt;
-    // Not exposed
-    // refreshToken!: string;
     refreshAttemptsUsed;
 }
 

package/dist/services/interfaces/refresh-token.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/interfaces/refresh-token.dto.ts"],"names":["RefreshTokenDto","id","userId","expiresAt","refreshAttemptsUsed"],"mappings":";;;;+BAEaA;;;eAAAA;;;AAAN,MAAMA;IACXC,GAAa;IACbC,OAAiB;IACjBC,UAAmB;IACnB,cAAc;IACd,yBAAyB;IACzBC,oBAA6B;AAC/B"}
+{"version":3,"sources":["../../../src/services/interfaces/refresh-token.dto.ts"],"names":["RefreshTokenDto","id","userId","expiresAt","refreshAttemptsUsed"],"mappings":";;;;+BAEaA;;;eAAAA;;;AAAN,MAAMA;IACXC,GAAa;IACbC,OAAiB;IACjBC,UAAmB;IAGnBC,oBAA6B;AAC/B"}