@fdm-monster/server 1.5.1 → 1.5.3

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

@@ -32,7 +32,9 @@ const exportPrintersFloorsYamlRules = {
     // 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 +44,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;IAC3C,iBAAiB;IACjBG,gBAAgB;IAChBC,iBAAiB;IACjBC,cAAc;IACd,oCAAoC;IACpCC,uCAAuC;IACvC,2CAA2C;IAC3CC,qCAAqC;IACrC,oBAAoB;IACpBC,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.cache.js

@@ -12,12 +12,11 @@ const _findpredicateutils = require("../utils/find-predicate.utils");
 const _runtimeexceptions = require("../exceptions/runtime.exceptions");
 const _serviceconstants = require("../constants/service.constants");
 class FileCache {
-    // Associative array
-    #printerFileStorage = {};
-    #totalFileCount = 0;
-    #logger;
+    printerFileStorage = {};
+    totalFileCount = 0;
+    logger;
     constructor({ loggerFactory }){
-        this.#logger = loggerFactory(FileCache.name);
+        this.logger = loggerFactory(FileCache.name);
     }
     /**
    * Save a printer storage reference to cache
@@ -29,23 +28,23 @@ class FileCache {
         this.cachePrinterFiles(printerId, fileList);
     }
     cachePrinterFiles(printerId, fileList) {
-        const printerFileStorage = this.#getPrinterFileStorage(printerId);
+        const printerFileStorage = this.getPrinterFileStorage(printerId);
         printerFileStorage.fileList = fileList;
         this.updateCacheFileRefCount();
     }
     cachePrinterStorage(printerId, storage) {
-        const printerFileStorage = this.#getPrinterFileStorage(printerId);
+        const printerFileStorage = this.getPrinterFileStorage(printerId);
         printerFileStorage.storage = storage;
         this.updateCacheFileRefCount();
     }
-    #getPrinterFileStorage(printerId) {
+    getPrinterFileStorage(printerId) {
         if (!printerId) {
             throw new Error("File Cache cant get a null/undefined printer id");
         }
-        let fileStorage = this.#printerFileStorage[printerId];
+        let fileStorage = this.printerFileStorage[printerId];
         if (!fileStorage) {
             // A runtime thing only, repository handles it differently
-            fileStorage = this.#printerFileStorage[printerId] = {
+            fileStorage = this.printerFileStorage[printerId] = {
                 fileList: (0, _serviceconstants.getFileListDefault)(),
                 storage: undefined
             };
@@ -53,21 +52,21 @@ class FileCache {
         return fileStorage;
     }
     getPrinterFiles(printerId) {
-        const fileStorage = this.#getPrinterFileStorage(printerId);
+        const fileStorage = this.getPrinterFileStorage(printerId);
         return fileStorage?.fileList;
     }
     getPrinterStorage(printerId) {
-        const fileStorage = this.#getPrinterFileStorage(printerId);
+        const fileStorage = this.getPrinterFileStorage(printerId);
         return fileStorage?.storage;
     }
     updateCacheFileRefCount() {
         let totalFiles = 0;
-        for (const storage of Object.values(this.#printerFileStorage)){
-            totalFiles += storage.fileList.files?.length || 0;
+        for (const storage of Object.values(this.printerFileStorage)){
+            totalFiles += storage.fileList?.files?.length || 0;
         }
-        if (totalFiles !== this.#totalFileCount) {
-            this.#totalFileCount = totalFiles;
-            this.#logger.log(`Cache updated. ${this.#totalFileCount} file storage references cached.`);
+        if (totalFiles !== this.totalFileCount) {
+            this.totalFileCount = totalFiles;
+            this.logger.log(`Cache updated. ${this.totalFileCount} file storage references cached.`);
         }
         return totalFiles;
     }
@@ -75,24 +74,24 @@ class FileCache {
         if (!printerId) {
             throw new _runtimeexceptions.ValidationException("Parameter printerId was not provided.");
         }
-        const fileStorage = this.#printerFileStorage[printerId];
+        const fileStorage = this.printerFileStorage[printerId];
         if (!fileStorage) {
-            this.#logger.warn("Did not remove printer File Storage as it was not found");
+            this.logger.warn("Did not remove printer File Storage as it was not found");
             return;
         }
-        delete this.#printerFileStorage[printerId];
-        this.#logger.log(`Purged printerId '${printerId}' file cache`);
+        delete this.printerFileStorage[printerId];
+        this.logger.log(`Purged printerId '${printerId}' file cache`);
     }
     purgeFile(printerId, filePath) {
-        const { fileList } = this.#getPrinterFileStorage(printerId);
+        const { fileList } = this.getPrinterFileStorage(printerId);
         const fileIndex = (0, _findpredicateutils.findFileIndex)(fileList, filePath);
         if (fileIndex === -1) {
             // We can always choose to throw - if we trust the cache consistency
-            this.#logger.warn(`A file removal was ordered but this file was not found in files cache for printer Id ${printerId}`, filePath);
-            return this.#logger.log("File was not found in cached printer fileList");
+            this.logger.warn(`A file removal was ordered but this file was not found in files cache for printer Id ${printerId}`, filePath);
+            return this.logger.log("File was not found in cached printer fileList");
         }
         fileList.files.splice(fileIndex, 1);
-        this.#logger.log(`File ${filePath} was removed`);
+        this.logger.log(`File ${filePath} was removed`);
     }
 }
 

package/dist/state/file.cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/file.cache.ts"],"names":["FileCache","printerFileStorage","totalFileCount","logger","constructor","loggerFactory","name","cachePrinterFileStorage","printerId","fileList","storage","cachePrinterStorage","cachePrinterFiles","getPrinterFileStorage","updateCacheFileRefCount","Error","fileStorage","getFileListDefault","undefined","getPrinterFiles","getPrinterStorage","totalFiles","Object","values","files","length","log","purgePrinterId","ValidationException","warn","purgeFile","filePath","fileIndex","findFileIndex","splice"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/file.cache.ts"],"names":["FileCache","printerFileStorage","totalFileCount","logger","constructor","loggerFactory","name","cachePrinterFileStorage","printerId","fileList","storage","cachePrinterStorage","cachePrinterFiles","getPrinterFileStorage","updateCacheFileRefCount","Error","fileStorage","getFileListDefault","undefined","getPrinterFiles","getPrinterStorage","totalFiles","Object","values","files","length","log","purgePrinterId","ValidationException","warn","purgeFile","filePath","fileIndex","findFileIndex","splice"],"mappings":"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"}

package/dist/state/files.store.js

@@ -62,7 +62,7 @@ class FilesStore {
         const succeededFiles = [];
         const nonRecursiveFiles = this.getOutdatedFiles(printerId, ageDaysMax);
         const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
-        const printerName = await this.printerCache.getCachedPrinterOrThrowAsync(printerId).printerName;
+        const name = await this.printerCache.getCachedPrinterOrThrowAsync(printerId).name;
         for (let file of nonRecursiveFiles){
             try {
                 await this.octoPrintApiService.deleteFileOrFolder(printerLogin, file.path);
@@ -71,7 +71,7 @@ class FilesStore {
                 failedFiles.push(file);
             }
         }
-        this.logger.log(`Deleted ${succeededFiles.length} successfully and ${failedFiles.length} with failure for printer ${printerName}.`);
+        this.logger.log(`Deleted ${succeededFiles.length} successfully and ${failedFiles.length} with failure for printer ${name}.`);
         return {
             failedFiles,
             succeededFiles

package/dist/state/files.store.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/files.store.ts"],"names":["FilesStore","printerCache","printerFilesService","fileCache","octoPrintApiService","logger","constructor","loggerFactory","name","loadFilesStore","printers","listCachedPrinters","printer","printerFileStorage","getPrinterFilesStorage","id","cachePrinterFileStorage","e","error","stack","eagerLoadPrinterFiles","printerId","recursive","loginDto","getLoginDtoAsync","response","getFiles","unwrap","simple","updatePrinterFiles","data","getPrinterFiles","getOutdatedFiles","ageDaysMax","ValidationException","printerFiles","files","length","nowTimestampSeconds","Date","now","filter","file","date","deleteOutdatedFiles","failedFiles","succeededFiles","nonRecursiveFiles","printerLogin","printerName","getCachedPrinterOrThrowAsync","deleteFileOrFolder","path","push","log","purgePrinterFiles","printerState","clearFiles","purgePrinterId","purgeFiles","allPrinters","printerFileList","updateFiles","cachePrinterFiles","appendOrSetPrinterFile","addedFile","fileList","lastPrintedFile","appendOrReplaceFile","setPrinterLastPrintedFile","fileName","setExistingFileForPrint","filePath","deleteFile","throwError","serviceActionResult","cacheActionResult","purgeFile","service","cache"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/files.store.ts"],"names":["FilesStore","printerCache","printerFilesService","fileCache","octoPrintApiService","logger","constructor","loggerFactory","name","loadFilesStore","printers","listCachedPrinters","printer","printerFileStorage","getPrinterFilesStorage","id","cachePrinterFileStorage","e","error","stack","eagerLoadPrinterFiles","printerId","recursive","loginDto","getLoginDtoAsync","response","getFiles","unwrap","simple","updatePrinterFiles","data","getPrinterFiles","getOutdatedFiles","ageDaysMax","ValidationException","printerFiles","files","length","nowTimestampSeconds","Date","now","filter","file","date","deleteOutdatedFiles","failedFiles","succeededFiles","nonRecursiveFiles","printerLogin","getCachedPrinterOrThrowAsync","deleteFileOrFolder","path","push","log","purgePrinterFiles","printerState","clearFiles","purgePrinterId","purgeFiles","allPrinters","printerFileList","updateFiles","cachePrinterFiles","appendOrSetPrinterFile","addedFile","fileList","lastPrintedFile","appendOrReplaceFile","setPrinterLastPrintedFile","fileName","setExistingFileForPrint","filePath","deleteFile","throwError","serviceActionResult","cacheActionResult","purgeFile","service","cache"],"mappings":"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"}

package/dist/state/floor.store.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/floor.store.ts"],"names":["FloorStore","KeyDiffCache","floorService","logger","constructor","loggerFactory","name","loadStore","floors","list","length","log","floor","createDefaultFloor","floorDto","toDto","setKeyValue","id","keyValues","map","key","toString","value","setKeyValuesBatch","listCache","getAllValues","create","input","delete","floorId","deleteResult","deleteKeyValue","getFloor","getValue","dbFloor","get","update","updateName","updateFloorNumber","floorLevel","updateLevel","addOrUpdatePrinter","position","removePrinter","printerId","removePrinterFromAnyFloor","deletePrinterFromAnyFloor"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/floor.store.ts"],"names":["FloorStore","KeyDiffCache","floorService","logger","constructor","loggerFactory","name","loadStore","floors","list","length","log","floor","createDefaultFloor","floorDto","toDto","setKeyValue","id","keyValues","map","key","toString","value","setKeyValuesBatch","listCache","getAllValues","create","input","delete","floorId","deleteResult","deleteKeyValue","getFloor","getValue","dbFloor","get","update","updateName","updateFloorNumber","floorLevel","updateLevel","addOrUpdatePrinter","position","removePrinter","printerId","removePrinterFromAnyFloor","deletePrinterFromAnyFloor"],"mappings":"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"}

package/dist/state/printer.cache.js

@@ -11,7 +11,6 @@ Object.defineProperty(exports, "PrinterCache", {
 const _keydiffcache = require("../utils/cache/key-diff.cache");
 const _eventconstants = require("../constants/event.constants");
 const _runtimeexceptions = require("../exceptions/runtime.exceptions");
-const _mapperutils = require("../utils/mapper.utils");
 class PrinterCache extends _keydiffcache.KeyDiffCache {
     printerService;
     eventEmitter2;
@@ -25,6 +24,7 @@ class PrinterCache extends _keydiffcache.KeyDiffCache {
         this.eventEmitter2.on(_eventconstants.printerEvents.printersDeleted, this.handlePrintersDeleted.bind(this));
     }
     async loadCache() {
+        // TODO this is missing any login required for middleware
         const printerDocs = await this.printerService.list();
         const dtos = this.mapArray(printerDocs);
         const keyValues = dtos.map((p)=>({
@@ -95,17 +95,13 @@ class PrinterCache extends _keydiffcache.KeyDiffCache {
     getId(value) {
         return value.id.toString();
     }
-    mapArray(printerDocs) {
-        return printerDocs.map((p)=>{
+    mapArray(entities) {
+        return entities.map((p)=>{
             return this.map(p);
         });
     }
-    map(printerDoc) {
-        const p = (0, _mapperutils.mapMongoDb)(printerDoc);
-        p.printerName = p.settingsAppearance.name;
-        delete p.settingsAppearance;
-        delete p.fileList;
-        return p;
+    map(entity) {
+        return this.printerService.toUnsafeDto(entity);
     }
 }
 

package/dist/state/printer.cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer.cache.ts"],"names":["PrinterCache","KeyDiffCache","printerService","eventEmitter2","constructor","on","printerEvents","batchPrinterCreated","handleBatchPrinterCreated","bind","printerCreated","handlePrinterCreatedOrUpdated","printerUpdated","printersDeleted","handlePrintersDeleted","loadCache","printerDocs","list","dtos","mapArray","keyValues","map","p","key","getId","value","setKeyValuesBatch","listCachedPrinters","includeDisabled","printers","getAllValues","filter","enabled","getCachedPrinterOrThrowAsync","id","printer","getValue","NotFoundException","getCachedPrinterOrThrow","keyValueStore","getNameAsync","name","getName","getLoginDtoAsync","printerURL","apiKey","getLoginDto","mappedPrinters","printerDto","setKeyValue","printerIds","deleteKeysBatch","toString","printerDoc","mapMongoDb","printerName","settingsAppearance","fileList"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer.cache.ts"],"names":["PrinterCache","KeyDiffCache","printerService","eventEmitter2","constructor","on","printerEvents","batchPrinterCreated","handleBatchPrinterCreated","bind","printerCreated","handlePrinterCreatedOrUpdated","printerUpdated","printersDeleted","handlePrintersDeleted","loadCache","printerDocs","list","dtos","mapArray","keyValues","map","p","key","getId","value","setKeyValuesBatch","listCachedPrinters","includeDisabled","printers","getAllValues","filter","enabled","getCachedPrinterOrThrowAsync","id","printer","getValue","NotFoundException","getCachedPrinterOrThrow","keyValueStore","getNameAsync","name","getName","getLoginDtoAsync","printerURL","apiKey","getLoginDto","mappedPrinters","printerDto","setKeyValue","printerIds","deleteKeysBatch","toString","entities","entity","toUnsafeDto"],"mappings":"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"}

package/dist/tasks/print-completion.socketio.task.js

@@ -40,18 +40,19 @@ class PrintCompletionSocketIoTask {
         if (octoPrintEvent !== "event") {
             return;
         }
+        this.socketIoGateway.send(_socketiogateway.IO_MESSAGES.CompletionEvent, JSON.stringify({
+            fdmEvent,
+            octoPrintEvent,
+            data
+        }));
         const completion = {
             status: data.type,
             fileName: data.payload?.name,
             createdAt: Date.now(),
             completionLog: data.payload?.error,
-            printerId: printerId
+            printerId,
+            context: {}
         };
-        this.socketIoGateway.send(_socketiogateway.IO_MESSAGES.CompletionEvent, JSON.stringify({
-            fdmEvent,
-            octoPrintEvent,
-            data
-        }));
         if (data.type === _octoprintwebsocketconstants.EVENT_TYPES.EStop || data.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintCancelling || data.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintCancelled || data.type === _octoprintwebsocketconstants.EVENT_TYPES.Home || data.type === _octoprintwebsocketconstants.EVENT_TYPES.TransferStarted || data.type === _octoprintwebsocketconstants.EVENT_TYPES.TransferDone || data.type === _octoprintwebsocketconstants.EVENT_TYPES.Disconnecting || data.type === _octoprintwebsocketconstants.EVENT_TYPES.Disconnected || data.type === _octoprintwebsocketconstants.EVENT_TYPES.MetadataAnalysisStarted || data.type === _octoprintwebsocketconstants.EVENT_TYPES.MetadataAnalysisFinished || data.type === _octoprintwebsocketconstants.EVENT_TYPES.Error) {
             this.contextCache[printerId] = {
                 ...this.contextCache[printerId],
@@ -63,9 +64,11 @@ class PrintCompletionSocketIoTask {
         }
         if (data.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintStarted) {
             // Clear the context now with association id
+            const token = (0, _correlationtokenutil.generateCorrelationToken)();
             this.contextCache[printerId] = {
-                correlationId: (0, _correlationtokenutil.generateCorrelationToken)()
+                correlationId: token
             };
+            completion.correlationId = token;
             completion.context = this.contextCache[printerId];
             await this.printCompletionService.create(completion);
         } else if (data.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintFailed || data.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintDone) {

package/dist/tasks/print-completion.socketio.task.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/tasks/print-completion.socketio.task.ts"],"names":["PrintCompletionSocketIoTask","eventEmitter2","socketIoGateway","logger","printCompletionService","contextCache","constructor","loggerFactory","name","that","on","octoPrintWebsocketEvent","octoPrintEvent","data","handleMessage","event","contexts","fdmEvent","printerId","replace","log","completion","status","type","fileName","payload","createdAt","Date","now","completionLog","error","send","IO_MESSAGES","CompletionEvent","JSON","stringify","EVENT_TYPES","EStop","PrintCancelling","PrintCancelled","Home","TransferStarted","TransferDone","Disconnecting","Disconnected","MetadataAnalysisStarted","MetadataAnalysisFinished","Error","corrId","correlationId","updateContext","PrintStarted","generateCorrelationToken","context","create","PrintFailed","PrintDone","emit","fdmMonsterPrinterStoppedEvent","run","loadPrintContexts"],"mappings":"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"}
+{"version":3,"sources":["../../src/tasks/print-completion.socketio.task.ts"],"names":["PrintCompletionSocketIoTask","eventEmitter2","socketIoGateway","logger","printCompletionService","contextCache","constructor","loggerFactory","name","that","on","octoPrintWebsocketEvent","octoPrintEvent","data","handleMessage","event","contexts","fdmEvent","printerId","replace","log","send","IO_MESSAGES","CompletionEvent","JSON","stringify","completion","status","type","fileName","payload","createdAt","Date","now","completionLog","error","context","EVENT_TYPES","EStop","PrintCancelling","PrintCancelled","Home","TransferStarted","TransferDone","Disconnecting","Disconnected","MetadataAnalysisStarted","MetadataAnalysisFinished","Error","corrId","correlationId","updateContext","PrintStarted","token","generateCorrelationToken","create","PrintFailed","PrintDone","emit","fdmMonsterPrinterStoppedEvent","run","loadPrintContexts"],"mappings":"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"}

package/dist/tasks/printer-file-clean.task.js

@@ -42,7 +42,7 @@ class PrinterFileCleanTask {
                 const outdatedFiles = this.getPrinterOutdatedFiles(printer);
                 if (!outdatedFiles?.length) continue;
                 // Report
-                this.logger.log(`Found ${outdatedFiles?.length} old files of ${printer.printerName}`);
+                this.logger.log(`Found ${outdatedFiles?.length} old files of ${printer.name}`);
                 if (autoCleanAtBootEnabled) {
                     await this.cleanPrinterFiles(printer.id);
                 }

package/dist/tasks/printer-file-clean.task.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/tasks/printer-file-clean.task.ts"],"names":["PrinterFileCleanTask","logger","filesStore","printerCache","settingsStore","taskManagerService","octoPrintApiService","constructor","loggerFactory","name","ageDaysMaxSetting","getSettings","autoRemoveOldFilesCriteriumDays","run","printers","listCachedPrinters","fileCleanSettings","autoCleanAtBootEnabled","autoRemoveOldFilesAtBoot","log","length","printer","outdatedFiles","getPrinterOutdatedFiles","printerName","cleanPrinterFiles","id","printerId","deleteOutdatedFiles","eagerLoadPrinterFiles","ageDaysMax","getOutdatedFiles","getFileCleanSettings"],"mappings":";;;;+BAYaA;;;eAAAA;;;AAAN,MAAMA;IACXC,OAAsB;IACtBC,WAAuB;IACvBC,aAA2B;IAC3BC,cAA6B;IAC7BC,mBAAuC;IACvCC,oBAAyC;IAEzCC,YAAY,EACVJ,YAAY,EACZD,UAAU,EACVI,mBAAmB,EACnBD,kBAAkB,EAClBD,aAAa,EACbI,aAAa,EAQd,CAAE;QACD,IAAI,CAACL,YAAY,GAAGA;QACpB,IAAI,CAACD,UAAU,GAAGA;QAClB,IAAI,CAACG,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACF,aAAa,GAAGA;QACrB,IAAI,CAACH,MAAM,GAAGO,cAAcR,qBAAqBS,IAAI;IACvD;IAEA,IAAI,CAACC,iBAAiB;QACpB,OAAO,IAAI,CAAC,CAACC,WAAW,GAAGC,+BAA+B;IAC5D;IAEA,MAAMC,MAAM;QACV,oCAAoC;QACpC,MAAMC,WAAW,MAAM,IAAI,CAACX,YAAY,CAACY,kBAAkB,CAAC;QAC5D,MAAMC,oBAAoB,IAAI,CAAC,CAACL,WAAW;QAC3C,MAAMM,yBAAyBD,kBAAkBE,wBAAwB;QAEzE,IAAI;YACF,IAAID,wBAAwB;gBAC1B,IAAI,CAAChB,MAAM,CAACkB,GAAG,CAAC,CAAC,kBAAkB,EAAEL,SAASM,MAAM,CAAC,6DAA6D,CAAC;YACrH,OAAO;gBACL,IAAI,CAACnB,MAAM,CAACkB,GAAG,CAAC,CAAC,6BAA6B,EAAEL,SAASM,MAAM,CAAC,UAAU,CAAC;YAC7E;YAEA,qEAAqE;YACrE,KAAK,IAAIC,WAAWP,SAAU;gBAC5B,MAAMQ,gBAAgB,IAAI,CAACC,uBAAuB,CAACF;gBACnD,IAAI,CAACC,eAAeF,QAAQ;gBAE5B,SAAS;gBACT,IAAI,CAACnB,MAAM,CAACkB,GAAG,CAAC,CAAC,MAAM,EAAEG,eAAeF,OAAO,cAAc,EAAEC,QAAQG,WAAW,CAAC,CAAC;gBAEpF,IAAIP,wBAAwB;oBAC1B,MAAM,IAAI,CAACQ,iBAAiB,CAACJ,QAAQK,EAAE;gBACzC;YACF;QACF,SAAU;YACR,IAAI,CAACzB,MAAM,CAACkB,GAAG,CAAC,CAAC,mCAAmC,CAAC;QACvD;IACF;IAEA,MAAMM,kBAAkBE,SAAS,EAAE;QACjC,MAAM;QACN,MAAM,IAAI,CAACzB,UAAU,CAAC0B,mBAAmB,CAACD,WAAW,IAAI,CAAC,CAACjB,iBAAiB;QAE5E,uBAAuB;QACvB,MAAM,IAAI,CAACR,UAAU,CAAC2B,qBAAqB,CAACF,WAAW;IACzD;IAEA;;;GAGC,GACDJ,wBAAwBF,OAAO,EAAE;QAC/B,MAAMS,aAAa,IAAI,CAAC,CAACpB,iBAAiB;QAC1C,OAAO,IAAI,CAACR,UAAU,CAAC6B,gBAAgB,CAACV,QAAQK,EAAE,EAAEI;IACtD;IAEA,CAACnB,WAAW;QACV,OAAO,IAAI,CAACP,aAAa,CAAC4B,oBAAoB;IAChD;AACF"}
+{"version":3,"sources":["../../src/tasks/printer-file-clean.task.ts"],"names":["PrinterFileCleanTask","logger","filesStore","printerCache","settingsStore","taskManagerService","octoPrintApiService","constructor","loggerFactory","name","ageDaysMaxSetting","getSettings","autoRemoveOldFilesCriteriumDays","run","printers","listCachedPrinters","fileCleanSettings","autoCleanAtBootEnabled","autoRemoveOldFilesAtBoot","log","length","printer","outdatedFiles","getPrinterOutdatedFiles","cleanPrinterFiles","id","printerId","deleteOutdatedFiles","eagerLoadPrinterFiles","ageDaysMax","getOutdatedFiles","getFileCleanSettings"],"mappings":";;;;+BAYaA;;;eAAAA;;;AAAN,MAAMA;IACXC,OAAsB;IACtBC,WAAuB;IACvBC,aAA2B;IAC3BC,cAA6B;IAC7BC,mBAAuC;IACvCC,oBAAyC;IAEzCC,YAAY,EACVJ,YAAY,EACZD,UAAU,EACVI,mBAAmB,EACnBD,kBAAkB,EAClBD,aAAa,EACbI,aAAa,EAQd,CAAE;QACD,IAAI,CAACL,YAAY,GAAGA;QACpB,IAAI,CAACD,UAAU,GAAGA;QAClB,IAAI,CAACG,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACF,aAAa,GAAGA;QACrB,IAAI,CAACH,MAAM,GAAGO,cAAcR,qBAAqBS,IAAI;IACvD;IAEA,IAAI,CAACC,iBAAiB;QACpB,OAAO,IAAI,CAAC,CAACC,WAAW,GAAGC,+BAA+B;IAC5D;IAEA,MAAMC,MAAM;QACV,oCAAoC;QACpC,MAAMC,WAAW,MAAM,IAAI,CAACX,YAAY,CAACY,kBAAkB,CAAC;QAC5D,MAAMC,oBAAoB,IAAI,CAAC,CAACL,WAAW;QAC3C,MAAMM,yBAAyBD,kBAAkBE,wBAAwB;QAEzE,IAAI;YACF,IAAID,wBAAwB;gBAC1B,IAAI,CAAChB,MAAM,CAACkB,GAAG,CAAC,CAAC,kBAAkB,EAAEL,SAASM,MAAM,CAAC,6DAA6D,CAAC;YACrH,OAAO;gBACL,IAAI,CAACnB,MAAM,CAACkB,GAAG,CAAC,CAAC,6BAA6B,EAAEL,SAASM,MAAM,CAAC,UAAU,CAAC;YAC7E;YAEA,qEAAqE;YACrE,KAAK,IAAIC,WAAWP,SAAU;gBAC5B,MAAMQ,gBAAgB,IAAI,CAACC,uBAAuB,CAACF;gBACnD,IAAI,CAACC,eAAeF,QAAQ;gBAE5B,SAAS;gBACT,IAAI,CAACnB,MAAM,CAACkB,GAAG,CAAC,CAAC,MAAM,EAAEG,eAAeF,OAAO,cAAc,EAAEC,QAAQZ,IAAI,CAAC,CAAC;gBAE7E,IAAIQ,wBAAwB;oBAC1B,MAAM,IAAI,CAACO,iBAAiB,CAACH,QAAQI,EAAE;gBACzC;YACF;QACF,SAAU;YACR,IAAI,CAACxB,MAAM,CAACkB,GAAG,CAAC,CAAC,mCAAmC,CAAC;QACvD;IACF;IAEA,MAAMK,kBAAkBE,SAAS,EAAE;QACjC,MAAM;QACN,MAAM,IAAI,CAACxB,UAAU,CAACyB,mBAAmB,CAACD,WAAW,IAAI,CAAC,CAAChB,iBAAiB;QAE5E,uBAAuB;QACvB,MAAM,IAAI,CAACR,UAAU,CAAC0B,qBAAqB,CAACF,WAAW;IACzD;IAEA;;;GAGC,GACDH,wBAAwBF,OAAO,EAAE;QAC/B,MAAMQ,aAAa,IAAI,CAAC,CAACnB,iBAAiB;QAC1C,OAAO,IAAI,CAACR,UAAU,CAAC4B,gBAAgB,CAACT,QAAQI,EAAE,EAAEI;IACtD;IAEA,CAAClB,WAAW;QACV,OAAO,IAAI,CAACP,aAAa,CAAC2B,oBAAoB;IAChD;AACF"}

package/dist/utils/url.utils.js

@@ -24,6 +24,7 @@ function httpToWsUrl(url, protocol = "ws") {
     return wsUrl;
 }
 function normalizeURLWithProtocol(printerURL) {
+    if (!printerURL) return;
     if (!printerURL.startsWith("http://") && !printerURL.startsWith("https://")) {
         printerURL = `http://${printerURL}`;
     }

package/dist/utils/url.utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/url.utils.ts"],"names":["httpToWsUrl","normalizeURLWithProtocol","url","protocol","wsUrl","URL","normalizeUrl","pathname","printerURL","startsWith"],"mappings":";;;;;;;;;;;IAEgBA,WAAW;eAAXA;;IAOAC,wBAAwB;eAAxBA;;;8BATa;AAEtB,SAASD,YAAYE,GAAW,EAAEC,WAAW,IAAI;IACtD,MAAMC,QAAQ,IAAIC,IAAI,qBAAqBC,IAAAA,0BAAY,EAACJ;IACxDE,MAAMD,QAAQ,GAAG,CAAC,EAAEA,SAAS,CAAC;IAC9BC,MAAMG,QAAQ,GAAG;IACjB,OAAOH;AACT;AAEO,SAASH,yBAAyBO,UAAkB;IACzD,IAAI,CAACA,WAAWC,UAAU,CAAC,cAAc,CAACD,WAAWC,UAAU,CAAC,aAAa;QAC3ED,aAAa,CAAC,OAAO,EAAEA,WAAW,CAAC;IACrC;IAEA,OAAOF,IAAAA,0BAAY,EAACE;AACtB"}
+{"version":3,"sources":["../../src/utils/url.utils.ts"],"names":["httpToWsUrl","normalizeURLWithProtocol","url","protocol","wsUrl","URL","normalizeUrl","pathname","printerURL","startsWith"],"mappings":";;;;;;;;;;;IAEgBA,WAAW;eAAXA;;IAOAC,wBAAwB;eAAxBA;;;8BATa;AAEtB,SAASD,YAAYE,GAAW,EAAEC,WAAW,IAAI;IACtD,MAAMC,QAAQ,IAAIC,IAAI,qBAAqBC,IAAAA,0BAAY,EAACJ;IACxDE,MAAMD,QAAQ,GAAG,CAAC,EAAEA,SAAS,CAAC;IAC9BC,MAAMG,QAAQ,GAAG;IACjB,OAAOH;AACT;AAEO,SAASH,yBAAyBO,UAAkB;IACzD,IAAI,CAACA,YAAY;IAEjB,IAAI,CAACA,WAAWC,UAAU,CAAC,cAAc,CAACD,WAAWC,UAAU,CAAC,aAAa;QAC3ED,aAAa,CAAC,OAAO,EAAEA,WAAW,CAAC;IACrC;IAEA,OAAOF,IAAAA,0BAAY,EAACE;AACtB"}

package/package.json

@@ -7,7 +7,7 @@
   "author": "David Zwart",
   "license": "AGPL-3.0-or-later",
   "private": false,
-  "version": "1.5.1",
+  "version": "1.5.3",
   "description": "FDM Monster is a bulk OctoPrint manager to set up, configure and monitor 3D printers. Our aim is to provide extremely optimized websocket performance and reliability.",
   "main": "dist/index.js",
   "scripts": {
@@ -17,7 +17,7 @@
     "build:watch": "swc src -w -d dist",
     "start:dev": "ts-node src/index.ts",
     "start": "cross-env NODE_ENV=production node dist/index.js",
-    "migration:create": "migrate-mongo create printer-remove-sortindex",
+    "migration:create": "migrate-mongo create printer-remove-settingsappearance",
     "migration:up": "migrate-mongo up",
     "migration:down": "migrate-mongo down",
     "migration:status": "migrate-mongo status",
@@ -39,13 +39,13 @@
     "vue"
   ],
   "dependencies": {
-    "@fdm-monster/client": "1.4.1",
+    "@fdm-monster/client": "1.4.2",
     "@influxdata/influxdb-client": "1.33.2",
-    "@sentry/node": "7.77.0",
+    "@sentry/node": "7.80.0",
     "adm-zip": "0.5.10",
     "awilix": "9.0.0",
     "awilix-express": "8.0.0",
-    "axios": "1.6.0",
+    "axios": "1.6.1",
     "bcryptjs": "2.4.3",
     "cache-manager": "4.1.0",
     "class-validator": "0.14.0",
@@ -58,15 +58,15 @@
     "express": "4.18.2",
     "form-data": "4.0.0",
     "got": "11.8.6",
-    "helmet": "7.0.0",
+    "helmet": "7.1.0",
     "ip": "1.1.8",
     "js-yaml": "4.1.0",
     "jsonwebtoken": "9.0.2",
     "lodash": "4.17.21",
     "luxon": "3.4.3",
     "migrate-mongo": "11.0.0",
-    "mongoose": "6.12.2",
-    "mqtt": "5.1.4",
+    "mongoose": "6.12.3",
+    "mqtt": "5.2.1",
     "multer": "1.4.5-lts.1",
     "node-input-validator": "4.5.1",
     "nodemon": "3.0.1",
@@ -87,28 +87,28 @@
     "@lcov-viewer/cli": "1.3.0",
     "@lcov-viewer/istanbul-report": "1.4.0",
     "@swc/cli": "0.1.62",
-    "@swc/core": "1.3.95",
+    "@swc/core": "1.3.96",
     "@swc/jest": "0.2.29",
-    "@types/adm-zip": "0.5.3",
-    "@types/bcryptjs": "2.4.5",
-    "@types/cache-manager": "4.0.4",
-    "@types/connect-history-api-fallback": "1.5.2",
-    "@types/cookie-parser": "1.4.5",
-    "@types/express": "4.17.20",
-    "@types/express-session": "1.17.9",
-    "@types/ip": "1.1.2",
-    "@types/jest": "29.5.7",
-    "@types/js-yaml": "4.0.8",
-    "@types/lodash": "4.14.200",
-    "@types/luxon": "3.3.3",
-    "@types/migrate-mongo": "10.0.3",
-    "@types/multer": "1.4.9",
-    "@types/node": "20.8.10",
-    "@types/passport-anonymous": "1.0.4",
-    "@types/passport-jwt": "3.0.12",
-    "@types/semver": "7.5.4",
-    "@types/supertest": "2.0.15",
-    "@types/uuid": "9.0.6",
+    "@types/adm-zip": "0.5.4",
+    "@types/bcryptjs": "2.4.6",
+    "@types/cache-manager": "4.0.5",
+    "@types/connect-history-api-fallback": "1.5.3",
+    "@types/cookie-parser": "1.4.6",
+    "@types/express": "4.17.21",
+    "@types/express-session": "1.17.10",
+    "@types/ip": "1.1.3",
+    "@types/jest": "29.5.8",
+    "@types/js-yaml": "4.0.9",
+    "@types/lodash": "4.14.201",
+    "@types/luxon": "3.3.4",
+    "@types/migrate-mongo": "10.0.4",
+    "@types/multer": "1.4.10",
+    "@types/node": "20.9.0",
+    "@types/passport-anonymous": "1.0.5",
+    "@types/passport-jwt": "3.0.13",
+    "@types/semver": "7.5.5",
+    "@types/supertest": "2.0.16",
+    "@types/uuid": "9.0.7",
     "chokidar": "3.5.3",
     "concurrently": "8.2.2",
     "eslint": "8.53.0",

package/dist/utils/mapper.utils.js

@@ -1,33 +0,0 @@
-"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, {
-    mapMongoDb: function() {
-        return mapMongoDb;
-    },
-    mapMongoDbArray: function() {
-        return mapMongoDbArray;
-    }
-});
-function mapMongoDbArray(docs) {
-    if (!docs?.length) return [];
-    return docs.map(mapMongoDb);
-}
-function mapMongoDb(doc) {
-    if (!doc) return;
-    const data = doc.toJSON();
-    const id = data._id?.toString();
-    delete data._id;
-    delete data.__v;
-    data.id = id;
-    return data;
-}
-
-//# sourceMappingURL=mapper.utils.js.map

package/dist/utils/mapper.utils.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/utils/mapper.utils.ts"],"names":["mapMongoDb","mapMongoDbArray","docs","length","map","doc","data","toJSON","id","_id","toString","__v"],"mappings":";;;;;;;;;;;IAUgBA,UAAU;eAAVA;;IAVAC,eAAe;eAAfA;;;AAAT,SAASA,gBAAgBC,IAAI;IAClC,IAAI,CAACA,MAAMC,QAAQ,OAAO,EAAE;IAE5B,OAAOD,KAAKE,GAAG,CAACJ;AAClB;AAMO,SAASA,WAAWK,GAAQ;IACjC,IAAI,CAACA,KAAK;IAEV,MAAMC,OAAOD,IAAIE,MAAM;IACvB,MAAMC,KAAKF,KAAKG,GAAG,EAAEC;IACrB,OAAOJ,KAAKG,GAAG;IACf,OAAOH,KAAKK,GAAG;IACfL,KAAKE,EAAE,GAAGA;IACV,OAAOF;AACT"}