@fdm-monster/server 1.6.0-rc1 → 1.6.0-rc3

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

@@ -31,6 +31,7 @@ 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 _nodefs = require("node:fs");
 const Message = {
     connected: "connected",
     reauthRequired: "reauthRequired",
@@ -132,6 +133,7 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         }));
     }
     async reauthSession() {
+        this.logger.log("Sending reauthSession");
         await this.setupSocketSession();
         await this.sendAuth();
         this.resetReauthRequired();
@@ -140,42 +142,42 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         this.resetSocketState();
         this.sessionDto = await this.octoPrintApiService.login(this.loginDto).then((r)=>{
             if (r.name === "_api") {
-                this.setApiState(API_STATE.globalKey);
-                this.setSocketState(SOCKET_STATE.aborted);
+                this.setApiState("globalKey");
+                this.setSocketState("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.setApiState(API_STATE.authFail);
-                this.setSocketState(SOCKET_STATE.aborted);
+                this.setApiState("authFail");
+                this.setSocketState("aborted");
                 throw new _runtimeexceptions.ExternalServiceError("Guest group detected, authentication failed, aborting socket connection");
             }
-            this.setApiState(API_STATE.responding);
-            this.setSocketState(SOCKET_STATE.opening);
+            this.setApiState("responding");
+            this.setSocketState("opening");
             return r;
         }).catch((e)=>{
-            this.setSocketState(SOCKET_STATE.aborted);
+            this.setSocketState("aborted");
             if (e instanceof _runtimeexceptions.ExternalServiceError) {
                 this.logger.warn(`Printer authorization error (id: ${this.printerId}), apiState: ${this.apiState}`);
                 throw e;
             } else {
                 if (e?.response?.status === 403) {
-                    this.setApiState(API_STATE.authFail);
-                    this.setSocketState(SOCKET_STATE.aborted);
+                    this.setApiState("authFail");
+                    this.setSocketState("aborted");
                     throw new _runtimeexceptions.ExternalServiceError(e);
                 }
                 this.logger.error(`Printer (${this.printerId}) network or transport error, marking it as unreachable; ${e}`);
-                this.setApiState(API_STATE.noResponse);
+                this.setApiState("noResponse");
             }
             throw e;
         });
         this.username = await this.octoPrintApiService.getAdminUserOrDefault(this.loginDto).catch((e)=>{
             const status = e.response?.status;
             if (status === _httpstatuscodesconstants.HttpStatusCode.FORBIDDEN) {
-                this.setApiState(API_STATE.authFail);
-                this.setSocketState(SOCKET_STATE.aborted);
+                this.setApiState("authFail");
+                this.setSocketState("aborted");
             } else {
-                this.setApiState(API_STATE.authFail);
-                this.setSocketState(SOCKET_STATE.aborted);
+                this.setApiState("authFail");
+                this.setSocketState("aborted");
             }
             if ([
                 _httpstatuscodesconstants.HttpStatusCode.BAD_GATEWAY,
@@ -197,33 +199,8 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         this.reauthRequiredTimestamp = null;
     }
     resetSocketState() {
-        this.setSocketState(SOCKET_STATE.unopened);
-        this.setApiState(API_STATE.unset);
-    }
-    setApiState(state) {
-        this.apiState = state;
-        this.apiStateUpdated = true;
-        this.apiStateUpdateTimestamp = Date.now();
-        if (this._debugMode) {
-            this.logger.log(`${this.printerId} API state updated to: ` + state);
-        }
-        this.emitEventSync(Message.API_STATE_UPDATED, state);
-    }
-    setSocketState(state) {
-        this.socketState = state;
-        this.stateUpdated = true;
-        this.stateUpdateTimestamp = Date.now();
-        if (this._debugMode) {
-            this.logger.log(`${this.printerId} Socket state updated to: ` + state);
-        }
-        this.emitEventSync(Message.WS_STATE_UPDATED, state);
-    }
-    async emitEvent(event, payload) {
-        await this.eventEmitter.emitAsync(octoPrintEvent(event), {
-            event,
-            payload,
-            printerId: this.printerId
-        });
+        this.setSocketState("unopened");
+        this.setApiState("unset");
     }
     emitEventSync(event, payload) {
         this.eventEmitter.emit(octoPrintEvent(event), {
@@ -233,38 +210,69 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         });
     }
     async afterOpened(event) {
-        this.setSocketState(SOCKET_STATE.opened);
+        this.setSocketState("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);
+            this.setSocketState("authenticated");
         }
         const data = JSON.parse(message);
         const eventName = Object.keys(data)[0];
         const payload = data[eventName];
+        if (this._debugMode) {
+            this.logger.log(`RX Msg ${eventName} ${message.substring(0, 140)}...`);
+        }
         if (eventName === Message.reauthRequired) {
+            this.logger.log("Received 'reauthRequired', acting on it");
             this.setReauthRequired();
+        } else if (eventName === Message.current && this.configService.get(_serverconstants.AppConstants.debugFileWritePrinterStatesKey, _serverconstants.AppConstants.defaultDebugFileWritePrinterStates) === "true") {
+            (0, _nodefs.writeFileSync)(`websocket_current_${this.printerId}.txt`, JSON.stringify(payload, null, 2));
         }
         await this.emitEvent(eventName, payload);
     }
     async afterClosed(event) {
-        this.setSocketState(SOCKET_STATE.closed);
+        this.setSocketState("closed");
         delete this.socket;
         await this.emitEvent(Message.WS_CLOSED);
     }
     async onError(error) {
-        this.setSocketState(SOCKET_STATE.error);
+        this.setSocketState("error");
         await this.emitEvent(Message.WS_ERROR, error);
     }
+    async emitEvent(event, payload) {
+        await this.eventEmitter.emitAsync(octoPrintEvent(event), {
+            event,
+            payload,
+            printerId: this.printerId
+        });
+    }
     async sendAuth() {
         this.setSocketState(SOCKET_STATE.authenticating);
         await this.sendMessage(JSON.stringify({
             auth: `${this.username}:${this.sessionDto.session}`
         }));
     }
+    setSocketState(state) {
+        this.socketState = state;
+        this.stateUpdated = true;
+        this.stateUpdateTimestamp = Date.now();
+        if (this._debugMode) {
+            this.logger.log(`${this.printerId} Socket state updated to: ` + state);
+        }
+        this.emitEventSync(Message.WS_STATE_UPDATED, state);
+    }
+    setApiState(state) {
+        this.apiState = state;
+        this.apiStateUpdated = true;
+        this.apiStateUpdateTimestamp = Date.now();
+        if (this._debugMode) {
+            this.logger.log(`${this.printerId} API state updated to: ` + state);
+        }
+        this.emitEventSync(Message.API_STATE_UPDATED, state);
+    }
 }
 
 //# sourceMappingURL=octoprint-sockio.adapter.js.map

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","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"}
+{"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","log","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","emitEventSync","payload","emit","afterOpened","onMessage","message","data","parse","eventName","Object","keys","substring","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","writeFileSync","emitEvent","afterClosed","onError","emitAsync","auth","session","state"],"mappings":"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"}

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

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "normalizePrinterFile", {
+    enumerable: true,
+    get: function() {
+        return normalizePrinterFile;
+    }
+});
+function normalizePrinterFile(file) {
+    if (!file) {
+        throw new Error("File should not be null for normalization");
+    }
+    const keys = Object.keys(file);
+    const fileCopy = {
+        ...file
+    };
+    const knownKeys = [
+        "name",
+        "date",
+        "display",
+        "gcodeAnalysis",
+        "hash",
+        "origin",
+        "path",
+        "prints",
+        "refs",
+        "size",
+        "statistics",
+        "type",
+        "typePath"
+    ];
+    const unknownKeys = keys.filter((k)=>!knownKeys.includes(k));
+    const customData = {};
+    for (const unknownKey of unknownKeys){
+        customData[unknownKey] = fileCopy[unknownKey];
+        delete fileCopy[unknownKey];
+    }
+    fileCopy.customData = customData;
+    return fileCopy;
+}
+
+//# sourceMappingURL=file.utils.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/services/octoprint/utils/file.utils.ts"],"names":["normalizePrinterFile","file","Error","keys","Object","fileCopy","knownKeys","unknownKeys","filter","k","includes","customData","unknownKey"],"mappings":";;;;+BAGgBA;;;eAAAA;;;AAAT,SAASA,qBAAqBC,IAAyB;IAC5D,IAAI,CAACA,MAAM;QACT,MAAM,IAAIC,MAAM;IAClB;IAEA,MAAMC,OAAOC,OAAOD,IAAI,CAACF;IACzB,MAAMI,WAAW;QACf,GAAGJ,IAAI;IACT;IAEA,MAAMK,YAAY;QAChB;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;KACD;IAED,MAAMC,cAAcJ,KAAKK,MAAM,CAAC,CAACC,IAAM,CAACH,UAAUI,QAAQ,CAACD;IAE3D,MAAME,aAAiC,CAAC;IACxC,KAAK,MAAMC,cAAcL,YAAa;QACpCI,UAAU,CAACC,WAAW,GAAGP,QAAQ,CAACO,WAAW;QAC7C,OAAOP,QAAQ,CAACO,WAAW;IAC7B;IAEAP,SAASM,UAAU,GAAGA;IAEtB,OAAON;AACT"}

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

@@ -50,6 +50,9 @@ function BaseService(entity, dto, createDTO, updateDto) {
             return entity;
         }
         async create(dto) {
+            if (dto.id) {
+                delete dto.id;
+            }
             await (0, _classvalidator.validate)(dto);
             const entity = this.repository.create(dto);
             await (0, _classvalidator.validate)(entity);

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

@@ -1 +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"}
+{"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;YAE3B,IAAIA,IAAIU,EAAE,EAAE;gBACV,OAAOV,IAAIU,EAAE;YACf;YACA,MAAMiB,IAAAA,wBAAQ,EAAC3B;YACf,MAAMD,SAAS,IAAI,CAACM,UAAU,CAACyB,MAAM,CAAC9B;YACtC,MAAM2B,IAAAA,wBAAQ,EAAC5B;YAEf,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/orm/camera-stream.service.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "CameraStreamService", {
+    enumerable: true,
+    get: function() {
+        return CameraStreamService;
+    }
+});
+const _baseservice = require("./base.service");
+const _entities = require("../../entities");
+const _camerastreamdto = require("../interfaces/camera-stream.dto");
+class CameraStreamService extends (0, _baseservice.BaseService)(_entities.CameraStream, _camerastreamdto.CameraStreamDto) {
+    toDto(entity) {
+        return {
+            id: entity.id,
+            streamURL: entity.streamURL,
+            name: entity.name,
+            printerId: entity.printerId
+        };
+    }
+}
+
+//# sourceMappingURL=camera-stream.service.js.map

package/dist/services/orm/camera-stream.service.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/orm/camera-stream.service.ts"],"names":["CameraStreamService","BaseService","CameraStream","CameraStreamDto","toDto","entity","id","streamURL","name","printerId"],"mappings":";;;;+BAMaA;;;eAAAA;;;6BANe;0BACC;iCACG;AAIzB,MAAMA,4BACHC,IAAAA,wBAAW,EAACC,sBAAY,EAAEC,gCAAe;IAGjDC,MAAMC,MAAoB,EAAiC;QAEzD,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,WAAWF,OAAOE,SAAS;YAC3BC,MAAMH,OAAOG,IAAI;YACjBC,WAAWJ,OAAOI,SAAS;QAO7B;IACF;AACF"}

package/dist/services/orm/custom-gcode.service.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "CustomGcodeService", {
+    enumerable: true,
+    get: function() {
+        return CustomGcodeService;
+    }
+});
+const _entities = require("../../entities");
+const _customgcodedto = require("../interfaces/custom-gcode.dto");
+const _baseservice = require("./base.service");
+class CustomGcodeService extends (0, _baseservice.BaseService)(_entities.CustomGcode, _customgcodedto.CustomGcodeDto) {
+    toDto(entity) {
+        return {
+            id: entity.id,
+            name: entity.name,
+            description: entity.description,
+            gcode: [
+                ...entity.gcode
+            ]
+        };
+    }
+    async create(gcodeScript) {
+        return await super.create(gcodeScript);
+    }
+    async delete(gcodeScriptId, throwIfNotFound) {
+        return await super.delete(gcodeScriptId, throwIfNotFound);
+    }
+    async get(gcodeScriptId) {
+        return await super.get(gcodeScriptId);
+    }
+    async list() {
+        return await super.list();
+    }
+    async update(gcodeScriptId, updatedData) {
+        return await super.update(gcodeScriptId, updatedData);
+    }
+}
+
+//# sourceMappingURL=custom-gcode.service.js.map

package/dist/services/orm/custom-gcode.service.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/orm/custom-gcode.service.ts"],"names":["CustomGcodeService","BaseService","CustomGcode","CustomGcodeDto","toDto","entity","id","name","description","gcode","create","gcodeScript","delete","gcodeScriptId","throwIfNotFound","get","list","update","updatedData"],"mappings":";;;;+BAMaA;;;eAAAA;;;0BALe;gCAEG;6BACH;AAErB,MAAMA,2BACHC,IAAAA,wBAAW,EAACC,qBAAW,EAAEC,8BAAc;IAG/CC,MAAMC,MAAmB,EAAkB;QACzC,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,MAAMF,OAAOE,IAAI;YACjBC,aAAaH,OAAOG,WAAW;YAC/BC,OAAO;mBAAIJ,OAAOI,KAAK;aAAC;QAC1B;IACF;IAEA,MAAMC,OAAOC,WAAyC,EAAwB;QAC5E,OAAO,MAAM,KAAK,CAACD,OAAOC;IAC5B;IAEA,MAAMC,OAAOC,aAA2B,EAAEC,eAAyB,EAAE;QACnE,OAAO,MAAM,KAAK,CAACF,OAAOC,eAAeC;IAC3C;IAEA,MAAMC,IAAIF,aAA2B,EAAwB;QAC3D,OAAO,MAAM,KAAK,CAACE,IAAIF;IACzB;IAEA,MAAMG,OAA+B;QACnC,OAAO,MAAM,KAAK,CAACA;IACrB;IAEA,MAAMC,OAAOJ,aAA2B,EAAEK,WAAyC,EAAwB;QACzG,OAAO,MAAM,KAAK,CAACD,OAAOJ,eAAeK;IAC3C;AACF"}

package/dist/services/orm/floor-position.service.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "FloorPositionService", {
+    enumerable: true,
+    get: function() {
+        return FloorPositionService;
+    }
+});
+const _floorpositionentity = require("../../entities/floor-position.entity");
+const _baseservice = require("./base.service");
+const _floordto = require("../interfaces/floor.dto");
+class FloorPositionService extends (0, _baseservice.BaseService)(_floorpositionentity.FloorPosition, _floordto.PositionDto) {
+    constructor({ typeormService }){
+        super({
+            typeormService
+        });
+    }
+    async create(dto) {
+        return super.create(dto);
+    }
+    findPosition(x, y) {
+        return this.repository.findOneBy({
+            x,
+            y
+        });
+    }
+    findPrinterPosition(printerId) {
+        return this.repository.findOneBy({
+            id: printerId
+        });
+    }
+    deletePrinterPositionsByPrinterId(printerId) {
+        return this.repository.delete({
+            id: printerId
+        });
+    }
+    findPrinterPositionOnFloor(floorId, printerId) {
+        return this.repository.findOneBy({
+            floorId,
+            printerId
+        });
+    }
+    toDto(entity) {
+        return {
+            x: entity.x,
+            y: entity.y,
+            printerId: entity.printerId,
+            floorId: entity.floorId
+        };
+    }
+}
+
+//# sourceMappingURL=floor-position.service.js.map

package/dist/services/orm/floor-position.service.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/orm/floor-position.service.ts"],"names":["FloorPositionService","BaseService","FloorPosition","PositionDto","constructor","typeormService","create","dto","findPosition","x","y","repository","findOneBy","findPrinterPosition","printerId","id","deletePrinterPositionsByPrinterId","delete","findPrinterPositionOnFloor","floorId","toDto","entity"],"mappings":";;;;+BAOaA;;;eAAAA;;;qCAPiB;6BACF;0BAGA;AAGrB,MAAMA,6BAA6BC,IAAAA,wBAAW,EAACC,kCAAa,EAAEC,qBAAW;IAC9EC,YAAY,EAAEC,cAAc,EAAsC,CAAE;QAClE,KAAK,CAAC;YAAEA;QAAe;IACzB;IAEA,MAAMC,OAAOC,GAA8B,EAA0B;QACnE,OAAO,KAAK,CAACD,OAAOC;IACtB;IAEAC,aAAaC,CAAS,EAAEC,CAAS,EAAE;QACjC,OAAO,IAAI,CAACC,UAAU,CAACC,SAAS,CAAC;YAAEH;YAAGC;QAAE;IAC1C;IAEAG,oBAAoBC,SAAuB,EAAE;QAC3C,OAAO,IAAI,CAACH,UAAU,CAACC,SAAS,CAAC;YAAEG,IAAID;QAAU;IACnD;IAEAE,kCAAkCF,SAAuB,EAAE;QACzD,OAAO,IAAI,CAACH,UAAU,CAACM,MAAM,CAAC;YAAEF,IAAID;QAAU;IAChD;IAEAI,2BAA2BC,OAAqB,EAAEL,SAAuB,EAAE;QACzE,OAAO,IAAI,CAACH,UAAU,CAACC,SAAS,CAAC;YAAEO;YAASL;QAAU;IACxD;IAEAM,MAAMC,MAAqB,EAA6B;QACtD,OAAO;YACLZ,GAAGY,OAAOZ,CAAC;YACXC,GAAGW,OAAOX,CAAC;YACXI,WAAWO,OAAOP,SAAS;YAC3BK,SAASE,OAAOF,OAAO;QACzB;IACF;AACF"}

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

@@ -0,0 +1,122 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "FloorService", {
+    enumerable: true,
+    get: function() {
+        return FloorService;
+    }
+});
+const _baseservice = require("./base.service");
+const _entities = require("../../entities");
+const _floordto = require("../interfaces/floor.dto");
+const _validators = require("../../handlers/validators");
+const _floorservicevalidation = require("../validators/floor-service.validation");
+const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
+class FloorService extends (0, _baseservice.BaseService)(_entities.Floor, _floordto.FloorDto, _floordto.CreateFloorDto, _floordto.UpdateFloorDto) {
+    floorPositionService;
+    constructor({ floorPositionService, typeormService }){
+        super({
+            typeormService
+        });
+        this.floorPositionService = floorPositionService;
+    }
+    async create(dto) {
+        await (0, _validators.validateInput)(dto, _floorservicevalidation.createFloorRules);
+        const floor = await super.create({
+            name: dto.name,
+            floor: dto.floor,
+            printers: []
+        });
+        const printers = dto.printers;
+        if (printers?.length) {
+            for (let printer of printers){
+                await this.addOrUpdatePrinter(floor.id, printer);
+            }
+        }
+        return this.get(floor.id);
+    }
+    toDto(floor) {
+        return {
+            id: floor.id,
+            name: floor.name,
+            floor: floor.floor,
+            printers: floor.printers.map((p)=>({
+                    printerId: p.printerId,
+                    floorId: p.floorId,
+                    x: p.x,
+                    y: p.y
+                }))
+        };
+    }
+    async createDefaultFloor() {
+        const floor = await this.create({
+            name: "Default Floor",
+            floor: 0
+        });
+        return await this.get(floor.id);
+    }
+    async update(floorId, update) {
+        const floor = await this.get(floorId);
+        const floorUpdate = Object.assign(floor, update);
+        await (0, _validators.validateInput)(floorUpdate, _floorservicevalidation.updateFloorRules);
+        const printers = floorUpdate.printers;
+        if (printers?.length) {
+            for (let printer of printers){
+                await this.addOrUpdatePrinter(floor.id, printer);
+            }
+        }
+        delete floorUpdate.printers;
+        return super.update(floorId, floorUpdate);
+    }
+    async updateName(floorId, name) {
+        let floor = await this.get(floorId);
+        floor.name = name;
+        floor = await this.update(floorId, {
+            name
+        });
+        return floor;
+    }
+    async updateLevel(floorId, level) {
+        let floor = await this.get(floorId);
+        floor.floor = level;
+        floor = await this.update(floorId, {
+            floor: level
+        });
+        return floor;
+    }
+    async addOrUpdatePrinter(floorId, positionDto) {
+        const floor = await this.get(floorId);
+        const position = await this.floorPositionService.findPrinterPosition(positionDto.printerId);
+        if (position) {
+            await this.floorPositionService.delete(position.id);
+        }
+        const xyPosition = await this.floorPositionService.findPosition(positionDto.x, positionDto.y);
+        if (xyPosition) {
+            await this.floorPositionService.delete(xyPosition.id);
+        }
+        const newPosition = new _entities.FloorPosition();
+        Object.assign(newPosition, {
+            x: positionDto.x,
+            y: positionDto.y,
+            printerId: positionDto.printerId,
+            floorId: floorId
+        });
+        await this.floorPositionService.create(newPosition);
+        return this.get(floorId);
+    }
+    async removePrinter(floorId, printerId) {
+        const position = await this.floorPositionService.findPrinterPositionOnFloor(floorId, printerId);
+        if (!position) {
+            throw new _runtimeexceptions.NotFoundException("This printer was not found on this floor");
+        }
+        await this.floorPositionService.delete(position.id);
+        return await this.get(floorId);
+    }
+    async deletePrinterFromAnyFloor(printerId) {
+        await this.floorPositionService.deletePrinterPositionsByPrinterId(printerId);
+    }
+}
+
+//# sourceMappingURL=floor.service.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/orm/floor.service.ts"],"names":["FloorService","BaseService","Floor","FloorDto","CreateFloorDto","UpdateFloorDto","floorPositionService","constructor","typeormService","create","dto","validateInput","createFloorRules","floor","name","printers","length","printer","addOrUpdatePrinter","id","get","toDto","map","p","printerId","floorId","x","y","createDefaultFloor","update","floorUpdate","Object","assign","updateFloorRules","updateName","updateLevel","level","positionDto","position","findPrinterPosition","delete","xyPosition","findPosition","newPosition","FloorPosition","removePrinter","findPrinterPositionOnFloor","NotFoundException","deletePrinterFromAnyFloor","deletePrinterPositionsByPrinterId"],"mappings":"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"}