@fdm-monster/server 1.5.3 → 1.5.4

package/dist/services/printer.service.js

@@ -55,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();
@@ -72,12 +67,7 @@ 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, name } = await (0, _validators.validateInput)(updateData, _printerservicevalidation.createMongoPrinterRules);
@@ -125,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","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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"}
+{"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

@@ -40,13 +40,13 @@ const printerInFloorRules = (isSqlite)=>({
         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",
@@ -54,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","isSqlite","printerId","idRuleV2","floorId","x","y","name","minPrinterFloorNameLength","floor","printers"],"mappings":";;;;;;;;;;;IA+BaA,gBAAgB;eAAhBA;;IAxBAC,mBAAmB;eAAnBA;;IAJAC,yBAAyB;eAAzBA;;IAWAC,oBAAoB;eAApBA;;IAIAC,sBAAsB;eAAtBA;;IAIAC,gBAAgB;eAAhBA;;;kCAtB6B;mCACjB;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,2CAAyB,CAAC,CAAC;AACzD;AAEO,MAAMT,yBAAyB;IACpCU,OAAO;AACT;AAEO,MAAMT,mBAAmB;IAC9BO,MAAM,CAAC,mBAAmB,EAAEC,2CAAyB,CAAC,CAAC;IACvDC,OAAO;IACPC,UAAU;IACV,uBAAuB;IACvB,eAAe;IACf,eAAe;AACjB;AAEO,MAAMf,mBAAmB;IAC9BY,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/yaml-service.validation.js

@@ -21,15 +21,12 @@ _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, isTypeormMode)=>{

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","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"}
+{"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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"}

package/dist/state/file.cache.js

@@ -18,12 +18,7 @@ class FileCache {
     constructor({ loggerFactory }){
         this.logger = loggerFactory(FileCache.name);
     }
-    /**
-   * Save a printer storage reference to cache
-   * @param printerId
-   * @param fileList
-   * @param storage
-   */ cachePrinterFileStorage(printerId, { fileList, storage }) {
+    cachePrinterFileStorage(printerId, { fileList, storage }) {
         this.cachePrinterStorage(printerId, storage);
         this.cachePrinterFiles(printerId, fileList);
     }
@@ -43,7 +38,6 @@ class FileCache {
         }
         let fileStorage = this.printerFileStorage[printerId];
         if (!fileStorage) {
-            // A runtime thing only, repository handles it differently
             fileStorage = this.printerFileStorage[printerId] = {
                 fileList: (0, _serviceconstants.getFileListDefault)(),
                 storage: undefined
@@ -86,7 +80,6 @@ class FileCache {
         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");
         }

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":";;;;+BAUaA;;;eAAAA;;;oCAViB;mCACM;kCACD;AAQ5B,MAAMA;IACHC,qBAAqB,CAAC,EAAE;IACxBC,iBAAiB,EAAE;IAEnBC,OAAsB;IAE9BC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACF,MAAM,GAAGE,cAAcL,UAAUM,IAAI;IAC5C;IAEA;;;;;GAKC,GACDC,wBAAwBC,SAAiB,EAAE,EAAEC,QAAQ,EAAEC,OAAO,EAAE,EAAE;QAChE,IAAI,CAACC,mBAAmB,CAACH,WAAWE;QAEpC,IAAI,CAACE,iBAAiB,CAACJ,WAAWC;IACpC;IAEAG,kBAAkBJ,SAAiB,EAAEC,QAAQ,EAAE;QAC7C,MAAMR,qBAAqB,IAAI,CAACY,qBAAqB,CAACL;QAEtDP,mBAAmBQ,QAAQ,GAAGA;QAE9B,IAAI,CAACK,uBAAuB;IAC9B;IAEAH,oBAAoBH,SAAiB,EAAEE,OAAO,EAAE;QAC9C,MAAMT,qBAAqB,IAAI,CAACY,qBAAqB,CAACL;QAEtDP,mBAAmBS,OAAO,GAAGA;QAE7B,IAAI,CAACI,uBAAuB;IAC9B;IAEQD,sBAAsBL,SAAiB,EAAE;QAC/C,IAAI,CAACA,WAAW;YACd,MAAM,IAAIO,MAAM;QAClB;QAEA,IAAIC,cAAc,IAAI,CAACf,kBAAkB,CAACO,UAAU;QAEpD,IAAI,CAACQ,aAAa;YAChB,0DAA0D;YAC1DA,cAAc,IAAI,CAACf,kBAAkB,CAACO,UAAU,GAAG;gBACjDC,UAAUQ,IAAAA,oCAAkB;gBAC5BP,SAASQ;YACX;QACF;QAEA,OAAOF;IACT;IAEAG,gBAAgBX,SAAiB,EAAE;QACjC,MAAMQ,cAAc,IAAI,CAACH,qBAAqB,CAACL;QAC/C,OAAOQ,aAAaP;IACtB;IAEAW,kBAAkBZ,SAAiB,EAAE;QACnC,MAAMQ,cAAc,IAAI,CAACH,qBAAqB,CAACL;QAC/C,OAAOQ,aAAaN;IACtB;IAEAI,0BAA0B;QACxB,IAAIO,aAAa;QACjB,KAAK,MAAMX,WAAWY,OAAOC,MAAM,CAAC,IAAI,CAACtB,kBAAkB,EAAG;YAC5DoB,cAAcX,QAAQD,QAAQ,EAAEe,OAAOC,UAAU;QACnD;QAEA,IAAIJ,eAAe,IAAI,CAACnB,cAAc,EAAE;YACtC,IAAI,CAACA,cAAc,GAAGmB;YACtB,IAAI,CAAClB,MAAM,CAACuB,GAAG,CAAC,CAAC,eAAe,EAAE,IAAI,CAACxB,cAAc,CAAC,gCAAgC,CAAC;QACzF;QAEA,OAAOmB;IACT;IAEAM,eAAenB,SAAiB,EAAE;QAChC,IAAI,CAACA,WAAW;YACd,MAAM,IAAIoB,sCAAmB,CAAC;QAChC;QAEA,MAAMZ,cAAc,IAAI,CAACf,kBAAkB,CAACO,UAAU;QAEtD,IAAI,CAACQ,aAAa;YAChB,IAAI,CAACb,MAAM,CAAC0B,IAAI,CAAC;YACjB;QACF;QAEA,OAAO,IAAI,CAAC5B,kBAAkB,CAACO,UAAU;QAEzC,IAAI,CAACL,MAAM,CAACuB,GAAG,CAAC,CAAC,kBAAkB,EAAElB,UAAU,YAAY,CAAC;IAC9D;IAEAsB,UAAUtB,SAAiB,EAAEuB,QAAgB,EAAE;QAC7C,MAAM,EAAEtB,QAAQ,EAAE,GAAG,IAAI,CAACI,qBAAqB,CAACL;QAEhD,MAAMwB,YAAYC,IAAAA,iCAAa,EAACxB,UAAUsB;QAC1C,IAAIC,cAAc,CAAC,GAAG;YACpB,oEAAoE;YACpE,IAAI,CAAC7B,MAAM,CAAC0B,IAAI,CACd,CAAC,qFAAqF,EAAErB,UAAU,CAAC,EACnGuB;YAGF,OAAO,IAAI,CAAC5B,MAAM,CAACuB,GAAG,CAAC;QACzB;QAEAjB,SAASe,KAAK,CAACU,MAAM,CAACF,WAAW;QACjC,IAAI,CAAC7B,MAAM,CAACuB,GAAG,CAAC,CAAC,KAAK,EAAEK,SAAS,YAAY,CAAC;IAChD;AACF"}
+{"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/floor.store.js

@@ -91,7 +91,6 @@ class FloorStore extends _keydiffcache.KeyDiffCache {
     }
     async removePrinterFromAnyFloor(printerId) {
         await this.floorService.deletePrinterFromAnyFloor(printerId);
-        // Bit harsh, but we need to reload the entire store
         await this.loadStore();
     }
 }

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-events.cache.js

@@ -65,9 +65,7 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
         this.eventEmitter2.on("octoprint.*", (e)=>this.onPrinterSocketMessage(e));
         this.eventEmitter2.on(_eventconstants.printerEvents.printersDeleted, this.handlePrintersDeleted.bind(this));
     }
-    /**
-   * @param {OctoPrintEventDto} e
-   */ async onPrinterSocketMessage(e) {
+    async onPrinterSocketMessage(e) {
         const printerId = e.printerId;
         if (e.event !== "plugin" && e.event !== "event") {
             await this.setEvent(printerId, e.event, null, e.event === "history" ? this.pruneHistoryPayload(e.payload) : e.payload);

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer-events.cache.ts"],"names":["PrinterEventsCache","KeyDiffCache","logger","eventEmitter2","settingsStore","constructor","loggerFactory","name","subscribeToEvents","_debugMode","getServerSettings","debugSettings","debugSocketMessages","getPrinterSocketEvents","id","keyValueStore","getOrCreateEvents","printerId","ref","getValue","current","history","timelapse","event","plugin","setKeyValue","setEvent","label","eventName","payload","receivedAt","Date","now","setSubEvent","handlePrintersDeleted","printerIds","deleteKeysBatch","on","e","onPrinterSocketMessage","printerEvents","printersDeleted","bind","pruneHistoryPayload","log","formatKB","eventType","type","logs","temps","messages"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer-events.cache.ts"],"names":["PrinterEventsCache","KeyDiffCache","logger","eventEmitter2","settingsStore","constructor","loggerFactory","name","subscribeToEvents","_debugMode","getServerSettings","debugSettings","debugSocketMessages","getPrinterSocketEvents","id","keyValueStore","getOrCreateEvents","printerId","ref","getValue","current","history","timelapse","event","plugin","setKeyValue","setEvent","label","eventName","payload","receivedAt","Date","now","setSubEvent","handlePrintersDeleted","printerIds","deleteKeysBatch","on","e","onPrinterSocketMessage","printerEvents","printersDeleted","bind","pruneHistoryPayload","log","formatKB","eventType","type","logs","temps","messages"],"mappings":"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"}

package/dist/state/{files.store.js → printer-files.store.js}

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "FilesStore", {
+Object.defineProperty(exports, "PrinterFilesStore", {
     enumerable: true,
     get: function() {
-        return FilesStore;
+        return PrinterFilesStore;
     }
 });
 const _runtimeexceptions = require("../exceptions/runtime.exceptions");
-class FilesStore {
+class PrinterFilesStore {
     printerCache;
     printerFilesService;
     fileCache;
@@ -20,11 +20,9 @@ class FilesStore {
         this.printerFilesService = printerFilesService;
         this.fileCache = fileCache;
         this.octoPrintApiService = octoPrintApiService;
-        this.logger = loggerFactory(FilesStore.name);
+        this.logger = loggerFactory(PrinterFilesStore.name);
     }
-    /**
-   * Load the file store by grabbing files from the service. TODO move files out of printer
-   */ async loadFilesStore() {
+    async loadFilesStore() {
         const printers = await this.printerCache.listCachedPrinters(true);
         for (let printer of printers){
             try {
@@ -35,9 +33,7 @@ class FilesStore {
             }
         }
     }
-    /**
-   * Performs an OctoPrint call and updates both cache and database
-   */ async eagerLoadPrinterFiles(printerId, recursive) {
+    async eagerLoadPrinterFiles(printerId, recursive) {
         const loginDto = await this.printerCache.getLoginDtoAsync(printerId);
         const response = await this.octoPrintApiService.getFiles(loginDto, recursive, {
             unwrap: false,
@@ -47,7 +43,6 @@ class FilesStore {
         return response;
     }
     getFiles(printerId) {
-        // Might introduce a filter like folder later
         return this.fileCache.getPrinterFiles(printerId);
     }
     getOutdatedFiles(printerId, ageDaysMax) {
@@ -62,7 +57,7 @@ class FilesStore {
         const succeededFiles = [];
         const nonRecursiveFiles = this.getOutdatedFiles(printerId, ageDaysMax);
         const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
-        const name = await this.printerCache.getCachedPrinterOrThrowAsync(printerId).name;
+        const name = (await this.printerCache.getCachedPrinterOrThrowAsync(printerId)).name;
         for (let file of nonRecursiveFiles){
             try {
                 await this.octoPrintApiService.deleteFileOrFolder(printerLogin, file.path);
@@ -99,34 +94,25 @@ class FilesStore {
     }
     async updatePrinterFiles(printerId, files) {
         const printer = await this.printerCache.getCachedPrinterOrThrowAsync(printerId);
-        // Check printer in database and modify
         const printerFileList = await this.printerFilesService.updateFiles(printer.id, files);
-        // Update cache with data from storage
         await this.fileCache.cachePrinterFiles(printer.id, printerFileList);
     }
     async appendOrSetPrinterFile(printerId, addedFile) {
         const printer = await this.printerCache.getCachedPrinterOrThrowAsync(printerId);
-        // Check printer in database and modify
         const { fileList, lastPrintedFile } = await this.printerFilesService.appendOrReplaceFile(printer.id, addedFile);
-        // Update cache with data from storage
         await this.fileCache.cachePrinterFiles(printer.id, fileList);
-        // Update printer state with lastPrintedFile
         await this.printerFilesService.setPrinterLastPrintedFile(printer.id, lastPrintedFile.fileName);
     }
     async setExistingFileForPrint(printerId, filePath) {
         await this.printerFilesService.setPrinterLastPrintedFile(printerId, filePath);
     }
-    /**
-   * Remove file reference from database and then cache.
-   */ async deleteFile(printerId, filePath, throwError) {
+    async deleteFile(printerId, filePath, throwError) {
         const serviceActionResult = await this.printerFilesService.deleteFile(printerId, filePath, throwError);
-        // Warning only
-        const cacheActionResult = this.fileCache.purgeFile(printerId, filePath);
+        this.fileCache.purgeFile(printerId, filePath);
         return {
-            service: serviceActionResult,
-            cache: cacheActionResult
+            service: serviceActionResult
         };
     }
 }
 
-//# sourceMappingURL=files.store.js.map
+//# sourceMappingURL=printer-files.store.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/state/printer-files.store.ts"],"names":["PrinterFilesStore","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","purgeFile","service"],"mappings":"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"}

package/dist/state/printer-socket.store.js

@@ -41,16 +41,11 @@ class PrinterSocketStore {
         });
         return socketStatesById;
     }
-    /**
-   * Load all printers into cache, and create a new socket for each printer (if enabled)
-   * @param {OctoPrintEventDto} e
-   */ async loadPrinterSockets() {
+    async loadPrinterSockets() {
         await this.printerCache.loadCache();
         const printerDocs = await this.printerCache.listCachedPrinters(false);
         this.printerSocketAdaptersById = {};
-        /**
-     * @type {Printer}
-     */ for (const doc of printerDocs){
+        for (const doc of printerDocs){
             try {
                 await this.handlePrinterCreated({
                     printer: doc
@@ -64,20 +59,15 @@ class PrinterSocketStore {
     listPrinterSockets() {
         return Object.values(this.printerSocketAdaptersById);
     }
-    /**
-   * Reconnect the OctoPrint Websocket connection
-   */ reconnectOctoPrint(id) {
+    reconnectOctoPrint(id) {
         const socket = this.getPrinterSocket(id);
         socket.close();
-        // The reconnect task will pick up this state and reconnect
         socket.resetSocketState();
     }
     getPrinterSocket(id) {
         return this.printerSocketAdaptersById[id];
     }
-    /**
-   * Sets up the new WebSocket connections for all printers
-   */ async reconnectPrinterSockets() {
+    async reconnectPrinterSockets() {
         let reauthRequested = 0;
         let socketSetupRequested = 0;
         const socketStates = {};
@@ -147,34 +137,21 @@ class PrinterSocketStore {
             });
         }
     }
-    /**
-   * @private
-   * @param { printer: Printer } printer
-   * @returns void
-   */ handlePrinterCreated({ printer }) {
+    handlePrinterCreated({ printer }) {
         this.createOrUpdateSocket(printer);
     }
-    /**
-   * @private
-   * @param { printer: Printer } printer
-   * @returns void
-   */ handlePrinterUpdated({ printer }) {
+    handlePrinterUpdated({ printer }) {
         this.logger.log(`Printer '${printer.id}' updated. Updating socket.`);
         this.createOrUpdateSocket(printer);
     }
-    /**
-   * @param { printer: Printer } printer
-   * @returns void
-   */ createOrUpdateSocket(printer) {
+    createOrUpdateSocket(printer) {
         const { enabled, id } = printer;
         let foundAdapter = this.printerSocketAdaptersById[id.toString()];
-        // Delete the socket if the printer is disabled
         if (!enabled) {
             this.logger.log(`Printer '${id}' is disabled. Deleting socket.`);
             this.deleteSocket(id);
             return;
         }
-        // Create a new socket if it doesn't exist
         if (!foundAdapter) {
             foundAdapter = this.socketFactory.createInstance();
             this.printerSocketAdaptersById[id] = foundAdapter;
@@ -182,7 +159,6 @@ class PrinterSocketStore {
             foundAdapter.close();
             this.logger.log(`Closing printer '${id}' socket for update.`);
         }
-        // Reset the socket credentials before (re-)connecting
         foundAdapter.registerCredentials({
             printerId: printer.id.toString(),
             loginDto: {
@@ -209,7 +185,6 @@ class PrinterSocketStore {
         if (!!socket) {
             socket.close();
         }
-        // TODO mark diff cache
         delete this.printerSocketAdaptersById[printerId];
     }
 }

package/dist/state/printer-socket.store.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer-socket.store.ts"],"names":["PrinterSocketStore","socketIoGateway","socketFactory","eventEmitter2","printerCache","printerSocketAdaptersById","logger","configService","settingsStore","constructor","loggerFactory","name","subscribeToEvents","getSocketStatesById","socketStatesById","Object","values","forEach","s","printerId","socket","socketState","api","apiState","loadPrinterSockets","loadCache","printerDocs","listCachedPrinters","doc","handlePrinterCreated","printer","e","error","errorSummary","log","keys","length","listPrinterSockets","reconnectOctoPrint","id","getPrinterSocket","close","resetSocketState","reconnectPrinterSockets","reauthRequested","socketSetupRequested","socketStates","apiStates","promisesReauth","failedSocketsReauth","needsReauth","promise","reauthSession","catch","_","push","getServerSettings","debugSettings","debugSocketSetup","captureException","Promise","all","promisesOpenSocket","failedSocketReopened","needsSetup","needsReopen","setupSocketSession","then","open","keySocket","valSocket","keyApi","valApi","reauth","socketSetup","handleBatchPrinterCreated","printers","p","createOrUpdateSocket","handlePrinterUpdated","enabled","foundAdapter","toString","deleteSocket","createInstance","registerCredentials","loginDto","apiKey","printerURL","protocol","handlePrintersDeleted","printerIds","on","printerEvents","printerCreated","bind","printersDeleted","printerUpdated","batchPrinterCreated"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer-socket.store.ts"],"names":["PrinterSocketStore","socketIoGateway","socketFactory","eventEmitter2","printerCache","printerSocketAdaptersById","logger","configService","settingsStore","constructor","loggerFactory","name","subscribeToEvents","getSocketStatesById","socketStatesById","Object","values","forEach","s","printerId","socket","socketState","api","apiState","loadPrinterSockets","loadCache","printerDocs","listCachedPrinters","doc","handlePrinterCreated","printer","e","error","errorSummary","log","keys","length","listPrinterSockets","reconnectOctoPrint","id","getPrinterSocket","close","resetSocketState","reconnectPrinterSockets","reauthRequested","socketSetupRequested","socketStates","apiStates","promisesReauth","failedSocketsReauth","needsReauth","promise","reauthSession","catch","_","push","getServerSettings","debugSettings","debugSocketSetup","captureException","Promise","all","promisesOpenSocket","failedSocketReopened","needsSetup","needsReopen","setupSocketSession","then","open","keySocket","valSocket","keyApi","valApi","reauth","socketSetup","handleBatchPrinterCreated","printers","p","createOrUpdateSocket","handlePrinterUpdated","enabled","foundAdapter","toString","deleteSocket","createInstance","registerCredentials","loginDto","apiKey","printerURL","protocol","handlePrintersDeleted","printerIds","on","printerEvents","printerCreated","bind","printersDeleted","printerUpdated","batchPrinterCreated"],"mappings":";;;;+BAcaA;;;eAAAA;;;sBAdoB;4BACJ;gCACC;AAYvB,MAAMA;IACXC,gBAAiC;IACjCC,cAA6B;IAC7BC,cAA6B;IAC7BC,aAA2B;IAC3BC,4BAAoE,CAAC,EAAE;IACvEC,OAAsB;IACtBC,cAA6B;IAC7BC,cAA6B;IAE7BC,YAAY,EACVP,aAAa,EACbD,eAAe,EACfO,aAAa,EACbL,aAAa,EACbC,YAAY,EACZM,aAAa,EACbH,aAAa,EASd,CAAE;QACD,IAAI,CAACH,YAAY,GAAGA;QACpB,IAAI,CAACH,eAAe,GAAGA;QACvB,IAAI,CAACC,aAAa,GAAGA;QACrB,IAAI,CAACC,aAAa,GAAGA;QACrB,IAAI,CAACK,aAAa,GAAGA;QACrB,IAAI,CAACF,MAAM,GAAGI,cAAcV,mBAAmBW,IAAI;QACnD,IAAI,CAACJ,aAAa,GAAGA;QAErB,IAAI,CAACK,iBAAiB;IACxB;IAEAC,sBAAsB;QACpB,MAAMC,mBAAmB,CAAC;QAC1BC,OAAOC,MAAM,CAAC,IAAI,CAACX,yBAAyB,EAAEY,OAAO,CAAC,CAACC;YACrDJ,gBAAgB,CAACI,EAAEC,SAAS,CAAC,GAAG;gBAC9BA,WAAWD,EAAEC,SAAS;gBACtBC,QAAQF,EAAEG,WAAW;gBACrBC,KAAKJ,EAAEK,QAAQ;YACjB;QACF;QACA,OAAOT;IACT;IAMA,MAAMU,qBAAqB;QACzB,MAAM,IAAI,CAACpB,YAAY,CAACqB,SAAS;QAEjC,MAAMC,cAAc,MAAM,IAAI,CAACtB,YAAY,CAACuB,kBAAkB,CAAC;QAC/D,IAAI,CAACtB,yBAAyB,GAAG,CAAC;QAIlC,KAAK,MAAMuB,OAAOF,YAAa;YAC7B,IAAI;gBACF,MAAM,IAAI,CAACG,oBAAoB,CAAC;oBAAEC,SAASF;gBAAI;YACjD,EAAE,OAAOG,GAAG;gBACV,IAAI,CAACzB,MAAM,CAAC0B,KAAK,CAAC,gEAAgEC,IAAAA,wBAAY,EAACF;YACjG;QACF;QAEA,IAAI,CAACzB,MAAM,CAAC4B,GAAG,CAAC,CAAC,OAAO,EAAEnB,OAAOoB,IAAI,CAAC,IAAI,CAAC9B,yBAAyB,EAAE+B,MAAM,CAAC,0BAA0B,CAAC;IAC1G;IAEAC,qBAAqB;QACnB,OAAOtB,OAAOC,MAAM,CAAC,IAAI,CAACX,yBAAyB;IACrD;IAKAiC,mBAAmBC,EAAU,EAAE;QAC7B,MAAMnB,SAAS,IAAI,CAACoB,gBAAgB,CAACD;QACrCnB,OAAOqB,KAAK;QAGZrB,OAAOsB,gBAAgB;IACzB;IAEAF,iBAAiBD,EAAU,EAA0B;QACnD,OAAO,IAAI,CAAClC,yBAAyB,CAACkC,GAAG;IAC3C;IAKA,MAAMI,0BAAyC;QAC7C,IAAIC,kBAAkB;QACtB,IAAIC,uBAAuB;QAC3B,MAAMC,eAAe,CAAC;QACtB,MAAMC,YAAY,CAAC;QACnB,MAAMC,iBAAiB,EAAE;QACzB,MAAMC,sBAAsB,EAAE;QAC9B,KAAK,MAAM7B,UAAUL,OAAOC,MAAM,CAAC,IAAI,CAACX,yBAAyB,EAAG;YAClE,IAAI;gBACF,IAAIe,OAAO8B,WAAW,IAAI;oBACxBN;oBACA,MAAMO,UAAU/B,OAAOgC,aAAa,GAAGC,KAAK,CAAC,CAACC;wBAC5CL,oBAAoBM,IAAI,CAACnC,OAAOD,SAAS;oBAC3C;oBACA6B,eAAeO,IAAI,CAACJ;gBACtB;YACF,EAAE,OAAOpB,GAAG;gBACV,IAAI,IAAI,CAACvB,aAAa,CAACgD,iBAAiB,GAAGC,aAAa,EAAEC,kBAAkB;oBAC1E,IAAI,CAACpD,MAAM,CAAC4B,GAAG,CAAC,mCAAmCD,IAAAA,wBAAY,EAACF;gBAClE;gBACA4B,IAAAA,sBAAgB,EAAC5B;YACnB;QACF;QAEA,MAAM6B,QAAQC,GAAG,CAACb;QAElB,MAAMc,qBAAqB,EAAE;QAC7B,MAAMC,uBAAuB,EAAE;QAC/B,KAAK,MAAM3C,UAAUL,OAAOC,MAAM,CAAC,IAAI,CAACX,yBAAyB,EAAG;YAClE,IAAI;gBACF,IAAIe,OAAO4C,UAAU,MAAM5C,OAAO6C,WAAW,IAAI;oBAC/C,IAAI,IAAI,CAACzD,aAAa,CAACgD,iBAAiB,GAAGC,aAAa,EAAEC,kBAAkB;wBAC1E,IAAI,CAACpD,MAAM,CAAC4B,GAAG,CACb,CAAC,gCAAgC,EAC/Bd,OAAOD,SAAS,CACjB,UAAU,EAAEC,OAAO4C,UAAU,GAAG,UAAU,EAAE5C,OAAO6C,WAAW,GAAG,CAAC,CAAC;oBAExE;oBACApB;oBACA,MAAMM,UAAU/B,OACb8C,kBAAkB,GAClBC,IAAI,CAAC;wBACJ/C,OAAOgD,IAAI;oBACb,GACCf,KAAK,CAAC,CAACC;wBACNS,qBAAqBR,IAAI,CAACnC,OAAOD,SAAS;oBAC5C;oBACF2C,mBAAmBP,IAAI,CAACJ;gBAC1B;YACF,EAAE,OAAOpB,GAAG;gBACV,IAAI,IAAI,CAACvB,aAAa,CAACgD,iBAAiB,GAAGC,aAAa,EAAEC,kBAAkB;oBAC1E,IAAI,CAACpD,MAAM,CAAC4B,GAAG,CAAC,CAAC,+BAA+B,EAAED,IAAAA,wBAAY,EAACF,GAAG,CAAC;gBACrE;gBACA4B,IAAAA,sBAAgB,EAAC5B;YACnB;YAEA,MAAMsC,YAAYjD,OAAOC,WAAW;YACpC,MAAMiD,YAAYxB,YAAY,CAACuB,UAAU;YACzCvB,YAAY,CAACuB,UAAU,GAAGC,YAAYA,YAAY,IAAI;YACtD,MAAMC,SAASnD,OAAOG,QAAQ;YAC9B,MAAMiD,SAASzB,SAAS,CAACwB,OAAO;YAChCxB,SAAS,CAACwB,OAAO,GAAGC,SAASA,SAAS,IAAI;QAC5C;QAEA,MAAMZ,QAAQC,GAAG,CAACC;QAElB,OAAO;YACLW,QAAQ7B;YACRmB;YACAd;YACAyB,aAAa7B;YACbzB,QAAQ0B;YACRxB,KAAKyB;QACP;IACF;IAEQ4B,0BAA0B,EAAEC,QAAQ,EAAE,EAAE;QAC9C,KAAK,MAAMC,KAAKD,SAAU;YACxB,IAAI,CAAC/C,oBAAoB,CAAC;gBAAEC,SAAS+C;YAAE;QACzC;IACF;IAOQhD,qBAAqB,EAAEC,OAAO,EAAE,EAAE;QACxC,IAAI,CAACgD,oBAAoB,CAAChD;IAC5B;IAOQiD,qBAAqB,EAAEjD,OAAO,EAAE,EAAE;QACxC,IAAI,CAACxB,MAAM,CAAC4B,GAAG,CAAC,CAAC,SAAS,EAAEJ,QAAQS,EAAE,CAAC,2BAA2B,CAAC;QACnE,IAAI,CAACuC,oBAAoB,CAAChD;IAC5B;IAMAgD,qBAAqBhD,OAAO,EAAE;QAC5B,MAAM,EAAEkD,OAAO,EAAEzC,EAAE,EAAE,GAAGT;QACxB,IAAImD,eAAe,IAAI,CAAC5E,yBAAyB,CAACkC,GAAG2C,QAAQ,GAAG;QAGhE,IAAI,CAACF,SAAS;YACZ,IAAI,CAAC1E,MAAM,CAAC4B,GAAG,CAAC,CAAC,SAAS,EAAEK,GAAG,+BAA+B,CAAC;YAC/D,IAAI,CAAC4C,YAAY,CAAC5C;YAClB;QACF;QAGA,IAAI,CAAC0C,cAAc;YACjBA,eAAe,IAAI,CAAC/E,aAAa,CAACkF,cAAc;YAChD,IAAI,CAAC/E,yBAAyB,CAACkC,GAAG,GAAG0C;QACvC,OAAO;YACLA,aAAaxC,KAAK;YAClB,IAAI,CAACnC,MAAM,CAAC4B,GAAG,CAAC,CAAC,iBAAiB,EAAEK,GAAG,oBAAoB,CAAC;QAC9D;QAGA0C,aAAaI,mBAAmB,CAAC;YAC/BlE,WAAWW,QAAQS,EAAE,CAAC2C,QAAQ;YAC9BI,UAAU;gBACRC,QAAQzD,QAAQyD,MAAM;gBACtBC,YAAY1D,QAAQ0D,UAAU;YAChC;YACAC,UAAU;QACZ;QACAR,aAAavC,gBAAgB;IAC/B;IAEQgD,sBAAsB,EAAEC,UAAU,EAAE,EAAE;QAC5CA,WAAW1E,OAAO,CAAC,CAACsB;YAClB,IAAI,CAAC4C,YAAY,CAAC5C;QACpB;IACF;IAEQ3B,oBAAoB;QAC1B,IAAI,CAACT,aAAa,CAACyF,EAAE,CAACC,6BAAa,CAACC,cAAc,EAAE,IAAI,CAACjE,oBAAoB,CAACkE,IAAI,CAAC,IAAI;QACvF,IAAI,CAAC5F,aAAa,CAACyF,EAAE,CAACC,6BAAa,CAACG,eAAe,EAAE,IAAI,CAACN,qBAAqB,CAACK,IAAI,CAAC,IAAI;QACzF,IAAI,CAAC5F,aAAa,CAACyF,EAAE,CAACC,6BAAa,CAACI,cAAc,EAAE,IAAI,CAAClB,oBAAoB,CAACgB,IAAI,CAAC,IAAI;QACvF,IAAI,CAAC5F,aAAa,CAACyF,EAAE,CAACC,6BAAa,CAACK,mBAAmB,EAAE,IAAI,CAACvB,yBAAyB,CAACoB,IAAI,CAAC,IAAI;IACnG;IAEQZ,aAAahE,SAAiB,EAAE;QACtC,MAAMC,SAAS,IAAI,CAACf,yBAAyB,CAACc,UAAU;QACxD,IAAI,CAAC,CAACC,QAAQ;YACZA,OAAOqB,KAAK;QACd;QAEA,OAAO,IAAI,CAACpC,yBAAyB,CAACc,UAAU;IAClD;AACF"}

package/dist/state/printer.cache.js

@@ -24,7 +24,6 @@ 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)=>({

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","entities","entity","toUnsafeDto"],"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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"}