npm - @fdm-monster/server - Versions diffs - 1.6.1 → 1.6.3 - Mend

@fdm-monster/server 1.6.1 → 1.6.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (542) hide show

package/dist/services/octoprint/octoprint-api.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../../src/services/octoprint/octoprint-api.service.ts"],"names":["OctoPrintApiService","OctoPrintRoutes","eventEmitter2","axiosClient","logger","constructor","settingsStore","httpClient","loggerFactory","name","login","url","options","prepareRequest","apiLogin","response","post","data","sendConnectionCommand","commandData","prepareJsonRequest","apiConnection","sendPrintHeadJogCommand","amounts","axesToHome","x","y","z","command","sendPrintHeadCommand","sendPrintHeadHomeCommand","axes","apiPrinterHead","sendCustomGCodeCommand","commandString","apiPrinterCustomCommand","sendJobCommand","apiJob","sendBedTempCommand","targetTemp","apiPrinterBed","getBedTargetCommand","getSettings","apiSettingsPart","get","updatePrinterNameSetting","printerName","settingPatch","printerNameSetting","updateFirmwareUpdaterSettings","firmwareUpdateConfig","pluginFirmwareUpdaterSettings","setGCodeAnalysis","enabled","gcodeAnalysisSetting","getAdminUserOrDefault","getUsers","opAdminUserName","users","Array","isArray","adminUser","find","user","admin","apiUsers","getLocalFiles","recursive","apiGetFiles","files","filter","f","date","map","normalizePrinterFile","getFile","path","pathUrl","apiFile","e","error","errorSummary","createFolder","foldername","apiFilesLocation","formData","FormData","append","headers","getHeaders","getLengthSync","moveFileOrFolder","destination","moveFileCommand","selectPrintFile","print","selectCommand","uploadFileAsMultiPart","multerFileOrBuffer","commands","token","multiPartContentType","select","source","buffer","isPhysicalFile","createReadStream","filename","originalname","result","Promise","resolve","reject","getLength","err","length","axios","method","onUploadProgress","p","emit","uploadProgressEvent","failed","JSON","parse","body","ExternalServiceError","message","statusCode","success","stack","deleteFileOrFolder","delete","getPrinterCurrent","history","limit","exclude","apiPrinterCurrent","getConnection","getPrinterProfiles","apiPrinterProfiles","postSoftwareUpdate","targets","pluginSoftwareUpdateUpdate","getPluginManagerPlugins","pluginManagerPlugins","getPluginManagerPlugin","pluginName","pluginManagerPlugin","postApiPluginManagerCommand","pluginCommand","pluginUrl","apiPluginManager","pluginManagerCommand","postPluginFirmwareUpdateFlash","currentPrinterId","firmwarePath","pluginFirmwareUpdaterFlash","basename","fileReadStream","fs","uploadProgress","firmwareFlashUploadEvent","getPluginFirmwareUpdateStatus","pluginFirmwareUpdaterStatus","fetchOctoPrintPlugins","prepareAnonymousRequest","pluginRepositoryUrl","getSystemInfo","apiSystemInfo","getSystemCommands","apiSystemCommands","postSystemRestartCommand","apiSystemRestartCommand","getSoftwareUpdateCheck","force","apiSoftwareUpdateCheck","getPluginPiSupport","apiPluginPiSupport","deleteTimeLapse","fileName","apiTimelapse","listUnrenderedTimeLapses","listProfiles","apiProfiles","getBackupOverview","pluginBackupIndex","getBackups","pluginBackupEndpoint","createBackup","excludeArray","getDownloadBackupStream","pluginBackupFileDownload","responseType","catch","forwardRestoreBackupFileStream","pluginBackupFileRestore","deleteBackup","pluginBackupFile"],"mappings":"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"}
1	+ {"version":3,"sources":["../../../src/services/octoprint/octoprint-api.service.ts"],"names":["OctoPrintApiService","OctoPrintRoutes","eventEmitter2","axiosClient","logger","constructor","settingsStore","httpClient","loggerFactory","name","getVersion","login","timeout","url","options","prepareRequest","apiVersion","response","get","data","getServer","apiServer","apiLogin","post","sendConnectionCommand","commandData","prepareJsonRequest","apiConnection","sendPrintHeadJogCommand","amounts","axesToHome","x","y","z","command","sendPrintHeadCommand","sendPrintHeadHomeCommand","axes","apiPrinterHead","sendCustomGCodeCommand","commandString","apiPrinterCustomCommand","sendJobCommand","apiJob","sendBedTempCommand","targetTemp","apiPrinterBed","getBedTargetCommand","getSettings","apiSettingsPart","updatePrinterNameSetting","printerName","settingPatch","printerNameSetting","updateFirmwareUpdaterSettings","firmwareUpdateConfig","pluginFirmwareUpdaterSettings","setGCodeAnalysis","enabled","gcodeAnalysisSetting","getCurrentUser","apiCurrentUser","getAdminUserOrDefault","currentUser","getUsers","apiUsers","getLocalFiles","recursive","apiGetFiles","files","filter","f","date","map","normalizePrinterFile","getFile","path","pathUrl","apiFile","e","captureException","error","createFolder","foldername","apiFilesLocation","formData","FormData","append","headers","getHeaders","getLengthSync","moveFileOrFolder","destination","moveFileCommand","selectPrintFile","print","selectCommand","uploadFileAsMultiPart","multerFileOrBuffer","commands","token","multiPartContentType","select","source","buffer","isPhysicalFile","createReadStream","filename","originalname","result","Promise","resolve","reject","getLength","err","length","axios","method","onUploadProgress","p","emit","uploadProgressEvent","failed","JSON","parse","body","ExternalServiceError","message","statusCode","success","stack","deleteFileOrFolder","delete","getPrinterCurrent","history","limit","exclude","apiPrinterCurrent","getConnection","getPrinterProfiles","apiPrinterProfiles","postSoftwareUpdate","targets","pluginSoftwareUpdateUpdate","getPluginManagerPlugins","pluginManagerPlugins","getPluginManagerPlugin","pluginName","pluginManagerPlugin","postApiPluginManagerCommand","pluginCommand","pluginUrl","apiPluginManager","pluginManagerCommand","postPluginFirmwareUpdateFlash","currentPrinterId","firmwarePath","pluginFirmwareUpdaterFlash","basename","fileReadStream","fs","uploadProgress","firmwareFlashUploadEvent","getPluginFirmwareUpdateStatus","pluginFirmwareUpdaterStatus","fetchOctoPrintPlugins","prepareAnonymousRequest","pluginRepositoryUrl","getSystemInfo","apiSystemInfo","getSystemCommands","apiSystemCommands","postSystemRestartCommand","apiSystemRestartCommand","getSoftwareUpdateCheck","force","apiSoftwareUpdateCheck","getPluginPiSupport","apiPluginPiSupport","deleteTimeLapse","fileName","apiTimelapse","listUnrenderedTimeLapses","listProfiles","apiProfiles","getBackupOverview","pluginBackupIndex","getBackups","pluginBackupEndpoint","createBackup","excludeArray","getDownloadBackupStream","pluginBackupFileDownload","responseType","catch","forwardRestoreBackupFileStream","pluginBackupFileRestore","deleteBackup","pluginBackupFile"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

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

@@ -12,8 +12,8 @@ _export(exports, {
     API_STATE: function() {
         return API_STATE;
     },
-    Message: function() {
-        return Message;
+    OctoPrintMessage: function() {
+        return OctoPrintMessage;
     },
     OctoPrintSockIoAdapter: function() {
         return OctoPrintSockIoAdapter;
@@ -21,6 +21,9 @@ _export(exports, {
     SOCKET_STATE: function() {
         return SOCKET_STATE;
     },
+    WsMessage: function() {
+        return WsMessage;
+    },
     octoPrintEvent: function() {
         return octoPrintEvent;
     }
@@ -32,7 +35,14 @@ 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 = {
+const WsMessage = {
+    WS_OPENED: "WS_OPENED",
+    WS_CLOSED: "WS_CLOSED",
+    WS_ERROR: "WS_ERROR",
+    API_STATE_UPDATED: "API_STATE_UPDATED",
+    WS_STATE_UPDATED: "WS_STATE_UPDATED"
+};
+const OctoPrintMessage = {
     connected: "connected",
     reauthRequired: "reauthRequired",
     current: "current",
@@ -40,12 +50,7 @@ const Message = {
     event: "event",
     plugin: "plugin",
     timelapse: "timelapse",
-    slicingProgress: "slicingProgress",
-    WS_OPENED: "WS_OPENED",
-    WS_CLOSED: "WS_CLOSED",
-    WS_ERROR: "WS_ERROR",
-    API_STATE_UPDATED: "API_STATE_UPDATED",
-    WS_STATE_UPDATED: "WS_STATE_UPDATED"
+    slicingProgress: "slicingProgress"
 };
 const SOCKET_STATE = {
     unopened: "unopened",
@@ -120,7 +125,7 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
     }
     open() {
         if (this.socket) {
-            throw new Error(`Socket already exists (printerId: ${this.printerId}, ignoring open request`);
+            throw new Error(`Socket already exists by printerId, ignoring open request`);
         }
         super.open(this.socketURL);
     }
@@ -144,12 +149,12 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
             if (r.name === "_api") {
                 this.setApiState("globalKey");
                 this.setSocketState("aborted");
-                throw new _runtimeexceptions.ExternalServiceError("Global API Key detected, aborting socket connection");
+                throw new _runtimeexceptions.ExternalServiceError("Global API Key detected, aborting socket connection", "OctoPrint");
             } else if (r.needs?.group[0] === "guests") {
                 this.logger.warn("Detected group guests in OctoPrint login response, marking as unauthorized");
                 this.setApiState("authFail");
                 this.setSocketState("aborted");
-                throw new _runtimeexceptions.ExternalServiceError("Guest group detected, authentication failed, aborting socket connection");
+                throw new _runtimeexceptions.ExternalServiceError("Guest group detected, authentication failed, aborting socket connection", "OctoPrint");
             }
             this.setApiState("responding");
             this.setSocketState("opening");
@@ -157,13 +162,13 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         }).catch((e)=>{
             this.setSocketState("aborted");
             if (e instanceof _runtimeexceptions.ExternalServiceError) {
-                this.logger.warn(`Printer authorization error (id: ${this.printerId}), apiState: ${this.apiState}`);
+                this.logger.warn(`Printer authorization error, apiState: ${this.apiState}`);
                 throw e;
             } else {
                 if (e?.response?.status === 403) {
                     this.setApiState("authFail");
                     this.setSocketState("aborted");
-                    throw new _runtimeexceptions.ExternalServiceError(e);
+                    throw new _runtimeexceptions.ExternalServiceError(e, "OctoPrint");
                 }
                 this.logger.error(`Printer (${this.printerId}) network or transport error, marking it as unreachable; ${e}`);
                 this.setApiState("noResponse");
@@ -225,10 +230,10 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         if (this._debugMode) {
             this.logger.log(`RX Msg ${eventName} ${message.substring(0, 140)}...`);
         }
-        if (eventName === Message.reauthRequired) {
+        if (eventName === OctoPrintMessage.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") {
+        } else if (eventName === OctoPrintMessage.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);
@@ -236,11 +241,11 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
     async afterClosed(event) {
         this.setSocketState("closed");
         delete this.socket;
-        await this.emitEvent(Message.WS_CLOSED, "connection closed");
+        await this.emitEvent(WsMessage.WS_CLOSED, "connection closed");
     }
     async onError(error) {
         this.setSocketState("error");
-        await this.emitEvent(Message.WS_ERROR, error?.length ? error : "connection error");
+        await this.emitEvent(WsMessage.WS_ERROR, error?.length ? error : "connection error");
     }
     async emitEvent(event, payload) {
         await this.eventEmitter.emitAsync(octoPrintEvent(event), {
@@ -262,7 +267,7 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         if (this._debugMode) {
             this.logger.log(`${this.printerId} Socket state updated to: ` + state);
         }
-        this.emitEventSync(Message.WS_STATE_UPDATED, state);
+        this.emitEventSync(WsMessage.WS_STATE_UPDATED, state);
     }
     setApiState(state) {
         this.apiState = state;
@@ -271,7 +276,7 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
         if (this._debugMode) {
             this.logger.log(`${this.printerId} API state updated to: ` + state);
         }
-        this.emitEventSync(Message.API_STATE_UPDATED, state);
+        this.emitEventSync(WsMessage.API_STATE_UPDATED, state);
     }
 }

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

	@@ -1 +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","printerId","stateUpdated","stateUpdateTimestamp","socketState","apiStateUpdated","apiStateUpdateTimestamp","apiState","lastMessageReceivedTimestamp","reauthRequiredTimestamp","loginDto","logger","eventEmitter","configService","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","length","emitAsync","auth","session","state"],"mappings":";;;;;;;;;;;IAmDaA,SAAS;eAATA;;~~IA/BAC~~,~~OAAO~~;~~eAAPA~~;;~~IA2CAC~~,sBAAsB;eAAtBA;;IAzBAC,YAAY;eAAZA;;~~IAuBAC~~,cAAc;eAAdA;;;0CA7DkB;iCACF;mCACQ;0BACT;8BACC;kCAUI;wBAEH;~~AAIvB~~,~~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;AAIO,~~MAAMzB~~,YAAY;~~IACvB0B~~,OAAO;IACPC,YAAY;IACZC,WAAW;IACXC,UAAU;IACVC,YAAY;AACd;AAIO,MAAM1B,iBAAiB,~~CAACK~~,QAAkB,CAAC,UAAU,EAAEA,MAAM,CAAC;AAE9D,~~MAAMP~~,+BAA+~~B6B~~,kCAAgB;IAC1DC,oBAAyC;IAClCC,UAAmB;IAC1BC,eAAe,MAAM;IACrBC,uBAAsC,KAAK;IAC3CC,~~cAAcjC~~,~~aAAae~~,QAAQ,CAAC;IACpCmB,kBAAkB,MAAM;IACxBC,0BAAyC,KAAK;IAC9CC,~~WAAWvC~~,~~UAAU0B~~,KAAK,CAAC;IAC3Bc,+BAA8C,KAAK;~~IACnDlC~~,iBAAiB,MAAM;~~IACvBmC~~,0BAAyC,KAAK;IAC9CC,SAA2B;IACjBC,OAAsB;IACxBC,aAA4B;IAC5BC,cAA6B;IAC7BC,UAAgB;IAChBC,WAAiC;IACjCC,SAAkB;IAE1BC,YAAY,EACVC,aAAa,EACblB,mBAAmB,EACnBmB,aAAa,EACbN,aAAa,EAMd,CAAE;QACD,KAAK,CAAC;YAAEK;QAAc;QAEtB,IAAI,CAACP,MAAM,GAAGO,~~cAAchD~~,~~uBAAuBkD~~,IAAI;QACvD,IAAI,CAACpB,mBAAmB,GAAGA;QAC3B,IAAI,CAACY,YAAY,GAAGO;QACpB,IAAI,CAACN,aAAa,GAAGA;IACvB;IAEA,IAAIQ,aAAa;QACf,OAAO,IAAI,CAACR,aAAa,CAACS,GAAG,CAACC,6BAAY,CAACC,oBAAoB,EAAED,6BAAY,CAACE,wBAAwB,MAAM;IAC9G;IAEAC,cAAc;QACZ,MAAMC,cAAc,IAAI,CAACpB,QAAQ,~~KAAKvC~~,~~UAAU8B~~,UAAU;QAC1D,OAAO6B,eAAgB,CAAA,IAAI,CAACvB,WAAW,~~KAAKjC~~,~~aAAasB~~,MAAM,IAAI,IAAI,CAACW,WAAW,~~KAAKjC~~,~~aAAaqB~~,KAAK,AAAD;IAC3G;IAEAoC,aAAa;QACX,OAAO,IAAI,CAACxB,WAAW,~~KAAKjC~~,~~aAAae~~,QAAQ;IACnD;IAMA2C,cAAc;QACZ,OAAO,IAAI,~~CAACvD~~,cAAc;IAC5B;~~IAEAwD~~,oBAAoB;QAClB,OAAO,IAAI,CAAC1B,WAAW,~~KAAKjC~~,~~aAAasB~~,MAAM,IAAI,IAAI,CAACW,WAAW,~~KAAKjC~~,~~aAAaoB~~,OAAO;IAC9F;IAEAwC,oBAAoBC,WAAgC,EAAE;QACpD,MAAM,EAAE/B,SAAS,EAAES,QAAQ,EAAEuB,QAAQ,EAAE,GAAGD;QAC1C,IAAI,CAAC/B,SAAS,GAAGA;QACjB,IAAI,CAACS,QAAQ,GAAGA;QAEhB,MAAMwB,UAAUC,IAAAA,0BAAY,EAAC,IAAI,CAACzB,QAAQ,CAAC0B,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,CAACzC,SAAS,~~CAAC~~,uBAAuB,CAAC~~;~~QAC9F~~;QACA,KAAK,~~CAACuC~~,KAAK,IAAI,CAAC1B,SAAS;IAC3B;IAEA6B,QAAQ;QACN,KAAK,CAACA;IACR;IAEA,MAAMC,aAAaC,WAAmBtB,6BAAY,CAACuB,yBAAyB,EAAiB;QAC3F,OAAO,MAAM,IAAI,CAACC,WAAW,CAACC,KAAKC,SAAS,CAAC;YAAEJ;QAAS;IAC1D;IAEA,MAAMK,gBAAgB;QACpB,IAAI,CAACvC,MAAM,CAACwC,GAAG,CAAC;QAChB,MAAM,IAAI,CAACC,kBAAkB;QAC7B,MAAM,IAAI,CAACC,QAAQ;QACnB,IAAI,CAACC,mBAAmB;IAC1B;IAKA,MAAMF,qBAAoC;QACxC,IAAI,CAACG,gBAAgB;QACrB,IAAI,CAACxC,UAAU,GAAG,MAAM,IAAI,CAACf,mBAAmB,CAC7CwD,KAAK,CAAC,IAAI,CAAC9C,QAAQ,EACnB+C,IAAI,CAAC,CAACC;YAEL,IAAIA,EAAEtC,IAAI,KAAK,QAAQ;gBACrB,IAAI,CAACuC,WAAW,CAAC;gBACjB,IAAI,CAACC,cAAc,CAAC;gBACpB,MAAM,IAAIC,uCAAoB,CAAC;~~YACjC~~,OAAO,IAAIH,EAAEI,KAAK,EAAEC,KAAK,CAAC,EAAE,KAAK,UAAU;gBACzC,IAAI,CAACpD,MAAM,CAACqD,IAAI,CAAC;gBAEjB,IAAI,CAACL,WAAW,CAAC;gBACjB,IAAI,CAACC,cAAc,CAAC;gBACpB,MAAM,IAAIC,uCAAoB,CAAC;~~YACjC~~;YACA,IAAI,CAACF,WAAW,CAAC;YACjB,IAAI,CAACC,cAAc,CAAC;YACpB,OAAOF;QACT,GACCO,KAAK,CAAC,CAACC;YACN,IAAI,CAACN,cAAc,CAAC;YAEpB,IAAIM,aAAaL,uCAAoB,EAAE;gBACrC,IAAI,CAAClD,MAAM,CAACqD,IAAI,CAAC,CAAC,~~iCAAiC~~,EAAE,IAAI,~~CAAC/D~~,~~SAAS,CAAC,aAAa,EAAE,IAAI,CAACM,~~QAAQ,CAAC,CAAC;~~gBAClG~~,MAAM2D;YACR,OAAO;gBACL,IAAIA,GAAGC,UAAUC,WAAW,KAAK;oBAC/B,IAAI,CAACT,WAAW,CAAC;oBACjB,IAAI,CAACC,cAAc,CAAC;oBACpB,MAAM,IAAIC,uCAAoB,CAACK;~~gBACjC~~;~~gBACA~~,IAAI,CAACvD,MAAM,CAACnB,KAAK,CAAC,CAAC,SAAS,EAAE,IAAI,CAACS,SAAS,CAAC,yDAAyD,EAAEiE,EAAE,CAAC;gBAC3G,IAAI,CAACP,WAAW,CAAC;YACnB;YACA,MAAMO;QACR;QAEF,IAAI,CAAClD,QAAQ,GAAG,MAAM,IAAI,CAAChB,mBAAmB,CAACqE,qBAAqB,CAAC,IAAI,CAAC3D,QAAQ,EAAEuD,KAAK,CAAC,CAACC;YACzF,MAAME,SAASF,EAAEC,QAAQ,EAAEC;YAC3B,IAAIA,WAAWE,wCAAc,CAACC,SAAS,EAAE;gBACvC,IAAI,CAACZ,WAAW,CAAC;gBACjB,IAAI,CAACC,cAAc,CAAC;YACtB,OAAO;gBACL,IAAI,CAACD,WAAW,CAAC;gBACjB,IAAI,CAACC,cAAc,CAAC;YACtB;YACA,IACE;gBACEU,wCAAc,CAACE,WAAW;gBAC1BF,wCAAc,CAACG,eAAe;gBAC9BH,wCAAc,CAACI,mBAAmB;gBAClCJ,wCAAc,CAACK,eAAe;aAC/B,CAACC,QAAQ,CAACR,SACX;gBACA,IAAI,CAACzD,MAAM,CAACnB,KAAK,CAAC,CAAC,0BAA0B,EAAE4E,OAAO,iDAAiD,CAAC;YAC1G;YACA,MAAMF;QACR;IACF;IAEAW,oBAAoB;QAClB,IAAI,~~CAACvG~~,cAAc,GAAG;QACtB,IAAI,~~CAACmC~~,uBAAuB,GAAGqE,KAAKC,GAAG;IACzC;IAEAzB,sBAAsB;QACpB,IAAI,~~CAAChF~~,cAAc,GAAG;QACtB,IAAI,~~CAACmC~~,uBAAuB,GAAG;IACjC;IAEA8C,mBAAmB;QACjB,IAAI,CAACK,cAAc,CAAC;QACpB,IAAI,CAACD,WAAW,CAAC;IACnB;IAEAqB,~~cAAcvG~~,KAAa,~~EAAEwG~~,OAAY,EAAE;QACzC,IAAI,CAACrE,YAAY,CAACsE,IAAI,CAAC9G,~~eAAeK~~,QAAQ;YAC5CA;~~YACAwG~~;YACAhF,WAAW,IAAI,CAACA,SAAS;QAC3B;IACF;IAEA,MAAgBkF,~~YAAY1G~~,KAAU,EAAiB;QACrD,IAAI,~~CAACmF~~,cAAc,CAAC;QACpB,MAAM,IAAI,CAACP,QAAQ;QACnB,MAAM,IAAI,CAACT,YAAY,CAACrB,6BAAY,CAACuB,yBAAyB;IAChE;IAEA,MAAgBsC,UAAUC,OAAe,EAAiB;QACxD,IAAI,CAAC7E,4BAA4B,GAAGsE,KAAKC,GAAG;QAE5C,IAAI,IAAI,CAAC3E,WAAW,~~KAAKjC~~,~~aAAamB~~,aAAa,EAAE;YACnD,IAAI,CAACsE,cAAc,CAAC;QACtB;QAEA,MAAM0B,OAAOtC,KAAKuC,KAAK,CAACF;QACxB,MAAMG,YAAYC,OAAOC,IAAI,CAACJ,KAAK,CAAC,EAAE;QACtC,MAAML,UAAUK,IAAI,CAACE,UAAU;QAE/B,IAAI,IAAI,CAACnE,UAAU,EAAE;YACnB,IAAI,CAACV,MAAM,CAACwC,GAAG,CAAC,CAAC,OAAO,EAAEqC,UAAU,CAAC,EAAEH,QAAQM,SAAS,CAAC,GAAG,KAAK,GAAG,CAAC;QACvE;QAEA,IAAIH,~~cAAcvH~~,~~QAAQK~~,cAAc,EAAE;~~YACxC~~,IAAI,~~CAACqC~~,MAAM,CAACwC,GAAG,CAAC;YAChB,IAAI,CAAC0B,iBAAiB;QACxB,OAAO,IACLW,~~cAAcvH~~,~~QAAQM~~,OAAO,~~IAC7B~~,IAAI,~~CAACsC~~,aAAa,CAACS,GAAG,CAACC,6BAAY,CAACqE,8BAA8B,EAAErE,6BAAY,CAACsE,kCAAkC,MACjH,QACF;YACAC,IAAAA,qBAAa,EAAC,CAAC,kBAAkB,EAAE,IAAI,CAAC7F,SAAS,CAAC,IAAI,CAAC,EAAE+C,KAAKC,SAAS,CAACgC,SAAS,MAAM;QACzF;QAGA,MAAM,IAAI,CAACc,SAAS,CAACP,WAAWP;IAClC;IAEA,MAAgBe,~~YAAYvH~~,KAAU,EAAE;QACtC,IAAI,~~CAACmF~~,cAAc,CAAC;QACpB,OAAO,IAAI,CAACnB,MAAM;QAClB,MAAM,IAAI,CAACsD,SAAS,~~CAAC9H~~,~~QAAQa~~,SAAS,EAAE;~~IAC1C~~;IAEA,~~MAAgBmH~~,QAAQzG,KAAU,EAAE;QAClC,IAAI,CAACoE,cAAc,CAAC;QACpB,MAAM,IAAI,CAACmC,SAAS,~~CAAC9H~~,~~QAAQc~~,QAAQ,~~EAAES~~,OAAO0G,SAAS1G,QAAQ;~~IACjE~~;IAEA,MAAcuG,~~UAAUtH~~,KAAa,~~EAAEwG~~,OAAa,EAAE;QACpD,MAAM,IAAI,CAACrE,YAAY,CAACuF,SAAS,CAAC/H,~~eAAeK~~,QAAQ;YACvDA;~~YACAwG~~;YACAhF,WAAW,IAAI,CAACA,SAAS;QAC3B;IACF;IAEA,MAAcoD,WAA0B;QACtC,IAAI,CAACO,cAAc,~~CAACzF~~,~~aAAaiB~~,cAAc;QAC/C,MAAM,IAAI,CAAC2D,WAAW,CACpBC,KAAKC,SAAS,CAAC;YACbmD,MAAM,CAAC,EAAE,IAAI,CAACpF,QAAQ,CAAC,CAAC,EAAE,IAAI,CAACD,UAAU,CAACsF,OAAO,CAAC,CAAC;QACrD;IAGJ;IAEQzC,eAAe0C,KAAsB,EAAE;QAC7C,IAAI,CAAClG,WAAW,GAAGkG;QACnB,IAAI,CAACpG,YAAY,GAAG;QACpB,IAAI,CAACC,oBAAoB,GAAG2E,KAAKC,GAAG;QACpC,IAAI,IAAI,CAAC1D,UAAU,EAAE;YACnB,IAAI,CAACV,MAAM,CAACwC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAClD,SAAS,CAAC,0BAA0B,CAAC,GAAGqG;QAClE;QACA,IAAI,CAACtB,aAAa,~~CAAC/G~~,~~QAAQgB~~,gBAAgB,~~EAAEqH~~;~~IAC/C~~;IAEQ3C,YAAY2C,KAAmB,EAAE;QACvC,IAAI,CAAC/F,QAAQ,GAAG+F;QAChB,IAAI,CAACjG,eAAe,GAAG;QACvB,IAAI,CAACC,uBAAuB,GAAGwE,KAAKC,GAAG;QACvC,IAAI,IAAI,CAAC1D,UAAU,EAAE;YACnB,IAAI,CAACV,MAAM,CAACwC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAClD,SAAS,CAAC,uBAAuB,CAAC,GAAGqG;QAC/D;QACA,IAAI,CAACtB,aAAa,~~CAAC/G~~,~~QAAQe~~,iBAAiB,~~EAAEsH~~;~~IAChD~~;AACF"}
1	+ {"version":3,"sources":["../../../src/services/octoprint/octoprint-sockio.adapter.ts"],"names":["API_STATE","OctoPrintMessage","OctoPrintSockIoAdapter","SOCKET_STATE","WsMessage","octoPrintEvent","WS_OPENED","WS_CLOSED","WS_ERROR","API_STATE_UPDATED","WS_STATE_UPDATED","connected","reauthRequired","current","history","event","plugin","timelapse","slicingProgress","unopened","opening","authenticating","opened","authenticated","aborted","error","closed","unset","noResponse","globalKey","authFail","responding","WebsocketAdapter","octoPrintApiService","printerId","stateUpdated","stateUpdateTimestamp","socketState","apiStateUpdated","apiStateUpdateTimestamp","apiState","lastMessageReceivedTimestamp","reauthRequiredTimestamp","loginDto","logger","eventEmitter","configService","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","length","emitAsync","auth","session","state"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

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

	@@ -1 +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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"}
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"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

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

@@ -43,7 +43,7 @@ class PluginFirmwareUpdateService extends _pluginbaseservice.PluginBaseService {
             const response = await this.githubService.getReleases(defaultRepos.prusaFirmwareOwner, defaultRepos.prusaFirmwareRepo);
             this.prusaFirmwareReleases = response.data;
         } catch (e) {
-            return this.logger.error("Github fetch error. Probably rate limited, skipping firmware dowmload");
+            return this.logger.error("Github fetch error. Probably rate limited, skipping firmware download");
         }
         if (!this.prusaFirmwareReleases?.length) return [];
         this.latestFirmware = this.prusaFirmwareReleases[0];

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

	@@ -1 +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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"}
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"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

package/dist/services/octoprint/plugin-repository.cache.js CHANGED Viewed

@@ -22,7 +22,7 @@ class PluginRepositoryCache {
     getPlugin(pluginName) {
         if (!this.wasCached) {
             if (!(0, _envutils.isTestEnvironment)()) {
-                this.logger.warn(`Could not check plugin '${pluginName}', as cache was not loaded.`);
+                this.logger.warn(`Could not check plugin '${pluginName}', as cache was not loaded`);
             }
             return;
         }

package/dist/services/octoprint/plugin-repository.cache.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../../src/services/octoprint/plugin-repository.cache.ts"],"names":["PluginRepositoryCache","octoPrintApiService","logger","wasCached","pluginCache","lastQueried","undefined","constructor","loggerFactory","name","getPlugin","pluginName","isTestEnvironment","warn","getCache","find","p","id","toLowerCase","queryCache","fetchOctoPrintPlugins","Date","now","log","length"],"mappings":";;;;+BAKaA;;;eAAAA;;;0BALqB;AAK3B,MAAMA;IACXC,oBAAyC;IACzCC,OAAsB;IAEtBC,YAAY,MAAM;IAClBC,cAAc,EAAE,CAAC;IACjBC,cAAcC,UAAU;IAExBC,YAAY,EACVN,mBAAmB,EACnBO,aAAa,EAId,CAAE;QACD,IAAI,CAACP,mBAAmB,GAAGA;QAC3B,IAAI,CAACC,MAAM,GAAGM,cAAcR,sBAAsBS,IAAI;IACxD;IAEAC,UAAUC,UAAkB,EAAE;QAC5B,IAAI,CAAC,IAAI,CAACR,SAAS,EAAE;YACnB,IAAI,CAACS,IAAAA,2BAAiB,KAAI;gBACxB,IAAI,CAACV,MAAM,CAACW,IAAI,CAAC,CAAC,wBAAwB,EAAEF,WAAW,~~2BAA2B~~,CAAC;~~YACrF~~;YACA;QACF;QAEA,OAAO,IAAI,CAACG,QAAQ,GAAGC,IAAI,CAAC,CAACC,IAAMA,EAAEC,EAAE,CAACC,WAAW,OAAOP,WAAWO,WAAW;IAClF;IAEAJ,WAAW;QACT,OAAO;eAAI,IAAI,CAACV,WAAW;SAAC;IAC9B;IAEA,MAAMe,aAAa;QACjB,IAAI,CAACf,WAAW,GAAG,AAAC,MAAM,IAAI,CAACH,mBAAmB,CAACmB,qBAAqB,MAAO,EAAE;QACjF,IAAI,CAACjB,SAAS,GAAG;QACjB,IAAI,CAACE,WAAW,GAAGgB,KAAKC,GAAG;QAE3B,IAAI,CAACpB,MAAM,CAACqB,GAAG,CAAC,CAAC,yBAAyB,EAAE,IAAI,CAACnB,WAAW,EAAEoB,UAAU,IAAI,QAAQ,CAAC;QAErF,OAAO,IAAI,CAACV,QAAQ;IACtB;AACF"}
1	+ {"version":3,"sources":["../../../src/services/octoprint/plugin-repository.cache.ts"],"names":["PluginRepositoryCache","octoPrintApiService","logger","wasCached","pluginCache","lastQueried","undefined","constructor","loggerFactory","name","getPlugin","pluginName","isTestEnvironment","warn","getCache","find","p","id","toLowerCase","queryCache","fetchOctoPrintPlugins","Date","now","log","length"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAKaA;;;eAAAA;;;0BALqB;AAK3B,MAAMA;IACXC,oBAAyC;IACzCC,OAAsB;IAEtBC,YAAY,MAAM;IAClBC,cAAc,EAAE,CAAC;IACjBC,cAAcC,UAAU;IAExBC,YAAY,EACVN,mBAAmB,EACnBO,aAAa,EAId,CAAE;QACD,IAAI,CAACP,mBAAmB,GAAGA;QAC3B,IAAI,CAACC,MAAM,GAAGM,cAAcR,sBAAsBS,IAAI;IACxD;IAEAC,UAAUC,UAAkB,EAAE;QAC5B,IAAI,CAAC,IAAI,CAACR,SAAS,EAAE;YACnB,IAAI,CAACS,IAAAA,2BAAiB,KAAI;gBACxB,IAAI,CAACV,MAAM,CAACW,IAAI,CAAC,CAAC,wBAAwB,EAAEF,WAAW,0BAA0B,CAAC;YACpF;YACA;QACF;QAEA,OAAO,IAAI,CAACG,QAAQ,GAAGC,IAAI,CAAC,CAACC,IAAMA,EAAEC,EAAE,CAACC,WAAW,OAAOP,WAAWO,WAAW;IAClF;IAEAJ,WAAW;QACT,OAAO;eAAI,IAAI,CAACV,WAAW;SAAC;IAC9B;IAEA,MAAMe,aAAa;QACjB,IAAI,CAACf,WAAW,GAAG,AAAC,MAAM,IAAI,CAACH,mBAAmB,CAACmB,qBAAqB,MAAO,EAAE;QACjF,IAAI,CAACjB,SAAS,GAAG;QACjB,IAAI,CAACE,WAAW,GAAGgB,KAAKC,GAAG;QAE3B,IAAI,CAACpB,MAAM,CAACqB,GAAG,CAAC,CAAC,yBAAyB,EAAE,IAAI,CAACnB,WAAW,EAAEoB,UAAU,IAAI,QAAQ,CAAC;QAErF,OAAO,IAAI,CAACV,QAAQ;IACtB;AACF"}

package/dist/services/octoprint/socket.factory.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../../src/services/octoprint/socket.factory.ts"],"names":["SocketFactory","cradle","constructor","createInstance","DITokens","octoPrintSockIoAdapter"],"mappings":";;;;+BAGaA;;;eAAAA;;;iCAHY;AAGlB,MAAMA;IACXC,OAAY;IAEZC,YAAYD,MAAU,CAAE;QACtB,IAAI,CAACA,MAAM,GAAGA;IAChB;IAEAE,iBAAyC;QACvC,OAAO,IAAI,CAACF,MAAM,CAACG,yBAAQ,CAACC,sBAAsB,CAAC;IACrD;AACF"}
1	+ {"version":3,"sources":["../../../src/services/octoprint/socket.factory.ts"],"names":["SocketFactory","cradle","constructor","createInstance","DITokens","octoPrintSockIoAdapter"],"rangeMappings":";;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAGaA;;;eAAAA;;;iCAHY;AAGlB,MAAMA;IACXC,OAAY;IAEZC,YAAYD,MAAU,CAAE;QACtB,IAAI,CAACA,MAAM,GAAGA;IAChB;IAEAE,iBAAyC;QACvC,OAAO,IAAI,CAACF,MAAM,CAACG,yBAAQ,CAACC,sBAAsB,CAAC;IACrD;AACF"}

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

	@@ -1 +1 @@
1	- {"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"}
1	+ {"version":3,"sources":["../../../../src/services/octoprint/utils/api.utils.ts"],"names":["constructHeaders","validateLogin","login","apiKey","printerURL","ValidationException","contentType","jsonContentType","contentTypeHeaderKey","apiKeyHeaderKey"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","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/octoprint/utils/file.utils.js.map CHANGED Viewed

	@@ -1 +1 @@
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"}
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"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","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.interface.js.map CHANGED Viewed

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

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

@@ -20,14 +20,17 @@ function BaseService(entity, dto, createDTO, updateDto) {
             this.typeormService = typeormService;
             this.repository = typeormService.getDataSource().getRepository(entity);
         }
-        async get(id, throwIfNotFound = true) {
+        async get(id, throwIfNotFound = true, options) {
             try {
-                return this.repository.findOneByOrFail({
-                    id
+                return this.repository.findOneOrFail({
+                    ...options,
+                    where: {
+                        id
+                    }
                 });
             } catch (e) {
                 if (throwIfNotFound && e instanceof _typeorm.EntityNotFoundError) {
-                    throw new _runtimeexceptions.NotFoundException(`The entity ${entity} with id '${id}' was not found.`);
+                    throw new _runtimeexceptions.NotFoundException(`The entity ${entity} with the provided id was not found`);
                 }
                 return undefined;
             }
@@ -47,7 +50,7 @@ function BaseService(entity, dto, createDTO, updateDto) {
             await (0, _classvalidator.validate)(updateDto);
             await (0, _classvalidator.validate)(Object.assign(entity, updateDto));
             await this.repository.update(entity.id, updateDto);
-            return entity;
+            return await this.get(id);
         }
         async create(dto) {
             if (dto.id) {

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

	@@ -1 +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;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"}
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","options","findOneOrFail","where","e","EntityNotFoundError","NotFoundException","undefined","list","find","listPaged","page","DEFAULT_PAGE","take","pageSize","skip","update","validate","Object","assign","create","save","delete","deleteMany","ids","emitEvent"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAkBgBA;;;eAAAA;;;yBAPT;gCACkB;mCAGS;+BACQ;AAEnC,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,EAAEC,OAA2B,EAAE;YAC/E,IAAI;gBACF,OAAO,IAAI,CAACP,UAAU,CAACQ,aAAa,CAAC;oBAAE,GAAGD,OAAO;oBAAEE,OAAO;wBAAEJ;oBAAG;gBAAE;YACnE,EAAE,OAAOK,GAAG;gBACV,IAAIJ,mBAAmBI,aAAaC,4BAAmB,EAAE;oBACvD,MAAM,IAAIC,oCAAiB,CAAC,CAAC,WAAW,EAAElB,OAAO,mCAAmC,CAAC;gBACvF;gBACA,OAAOmB;YACT;QACF;QAEA,MAAMC,KAAKP,OAA4B,EAAE;YACvC,OAAO,IAAI,CAACP,UAAU,CAACe,IAAI,CAACR;QAC9B;QAEA,MAAMS,UAAUC,OAAoBC,2BAAY,EAAEX,OAA4B,EAAE;YAC9E,OAAO,IAAI,CAACP,UAAU,CAACe,IAAI,CAAC;gBAAEI,MAAMF,KAAKG,QAAQ;gBAAEC,MAAMJ,KAAKG,QAAQ,GAAGH,KAAKA,IAAI;gBAAE,GAAGV,OAAO;YAAC;QACjG;QAEA,MAAMe,OAAOjB,EAAgB,EAAER,SAAoB,EAAE;YACnD,MAAMH,SAAS,MAAM,IAAI,CAACU,GAAG,CAACC;YAC9B,MAAMkB,IAAAA,wBAAQ,EAAC1B;YACf,MAAM0B,IAAAA,wBAAQ,EAACC,OAAOC,MAAM,CAAC/B,QAAQG;YACrC,MAAM,IAAI,CAACG,UAAU,CAACsB,MAAM,CAAC5B,OAAOW,EAAE,EAAER;YACxC,OAAO,MAAM,IAAI,CAACO,GAAG,CAACC;QACxB;QAEA,MAAMqB,OAAO/B,GAAc,EAAE;YAE3B,IAAIA,IAAIU,EAAE,EAAE;gBACV,OAAOV,IAAIU,EAAE;YACf;YACA,MAAMkB,IAAAA,wBAAQ,EAAC5B;YACf,MAAMD,SAAS,IAAI,CAACM,UAAU,CAAC0B,MAAM,CAAC/B;YACtC,MAAM4B,IAAAA,wBAAQ,EAAC7B;YAEf,OAAO,MAAM,IAAI,CAACM,UAAU,CAAC2B,IAAI,CAACjC;QACpC;QAEA,MAAMkC,OAAOvB,EAAgB,EAAEC,kBAAkB,IAAI,EAAE;YACrD,MAAMZ,SAAS,MAAM,IAAI,CAACU,GAAG,CAACC,IAAIC;YAClC,OAAO,MAAM,IAAI,CAACN,UAAU,CAAC4B,MAAM,CAAClC,OAAOW,EAAE;QAC/C;QAEA,MAAMwB,WAAWC,GAAmB,EAAEC,YAAY,IAAI,EAAyB;YAC7E,OAAO,MAAM,IAAI,CAAC/B,UAAU,CAAC4B,MAAM,CAACE;QACtC;IACF;IAEA,OAAOhC;AACT"}

package/dist/services/orm/camera-stream.service.js CHANGED Viewed

@@ -11,7 +11,7 @@ Object.defineProperty(exports, "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) {
+class CameraStreamService extends (0, _baseservice.BaseService)(_entities.CameraStream, _camerastreamdto.CameraStreamDto, _camerastreamdto.CreateCameraStreamDto) {
     toDto(entity) {
         return {
             id: entity.id,

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

	@@ -1 +1 @@
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"}
1	+ {"version":3,"sources":["../../../src/services/orm/camera-stream.service.ts"],"names":["CameraStreamService","BaseService","CameraStream","CameraStreamDto","CreateCameraStreamDto","toDto","entity","id","streamURL","name","printerId"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAMaA;;;eAAAA;;;6BANe;0BACC;iCAC0B;AAIhD,MAAMA,4BACHC,IAAAA,wBAAW,EAACC,sBAAY,EAAEC,gCAAe,EAAEC,sCAAqB;IAGxEC,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 CHANGED Viewed

@@ -11,7 +11,7 @@ Object.defineProperty(exports, "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) {
+class CustomGcodeService extends (0, _baseservice.BaseService)(_entities.CustomGcode, _customgcodedto.CustomGcodeDto, _customgcodedto.CustomGcodeDto) {
     toDto(entity) {
         return {
             id: entity.id,

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

	@@ -1 +1 @@
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"}
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"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAMaA;;;eAAAA;;;0BALe;gCAEG;6BACH;AAErB,MAAMA,2BACHC,IAAAA,wBAAW,EAACC,qBAAW,EAAEC,8BAAc,EAAgBA,8BAAc;IAG7EC,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 CHANGED Viewed

@@ -20,8 +20,9 @@ class FloorPositionService extends (0, _baseservice.BaseService)(_floorpositione
     async create(dto) {
         return super.create(dto);
     }
-    findPosition(x, y) {
+    findPosition(floorId, x, y) {
         return this.repository.findOneBy({
+            floorId,
             x,
             y
         });
@@ -33,7 +34,7 @@ class FloorPositionService extends (0, _baseservice.BaseService)(_floorpositione
     }
     deletePrinterPositionsByPrinterId(printerId) {
         return this.repository.delete({
-            id: printerId
+            printerId
         });
     }
     findPrinterPositionOnFloor(floorId, printerId) {

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

	@@ -1 +1 @@
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","deletePrinterPositionsByPrinterId","delete","id","~~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;YAAEE;QAAU;IAC/C;IAEAC,kCAAkCD,SAAuB,EAAE;QACzD,OAAO,IAAI,CAACH,UAAU,CAACK,MAAM,CAAC;~~YAAEC,IAAIH~~;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"}
1	+ {"version":3,"sources":["../../../src/services/orm/floor-position.service.ts"],"names":["FloorPositionService","BaseService","FloorPosition","PositionDto","constructor","typeormService","create","dto","findPosition","floorId","x","y","repository","findOneBy","findPrinterPosition","printerId","deletePrinterPositionsByPrinterId","delete","findPrinterPositionOnFloor","toDto","entity"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAMaA;;;eAAAA;;;qCANiB;6BACF;0BAGA;AAErB,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,OAAqB,EAAEC,CAAS,EAAEC,CAAS,EAAE;QACxD,OAAO,IAAI,CAACC,UAAU,CAACC,SAAS,CAAC;YAAEJ;YAASC;YAAGC;QAAE;IACnD;IAMAG,oBAAoBC,SAAuB,EAAE;QAC3C,OAAO,IAAI,CAACH,UAAU,CAACC,SAAS,CAAC;YAAEE;QAAU;IAC/C;IAEAC,kCAAkCD,SAAuB,EAAE;QACzD,OAAO,IAAI,CAACH,UAAU,CAACK,MAAM,CAAC;YAAEF;QAAU;IAC5C;IAEAG,2BAA2BT,OAAqB,EAAEM,SAAuB,EAAE;QACzE,OAAO,IAAI,CAACH,UAAU,CAACC,SAAS,CAAC;YAAEJ;YAASM;QAAU;IACxD;IAEAI,MAAMC,MAAqB,EAA6B;QACtD,OAAO;YACLV,GAAGU,OAAOV,CAAC;YACXC,GAAGS,OAAOT,CAAC;YACXI,WAAWK,OAAOL,SAAS;YAC3BN,SAASW,OAAOX,OAAO;QACzB;IACF;AACF"}

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

@@ -22,6 +22,20 @@ class FloorService extends (0, _baseservice.BaseService)(_entities.Floor, _floor
         });
         this.floorPositionService = floorPositionService;
     }
+    async list(options) {
+        return super.list(Object.assign(options || {}, {
+            relations: [
+                "printers"
+            ]
+        }));
+    }
+    async get(id, throwIfNotFound = true, options) {
+        return super.get(id, throwIfNotFound, Object.assign(options || {}, {
+            relations: [
+                "printers"
+            ]
+        }));
+    }
     async create(dto) {
         await (0, _validators.validateInput)(dto, _floorservicevalidation.createFloorRules);
         const floor = await super.create({
@@ -29,9 +43,8 @@ class FloorService extends (0, _baseservice.BaseService)(_entities.Floor, _floor
             floor: dto.floor,
             printers: []
         });
-        const printers = dto.printers;
-        if (printers?.length) {
-            for (const printer of printers){
+        if (dto.printers?.length) {
+            for (const printer of dto.printers){
                 await this.addOrUpdatePrinter(floor.id, printer);
             }
         }
@@ -59,40 +72,48 @@ class FloorService extends (0, _baseservice.BaseService)(_entities.Floor, _floor
     }
     async update(floorId, update) {
         const floor = await this.get(floorId);
-        const floorUpdate = Object.assign(floor, update);
+        const floorUpdate = {
+            ...floor,
+            name: update.name,
+            printers: update.printers,
+            floor: update.floor
+        };
         await (0, _validators.validateInput)(floorUpdate, _floorservicevalidation.updateFloorRules);
-        const printers = floorUpdate.printers;
-        if (printers?.length) {
-            for (let printer of printers){
+        const desiredPositions = floorUpdate.printers;
+        if (desiredPositions?.length) {
+            for (let printer of desiredPositions){
                 await this.addOrUpdatePrinter(floor.id, printer);
             }
         }
+        const undesiredPositions = floor.printers.filter((pos)=>!desiredPositions.find((dp)=>dp.printerId === pos.printerId));
+        if (undesiredPositions?.length) {
+            await this.floorPositionService.deleteMany(undesiredPositions.map((pos)=>pos.id));
+        }
         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
-        });
+        floor = await this.update(floorId, floor);
         return floor;
     }
     async updateLevel(floorId, level) {
         let floor = await this.get(floorId);
         floor.floor = level;
-        floor = await this.update(floorId, {
-            floor: level
-        });
+        floor = await this.update(floorId, floor);
         return floor;
     }
     async addOrUpdatePrinter(floorId, positionDto) {
-        await this.get(floorId);
+        await this.get(floorId, true);
         const position = await this.floorPositionService.findPrinterPosition(positionDto.printerId);
+        if (position && position.floorId === floorId && position.x === positionDto.x && position.x === positionDto.y && position.printerId === positionDto.printerId) {
+            return this.get(floorId);
+        }
         if (position) {
             await this.floorPositionService.delete(position.id);
         }
-        const xyPosition = await this.floorPositionService.findPosition(positionDto.x, positionDto.y);
+        const xyPosition = await this.floorPositionService.findPosition(floorId, positionDto.x, positionDto.y);
         if (xyPosition) {
             await this.floorPositionService.delete(xyPosition.id);
         }