@fdm-monster/server 1.8.3 → 1.9.0

package/dist/shared/websocket.adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/shared/websocket.adapter.ts"],"names":["WebsocketAdapter","socket","logger","eventEmittingAllowed","constructor","loggerFactory","name","isOpened","readyState","WebSocket","OPEN","close","allowEmittingEvents","disallowEmittingEvents","open","url","handshakeTimeout","AppConstants","defaultWebsocketHandshakeTimeout","onopen","event","onOpen","onerror","error","onError","onclose","onClose","onmessage","message","onMessage","data","sendMessage","payload","Promise","resolve","reject","send","afterOpened","afterClosed"],"mappings":";;;;+BAOaA;;;eAAAA;;;iCAPgB;oBAC2D;AAMjF,MAAMA;IACXC,OAAmB;IACTC,OAAsB;IAChCC,uBAAgC,KAAK;IAErCC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACH,MAAM,GAAGG,cAAcL,iBAAiBM,IAAI;IACnD;IAEA,IAAIC,WAAW;QACb,OAAO,IAAI,CAACN,MAAM,EAAEO,eAAeC,aAAS,CAACC,IAAI;IACnD;IAEOC,QAAQ;QACb,IAAI,CAACV,MAAM,EAAEU;QACb,OAAO,IAAI,CAACV,MAAM;IACpB;IAEOW,sBAAsB;QAC3B,IAAI,CAACT,oBAAoB,GAAG;IAC9B;IAEOU,yBAAyB;QAC9B,IAAI,CAACV,oBAAoB,GAAG;IAC9B;IASAW,KAAKC,GAAiB,EAAQ;QAC5B,IAAI,CAACd,MAAM,GAAG,IAAIQ,aAAS,CAACM,KAAK;YAC/BC,kBAAkBC,6BAAY,CAACC,gCAAgC;QACjE;QACA,IAAI,CAACjB,MAAM,CAACkB,MAAM,GAAG,CAACC,QAAU,IAAI,CAACC,MAAM,CAACD;QAC5C,IAAI,CAACnB,MAAM,CAACqB,OAAO,GAAG,CAACC,QAAU,IAAI,CAACC,OAAO,CAACD;QAC9C,IAAI,CAACtB,MAAM,CAACwB,OAAO,GAAG,CAACL,QAAU,IAAI,CAACM,OAAO,CAACN;QAC9C,IAAI,CAACnB,MAAM,CAAC0B,SAAS,GAAG,CAACC,UAAY,IAAI,CAACC,SAAS,CAACD,QAAQE,IAAI;IAClE;IASA,MAAgBC,YAAYC,OAAe,EAAiB;QAC1D,IAAI,CAAC,IAAI,CAACzB,QAAQ,IAAI,CAAC,IAAI,CAACN,MAAM,EAAE;YAClC,IAAI,CAACC,MAAM,CAACqB,KAAK,CAAC;YAClB;QACF;QACA,OAAO,MAAM,IAAIU,QAAQ,CAACC,SAASC;YACjC,IAAI,CAAClC,MAAM,CAAEmC,IAAI,CAACJ,SAAS,CAACT;gBAC1B,IAAIA,OAAOY,OAAOZ;gBAClBW;YACF;QACF;IACF;IASUV,QAAQD,KAAiB,EAAwB,CAAC;IASlDc,YAAYjB,KAAc,EAAwB,CAAC;IASnDkB,YAAYlB,KAAiB,EAAwB,CAAC;IAStDS,UAAUT,KAAW,EAAwB,CAAC;IAQxD,MAAcC,OAAOD,KAAc,EAAiB;QAClD,MAAM,IAAI,CAACiB,WAAW,CAACjB;IACzB;IAQA,MAAcM,QAAQN,KAAiB,EAAiB;QACtD,MAAM,IAAI,CAACkB,WAAW,CAAClB;IACzB;AACF"}
+{"version":3,"sources":["../../src/shared/websocket.adapter.ts"],"names":["WebsocketAdapter","socket","logger","eventEmittingAllowed","constructor","loggerFactory","name","isOpened","readyState","WebSocket","OPEN","close","allowEmittingEvents","disallowEmittingEvents","open","url","Error","handshakeTimeout","AppConstants","defaultWebsocketHandshakeTimeout","onopen","event","onOpen","onerror","error","onError","onclose","onClose","onmessage","message","onMessage","data","sendMessage","payload","Promise","resolve","reject","send","afterOpened","afterClosed"],"mappings":";;;;+BAOsBA;;;eAAAA;;;iCAPO;oBAC6C;AAMnE,MAAeA;IACpBC,OAAmB;IACTC,OAAsB;IAChCC,uBAAgC,KAAK;IAErCC,YAAYC,aAA6B,CAAE;QACzC,IAAI,CAACH,MAAM,GAAGG,cAAcL,iBAAiBM,IAAI;IACnD;IAEA,IAAIC,WAAW;QACb,OAAO,IAAI,CAACN,MAAM,EAAEO,eAAeC,aAAS,CAACC,IAAI;IACnD;IAEOC,QAAQ;QACb,IAAI,CAACV,MAAM,EAAEU;QACb,OAAO,IAAI,CAACV,MAAM;IACpB;IAEOW,sBAAsB;QAC3B,IAAI,CAACT,oBAAoB,GAAG;IAC9B;IAEOU,yBAAyB;QAC9B,IAAI,CAACV,oBAAoB,GAAG;IAC9B;IASAW,KAAKC,GAAS,EAAQ;QACpB,IAAI,CAACA,KAAK;YACR,MAAM,IAAIC,MAAM;QAClB;QACA,IAAI,CAACf,MAAM,GAAG,IAAIQ,aAAS,CAACM,KAAK;YAC/BE,kBAAkBC,6BAAY,CAACC,gCAAgC;QACjE;QACA,IAAI,CAAClB,MAAM,CAACmB,MAAM,GAAG,CAACC,QAAU,IAAI,CAACC,MAAM,CAACD;QAC5C,IAAI,CAACpB,MAAM,CAACsB,OAAO,GAAG,CAACC,QAAU,IAAI,CAACC,OAAO,CAACD;QAC9C,IAAI,CAACvB,MAAM,CAACyB,OAAO,GAAG,CAACL,QAAU,IAAI,CAACM,OAAO,CAACN;QAC9C,IAAI,CAACpB,MAAM,CAAC2B,SAAS,GAAG,CAACC,UAAY,IAAI,CAACC,SAAS,CAACD,QAAQE,IAAI;IAClE;IASA,MAAgBC,YAAYC,OAAe,EAAiB;QAC1D,IAAI,CAAC,IAAI,CAAC1B,QAAQ,IAAI,CAAC,IAAI,CAACN,MAAM,EAAE;YAClC,IAAI,CAACC,MAAM,CAACsB,KAAK,CAAC;YAClB;QACF;QACA,OAAO,MAAM,IAAIU,QAAQ,CAACC,SAASC;YACjC,IAAI,CAACnC,MAAM,CAAEoC,IAAI,CAACJ,SAAS,CAACT;gBAC1B,IAAIA,OAAOY,OAAOZ;gBAClBW;YACF;QACF;IACF;IA4CA,MAAcb,OAAOD,KAAc,EAAiB;QAClD,MAAM,IAAI,CAACiB,WAAW,CAACjB;IACzB;IAQA,MAAcM,QAAQN,KAAiB,EAAiB;QACtD,MAAM,IAAI,CAACkB,WAAW,CAAClB;IACzB;AACF"}

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

@@ -11,11 +11,12 @@ Object.defineProperty(exports, "FileUploadTrackerCache", {
 const _correlationtokenutil = require("../utils/correlation-token.util");
 const _eventconstants = require("../constants/event.constants");
 class FileUploadTrackerCache {
-    currentUploads = [];
     eventEmitter2;
+    currentUploads;
     logger;
-    constructor({ loggerFactory, eventEmitter2 }){
+    constructor(loggerFactory, eventEmitter2){
         this.eventEmitter2 = eventEmitter2;
+        this.currentUploads = [];
         this.logger = loggerFactory(FileUploadTrackerCache.name);
         this.eventEmitter2.on((0, _eventconstants.uploadProgressEvent)("*"), (token, progress)=>this.handleUploadProgress(token, progress));
         this.eventEmitter2.on((0, _eventconstants.uploadDoneEvent)("*"), (token)=>this.handleUploadDone(token));
@@ -50,7 +51,7 @@ class FileUploadTrackerCache {
         if (!upload) {
             return;
         }
-        upload.progress = event.progress;
+        upload.progress = event.progress ?? null;
     }
     handleUploadFailed(token, reason) {
         this.logger.log(`Upload tracker ${token} completed with failure`);
@@ -70,7 +71,7 @@ class FileUploadTrackerCache {
         trackedUpload.completed = true;
         trackedUpload.success = success;
         trackedUpload.completedAt = Date.now();
-        trackedUpload.reason = reason;
+        trackedUpload.reason = reason ?? null;
     }
 }
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/file-upload-tracker.cache.ts"],"names":["FileUploadTrackerCache","currentUploads","eventEmitter2","logger","constructor","loggerFactory","name","on","uploadProgressEvent","token","progress","handleUploadProgress","uploadDoneEvent","handleUploadDone","uploadFailedEvent","reason","handleUploadFailed","getUploads","current","getUpload","correlationToken","find","cu","addUploadTracker","multerFile","printerId","generateCorrelationToken","log","push","startedAt","Date","now","completed","completedAt","success","event","upload","markUploadDone","trackedUploadIndex","findIndex","warn","trackedUpload"],"mappings":";;;;+BASaA;;;eAAAA;;;sCAT4B;gCAC+B;AAQjE,MAAMA;IACHC,iBAAkC,EAAE,CAAC;IACrCC,cAA6B;IAC7BC,OAAsB;IAE9BC,YAAY,EAAEC,aAAa,EAAEH,aAAa,EAAmE,CAAE;QAC7G,IAAI,CAACA,aAAa,GAAGA;QACrB,IAAI,CAACC,MAAM,GAAGE,cAAcL,uBAAuBM,IAAI;QAEvD,IAAI,CAACJ,aAAa,CAACK,EAAE,CAACC,IAAAA,mCAAmB,EAAC,MAAM,CAACC,OAAOC,WAAa,IAAI,CAACC,oBAAoB,CAACF,OAAOC;QACtG,IAAI,CAACR,aAAa,CAACK,EAAE,CAACK,IAAAA,+BAAe,EAAC,MAAM,CAACH,QAAkB,IAAI,CAACI,gBAAgB,CAACJ;QACrF,IAAI,CAACP,aAAa,CAACK,EAAE,CAACO,IAAAA,iCAAiB,EAAC,MAAM,CAACL,OAAeM,SAAoB,IAAI,CAACC,kBAAkB,CAACP,OAAOM;IACnH;IAEAE,aAAa;QACX,OAAO;YACLC,SAAS,IAAI,CAACjB,cAAc;QAC9B;IACF;IAEAkB,UAAUC,gBAAwB,EAAE;QAClC,OAAO,IAAI,CAACnB,cAAc,CAACoB,IAAI,CAAC,CAACC,KAAOA,GAAGF,gBAAgB,KAAKA;IAClE;IAEAG,iBAAiBC,UAA+B,EAAEC,SAAiB,EAAE;QACnE,MAAML,mBAAmBM,IAAAA,8CAAwB;QACjD,IAAI,CAACvB,MAAM,CAACwB,GAAG,CAAC,CAAC,mCAAmC,EAAEP,kBAAkB;QAExE,IAAI,CAACnB,cAAc,CAAC2B,IAAI,CAAC;YACvBR;YACAK;YACAI,WAAWC,KAAKC,GAAG;YACnBP;YACAd,UAAU;YACVsB,WAAW;YACXC,aAAa;YACbC,SAAS;YACTnB,QAAQ;QACV;QAEA,OAAOK;IACT;IAEAT,qBAAqBF,KAAa,EAAE0B,KAAyB,EAAE;QAC7D,MAAMC,SAAS,IAAI,CAACjB,SAAS,CAACV;QAC9B,IAAI,CAAC2B,QAAQ;YACX;QACF;QACAA,OAAO1B,QAAQ,GAAGyB,MAAMzB,QAAQ;IAClC;IAEAM,mBAAmBP,KAAa,EAAEM,MAAe,EAAE;QACjD,IAAI,CAACZ,MAAM,CAACwB,GAAG,CAAC,CAAC,eAAe,EAAElB,MAAM,uBAAuB,CAAC;QAChE,IAAI,CAAC4B,cAAc,CAAC5B,OAAO,OAAOM;IACpC;IAEAF,iBAAiBJ,KAAa,EAAE;QAC9B,IAAI,CAACN,MAAM,CAACwB,GAAG,CAAC,CAAC,eAAe,EAAElB,MAAM,uBAAuB,CAAC;QAChE,IAAI,CAAC4B,cAAc,CAAC5B,OAAO;IAC7B;IAEA4B,eAAe5B,KAAa,EAAEyB,OAAgB,EAAEnB,MAAe,EAAE;QAC/D,MAAMuB,qBAAqB,IAAI,CAACrC,cAAc,CAACsC,SAAS,CAAC,CAACjB,KAAOA,GAAGF,gBAAgB,KAAKX;QACzF,IAAI6B,uBAAuB,CAAC,GAAG;YAC7B,IAAI,CAACnC,MAAM,CAACqC,IAAI,CAAC,CAAC,sDAAsD,EAAE/B,MAAM,8BAA8B,CAAC;YAC/G;QACF;QAEA,MAAMgC,gBAAgB,IAAI,CAACxC,cAAc,CAACqC,mBAAmB;QAE7DG,cAAcT,SAAS,GAAG;QAC1BS,cAAcP,OAAO,GAAGA;QACxBO,cAAcR,WAAW,GAAGH,KAAKC,GAAG;QACpCU,cAAc1B,MAAM,GAAGA;IACzB;AACF"}
+{"version":3,"sources":["../../src/state/file-upload-tracker.cache.ts"],"names":["FileUploadTrackerCache","currentUploads","logger","constructor","loggerFactory","eventEmitter2","name","on","uploadProgressEvent","token","progress","handleUploadProgress","uploadDoneEvent","handleUploadDone","uploadFailedEvent","reason","handleUploadFailed","getUploads","current","getUpload","correlationToken","find","cu","addUploadTracker","multerFile","printerId","generateCorrelationToken","log","push","startedAt","Date","now","completed","completedAt","success","event","upload","markUploadDone","trackedUploadIndex","findIndex","warn","trackedUpload"],"mappings":";;;;+BASaA;;;eAAAA;;;sCAT4B;gCAC+B;AAQjE,MAAMA;;IACMC,eAAqC;IAErCC,OAAsB;IAEvCC,YACEC,aAA6B,EAC7B,AAAiBC,aAA4B,CAC7C;aADiBA,gBAAAA;aANFJ,iBAAkC,EAAE;QAQnD,IAAI,CAACC,MAAM,GAAGE,cAAcJ,uBAAuBM,IAAI;QAEvD,IAAI,CAACD,aAAa,CAACE,EAAE,CAACC,IAAAA,mCAAmB,EAAC,MAAM,CAACC,OAAOC,WAAa,IAAI,CAACC,oBAAoB,CAACF,OAAOC;QACtG,IAAI,CAACL,aAAa,CAACE,EAAE,CAACK,IAAAA,+BAAe,EAAC,MAAM,CAACH,QAAkB,IAAI,CAACI,gBAAgB,CAACJ;QACrF,IAAI,CAACJ,aAAa,CAACE,EAAE,CAACO,IAAAA,iCAAiB,EAAC,MAAM,CAACL,OAAeM,SAC5D,IAAI,CAACC,kBAAkB,CAACP,OAAOM;IAEnC;IAEAE,aAAa;QACX,OAAO;YACLC,SAAS,IAAI,CAACjB,cAAc;QAC9B;IACF;IAEAkB,UAAUC,gBAAwB,EAAE;QAClC,OAAO,IAAI,CAACnB,cAAc,CAACoB,IAAI,CAAC,CAACC,KAAOA,GAAGF,gBAAgB,KAAKA;IAClE;IAEAG,iBAAiBC,UAA+B,EAAEC,SAAiB,EAAE;QACnE,MAAML,mBAAmBM,IAAAA,8CAAwB;QACjD,IAAI,CAACxB,MAAM,CAACyB,GAAG,CAAC,CAAC,mCAAmC,EAAEP,kBAAkB;QAExE,IAAI,CAACnB,cAAc,CAAC2B,IAAI,CAAC;YACvBR;YACAK;YACAI,WAAWC,KAAKC,GAAG;YACnBP;YACAd,UAAU;YACVsB,WAAW;YACXC,aAAa;YACbC,SAAS;YACTnB,QAAQ;QACV;QAEA,OAAOK;IACT;IAEAT,qBAAqBF,KAAa,EAAE0B,KAAyB,EAAE;QAC7D,MAAMC,SAAS,IAAI,CAACjB,SAAS,CAACV;QAC9B,IAAI,CAAC2B,QAAQ;YACX;QACF;QACAA,OAAO1B,QAAQ,GAAGyB,MAAMzB,QAAQ,IAAI;IACtC;IAEAM,mBAAmBP,KAAa,EAAEM,MAAe,EAAE;QACjD,IAAI,CAACb,MAAM,CAACyB,GAAG,CAAC,CAAC,eAAe,EAAElB,MAAM,uBAAuB,CAAC;QAChE,IAAI,CAAC4B,cAAc,CAAC5B,OAAO,OAAOM;IACpC;IAEAF,iBAAiBJ,KAAa,EAAE;QAC9B,IAAI,CAACP,MAAM,CAACyB,GAAG,CAAC,CAAC,eAAe,EAAElB,MAAM,uBAAuB,CAAC;QAChE,IAAI,CAAC4B,cAAc,CAAC5B,OAAO;IAC7B;IAEA4B,eAAe5B,KAAa,EAAEyB,OAAgB,EAAEnB,MAAe,EAAE;QAC/D,MAAMuB,qBAAqB,IAAI,CAACrC,cAAc,CAACsC,SAAS,CAAC,CAACjB,KAAOA,GAAGF,gBAAgB,KAAKX;QACzF,IAAI6B,uBAAuB,CAAC,GAAG;YAC7B,IAAI,CAACpC,MAAM,CAACsC,IAAI,CAAC,CAAC,sDAAsD,EAAE/B,MAAM,8BAA8B,CAAC;YAC/G;QACF;QAEA,MAAMgC,gBAAgB,IAAI,CAACxC,cAAc,CAACqC,mBAAmB;QAE7DG,cAAcT,SAAS,GAAG;QAC1BS,cAAcP,OAAO,GAAGA;QACxBO,cAAcR,WAAW,GAAGH,KAAKC,GAAG;QACpCU,cAAc1B,MAAM,GAAGA,UAAU;IACnC;AACF"}

package/dist/state/file.cache.js

@@ -13,7 +13,7 @@ class FileCache {
     printerFileStorage = {};
     totalFileCount = 0;
     logger;
-    constructor({ loggerFactory }){
+    constructor(loggerFactory){
         this.logger = loggerFactory(FileCache.name);
     }
     cachePrinterFiles(printerId, files) {

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","cachePrinterFiles","printerId","files","Error","updateCacheFileRefCount","getPrinterFiles","totalFiles","storage","Object","values","length","log","purgePrinterId","ValidationException","fileStorage","warn","purgeFile","filePath","fileIndex","findIndex","f","path","splice"],"mappings":";;;;+BAMaA;;;eAAAA;;;mCANuB;AAM7B,MAAMA;IACHC,qBAAgD,CAAC,EAAE;IACnDC,iBAAiB,EAAE;IAEnBC,OAAsB;IAE9BC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACF,MAAM,GAAGE,cAAcL,UAAUM,IAAI;IAC5C;IAEAC,kBAAkBC,SAAiB,EAAEC,KAAgB,EAAE;QACrD,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,OAAO,IAAI,CAACT,kBAAkB,CAACO,UAAU;IAC3C;IAEAG,0BAA0B;QACxB,IAAIE,aAAa;QACjB,KAAK,MAAMC,WAAWC,OAAOC,MAAM,CAAC,IAAI,CAACf,kBAAkB,EAAG;YAC5DY,cAAcC,SAASG,UAAU;QACnC;QAEA,IAAIJ,eAAe,IAAI,CAACX,cAAc,EAAE;YACtC,IAAI,CAACA,cAAc,GAAGW;YACtB,IAAI,CAACV,MAAM,CAACe,GAAG,CAAC,CAAC,eAAe,EAAE,IAAI,CAAChB,cAAc,CAAC,gCAAgC,CAAC;QACzF;QAEA,OAAOW;IACT;IAEAM,eAAeX,SAAiB,EAAE;QAChC,IAAI,CAACA,WAAW;YACd,MAAM,IAAIY,sCAAmB,CAAC;QAChC;QAEA,MAAMC,cAAc,IAAI,CAACpB,kBAAkB,CAACO,UAAU;QAEtD,IAAI,CAACa,aAAa;YAChB,IAAI,CAAClB,MAAM,CAACmB,IAAI,CAAC;YACjB;QACF;QAEA,OAAO,IAAI,CAACrB,kBAAkB,CAACO,UAAU;QAEzC,IAAI,CAACL,MAAM,CAACe,GAAG,CAAC,CAAC,yBAAyB,CAAC;IAC7C;IAEAK,UAAUf,SAAiB,EAAEgB,QAAgB,EAAE;QAC7C,MAAMf,QAAQ,IAAI,CAACG,eAAe,CAACJ;QACnC,IAAI,CAACC,OAAO;QAEZ,MAAMgB,YAAYhB,MAAMiB,SAAS,CAAC,CAACC,IAAMA,EAAEC,IAAI,KAAKJ;QACpD,IAAIC,cAAc,CAAC,GAAG;YAEpB,IAAI,CAACtB,MAAM,CAACmB,IAAI,CAAC,CAAC,6FAA6F,CAAC,EAAEE;YAElH,OAAO,IAAI,CAACrB,MAAM,CAACe,GAAG,CAAC;QACzB;QAEAT,MAAMoB,MAAM,CAACJ,WAAW;QACxB,IAAI,CAACtB,MAAM,CAACe,GAAG,CAAC,CAAC,2BAA2B,CAAC;IAC/C;AACF"}
+{"version":3,"sources":["../../src/state/file.cache.ts"],"names":["FileCache","printerFileStorage","totalFileCount","logger","constructor","loggerFactory","name","cachePrinterFiles","printerId","files","Error","updateCacheFileRefCount","getPrinterFiles","totalFiles","storage","Object","values","length","log","purgePrinterId","ValidationException","fileStorage","warn","purgeFile","filePath","fileIndex","findIndex","f","path","splice"],"mappings":";;;;+BAMaA;;;eAAAA;;;mCANuB;AAM7B,MAAMA;IACHC,qBAAgD,CAAC,EAAE;IACnDC,iBAAiB,EAAE;IAEVC,OAAsB;IAEvCC,YAAYC,aAA6B,CAAE;QACzC,IAAI,CAACF,MAAM,GAAGE,cAAcL,UAAUM,IAAI;IAC5C;IAEAC,kBAAkBC,SAAiB,EAAEC,KAAgB,EAAE;QACrD,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,OAAO,IAAI,CAACT,kBAAkB,CAACO,UAAU;IAC3C;IAEAG,0BAA0B;QACxB,IAAIE,aAAa;QACjB,KAAK,MAAMC,WAAWC,OAAOC,MAAM,CAAC,IAAI,CAACf,kBAAkB,EAAG;YAC5DY,cAAcC,SAASG,UAAU;QACnC;QAEA,IAAIJ,eAAe,IAAI,CAACX,cAAc,EAAE;YACtC,IAAI,CAACA,cAAc,GAAGW;YACtB,IAAI,CAACV,MAAM,CAACe,GAAG,CAAC,CAAC,eAAe,EAAE,IAAI,CAAChB,cAAc,CAAC,gCAAgC,CAAC;QACzF;QAEA,OAAOW;IACT;IAEAM,eAAeX,SAAiB,EAAE;QAChC,IAAI,CAACA,WAAW;YACd,MAAM,IAAIY,sCAAmB,CAAC;QAChC;QAEA,MAAMC,cAAc,IAAI,CAACpB,kBAAkB,CAACO,UAAU;QAEtD,IAAI,CAACa,aAAa;YAChB,IAAI,CAAClB,MAAM,CAACmB,IAAI,CAAC;YACjB;QACF;QAEA,OAAO,IAAI,CAACrB,kBAAkB,CAACO,UAAU;QAEzC,IAAI,CAACL,MAAM,CAACe,GAAG,CAAC,CAAC,yBAAyB,CAAC;IAC7C;IAEAK,UAAUf,SAAiB,EAAEgB,QAAgB,EAAE;QAC7C,MAAMf,QAAQ,IAAI,CAACG,eAAe,CAACJ;QACnC,IAAI,CAACC,OAAO;QAEZ,MAAMgB,YAAYhB,MAAMiB,SAAS,CAAC,CAACC,IAAMA,EAAEC,IAAI,KAAKJ;QACpD,IAAIC,cAAc,CAAC,GAAG;YAEpB,IAAI,CAACtB,MAAM,CAACmB,IAAI,CACd,CAAC,6FAA6F,CAAC,EAC/FE;YAGF,OAAO,IAAI,CAACrB,MAAM,CAACe,GAAG,CAAC;QACzB;QAEAT,MAAMoB,MAAM,CAACJ,WAAW;QACxB,IAAI,CAACtB,MAAM,CAACe,GAAG,CAAC,CAAC,2BAA2B,CAAC;IAC/C;AACF"}

package/dist/state/floor.store.js

@@ -12,9 +12,8 @@ const _keydiffcache = require("../utils/cache/key-diff.cache");
 class FloorStore extends _keydiffcache.KeyDiffCache {
     floorService;
     logger;
-    constructor({ floorService, loggerFactory }){
-        super();
-        this.floorService = floorService;
+    constructor(floorService, loggerFactory){
+        super(), this.floorService = floorService;
         this.logger = loggerFactory(FloorStore.name);
     }
     async loadStore() {
@@ -47,13 +46,14 @@ class FloorStore extends _keydiffcache.KeyDiffCache {
         return floorDto;
     }
     async delete(floorId) {
-        const deleteResult = await this.floorService.delete(floorId);
+        await this.floorService.delete(floorId);
         await this.deleteKeyValue(floorId);
-        return deleteResult;
     }
     async getFloor(floorId) {
         let floor = await this.getValue(floorId);
-        if (!!floor) return floor;
+        if (floor) {
+            return floor;
+        }
         const dbFloor = await this.floorService.get(floorId);
         const floorDto = this.floorService.toDto(dbFloor);
         await this.setKeyValue(floorId, floorDto, true);

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","logger","constructor","floorService","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","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

@@ -9,22 +9,18 @@ Object.defineProperty(exports, "PrinterEventsCache", {
     }
 });
 const _keydiffcache = require("../utils/cache/key-diff.cache");
-const _metricutils = require("../utils/metric.utils");
 const _eventconstants = require("../constants/event.constants");
+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");
 class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
-    logger;
     eventEmitter2;
-    settingsStore;
-    constructor({ eventEmitter2, loggerFactory, settingsStore }){
-        super();
-        this.settingsStore = settingsStore;
+    logger;
+    constructor(eventEmitter2, loggerFactory){
+        super(), this.eventEmitter2 = eventEmitter2;
         this.logger = loggerFactory(PrinterEventsCache.name);
-        this.eventEmitter2 = eventEmitter2;
         this.subscribeToEvents();
     }
-    get _debugMode() {
-        return this.settingsStore.getSettingsSensitive()?.server?.debugSettings?.debugSocketMessages;
-    }
     async deletePrinterSocketEvents(id) {
         await this.deleteKeyValue(id, true);
     }
@@ -58,7 +54,7 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
         };
         await this.setKeyValue(printerId, ref);
     }
-    async setSubstate(printerId, label, substateName, payload) {
+    async setSubState(printerId, label, substateName, payload) {
         const ref = await this.getOrCreateEvents(printerId);
         if (!ref[label]) {
             ref[label] = {};
@@ -69,12 +65,13 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
         };
         await this.setKeyValue(printerId, ref);
     }
-    async handlePrintersDeleted({ printerIds }) {
-        await this.deleteKeysBatch(printerIds);
+    async handlePrintersDeleted(event) {
+        await this.deleteKeysBatch(event.printerIds);
     }
     subscribeToEvents() {
-        this.eventEmitter2.on("octoprint.*", (e)=>this.onOctoPrintSocketMessage(e));
-        this.eventEmitter2.on("moonraker.*", (e)=>this.onMoonrakerSocketMessage(e));
+        this.eventEmitter2.on((0, _octoprintwebsocketadapter.octoPrintEvent)("*"), (e)=>this.onOctoPrintSocketMessage(e));
+        this.eventEmitter2.on((0, _moonrakerconstants.moonrakerEvent)("*"), (e)=>this.onMoonrakerSocketMessage(e));
+        this.eventEmitter2.on((0, _prusalinkconstants.prusaLinkEvent)("*"), (e)=>this.onPrusaLinkPollMessage(e));
         this.eventEmitter2.on(_eventconstants.printerEvents.printersDeleted, this.handlePrintersDeleted.bind(this));
     }
     async onOctoPrintSocketMessage(e) {
@@ -84,9 +81,6 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
             "event"
         ].includes(e.event)) {
             await this.setEvent(printerId, e.event, e.event === "history" ? this.pruneHistoryPayload(e.payload) : e.payload);
-            if (this._debugMode) {
-                this.logger.log(`Message '${e.event}' received, size ${(0, _metricutils.formatKB)(e.payload)}`, e.printerId);
-            }
         }
     }
     async onMoonrakerSocketMessage(e) {
@@ -99,11 +93,16 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
             await this.setEvent(printerId, eventType, e.payload);
         }
     }
+    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);
+        }
+    }
     pruneHistoryPayload(payload) {
-        delete payload.logs;
-        delete payload.temps;
-        delete payload.messages;
-        return payload;
+        const { logs, temps, messages, plugins, ...prunedPayload } = payload;
+        return prunedPayload;
     }
 }
 

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","getSettingsSensitive","server","debugSettings","debugSocketMessages","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","printerIds","deleteKeysBatch","on","e","onOctoPrintSocketMessage","onMoonrakerSocketMessage","printerEvents","printersDeleted","bind","includes","event","pruneHistoryPayload","log","formatKB","eventType","logs","temps","messages"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer-events.cache.ts"],"names":["PrinterEventsCache","KeyDiffCache","logger","constructor","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","printerEvents","printersDeleted","bind","includes","pruneHistoryPayload","eventType","debug","logs","temps","messages","plugins","prunedPayload"],"mappings":"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"}

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

@@ -14,28 +14,26 @@ class PrinterFilesStore {
     printerCache;
     fileCache;
     printerApiFactory;
-    octoprintClient;
     logger;
-    constructor({ printerCache, fileCache, printerApiFactory, octoprintClient, loggerFactory }){
+    constructor(loggerFactory, printerCache, fileCache, printerApiFactory){
         this.printerCache = printerCache;
-        this.printerApiFactory = printerApiFactory;
         this.fileCache = fileCache;
-        this.octoprintClient = octoprintClient;
+        this.printerApiFactory = printerApiFactory;
         this.logger = loggerFactory(PrinterFilesStore.name);
     }
     async loadFilesStore() {
         const printers = await this.printerCache.listCachedPrinters(true);
-        for (const printer of printers){
+        for (const printer of printers.filter((p)=>p.enabled)){
             try {
-                const printerFiles = await this.loadFiles(printer.id, false);
+                const printerFiles = await this.loadFiles(printer.id);
                 this.fileCache.cachePrinterFiles(printer.id, printerFiles);
             } catch (e) {
                 (0, _node.captureException)(e);
-                this.logger.error("Files store failed to load file list for printer");
+                this.logger.error(`Files store failed to load file list for printer ${printer.name}`);
             }
         }
     }
-    async loadFiles(printerId, recursive = false) {
+    async loadFiles(printerId) {
         const loginDto = await this.printerCache.getLoginDtoAsync(printerId);
         const printerApi = this.printerApiFactory.getScopedPrinter(loginDto);
         const files = await printerApi.getFiles();

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer-files.store.ts"],"names":["PrinterFilesStore","printerCache","fileCache","printerApiFactory","octoprintClient","logger","constructor","loggerFactory","name","loadFilesStore","printers","listCachedPrinters","printer","printerFiles","loadFiles","id","cachePrinterFiles","e","captureException","error","printerId","recursive","loginDto","getLoginDtoAsync","printerApi","getScopedPrinter","files","getFiles","getPrinterFiles","getOutdatedFiles","ageDaysMax","ValidationException","length","nowTimestampSeconds","Date","now","filter","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","constructor","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

@@ -13,27 +13,25 @@ const _errorutils = require("../utils/error.utils");
 const _eventconstants = require("../constants/event.constants");
 const _printerapiinterface = require("../services/printer-api.interface");
 class PrinterSocketStore {
-    socketIoGateway;
     socketFactory;
     eventEmitter2;
     printerCache;
-    printerSocketAdaptersById = {};
+    printerSocketAdaptersById;
     logger;
-    configService;
-    settingsStore;
-    constructor({ socketFactory, socketIoGateway, settingsStore, eventEmitter2, printerCache, loggerFactory, configService }){
-        this.printerCache = printerCache;
-        this.socketIoGateway = socketIoGateway;
+    constructor(loggerFactory, socketFactory, eventEmitter2, printerCache){
         this.socketFactory = socketFactory;
         this.eventEmitter2 = eventEmitter2;
-        this.settingsStore = settingsStore;
+        this.printerCache = printerCache;
+        this.printerSocketAdaptersById = {};
         this.logger = loggerFactory(PrinterSocketStore.name);
-        this.configService = configService;
         this.subscribeToEvents();
     }
     getSocketStatesById() {
         const socketStatesById = {};
         Object.values(this.printerSocketAdaptersById).forEach((s)=>{
+            if (!s.printerId) {
+                return;
+            }
             socketStatesById[s.printerId] = {
                 printerId: s.printerId,
                 printerType: s.printerType,
@@ -45,24 +43,24 @@ class PrinterSocketStore {
     }
     async loadPrinterSockets() {
         await this.printerCache.loadCache();
-        const printerDocs = await this.printerCache.listCachedPrinters(false);
+        const printerDtoList = await this.printerCache.listCachedPrinters(false);
         this.printerSocketAdaptersById = {};
-        for (const doc of printerDocs){
+        for (const printerDto of printerDtoList){
             try {
-                await this.handlePrinterCreated({
-                    printer: doc
+                this.handlePrinterCreated({
+                    printer: printerDto
                 });
             } catch (e) {
                 (0, _node.captureException)(e);
-                this.logger.error("PrinterSocketStore failed to construct new OctoPrint socket.", (0, _errorutils.errorSummary)(e));
+                this.logger.error("PrinterSocketStore failed to construct new socket.", (0, _errorutils.errorSummary)(e));
             }
         }
-        this.logger.log(`Loaded ${Object.keys(this.printerSocketAdaptersById).length} printer OctoPrint sockets`);
+        this.logger.log(`Loaded ${Object.keys(this.printerSocketAdaptersById).length} printer sockets`);
     }
     listPrinterSockets() {
         return Object.values(this.printerSocketAdaptersById);
     }
-    reconnectOctoPrint(id) {
+    reconnectPrinterAdapter(id) {
         const socket = this.getPrinterSocket(id);
         if (!socket) return;
         socket.close();
@@ -77,44 +75,29 @@ class PrinterSocketStore {
         const socketStates = {};
         const apiStates = {};
         const promisesReauth = [];
-        const failedSocketsReauth = [];
         for (const socket of Object.values(this.printerSocketAdaptersById)){
             try {
                 if (socket.printerType === _printerapiinterface.OctoprintType && socket.needsReauth()) {
                     reauthRequested++;
-                    const promise = socket.reauthSession().catch((_)=>{
-                        failedSocketsReauth.push(socket.printerId);
-                    });
+                    const promise = socket.reauthSession().catch();
                     promisesReauth.push(promise);
                 }
             } catch (e) {
-                if (this.settingsStore.getDebugSettingsSensitive()?.debugSocketSetup) {
-                    this.logger.log("Failed to reauth printer socket", (0, _errorutils.errorSummary)(e));
-                }
                 (0, _node.captureException)(e);
             }
         }
         await Promise.all(promisesReauth);
         const promisesOpenSocket = [];
-        const failedSocketReopened = [];
         for (const socket of Object.values(this.printerSocketAdaptersById)){
             try {
                 if (socket.needsSetup() || socket.needsReopen()) {
-                    if (this.settingsStore.getDebugSettingsSensitive()?.debugSocketSetup) {
-                        this.logger.log(`Reopening socket for printerId '${socket.printerId}' (setup: ${socket.needsSetup()}, reopen: ${socket.needsReopen()})`);
-                    }
                     socketSetupRequested++;
                     const promise = socket.setupSocketSession().then(()=>{
                         socket.open();
-                    }).catch((_)=>{
-                        failedSocketReopened.push(socket.printerId);
-                    });
+                    }).catch();
                     promisesOpenSocket.push(promise);
                 }
             } catch (e) {
-                if (this.settingsStore.getDebugSettingsSensitive()?.debugSocketSetup) {
-                    this.logger.log(`Failed to setup printer socket ${(0, _errorutils.errorSummary)(e)}`);
-                }
                 (0, _node.captureException)(e);
             }
             const keySocket = socket.socketState;
@@ -125,14 +108,6 @@ class PrinterSocketStore {
             apiStates[keyApi] = valApi ? valApi + 1 : 1;
         }
         await Promise.all(promisesOpenSocket);
-        return {
-            reauth: reauthRequested,
-            failedSocketReopened,
-            failedSocketsReauth,
-            socketSetup: socketSetupRequested,
-            socket: socketStates,
-            api: apiStates
-        };
     }
     createOrUpdateSocket(printer) {
         const { enabled, id } = printer;
@@ -153,28 +128,30 @@ class PrinterSocketStore {
             printerId: printer.id.toString(),
             loginDto: {
                 apiKey: printer.apiKey,
+                username: printer.username,
+                password: printer.password,
                 printerURL: printer.printerURL,
                 printerType: printer.printerType
             }
         });
         foundAdapter.resetSocketState();
     }
-    handleBatchPrinterCreated({ printers }) {
-        for (const p of printers){
+    handleBatchPrinterCreated(event) {
+        for (const printer of event.printers){
             this.handlePrinterCreated({
-                printer: p
+                printer
             });
         }
     }
-    handlePrinterCreated({ printer }) {
-        this.createOrUpdateSocket(printer);
+    handlePrinterCreated(event) {
+        this.createOrUpdateSocket(event.printer);
     }
-    handlePrinterUpdated({ printer }) {
+    handlePrinterUpdated(event) {
         this.logger.log(`Printer updated. Updating socket`);
-        this.createOrUpdateSocket(printer);
+        this.createOrUpdateSocket(event.printer);
     }
-    handlePrintersDeleted({ printerIds }) {
-        printerIds.forEach((id)=>{
+    handlePrintersDeleted(event) {
+        event.printerIds.forEach((id)=>{
             this.deleteSocket(id);
         });
     }

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","printerType","socket","socketState","api","apiState","loadPrinterSockets","loadCache","printerDocs","listCachedPrinters","doc","handlePrinterCreated","printer","e","captureException","error","errorSummary","log","keys","length","listPrinterSockets","reconnectOctoPrint","id","getPrinterSocket","close","resetSocketState","reconnectPrinterSockets","reauthRequested","socketSetupRequested","socketStates","apiStates","promisesReauth","failedSocketsReauth","OctoprintType","needsReauth","promise","reauthSession","catch","_","push","getDebugSettingsSensitive","debugSocketSetup","Promise","all","promisesOpenSocket","failedSocketReopened","needsSetup","needsReopen","setupSocketSession","then","open","keySocket","valSocket","keyApi","valApi","reauth","socketSetup","createOrUpdateSocket","enabled","foundAdapter","toString","deleteSocket","createInstance","registerCredentials","loginDto","apiKey","printerURL","handleBatchPrinterCreated","printers","p","handlePrinterUpdated","handlePrintersDeleted","printerIds","on","printerEvents","printerCreated","bind","printersDeleted","printerUpdated","batchPrinterCreated","disallowEmittingEvents"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer-socket.store.ts"],"names":["PrinterSocketStore","printerSocketAdaptersById","logger","constructor","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":"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"}

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

@@ -31,16 +31,12 @@ const gcodeMaxLinesToRead = 10000;
 class PrinterThumbnailCache extends _keydiffcache.KeyDiffCache {
     printerCache;
     printerApiFactory;
-    logger;
     eventEmitter2;
     settingsStore;
-    constructor({ printerCache, printerApiFactory, loggerFactory, eventEmitter2, settingsStore }){
-        super();
-        this.printerCache = printerCache;
-        this.printerApiFactory = printerApiFactory;
+    logger;
+    constructor(loggerFactory, printerCache, printerApiFactory, eventEmitter2, settingsStore){
+        super(), this.printerCache = printerCache, this.printerApiFactory = printerApiFactory, this.eventEmitter2 = eventEmitter2, this.settingsStore = settingsStore;
         this.logger = loggerFactory(PrinterThumbnailCache.name);
-        this.eventEmitter2 = eventEmitter2;
-        this.settingsStore = settingsStore;
         this.eventEmitter2.on(_eventconstants.printerEvents.printersDeleted, this.handlePrintersDeleted.bind(this));
     }
     async resetCache() {
@@ -64,9 +60,9 @@ class PrinterThumbnailCache extends _keydiffcache.KeyDiffCache {
             }
         }
     }
-    async handlePrintersDeleted({ printerIds }) {
+    async handlePrintersDeleted(event) {
         if (!this.settingsStore.isThumbnailSupportEnabled()) return;
-        for (const printerId of printerIds){
+        for (const printerId of event.printerIds){
             await this.removeThumbnailFile(printerId);
             await this.unsetPrinterThumbnail(printerId);
         }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer-thumbnail.cache.ts"],"names":["PrinterThumbnailCache","gcodeMaxLinesToRead","KeyDiffCache","printerCache","printerApiFactory","logger","eventEmitter2","settingsStore","constructor","loggerFactory","name","on","printerEvents","printersDeleted","handlePrintersDeleted","bind","resetCache","keys","Object","keyValueStore","deleteKeysBatch","loadCache","isThumbnailSupportEnabled","printers","listCachedPrinters","baseFolder","join","superRootPath","AppConstants","defaultPrinterThumbnailsStorage","resetDiffs","forEach","key","printer","printerIdStr","id","toString","thumbnailFile","existsSync","data","readFileSync","setPrinterThumbnail","printerIds","printerId","removeThumbnailFile","unsetPrinterThumbnail","imageData","setKeyValue","thumbnailBase64","deleteKeyValue","loadPrinterThumbnailRemote","login","file","thumbnailData","extractRemoteThumbnailBase64","writeThumbnailFile","e","error","captureException","loadPrinterThumbnailLocal","extractThumbnailBase64","length","thumbnailPath","ensureDirExists","writeFile","rmSync","lines","readRemoteGcodeLines","Error","collecting","currentThumbnailBase64","index","line","startsWith","includes","trim","replace","numberOfLines","fromEnd","endCondition","getScopedPrinter","fileData","getFile","fileSize","size","position","iterationsLeft","bytesToRead","Math","min","gcodeScanningChunkSize","start","end","remoteChunk","getFileChunk","chunkLines","split","concat","endIndex","findIndex","slice","gcodePath","fileStream","createReadStream","rl","createInterface","input","crlfDelay","Infinity","close","Buffer","from"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer-thumbnail.cache.ts"],"names":["PrinterThumbnailCache","gcodeMaxLinesToRead","KeyDiffCache","logger","constructor","loggerFactory","printerCache","printerApiFactory","eventEmitter2","settingsStore","name","on","printerEvents","printersDeleted","handlePrintersDeleted","bind","resetCache","keys","Object","keyValueStore","deleteKeysBatch","loadCache","isThumbnailSupportEnabled","printers","listCachedPrinters","baseFolder","join","superRootPath","AppConstants","defaultPrinterThumbnailsStorage","resetDiffs","forEach","key","printer","printerIdStr","id","toString","thumbnailFile","existsSync","data","readFileSync","setPrinterThumbnail","event","printerId","printerIds","removeThumbnailFile","unsetPrinterThumbnail","imageData","setKeyValue","thumbnailBase64","deleteKeyValue","loadPrinterThumbnailRemote","login","file","thumbnailData","extractRemoteThumbnailBase64","writeThumbnailFile","e","error","captureException","loadPrinterThumbnailLocal","extractThumbnailBase64","length","thumbnailPath","ensureDirExists","writeFile","rmSync","lines","readRemoteGcodeLines","Error","collecting","currentThumbnailBase64","index","line","startsWith","includes","trim","replace","numberOfLines","fromEnd","endCondition","getScopedPrinter","fileData","getFile","fileSize","size","position","iterationsLeft","bytesToRead","Math","min","gcodeScanningChunkSize","start","end","remoteChunk","getFileChunk","chunkLines","split","concat","endIndex","findIndex","slice","gcodePath","fileStream","createReadStream","rl","createInterface","input","crlfDelay","Infinity","close","Buffer","from"],"mappings":"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"}