@fdm-monster/server 1.5.1 → 1.5.4

package/dist/services/print-completion.service.js

@@ -11,13 +11,25 @@ Object.defineProperty(exports, "PrintCompletionService", {
 const _models = require("../models");
 const _printcompletionservicevalidation = require("./validators/print-completion-service.validation");
 const _validators = require("../handlers/validators");
-const _arrayutil = require("../utils/array.util");
 const _octoprintwebsocketconstants = require("./octoprint/constants/octoprint-websocket.constants");
+const _printcompletionshared = require("./print-completion.shared");
 class PrintCompletionService {
     logger;
     constructor({ loggerFactory }){
         this.logger = loggerFactory(PrintCompletionService.name);
     }
+    toDto(entity) {
+        return {
+            id: entity.id,
+            completionLog: entity.completionLog,
+            context: entity.context,
+            fileName: entity.fileName,
+            createdAt: entity.createdAt,
+            correlationId: entity.correlationId,
+            status: entity.status,
+            printerId: entity.printerId.toString()
+        };
+    }
     async create(input) {
         const { printerId, fileName, completionLog, status, context } = await (0, _validators.validateInput)(input, _printcompletionservicevalidation.createPrintCompletionRules);
         return _models.PrintCompletion.create({
@@ -99,9 +111,6 @@ class PrintCompletionService {
             {
                 $group: {
                     _id: "$printerId",
-                    eventCount: {
-                        $sum: 1
-                    },
                     printEvents: {
                         $push: {
                             printerId: "$printerId",
@@ -115,47 +124,7 @@ class PrintCompletionService {
                 }
             }
         ]);
-        const durationDayMSec = 24 * 60 * 60 * 1000;
-        return printCompletionsAggr.map((pc)=>{
-            const jobs = (0, _arrayutil.groupArrayBy)(pc.printEvents, (e)=>e.context?.correlationId);
-            pc.printJobs = Object.entries(jobs).map(([id, events])=>{
-                const eventMap = events.map(({ status, createdAt, fileName, completionLog })=>({
-                        status,
-                        createdAt,
-                        fileName,
-                        completionLog
-                    }));
-                return {
-                    correlationId: id,
-                    events: eventMap,
-                    lastEvent: eventMap.reduce((e1, e2)=>e1.createdAt > e2.createdAt ? e1 : e2)
-                };
-            });
-            pc.correlationIds = pc.printJobs.map((j)=>j.correlationId);
-            pc.printCount = pc.correlationIds?.length;
-            const mappedEvents = pc.printEvents.map(({ status, createdAt, fileName, context, completionLog })=>({
-                    status,
-                    createdAt,
-                    fileName,
-                    context,
-                    completionLog
-                }));
-            const failureEvents = mappedEvents.filter((e)=>e.status === _octoprintwebsocketconstants.EVENT_TYPES.PrintFailed);
-            pc.failureCount = failureEvents?.length;
-            pc.lastFailure = failureEvents?.length ? failureEvents.reduce((j1, j2)=>j1.createdAt > j2.createdAt ? j1 : j2) : null;
-            pc.failureEventsLastWeek = failureEvents.filter((e)=>e.createdAt > Date.now() - 7 * durationDayMSec)?.length;
-            pc.failureEventsLast48H = failureEvents.filter((e)=>e.createdAt > Date.now() - 2 * durationDayMSec)?.length;
-            pc.failureEventsLast24H = failureEvents.filter((e)=>e.createdAt > Date.now() - durationDayMSec)?.length;
-            const successEvents = mappedEvents.filter((e)=>e.status === _octoprintwebsocketconstants.EVENT_TYPES.PrintDone);
-            pc.successCount = successEvents?.length;
-            pc.lastSuccess = successEvents?.length ? successEvents?.reduce((j1, j2)=>j1.createdAt > j2.createdAt ? j1 : j2) : null;
-            pc.successEventsLastWeek = successEvents.filter((e)=>e.createdAt > Date.now() - 7 * durationDayMSec)?.length;
-            pc.successEventsLast48H = successEvents.filter((e)=>e.createdAt > Date.now() - 2 * durationDayMSec)?.length;
-            pc.successEventsLast24H = successEvents.filter((e)=>e.createdAt > Date.now() - durationDayMSec)?.length;
-            // Explodes in size quickly, remove the event timeline
-            delete pc.printEvents;
-            return pc;
-        });
+        return (0, _printcompletionshared.processCompletions)(printCompletionsAggr);
     }
 }
 

package/dist/services/print-completion.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/print-completion.service.ts"],"names":["PrintCompletionService","logger","constructor","loggerFactory","name","create","input","printerId","fileName","completionLog","status","context","validateInput","createPrintCompletionRules","PrintCompletion","createdAt","Date","now","list","find","findPrintCompletion","correlationId","updateContext","completionEntry","findOne","EVENT_TYPES","PrintStarted","warn","save","loadPrintContexts","contexts","aggregate","$sort","$group","_id","$first","$match","$nin","PrintDone","PrintFailed","Object","fromEntries","map","c","listGroupByPrinterStatus","printCompletionsAggr","eventCount","$sum","printEvents","$push","durationDayMSec","pc","jobs","groupArrayBy","e","printJobs","entries","id","events","eventMap","lastEvent","reduce","e1","e2","correlationIds","j","printCount","length","mappedEvents","failureEvents","filter","failureCount","lastFailure","j1","j2","failureEventsLastWeek","failureEventsLast48H","failureEventsLast24H","successEvents","successCount","lastSuccess","successEventsLastWeek","successEventsLast48H","successEventsLast24H"],"mappings":"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"}
+{"version":3,"sources":["../../src/services/print-completion.service.ts"],"names":["PrintCompletionService","logger","constructor","loggerFactory","name","toDto","entity","id","completionLog","context","fileName","createdAt","correlationId","status","printerId","toString","create","input","validateInput","createPrintCompletionRules","PrintCompletion","Date","now","list","find","findPrintCompletion","updateContext","completionEntry","findOne","EVENT_TYPES","PrintStarted","warn","save","loadPrintContexts","contexts","aggregate","$sort","$group","_id","$first","$match","$nin","PrintDone","PrintFailed","Object","fromEntries","map","c","listGroupByPrinterStatus","printCompletionsAggr","printEvents","$push","processCompletions"],"mappings":";;;;+BAYaA;;;eAAAA;;;wBAZmB;kDACW;4BACb;6CACF;uCAOO;AAE5B,MAAMA;IACXC,OAAsB;IAEtBC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACF,MAAM,GAAGE,cAAcH,uBAAuBI,IAAI;IACzD;IAEAC,MAAMC,MAAwB,EAAmC;QAC/D,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,eAAeF,OAAOE,aAAa;YACnCC,SAASH,OAAOG,OAAO;YACvBC,UAAUJ,OAAOI,QAAQ;YACzBC,WAAWL,OAAOK,SAAS;YAC3BC,eAAeN,OAAOM,aAAa;YACnCC,QAAQP,OAAOO,MAAM;YACrBC,WAAWR,OAAOQ,SAAS,CAACC,QAAQ;QACtC;IACF;IAEA,MAAMC,OAAOC,KAA4C,EAAE;QACzD,MAAM,EAAEH,SAAS,EAAEJ,QAAQ,EAAEF,aAAa,EAAEK,MAAM,EAAEJ,OAAO,EAAE,GAAG,MAAMS,IAAAA,yBAAa,EAACD,OAAOE,4DAA0B;QAErH,OAAOC,uBAAe,CAACJ,MAAM,CAAC;YAC5BF;YACAJ;YACAF;YACAK;YACAF,WAAWU,KAAKC,GAAG;YACnBb;QACF;IACF;IAEA,MAAMc,OAAO;QACX,OAAOH,uBAAe,CAACI,IAAI,CAAC,CAAC;IAC/B;IAEA,MAAMC,oBAAoBb,aAAqB,EAAE;QAC/C,OAAOQ,uBAAe,CAACI,IAAI,CAAC;YAC1B,yBAAyBZ;QAC3B;IACF;IAEA,MAAMc,cAAcd,aAAqB,EAAEH,OAA+B,EAAE;QAC1E,MAAMkB,kBAAkB,MAAMP,uBAAe,CAACQ,OAAO,CAAC;YACpD,yBAAyBhB;YACzBC,QAAQgB,wCAAW,CAACC,YAAY;QAClC;QAEA,IAAI,CAACH,iBAAiB;YACpB,IAAI,CAAC1B,MAAM,CAAC8B,IAAI,CAAC,CAAC,yBAAyB,EAAEnB,cAAc,0DAA0D,CAAC;YACtH;QACF;QACAe,gBAAgBlB,OAAO,GAAGA;QAC1B,MAAMkB,gBAAgBK,IAAI;IAC5B;IAEA,MAAMC,oBAAoB;QACxB,MAAMC,WAAW,MAAMd,uBAAe,CAACe,SAAS,CAAC;YAC/C;gBAAEC,OAAO;oBAAEtB,WAAW;oBAAGH,WAAW,CAAC;gBAAE;YAAE;YACzC;gBACE0B,QAAQ;oBACNC,KAAK;oBACL3B,WAAW;wBAAE4B,QAAQ;oBAAa;oBAClC9B,SAAS;wBAAE8B,QAAQ;oBAAW;oBAC9B1B,QAAQ;wBAAE0B,QAAQ;oBAAU;oBAC5B7B,UAAU;wBAAE6B,QAAQ;oBAAY;gBAClC;YACF;YACA;gBACEC,QAAQ;oBACN3B,QAAQ;wBACN4B,MAAM;4BAACZ,wCAAW,CAACa,SAAS;4BAAEb,wCAAW,CAACc,WAAW;yBAAC;oBACxD;gBACF;YACF;SACD;QAED,OAAOC,OAAOC,WAAW,CACvBX,SAASY,GAAG,CAAC,CAACC;YACZA,EAAEjC,SAAS,GAAGiC,EAAET,GAAG;YACnB,OAAOS,EAAET,GAAG;YACZ,OAAO;gBAACS,EAAEjC,SAAS;gBAAEiC;aAAE;QACzB;IAEJ;IAEA,MAAMC,2BAA2B;QAC/B,MAAMC,uBAAuB,MAAM7B,uBAAe,CAACe,SAAS,CAAC;YAC3D;gBACEE,QAAQ;oBACNC,KAAK;oBACLY,aAAa;wBACXC,OAAO;4BACLrC,WAAW;4BACXL,SAAS;4BACTD,eAAe;4BACfE,UAAU;4BACVG,QAAQ;4BACRF,WAAW;wBACb;oBACF;gBACF;YACF;SACD;QAED,OAAOyC,IAAAA,yCAAkB,EAACH;IAC5B;AACF"}

package/dist/services/print-completion.shared.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "processCompletions", {
+    enumerable: true,
+    get: function() {
+        return processCompletions;
+    }
+});
+const _arrayutil = require("../utils/array.util");
+const _octoprintwebsocketconstants = require("./octoprint/constants/octoprint-websocket.constants");
+const durationDayMSec = 24 * 60 * 60 * 1000;
+function processCompletions(completions) {
+    return completions.map((pc)=>{
+        pc.printerId = pc.printerId ?? pc._id;
+        delete pc._id;
+        const jobs = (0, _arrayutil.groupArrayBy)(pc.printEvents, (e)=>e.context?.correlationId);
+        pc.printJobs = Object.entries(jobs).map(([id, events])=>{
+            const eventMap = events.map(({ status, createdAt, fileName, completionLog })=>({
+                    status,
+                    createdAt,
+                    fileName,
+                    completionLog
+                }));
+            return {
+                correlationId: id,
+                events: eventMap,
+                lastEvent: eventMap.reduce((e1, e2)=>e1.createdAt > e2.createdAt ? e1 : e2)
+            };
+        });
+        pc.correlationIds = pc.printJobs.map((j)=>j.correlationId);
+        pc.printCount = pc.correlationIds?.length;
+        pc.eventCount = pc.printEvents.length;
+        const mappedEvents = pc.printEvents.map(({ status, createdAt, fileName, context, completionLog })=>({
+                status,
+                createdAt,
+                fileName,
+                context,
+                completionLog
+            }));
+        const failureEvents = mappedEvents.filter((e)=>e.status === _octoprintwebsocketconstants.EVENT_TYPES.PrintFailed);
+        pc.failureCount = failureEvents?.length;
+        pc.lastFailure = failureEvents?.length ? failureEvents.reduce((j1, j2)=>j1.createdAt > j2.createdAt ? j1 : j2) : null;
+        pc.failureEventsLastWeek = failureEvents.filter((e)=>e.createdAt > Date.now() - 7 * durationDayMSec)?.length;
+        pc.failureEventsLast48H = failureEvents.filter((e)=>e.createdAt > Date.now() - 2 * durationDayMSec)?.length;
+        pc.failureEventsLast24H = failureEvents.filter((e)=>e.createdAt > Date.now() - durationDayMSec)?.length;
+        const successEvents = mappedEvents.filter((e)=>e.status === _octoprintwebsocketconstants.EVENT_TYPES.PrintDone);
+        pc.successCount = successEvents?.length;
+        pc.lastSuccess = successEvents?.length ? successEvents?.reduce((j1, j2)=>j1.createdAt > j2.createdAt ? j1 : j2) : null;
+        pc.successEventsLastWeek = successEvents.filter((e)=>e.createdAt > Date.now() - 7 * durationDayMSec)?.length;
+        pc.successEventsLast48H = successEvents.filter((e)=>e.createdAt > Date.now() - 2 * durationDayMSec)?.length;
+        pc.successEventsLast24H = successEvents.filter((e)=>e.createdAt > Date.now() - durationDayMSec)?.length;
+        delete pc.printEvents;
+        return pc;
+    });
+}
+
+//# sourceMappingURL=print-completion.shared.js.map

package/dist/services/print-completion.shared.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/services/print-completion.shared.ts"],"names":["processCompletions","durationDayMSec","completions","map","pc","printerId","_id","jobs","groupArrayBy","printEvents","e","context","correlationId","printJobs","Object","entries","id","events","eventMap","status","createdAt","fileName","completionLog","lastEvent","reduce","e1","e2","correlationIds","j","printCount","length","eventCount","mappedEvents","failureEvents","filter","EVENT_TYPES","PrintFailed","failureCount","lastFailure","j1","j2","failureEventsLastWeek","Date","now","failureEventsLast48H","failureEventsLast24H","successEvents","PrintDone","successCount","lastSuccess","successEventsLastWeek","successEventsLast48H","successEventsLast24H"],"mappings":";;;;+BA2BgBA;;;eAAAA;;;2BA3Ba;6CACD;AAI5B,MAAMC,kBAAkB,KAAK,KAAK,KAAK;AAsBhC,SAASD,mBAAmBE,WAAkC;IACnE,OAAOA,YAAYC,GAAG,CAAC,CAACC;QACtBA,GAAGC,SAAS,GAAGD,GAAGC,SAAS,IAAID,GAAGE,GAAG;QACrC,OAAOF,GAAGE,GAAG;QACb,MAAMC,OAAOC,IAAAA,uBAAY,EAACJ,GAAGK,WAAW,EAAE,CAACC,IAAMA,EAAEC,OAAO,EAAEC;QAC5DR,GAAGS,SAAS,GAAGC,OAAOC,OAAO,CAACR,MAAMJ,GAAG,CAAC,CAAC,CAACa,IAAIC,OAAO;YACnD,MAAMC,WAAWD,OAAOd,GAAG,CAAC,CAAC,EAAEgB,MAAM,EAAEC,SAAS,EAAEC,QAAQ,EAAEC,aAAa,EAAE,GAAM,CAAA;oBAC/EH;oBACAC;oBACAC;oBACAC;gBACF,CAAA;YACA,OAAO;gBACLV,eAAeI;gBACfC,QAAQC;gBACRK,WAAWL,SAASM,MAAM,CAAC,CAACC,IAAIC,KAAQD,GAAGL,SAAS,GAAGM,GAAGN,SAAS,GAAGK,KAAKC;YAC7E;QACF;QACAtB,GAAGuB,cAAc,GAAGvB,GAAGS,SAAS,CAACV,GAAG,CAAC,CAACyB,IAAMA,EAAEhB,aAAa;QAC3DR,GAAGyB,UAAU,GAAGzB,GAAGuB,cAAc,EAAEG;QACnC1B,GAAG2B,UAAU,GAAG3B,GAAGK,WAAW,CAACqB,MAAM;QAErC,MAAME,eAAe5B,GAAGK,WAAW,CAACN,GAAG,CAAC,CAAC,EAAEgB,MAAM,EAAEC,SAAS,EAAEC,QAAQ,EAAEV,OAAO,EAAEW,aAAa,EAAE,GAAM,CAAA;gBACpGH;gBACAC;gBACAC;gBACAV;gBACAW;YACF,CAAA;QAEA,MAAMW,gBAAgBD,aAAaE,MAAM,CAAC,CAACxB,IAAMA,EAAES,MAAM,KAAKgB,wCAAW,CAACC,WAAW;QACrFhC,GAAGiC,YAAY,GAAGJ,eAAeH;QACjC1B,GAAGkC,WAAW,GAAGL,eAAeH,SAASG,cAAcT,MAAM,CAAC,CAACe,IAAIC,KAAQD,GAAGnB,SAAS,GAAGoB,GAAGpB,SAAS,GAAGmB,KAAKC,MAAO;QACrHpC,GAAGqC,qBAAqB,GAAGR,cAAcC,MAAM,CAAC,CAACxB,IAAMA,EAAEU,SAAS,GAAGsB,KAAKC,GAAG,KAAK,IAAI1C,kBAAkB6B;QACxG1B,GAAGwC,oBAAoB,GAAGX,cAAcC,MAAM,CAAC,CAACxB,IAAMA,EAAEU,SAAS,GAAGsB,KAAKC,GAAG,KAAK,IAAI1C,kBAAkB6B;QACvG1B,GAAGyC,oBAAoB,GAAGZ,cAAcC,MAAM,CAAC,CAACxB,IAAMA,EAAEU,SAAS,GAAGsB,KAAKC,GAAG,KAAK1C,kBAAkB6B;QAEnG,MAAMgB,gBAAgBd,aAAaE,MAAM,CAAC,CAACxB,IAAMA,EAAES,MAAM,KAAKgB,wCAAW,CAACY,SAAS;QACnF3C,GAAG4C,YAAY,GAAGF,eAAehB;QACjC1B,GAAG6C,WAAW,GAAGH,eAAehB,SAASgB,eAAetB,OAAO,CAACe,IAAIC,KAAQD,GAAGnB,SAAS,GAAGoB,GAAGpB,SAAS,GAAGmB,KAAKC,MAAO;QACtHpC,GAAG8C,qBAAqB,GAAGJ,cAAcZ,MAAM,CAAC,CAACxB,IAAMA,EAAEU,SAAS,GAAGsB,KAAKC,GAAG,KAAK,IAAI1C,kBAAkB6B;QACxG1B,GAAG+C,oBAAoB,GAAGL,cAAcZ,MAAM,CAAC,CAACxB,IAAMA,EAAEU,SAAS,GAAGsB,KAAKC,GAAG,KAAK,IAAI1C,kBAAkB6B;QACvG1B,GAAGgD,oBAAoB,GAAGN,cAAcZ,MAAM,CAAC,CAACxB,IAAMA,EAAEU,SAAS,GAAGsB,KAAKC,GAAG,KAAK1C,kBAAkB6B;QAGnG,OAAO1B,GAAGK,WAAW;QAErB,OAAOL;IACT;AACF"}

package/dist/services/printer-files.service.js

@@ -33,7 +33,6 @@ class PrinterFilesService {
     }
     async appendOrReplaceFile(printerId, addedFile) {
         const printer = await this.printerService.get(printerId);
-        // TODO replace with file storage
         const foundFileIndex = printer.fileList.files.findIndex((f)=>f.path === addedFile.path);
         if (foundFileIndex === -1) {
             printer.fileList.files.push(addedFile);
@@ -42,7 +41,6 @@ class PrinterFilesService {
         }
         printer.markModified("fileList");
         await printer.save();
-        // Only now are we allowed to adjust the last uploaded printer file
         let lastPrintedFile = {};
         try {
             lastPrintedFile = await this.setPrinterLastPrintedFile(printerId, addedFile.name);
@@ -70,9 +68,7 @@ class PrinterFilesService {
         printer.markModified("fileList");
         await printer.save();
     }
-    /**
-   * Perform delete action on database
-   **/ async deleteFile(printerId, filePath, throwError = true) {
+    async deleteFile(printerId, filePath, throwError = true) {
         const printer = await this.printerService.get(printerId);
         const fileIndex = (0, _findpredicateutils.findFileIndex)(printer.fileList, filePath);
         if (fileIndex === -1) {

package/dist/services/printer-files.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/printer-files.service.ts"],"names":["PrinterFilesService","printerService","logger","constructor","loggerFactory","name","getPrinterFilesStorage","printerId","printer","get","fileList","storage","updateFiles","markModified","save","appendOrReplaceFile","addedFile","foundFileIndex","files","findIndex","f","path","push","lastPrintedFile","setPrinterLastPrintedFile","e","warn","fileName","editTimestamp","Date","now","updateLastPrintedFile","log","clearFiles","deleteFile","filePath","throwError","fileIndex","findFileIndex","NotFoundException","splice"],"mappings":"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"}
+{"version":3,"sources":["../../src/services/printer-files.service.ts"],"names":["PrinterFilesService","printerService","logger","constructor","loggerFactory","name","getPrinterFilesStorage","printerId","printer","get","fileList","storage","updateFiles","markModified","save","appendOrReplaceFile","addedFile","foundFileIndex","files","findIndex","f","path","push","lastPrintedFile","setPrinterLastPrintedFile","e","warn","fileName","editTimestamp","Date","now","updateLastPrintedFile","log","clearFiles","deleteFile","filePath","throwError","fileIndex","findFileIndex","NotFoundException","splice"],"mappings":"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"}

package/dist/services/printer.service.js

@@ -22,6 +22,22 @@ class PrinterService {
         this.eventEmitter2 = eventEmitter2;
         this.logger = loggerFactory(PrinterService.name);
     }
+    toUnsafeDto(entity) {
+        return {
+            ...this.toDto(entity),
+            apiKey: entity.apiKey,
+            printerURL: entity.printerURL
+        };
+    }
+    toDto(entity) {
+        return {
+            id: entity.id,
+            name: entity.name,
+            enabled: entity.enabled,
+            disabledReason: entity.disabledReason,
+            dateAdded: entity.dateAdded
+        };
+    }
     async list() {
         return _models.Printer.find({}, null, {
             sort: {
@@ -39,12 +55,7 @@ class PrinterService {
         }
         return printer;
     }
-    /**
-   * Stores a new printer into the database.
-   * @param {Object} newPrinter object to create.
-   * @param {boolean} emitEvent
-   * @throws {Error} If the printer is not correctly provided.
-   */ async create(newPrinter, emitEvent = true) {
+    async create(newPrinter, emitEvent = true) {
         if (!newPrinter) throw new Error("Missing printer");
         const mergedPrinter = await this.validateAndDefault(newPrinter);
         mergedPrinter.dateAdded = Date.now();
@@ -56,21 +67,16 @@ class PrinterService {
         }
         return printer;
     }
-    /**
-   * Explicit patching of printer document
-   * @param printerId
-   * @param updateData
-   * @returns {Promise<Query<Document<any, any, unknown> | null, Document<any, any, unknown>, {}, unknown>>}
-   */ async update(printerId, updateData) {
+    async update(printerId, updateData) {
         const printer = await this.get(printerId);
         updateData.printerURL = (0, _urlutils.normalizeURLWithProtocol)(updateData.printerURL);
-        const { printerURL, apiKey, enabled, settingsAppearance } = await (0, _validators.validateInput)(updateData, _printerservicevalidation.createMongoPrinterRules);
+        const { printerURL, apiKey, enabled, name } = await (0, _validators.validateInput)(updateData, _printerservicevalidation.createMongoPrinterRules);
         printer.printerURL = printerURL;
         printer.apiKey = apiKey;
         if (enabled !== undefined) {
             printer.enabled = enabled;
         }
-        printer.settingsAppearance.name = settingsAppearance.name;
+        printer.name = name;
         await printer.save();
         this.eventEmitter2.emit(_eventconstants.printerEvents.printerUpdated, {
             printer
@@ -109,7 +115,6 @@ class PrinterService {
             await this.validateAndDefault(printer);
         }
         this.logger.log(`Validation passed. Creating ${printers.length} printers`);
-        // We've passed validation completely - creation will likely succeed
         const newPrinters = [];
         for (let printer of printers){
             const createdPrinter = await this.create(printer, false);

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/printer.service.ts"],"names":["PrinterService","eventEmitter2","logger","constructor","loggerFactory","name","list","Printer","find","sort","dateAdded","get","printerId","filter","_id","printer","findOne","NotFoundException","create","newPrinter","emitEvent","Error","mergedPrinter","validateAndDefault","Date","now","emit","printerEvents","printerCreated","update","updateData","printerURL","normalizeURLWithProtocol","apiKey","enabled","settingsAppearance","validateInput","createMongoPrinterRules","undefined","save","printerUpdated","deleteMany","printerIds","$in","printersDeleted","delete","findOneAndDelete","batchImport","printers","length","log","newPrinters","createdPrinter","push","batchPrinterCreated","updateLastPrintedFile","lastPrintedFile","findByIdAndUpdate","new","useFindAndModify","updateFlowRate","flowRate","updateFeedRate","feedRate","updateConnectionSettings","updateEnabled","disabledReason","updatePrinterEnabledRule","updateDisabledReason","updatePrinterDisabledReasonRule","getDefaultPrinterEntry"],"mappings":"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"}
+{"version":3,"sources":["../../src/services/printer.service.ts"],"names":["PrinterService","eventEmitter2","logger","constructor","loggerFactory","name","toUnsafeDto","entity","toDto","apiKey","printerURL","id","enabled","disabledReason","dateAdded","list","Printer","find","sort","get","printerId","filter","_id","printer","findOne","NotFoundException","create","newPrinter","emitEvent","Error","mergedPrinter","validateAndDefault","Date","now","emit","printerEvents","printerCreated","update","updateData","normalizeURLWithProtocol","validateInput","createMongoPrinterRules","undefined","save","printerUpdated","deleteMany","printerIds","$in","printersDeleted","delete","findOneAndDelete","batchImport","printers","length","log","newPrinters","createdPrinter","push","batchPrinterCreated","updateLastPrintedFile","lastPrintedFile","findByIdAndUpdate","new","useFindAndModify","updateFlowRate","flowRate","updateFeedRate","feedRate","updateConnectionSettings","updateEnabled","updatePrinterEnabledRule","updateDisabledReason","updatePrinterDisabledReasonRule","getDefaultPrinterEntry"],"mappings":"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"}

package/dist/services/settings.service.js

@@ -21,7 +21,6 @@ class SettingsService {
     }
     toDto(entity) {
         return {
-            // Credential settings are not shared with the client
             [_serversettingsconstants.serverSettingsKey]: entity[_serversettingsconstants.serverSettingsKey],
             [_serversettingsconstants.wizardSettingKey]: entity[_serversettingsconstants.wizardSettingKey],
             [_serversettingsconstants.frontendSettingKey]: entity[_serversettingsconstants.frontendSettingKey],
@@ -34,10 +33,8 @@ class SettingsService {
         if (!settings) {
             const defaultSettings = new _models.Settings((0, _serversettingsconstants.getDefaultSettings)());
             await defaultSettings.save();
-            // Return to upper layer
             return defaultSettings;
         } else {
-            // Perform patch of settings
             settings = this.migrateSettingsRuntime(settings);
             return _models.Settings.findOneAndUpdate({
                 _id: settings.id
@@ -46,14 +43,11 @@ class SettingsService {
             });
         }
     }
-    /**
-   * Patch the given settings object manually - runtime migration strategy
-   */ migrateSettingsRuntime(knownSettings) {
-        const doc = knownSettings; // alias _doc also works
+    migrateSettingsRuntime(knownSettings) {
+        const doc = knownSettings;
         if (!doc[_serversettingsconstants.fileCleanSettingKey]) {
             doc[_serversettingsconstants.fileCleanSettingKey] = (0, _serversettingsconstants.getDefaultFileCleanSettings)();
         }
-        // Server settings exist, but need updating with new ones if they don't exist.
         if (!doc[_serversettingsconstants.wizardSettingKey]) {
             doc[_serversettingsconstants.wizardSettingKey] = (0, _serversettingsconstants.getDefaultWizardSettings)();
         }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/settings.service.ts"],"names":["SettingsService","configService","constructor","toDto","entity","serverSettingsKey","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey","getOrCreate","settings","Settings","findOne","defaultSettings","getDefaultSettings","save","migrateSettingsRuntime","findOneAndUpdate","_id","id","new","knownSettings","doc","getDefaultFileCleanSettings","getDefaultWizardSettings","getDefaultTimeout","getDefaultServerSettings","credentialSettingsKey","getDefaultCredentialSettings","isWhiteListSettingEnabled","server","whitelistEnabled","whitelistedIpAddresses","getDefaultWhitelistIpAddresses","length","getDefaultFrontendSettings","patchFileCleanSettings","patchUpdate","validatedInput","validateInput","fileCleanSettingsUpdateRules","settingsDoc","Object","assign","patchWizardSettings","wizardUpdateRules","setWhitelist","enabled","ipAddresses","BadRequestException","whitelistSettingUpdateRules","updateFrontendSettings","frontendSettingsUpdateRules","frontendSettings","patchCredentialSettings","credentialSettingPatchRules","credentialSettings","patchServerSettings","serverSettingsUpdateRules","serverSettings","updateTimeoutSettings","timeoutSettingsUpdateRules","timeoutSettings","get","AppConstants","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS"],"mappings":"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"}
+{"version":3,"sources":["../../src/services/settings.service.ts"],"names":["SettingsService","configService","constructor","toDto","entity","serverSettingsKey","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey","getOrCreate","settings","Settings","findOne","defaultSettings","getDefaultSettings","save","migrateSettingsRuntime","findOneAndUpdate","_id","id","new","knownSettings","doc","getDefaultFileCleanSettings","getDefaultWizardSettings","getDefaultTimeout","getDefaultServerSettings","credentialSettingsKey","getDefaultCredentialSettings","isWhiteListSettingEnabled","server","whitelistEnabled","whitelistedIpAddresses","getDefaultWhitelistIpAddresses","length","getDefaultFrontendSettings","patchFileCleanSettings","patchUpdate","validatedInput","validateInput","fileCleanSettingsUpdateRules","settingsDoc","Object","assign","patchWizardSettings","wizardUpdateRules","setWhitelist","enabled","ipAddresses","BadRequestException","whitelistSettingUpdateRules","updateFrontendSettings","frontendSettingsUpdateRules","frontendSettings","patchCredentialSettings","credentialSettingPatchRules","credentialSettings","patchServerSettings","serverSettingsUpdateRules","serverSettings","updateTimeoutSettings","timeoutSettingsUpdateRules","timeoutSettings","get","AppConstants","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS"],"mappings":"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"}

package/dist/services/validators/floor-service.validation.js

@@ -29,22 +29,24 @@ _export(exports, {
     }
 });
 const _serviceconstants = require("../../constants/service.constants");
-const removePrinterInFloorRules = {
-    printerId: "required|mongoId"
-};
-const printerInFloorRules = {
-    printerId: "required|mongoId",
-    x: "required|integer|between:0,12",
-    y: "required|integer|between:0,12"
-};
+const _genericvalidation = require("../../controllers/validation/generic.validation");
+const removePrinterInFloorRules = (isSqlite)=>({
+        printerId: (0, _genericvalidation.idRuleV2)(isSqlite)
+    });
+const printerInFloorRules = (isSqlite)=>({
+        printerId: (0, _genericvalidation.idRuleV2)(isSqlite),
+        floorId: isSqlite ? (0, _genericvalidation.idRuleV2)(true) : "not",
+        x: "required|integer|between:0,12",
+        y: "required|integer|between:0,12"
+    });
 const updateFloorNameRules = {
-    name: `required|minLength:${_serviceconstants.minPrinterFloorNameLength}`
+    name: `required|minLength:${_serviceconstants.minFloorNameLength}`
 };
 const updateFloorNumberRules = {
     floor: "required|integer"
 };
 const updateFloorRules = {
-    name: `required|minLength:${_serviceconstants.minPrinterFloorNameLength}`,
+    name: `required|minLength:${_serviceconstants.minFloorNameLength}`,
     floor: "required|integer",
     printers: "array",
     "printer.*.printerId": "required|mongoId",
@@ -52,7 +54,7 @@ const updateFloorRules = {
     "printer.*.y": "required|integer|between:0,12"
 };
 const createFloorRules = {
-    name: `required|minLength:${_serviceconstants.minPrinterFloorNameLength}`,
+    name: `required|minLength:${_serviceconstants.minFloorNameLength}`,
     floor: "required|integer",
     printers: "array"
 };

package/dist/services/validators/floor-service.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/floor-service.validation.ts"],"names":["createFloorRules","printerInFloorRules","removePrinterInFloorRules","updateFloorNameRules","updateFloorNumberRules","updateFloorRules","printerId","x","y","name","minPrinterFloorNameLength","floor","printers"],"mappings":";;;;;;;;;;;IA6BaA,gBAAgB;eAAhBA;;IAvBAC,mBAAmB;eAAnBA;;IAJAC,yBAAyB;eAAzBA;;IAUAC,oBAAoB;eAApBA;;IAIAC,sBAAsB;eAAtBA;;IAIAC,gBAAgB;eAAhBA;;;kCApB6B;AAEnC,MAAMH,4BAA4B;IACvCI,WAAW;AACb;AAEO,MAAML,sBAAsB;IACjCK,WAAW;IACXC,GAAG;IACHC,GAAG;AACL;AAEO,MAAML,uBAAuB;IAClCM,MAAM,CAAC,mBAAmB,EAAEC,2CAAyB,CAAC,CAAC;AACzD;AAEO,MAAMN,yBAAyB;IACpCO,OAAO;AACT;AAEO,MAAMN,mBAAmB;IAC9BI,MAAM,CAAC,mBAAmB,EAAEC,2CAAyB,CAAC,CAAC;IACvDC,OAAO;IACPC,UAAU;IACV,uBAAuB;IACvB,eAAe;IACf,eAAe;AACjB;AAEO,MAAMZ,mBAAmB;IAC9BS,MAAM,CAAC,mBAAmB,EAAEC,2CAAyB,CAAC,CAAC;IACvDC,OAAO;IACPC,UAAU;AACZ"}
+{"version":3,"sources":["../../../src/services/validators/floor-service.validation.ts"],"names":["createFloorRules","printerInFloorRules","removePrinterInFloorRules","updateFloorNameRules","updateFloorNumberRules","updateFloorRules","isSqlite","printerId","idRuleV2","floorId","x","y","name","minFloorNameLength","floor","printers"],"mappings":";;;;;;;;;;;IA+BaA,gBAAgB;eAAhBA;;IAxBAC,mBAAmB;eAAnBA;;IAJAC,yBAAyB;eAAzBA;;IAWAC,oBAAoB;eAApBA;;IAIAC,sBAAsB;eAAtBA;;IAIAC,gBAAgB;eAAhBA;;;kCAtBsB;mCACV;AAElB,MAAMH,4BAA4B,CAACI,WAAuB,CAAA;QAC/DC,WAAWC,IAAAA,2BAAQ,EAACF;IACtB,CAAA;AAEO,MAAML,sBAAsB,CAACK,WAAuB,CAAA;QACzDC,WAAWC,IAAAA,2BAAQ,EAACF;QACpBG,SAASH,WAAWE,IAAAA,2BAAQ,EAAC,QAAQ;QACrCE,GAAG;QACHC,GAAG;IACL,CAAA;AAEO,MAAMR,uBAAuB;IAClCS,MAAM,CAAC,mBAAmB,EAAEC,oCAAkB,CAAC,CAAC;AAClD;AAEO,MAAMT,yBAAyB;IACpCU,OAAO;AACT;AAEO,MAAMT,mBAAmB;IAC9BO,MAAM,CAAC,mBAAmB,EAAEC,oCAAkB,CAAC,CAAC;IAChDC,OAAO;IACPC,UAAU;IACV,uBAAuB;IACvB,eAAe;IACf,eAAe;AACjB;AAEO,MAAMf,mBAAmB;IAC9BY,MAAM,CAAC,mBAAmB,EAAEC,oCAAkB,CAAC,CAAC;IAChDC,OAAO;IACPC,UAAU;AACZ"}

package/dist/services/validators/printer-service.validation.js

@@ -28,8 +28,7 @@ const createMongoPrinterRules = {
     apiKey: `required|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
     printerURL: "required|httpurl",
     enabled: "boolean",
-    settingsAppearance: "object",
-    "settingsAppearance.name": "string"
+    name: "string"
 };
 const createPrinterRules = {
     apiKey: `required|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,

package/dist/services/validators/printer-service.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createMongoPrinterRules","createPrinterRules","updatePrinterDisabledReasonRule","updatePrinterEnabledRule","_id","apiKey","UUID_LENGTH","printerURL","enabled","settingsAppearance","name","disabledReason"],"mappings":";;;;;;;;;;;IAEaA,uBAAuB;eAAvBA;;IASAC,kBAAkB;eAAlBA;;IAWAC,+BAA+B;eAA/BA;;IAJAC,wBAAwB;eAAxBA;;;kCAlBe;AAErB,MAAMH,0BAA0B;IACrCI,KAAK;IACLC,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;IACZC,SAAS;IACTC,oBAAoB;IACpB,2BAA2B;AAC7B;AAEO,MAAMR,qBAAqB;IAChCI,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;IACZC,SAAS;IACTE,MAAM;AACR;AAEO,MAAMP,2BAA2B;IACtCK,SAAS;AACX;AAEO,MAAMN,kCAAkC;IAC7CS,gBAAgB;IAChBH,SAAS;AACX"}
+{"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createMongoPrinterRules","createPrinterRules","updatePrinterDisabledReasonRule","updatePrinterEnabledRule","_id","apiKey","UUID_LENGTH","printerURL","enabled","name","disabledReason"],"mappings":";;;;;;;;;;;IAEaA,uBAAuB;eAAvBA;;IAQAC,kBAAkB;eAAlBA;;IAWAC,+BAA+B;eAA/BA;;IAJAC,wBAAwB;eAAxBA;;;kCAjBe;AAErB,MAAMH,0BAA0B;IACrCI,KAAK;IACLC,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;IACZC,SAAS;IACTC,MAAM;AACR;AAEO,MAAMR,qBAAqB;IAChCI,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;IACZC,SAAS;IACTC,MAAM;AACR;AAEO,MAAMN,2BAA2B;IACtCK,SAAS;AACX;AAEO,MAAMN,kCAAkC;IAC7CQ,gBAAgB;IAChBF,SAAS;AACX"}

package/dist/services/validators/user-service.validation.js

@@ -17,16 +17,16 @@ _export(exports, {
     }
 });
 const _serverconstants = require("../../server.constants");
-const registerUserRules = {
-    username: `required|string|minLength:${_serverconstants.AppConstants.DEFAULT_USERNAME_MINLEN}`,
-    password: `required|string|minLength:${_serverconstants.AppConstants.DEFAULT_PASSWORD_MINLEN}`,
-    needsPasswordChange: "boolean",
-    roles: "required|array",
-    isDemoUser: "boolean",
-    isRootUser: "boolean",
-    "roles.*": "required|mongoId",
-    isVerified: "boolean"
-};
+const registerUserRules = (isSqlite)=>({
+        username: `required|string|minLength:${_serverconstants.AppConstants.DEFAULT_USERNAME_MINLEN}`,
+        password: `required|string|minLength:${_serverconstants.AppConstants.DEFAULT_PASSWORD_MINLEN}`,
+        needsPasswordChange: "boolean",
+        roles: "required|array",
+        isDemoUser: "boolean",
+        isRootUser: "boolean",
+        "roles.*": `required|${isSqlite ? "integer|min:1" : "mongoId"}`,
+        isVerified: "boolean"
+    });
 const newPasswordRules = {
     password: `required|string|minLength:${_serverconstants.AppConstants.DEFAULT_PASSWORD_MINLEN}`
 };

package/dist/services/validators/user-service.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/user-service.validation.ts"],"names":["newPasswordRules","registerUserRules","username","AppConstants","DEFAULT_USERNAME_MINLEN","password","DEFAULT_PASSWORD_MINLEN","needsPasswordChange","roles","isDemoUser","isRootUser","isVerified"],"mappings":";;;;;;;;;;;IAaaA,gBAAgB;eAAhBA;;IAXAC,iBAAiB;eAAjBA;;;iCAFgB;AAEtB,MAAMA,oBAAoB;IAC/BC,UAAU,CAAC,0BAA0B,EAAEC,6BAAY,CAACC,uBAAuB,CAAC,CAAC;IAC7EC,UAAU,CAAC,0BAA0B,EAAEF,6BAAY,CAACG,uBAAuB,CAAC,CAAC;IAC7EC,qBAAqB;IACrBC,OAAO;IACPC,YAAY;IACZC,YAAY;IACZ,WAAW;IACXC,YAAY;AACd;AAEO,MAAMX,mBAAmB;IAC9BK,UAAU,CAAC,0BAA0B,EAAEF,6BAAY,CAACG,uBAAuB,CAAC,CAAC;AAC/E"}
+{"version":3,"sources":["../../../src/services/validators/user-service.validation.ts"],"names":["newPasswordRules","registerUserRules","isSqlite","username","AppConstants","DEFAULT_USERNAME_MINLEN","password","DEFAULT_PASSWORD_MINLEN","needsPasswordChange","roles","isDemoUser","isRootUser","isVerified"],"mappings":";;;;;;;;;;;IAaaA,gBAAgB;eAAhBA;;IAXAC,iBAAiB;eAAjBA;;;iCAFgB;AAEtB,MAAMA,oBAAoB,CAACC,WAAuB,CAAA;QACvDC,UAAU,CAAC,0BAA0B,EAAEC,6BAAY,CAACC,uBAAuB,CAAC,CAAC;QAC7EC,UAAU,CAAC,0BAA0B,EAAEF,6BAAY,CAACG,uBAAuB,CAAC,CAAC;QAC7EC,qBAAqB;QACrBC,OAAO;QACPC,YAAY;QACZC,YAAY;QACZ,WAAW,CAAC,SAAS,EAAET,WAAW,kBAAkB,UAAU,CAAC;QAC/DU,YAAY;IACd,CAAA;AAEO,MAAMZ,mBAAmB;IAC9BM,UAAU,CAAC,0BAA0B,EAAEF,6BAAY,CAACG,uBAAuB,CAAC,CAAC;AAC/E"}

package/dist/services/validators/yaml-service.validation.js

@@ -21,18 +21,17 @@ _export(exports, {
 });
 const _serviceconstants = require("../../constants/service.constants");
 const exportPrintersFloorsYamlRules = {
-    // Used to export
     exportPrinters: "required|boolean",
     exportFloorGrid: "required|boolean",
     exportFloors: "required|boolean",
-    // Used to determine import strategy
     printerComparisonStrategiesByPriority: "required|arrayUnique|minLength:1",
     "printerComparisonStrategiesByPriority.*": "required|string|in:name,url,id",
     floorComparisonStrategiesByPriority: "required|string|in:name,floor,id",
-    // Helpful reference
     notes: "string"
 };
-const importPrintersFloorsYamlRules = (importPrinters, importFloorGrid, importFloors)=>({
+const importPrintersFloorsYamlRules = (importPrinters, importFloorGrid, importFloors, isTypeormMode)=>{
+    const idVal = isTypeormMode ? "integer|min:1" : "mongoId";
+    return {
         version: "required|string",
         config: "required|object",
         "config.exportPrinters": "required|boolean",
@@ -42,22 +41,22 @@ const importPrintersFloorsYamlRules = (importPrinters, importFloorGrid, importFl
         "config.printerComparisonStrategiesByPriority.*": "required|string|in:name,url,id",
         "config.floorComparisonStrategiesByPriority": "required|string|in:name,floor,id",
         printers: `${!!importPrinters ? "array|minLength:0" : "not"}`,
-        "printers.*.id": "mongoId",
+        "printers.*.id": `${idVal}`,
         "printers.*.apiKey": `required|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
         "printers.*.printerURL": "required|httpurl",
         "printers.*.enabled": "boolean",
-        "printers.*.settingsAppearance": "required|object",
-        "printers.*.settingsAppearance.name": "required|string",
+        "printers.*.name": "required|string",
         floors: `${!!importFloors ? "array|minLength:0" : "not"}`,
-        "floors.*.id": "required|mongoId",
+        "floors.*.id": `${idVal}`,
         "floors.*.floor": "required|integer",
         "floors.*.name": "required|string"
-    });
-const importPrinterPositionsRules = {
-    printers: "array|minLength:0",
-    "printers.*.printerId": "required|mongoId",
-    "printers.*.x": "required|integer|min:0|max:12",
-    "printers.*.y": "required|integer|min:0|max:12"
+    };
 };
+const importPrinterPositionsRules = (isTypeormMode)=>({
+        printers: "array|minLength:0",
+        "printers.*.printerId": isTypeormMode ? "integer|min:1" : "mongoId",
+        "printers.*.x": "required|integer|min:0|max:12",
+        "printers.*.y": "required|integer|min:0|max:12"
+    });
 
 //# sourceMappingURL=yaml-service.validation.js.map

package/dist/services/validators/yaml-service.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlRules","importPrinterPositionsRules","importPrintersFloorsYamlRules","exportPrinters","exportFloorGrid","exportFloors","printerComparisonStrategiesByPriority","floorComparisonStrategiesByPriority","notes","importPrinters","importFloorGrid","importFloors","version","config","printers","UUID_LENGTH","floors"],"mappings":";;;;;;;;;;;IAEaA,6BAA6B;eAA7BA;;IAsCAC,2BAA2B;eAA3BA;;IAtBAC,6BAA6B;eAA7BA;;;kCAlBe;AAErB,MAAMF,gCAAgC;IAC3C,iBAAiB;IACjBG,gBAAgB;IAChBC,iBAAiB;IACjBC,cAAc;IACd,oCAAoC;IACpCC,uCAAuC;IACvC,2CAA2C;IAC3CC,qCAAqC;IACrC,oBAAoB;IACpBC,OAAO;AAIT;AAEO,MAAMN,gCAAgC,CAACO,gBAAgBC,iBAAiBC,eAAkB,CAAA;QAC/FC,SAAS;QACTC,QAAQ;QACR,yBAAyB;QACzB,0BAA0B;QAC1B,uBAAuB;QACvB,gDAAgD;QAChD,kDAAkD;QAClD,8CAA8C;QAC9CC,UAAU,CAAC,EAAE,CAAC,CAACL,iBAAiB,sBAAsB,MAAM,CAAC;QAC7D,iBAAiB;QACjB,qBAAqB,CAAC,gBAAgB,EAAEM,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;QACjF,yBAAyB;QACzB,sBAAsB;QACtB,iCAAiC;QACjC,sCAAsC;QACtCC,QAAQ,CAAC,EAAE,CAAC,CAACL,eAAe,sBAAsB,MAAM,CAAC;QACzD,eAAe;QACf,kBAAkB;QAClB,iBAAiB;IACnB,CAAA;AAEO,MAAMV,8BAA8B;IACzCa,UAAU;IACV,wBAAwB;IACxB,gBAAgB;IAChB,gBAAgB;AAClB"}
+{"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlRules","importPrinterPositionsRules","importPrintersFloorsYamlRules","exportPrinters","exportFloorGrid","exportFloors","printerComparisonStrategiesByPriority","floorComparisonStrategiesByPriority","notes","importPrinters","importFloorGrid","importFloors","isTypeormMode","idVal","version","config","printers","UUID_LENGTH","floors"],"mappings":";;;;;;;;;;;IAEaA,6BAA6B;eAA7BA;;IA6CAC,2BAA2B;eAA3BA;;IA7BAC,6BAA6B;eAA7BA;;;kCAlBe;AAErB,MAAMF,gCAAgC;IAE3CG,gBAAgB;IAChBC,iBAAiB;IACjBC,cAAc;IAEdC,uCAAuC;IACvC,2CAA2C;IAC3CC,qCAAqC;IAErCC,OAAO;AAIT;AAEO,MAAMN,gCAAgC,CAC3CO,gBACAC,iBACAC,cACAC;IAEA,MAAMC,QAAQD,gBAAgB,kBAAkB;IAChD,OAAO;QACLE,SAAS;QACTC,QAAQ;QACR,yBAAyB;QACzB,0BAA0B;QAC1B,uBAAuB;QACvB,gDAAgD;QAChD,kDAAkD;QAClD,8CAA8C;QAC9CC,UAAU,CAAC,EAAE,CAAC,CAACP,iBAAiB,sBAAsB,MAAM,CAAC;QAC7D,iBAAiB,CAAC,EAAEI,MAAM,CAAC;QAC3B,qBAAqB,CAAC,gBAAgB,EAAEI,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;QACjF,yBAAyB;QACzB,sBAAsB;QACtB,mBAAmB;QACnBC,QAAQ,CAAC,EAAE,CAAC,CAACP,eAAe,sBAAsB,MAAM,CAAC;QACzD,eAAe,CAAC,EAAEE,MAAM,CAAC;QACzB,kBAAkB;QAClB,iBAAiB;IACnB;AACF;AAEO,MAAMZ,8BAA8B,CAACW,gBAA4B,CAAA;QACtEI,UAAU;QACV,wBAAwBJ,gBAAgB,kBAAkB;QAC1D,gBAAgB;QAChB,gBAAgB;IAClB,CAAA"}

package/dist/state/file-upload-tracker.cache.js

@@ -21,7 +21,6 @@ class FileUploadTrackerCache {
         this.logger = loggerFactory(FileUploadTrackerCache.name);
     }
     progressCallback = (token, p)=>{
-        // Ensure binding of this is correct
         this.updateUploadProgress(token, p);
     };
     getUploads(filterHourOld = false) {

package/dist/state/file-upload-tracker.cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/file-upload-tracker.cache.ts"],"names":["FileUploadTrackerCache","currentUploads","uploadsDone","uploadsFailed","eventEmitter2","logger","constructor","loggerFactory","name","progressCallback","token","p","updateUploadProgress","getUploads","filterHourOld","currentTime","Date","now","done","filter","d","startedAt","failed","current","getUpload","correlationToken","find","cu","addUploadTracker","multerFile","generateCorrelationToken","log","on","uploadProgressEvent","push","progress","reason","percent","markUploadDone","off","upload","success","trackedUploadIndex","findIndex","warn","trackedUpload","failedAt","succeededAt","splice"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/file-upload-tracker.cache.ts"],"names":["FileUploadTrackerCache","currentUploads","uploadsDone","uploadsFailed","eventEmitter2","logger","constructor","loggerFactory","name","progressCallback","token","p","updateUploadProgress","getUploads","filterHourOld","currentTime","Date","now","done","filter","d","startedAt","failed","current","getUpload","correlationToken","find","cu","addUploadTracker","multerFile","generateCorrelationToken","log","on","uploadProgressEvent","push","progress","reason","percent","markUploadDone","off","upload","success","trackedUploadIndex","findIndex","warn","trackedUpload","failedAt","succeededAt","splice"],"mappings":"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"}