@fdm-monster/server 1.9.4 → 2.0.0

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

@@ -10,15 +10,19 @@ Object.defineProperty(exports, "PrinterEventsCache", {
 });
 const _keydiffcache = require("../utils/cache/key-diff.cache");
 const _eventconstants = require("../constants/event.constants");
+const _octoprinteventdto = require("../services/octoprint/dto/octoprint-event.dto");
 const _octoprintwebsocketadapter = require("../services/octoprint/octoprint-websocket.adapter");
 const _moonrakerconstants = require("../services/moonraker/constants/moonraker.constants");
 const _prusalinkconstants = require("../services/prusa-link/constants/prusalink.constants");
 const _bambumqttadapter = require("../services/bambu/bambu-mqtt.adapter");
 class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
     eventEmitter2;
+    printJobService;
+    printerCache;
+    printerThumbnailCache;
     logger;
-    constructor(eventEmitter2, loggerFactory){
-        super(), this.eventEmitter2 = eventEmitter2;
+    constructor(eventEmitter2, loggerFactory, printJobService, printerCache, printerThumbnailCache){
+        super(), this.eventEmitter2 = eventEmitter2, this.printJobService = printJobService, this.printerCache = printerCache, this.printerThumbnailCache = printerThumbnailCache;
         this.logger = loggerFactory(PrinterEventsCache.name);
         this.subscribeToEvents();
     }
@@ -26,7 +30,7 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
         await this.deleteKeyValue(id, true);
     }
     async getPrinterSocketEvents(id) {
-        return this.keyValueStore[id];
+        return this.keyValueStore.get(id);
     }
     async getOrCreateEvents(printerId) {
         let ref = await this.getValue(printerId);
@@ -76,30 +80,140 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
         this.eventEmitter2.on((0, _bambumqttadapter.bambuEvent)("*"), (e)=>this.onBambuSocketMessage(e));
         this.eventEmitter2.on(_eventconstants.printerEvents.printersDeleted, this.handlePrintersDeleted.bind(this));
     }
+    async getPrinterName(printerId) {
+        try {
+            const printer = await this.printerCache.getValue(printerId);
+            return printer?.name;
+        } catch (error) {
+            this.logger.debug(`Could not get printer name for ${printerId}: ${error}`);
+            return undefined;
+        }
+    }
     async onOctoPrintSocketMessage(e) {
         const printerId = e.printerId;
-        if (![
-            "plugin",
-            "event"
-        ].includes(e.event)) {
-            await this.setEvent(printerId, e.event, e.event === "history" ? this.pruneHistoryPayload(e.payload) : e.payload);
+        if (e.event === _octoprinteventdto.messages.current && e.payload) {
+            await this.setEvent(printerId, _octoprinteventdto.messages.current, e.payload);
+            const payload = e.payload;
+            const flags = payload?.state?.flags;
+            const filePath = payload?.job?.file?.path;
+            const completion = payload?.progress?.completion;
+            if (flags?.printing && filePath) {
+                const printerName = await this.getPrinterName(printerId);
+                const job = await this.printJobService.markStarted(printerId, filePath, printerName);
+                if (job) {
+                    await this.printerThumbnailCache.handleJobStarted(printerId, job.id);
+                }
+                if (job && !job.fileStorageId && job.analysisState === "NOT_ANALYZED") {
+                    this.logger.log(`Job ${job.id} has no local file - triggering download and analysis`);
+                    await this.printJobService.triggerFileAnalysis(job.id);
+                }
+                if (job && !job.metadata?.gcodePrintTimeSeconds) {
+                    const estimatedTime = payload?.job?.estimatedPrintTime;
+                    const filament = payload?.job?.filament?.tool0;
+                    await this.printJobService.updateJobMetadata(printerId, filePath, {
+                        gcodePrintTimeSeconds: estimatedTime ? Math.round(estimatedTime) : null,
+                        nozzleDiameterMm: null,
+                        filamentDiameterMm: null,
+                        filamentDensityGramsCm3: null,
+                        filamentUsedMm: filament?.length ? Math.round(filament.length) : null,
+                        filamentUsedCm3: filament?.volume ? Math.round(filament.volume * 100) / 100 : null,
+                        filamentUsedGrams: null,
+                        totalFilamentUsedGrams: null
+                    });
+                }
+            }
+            if (typeof completion === "number" && filePath) {
+                await this.printJobService.markProgress(printerId, filePath, completion);
+            }
+            if ((flags?.finished || flags?.error) && filePath) {
+                const reason = flags?.error ? "Error" : "Finished";
+                if (flags?.finished) {
+                    const job = await this.printJobService.markFinished(printerId, filePath);
+                    if (job) {
+                        await this.printerThumbnailCache.handleJobCompleted(printerId, job.id);
+                    }
+                } else {
+                    await this.printJobService.markFailed(printerId, filePath, reason);
+                }
+            }
         }
     }
     async onMoonrakerSocketMessage(e) {
         const printerId = e.printerId;
         const eventType = e.event;
         if ([
-            "notify_status_update",
-            "current"
+            _octoprinteventdto.messages.notify_status_update,
+            _octoprinteventdto.messages.current
         ].includes(eventType)) {
             await this.setEvent(printerId, eventType, e.payload);
+            const payload = e.payload;
+            const status = payload?.status ?? payload?.result ?? {};
+            const filename = status?.print_stats?.filename;
+            const progress = status?.display_status?.progress ?? status?.print_stats?.progress;
+            const state = status?.print_stats?.state;
+            if (state === "printing" && filename) {
+                const printerName = await this.getPrinterName(printerId);
+                const job = await this.printJobService.markStarted(printerId, filename, printerName);
+                if (job) {
+                    await this.printerThumbnailCache.handleJobStarted(printerId, job.id);
+                }
+                if (job && !job.fileStorageId && job.analysisState === "NOT_ANALYZED") {
+                    this.logger.log(`Job ${job.id} has no local file - triggering download and analysis`);
+                    await this.printJobService.triggerFileAnalysis(job.id);
+                }
+            }
+            if (typeof progress === "number" && filename) {
+                await this.printJobService.markProgress(printerId, filename, Math.round(progress * 100));
+            }
+            if ([
+                "complete",
+                "cancelled",
+                "error"
+            ].includes(state) && filename) {
+                if (state === "complete") {
+                    const job = await this.printJobService.markFinished(printerId, filename);
+                    if (job) {
+                        await this.printerThumbnailCache.handleJobCompleted(printerId, job.id);
+                    }
+                } else {
+                    await this.printJobService.markFailed(printerId, filename, state);
+                }
+            }
         }
     }
     async onPrusaLinkPollMessage(e) {
         const printerId = e.printerId;
-        this.logger.debug(`Received prusaLink event ${e.event}, printerId ${e.printerId}`, e);
-        if (e.event === "current") {
-            await this.setEvent(printerId, e.event, e.payload);
+        if (e.event === _octoprinteventdto.messages.current) {
+            await this.setEvent(printerId, _octoprinteventdto.messages.current, e.payload);
+            const payload = e.payload;
+            const state = payload?.state;
+            const filename = payload?.job?.file?.path ?? payload?.job?.file?.display;
+            const completion = payload?.progress?.completion;
+            if (state === "Printing" && filename) {
+                const printerName = await this.getPrinterName(printerId);
+                const job = await this.printJobService.markStarted(printerId, filename, printerName);
+                if (job) {
+                    await this.printerThumbnailCache.handleJobStarted(printerId, job.id);
+                }
+                if (job && !job.fileStorageId && job.analysisState === "NOT_ANALYZED") {
+                    this.logger.log(`Job ${job.id} has no local file - triggering download and analysis`);
+                    await this.printJobService.triggerFileAnalysis(job.id);
+                }
+            }
+            if (typeof completion === "number" && filename) {
+                await this.printJobService.markProgress(printerId, filename, completion);
+            }
+            if (state === "Finished" && filename) {
+                const job = await this.printJobService.markFinished(printerId, filename);
+                if (job) {
+                    await this.printerThumbnailCache.handleJobCompleted(printerId, job.id);
+                }
+            } else if ([
+                "Stopped",
+                "Error"
+            ].includes(state) && filename) {
+                await this.printJobService.markFailed(printerId, filename, state);
+            }
         }
     }
     async onBambuSocketMessage(e) {
@@ -108,15 +222,61 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
             this.logger.warn("Received Bambu event without printerId", e);
             return;
         }
-        this.logger.debug(`Received Bambu event ${e.event}, printerId ${printerId}`);
-        if (e.event === "current") {
-            await this.setEvent(printerId, e.event, e.payload);
+        if (e.event === _octoprinteventdto.messages.current) {
+            await this.setEvent(printerId, _octoprinteventdto.messages.current, e.payload);
+            const payload = e.payload;
+            const print = payload?.print;
+            const percent = print?.mc_percent;
+            const filename = print?.gcode_file || print?.subtask_name;
+            const stage = print?.mc_print_stage;
+            const state = print?.gcode_state;
+            if (state === "PRINTING" && filename) {
+                const printerName = await this.getPrinterName(printerId);
+                const job = await this.printJobService.markStarted(printerId, filename, printerName);
+                if (job) {
+                    await this.printerThumbnailCache.handleJobStarted(printerId, job.id);
+                }
+                if (job && !job.fileStorageId && job.analysisState === "NOT_ANALYZED") {
+                    this.logger.log(`Job ${job.id} has no local file - triggering download and analysis`);
+                    await this.printJobService.triggerFileAnalysis(job.id);
+                }
+                if (job && !job.metadata?.gcodePrintTimeSeconds) {
+                    const remainingMinutes = print?.mc_remaining_time;
+                    const totalLayers = print?.total_layer_num;
+                    const estimatedSeconds = remainingMinutes ? remainingMinutes * 60 : null;
+                    const tray = print?.ams?.tray_now ? print?.vt_tray : print?.ams?.ams?.[0]?.tray?.[0];
+                    const filamentDiameter = tray?.tray_diameter ? parseFloat(tray.tray_diameter) : null;
+                    await this.printJobService.updateJobMetadata(printerId, filename, {
+                        gcodePrintTimeSeconds: estimatedSeconds,
+                        nozzleDiameterMm: null,
+                        filamentDiameterMm: filamentDiameter,
+                        filamentDensityGramsCm3: null,
+                        filamentUsedMm: null,
+                        filamentUsedCm3: null,
+                        filamentUsedGrams: null,
+                        totalFilamentUsedGrams: null
+                    });
+                }
+            }
+            if (typeof percent === "number" && filename) {
+                await this.printJobService.markProgress(printerId, filename, percent);
+            }
+            if (state === "FINISHED" && filename) {
+                const job = await this.printJobService.markFinished(printerId, filename);
+                if (job) {
+                    await this.printerThumbnailCache.handleJobCompleted(printerId, job.id);
+                }
+            } else if (state === "IDLE") {
+                const activeJob = await this.printJobService.getActivePrintJob(printerId);
+                if (activeJob && activeJob.status === "PRINTING") {
+                    this.logger.log(`Print job ${activeJob.id} transitioned to IDLE - marking as cancelled`);
+                    await this.printJobService.handlePrintCancelled(printerId, "Print stopped");
+                }
+            } else if (state === "ERROR" && filename) {
+                await this.printJobService.markFailed(printerId, filename, "Error");
+            }
         }
     }
-    pruneHistoryPayload(payload) {
-        const { logs, temps, messages, plugins, ...prunedPayload } = payload;
-        return prunedPayload;
-    }
 }
 
 //# sourceMappingURL=printer-events.cache.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer-events.cache.ts"],"names":["PrinterEventsCache","KeyDiffCache","logger","eventEmitter2","loggerFactory","name","subscribeToEvents","deletePrinterSocketEvents","id","deleteKeyValue","getPrinterSocketEvents","keyValueStore","getOrCreateEvents","printerId","ref","getValue","connected","reauthRequired","notify_status_update","current","history","API_STATE_UPDATED","WS_CLOSED","WS_ERROR","WS_OPENED","WS_STATE_UPDATED","setKeyValue","setEvent","label","payload","receivedAt","Date","now","setSubState","substateName","handlePrintersDeleted","event","deleteKeysBatch","printerIds","on","octoPrintEvent","e","onOctoPrintSocketMessage","moonrakerEvent","onMoonrakerSocketMessage","prusaLinkEvent","onPrusaLinkPollMessage","bambuEvent","onBambuSocketMessage","printerEvents","printersDeleted","bind","includes","pruneHistoryPayload","eventType","debug","warn","logs","temps","messages","plugins","prunedPayload"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer-events.cache.ts"],"names":["PrinterEventsCache","KeyDiffCache","logger","eventEmitter2","loggerFactory","printJobService","printerCache","printerThumbnailCache","name","subscribeToEvents","deletePrinterSocketEvents","id","deleteKeyValue","getPrinterSocketEvents","keyValueStore","get","getOrCreateEvents","printerId","ref","getValue","connected","reauthRequired","notify_status_update","current","history","API_STATE_UPDATED","WS_CLOSED","WS_ERROR","WS_OPENED","WS_STATE_UPDATED","setKeyValue","setEvent","label","payload","receivedAt","Date","now","setSubState","substateName","handlePrintersDeleted","event","deleteKeysBatch","printerIds","on","octoPrintEvent","e","onOctoPrintSocketMessage","moonrakerEvent","onMoonrakerSocketMessage","prusaLinkEvent","onPrusaLinkPollMessage","bambuEvent","onBambuSocketMessage","printerEvents","printersDeleted","bind","getPrinterName","printer","error","debug","undefined","messages","flags","state","filePath","job","file","path","completion","progress","printing","printerName","markStarted","handleJobStarted","fileStorageId","analysisState","log","triggerFileAnalysis","metadata","gcodePrintTimeSeconds","estimatedTime","estimatedPrintTime","filament","tool0","updateJobMetadata","Math","round","nozzleDiameterMm","filamentDiameterMm","filamentDensityGramsCm3","filamentUsedMm","length","filamentUsedCm3","volume","filamentUsedGrams","totalFilamentUsedGrams","markProgress","finished","reason","markFinished","handleJobCompleted","markFailed","eventType","includes","status","result","filename","print_stats","display_status","display","warn","print","percent","mc_percent","gcode_file","subtask_name","stage","mc_print_stage","gcode_state","remainingMinutes","mc_remaining_time","totalLayers","total_layer_num","estimatedSeconds","tray","ams","tray_now","vt_tray","filamentDiameter","tray_diameter","parseFloat","activeJob","getActivePrintJob","handlePrintCancelled"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer-files.store.ts"],"names":["PrinterFilesStore","logger","loggerFactory","printerCache","fileCache","printerApiFactory","name","loadFilesStore","printers","listCachedPrinters","printer","filter","p","enabled","printerFiles","loadFiles","id","cachePrinterFiles","e","captureException","error","printerId","loginDto","getLoginDtoAsync","printerApi","getScopedPrinter","files","getFiles","getPrinterFiles","getOutdatedFiles","ageDaysMax","ValidationException","length","nowTimestampSeconds","Date","now","file","date","deleteOutdatedFiles","getById","failedFiles","succeededFiles","nonRecursiveFiles","getCachedPrinterOrThrowAsync","deleteFile","path","push","log","purgePrinterFiles","printerState","purgePrinterId","purgeFiles","allPrinters","filePath","purgeFile"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer-files.store.ts"],"names":["PrinterFilesStore","logger","loggerFactory","printerCache","fileCache","printerApiFactory","name","loadFilesStore","printers","listCachedPrinters","printer","filter","p","enabled","printerFiles","loadFiles","id","cachePrinterFiles","e","captureException","error","printerId","loginDto","getLoginDtoAsync","printerApi","getScopedPrinter","files","getFiles","getPrinterFiles","getOutdatedFiles","ageDaysMax","ValidationException","length","nowTimestampSeconds","Date","now","file","date","deleteOutdatedFiles","getById","failedFiles","succeededFiles","nonRecursiveFiles","getCachedPrinterOrThrowAsync","deleteFile","path","push","log","purgePrinterFiles","printerState","purgePrinterId","purgeFiles","allPrinters","filePath","purgeFile"],"mappings":"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"}

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

@@ -16,7 +16,7 @@ class PrinterSocketStore {
     socketFactory;
     eventEmitter2;
     printerCache;
-    printerSocketAdaptersById = {};
+    printerSocketAdaptersById = new Map();
     logger;
     constructor(loggerFactory, socketFactory, eventEmitter2, printerCache){
         this.socketFactory = socketFactory;
@@ -27,7 +27,7 @@ class PrinterSocketStore {
     }
     getSocketStatesById() {
         const socketStatesById = {};
-        Object.values(this.printerSocketAdaptersById).forEach((s)=>{
+        this.printerSocketAdaptersById.forEach((s)=>{
             if (!s.printerId) {
                 return;
             }
@@ -43,21 +43,19 @@ class PrinterSocketStore {
     async loadPrinterSockets() {
         await this.printerCache.loadCache();
         const printerDtoList = await this.printerCache.listCachedPrinters(false);
-        this.printerSocketAdaptersById = {};
+        this.printerSocketAdaptersById.clear();
         for (const printerDto of printerDtoList){
             try {
-                this.handlePrinterCreated({
-                    printer: printerDto
-                });
+                this.createOrUpdateSocket(printerDto);
             } catch (e) {
                 (0, _node.captureException)(e);
                 this.logger.error("PrinterSocketStore failed to construct new socket.", (0, _errorutils.errorSummary)(e));
             }
         }
-        this.logger.log(`Loaded ${Object.keys(this.printerSocketAdaptersById).length} printer sockets`);
+        this.logger.log(`Loaded ${this.printerSocketAdaptersById.size} printer sockets`);
     }
     listPrinterSockets() {
-        return Object.values(this.printerSocketAdaptersById);
+        return Array.from(this.printerSocketAdaptersById.values());
     }
     reconnectPrinterAdapter(id) {
         const socket = this.getPrinterSocket(id);
@@ -66,7 +64,7 @@ class PrinterSocketStore {
         socket.resetSocketState();
     }
     getPrinterSocket(id) {
-        return this.printerSocketAdaptersById[id];
+        return this.printerSocketAdaptersById.get(id);
     }
     async reconnectPrinterSockets() {
         let reauthRequested = 0;
@@ -74,7 +72,7 @@ class PrinterSocketStore {
         const socketStates = {};
         const apiStates = {};
         const promisesReauth = [];
-        for (const socket of Object.values(this.printerSocketAdaptersById)){
+        for (const socket of this.printerSocketAdaptersById.values()){
             try {
                 if (socket.printerType === _printerapiinterface.OctoprintType && socket.needsReauth()) {
                     reauthRequested++;
@@ -87,7 +85,7 @@ class PrinterSocketStore {
         }
         await Promise.all(promisesReauth);
         const promisesOpenSocket = [];
-        for (const socket of Object.values(this.printerSocketAdaptersById)){
+        for (const socket of this.printerSocketAdaptersById.values()){
             try {
                 if (socket.needsSetup() || socket.needsReopen()) {
                     socketSetupRequested++;
@@ -110,21 +108,28 @@ class PrinterSocketStore {
     }
     createOrUpdateSocket(printer) {
         const { enabled, id } = printer;
-        let foundAdapter = this.printerSocketAdaptersById[id.toString()];
+        let foundAdapter = this.printerSocketAdaptersById.get(id);
         if (!enabled) {
             this.logger.log(`Printer is disabled. Deleting socket`);
             this.deleteSocket(id);
             return;
         }
-        if (!foundAdapter) {
-            foundAdapter = this.socketFactory.createInstance(printer.printerType);
-            this.printerSocketAdaptersById[id] = foundAdapter;
+        if (foundAdapter) {
+            if (foundAdapter.printerType === printer.printerType) {
+                foundAdapter.close();
+                this.logger.log(`Closing printer socket for update`);
+            } else {
+                this.logger.log(`Printer type changed from ${foundAdapter.printerType} to ${printer.printerType}. Creating new socket adapter`);
+                foundAdapter.close();
+                foundAdapter = this.socketFactory.createInstance(printer.printerType);
+                this.printerSocketAdaptersById.set(id, foundAdapter);
+            }
         } else {
-            foundAdapter.close();
-            this.logger.log(`Closing printer socket for update`);
+            foundAdapter = this.socketFactory.createInstance(printer.printerType);
+            this.printerSocketAdaptersById.set(id, foundAdapter);
         }
         foundAdapter.registerCredentials({
-            printerId: printer.id.toString(),
+            printerId: printer.id,
             loginDto: {
                 apiKey: printer.apiKey,
                 username: printer.username,
@@ -161,10 +166,10 @@ class PrinterSocketStore {
         this.eventEmitter2.on(_eventconstants.printerEvents.batchPrinterCreated, this.handleBatchPrinterCreated.bind(this));
     }
     deleteSocket(printerId) {
-        const socket = this.printerSocketAdaptersById[printerId];
+        const socket = this.printerSocketAdaptersById.get(printerId);
         socket?.disallowEmittingEvents();
         socket?.close();
-        delete this.printerSocketAdaptersById[printerId];
+        this.printerSocketAdaptersById.delete(printerId);
     }
 }
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer-socket.store.ts"],"names":["PrinterSocketStore","printerSocketAdaptersById","logger","loggerFactory","socketFactory","eventEmitter2","printerCache","name","subscribeToEvents","getSocketStatesById","socketStatesById","Object","values","forEach","s","printerId","printerType","socket","socketState","api","apiState","loadPrinterSockets","loadCache","printerDtoList","listCachedPrinters","printerDto","handlePrinterCreated","printer","e","captureException","error","errorSummary","log","keys","length","listPrinterSockets","reconnectPrinterAdapter","id","getPrinterSocket","close","resetSocketState","reconnectPrinterSockets","reauthRequested","socketSetupRequested","socketStates","apiStates","promisesReauth","OctoprintType","needsReauth","promise","reauthSession","catch","push","Promise","all","promisesOpenSocket","needsSetup","needsReopen","setupSocketSession","then","open","keySocket","valSocket","keyApi","valApi","createOrUpdateSocket","enabled","foundAdapter","toString","deleteSocket","createInstance","registerCredentials","loginDto","apiKey","username","password","printerURL","handleBatchPrinterCreated","event","printers","handlePrinterUpdated","handlePrintersDeleted","printerIds","on","printerEvents","printerCreated","bind","printersDeleted","printerUpdated","batchPrinterCreated","disallowEmittingEvents"],"mappings":";;;;+BA6BaA;;;eAAAA;;;sBA7BoB;4BACJ;gCAOtB;qCAQuB;AAavB,MAAMA;;;;IACXC,4BAA+D,CAAC,EAAE;IACjDC,OAAsB;IAEvC,YACEC,aAA6B,EAC7B,AAAiBC,aAA4B,EAC7C,AAAiBC,aAA4B,EAC7C,AAAiBC,YAA0B,CAC3C;aAHiBF,gBAAAA;aACAC,gBAAAA;aACAC,eAAAA;QAEjB,IAAI,CAACJ,MAAM,GAAGC,cAAcH,mBAAmBO,IAAI;QAEnD,IAAI,CAACC,iBAAiB;IACxB;IAEAC,sBAAsB;QACpB,MAAMC,mBAAwD,CAAC;QAC/DC,OAAOC,MAAM,CAAC,IAAI,CAACX,yBAAyB,EAAEY,OAAO,CAAC,CAACC;YACrD,IAAI,CAACA,EAAEC,SAAS,EAAE;gBAChB;YACF;YAEAL,gBAAgB,CAACI,EAAEC,SAAS,CAAC,GAAG;gBAC9BA,WAAWD,EAAEC,SAAS;gBACtBC,aAAaF,EAAEE,WAAW;gBAC1BC,QAAQH,EAAEI,WAAW;gBACrBC,KAAKL,EAAEM,QAAQ;YACjB;QACF;QACA,OAAOV;IACT;IAEA,MAAMW,qBAAqB;QACzB,MAAM,IAAI,CAACf,YAAY,CAACgB,SAAS;QAEjC,MAAMC,iBAAiB,MAAM,IAAI,CAACjB,YAAY,CAACkB,kBAAkB,CAAC;QAClE,IAAI,CAACvB,yBAAyB,GAAG,CAAC;QAClC,KAAK,MAAMwB,cAAcF,eAAgB;YACvC,IAAI;gBACF,IAAI,CAACG,oBAAoB,CAAC;oBAAEC,SAASF;gBAAW;YAClD,EAAE,OAAOG,GAAG;gBACVC,IAAAA,sBAAgB,EAACD;gBACjB,IAAI,CAAC1B,MAAM,CAAC4B,KAAK,CAAC,sDAAsDC,IAAAA,wBAAY,EAACH;YACvF;QACF;QAEA,IAAI,CAAC1B,MAAM,CAAC8B,GAAG,CAAC,CAAC,OAAO,EAAErB,OAAOsB,IAAI,CAAC,IAAI,CAAChC,yBAAyB,EAAEiC,MAAM,CAAC,gBAAgB,CAAC;IAChG;IAEAC,qBAAqB;QACnB,OAAOxB,OAAOC,MAAM,CAAC,IAAI,CAACX,yBAAyB;IACrD;IAEAmC,wBAAwBC,EAAU,EAAE;QAClC,MAAMpB,SAAS,IAAI,CAACqB,gBAAgB,CAACD;QACrC,IAAI,CAACpB,QAAQ;QAEbA,OAAOsB,KAAK;QAGZtB,OAAOuB,gBAAgB;IACzB;IAEAF,iBAAiBD,EAAU,EAAiC;QAC1D,OAAO,IAAI,CAACpC,yBAAyB,CAACoC,GAAG;IAC3C;IAKA,MAAMI,0BAAyC;QAC7C,IAAIC,kBAAkB;QACtB,IAAIC,uBAAuB;QAC3B,MAAMC,eAAwC,CAAC;QAC/C,MAAMC,YAAqC,CAAC;QAC5C,MAAMC,iBAAiB,EAAE;QACzB,KAAK,MAAM7B,UAAUN,OAAOC,MAAM,CAAC,IAAI,CAACX,yBAAyB,EAAG;YAClE,IAAI;gBACF,IAAIgB,OAAOD,WAAW,KAAK+B,kCAAa,IAAI,AAAC9B,OAAqC+B,WAAW,IAAI;oBAC/FN;oBAEA,MAAMO,UAAUhC,OAAOiC,aAAa,GAAGC,KAAK;oBAE5CL,eAAeM,IAAI,CAACH;gBACtB;YACF,EAAE,OAAOrB,GAAG;gBACVC,IAAAA,sBAAgB,EAACD;YACnB;QACF;QAEA,MAAMyB,QAAQC,GAAG,CAACR;QAElB,MAAMS,qBAA4B,EAAE;QACpC,KAAK,MAAMtC,UAAUN,OAAOC,MAAM,CAAC,IAAI,CAACX,yBAAyB,EAAG;YAClE,IAAI;gBACF,IAAIgB,OAAOuC,UAAU,MAAMvC,OAAOwC,WAAW,IAAI;oBAC/Cd;oBACA,MAAMM,UAAUhC,OACbyC,kBAAkB,GAClBC,IAAI,CAAC;wBACJ1C,OAAO2C,IAAI;oBACb,GACCT,KAAK;oBACRI,mBAAmBH,IAAI,CAACH;gBAC1B;YACF,EAAE,OAAOrB,GAAG;gBACVC,IAAAA,sBAAgB,EAACD;YACnB;YAEA,MAAMiC,YAAY5C,OAAOC,WAAW;YACpC,MAAM4C,YAAYlB,YAAY,CAACiB,UAAU;YACzCjB,YAAY,CAACiB,UAAU,GAAGC,YAAYA,YAAY,IAAI;YACtD,MAAMC,SAAS9C,OAAOG,QAAQ;YAC9B,MAAM4C,SAASnB,SAAS,CAACkB,OAAO;YAChClB,SAAS,CAACkB,OAAO,GAAGC,SAASA,SAAS,IAAI;QAC5C;QAEA,MAAMX,QAAQC,GAAG,CAACC;IACpB;IAEAU,qBAAqBtC,OAA2B,EAAE;QAChD,MAAM,EAAEuC,OAAO,EAAE7B,EAAE,EAAE,GAAGV;QACxB,IAAIwC,eAAe,IAAI,CAAClE,yBAAyB,CAACoC,GAAG+B,QAAQ,GAAG;QAGhE,IAAI,CAACF,SAAS;YACZ,IAAI,CAAChE,MAAM,CAAC8B,GAAG,CAAC,CAAC,oCAAoC,CAAC;YACtD,IAAI,CAACqC,YAAY,CAAChC;YAClB;QACF;QAGA,IAAI,CAAC8B,cAAc;YACjBA,eAAe,IAAI,CAAC/D,aAAa,CAACkE,cAAc,CAAC3C,QAAQX,WAAW;YACpE,IAAI,CAACf,yBAAyB,CAACoC,GAAG,GAAG8B;QACvC,OAAO;YACLA,aAAa5B,KAAK;YAClB,IAAI,CAACrC,MAAM,CAAC8B,GAAG,CAAC,CAAC,iCAAiC,CAAC;QACrD;QAGAmC,aAAaI,mBAAmB,CAAC;YAC/BxD,WAAWY,QAAQU,EAAE,CAAC+B,QAAQ;YAC9BI,UAAU;gBACRC,QAAQ9C,QAAQ8C,MAAM;gBACtBC,UAAU/C,QAAQ+C,QAAQ;gBAC1BC,UAAUhD,QAAQgD,QAAQ;gBAC1BC,YAAYjD,QAAQiD,UAAU;gBAC9B5D,aAAaW,QAAQX,WAAW;YAClC;QACF;QACAmD,aAAa3B,gBAAgB;IAC/B;IAEQqC,0BAA0BC,KAA+B,EAAE;QACjE,KAAK,MAAMnD,WAAWmD,MAAMC,QAAQ,CAAE;YACpC,IAAI,CAACrD,oBAAoB,CAAC;gBAAEC;YAAQ;QACtC;IACF;IAEQD,qBAAqBoD,KAA0B,EAAE;QACvD,IAAI,CAACb,oBAAoB,CAACa,MAAMnD,OAAO;IACzC;IAEQqD,qBAAqBF,KAA0B,EAAE;QACvD,IAAI,CAAC5E,MAAM,CAAC8B,GAAG,CAAC,CAAC,gCAAgC,CAAC;QAClD,IAAI,CAACiC,oBAAoB,CAACa,MAAMnD,OAAO;IACzC;IAEQsD,sBAAsBH,KAA2B,EAAE;QACzDA,MAAMI,UAAU,CAACrE,OAAO,CAAC,CAACwB;YACxB,IAAI,CAACgC,YAAY,CAAChC;QACpB;IACF;IAEQ7B,oBAAoB;QAC1B,IAAI,CAACH,aAAa,CAAC8E,EAAE,CAACC,6BAAa,CAACC,cAAc,EAAE,IAAI,CAAC3D,oBAAoB,CAAC4D,IAAI,CAAC,IAAI;QACvF,IAAI,CAACjF,aAAa,CAAC8E,EAAE,CAACC,6BAAa,CAACG,eAAe,EAAE,IAAI,CAACN,qBAAqB,CAACK,IAAI,CAAC,IAAI;QACzF,IAAI,CAACjF,aAAa,CAAC8E,EAAE,CAACC,6BAAa,CAACI,cAAc,EAAE,IAAI,CAACR,oBAAoB,CAACM,IAAI,CAAC,IAAI;QACvF,IAAI,CAACjF,aAAa,CAAC8E,EAAE,CAACC,6BAAa,CAACK,mBAAmB,EAAE,IAAI,CAACZ,yBAAyB,CAACS,IAAI,CAAC,IAAI;IACnG;IAEQjB,aAAatD,SAAiB,EAAE;QACtC,MAAME,SAAS,IAAI,CAAChB,yBAAyB,CAACc,UAAU;QAGxDE,QAAQyE;QAERzE,QAAQsB;QAGR,OAAO,IAAI,CAACtC,yBAAyB,CAACc,UAAU;IAClD;AACF"}
+{"version":3,"sources":["../../src/state/printer-socket.store.ts"],"names":["PrinterSocketStore","printerSocketAdaptersById","Map","logger","loggerFactory","socketFactory","eventEmitter2","printerCache","name","subscribeToEvents","getSocketStatesById","socketStatesById","forEach","s","printerId","printerType","socket","socketState","api","apiState","loadPrinterSockets","loadCache","printerDtoList","listCachedPrinters","clear","printerDto","createOrUpdateSocket","e","captureException","error","errorSummary","log","size","listPrinterSockets","Array","from","values","reconnectPrinterAdapter","id","getPrinterSocket","close","resetSocketState","get","reconnectPrinterSockets","reauthRequested","socketSetupRequested","socketStates","apiStates","promisesReauth","OctoprintType","needsReauth","promise","reauthSession","catch","push","Promise","all","promisesOpenSocket","needsSetup","needsReopen","setupSocketSession","then","open","keySocket","valSocket","keyApi","valApi","printer","enabled","foundAdapter","deleteSocket","createInstance","set","registerCredentials","loginDto","apiKey","username","password","printerURL","handleBatchPrinterCreated","event","printers","handlePrinterCreated","handlePrinterUpdated","handlePrintersDeleted","printerIds","on","printerEvents","printerCreated","bind","printersDeleted","printerUpdated","batchPrinterCreated","disallowEmittingEvents","delete"],"mappings":"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"}