@fdm-monster/server 1.8.2 → 1.9.0-rc1

package/dist/shared/websocket-rpc-extended.adapter.js

@@ -10,17 +10,18 @@ Object.defineProperty(exports, "WebsocketRpcExtendedAdapter", {
 });
 const _websocketadapter = require("./websocket.adapter");
 class WebsocketRpcExtendedAdapter extends _websocketadapter.WebsocketAdapter {
-    constructor({ loggerFactory }){
-        super({
-            loggerFactory
-        });
+    requestMap;
+    constructor(loggerFactory){
+        super(loggerFactory);
         this.logger = loggerFactory(WebsocketRpcExtendedAdapter.name);
         this.requestMap = new Map();
     }
-    requestMap;
     sendRequest(request, options = {
         timeout: 10000
     }) {
+        if (!this.socket) {
+            throw new Error("Websocket was not created, cannot send request");
+        }
         request.id = request.id++;
         const requestId = request.id;
         const promise = new Promise((resolve, reject)=>{
@@ -37,19 +38,12 @@ class WebsocketRpcExtendedAdapter extends _websocketadapter.WebsocketAdapter {
         this.socket.send(JSON.stringify(request));
         return promise;
     }
-    clearRequest(requestId) {
-        const request = this.requestMap.get(requestId);
-        if (request) {
-            clearTimeout(request.timeout);
-            this.requestMap.delete(requestId);
-        }
-    }
-    onMessage(message) {
+    async onMessage(message) {
         const response = JSON.parse(message.toString());
         const requestId = response.id;
         if (!requestId) {
             const event = response;
-            return this.onEventMessage(event);
+            return await this.onEventMessage(event);
         }
         const request = this.requestMap.get(requestId);
         if (!request) {
@@ -62,6 +56,13 @@ class WebsocketRpcExtendedAdapter extends _websocketadapter.WebsocketAdapter {
             this.requestMap.delete(requestId);
         }
     }
+    clearRequest(requestId) {
+        const request = this.requestMap.get(requestId);
+        if (request) {
+            clearTimeout(request.timeout);
+            this.requestMap.delete(requestId);
+        }
+    }
 }
 
 //# sourceMappingURL=websocket-rpc-extended.adapter.js.map

package/dist/shared/websocket-rpc-extended.adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/shared/websocket-rpc-extended.adapter.ts"],"names":["WebsocketRpcExtendedAdapter","WebsocketAdapter","loggerFactory","logger","name","requestMap","Map","sendRequest","request","options","timeout","id","requestId","promise","Promise","resolve","reject","setTimeout","clearRequest","Error","Math","min","set","socket","send","JSON","stringify","get","clearTimeout","delete","onMessage","message","response","parse","toString","event","onEventMessage","warn"],"mappings":";;;;+BAQsBA;;;eAAAA;;;kCARW;AAQ1B,MAAeA,oCAAoCC,kCAAgB;IAExE,YAAsB,EAAEC,aAAa,EAAqC,CAAE;QAC1E,KAAK,CAAC;YAAEA;QAAc;QAEtB,IAAI,CAACC,MAAM,GAAGD,cAAcF,4BAA4BI,IAAI;QAE5D,IAAI,CAACC,UAAU,GAAG,IAAIC;IACxB;IAEQD,WAON;IAEFE,YAAwBC,OAA6B,EAAEC,UAAU;QAAEC,SAAS;IAAM,CAAC,EAAkC;QACnHF,QAAQG,EAAE,GAAGH,QAAQG,EAAE;QAGvB,MAAMC,YAAYJ,QAAQG,EAAE;QAC5B,MAAME,UAAU,IAAIC,QAA+B,CAACC,SAASC;YAC3D,MAAMN,UAAUO,WAAW;gBACzB,IAAI,CAACC,YAAY,CAACN;gBAClBI,OAAO,IAAIG,MAAM,CAAC,4BAA4B,EAAEP,UAAU,UAAU,CAAC;YACvE,GAAGQ,KAAKC,GAAG,CAAC,MAAMZ,SAASC,YAAY;YAEvC,IAAI,CAACL,UAAU,CAACiB,GAAG,CAACV,WAAW;gBAAEG;gBAASC;gBAAQN;YAAQ;QAC5D;QAGA,IAAI,CAACa,MAAM,CAACC,IAAI,CAACC,KAAKC,SAAS,CAAClB;QAEhC,OAAOK;IACT;IAEQK,aAAaN,SAAiB,EAAQ;QAC5C,MAAMJ,UAAU,IAAI,CAACH,UAAU,CAACsB,GAAG,CAACf;QACpC,IAAIJ,SAAS;YACXoB,aAAapB,QAAQE,OAAO;YAC5B,IAAI,CAACL,UAAU,CAACwB,MAAM,CAACjB;QACzB;IACF;IASUkB,UAAUC,OAAa,EAAQ;QACvC,MAAMC,WAAoCP,KAAKQ,KAAK,CAACF,QAAQG,QAAQ;QACrE,MAAMtB,YAAYoB,SAASrB,EAAE;QAC7B,IAAI,CAACC,WAAW;YACd,MAAMuB,QAAQH;YACd,OAAO,IAAI,CAACI,cAAc,CAACD;QAC7B;QAEA,MAAM3B,UAAU,IAAI,CAACH,UAAU,CAACsB,GAAG,CAACf;QACpC,IAAI,CAACJ,SAAS;YACZ,IAAI,CAACL,MAAM,CAACkC,IAAI,CACd,CAAC,uDAAuD,EAAEL,SAASrB,EAAE,CAAC,yCAAyC,CAAC;YAElH;QACF;QAEA,IAAIH,SAAS;YACXoB,aAAapB,QAAQE,OAAO;YAC5BF,QAAQO,OAAO,CAACiB;YAChB,IAAI,CAAC3B,UAAU,CAACwB,MAAM,CAACjB;QACzB;IACF;AACF"}
+{"version":3,"sources":["../../src/shared/websocket-rpc-extended.adapter.ts"],"names":["WebsocketRpcExtendedAdapter","WebsocketAdapter","requestMap","loggerFactory","logger","name","Map","sendRequest","request","options","timeout","socket","Error","id","requestId","promise","Promise","resolve","reject","setTimeout","clearRequest","Math","min","set","send","JSON","stringify","onMessage","message","response","parse","toString","event","onEventMessage","get","warn","clearTimeout","delete"],"mappings":";;;;+BAQsBA;;;eAAAA;;;kCARW;AAQ1B,MAAeA,oCAAoCC,kCAAgB;IAEhEC,WAON;IAEF,YAAsBC,aAA6B,CAAE;QACnD,KAAK,CAACA;QAEN,IAAI,CAACC,MAAM,GAAGD,cAAcH,4BAA4BK,IAAI;QAE5D,IAAI,CAACH,UAAU,GAAG,IAAII;IACxB;IAEAC,YAAwBC,OAA6B,EAAEC,UAAU;QAAEC,SAAS;IAAM,CAAC,EAAkC;QACnH,IAAI,CAAC,IAAI,CAACC,MAAM,EAAE;YAChB,MAAM,IAAIC,MAAM;QAClB;QAEAJ,QAAQK,EAAE,GAAGL,QAAQK,EAAE;QAGvB,MAAMC,YAAYN,QAAQK,EAAE;QAC5B,MAAME,UAAU,IAAIC,QAA+B,CAACC,SAASC;YAC3D,MAAMR,UAAUS,WAAW;gBACzB,IAAI,CAACC,YAAY,CAACN;gBAClBI,OAAO,IAAIN,MAAM,CAAC,4BAA4B,EAAEE,UAAU,UAAU,CAAC;YACvE,GAAGO,KAAKC,GAAG,CAAC,MAAMb,SAASC,YAAY;YAEvC,IAAI,CAACR,UAAU,CAACqB,GAAG,CAACT,WAAW;gBAAEG;gBAASC;gBAAQR;YAAQ;QAC5D;QAGA,IAAI,CAACC,MAAM,CAACa,IAAI,CAACC,KAAKC,SAAS,CAAClB;QAEhC,OAAOO;IACT;IASA,MAAgBY,UAAUC,OAAa,EAAiB;QACtD,MAAMC,WAAoCJ,KAAKK,KAAK,CAACF,QAAQG,QAAQ;QACrE,MAAMjB,YAAYe,SAAShB,EAAE;QAC7B,IAAI,CAACC,WAAW;YACd,MAAMkB,QAAQH;YACd,OAAO,MAAM,IAAI,CAACI,cAAc,CAACD;QACnC;QAEA,MAAMxB,UAAU,IAAI,CAACN,UAAU,CAACgC,GAAG,CAACpB;QACpC,IAAI,CAACN,SAAS;YACZ,IAAI,CAACJ,MAAM,CAAC+B,IAAI,CACd,CAAC,uDAAuD,EAAEN,SAAShB,EAAE,CAAC,yCAAyC,CAAC;YAElH;QACF;QAEA,IAAIL,SAAS;YACX4B,aAAa5B,QAAQE,OAAO;YAC5BF,QAAQS,OAAO,CAACY;YAChB,IAAI,CAAC3B,UAAU,CAACmC,MAAM,CAACvB;QACzB;IACF;IAEQM,aAAaN,SAAiB,EAAQ;QAC5C,MAAMN,UAAU,IAAI,CAACN,UAAU,CAACgC,GAAG,CAACpB;QACpC,IAAIN,SAAS;YACX4B,aAAa5B,QAAQE,OAAO;YAC5B,IAAI,CAACR,UAAU,CAACmC,MAAM,CAACvB;QACzB;IACF;AACF"}

package/dist/shared/websocket.adapter.js

@@ -14,7 +14,7 @@ class WebsocketAdapter {
     socket;
     logger;
     eventEmittingAllowed = true;
-    constructor({ loggerFactory }){
+    constructor(loggerFactory){
         this.logger = loggerFactory(WebsocketAdapter.name);
     }
     get isOpened() {
@@ -31,6 +31,9 @@ class WebsocketAdapter {
         this.eventEmittingAllowed = false;
     }
     open(url) {
+        if (!url) {
+            throw new Error("Cant setup up websocket, URL may not be empty.");
+        }
         this.socket = new _ws.WebSocket(url, {
             handshakeTimeout: _serverconstants.AppConstants.defaultWebsocketHandshakeTimeout
         });
@@ -51,10 +54,6 @@ class WebsocketAdapter {
             });
         });
     }
-    onError(error) {}
-    afterOpened(event) {}
-    afterClosed(event) {}
-    onMessage(event) {}
     async onOpen(event) {
         await this.afterOpened(event);
     }

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;YAAEC,kBAAkBC,6BAAY,CAACC,gCAAgC;QAAC;QACnG,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,59 +11,55 @@ Object.defineProperty(exports, "FileUploadTrackerCache", {
 const _correlationtokenutil = require("../utils/correlation-token.util");
 const _eventconstants = require("../constants/event.constants");
 class FileUploadTrackerCache {
-    currentUploads = [];
-    uploadsDone = [];
-    uploadsFailed = [];
     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));
+        this.eventEmitter2.on((0, _eventconstants.uploadFailedEvent)("*"), (token, reason)=>this.handleUploadFailed(token, reason));
     }
-    progressCallback = (token, p)=>{
-        this.updateUploadProgress(token, p);
-    };
-    getUploads(filterHourOld = false) {
-        const currentTime = Date.now();
-        const done = this.uploadsDone.filter((d)=>currentTime - d.startedAt < 60 * 60 * 1000);
-        const failed = this.uploadsFailed.filter((d)=>currentTime - d.startedAt < 60 * 60 * 1000);
-        return filterHourOld ? {
-            current: this.currentUploads,
-            done,
-            failed
-        } : {
-            current: this.currentUploads,
-            done: this.uploadsDone,
-            failed: this.uploadsFailed
+    getUploads() {
+        return {
+            current: this.currentUploads
         };
     }
     getUpload(correlationToken) {
         return this.currentUploads.find((cu)=>cu.correlationToken === correlationToken);
     }
-    addUploadTracker(multerFile) {
+    addUploadTracker(multerFile, printerId) {
         const correlationToken = (0, _correlationtokenutil.generateCorrelationToken)();
         this.logger.log(`Starting upload session with token ${correlationToken}`);
-        this.eventEmitter2.on((0, _eventconstants.uploadProgressEvent)(correlationToken), this.progressCallback);
         this.currentUploads.push({
             correlationToken,
+            printerId,
             startedAt: Date.now(),
             multerFile,
-            progress: {}
+            progress: 0,
+            completed: false,
+            completedAt: null,
+            success: null,
+            reason: null
         });
         return correlationToken;
     }
-    updateUploadProgress(token, progress, reason) {
-        if (progress.progress === 1) {
-            this.logger.log("Upload tracker completed");
-            this.markUploadDone(token, true);
-            this.eventEmitter2.off((0, _eventconstants.uploadProgressEvent)(token), this.progressCallback);
-        } else if (progress.failed) {
-            this.markUploadDone(token, false, reason);
-            this.eventEmitter2.off((0, _eventconstants.uploadProgressEvent)(token), this.progressCallback);
-        } else {
-            const upload = this.getUpload(token);
-            upload.progress = progress;
+    handleUploadProgress(token, event) {
+        const upload = this.getUpload(token);
+        if (!upload) {
+            return;
         }
+        upload.progress = event.progress ?? null;
+    }
+    handleUploadFailed(token, reason) {
+        this.logger.log(`Upload tracker ${token} completed with failure`);
+        this.markUploadDone(token, false, reason);
+    }
+    handleUploadDone(token) {
+        this.logger.log(`Upload tracker ${token} completed with success`);
+        this.markUploadDone(token, true);
     }
     markUploadDone(token, success, reason) {
         const trackedUploadIndex = this.currentUploads.findIndex((cu)=>cu.correlationToken === token);
@@ -72,15 +68,10 @@ class FileUploadTrackerCache {
             return;
         }
         const trackedUpload = this.currentUploads[trackedUploadIndex];
-        if (success) {
-            trackedUpload.failedAt = Date.now();
-            trackedUpload.reason = reason;
-            this.uploadsDone.push(trackedUpload);
-        } else {
-            trackedUpload.succeededAt = Date.now();
-            this.uploadsFailed.push(trackedUpload);
-        }
-        this.currentUploads.splice(trackedUploadIndex, 1);
+        trackedUpload.completed = true;
+        trackedUpload.success = success;
+        trackedUpload.completedAt = Date.now();
+        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","uploadsDone","uploadsFailed","eventEmitter2","logger","constructor","loggerFactory","name","progressCallback","token","p","updateUploadProgress","getUploads","filterHourOld","currentTime","Date","now","done","filter","d","startedAt","failed","current","getUpload","correlationToken","find","cu","addUploadTracker","multerFile","generateCorrelationToken","log","on","uploadProgressEvent","push","progress","reason","markUploadDone","off","upload","success","trackedUploadIndex","findIndex","warn","trackedUpload","failedAt","succeededAt","splice"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/file-upload-tracker.cache.ts"],"names":["FileUploadTrackerCache","currentUploads","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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"}