@fdm-monster/server 1.5.3 → 1.6.0-rc1

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/print-completion.dto.js

@@ -22,7 +22,6 @@ class CreatePrintCompletionDto {
     printerId;
     printerReference;
     completionLog;
-    correlationId;
     context;
 }
 class PrintCompletionDto {
@@ -33,7 +32,6 @@ class PrintCompletionDto {
     printerId;
     printerReference;
     completionLog;
-    correlationId;
     context;
 }
 

package/dist/services/interfaces/print-completion.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/interfaces/print-completion.dto.ts"],"names":["CreatePrintCompletionDto","PrintCompletionDto","fileName","status","printerId","printerReference","completionLog","correlationId","context","id","createdAt"],"mappings":";;;;;;;;;;;IAMaA,wBAAwB;eAAxBA;;IAUAC,kBAAkB;eAAlBA;;;AAVN,MAAMD;IACXE,SAAiB;IACjBC,OAAe;IACfC,UAAmB;IACnBC,iBAA0B;IAC1BC,cAAsB;IACtBC,cAAsB;IACtBC,QAAgC;AAClC;AAEO,MAAMP;IACXQ,GAAa;IACbP,SAAiB;IACjBQ,UAAkB;IAClBP,OAAe;IACfC,UAAmB;IACnBC,iBAA0B;IAC1BC,cAAsB;IACtBC,cAAsB;IACtBC,QAAgC;AAClC"}
+{"version":3,"sources":["../../../src/services/interfaces/print-completion.dto.ts"],"names":["CreatePrintCompletionDto","PrintCompletionDto","fileName","status","printerId","printerReference","completionLog","context","id","createdAt"],"mappings":";;;;;;;;;;;IAMaA,wBAAwB;eAAxBA;;IASAC,kBAAkB;eAAlBA;;;AATN,MAAMD;IACXE,SAAiB;IACjBC,OAAe;IACfC,UAAmB;IACnBC,iBAA0B;IAC1BC,cAAsB;IACtBC,QAAgC;AAClC;AAEO,MAAMN;IACXO,GAAa;IACbN,SAAiB;IACjBO,UAAkB;IAClBN,OAAe;IACfC,UAAmB;IACnBC,iBAA0B;IAC1BC,cAAsB;IACtBC,QAAgC;AAClC"}

package/dist/services/interfaces/print-completion.interface.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+
+//# sourceMappingURL=print-completion.interface.js.map

package/dist/services/interfaces/{print-completion.service.js.map → print-completion.interface.js.map}

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/interfaces/print-completion.service.ts"],"names":[],"mappings":""}
+{"version":3,"sources":["../../../src/services/interfaces/print-completion.interface.ts"],"names":[],"mappings":""}

package/dist/services/interfaces/printer-file.dto.js

@@ -8,7 +8,9 @@ Object.defineProperty(exports, "PrinterFileDto", {
         return PrinterFileDto;
     }
 });
-class PrinterFileDto {
+const _sharedconstants = require("../../shared.constants");
+class PrinterFileDto extends _sharedconstants.IdDto {
+    printerId;
     name;
     date;
     display;

package/dist/services/interfaces/printer-file.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/interfaces/printer-file.dto.ts"],"names":["PrinterFileDto","name","date","display","gcodeAnalysis","hash","origin","path","prints","refs","size","statistics","type","typePath"],"mappings":";;;;+BA4BaA;;;eAAAA;;;AAAN,MAAMA;IACXC,KAAa;IACbC,KAAa;IACbC,QAAgB;IAChBC,cAAgC;IAEhCC,KAAa;IACbC,OAAe;IACfC,KAAa;IACbC,OAAe;IACfC,KAAW;IACXC,KAAa;IACbC,WAAuB;IACvBC,KAAa;IACbC,SAAmB;AACrB"}
+{"version":3,"sources":["../../../src/services/interfaces/printer-file.dto.ts"],"names":["PrinterFileDto","IdDto","printerId","name","date","display","gcodeAnalysis","hash","origin","path","prints","refs","size","statistics","type","typePath"],"mappings":";;;;+BA6BaA;;;eAAAA;;;iCA5BiB;AA4BvB,MAAMA,uBAAyCC,sBAAK;IACzDC,UAAmB;IAEnBC,KAAa;IACbC,KAAa;IACbC,QAAgB;IAChBC,cAAgC;IAEhCC,KAAa;IACbC,OAAe;IACfC,KAAa;IACbC,OAAe;IACfC,KAAW;IACXC,KAAa;IACbC,WAAuB;IACvBC,KAAa;IACbC,SAAmB;AACrB"}

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"}

package/dist/services/interfaces/settings.dto.js

@@ -25,7 +25,6 @@ class SettingsDto {
     [_serversettingsconstants.serverSettingsKey];
     [_serversettingsconstants.wizardSettingKey];
     [_serversettingsconstants.frontendSettingKey];
-    // [credentialSettingsKey]: CredentialSettingsDto;
     [_serversettingsconstants.fileCleanSettingKey];
     [_serversettingsconstants.timeoutSettingKey];
 }

package/dist/services/interfaces/settings.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/interfaces/settings.dto.ts"],"names":["IpWhitelistSettingsDto","SettingsDto","whitelistedIpAddresses","whitelistEnabled","serverSettingsKey","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey"],"mappings":";;;;;;;;;;;IAmBaA,sBAAsB;eAAtBA;;IA2CAC,WAAW;eAAXA;;;yCAvDN;AAYA,MAAMD;IACXE,uBAAiC;IACjCC,iBAA0B;AAC5B;AAwCO,MAAMF;IACX,CAACG,0CAAiB,CAAC,CAAoB;IACvC,CAACC,yCAAgB,CAAC,CAAoB;IACtC,CAACC,2CAAkB,CAAC,CAAsB;IAC1C,kDAAkD;IAClD,CAACC,4CAAmB,CAAC,CAAuB;IAC5C,CAACC,0CAAiB,CAAC,CAAqB;AAC1C"}
+{"version":3,"sources":["../../../src/services/interfaces/settings.dto.ts"],"names":["IpWhitelistSettingsDto","SettingsDto","whitelistedIpAddresses","whitelistEnabled","serverSettingsKey","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey"],"mappings":";;;;;;;;;;;IAmBaA,sBAAsB;eAAtBA;;IA2CAC,WAAW;eAAXA;;;yCAvDN;AAYA,MAAMD;IACXE,uBAAiC;IACjCC,iBAA0B;AAC5B;AAwCO,MAAMF;IACX,CAACG,0CAAiB,CAAC,CAAoB;IACvC,CAACC,yCAAgB,CAAC,CAAoB;IACtC,CAACC,2CAAkB,CAAC,CAAsB;IAE1C,CAACC,4CAAmB,CAAC,CAAuB;IAC5C,CAACC,0CAAiB,CAAC,CAAqB;AAC1C"}

package/dist/services/octoprint/constants/octoprint-service.constants.js

@@ -1,4 +1,3 @@
-// https://github.com/OctoPrint/OctoPrint/blob/161e21fe0f6344ec3b9b9b541e9b2c472087ba77/src/octoprint/util/comm.py#L913
 "use strict";
 Object.defineProperty(exports, "__esModule", {
     value: true
@@ -93,8 +92,6 @@ const apiKeyHeaderKey = "x-api-key";
 const jsonContentType = "application/json";
 const multiPartContentType = "multipart/form-data";
 function isLoginResponseGlobal(octoPrintResponse) {
-    // Explicit nullability check serves to let an unconnected printer fall through as well as incorrect apiKey
-    // Note: 'apikey' property is conform OctoPrint response (and not FDM Monster printer model's 'apiKey')
     return !!octoPrintResponse && octoPrintResponse.name === "_api";
 }
 

package/dist/services/octoprint/constants/octoprint-service.constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/services/octoprint/constants/octoprint-service.constants.ts"],"names":["OP_STATE","apiKeyHeaderKey","contentTypeHeaderKey","isLoginResponseGlobal","jsonContentType","multiPartContentType","pluginManagerCommands","pluginRepositoryUrl","Offline","OpeningSerial","DetectingSerial","Connecting","Operational","StartingPrintFromSD","StartSendingPrintToSD","Starting","TransferringFileToSD","PrintingFromSD","SendingFileToSD","Printing","Cancelling","Pausing","Paused","Resuming","Finishing","Error","OfflineAfterError","UnknownState","install","name","param","uninstall","enable","disable","cleanup","cleanup_all","undefined","refresh_repository","octoPrintResponse"],"mappings":"AAAA,uHAAuH;;;;;;;;;;;;IAC1GA,QAAQ;eAARA;;IAyDAC,eAAe;eAAfA;;IADAC,oBAAoB;eAApBA;;IAQGC,qBAAqB;eAArBA;;IANHC,eAAe;eAAfA;;IACAC,oBAAoB;eAApBA;;IApCAC,qBAAqB;eAArBA;;IA+BAC,mBAAmB;eAAnBA;;;AAtDN,MAAMP,WAAW;IACtBQ,SAAS;IACTC,eAAe;IACfC,iBAAiB;IACjBC,YAAY;IACZC,aAAa;IACbC,qBAAqB;IACrBC,uBAAuB;IACvBC,UAAU;IACVC,sBAAsB;IACtBC,gBAAgB;IAChBC,iBAAiB;IACjBC,UAAU;IACVC,YAAY;IACZC,SAAS;IACTC,QAAQ;IACRC,UAAU;IACVC,WAAW;IACXC,OAAO;IACPC,mBAAmB;IACnBC,cAAc;AAChB;AAEO,MAAMrB,wBAAwB;IACnCsB,SAAS;QACPC,MAAM;QACNC,OAAO;IACT;IACAC,WAAW;QACTF,MAAM;QACNC,OAAO;IACT;IACAE,QAAQ;QACNH,MAAM;QACNC,OAAO;IACT;IACAG,SAAS;QACPJ,MAAM;QACNC,OAAO;IACT;IACAI,SAAS;QACPL,MAAM;QACNC,OAAO;IACT;IACAK,aAAa;QACXN,MAAM;QACNC,OAAOM;IACT;IACAC,oBAAoB;QAClBR,MAAM;QACNC,OAAOM;IACT;AACF;AAEO,MAAM7B,sBAAsB;AAE5B,MAAML,uBAAuB;AAC7B,MAAMD,kBAAkB;AACxB,MAAMG,kBAAkB;AACxB,MAAMC,uBAAuB;AAK7B,SAASF,sBAAsBmC,iBAAiB;IACrD,2GAA2G;IAC3G,uGAAuG;IACvG,OAAO,CAAC,CAACA,qBAAqBA,kBAAkBT,IAAI,KAAK;AAC3D"}
+{"version":3,"sources":["../../../../src/services/octoprint/constants/octoprint-service.constants.ts"],"names":["OP_STATE","apiKeyHeaderKey","contentTypeHeaderKey","isLoginResponseGlobal","jsonContentType","multiPartContentType","pluginManagerCommands","pluginRepositoryUrl","Offline","OpeningSerial","DetectingSerial","Connecting","Operational","StartingPrintFromSD","StartSendingPrintToSD","Starting","TransferringFileToSD","PrintingFromSD","SendingFileToSD","Printing","Cancelling","Pausing","Paused","Resuming","Finishing","Error","OfflineAfterError","UnknownState","install","name","param","uninstall","enable","disable","cleanup","cleanup_all","undefined","refresh_repository","octoPrintResponse"],"mappings":";;;;;;;;;;;IACaA,QAAQ;eAARA;;IAyDAC,eAAe;eAAfA;;IADAC,oBAAoB;eAApBA;;IAQGC,qBAAqB;eAArBA;;IANHC,eAAe;eAAfA;;IACAC,oBAAoB;eAApBA;;IApCAC,qBAAqB;eAArBA;;IA+BAC,mBAAmB;eAAnBA;;;AAtDN,MAAMP,WAAW;IACtBQ,SAAS;IACTC,eAAe;IACfC,iBAAiB;IACjBC,YAAY;IACZC,aAAa;IACbC,qBAAqB;IACrBC,uBAAuB;IACvBC,UAAU;IACVC,sBAAsB;IACtBC,gBAAgB;IAChBC,iBAAiB;IACjBC,UAAU;IACVC,YAAY;IACZC,SAAS;IACTC,QAAQ;IACRC,UAAU;IACVC,WAAW;IACXC,OAAO;IACPC,mBAAmB;IACnBC,cAAc;AAChB;AAEO,MAAMrB,wBAAwB;IACnCsB,SAAS;QACPC,MAAM;QACNC,OAAO;IACT;IACAC,WAAW;QACTF,MAAM;QACNC,OAAO;IACT;IACAE,QAAQ;QACNH,MAAM;QACNC,OAAO;IACT;IACAG,SAAS;QACPJ,MAAM;QACNC,OAAO;IACT;IACAI,SAAS;QACPL,MAAM;QACNC,OAAO;IACT;IACAK,aAAa;QACXN,MAAM;QACNC,OAAOM;IACT;IACAC,oBAAoB;QAClBR,MAAM;QACNC,OAAOM;IACT;AACF;AAEO,MAAM7B,sBAAsB;AAE5B,MAAML,uBAAuB;AAC7B,MAAMD,kBAAkB;AACxB,MAAMG,kBAAkB;AACxB,MAAMC,uBAAuB;AAK7B,SAASF,sBAAsBmC,iBAAiB;IAGrD,OAAO,CAAC,CAACA,qBAAqBA,kBAAkBT,IAAI,KAAK;AAC3D"}

package/dist/services/octoprint/dto/connection-state.dto.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "ConnectionStateDto", {
+    enumerable: true,
+    get: function() {
+        return ConnectionStateDto;
+    }
+});
+const _statedto = require("../../../octoprint/dto/state.dto");
+const _swagger = require("@nestjs/swagger");
+function _ts_decorate(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+function _ts_metadata(k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
+class ConnectionStateDto {
+    correlationId;
+    socketState;
+    apiState;
+    apiStateUpdateTimestamp;
+    stateUpdateTimestamp;
+    lastMessageReceivedTimestamp;
+    reauthRequiredTimestamp;
+}
+_ts_decorate([
+    (0, _swagger.ApiProperty)({
+        enumName: "SocketState",
+        enum: Object.values(_statedto.SOCKET_STATE)
+    }),
+    _ts_metadata("design:type", typeof _statedto.SocketState === "undefined" ? Object : _statedto.SocketState)
+], ConnectionStateDto.prototype, "socketState", void 0);
+_ts_decorate([
+    (0, _swagger.ApiProperty)({
+        enumName: "ApiState",
+        enum: Object.values(_statedto.API_STATE)
+    }),
+    _ts_metadata("design:type", typeof _statedto.ApiState === "undefined" ? Object : _statedto.ApiState)
+], ConnectionStateDto.prototype, "apiState", void 0);
+
+//# sourceMappingURL=connection-state.dto.js.map

package/dist/services/octoprint/dto/connection-state.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/services/octoprint/dto/connection-state.dto.ts"],"names":["ConnectionStateDto","correlationId","socketState","apiState","apiStateUpdateTimestamp","stateUpdateTimestamp","lastMessageReceivedTimestamp","reauthRequiredTimestamp","ApiProperty","enumName","enum","Object","values","SOCKET_STATE","API_STATE"],"mappings":";;;;+BAIaA;;;eAAAA;;;0BAJkD;yBACnC;;;;;;;;;;AAGrB,MAAMA;IACXC,cAAsB;IAEtBC,YAAyB;IAEzBC,SAAmB;IACnBC,wBAAgC;IAChCC,qBAA6B;IAC7BC,6BAAqC;IACrCC,wBAAgC;AAClC;;IARGC,IAAAA,oBAAW,EAAC;QAAEC,UAAU;QAAeC,MAAMC,OAAOC,MAAM,CAACC,sBAAY;IAAE;uCAC7D,qBAAW,4BAAX,qBAAW;GAHbb;;IAIVQ,IAAAA,oBAAW,EAAC;QAAEC,UAAU;QAAYC,MAAMC,OAAOC,MAAM,CAACE,mBAAS;IAAE;uCAC1D,kBAAQ,4BAAR,kBAAQ;GALPd"}

package/dist/services/octoprint/dto/octoprint-currentuser.dto.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+
+//# sourceMappingURL=octoprint-currentuser.dto.js.map

package/dist/services/octoprint/dto/octoprint-currentuser.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/services/octoprint/dto/octoprint-currentuser.dto.ts"],"names":[],"mappings":""}

package/dist/services/octoprint/dto/octoprint-event.dto.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    Message: function() {
+        return Message;
+    },
+    OctoPrintEventDto: function() {
+        return OctoPrintEventDto;
+    }
+});
+var Message;
+(function(Message) {
+    Message["CONNECTED"] = "connected";
+    Message["REAUTHREQUIRED"] = "reauthRequired";
+    Message["CURRENT"] = "current";
+    Message["HISTORY"] = "history";
+    Message["EVENT"] = "event";
+    Message["PLUGIN"] = "plugin";
+    Message["TIMELAPSE"] = "timelapse";
+    Message["SLICINGPROCESS"] = "slicingProgress";
+    Message["WS_OPENED"] = "WS_OPENED";
+    Message["WS_CLOSED"] = "WS_CLOSED";
+    Message["WS_ERROR"] = "WS_ERROR";
+    Message["API_STATE_UPDATED"] = "API_STATE_UPDATED";
+    Message["WS_STATE_UPDATED"] = "WS_STATE_UPDATED";
+})(Message || (Message = {}));
+class OctoPrintEventDto {
+    event;
+    payload;
+    printerId;
+}
+
+//# sourceMappingURL=octoprint-event.dto.js.map

package/dist/services/octoprint/dto/octoprint-event.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/services/octoprint/dto/octoprint-event.dto.ts"],"names":["OctoPrintEventDto","Message","event","payload","printerId"],"mappings":";;;;;;;;;;;;;;IAoBaA,iBAAiB;eAAjBA;;;;UAlBDC;;;;;;;;;;;;;;GAAAA,YAAAA;AAkBL,MAAMD;IACXE,MAAe;IACfC,QAAW;IACXC,UAAkB;AACpB"}