@fdm-monster/server 1.5.3 → 1.6.0-rc1

package/dist/state/file.cache.js

@@ -8,9 +8,7 @@ Object.defineProperty(exports, "FileCache", {
         return FileCache;
     }
 });
-const _findpredicateutils = require("../utils/find-predicate.utils");
 const _runtimeexceptions = require("../exceptions/runtime.exceptions");
-const _serviceconstants = require("../constants/service.constants");
 class FileCache {
     printerFileStorage = {};
     totalFileCount = 0;
@@ -18,51 +16,24 @@ 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 }) {
-        this.cachePrinterStorage(printerId, storage);
-        this.cachePrinterFiles(printerId, fileList);
-    }
-    cachePrinterFiles(printerId, fileList) {
-        const printerFileStorage = this.getPrinterFileStorage(printerId);
-        printerFileStorage.fileList = fileList;
-        this.updateCacheFileRefCount();
-    }
-    cachePrinterStorage(printerId, storage) {
-        const printerFileStorage = this.getPrinterFileStorage(printerId);
-        printerFileStorage.storage = storage;
-        this.updateCacheFileRefCount();
-    }
-    getPrinterFileStorage(printerId) {
+    cachePrinterFiles(printerId, files) {
         if (!printerId) {
             throw new Error("File Cache cant get a null/undefined printer id");
         }
-        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
-            };
-        }
-        return fileStorage;
+        this.printerFileStorage[printerId] = files;
+        this.updateCacheFileRefCount();
     }
     getPrinterFiles(printerId) {
-        const fileStorage = this.getPrinterFileStorage(printerId);
-        return fileStorage?.fileList;
-    }
-    getPrinterStorage(printerId) {
-        const fileStorage = this.getPrinterFileStorage(printerId);
-        return fileStorage?.storage;
+        if (!printerId) {
+            throw new Error("File Cache cant get a null/undefined printer id");
+        }
+        this.printerFileStorage[printerId] = this.getPrinterFileStorage(printerId);
+        return this.getPrinterFileStorage(printerId);
     }
     updateCacheFileRefCount() {
         let totalFiles = 0;
         for (const storage of Object.values(this.printerFileStorage)){
-            totalFiles += storage.fileList?.files?.length || 0;
+            totalFiles += storage?.length || 0;
         }
         if (totalFiles !== this.totalFileCount) {
             this.totalFileCount = totalFiles;
@@ -83,16 +54,22 @@ class FileCache {
         this.logger.log(`Purged printerId '${printerId}' file cache`);
     }
     purgeFile(printerId, filePath) {
-        const { fileList } = this.getPrinterFileStorage(printerId);
-        const fileIndex = (0, _findpredicateutils.findFileIndex)(fileList, filePath);
+        const files = this.getPrinterFileStorage(printerId);
+        if (!files) return;
+        const fileIndex = files.findIndex((f)=>f.path === 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");
         }
-        fileList.files.splice(fileIndex, 1);
+        files.splice(fileIndex, 1);
         this.logger.log(`File ${filePath} was removed`);
     }
+    getPrinterFileStorage(printerId) {
+        if (!printerId) {
+            throw new Error("File Cache cant get a null/undefined printer id");
+        }
+        return this.printerFileStorage[printerId];
+    }
 }
 
 //# sourceMappingURL=file.cache.js.map

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","cachePrinterFiles","printerId","files","Error","updateCacheFileRefCount","getPrinterFiles","getPrinterFileStorage","totalFiles","storage","Object","values","length","log","purgePrinterId","ValidationException","fileStorage","warn","purgeFile","filePath","fileIndex","findIndex","f","path","splice"],"mappings":";;;;+BAOaA;;;eAAAA;;;mCAPuB;AAO7B,MAAMA;IACHC,qBAAwE,CAAC,EAAE;IAC3EC,iBAAiB,EAAE;IAEnBC,OAAsB;IAE9BC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACF,MAAM,GAAGE,cAAcL,UAAUM,IAAI;IAC5C;IAEAC,kBAAkBC,SAAiB,EAAEC,KAAwC,EAAE;QAC7E,IAAI,CAACD,WAAW;YACd,MAAM,IAAIE,MAAM;QAClB;QACA,IAAI,CAACT,kBAAkB,CAACO,UAAU,GAAGC;QACrC,IAAI,CAACE,uBAAuB;IAC9B;IAEAC,gBAAgBJ,SAAiB,EAAE;QACjC,IAAI,CAACA,WAAW;YACd,MAAM,IAAIE,MAAM;QAClB;QACA,IAAI,CAACT,kBAAkB,CAACO,UAAU,GAAG,IAAI,CAACK,qBAAqB,CAACL;QAChE,OAAO,IAAI,CAACK,qBAAqB,CAACL;IACpC;IAEAG,0BAA0B;QACxB,IAAIG,aAAa;QACjB,KAAK,MAAMC,WAAWC,OAAOC,MAAM,CAAC,IAAI,CAAChB,kBAAkB,EAAG;YAC5Da,cAAcC,SAASG,UAAU;QACnC;QAEA,IAAIJ,eAAe,IAAI,CAACZ,cAAc,EAAE;YACtC,IAAI,CAACA,cAAc,GAAGY;YACtB,IAAI,CAACX,MAAM,CAACgB,GAAG,CAAC,CAAC,eAAe,EAAE,IAAI,CAACjB,cAAc,CAAC,gCAAgC,CAAC;QACzF;QAEA,OAAOY;IACT;IAEAM,eAAeZ,SAAiB,EAAE;QAChC,IAAI,CAACA,WAAW;YACd,MAAM,IAAIa,sCAAmB,CAAC;QAChC;QAEA,MAAMC,cAAc,IAAI,CAACrB,kBAAkB,CAACO,UAAU;QAEtD,IAAI,CAACc,aAAa;YAChB,IAAI,CAACnB,MAAM,CAACoB,IAAI,CAAC;YACjB;QACF;QAEA,OAAO,IAAI,CAACtB,kBAAkB,CAACO,UAAU;QAEzC,IAAI,CAACL,MAAM,CAACgB,GAAG,CAAC,CAAC,kBAAkB,EAAEX,UAAU,YAAY,CAAC;IAC9D;IAEAgB,UAAUhB,SAAiB,EAAEiB,QAAgB,EAAE;QAC7C,MAAMhB,QAAQ,IAAI,CAACI,qBAAqB,CAACL;QACzC,IAAI,CAACC,OAAO;QAEZ,MAAMiB,YAAYjB,MAAMkB,SAAS,CAAC,CAACC,IAAMA,EAAEC,IAAI,KAAKJ;QACpD,IAAIC,cAAc,CAAC,GAAG;YAEpB,IAAI,CAACvB,MAAM,CAACoB,IAAI,CACd,CAAC,qFAAqF,EAAEf,UAAU,CAAC,EACnGiB;YAGF,OAAO,IAAI,CAACtB,MAAM,CAACgB,GAAG,CAAC;QACzB;QAEAV,MAAMqB,MAAM,CAACJ,WAAW;QACxB,IAAI,CAACvB,MAAM,CAACgB,GAAG,CAAC,CAAC,KAAK,EAAEM,SAAS,YAAY,CAAC;IAChD;IAEQZ,sBAAsBL,SAAiB,EAAE;QAC/C,IAAI,CAACA,WAAW;YACd,MAAM,IAAIE,MAAM;QAClB;QAEA,OAAO,IAAI,CAACT,kBAAkB,CAACO,UAAU;IAC3C;AACF"}

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,15 @@
 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 {
+const _errorutils = require("../utils/error.utils");
+class PrinterFilesStore {
     printerCache;
     printerFilesService;
     fileCache;
@@ -20,49 +21,42 @@ 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 {
-                const printerFileStorage = await this.printerFilesService.getPrinterFilesStorage(printer.id);
-                this.fileCache.cachePrinterFileStorage(printer.id, printerFileStorage);
+                const printerFiles = await this.printerFilesService.getPrinterFiles(printer.id);
+                this.fileCache.cachePrinterFiles(printer.id, printerFiles);
             } catch (e) {
-                this.logger.error("Files store failed to reconstruct files from database.", e.stack);
+                this.logger.error("Files store failed to reconstruct files from database.", (0, _errorutils.errorSummary)(e));
             }
         }
     }
-    /**
-   * 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,
-            simple: true
-        });
-        await this.updatePrinterFiles(printerId, response.data);
-        return response;
+        const response = await this.octoPrintApiService.getLocalFiles(loginDto, recursive);
+        const files = response?.files;
+        await this.updatePrinterFiles(printerId, files);
+        return files;
     }
     getFiles(printerId) {
-        // Might introduce a filter like folder later
         return this.fileCache.getPrinterFiles(printerId);
     }
     getOutdatedFiles(printerId, ageDaysMax) {
         if (!ageDaysMax) throw new _runtimeexceptions.ValidationException("ageDaysMax property is required to get printer's outdated files");
         const printerFiles = this.getFiles(printerId);
-        if (!printerFiles?.files?.length) return [];
+        if (!printerFiles?.length) return [];
         const nowTimestampSeconds = Date.now() / 1000;
-        return printerFiles.files.filter((file)=>!!file.date && file.date + ageDaysMax * 86400 < nowTimestampSeconds);
+        return printerFiles.filter((file)=>!!file.date && file.date + ageDaysMax * 86400 < nowTimestampSeconds);
     }
     async deleteOutdatedFiles(printerId, ageDaysMax) {
         const failedFiles = [];
         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 +93,23 @@ 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);
+        const files = await this.printerFilesService.appendOrReplaceFile(printer.id, addedFile);
+        await this.fileCache.cachePrinterFiles(printer.id, files);
     }
-    async setExistingFileForPrint(printerId, filePath) {
-        await this.printerFilesService.setPrinterLastPrintedFile(printerId, filePath);
-    }
-    /**
-   * Remove file reference from database and then cache.
-   */ async deleteFile(printerId, filePath, throwError) {
-        const serviceActionResult = await this.printerFilesService.deleteFile(printerId, filePath, throwError);
-        // Warning only
-        const cacheActionResult = this.fileCache.purgeFile(printerId, filePath);
+    async deleteFile(printerId, filePath, throwError) {
+        const serviceActionResult = await this.printerFilesService.deletePrinterFiles(printerId, [
+            filePath
+        ], throwError);
+        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","printerFiles","getPrinterFiles","id","cachePrinterFiles","e","error","errorSummary","eagerLoadPrinterFiles","printerId","recursive","loginDto","getLoginDtoAsync","response","getLocalFiles","files","updatePrinterFiles","getFiles","getOutdatedFiles","ageDaysMax","ValidationException","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","appendOrSetPrinterFile","addedFile","appendOrReplaceFile","deleteFile","filePath","throwError","serviceActionResult","deletePrinterFiles","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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"}

package/dist/state/settings.store.js

@@ -25,7 +25,6 @@ class SettingsStore {
         const settings = this.settings;
         if (!settings) throw new _runtimeexceptions.InternalServerException("Could not check server settings (server settings not loaded");
         return Object.freeze({
-            // Credential settings are not shared with the client
             [_serversettingsconstants.serverSettingsKey]: {
                 loginRequired: settings[_serversettingsconstants.serverSettingsKey].loginRequired,
                 registration: settings[_serversettingsconstants.serverSettingsKey].registration,
@@ -54,7 +53,6 @@ class SettingsStore {
         });
     }
     async loadSettings() {
-        // Setup Settings as connection is established
         this.settings = await this.settingsService.getOrCreate();
         await this.processSentryEnabled();
     }
@@ -170,7 +168,12 @@ class SettingsStore {
             this.logger.log("Disabling Sentry for remote diagnostics");
         }
         if ((0, _envutils.isTestEnvironment)()) return;
-        (0, _node.getCurrentHub)().getClient().getOptions().enabled = sentryEnabled;
+        const client = (0, _node.getCurrentHub)().getClient();
+        if (!client) {
+            this.logger.warn("Could not apply Sentry. Was the SDK initialized?");
+            return;
+        }
+        client.getOptions().enabled = sentryEnabled;
     }
 }
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","settingsService","logger","settings","constructor","loggerFactory","name","getSettings","InternalServerException","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","debugSettings","whitelistEnabled","whitelistedIpAddresses","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","updateCredentialSettings","jwtSecret","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","getServerSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","patchWizardSettings","wizardCompletedAt","Date","setRegistrationEnabled","patchServerSettings","getLoginRequired","setLoginRequired","setWhitelist","updateServerSettings","serverSettings","updateTimeoutSettings","timeoutSettings","patchFileCleanSettings","fileClean","credentialSettings","patchCredentialSettings","setSentryDiagnosticsEnabled","updateFrontendSettings","frontendSettings","sentryEnabled","log","isTestEnvironment","getCurrentHub","getClient","getOptions","enabled"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","settingsService","logger","settings","constructor","loggerFactory","name","getSettings","InternalServerException","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","debugSettings","whitelistEnabled","whitelistedIpAddresses","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","updateCredentialSettings","jwtSecret","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","getServerSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","patchWizardSettings","wizardCompletedAt","Date","setRegistrationEnabled","patchServerSettings","getLoginRequired","setLoginRequired","setWhitelist","updateServerSettings","serverSettings","updateTimeoutSettings","timeoutSettings","patchFileCleanSettings","fileClean","credentialSettings","patchCredentialSettings","setSentryDiagnosticsEnabled","updateFrontendSettings","frontendSettings","sentryEnabled","log","isTestEnvironment","client","getCurrentHub","getClient","warn","getOptions","enabled"],"mappings":"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"}

package/dist/state/socket-io.gateway.js

@@ -24,10 +24,8 @@ const authorize = (settingsStore, options, verify)=>{
     const strategy = new _passportjwt.Strategy(options, verify);
     return async function authorizeCallback(socket, next) {
         if (!await settingsStore.getLoginRequired()) {
-            // No login required, so we can skip the authentication
             return next();
         }
-        // --- Begin strategy augmentation ala passport
         strategy.success = function success(user) {
             socket.handshake.user = user;
             next();

package/dist/state/socket-io.gateway.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/socket-io.gateway.ts"],"names":["IO_MESSAGES","SocketIoGateway","authorize","settingsStore","options","verify","strategy","JwtStrategy","authorizeCallback","socket","next","getLoginRequired","success","user","handshake","fail","info","Error","error","authenticate","logger","eventEmitter2","io","authService","configService","userService","constructor","loggerFactory","name","attachServer","httpServer","Server","cors","origin","opts","getPassportJwtOptions","value","auth","token","verifyUserCallback","use","on","onConnect","bind","log","id","emit","socketIoConnectedEvent","send","event","data","debug","getServerSettings","debugSettings","debugSocketIoEvents","LegacyUpdate","LegacyPrinterTest","CompletionEvent","HostState","ApiAccessibility"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/socket-io.gateway.ts"],"names":["IO_MESSAGES","SocketIoGateway","authorize","settingsStore","options","verify","strategy","JwtStrategy","authorizeCallback","socket","next","getLoginRequired","success","user","handshake","fail","info","Error","error","authenticate","logger","eventEmitter2","io","authService","configService","userService","constructor","loggerFactory","name","attachServer","httpServer","Server","cors","origin","opts","getPassportJwtOptions","value","auth","token","verifyUserCallback","use","on","onConnect","bind","log","id","emit","socketIoConnectedEvent","send","event","data","debug","getServerSettings","debugSettings","debugSocketIoEvents","LegacyUpdate","LegacyPrinterTest","CompletionEvent","HostState","ApiAccessibility"],"mappings":";;;;;;;;;;;IA0GaA,WAAW;eAAXA;;IAhEAC,eAAe;eAAfA;;;0BA1CkB;gCACQ;0BAOmB;6BAEiB;AAK3E,MAAMC,YAAY,CAChBC,eACAC,SACAC;IAEA,MAAMC,WAAW,IAAIC,qBAAW,CAACH,SAASC;IAE1C,OAAO,eAAeG,kBACpBC,MAAyE,EACzEC,IAAmC;QAEnC,IAAI,CAAE,MAAMP,cAAcQ,gBAAgB,IAAK;YAE7C,OAAOD;QACT;QAEAJ,SAASM,OAAO,GAAG,SAASA,QAAQC,IAAI;YACtCJ,OAAOK,SAAS,CAACD,IAAI,GAAGA;YACxBH;QACF;QACAJ,SAASS,IAAI,GAAG,CAACC,OAASN,KAAK,IAAIO,MAAMD;QACzCV,SAASY,KAAK,GAAG,CAACA,QAAUR,KAAKQ;QAEjCZ,SAASa,YAAY,CAACV,QAAQ,CAAC;IACjC;AACF;AAEO,MAAMR;IACXmB,OAAsB;IACtBC,cAA6B;IAC7BC,GAAW;IAEXC,YAAyB;IACzBpB,cAA6B;IAC7BqB,cAA8B;IAC9BC,YAA0B;IAE1BC,YAAY,EACVC,aAAa,EACbN,aAAa,EACblB,aAAa,EACboB,WAAW,EACXC,aAAa,EACbC,WAAW,EAQZ,CAAE;QACD,IAAI,CAACL,MAAM,GAAGO,cAAc1B,gBAAgB2B,IAAI;QAChD,IAAI,CAACP,aAAa,GAAGA;QACrB,IAAI,CAAClB,aAAa,GAAGA;QACrB,IAAI,CAACoB,WAAW,GAAGA;QACnB,IAAI,CAACE,WAAW,GAAGA;QACnB,IAAI,CAACD,aAAa,GAAGA;IACvB;IAEAK,aAAaC,UAAuB,EAAE;QACpC,IAAI,CAACR,EAAE,GAAG,IAAIS,gBAAM,CAACD,YAAY;YAAEE,MAAM;gBAAEC,QAAQ;YAAI;QAAE;QACzD,MAAMC,OAAOC,IAAAA,+BAAqB,EAAC,IAAI,CAAChC,aAAa,EAAE,IAAI,CAACqB,aAAa,EAAE,CAACY,QAAkBA,MAAMtB,SAAS,CAACuB,IAAI,CAACC,KAAK;QACxH,MAAMjC,SAASkC,IAAAA,4BAAkB,EAAC,IAAI,CAACd,WAAW;QAClD,IAAI,CAACH,EAAE,CAACkB,GAAG,CAACtC,UAAU,IAAI,CAACC,aAAa,EAAE+B,MAAM7B;QAChD,IAAI,CAACiB,EAAE,CAACmB,EAAE,CAAC,cAAc,CAAChC,SAAW,IAAI,CAACiC,SAAS,CAACC,IAAI,CAAC,IAAI,EAAElC;IACjE;IAEAiC,UAAUjC,MAAc,EAAE;QACxB,IAAI,CAACW,MAAM,CAACwB,GAAG,CAAC,6BAA6BnC,OAAOoC,EAAE;QAEtD,IAAI,CAACxB,aAAa,CAACyB,IAAI,CAACC,sCAAsB,EAAEtC,OAAOoC,EAAE;QAEzDpC,OAAOgC,EAAE,CAAC,cAAc;YACtB,IAAI,CAACrB,MAAM,CAACwB,GAAG,CAAC,gCAAgCnC,OAAOoC,EAAE;QAC3D;IACF;IAEAG,KAAQC,KAAa,EAAEC,IAAO,EAAE;QAC9B,IAAI,CAAC,IAAI,CAAC5B,EAAE,EAAE;YACZ,IAAI,CAACF,MAAM,CAAC+B,KAAK,CAAC;YAClB;QACF;QAEA,IAAI,IAAI,CAAChD,aAAa,CAACiD,iBAAiB,GAAGC,aAAa,EAAEC,qBAAqB;YAC7E,IAAI,CAAClC,MAAM,CAACwB,GAAG,CAAC,CAAC,cAAc,EAAEK,MAAM,CAAC;QAC1C;QACA,IAAI,CAAC3B,EAAE,CAACwB,IAAI,CAACG,OAAOC;IACtB;AACF;AAEO,MAAMlD,cAAc;IACzBuD,cAAc;IACdC,mBAAmB;IACnBC,iBAAiB;IACjBC,WAAW;IACXC,kBAAkB;AACpB"}

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

@@ -23,21 +23,15 @@ class TestPrinterSocketStore {
         this.socketIoGateway = socketIoGateway;
         this.eventEmitter2 = eventEmitter2;
     }
-    /**
-   * Sets up/recreates a printer to be tested quickly by running the standard checks
-   * @param printer
-   * @returns {Promise<*>}
-   */ async setupTestPrinter(printer) {
+    async setupTestPrinter(printer) {
         if (this.testSocket) {
             this.testSocket.close();
             this.testSocket = null;
         }
         const validatedData = await (0, _validators.validateInput)(printer, _createtestprintervalidation.createTestPrinterRules);
         validatedData.enabled = true;
-        // Create a new socket if it doesn't exist
         const { correlationToken } = printer;
         this.testSocket = this.socketFactory.createInstance();
-        // Reset the socket credentials before (re-)connecting
         this.testSocket.registerCredentials({
             printerId: correlationToken,
             loginDto: {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","socketIoGateway","socketFactory","eventEmitter2","constructor","setupTestPrinter","printer","close","validatedData","validateInput","createTestPrinterRules","enabled","correlationToken","createInstance","registerCredentials","printerId","loginDto","apiKey","printerURL","protocol","testEvents","octoPrintEvent","Message","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","listener","event","payload","send","forEach","te","on","setupSocketSession","promise","Promise","resolve","reject","open","startTime","setInterval","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","off"],"mappings":";;;;+BASaA;;;eAAAA;;;0BAT2B;4BACV;6CACS;wCACuC;iCACjD;AAKtB,MAAMA;IACXC,WAAmC;IACnCC,gBAAiC;IACjCC,cAA6B;IAC7BC,cAA6B;IAC7BC,YAAY,EACVF,aAAa,EACbD,eAAe,EACfE,aAAa,EAKd,CAAE;QACD,IAAI,CAACD,aAAa,GAAGA;QACrB,IAAI,CAACD,eAAe,GAAGA;QACvB,IAAI,CAACE,aAAa,GAAGA;IACvB;IAEA;;;;GAIC,GACD,MAAME,iBAAiBC,OAAO,EAAE;QAC9B,IAAI,IAAI,CAACN,UAAU,EAAE;YACnB,IAAI,CAACA,UAAU,CAACO,KAAK;YACrB,IAAI,CAACP,UAAU,GAAG;QACpB;QAEA,MAAMQ,gBAAgB,MAAMC,IAAAA,yBAAa,EAACH,SAASI,mDAAsB;QACzEF,cAAcG,OAAO,GAAG;QAExB,0CAA0C;QAC1C,MAAM,EAAEC,gBAAgB,EAAE,GAAGN;QAC7B,IAAI,CAACN,UAAU,GAAG,IAAI,CAACE,aAAa,CAACW,cAAc;QAEnD,sDAAsD;QACtD,IAAI,CAACb,UAAU,CAACc,mBAAmB,CAAC;YAClCC,WAAWH;YACXI,UAAU;gBACRC,QAAQX,QAAQW,MAAM;gBACtBC,YAAYZ,QAAQY,UAAU;YAChC;YACAC,UAAU;QACZ;QAEA,MAAMC,aAAa;YACjBC,IAAAA,sCAAc,EAACC,+BAAO,CAACC,gBAAgB;YACvCF,IAAAA,sCAAc,EAACC,+BAAO,CAACE,iBAAiB;YACxCH,IAAAA,sCAAc,EAACC,+BAAO,CAACG,SAAS;YAChCJ,IAAAA,sCAAc,EAACC,+BAAO,CAACI,SAAS;YAChCL,IAAAA,sCAAc,EAACC,+BAAO,CAACK,QAAQ;SAChC;QACD,MAAMC,WAAW,CAAC,EAAEC,KAAK,EAAEC,OAAO,EAAEf,SAAS,EAAE;YAC7C,IAAIA,cAAcH,kBAAkB;gBAClC;YACF;YACA,IAAI,CAACX,eAAe,CAAC8B,IAAI,CAAC,sBAAsB;gBAC9CF;gBACAC;gBACAlB;YACF;QACF;QACAQ,WAAWY,OAAO,CAAC,CAACC;YAClB,IAAI,CAAC9B,aAAa,CAAC+B,EAAE,CAACD,IAAIL;QAC5B;QACA,MAAM,IAAI,CAAC5B,UAAU,CAACmC,kBAAkB;QAExC,MAAMC,UAAU,IAAIC,QAAQ,OAAOC,SAASC;YAC1C,IAAI,CAACvC,UAAU,CAACwC,IAAI;YACpB,WAAW,MAAMC,aAAaC,IAAAA,qBAAW,EAAC,KAAM;gBAC9C,IAAI,CAAC,IAAI,CAAC1C,UAAU,EAAE;oBACpB;gBACF;gBACA,IAAI,IAAI,CAACA,UAAU,CAAC2C,WAAW,KAAKC,oCAAY,CAACC,aAAa,EAAE;oBAC9DP;oBACA;gBACF;YACF;QACF;QAEA,MAAMD,QAAQS,IAAI,CAAC;YAACV;YAASW,IAAAA,oBAAU,EAACC,6BAAY,CAACC,gCAAgC;SAAE;QACvF,IAAI,CAACjD,UAAU,CAACO,KAAK;QACrB,OAAO,IAAI,CAACP,UAAU;QACtBoB,WAAWY,OAAO,CAAC,CAACC;YAClB,IAAI,CAAC9B,aAAa,CAAC+C,GAAG,CAACjB,IAAIL;QAC7B;IACF;AACF"}
+{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","socketIoGateway","socketFactory","eventEmitter2","constructor","setupTestPrinter","printer","close","validatedData","validateInput","createTestPrinterRules","enabled","correlationToken","createInstance","registerCredentials","printerId","loginDto","apiKey","printerURL","protocol","testEvents","octoPrintEvent","Message","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","listener","event","payload","send","forEach","te","on","setupSocketSession","promise","Promise","resolve","reject","open","startTime","setInterval","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","off"],"mappings":";;;;+BASaA;;;eAAAA;;;0BAT2B;4BACV;6CACS;wCACuC;iCACjD;AAKtB,MAAMA;IACXC,WAAmC;IACnCC,gBAAiC;IACjCC,cAA6B;IAC7BC,cAA6B;IAC7BC,YAAY,EACVF,aAAa,EACbD,eAAe,EACfE,aAAa,EAKd,CAAE;QACD,IAAI,CAACD,aAAa,GAAGA;QACrB,IAAI,CAACD,eAAe,GAAGA;QACvB,IAAI,CAACE,aAAa,GAAGA;IACvB;IAOA,MAAME,iBAAiBC,OAAO,EAAE;QAC9B,IAAI,IAAI,CAACN,UAAU,EAAE;YACnB,IAAI,CAACA,UAAU,CAACO,KAAK;YACrB,IAAI,CAACP,UAAU,GAAG;QACpB;QAEA,MAAMQ,gBAAgB,MAAMC,IAAAA,yBAAa,EAACH,SAASI,mDAAsB;QACzEF,cAAcG,OAAO,GAAG;QAGxB,MAAM,EAAEC,gBAAgB,EAAE,GAAGN;QAC7B,IAAI,CAACN,UAAU,GAAG,IAAI,CAACE,aAAa,CAACW,cAAc;QAGnD,IAAI,CAACb,UAAU,CAACc,mBAAmB,CAAC;YAClCC,WAAWH;YACXI,UAAU;gBACRC,QAAQX,QAAQW,MAAM;gBACtBC,YAAYZ,QAAQY,UAAU;YAChC;YACAC,UAAU;QACZ;QAEA,MAAMC,aAAa;YACjBC,IAAAA,sCAAc,EAACC,+BAAO,CAACC,gBAAgB;YACvCF,IAAAA,sCAAc,EAACC,+BAAO,CAACE,iBAAiB;YACxCH,IAAAA,sCAAc,EAACC,+BAAO,CAACG,SAAS;YAChCJ,IAAAA,sCAAc,EAACC,+BAAO,CAACI,SAAS;YAChCL,IAAAA,sCAAc,EAACC,+BAAO,CAACK,QAAQ;SAChC;QACD,MAAMC,WAAW,CAAC,EAAEC,KAAK,EAAEC,OAAO,EAAEf,SAAS,EAAE;YAC7C,IAAIA,cAAcH,kBAAkB;gBAClC;YACF;YACA,IAAI,CAACX,eAAe,CAAC8B,IAAI,CAAC,sBAAsB;gBAC9CF;gBACAC;gBACAlB;YACF;QACF;QACAQ,WAAWY,OAAO,CAAC,CAACC;YAClB,IAAI,CAAC9B,aAAa,CAAC+B,EAAE,CAACD,IAAIL;QAC5B;QACA,MAAM,IAAI,CAAC5B,UAAU,CAACmC,kBAAkB;QAExC,MAAMC,UAAU,IAAIC,QAAQ,OAAOC,SAASC;YAC1C,IAAI,CAACvC,UAAU,CAACwC,IAAI;YACpB,WAAW,MAAMC,aAAaC,IAAAA,qBAAW,EAAC,KAAM;gBAC9C,IAAI,CAAC,IAAI,CAAC1C,UAAU,EAAE;oBACpB;gBACF;gBACA,IAAI,IAAI,CAACA,UAAU,CAAC2C,WAAW,KAAKC,oCAAY,CAACC,aAAa,EAAE;oBAC9DP;oBACA;gBACF;YACF;QACF;QAEA,MAAMD,QAAQS,IAAI,CAAC;YAACV;YAASW,IAAAA,oBAAU,EAACC,6BAAY,CAACC,gCAAgC;SAAE;QACvF,IAAI,CAACjD,UAAU,CAACO,KAAK;QACrB,OAAO,IAAI,CAACP,UAAU;QACtBoB,WAAWY,OAAO,CAAC,CAACC;YAClB,IAAI,CAAC9B,aAAa,CAAC+C,GAAG,CAACjB,IAAIL;QAC7B;IACF;AACF"}