@fdm-monster/server 1.5.3 → 1.6.0-rc1

package/dist/services/octoprint/octoprint-sockio.adapter.js

@@ -25,12 +25,12 @@ _export(exports, {
         return octoPrintEvent;
     }
 });
-const _websocketadapter = require("../../utils/websocket.adapter");
 const _httpstatuscodesconstants = require("../../constants/http-status-codes.constants");
 const _serverconstants = require("../../server.constants");
 const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
 const _urlutils = require("../../utils/url.utils");
 const _normalizeurl = require("../../utils/normalize-url");
+const _websocketadapter = require("../../shared/websocket.adapter");
 const Message = {
     connected: "connected",
     reauthRequired: "reauthRequired",
@@ -40,7 +40,6 @@ const Message = {
     plugin: "plugin",
     timelapse: "timelapse",
     slicingProgress: "slicingProgress",
-    // Custom events
     WS_OPENED: "WS_OPENED",
     WS_CLOSED: "WS_CLOSED",
     WS_ERROR: "WS_ERROR",
@@ -66,15 +65,10 @@ const API_STATE = {
 };
 const octoPrintEvent = (event)=>`octoprint.${event}`;
 class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
-    printerId;
-    loginDto;
-    socketURL;
-    sessionDto;
-    username;
     octoPrintApiService;
     eventEmitter;
-    logger;
     configService;
+    printerId;
     stateUpdated = false;
     stateUpdateTimestamp = null;
     socketState = SOCKET_STATE.unopened;
@@ -84,6 +78,11 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
     lastMessageReceivedTimestamp = null;
     reauthRequired = false;
     reauthRequiredTimestamp = null;
+    loginDto;
+    logger;
+    socketURL;
+    sessionDto;
+    username;
     constructor({ loggerFactory, octoPrintApiService, eventEmitter2, configService }){
         super({
             loggerFactory
@@ -109,9 +108,7 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
     isClosedOrAborted() {
         return this.socketState === SOCKET_STATE.closed || this.socketState === SOCKET_STATE.aborted;
     }
-    /**
-   * @param {CredentialsDto} socketLogin
-   */ registerCredentials(socketLogin) {
+    registerCredentials(socketLogin) {
         const { printerId, loginDto, protocol } = socketLogin;
         this.printerId = printerId;
         this.loginDto = loginDto;
@@ -120,7 +117,7 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         wsUrl.pathname = "/sockjs/websocket";
         this.socketURL = wsUrl;
     }
-    open(_) {
+    open() {
         if (this.socket) {
             throw new Error(`Socket already exists (printerId: ${this.printerId}, ignoring open request`);
         }
@@ -139,19 +136,15 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         await this.sendAuth();
         this.resetReauthRequired();
     }
-    /**
-   * Retrieve session token by authenticating with OctoPrint API
-   */ async setupSocketSession() {
+    async setupSocketSession() {
         this.resetSocketState();
         this.sessionDto = await this.octoPrintApiService.login(this.loginDto).then((r)=>{
-            // Check response for red flags
             if (r.name === "_api") {
                 this.setApiState(API_STATE.globalKey);
                 this.setSocketState(SOCKET_STATE.aborted);
                 throw new _runtimeexceptions.ExternalServiceError("Global API Key detected, aborting socket connection");
             } else if (r.needs?.group[0] === "guests") {
                 this.logger.warn("Detected group guests in OctoPrint login response, marking as unauthorized");
-                // This doesn't occur often (instead a 400 with CSRF failed is returned)
                 this.setApiState(API_STATE.authFail);
                 this.setSocketState(SOCKET_STATE.aborted);
                 throw new _runtimeexceptions.ExternalServiceError("Guest group detected, authentication failed, aborting socket connection");
@@ -161,7 +154,6 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
             return r;
         }).catch((e)=>{
             this.setSocketState(SOCKET_STATE.aborted);
-            // TODO improve error type detection
             if (e instanceof _runtimeexceptions.ExternalServiceError) {
                 this.logger.warn(`Printer authorization error (id: ${this.printerId}), apiState: ${this.apiState}`);
                 throw e;
@@ -196,52 +188,6 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
             throw e;
         });
     }
-    /**
-   * @private
-   * @returns {Promise<void>}
-   */ async afterOpened(event) {
-        this.setSocketState(SOCKET_STATE.opened);
-        await this.sendAuth();
-        await this.sendThrottle(_serverconstants.AppConstants.defaultSocketThrottleRate);
-    }
-    /**
-   * @private
-   * @returns {Promise<void>}
-   */ async onMessage(message) {
-        this.lastMessageReceivedTimestamp = Date.now();
-        if (this.socketState !== SOCKET_STATE.authenticated) {
-            this.setSocketState(SOCKET_STATE.authenticated);
-        }
-        const data = JSON.parse(message);
-        /**
-     * @type {Message}
-     */ const eventName = Object.keys(data)[0];
-        const payload = data[eventName];
-        if (eventName === Message.reauthRequired) {
-            this.setReauthRequired();
-        }
-        // Emit the message to the event bus
-        await this.emitEvent(eventName, payload);
-    }
-    /**
-   * @private
-   * @returns {Promise<void>}
-   */ async sendAuth() {
-        this.setSocketState(SOCKET_STATE.authenticating);
-        await this.sendMessage(JSON.stringify({
-            auth: `${this.username}:${this.sessionDto.session}`
-        }));
-    // TODO what if bad auth? => pure silence right?
-    }
-    async afterClosed(event) {
-        this.setSocketState(SOCKET_STATE.closed);
-        delete this.socket;
-        await this.emitEvent(Message.WS_CLOSED);
-    }
-    async onError(error) {
-        this.setSocketState(SOCKET_STATE.error);
-        await this.emitEvent(Message.WS_ERROR, error);
-    }
     setReauthRequired() {
         this.reauthRequired = true;
         this.reauthRequiredTimestamp = Date.now();
@@ -254,10 +200,7 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         this.setSocketState(SOCKET_STATE.unopened);
         this.setApiState(API_STATE.unset);
     }
-    /**
-   * @private
-   * @param {API_STATE} state
-   */ setApiState(state) {
+    setApiState(state) {
         this.apiState = state;
         this.apiStateUpdated = true;
         this.apiStateUpdateTimestamp = Date.now();
@@ -266,10 +209,7 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         }
         this.emitEventSync(Message.API_STATE_UPDATED, state);
     }
-    /**
-   * @private
-   * @param {SOCKET_STATE} state
-   */ setSocketState(state) {
+    setSocketState(state) {
         this.socketState = state;
         this.stateUpdated = true;
         this.stateUpdateTimestamp = Date.now();
@@ -278,27 +218,52 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         }
         this.emitEventSync(Message.WS_STATE_UPDATED, state);
     }
-    /**
-   * @private
-   * @param {Message} event
-   * @param {?Object} payload
-   */ async emitEvent(event, payload) {
-        /**
-     * @type {OctoPrintEventDto}
-     */ const data = {
+    async emitEvent(event, payload) {
+        await this.eventEmitter.emitAsync(octoPrintEvent(event), {
             event,
             payload,
             printerId: this.printerId
-        };
-        await this.eventEmitter.emitAsync(octoPrintEvent(event), data);
+        });
     }
     emitEventSync(event, payload) {
-        const data = {
+        this.eventEmitter.emit(octoPrintEvent(event), {
             event,
             payload,
             printerId: this.printerId
-        };
-        this.eventEmitter.emit(octoPrintEvent(event), data);
+        });
+    }
+    async afterOpened(event) {
+        this.setSocketState(SOCKET_STATE.opened);
+        await this.sendAuth();
+        await this.sendThrottle(_serverconstants.AppConstants.defaultSocketThrottleRate);
+    }
+    async onMessage(message) {
+        this.lastMessageReceivedTimestamp = Date.now();
+        if (this.socketState !== SOCKET_STATE.authenticated) {
+            this.setSocketState(SOCKET_STATE.authenticated);
+        }
+        const data = JSON.parse(message);
+        const eventName = Object.keys(data)[0];
+        const payload = data[eventName];
+        if (eventName === Message.reauthRequired) {
+            this.setReauthRequired();
+        }
+        await this.emitEvent(eventName, payload);
+    }
+    async afterClosed(event) {
+        this.setSocketState(SOCKET_STATE.closed);
+        delete this.socket;
+        await this.emitEvent(Message.WS_CLOSED);
+    }
+    async onError(error) {
+        this.setSocketState(SOCKET_STATE.error);
+        await this.emitEvent(Message.WS_ERROR, error);
+    }
+    async sendAuth() {
+        this.setSocketState(SOCKET_STATE.authenticating);
+        await this.sendMessage(JSON.stringify({
+            auth: `${this.username}:${this.sessionDto.session}`
+        }));
     }
 }
 

package/dist/services/octoprint/octoprint-sockio.adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/octoprint/octoprint-sockio.adapter.ts"],"names":["API_STATE","Message","OctoPrintSockIoAdapter","SOCKET_STATE","octoPrintEvent","connected","reauthRequired","current","history","event","plugin","timelapse","slicingProgress","WS_OPENED","WS_CLOSED","WS_ERROR","API_STATE_UPDATED","WS_STATE_UPDATED","unopened","opening","authenticating","opened","authenticated","aborted","error","closed","unset","noResponse","globalKey","authFail","responding","WebsocketAdapter","printerId","loginDto","socketURL","sessionDto","username","octoPrintApiService","eventEmitter","logger","configService","stateUpdated","stateUpdateTimestamp","socketState","apiStateUpdated","apiStateUpdateTimestamp","apiState","lastMessageReceivedTimestamp","reauthRequiredTimestamp","constructor","loggerFactory","eventEmitter2","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","isApiOnline","needsSetup","needsReauth","isClosedOrAborted","registerCredentials","socketLogin","protocol","httpUrl","normalizeUrl","printerURL","wsUrl","httpToWsUrl","pathname","open","_","socket","Error","close","sendThrottle","throttle","defaultSocketThrottleRate","sendMessage","JSON","stringify","reauthSession","setupSocketSession","sendAuth","resetReauthRequired","resetSocketState","login","then","r","setApiState","setSocketState","ExternalServiceError","needs","group","warn","catch","e","response","status","getAdminUserOrDefault","HttpStatusCode","FORBIDDEN","BAD_GATEWAY","NOT_IMPLEMENTED","SERVICE_UNAVAILABLE","GATEWAY_TIMEOUT","includes","afterOpened","onMessage","message","Date","now","data","parse","eventName","Object","keys","payload","setReauthRequired","emitEvent","auth","session","afterClosed","onError","state","log","emitEventSync","emitAsync","emit"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/octoprint/octoprint-sockio.adapter.ts"],"names":["API_STATE","Message","OctoPrintSockIoAdapter","SOCKET_STATE","octoPrintEvent","connected","reauthRequired","current","history","event","plugin","timelapse","slicingProgress","WS_OPENED","WS_CLOSED","WS_ERROR","API_STATE_UPDATED","WS_STATE_UPDATED","unopened","opening","authenticating","opened","authenticated","aborted","error","closed","unset","noResponse","globalKey","authFail","responding","WebsocketAdapter","octoPrintApiService","eventEmitter","configService","printerId","stateUpdated","stateUpdateTimestamp","socketState","apiStateUpdated","apiStateUpdateTimestamp","apiState","lastMessageReceivedTimestamp","reauthRequiredTimestamp","loginDto","logger","socketURL","sessionDto","username","constructor","loggerFactory","eventEmitter2","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","isApiOnline","needsSetup","needsReauth","isClosedOrAborted","registerCredentials","socketLogin","protocol","httpUrl","normalizeUrl","printerURL","wsUrl","httpToWsUrl","pathname","open","socket","Error","close","sendThrottle","throttle","defaultSocketThrottleRate","sendMessage","JSON","stringify","reauthSession","setupSocketSession","sendAuth","resetReauthRequired","resetSocketState","login","then","r","setApiState","setSocketState","ExternalServiceError","needs","group","warn","catch","e","response","status","getAdminUserOrDefault","HttpStatusCode","FORBIDDEN","BAD_GATEWAY","NOT_IMPLEMENTED","SERVICE_UNAVAILABLE","GATEWAY_TIMEOUT","includes","setReauthRequired","Date","now","state","log","emitEventSync","emitEvent","payload","emitAsync","emit","afterOpened","onMessage","message","data","parse","eventName","Object","keys","afterClosed","onError","auth","session"],"mappings":";;;;;;;;;;;IAgDaA,SAAS;eAATA;;IA7BAC,OAAO;eAAPA;;IAuCAC,sBAAsB;eAAtBA;;IArBAC,YAAY;eAAZA;;IAmBAC,cAAc;eAAdA;;;0CAxDkB;iCACF;mCACQ;0BACT;8BACC;kCAUI;AAK1B,MAAMH,UAAU;IACrBI,WAAW;IACXC,gBAAgB;IAChBC,SAAS;IACTC,SAAS;IACTC,OAAO;IACPC,QAAQ;IACRC,WAAW;IACXC,iBAAiB;IAGjBC,WAAW;IACXC,WAAW;IACXC,UAAU;IACVC,mBAAmB;IACnBC,kBAAkB;AACpB;AAEO,MAAMd,eAAe;IAC1Be,UAAU;IACVC,SAAS;IACTC,gBAAgB;IAChBC,QAAQ;IACRC,eAAe;IACfC,SAAS;IACTC,OAAO;IACPC,QAAQ;AACV;AAEO,MAAMzB,YAAY;IACvB0B,OAAO;IACPC,YAAY;IACZC,WAAW;IACXC,UAAU;IACVC,YAAY;AACd;AAEO,MAAM1B,iBAAiB,CAACK,QAAkB,CAAC,UAAU,EAAEA,MAAM,CAAC;AAE9D,MAAMP,+BAA+B6B,kCAAgB;IAC1DC,oBAAyC;IACzCC,aAA4B;IAC5BC,cAA6B;IAEtBC,UAAmB;IAC1BC,eAAe,MAAM;IACrBC,uBAAsC,KAAK;IAC3CC,cAAcnC,aAAae,QAAQ,CAAC;IACpCqB,kBAAkB,MAAM;IACxBC,0BAAyC,KAAK;IAC9CC,WAAWzC,UAAU0B,KAAK,CAAC;IAC3BgB,+BAA8C,KAAK;IACnDpC,iBAAiB,MAAM;IACvBqC,0BAAyC,KAAK;IAC9CC,SAA2B;IACjBC,OAAsB;IACxBC,UAAgB;IAChBC,WAAiC;IACjCC,SAAkB;IAE1BC,YAAY,EACVC,aAAa,EACblB,mBAAmB,EACnBmB,aAAa,EACbjB,aAAa,EAMd,CAAE;QACD,KAAK,CAAC;YAAEgB;QAAc;QAEtB,IAAI,CAACL,MAAM,GAAGK,cAAchD,uBAAuBkD,IAAI;QACvD,IAAI,CAACpB,mBAAmB,GAAGA;QAC3B,IAAI,CAACC,YAAY,GAAGkB;QACpB,IAAI,CAACjB,aAAa,GAAGA;IACvB;IAEA,IAAImB,aAAa;QACf,OAAO,IAAI,CAACnB,aAAa,CAACoB,GAAG,CAACC,6BAAY,CAACC,oBAAoB,EAAED,6BAAY,CAACE,wBAAwB,MAAM;IAC9G;IAEAC,cAAc;QACZ,MAAMC,cAAc,IAAI,CAAClB,QAAQ,KAAKzC,UAAU8B,UAAU;QAC1D,OAAO6B,eAAgB,CAAA,IAAI,CAACrB,WAAW,KAAKnC,aAAasB,MAAM,IAAI,IAAI,CAACa,WAAW,KAAKnC,aAAaqB,KAAK,AAAD;IAC3G;IAEAoC,aAAa;QACX,OAAO,IAAI,CAACtB,WAAW,KAAKnC,aAAae,QAAQ;IACnD;IAMA2C,cAAc;QACZ,OAAO,IAAI,CAACvD,cAAc;IAC5B;IAEAwD,oBAAoB;QAClB,OAAO,IAAI,CAACxB,WAAW,KAAKnC,aAAasB,MAAM,IAAI,IAAI,CAACa,WAAW,KAAKnC,aAAaoB,OAAO;IAC9F;IAEAwC,oBAAoBC,WAAgC,EAAE;QACpD,MAAM,EAAE7B,SAAS,EAAES,QAAQ,EAAEqB,QAAQ,EAAE,GAAGD;QAC1C,IAAI,CAAC7B,SAAS,GAAGA;QACjB,IAAI,CAACS,QAAQ,GAAGA;QAEhB,MAAMsB,UAAUC,IAAAA,0BAAY,EAAC,IAAI,CAACvB,QAAQ,CAACwB,UAAU;QACrD,MAAMC,QAAQC,IAAAA,qBAAW,EAACJ,SAASD;QACnCI,MAAME,QAAQ,GAAG;QACjB,IAAI,CAACzB,SAAS,GAAGuB;IACnB;IAEAG,OAAO;QACL,IAAI,IAAI,CAACC,MAAM,EAAE;YACf,MAAM,IAAIC,MAAM,CAAC,kCAAkC,EAAE,IAAI,CAACvC,SAAS,CAAC,uBAAuB,CAAC;QAC9F;QACA,KAAK,CAACqC,KAAK,IAAI,CAAC1B,SAAS;IAC3B;IAEA6B,QAAQ;QACN,KAAK,CAACA;IACR;IAEA,MAAMC,aAAaC,WAAyBtB,6BAAY,CAACuB,yBAAyB,EAAiB;QACjG,OAAO,MAAM,IAAI,CAACC,WAAW,CAACC,KAAKC,SAAS,CAAC;YAAEJ;QAAS;IAC1D;IAEA,MAAMK,gBAAgB;QACpB,MAAM,IAAI,CAACC,kBAAkB;QAC7B,MAAM,IAAI,CAACC,QAAQ;QACnB,IAAI,CAACC,mBAAmB;IAC1B;IAKA,MAAMF,qBAAoC;QACxC,IAAI,CAACG,gBAAgB;QACrB,IAAI,CAACvC,UAAU,GAAG,MAAM,IAAI,CAACf,mBAAmB,CAC7CuD,KAAK,CAAC,IAAI,CAAC3C,QAAQ,EACnB4C,IAAI,CAAC,CAACC;YAEL,IAAIA,EAAErC,IAAI,KAAK,QAAQ;gBACrB,IAAI,CAACsC,WAAW,CAAC1F,UAAU4B,SAAS;gBACpC,IAAI,CAAC+D,cAAc,CAACxF,aAAaoB,OAAO;gBACxC,MAAM,IAAIqE,uCAAoB,CAAC;YACjC,OAAO,IAAIH,EAAEI,KAAK,EAAEC,KAAK,CAAC,EAAE,KAAK,UAAU;gBACzC,IAAI,CAACjD,MAAM,CAACkD,IAAI,CAAC;gBAEjB,IAAI,CAACL,WAAW,CAAC1F,UAAU6B,QAAQ;gBACnC,IAAI,CAAC8D,cAAc,CAACxF,aAAaoB,OAAO;gBACxC,MAAM,IAAIqE,uCAAoB,CAAC;YACjC;YACA,IAAI,CAACF,WAAW,CAAC1F,UAAU8B,UAAU;YACrC,IAAI,CAAC6D,cAAc,CAACxF,aAAagB,OAAO;YACxC,OAAOsE;QACT,GACCO,KAAK,CAAC,CAACC;YACN,IAAI,CAACN,cAAc,CAACxF,aAAaoB,OAAO;YAExC,IAAI0E,aAAaL,uCAAoB,EAAE;gBACrC,IAAI,CAAC/C,MAAM,CAACkD,IAAI,CAAC,CAAC,iCAAiC,EAAE,IAAI,CAAC5D,SAAS,CAAC,aAAa,EAAE,IAAI,CAACM,QAAQ,CAAC,CAAC;gBAClG,MAAMwD;YACR,OAAO;gBACL,IAAIA,GAAGC,UAAUC,WAAW,KAAK;oBAC/B,IAAI,CAACT,WAAW,CAAC1F,UAAU6B,QAAQ;oBACnC,IAAI,CAAC8D,cAAc,CAACxF,aAAaoB,OAAO;oBACxC,MAAM,IAAIqE,uCAAoB,CAACK;gBACjC;gBACA,IAAI,CAACpD,MAAM,CAACrB,KAAK,CAAC,CAAC,SAAS,EAAE,IAAI,CAACW,SAAS,CAAC,yDAAyD,EAAE8D,EAAE,CAAC;gBAC3G,IAAI,CAACP,WAAW,CAAC1F,UAAU2B,UAAU;YACvC;YACA,MAAMsE;QACR;QAEF,IAAI,CAACjD,QAAQ,GAAG,MAAM,IAAI,CAAChB,mBAAmB,CAACoE,qBAAqB,CAAC,IAAI,CAACxD,QAAQ,EAAEoD,KAAK,CAAC,CAACC;YACzF,MAAME,SAASF,EAAEC,QAAQ,EAAEC;YAC3B,IAAIA,WAAWE,wCAAc,CAACC,SAAS,EAAE;gBACvC,IAAI,CAACZ,WAAW,CAAC1F,UAAU6B,QAAQ;gBACnC,IAAI,CAAC8D,cAAc,CAACxF,aAAaoB,OAAO;YAC1C,OAAO;gBACL,IAAI,CAACmE,WAAW,CAAC1F,UAAU6B,QAAQ;gBACnC,IAAI,CAAC8D,cAAc,CAACxF,aAAaoB,OAAO;YAC1C;YACA,IACE;gBACE8E,wCAAc,CAACE,WAAW;gBAC1BF,wCAAc,CAACG,eAAe;gBAC9BH,wCAAc,CAACI,mBAAmB;gBAClCJ,wCAAc,CAACK,eAAe;aAC/B,CAACC,QAAQ,CAACR,SACX;gBACA,IAAI,CAACtD,MAAM,CAACrB,KAAK,CAAC,CAAC,0BAA0B,EAAE2E,OAAO,iDAAiD,CAAC;YAC1G;YACA,MAAMF;QACR;IACF;IAEAW,oBAAoB;QAClB,IAAI,CAACtG,cAAc,GAAG;QACtB,IAAI,CAACqC,uBAAuB,GAAGkE,KAAKC,GAAG;IACzC;IAEAzB,sBAAsB;QACpB,IAAI,CAAC/E,cAAc,GAAG;QACtB,IAAI,CAACqC,uBAAuB,GAAG;IACjC;IAEA2C,mBAAmB;QACjB,IAAI,CAACK,cAAc,CAACxF,aAAae,QAAQ;QACzC,IAAI,CAACwE,WAAW,CAAC1F,UAAU0B,KAAK;IAClC;IAMQgE,YAAYqB,KAAa,EAAE;QACjC,IAAI,CAACtE,QAAQ,GAAGsE;QAChB,IAAI,CAACxE,eAAe,GAAG;QACvB,IAAI,CAACC,uBAAuB,GAAGqE,KAAKC,GAAG;QACvC,IAAI,IAAI,CAACzD,UAAU,EAAE;YACnB,IAAI,CAACR,MAAM,CAACmE,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC7E,SAAS,CAAC,uBAAuB,CAAC,GAAG4E;QAC/D;QACA,IAAI,CAACE,aAAa,CAAChH,QAAQe,iBAAiB,EAAE+F;IAChD;IAMQpB,eAAeoB,KAAK,EAAE;QAC5B,IAAI,CAACzE,WAAW,GAAGyE;QACnB,IAAI,CAAC3E,YAAY,GAAG;QACpB,IAAI,CAACC,oBAAoB,GAAGwE,KAAKC,GAAG;QACpC,IAAI,IAAI,CAACzD,UAAU,EAAE;YACnB,IAAI,CAACR,MAAM,CAACmE,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC7E,SAAS,CAAC,0BAA0B,CAAC,GAAG4E;QAClE;QACA,IAAI,CAACE,aAAa,CAAChH,QAAQgB,gBAAgB,EAAE8F;IAC/C;IAOA,MAAcG,UAAUzG,KAAa,EAAE0G,OAAO,EAAE;QAC9C,MAAM,IAAI,CAAClF,YAAY,CAACmF,SAAS,CAAChH,eAAeK,QAAQ;YACvDA;YACA0G;YACAhF,WAAW,IAAI,CAACA,SAAS;QAC3B;IACF;IAEA8E,cAAcxG,KAAa,EAAE0G,OAAO,EAAE;QACpC,IAAI,CAAClF,YAAY,CAACoF,IAAI,CAACjH,eAAeK,QAAQ;YAC5CA;YACA0G;YACAhF,WAAW,IAAI,CAACA,SAAS;QAC3B;IACF;IAEA,MAAgBmF,YAAY7G,KAAK,EAAiB;QAChD,IAAI,CAACkF,cAAc,CAACxF,aAAakB,MAAM;QACvC,MAAM,IAAI,CAAC+D,QAAQ;QACnB,MAAM,IAAI,CAACR,YAAY,CAACrB,6BAAY,CAACuB,yBAAyB;IAChE;IAEA,MAAgByC,UAAUC,OAAO,EAAiB;QAChD,IAAI,CAAC9E,4BAA4B,GAAGmE,KAAKC,GAAG;QAE5C,IAAI,IAAI,CAACxE,WAAW,KAAKnC,aAAamB,aAAa,EAAE;YACnD,IAAI,CAACqE,cAAc,CAACxF,aAAamB,aAAa;QAChD;QAEA,MAAMmG,OAAOzC,KAAK0C,KAAK,CAACF;QACxB,MAAMG,YAAYC,OAAOC,IAAI,CAACJ,KAAK,CAAC,EAAE;QACtC,MAAMN,UAAUM,IAAI,CAACE,UAAU;QAE/B,IAAIA,cAAc1H,QAAQK,cAAc,EAAE;YACxC,IAAI,CAACsG,iBAAiB;QACxB;QAGA,MAAM,IAAI,CAACM,SAAS,CAACS,WAAWR;IAClC;IAEA,MAAgBW,YAAYrH,KAAK,EAAE;QACjC,IAAI,CAACkF,cAAc,CAACxF,aAAasB,MAAM;QACvC,OAAO,IAAI,CAACgD,MAAM;QAClB,MAAM,IAAI,CAACyC,SAAS,CAACjH,QAAQa,SAAS;IACxC;IAEA,MAAgBiH,QAAQvG,KAAK,EAAE;QAC7B,IAAI,CAACmE,cAAc,CAACxF,aAAaqB,KAAK;QACtC,MAAM,IAAI,CAAC0F,SAAS,CAACjH,QAAQc,QAAQ,EAAES;IACzC;IAEA,MAAc4D,WAA0B;QACtC,IAAI,CAACO,cAAc,CAACxF,aAAaiB,cAAc;QAC/C,MAAM,IAAI,CAAC2D,WAAW,CACpBC,KAAKC,SAAS,CAAC;YACb+C,MAAM,CAAC,EAAE,IAAI,CAAChF,QAAQ,CAAC,CAAC,EAAE,IAAI,CAACD,UAAU,CAACkF,OAAO,CAAC,CAAC;QACrD;IAGJ;AACF"}

package/dist/services/octoprint/plugin-base.service.js

@@ -11,7 +11,6 @@ Object.defineProperty(exports, "PluginBaseService", {
 const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
 const _octoprintserviceconstants = require("./constants/octoprint-service.constants");
 class PluginBaseService {
-    // https://github.com/OctoPrint/OctoPrint/blob/76e87ba81329e6ce761c9307d3e80c291000871e/src/octoprint/plugins/pluginmanager/__init__.py#L609
     octoPrintApiService;
     pluginRepositoryCache;
     _pluginName;

package/dist/services/octoprint/plugin-base.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/octoprint/plugin-base.service.ts"],"names":["PluginBaseService","octoPrintApiService","pluginRepositoryCache","_pluginName","_pluginUrl","logger","constructor","loggerFactory","pluginName","pluginUrl","pluginReference","getPlugin","archive","ValidationException","isPluginUpToDate","printerLogin","response","queryInstalledPlugin","result","github","latest_release","name","version","getPluginManagerPlugin","InternalServerException","plugin","isPluginInstalled","foundPlugin","findPluginFromListQuery","getPluginManagerPlugins","plugins","length","findPluginInList","pluginList","find","p","key","toLowerCase","updatePlugin","login","postSoftwareUpdate","installPlugin","restartAfter","command","pluginManagerCommands","install","postApiPluginManagerCommand","conditionalRestartCommand","uninstallPlugin","uninstall","enablePlugin","enable","disablePlugin","disable","cleanupPlugin","cleanup","cleanupAllPlugins","cleanup_all","postSystemRestartCommand"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/octoprint/plugin-base.service.ts"],"names":["PluginBaseService","octoPrintApiService","pluginRepositoryCache","_pluginName","_pluginUrl","logger","constructor","loggerFactory","pluginName","pluginUrl","pluginReference","getPlugin","archive","ValidationException","isPluginUpToDate","printerLogin","response","queryInstalledPlugin","result","github","latest_release","name","version","getPluginManagerPlugin","InternalServerException","plugin","isPluginInstalled","foundPlugin","findPluginFromListQuery","getPluginManagerPlugins","plugins","length","findPluginInList","pluginList","find","p","key","toLowerCase","updatePlugin","login","postSoftwareUpdate","installPlugin","restartAfter","command","pluginManagerCommands","install","postApiPluginManagerCommand","conditionalRestartCommand","uninstallPlugin","uninstall","enablePlugin","enable","disablePlugin","disable","cleanupPlugin","cleanup","cleanupAllPlugins","cleanup_all","postSystemRestartCommand"],"mappings":"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"}

package/dist/services/octoprint/plugin-firmware-update.service.js

@@ -58,7 +58,6 @@ class PluginFirmwareUpdateService extends _pluginbaseservice.PluginBaseService {
             throw new _runtimeexceptions.ValidationException("No firmware releases were scanned. Download was not successful");
         }
         const latestFirmware = this.prusaFirmwareReleases[0];
-        // Download the latest firmware asset
         const firmwareAsset = latestFirmware.assets.find((asset)=>asset.name.includes("MK3S_MK3S+"));
         const downloadUrl = firmwareAsset.browser_download_url;
         const downloadName = firmwareAsset.name;
@@ -74,7 +73,6 @@ class PluginFirmwareUpdateService extends _pluginbaseservice.PluginBaseService {
     async getPrinterFirmwareVersion(printerLogin) {
         const response = await this.octoPrintApiService.getSystemInfo(printerLogin);
         const systemInfo = response.systeminfo;
-        // @todo If this fails, the printer most likely is not connected...
         if (!Object.keys(systemInfo).includes(connectivityProp) || !Object.keys(systemInfo).includes(firmwareProp)) {
             throw new _runtimeexceptions.ValidationException("Could not retrieve printer firmware version as the OctoPrint response was not recognized. Is it connected?");
         }
@@ -96,7 +94,6 @@ class PluginFirmwareUpdateService extends _pluginbaseservice.PluginBaseService {
     }
     async flashPrusaFirmware(currentPrinterId, printerLogin) {
         const latestHexFilePath = this.multerService.getNewestFile(firmwareDownloadPath);
-        // todo setup BG task to track progress
         return await this.octoPrintApiService.postPluginFirmwareUpdateFlash(currentPrinterId, printerLogin, latestHexFilePath);
     }
 }

package/dist/services/octoprint/plugin-firmware-update.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/octoprint/plugin-firmware-update.service.ts"],"names":["PluginFirmwareUpdateService","config","pluginName","pluginUrl","defaultRepos","prusaFirmwareOwner","prusaFirmwareRepo","connectivityProp","firmwareProp","firmwareDownloadPath","PluginBaseService","octoPrintApiService","githubService","multerService","prusaFirmwareReleases","latestFirmware","constructor","pluginRepositoryCache","loggerFactory","queryGithubPrusaFirmwareReleasesCache","response","getReleases","data","e","logger","error","length","log","url","tag_name","downloadFirmware","ValidationException","firmwareAsset","assets","find","asset","name","includes","downloadUrl","browser_download_url","downloadName","fileExists","downloadFile","getPrinterFirmwareVersion","printerLogin","getSystemInfo","systemInfo","systeminfo","Object","keys","connected","firmware","getPluginFirmwareStatus","getPluginFirmwareUpdateStatus","configureFirmwareUpdaterSettings","updateFirmwareUpdaterSettings","defaultFirmwareUpdaterSettings","flashPrusaFirmware","currentPrinterId","latestHexFilePath","getNewestFile","postPluginFirmwareUpdateFlash"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/octoprint/plugin-firmware-update.service.ts"],"names":["PluginFirmwareUpdateService","config","pluginName","pluginUrl","defaultRepos","prusaFirmwareOwner","prusaFirmwareRepo","connectivityProp","firmwareProp","firmwareDownloadPath","PluginBaseService","octoPrintApiService","githubService","multerService","prusaFirmwareReleases","latestFirmware","constructor","pluginRepositoryCache","loggerFactory","queryGithubPrusaFirmwareReleasesCache","response","getReleases","data","e","logger","error","length","log","url","tag_name","downloadFirmware","ValidationException","firmwareAsset","assets","find","asset","name","includes","downloadUrl","browser_download_url","downloadName","fileExists","downloadFile","getPrinterFirmwareVersion","printerLogin","getSystemInfo","systemInfo","systeminfo","Object","keys","connected","firmware","getPluginFirmwareStatus","getPluginFirmwareUpdateStatus","configureFirmwareUpdaterSettings","updateFirmwareUpdaterSettings","defaultFirmwareUpdaterSettings","flashPrusaFirmware","currentPrinterId","latestHexFilePath","getNewestFile","postPluginFirmwareUpdateFlash"],"mappings":";;;;+BAyBaA;;;eAAAA;;;mCAzBqB;mCACE;iDACW;AAS/C,MAAMC,SAAS;IACbC,YAAY;IACZC,WAAW;AACb;AAEA,MAAMC,eAAe;IACnBC,oBAAoB;IACpBC,mBAAmB;AACrB;AAEA,MAAMC,mBAAmB;AACzB,MAAMC,eAAe;AACrB,MAAMC,uBAAuB;AAEtB,MAAMT,oCAAoCU,oCAAiB;IAChEC,oBAAyC;IACzCC,cAA6B;IACrBC,cAA6B;IAE7BC,sBAAsB;IACtBC,eAAe;IAEvBC,YAAY,EACVL,mBAAmB,EACnBM,qBAAqB,EACrBL,aAAa,EACbC,aAAa,EACbK,aAAa,EAOd,CAAE;QACD,KAAK,CAAC;YAAEP;YAAqBM;YAAuBC;QAAc,GAAGjB;QACrE,IAAI,CAACU,mBAAmB,GAAGA;QAC3B,IAAI,CAACC,aAAa,GAAGA;QACrB,IAAI,CAACC,aAAa,GAAGA;IACvB;IAEA,MAAMM,wCAAwC;QAC5C,IAAI;YACF,MAAMC,WAAW,MAAM,IAAI,CAACR,aAAa,CAACS,WAAW,CAACjB,aAAaC,kBAAkB,EAAED,aAAaE,iBAAiB;YACrH,IAAI,CAACQ,qBAAqB,GAAGM,SAASE,IAAI;QAC5C,EAAE,OAAOC,GAAG;YACV,OAAO,IAAI,CAACC,MAAM,CAACC,KAAK,CAAC;QAC3B;QAEA,IAAI,CAAC,IAAI,CAACX,qBAAqB,EAAEY,QAAQ,OAAO,EAAE;QAElD,IAAI,CAACX,cAAc,GAAG,IAAI,CAACD,qBAAqB,CAAC,EAAE;QACnD,IAAI,CAACU,MAAM,CAACG,GAAG,CAAC,CAAC,yBAAyB,EAAE,IAAI,CAACb,qBAAqB,EAAEY,UAAU,IAAI,kBAAkB,CAAC,EAAE;YACzGE,KAAK,IAAI,CAACb,cAAc,CAACa,GAAG;YAC5BC,UAAU,IAAI,CAACd,cAAc,CAACc,QAAQ;QACxC;QAEA,OAAO,IAAI,CAACf,qBAAqB;IACnC;IAEA,MAAMgB,mBAAmB;QACvB,IAAI,CAAC,IAAI,CAAChB,qBAAqB,EAAEY,UAAU,CAAC,IAAI,CAACX,cAAc,EAAE;YAC/D,MAAM,IAAIgB,sCAAmB,CAAC;QAChC;QAEA,MAAMhB,iBAAiB,IAAI,CAACD,qBAAqB,CAAC,EAAE;QAGpD,MAAMkB,gBAAgBjB,eAAekB,MAAM,CAACC,IAAI,CAAC,CAACC,QAAUA,MAAMC,IAAI,CAACC,QAAQ,CAAC;QAChF,MAAMC,cAAcN,cAAcO,oBAAoB;QACtD,MAAMC,eAAeR,cAAcI,IAAI;QACvC,IAAI,CAACZ,MAAM,CAACG,GAAG,CAAC,CAAC,kBAAkB,EAAEa,aAAa,CAAC;QACnD,IAAI,CAAC,IAAI,CAAC3B,aAAa,CAAC4B,UAAU,CAACD,cAAc/B,uBAAuB;YACtE,IAAI,CAACe,MAAM,CAACG,GAAG,CAAC,CAAC,0BAA0B,EAAEW,YAAY,CAAC;YAC1D,MAAM,IAAI,CAACzB,aAAa,CAAC6B,YAAY,CAACJ,aAAaE,cAAc/B;YACjE,IAAI,CAACe,MAAM,CAACG,GAAG,CAAC,CAAC,oBAAoB,EAAEa,aAAa,CAAC;QACvD,OAAO;YACL,IAAI,CAAChB,MAAM,CAACG,GAAG,CAAC,CAAC,eAAe,EAAEa,aAAa,CAAC;QAClD;IACF;IAEA,MAAMG,0BAA0BC,YAAsB,EAAE;QACtD,MAAMxB,WAAW,MAAM,IAAI,CAACT,mBAAmB,CAACkC,aAAa,CAACD;QAC9D,MAAME,aAAa1B,SAAS2B,UAAU;QAGtC,IAAI,CAACC,OAAOC,IAAI,CAACH,YAAYT,QAAQ,CAAC9B,qBAAqB,CAACyC,OAAOC,IAAI,CAACH,YAAYT,QAAQ,CAAC7B,eAAe;YAC1G,MAAM,IAAIuB,sCAAmB,CAC3B;QAEJ;QAEA,MAAMmB,YAAYJ,UAAU,CAACvC,iBAAiB;QAC9C,IAAI,CAAC2C,WAAW;YACd,MAAM,IAAInB,sCAAmB,CAAC;QAChC;QAEA,MAAMoB,WAAWL,UAAU,CAACtC,aAAa;QACzC,IAAI,CAAC2C,UAAUzB,QAAQ;YACrB,MAAM,IAAIK,sCAAmB,CAAC;QAChC;QAEA,OAAOoB;IACT;IAEA,MAAMC,wBAAwBR,YAAsB,EAAE;QACpD,OAAO,MAAM,IAAI,CAACjC,mBAAmB,CAAC0C,6BAA6B,CAACT;IACtE;IAEA,MAAMU,iCAAiCV,YAAsB,EAAE;QAC7D,OAAO,MAAM,IAAI,CAACjC,mBAAmB,CAAC4C,6BAA6B,CAACX,cAAcY,+DAA8B;IAClH;IAEA,MAAMC,mBAAmBC,gBAAwB,EAAEd,YAAsB,EAAE;QACzE,MAAMe,oBAAoB,IAAI,CAAC9C,aAAa,CAAC+C,aAAa,CAACnD;QAE3D,OAAO,MAAM,IAAI,CAACE,mBAAmB,CAACkD,6BAA6B,CAACH,kBAAkBd,cAAce;IACtG;AACF"}

package/dist/services/octoprint/utils/api.utils.js

@@ -12,12 +12,6 @@ _export(exports, {
     constructHeaders: function() {
         return constructHeaders;
     },
-    processGotResponse: function() {
-        return processGotResponse;
-    },
-    processResponse: function() {
-        return processResponse;
-    },
     validateLogin: function() {
         return validateLogin;
     }
@@ -39,34 +33,5 @@ function constructHeaders(apiKey, contentType = _octoprintserviceconstants.jsonC
         [_octoprintserviceconstants.apiKeyHeaderKey]: apiKey
     };
 }
-function processResponse(response, options = {
-    unwrap: true
-}) {
-    if (options.unwrap) {
-        return response?.data;
-    }
-    if (options.simple) {
-        return {
-            status: response.status,
-            data: response.data
-        };
-    }
-    return response;
-}
-async function processGotResponse(response, options = {
-    unwrap: true
-}) {
-    if (options.unwrap) {
-        return JSON.parse(response.body);
-    }
-    if (options.simple) {
-        const data = JSON.parse(response.body);
-        return {
-            status: response.statusCode,
-            data
-        };
-    }
-    return response;
-}
 
 //# sourceMappingURL=api.utils.js.map

package/dist/services/octoprint/utils/api.utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/services/octoprint/utils/api.utils.ts"],"names":["constructHeaders","processGotResponse","processResponse","validateLogin","login","apiKey","printerURL","ValidationException","contentType","jsonContentType","contentTypeHeaderKey","apiKeyHeaderKey","response","options","unwrap","data","simple","status","JSON","parse","body","statusCode"],"mappings":";;;;;;;;;;;IAmBgBA,gBAAgB;eAAhBA;;IA6BMC,kBAAkB;eAAlBA;;IAhBNC,eAAe;eAAfA;;IAxBAC,aAAa;eAAbA;;;2CAJT;mCAC6B;AAG7B,SAASA,cAAcC,KAAe;IAC3C,IAAI,CAACA,MAAMC,MAAM,IAAI,CAACD,MAAME,UAAU,EAAE;QACtC,MAAM,IAAIC,sCAAmB,CAAC;IAChC;IAEA,OAAO;QACLF,QAAQD,MAAMC,MAAM;QACpBC,YAAYF,MAAME,UAAU;IAC9B;AACF;AAEO,SAASN,iBAAiBK,MAAc,EAAEG,cAAcC,0CAAe;IAC5E,OAAO;QACL,CAACC,+CAAoB,CAAC,EAAEF;QACxB,CAACG,0CAAe,CAAC,EAAEN;IACrB;AACF;AAQO,SAASH,gBAAgBU,QAAQ,EAAEC,UAAU;IAAEC,QAAQ;AAAK,CAAC;IAClE,IAAID,QAAQC,MAAM,EAAE;QAClB,OAAOF,UAAUG;IACnB;IACA,IAAIF,QAAQG,MAAM,EAAE;QAClB,OAAO;YAAEC,QAAQL,SAASK,MAAM;YAAEF,MAAMH,SAASG,IAAI;QAAC;IACxD;IACA,OAAOH;AACT;AAQO,eAAeX,mBAAmBW,QAAQ,EAAEC,UAAU;IAAEC,QAAQ;AAAK,CAAC;IAC3E,IAAID,QAAQC,MAAM,EAAE;QAClB,OAAOI,KAAKC,KAAK,CAACP,SAASQ,IAAI;IACjC;IACA,IAAIP,QAAQG,MAAM,EAAE;QAClB,MAAMD,OAAOG,KAAKC,KAAK,CAACP,SAASQ,IAAI;QACrC,OAAO;YAAEH,QAAQL,SAASS,UAAU;YAAEN;QAAK;IAC7C;IACA,OAAOH;AACT"}
+{"version":3,"sources":["../../../../src/services/octoprint/utils/api.utils.ts"],"names":["constructHeaders","validateLogin","login","apiKey","printerURL","ValidationException","contentType","jsonContentType","contentTypeHeaderKey","apiKeyHeaderKey"],"mappings":";;;;;;;;;;;IAmBgBA,gBAAgB;eAAhBA;;IAXAC,aAAa;eAAbA;;;2CAJT;mCAC6B;AAG7B,SAASA,cAAcC,KAAe;IAC3C,IAAI,CAACA,MAAMC,MAAM,IAAI,CAACD,MAAME,UAAU,EAAE;QACtC,MAAM,IAAIC,sCAAmB,CAAC;IAChC;IAEA,OAAO;QACLF,QAAQD,MAAMC,MAAM;QACpBC,YAAYF,MAAME,UAAU;IAC9B;AACF;AAEO,SAASJ,iBAAiBG,MAAc,EAAEG,cAAcC,0CAAe;IAC5E,OAAO;QACL,CAACC,+CAAoB,CAAC,EAAEF;QACxB,CAACG,0CAAe,CAAC,EAAEN;IACrB;AACF"}

package/dist/services/orm/base.interface.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+
+//# sourceMappingURL=base.interface.js.map

package/dist/services/orm/base.interface.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/orm/base.interface.ts"],"names":[],"mappings":""}

package/dist/services/orm/base.service.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "BaseService", {
+    enumerable: true,
+    get: function() {
+        return BaseService;
+    }
+});
+const _typeorm = require("typeorm");
+const _classvalidator = require("class-validator");
+const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
+const _pageinterface = require("../interfaces/page.interface");
+function BaseService(entity, dto, createDTO, updateDto) {
+    class BaseServiceHost {
+        typeormService;
+        repository;
+        constructor({ typeormService }){
+            this.typeormService = typeormService;
+            this.repository = typeormService.getDataSource().getRepository(entity);
+        }
+        async get(id, throwIfNotFound = true) {
+            try {
+                return this.repository.findOneByOrFail({
+                    id
+                });
+            } catch (e) {
+                if (throwIfNotFound && e instanceof _typeorm.EntityNotFoundError) {
+                    throw new _runtimeexceptions.NotFoundException(`The entity ${entity} with id '${id}' was not found.`);
+                }
+                return undefined;
+            }
+        }
+        async list(options) {
+            return this.repository.find(options);
+        }
+        async listPaged(page = _pageinterface.DEFAULT_PAGE, options) {
+            return this.repository.find({
+                take: page.pageSize,
+                skip: page.pageSize * page.page,
+                ...options
+            });
+        }
+        async update(id, updateDto) {
+            const entity = await this.get(id);
+            await (0, _classvalidator.validate)(updateDto);
+            await (0, _classvalidator.validate)(Object.assign(entity, updateDto));
+            await this.repository.update(entity.id, updateDto);
+            return entity;
+        }
+        async create(dto) {
+            await (0, _classvalidator.validate)(dto);
+            const entity = this.repository.create(dto);
+            await (0, _classvalidator.validate)(entity);
+            return await this.repository.save(entity);
+        }
+        async delete(id, throwIfNotFound = true) {
+            const entity = await this.get(id, throwIfNotFound);
+            return await this.repository.delete(entity.id);
+        }
+        async deleteMany(ids, emitEvent = true) {
+            return await this.repository.delete(ids);
+        }
+    }
+    return BaseServiceHost;
+}
+
+//# sourceMappingURL=base.service.js.map

package/dist/services/orm/base.service.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/orm/base.service.ts"],"names":["BaseService","entity","dto","createDTO","updateDto","BaseServiceHost","typeormService","repository","constructor","getDataSource","getRepository","get","id","throwIfNotFound","findOneByOrFail","e","EntityNotFoundError","NotFoundException","undefined","list","options","find","listPaged","page","DEFAULT_PAGE","take","pageSize","skip","update","validate","Object","assign","create","save","delete","deleteMany","ids","emitEvent"],"mappings":";;;;+BAWgBA;;;eAAAA;;;yBAR0F;gCACjF;mCAGS;+BACQ;AAGnC,SAASA,YAKdC,MAAuB,EAAEC,GAAc,EAAEC,SAA2B,EAAEC,SAA2B;IACjG,MAAeC;QACbC,eAA+B;QAC/BC,WAA0B;QAE1BC,YAAY,EAAEF,cAAc,EAAsC,CAAE;YAClE,IAAI,CAACA,cAAc,GAAGA;YACtB,IAAI,CAACC,UAAU,GAAGD,eAAeG,aAAa,GAAGC,aAAa,CAACT;QACjE;QAIA,MAAMU,IAAIC,EAAgB,EAAEC,kBAAkB,IAAI,EAAE;YAClD,IAAI;gBACF,OAAO,IAAI,CAACN,UAAU,CAACO,eAAe,CAAC;oBAAEF;gBAAG;YAC9C,EAAE,OAAOG,GAAG;gBACV,IAAIF,mBAAmBE,aAAaC,4BAAmB,EAAE;oBACvD,MAAM,IAAIC,oCAAiB,CAAC,CAAC,WAAW,EAAEhB,OAAO,UAAU,EAAEW,GAAG,gBAAgB,CAAC;gBACnF;gBACA,OAAOM;YACT;QACF;QAEA,MAAMC,KAAKC,OAA4B,EAAE;YACvC,OAAO,IAAI,CAACb,UAAU,CAACc,IAAI,CAACD;QAC9B;QAEA,MAAME,UAAUC,OAAoBC,2BAAY,EAAEJ,OAA4B,EAAE;YAC9E,OAAO,IAAI,CAACb,UAAU,CAACc,IAAI,CAAC;gBAAEI,MAAMF,KAAKG,QAAQ;gBAAEC,MAAMJ,KAAKG,QAAQ,GAAGH,KAAKA,IAAI;gBAAE,GAAGH,OAAO;YAAC;QACjG;QAEA,MAAMQ,OAAOhB,EAAgB,EAAER,SAAoB,EAAE;YACnD,MAAMH,SAAS,MAAM,IAAI,CAACU,GAAG,CAACC;YAC9B,MAAMiB,IAAAA,wBAAQ,EAACzB;YACf,MAAMyB,IAAAA,wBAAQ,EAACC,OAAOC,MAAM,CAAC9B,QAAQG;YACrC,MAAM,IAAI,CAACG,UAAU,CAACqB,MAAM,CAAC3B,OAAOW,EAAE,EAAER;YACxC,OAAOH;QACT;QAEA,MAAM+B,OAAO9B,GAAc,EAAE;YAC3B,MAAM2B,IAAAA,wBAAQ,EAAC3B;YACf,MAAMD,SAAS,IAAI,CAACM,UAAU,CAACyB,MAAM,CAAC9B;YACtC,MAAM2B,IAAAA,wBAAQ,EAAC5B;YACf,OAAO,MAAM,IAAI,CAACM,UAAU,CAAC0B,IAAI,CAAChC;QACpC;QAEA,MAAMiC,OAAOtB,EAAgB,EAAEC,kBAAkB,IAAI,EAAE;YACrD,MAAMZ,SAAS,MAAM,IAAI,CAACU,GAAG,CAACC,IAAIC;YAClC,OAAO,MAAM,IAAI,CAACN,UAAU,CAAC2B,MAAM,CAACjC,OAAOW,EAAE;QAC/C;QAEA,MAAMuB,WAAWC,GAAmB,EAAEC,YAAY,IAAI,EAAyB;YAC7E,OAAO,MAAM,IAAI,CAAC9B,UAAU,CAAC2B,MAAM,CAACE;QACtC;IACF;IAEA,OAAO/B;AACT"}

package/dist/services/print-completion.service.js

@@ -25,7 +25,6 @@ class PrintCompletionService {
             context: entity.context,
             fileName: entity.fileName,
             createdAt: entity.createdAt,
-            correlationId: entity.correlationId,
             status: entity.status,
             printerId: entity.printerId.toString()
         };

package/dist/services/print-completion.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/print-completion.service.ts"],"names":["PrintCompletionService","logger","constructor","loggerFactory","name","toDto","entity","id","completionLog","context","fileName","createdAt","correlationId","status","printerId","toString","create","input","validateInput","createPrintCompletionRules","PrintCompletion","Date","now","list","find","findPrintCompletion","updateContext","completionEntry","findOne","EVENT_TYPES","PrintStarted","warn","save","loadPrintContexts","contexts","aggregate","$sort","$group","_id","$first","$match","$nin","PrintDone","PrintFailed","Object","fromEntries","map","c","listGroupByPrinterStatus","printCompletionsAggr","printEvents","$push","processCompletions"],"mappings":";;;;+BAYaA;;;eAAAA;;;wBAZmB;kDACW;4BACb;6CACF;uCAOO;AAE5B,MAAMA;IACXC,OAAsB;IAEtBC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACF,MAAM,GAAGE,cAAcH,uBAAuBI,IAAI;IACzD;IAEAC,MAAMC,MAAwB,EAAmC;QAC/D,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,eAAeF,OAAOE,aAAa;YACnCC,SAASH,OAAOG,OAAO;YACvBC,UAAUJ,OAAOI,QAAQ;YACzBC,WAAWL,OAAOK,SAAS;YAC3BC,eAAeN,OAAOM,aAAa;YACnCC,QAAQP,OAAOO,MAAM;YACrBC,WAAWR,OAAOQ,SAAS,CAACC,QAAQ;QACtC;IACF;IAEA,MAAMC,OAAOC,KAA4C,EAAE;QACzD,MAAM,EAAEH,SAAS,EAAEJ,QAAQ,EAAEF,aAAa,EAAEK,MAAM,EAAEJ,OAAO,EAAE,GAAG,MAAMS,IAAAA,yBAAa,EAACD,OAAOE,4DAA0B;QAErH,OAAOC,uBAAe,CAACJ,MAAM,CAAC;YAC5BF;YACAJ;YACAF;YACAK;YACAF,WAAWU,KAAKC,GAAG;YACnBb;QACF;IACF;IAEA,MAAMc,OAAO;QACX,OAAOH,uBAAe,CAACI,IAAI,CAAC,CAAC;IAC/B;IAEA,MAAMC,oBAAoBb,aAAqB,EAAE;QAC/C,OAAOQ,uBAAe,CAACI,IAAI,CAAC;YAC1B,yBAAyBZ;QAC3B;IACF;IAEA,MAAMc,cAAcd,aAAqB,EAAEH,OAA+B,EAAE;QAC1E,MAAMkB,kBAAkB,MAAMP,uBAAe,CAACQ,OAAO,CAAC;YACpD,yBAAyBhB;YACzBC,QAAQgB,wCAAW,CAACC,YAAY;QAClC;QAEA,IAAI,CAACH,iBAAiB;YACpB,IAAI,CAAC1B,MAAM,CAAC8B,IAAI,CAAC,CAAC,yBAAyB,EAAEnB,cAAc,0DAA0D,CAAC;YACtH;QACF;QACAe,gBAAgBlB,OAAO,GAAGA;QAC1B,MAAMkB,gBAAgBK,IAAI;IAC5B;IAEA,MAAMC,oBAAoB;QACxB,MAAMC,WAAW,MAAMd,uBAAe,CAACe,SAAS,CAAC;YAC/C;gBAAEC,OAAO;oBAAEtB,WAAW;oBAAGH,WAAW,CAAC;gBAAE;YAAE;YACzC;gBACE0B,QAAQ;oBACNC,KAAK;oBACL3B,WAAW;wBAAE4B,QAAQ;oBAAa;oBAClC9B,SAAS;wBAAE8B,QAAQ;oBAAW;oBAC9B1B,QAAQ;wBAAE0B,QAAQ;oBAAU;oBAC5B7B,UAAU;wBAAE6B,QAAQ;oBAAY;gBAClC;YACF;YACA;gBACEC,QAAQ;oBACN3B,QAAQ;wBACN4B,MAAM;4BAACZ,wCAAW,CAACa,SAAS;4BAAEb,wCAAW,CAACc,WAAW;yBAAC;oBACxD;gBACF;YACF;SACD;QAED,OAAOC,OAAOC,WAAW,CACvBX,SAASY,GAAG,CAAC,CAACC;YACZA,EAAEjC,SAAS,GAAGiC,EAAET,GAAG;YACnB,OAAOS,EAAET,GAAG;YACZ,OAAO;gBAACS,EAAEjC,SAAS;gBAAEiC;aAAE;QACzB;IAEJ;IAEA,MAAMC,2BAA2B;QAC/B,MAAMC,uBAAuB,MAAM7B,uBAAe,CAACe,SAAS,CAAC;YAC3D;gBACEE,QAAQ;oBACNC,KAAK;oBACLY,aAAa;wBACXC,OAAO;4BACLrC,WAAW;4BACXL,SAAS;4BACTD,eAAe;4BACfE,UAAU;4BACVG,QAAQ;4BACRF,WAAW;wBACb;oBACF;gBACF;YACF;SACD;QAED,OAAOyC,IAAAA,yCAAkB,EAACH;IAC5B;AACF"}
+{"version":3,"sources":["../../src/services/print-completion.service.ts"],"names":["PrintCompletionService","logger","constructor","loggerFactory","name","toDto","entity","id","completionLog","context","fileName","createdAt","status","printerId","toString","create","input","validateInput","createPrintCompletionRules","PrintCompletion","Date","now","list","find","findPrintCompletion","correlationId","updateContext","completionEntry","findOne","EVENT_TYPES","PrintStarted","warn","save","loadPrintContexts","contexts","aggregate","$sort","$group","_id","$first","$match","$nin","PrintDone","PrintFailed","Object","fromEntries","map","c","listGroupByPrinterStatus","printCompletionsAggr","printEvents","$push","processCompletions"],"mappings":";;;;+BAYaA;;;eAAAA;;;wBAZmB;kDACW;4BACb;6CACF;uCAOO;AAE5B,MAAMA;IACXC,OAAsB;IAEtBC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACF,MAAM,GAAGE,cAAcH,uBAAuBI,IAAI;IACzD;IAEAC,MAAMC,MAAwB,EAAmC;QAC/D,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,eAAeF,OAAOE,aAAa;YACnCC,SAASH,OAAOG,OAAO;YACvBC,UAAUJ,OAAOI,QAAQ;YACzBC,WAAWL,OAAOK,SAAS;YAC3BC,QAAQN,OAAOM,MAAM;YACrBC,WAAWP,OAAOO,SAAS,CAACC,QAAQ;QACtC;IACF;IAEA,MAAMC,OAAOC,KAA4C,EAAE;QACzD,MAAM,EAAEH,SAAS,EAAEH,QAAQ,EAAEF,aAAa,EAAEI,MAAM,EAAEH,OAAO,EAAE,GAAG,MAAMQ,IAAAA,yBAAa,EAACD,OAAOE,4DAA0B;QAErH,OAAOC,uBAAe,CAACJ,MAAM,CAAC;YAC5BF;YACAH;YACAF;YACAI;YACAD,WAAWS,KAAKC,GAAG;YACnBZ;QACF;IACF;IAEA,MAAMa,OAAO;QACX,OAAOH,uBAAe,CAACI,IAAI,CAAC,CAAC;IAC/B;IAEA,MAAMC,oBAAoBC,aAAqB,EAAE;QAC/C,OAAON,uBAAe,CAACI,IAAI,CAAC;YAC1B,yBAAyBE;QAC3B;IACF;IAEA,MAAMC,cAAcD,aAAqB,EAAEhB,OAA+B,EAAE;QAC1E,MAAMkB,kBAAkB,MAAMR,uBAAe,CAACS,OAAO,CAAC;YACpD,yBAAyBH;YACzBb,QAAQiB,wCAAW,CAACC,YAAY;QAClC;QAEA,IAAI,CAACH,iBAAiB;YACpB,IAAI,CAAC1B,MAAM,CAAC8B,IAAI,CAAC,CAAC,yBAAyB,EAAEN,cAAc,0DAA0D,CAAC;YACtH;QACF;QACAE,gBAAgBlB,OAAO,GAAGA;QAC1B,MAAMkB,gBAAgBK,IAAI;IAC5B;IAEA,MAAMC,oBAAoB;QACxB,MAAMC,WAAW,MAAMf,uBAAe,CAACgB,SAAS,CAAC;YAC/C;gBAAEC,OAAO;oBAAEvB,WAAW;oBAAGF,WAAW,CAAC;gBAAE;YAAE;YACzC;gBACE0B,QAAQ;oBACNC,KAAK;oBACL3B,WAAW;wBAAE4B,QAAQ;oBAAa;oBAClC9B,SAAS;wBAAE8B,QAAQ;oBAAW;oBAC9B3B,QAAQ;wBAAE2B,QAAQ;oBAAU;oBAC5B7B,UAAU;wBAAE6B,QAAQ;oBAAY;gBAClC;YACF;YACA;gBACEC,QAAQ;oBACN5B,QAAQ;wBACN6B,MAAM;4BAACZ,wCAAW,CAACa,SAAS;4BAAEb,wCAAW,CAACc,WAAW;yBAAC;oBACxD;gBACF;YACF;SACD;QAED,OAAOC,OAAOC,WAAW,CACvBX,SAASY,GAAG,CAAC,CAACC;YACZA,EAAElC,SAAS,GAAGkC,EAAET,GAAG;YACnB,OAAOS,EAAET,GAAG;YACZ,OAAO;gBAACS,EAAElC,SAAS;gBAAEkC;aAAE;QACzB;IAEJ;IAEA,MAAMC,2BAA2B;QAC/B,MAAMC,uBAAuB,MAAM9B,uBAAe,CAACgB,SAAS,CAAC;YAC3D;gBACEE,QAAQ;oBACNC,KAAK;oBACLY,aAAa;wBACXC,OAAO;4BACLtC,WAAW;4BACXJ,SAAS;4BACTD,eAAe;4BACfE,UAAU;4BACVE,QAAQ;4BACRD,WAAW;wBACb;oBACF;gBACF;YACF;SACD;QAED,OAAOyC,IAAAA,yCAAkB,EAACH;IAC5B;AACF"}

package/dist/services/print-completion.shared.js

@@ -51,7 +51,6 @@ function processCompletions(completions) {
         pc.successEventsLastWeek = successEvents.filter((e)=>e.createdAt > Date.now() - 7 * durationDayMSec)?.length;
         pc.successEventsLast48H = successEvents.filter((e)=>e.createdAt > Date.now() - 2 * durationDayMSec)?.length;
         pc.successEventsLast24H = successEvents.filter((e)=>e.createdAt > Date.now() - durationDayMSec)?.length;
-        // Explodes in size quickly, remove the event timeline
         delete pc.printEvents;
         return pc;
     });

package/dist/services/print-completion.shared.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/print-completion.shared.ts"],"names":["processCompletions","durationDayMSec","completions","map","pc","printerId","_id","jobs","groupArrayBy","printEvents","e","context","correlationId","printJobs","Object","entries","id","events","eventMap","status","createdAt","fileName","completionLog","lastEvent","reduce","e1","e2","correlationIds","j","printCount","length","eventCount","mappedEvents","failureEvents","filter","EVENT_TYPES","PrintFailed","failureCount","lastFailure","j1","j2","failureEventsLastWeek","Date","now","failureEventsLast48H","failureEventsLast24H","successEvents","PrintDone","successCount","lastSuccess","successEventsLastWeek","successEventsLast48H","successEventsLast24H"],"mappings":"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"}
+{"version":3,"sources":["../../src/services/print-completion.shared.ts"],"names":["processCompletions","durationDayMSec","completions","map","pc","printerId","_id","jobs","groupArrayBy","printEvents","e","context","correlationId","printJobs","Object","entries","id","events","eventMap","status","createdAt","fileName","completionLog","lastEvent","reduce","e1","e2","correlationIds","j","printCount","length","eventCount","mappedEvents","failureEvents","filter","EVENT_TYPES","PrintFailed","failureCount","lastFailure","j1","j2","failureEventsLastWeek","Date","now","failureEventsLast48H","failureEventsLast24H","successEvents","PrintDone","successCount","lastSuccess","successEventsLastWeek","successEventsLast48H","successEventsLast24H"],"mappings":"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"}