@fdm-monster/server 1.6.3 → 1.6.4

package/dist/services/moonraker/dto/server-sensors/sensor-measurements.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/server-sensors/sensor-measurements.dto.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/server-sensors/sensor-measurements.dto.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/server-webcams/webcam-item.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/server-webcams/webcam-item.dto.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/server-webcams/webcam-item.dto.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/server-webcams/webcam-list.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/server-webcams/webcam-list.dto.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/server-webcams/webcam-list.dto.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/server-webcams/webcam-test.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/server-webcams/webcam-test.dto.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/server-webcams/webcam-test.dto.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/spoolman/spoolman-active-spool.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/spoolman/spoolman-active-spool.dto.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/spoolman/spoolman-active-spool.dto.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/spoolman/spoolman-proxy-request.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/spoolman/spoolman-proxy-request.dto.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/spoolman/spoolman-proxy-request.dto.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/spoolman/spoolman-response.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/spoolman/spoolman-response.dto.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/spoolman/spoolman-response.dto.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/spoolman/spoolman-status.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/spoolman/spoolman-status.dto.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/spoolman/spoolman-status.dto.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/sudo-info.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/services/moonraker/dto/sudo-info.dto.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../src/services/moonraker/dto/sudo-info.dto.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/sudo-response.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/services/moonraker/dto/sudo-response.dto.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../src/services/moonraker/dto/sudo-response.dto.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/temperature-store.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/services/moonraker/dto/temperature-store.dto.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../src/services/moonraker/dto/temperature-store.dto.ts"],"names":[],"mappings":""}

package/dist/services/{interfaces/printer-files.service.interface.js → moonraker/dto/websocket/connection-identify-response.dto.js}

@@ -3,4 +3,4 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 
-//# sourceMappingURL=printer-files.service.interface.js.map
+//# sourceMappingURL=connection-identify-response.dto.js.map

package/dist/services/moonraker/dto/websocket/connection-identify-response.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/connection-identify-response.dto.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/websocket/connection-identify.dto.js

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

package/dist/services/moonraker/dto/websocket/connection-identify.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/connection-identify.dto.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/websocket/json-rpc-event.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/json-rpc-event.dto.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/json-rpc-event.dto.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/websocket/message.types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/message.types.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/message.types.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/websocket/methods.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/methods.ts"],"names":["klipperEvents","wsEventsList","notify_gcode_response","notify_status_update","notify_klippy_ready","notify_klippy_shutdown","notify_klippy_disconnected","notify_filelist_changed","notify_update_response","notify_update_refreshed","notify_cpu_throttled","notify_proc_stat_update","notify_history_changed","notify_user_created","notify_user_deleted","notify_user_logged_out","notify_service_state_changed","notify_job_queue_changed","notify_button_event","notify_announcement_update","notify_announcement_dismissed","notify_announcement_wake","notify_sudo_alert","notify_webcams_changed","notify_active_spool_set","notify_spoolman_status_changed","notify_agent_event","Object","keys"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;;;;;;;;IAAaA,aAAa;eAAbA;;IA6BAC,YAAY;eAAZA;;;AA7BN,MAAMD,gBAAgB;IAC3BE,uBAAuB;IACvBC,sBAAsB;IACtBC,qBAAqB;IACrBC,wBAAwB;IACxBC,4BAA4B;IAC5BC,yBAAyB;IACzBC,wBAAwB;IACxBC,yBAAyB;IACzBC,sBAAsB;IAEtBC,yBAAyB;IACzBC,wBAAwB;IACxBC,qBAAqB;IACrBC,qBAAqB;IACrBC,wBAAwB;IACxBC,8BAA8B;IAC9BC,0BAA0B;IAC1BC,qBAAqB;IACrBC,4BAA4B;IAC5BC,+BAA+B;IAC/BC,0BAA0B;IAC1BC,mBAAmB;IACnBC,wBAAwB;IACxBC,yBAAyB;IACzBC,gCAAgC;IAChCC,oBAAoB;IACpB,yBAAyB;AAC3B;AACO,MAAMzB,eAAe0B,OAAOC,IAAI,CAAC5B"}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/methods.ts"],"names":["klipperEvents","wsEventsList","notify_gcode_response","notify_status_update","notify_klippy_ready","notify_klippy_shutdown","notify_klippy_disconnected","notify_filelist_changed","notify_update_response","notify_update_refreshed","notify_cpu_throttled","notify_proc_stat_update","notify_history_changed","notify_user_created","notify_user_deleted","notify_user_logged_out","notify_service_state_changed","notify_job_queue_changed","notify_button_event","notify_announcement_update","notify_announcement_dismissed","notify_announcement_wake","notify_sudo_alert","notify_webcams_changed","notify_active_spool_set","notify_spoolman_status_changed","notify_agent_event","Object","keys"],"mappings":";;;;;;;;;;;IAAaA,aAAa;eAAbA;;IA6BAC,YAAY;eAAZA;;;AA7BN,MAAMD,gBAAgB;IAC3BE,uBAAuB;IACvBC,sBAAsB;IACtBC,qBAAqB;IACrBC,wBAAwB;IACxBC,4BAA4B;IAC5BC,yBAAyB;IACzBC,wBAAwB;IACxBC,yBAAyB;IACzBC,sBAAsB;IAEtBC,yBAAyB;IACzBC,wBAAwB;IACxBC,qBAAqB;IACrBC,qBAAqB;IACrBC,wBAAwB;IACxBC,8BAA8B;IAC9BC,0BAA0B;IAC1BC,qBAAqB;IACrBC,4BAA4B;IAC5BC,+BAA+B;IAC/BC,0BAA0B;IAC1BC,mBAAmB;IACnBC,wBAAwB;IACxBC,yBAAyB;IACzBC,gCAAgC;IAChCC,oBAAoB;IACpB,yBAAyB;AAC3B;AACO,MAAMzB,eAAe0B,OAAOC,IAAI,CAAC5B"}

package/dist/services/moonraker/dto/websocket/notify-active-spool-set.params.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-active-spool-set.params.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-active-spool-set.params.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/websocket/notify-agent-event.params.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-agent-event.params.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-agent-event.params.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/websocket/notify-announcement-update.params.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-announcement-update.params.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-announcement-update.params.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/websocket/notify-announcement.params.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-announcement.params.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-announcement.params.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/websocket/notify-button-event.params.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-button-event.params.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-button-event.params.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/websocket/notify-filelist-changed.params.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-filelist-changed.params.ts"],"names":["actionType"],"rangeMappings":";;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAMaA;;;eAAAA;;;AAAN,MAAMA,aAAa;IACxB;IACA;IACA;IACA;IACA;IACA;IACA;IACA;CACD"}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-filelist-changed.params.ts"],"names":["actionType"],"mappings":";;;;+BAMaA;;;eAAAA;;;AAAN,MAAMA,aAAa;IACxB;IACA;IACA;IACA;IACA;IACA;IACA;IACA;CACD"}

package/dist/services/moonraker/dto/websocket/notify-history-changed.params.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-history-changed.params.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-history-changed.params.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/websocket/notify-job-queue-changed.params.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-job-queue-changed.params.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-job-queue-changed.params.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/websocket/notify-proc-stat-update.params.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-proc-stat-update.params.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-proc-stat-update.params.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/websocket/notify-sensor-update.params.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-sensor-update.params.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-sensor-update.params.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/websocket/notify-service-state-changed.params.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-service-state-changed.params.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-service-state-changed.params.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/websocket/notify-spoolman-status-changed.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-spoolman-status-changed.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-spoolman-status-changed.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/websocket/notify-sudo-alert.params.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-sudo-alert.params.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-sudo-alert.params.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/dto/websocket/notify-update-response.params.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-update-response.params.ts"],"names":["applicationList","applications","moonraker","klipper","system","client","Object","keys"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;;;;;;;;IAMaA,eAAe;eAAfA;;IANAC,YAAY;eAAZA;;;AAAN,MAAMA,eAAe;IAC1BC,WAAW;IACXC,SAAS;IACTC,QAAQ;IACRC,QAAQ;AACV;AACO,MAAML,kBAAkBM,OAAOC,IAAI,CAACN"}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-update-response.params.ts"],"names":["applicationList","applications","moonraker","klipper","system","client","Object","keys"],"mappings":";;;;;;;;;;;IAMaA,eAAe;eAAfA;;IANAC,YAAY;eAAZA;;;AAAN,MAAMA,eAAe;IAC1BC,WAAW;IACXC,SAAS;IACTC,QAAQ;IACRC,QAAQ;AACV;AACO,MAAML,kBAAkBM,OAAOC,IAAI,CAACN"}

package/dist/services/moonraker/dto/websocket/notify-user-change.params.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-user-change.params.ts"],"names":[],"rangeMappings":"","mappings":""}
+{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-user-change.params.ts"],"names":[],"mappings":""}

package/dist/services/moonraker/moonraker-websocket.adapter.js

@@ -8,38 +8,70 @@ Object.defineProperty(exports, "MoonrakerWebsocketAdapter", {
         return MoonrakerWebsocketAdapter;
     }
 });
-const _websocketadapter = require("../../shared/websocket.adapter");
 const _serverconstants = require("../../server.constants");
 const _normalizeurl = require("../../utils/normalize-url");
 const _urlutils = require("../../utils/url.utils");
-const _octoprintsockioadapter = require("../octoprint/octoprint-sockio.adapter");
+const _octoprintwebsocketadapter = require("../octoprint/octoprint-websocket.adapter");
 const _websocketconstants = require("./constants/websocket.constants");
-class MoonrakerWebsocketAdapter extends _websocketadapter.WebsocketAdapter {
+const _socketstatetype = require("../../shared/dtos/socket-state.type");
+const _apistatetype = require("../../shared/dtos/api-state.type");
+const _websocketrpcextendedadapter = require("../../shared/websocket-rpc-extended.adapter");
+const _prettyprintutils = require("../../utils/pretty-print.utils");
+const _lodash = /*#__PURE__*/ _interop_require_default(require("lodash"));
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+class MoonrakerWebsocketAdapter extends _websocketrpcextendedadapter.WebsocketRpcExtendedAdapter {
     printerType = 1;
-    moonrakerClient;
+    client;
     logger;
     eventEmitter;
     configService;
-    socketState = _octoprintsockioadapter.SOCKET_STATE.unopened;
+    socketState = _socketstatetype.SOCKET_STATE.unopened;
     lastMessageReceivedTimestamp = null;
     stateUpdated = false;
     stateUpdateTimestamp = null;
     apiStateUpdated = false;
     apiStateUpdateTimestamp = null;
-    apiState = _octoprintsockioadapter.API_STATE.unset;
-    loginDto;
+    apiState = _apistatetype.API_STATE.unset;
+    login;
     socketURL;
-    sessionDto;
     printerId;
-    username;
-    constructor({ moonrakerClient, loggerFactory, eventEmitter2, configService }){
+    serverVersion;
+    refreshPrinterObjectsInterval;
+    get subscriptionObjects() {
+        return {
+            pause_resume: [],
+            idle_timeout: [],
+            print_stats: [],
+            heaters: [],
+            heater_bed: [],
+            extruder: [],
+            display_status: [],
+            webhooks: [],
+            virtual_sdcard: [],
+            gcode_move: [],
+            stepper_enable: [],
+            fan: [],
+            motion_report: [],
+            system_stats: []
+        };
+    }
+    printerObjects = {
+        eventtime: null,
+        status: null
+    };
+    constructor({ moonrakerClient, loggerFactory, eventEmitter2, configService, serverVersion }){
         super({
             loggerFactory
         });
-        this.moonrakerClient = moonrakerClient;
+        this.client = moonrakerClient;
         this.logger = loggerFactory(MoonrakerWebsocketAdapter.name);
         this.eventEmitter = eventEmitter2;
         this.configService = configService;
+        this.serverVersion = serverVersion;
     }
     get _debugMode() {
         return this.configService.get(_serverconstants.AppConstants.debugSocketStatesKey, _serverconstants.AppConstants.defaultDebugSocketStates) === "true";
@@ -48,7 +80,7 @@ class MoonrakerWebsocketAdapter extends _websocketadapter.WebsocketAdapter {
         return false;
     }
     needsSetup() {
-        return this.socketState === _octoprintsockioadapter.SOCKET_STATE.unopened;
+        return this.socketState === _socketstatetype.SOCKET_STATE.unopened;
     }
     needsReauth() {
         return false;
@@ -56,8 +88,8 @@ class MoonrakerWebsocketAdapter extends _websocketadapter.WebsocketAdapter {
     registerCredentials(socketLogin) {
         const { printerId, loginDto, protocol } = socketLogin;
         this.printerId = printerId;
-        this.loginDto = loginDto;
-        const httpUrl = (0, _normalizeurl.normalizeUrl)(this.loginDto.printerURL);
+        this.login = loginDto;
+        const httpUrl = (0, _normalizeurl.normalizeUrl)(this.login.printerURL);
         const wsUrl = (0, _urlutils.httpToWsUrl)(httpUrl, protocol);
         wsUrl.pathname = "/websocket";
         this.socketURL = wsUrl;
@@ -69,11 +101,119 @@ class MoonrakerWebsocketAdapter extends _websocketadapter.WebsocketAdapter {
         super.open(this.socketURL);
     }
     close() {
+        clearInterval(this.refreshPrinterObjectsInterval);
         super.close();
     }
     async setupSocketSession() {
-        const oneshot = await this.moonrakerClient.getAccessOneshotToken(this.loginDto);
-        this.logger.log(`Oneshot ${oneshot.data.result}`);
+        await this.client.getApiVersion(this.login);
+        this.setApiState(_apistatetype.API_STATE.responding);
+        await this.updateCurrentStateSafely();
+        if (this.refreshPrinterObjectsInterval) {
+            clearInterval(this.refreshPrinterObjectsInterval);
+        }
+        this.refreshPrinterObjectsInterval = setInterval(async ()=>{
+            await this.updateCurrentStateSafely();
+        }, 15000);
+    }
+    async updateCurrentStateSafely() {
+        try {
+            const query = this.subscriptionObjects;
+            const objects = await this.client.getPrinterObjectsQuery(this.login, query);
+            this.printerObjects = objects.data.result;
+            this.setApiState(_apistatetype.API_STATE.responding);
+            return await this.emitCurrentEvent(this.printerObjects);
+        } catch (e) {
+            const castError = e;
+            if (castError.isAxiosError) {
+                if (castError?.response?.status == 503) {
+                    this.printerObjects.status = {};
+                    this.printerObjects.eventtime = Date.now();
+                    return await this.emitCurrentEvent(this.printerObjects);
+                }
+                this.logger.error("Could not update Moonraker printer objects due to a request error");
+                this.setApiState(_apistatetype.API_STATE.noResponse);
+                return;
+            }
+            this.logger.error(`Could not update Moonraker current due to an unknown error`);
+            this.setApiState(_apistatetype.API_STATE.noResponse);
+        }
+    }
+    async afterOpened(_) {
+        this.setSocketState(_socketstatetype.SOCKET_STATE.opened);
+        const response = await this.sendRequest({
+            jsonrpc: "2.0",
+            method: "server.connection.identify",
+            params: {
+                client_name: "FDM Monster",
+                version: this.serverVersion,
+                type: "other",
+                url: _serverconstants.AppConstants.githubUrl
+            },
+            id: 1
+        });
+        try {
+            const query = this.subscriptionObjects;
+            const result = await this.client.postSubscribePrinterObjects(this.login, response.result.connection_id, query);
+            this.printerObjects = result.data.result;
+            await this.emitCurrentEvent(this.printerObjects);
+        } catch (e) {
+            const ae = e;
+            if (ae.isAxiosError) {
+                if (ae.response.status === 503) {
+                    this.logger.warn(`Klipper host issue ${(0, _prettyprintutils.PP)(ae.response.data?.error?.message)}`);
+                } else if (ae.response.status === 404) {
+                    this.logger.error("Error while afterOpened (404) - usually this means Moonraker is still starting");
+                }
+                this.setApiState(_apistatetype.API_STATE.noResponse);
+                return;
+            }
+            this.logger.error("Unknown error while afterOpened");
+            this.setApiState(_apistatetype.API_STATE.noResponse);
+        }
+    }
+    async onEventMessage(event) {
+        this.lastMessageReceivedTimestamp = Date.now();
+        if (this.socketState !== _socketstatetype.SOCKET_STATE.authenticated) {
+            this.setSocketState("authenticated");
+        }
+        const eventName = event.method;
+        if (this._debugMode) {
+            this.logger.log(`RX Msg ${eventName} ${JSON.stringify(event.params)?.substring(0, 80)}...`);
+        }
+        const payload = event.params?.length ? event.params[0] : undefined;
+        if (eventName === "notify_service_state_changed") {
+            const serviceChanged = event.params[0];
+            if (serviceChanged.klipper.active_state || serviceChanged.klipper_mcu.active_state || serviceChanged.moonraker.active_state) {
+                this.logger.log("Received notify_service_state_changed, reloading Moonraker printer objects");
+                await this.setupSocketSession();
+            }
+            return;
+        }
+        if (eventName === "notify_klippy_ready") {
+            this.logger.log("Received notify_klippy_ready, reloading Moonraker printer objects");
+            return await this.setupSocketSession();
+        }
+        if (eventName === "notify_klippy_disconnected") {
+            this.logger.log("Received notify_klippy_disconnected, reloading Moonraker printer objects");
+            return await this.setupSocketSession();
+        }
+        if (eventName === "notify_klippy_shutdown") {
+            this.logger.log("Received notify_klippy_shutdown, reloading Moonraker printer objects");
+            return await this.setupSocketSession();
+        }
+        if (eventName === "notify_status_update") {
+            const [data, eventtime] = event.params;
+            const substate = Object.keys(data)[0];
+            if (Object.keys(this.printerObjects.status).includes(substate)) {
+                this.printerObjects.status = _lodash.default.merge(this.printerObjects.status, data);
+                this.printerObjects.eventtime = eventtime;
+                await this.emitCurrentEvent(this.printerObjects);
+            } else {
+                this.logger.warn(`Substate ${substate} unknown`);
+            }
+            return;
+        }
+        await this.emitEvent(eventName, payload);
     }
     emitEventSync(event, payload) {
         this.eventEmitter.emit((0, _websocketconstants.moonrakerEvent)(event), {
@@ -87,30 +227,72 @@ class MoonrakerWebsocketAdapter extends _websocketadapter.WebsocketAdapter {
         this.setApiState("unset");
     }
     isClosedOrAborted() {
-        return this.socketState === _octoprintsockioadapter.SOCKET_STATE.closed || this.socketState === _octoprintsockioadapter.SOCKET_STATE.aborted;
-    }
-    async afterOpened(event) {
-        this.setSocketState("opened");
-    }
-    async onMessage(message) {
-        this.lastMessageReceivedTimestamp = Date.now();
-        if (this.socketState !== _octoprintsockioadapter.SOCKET_STATE.authenticated) {
-            this.setSocketState("authenticated");
-        }
-        const data = JSON.parse(message);
-        const eventName = data.method;
-        const payload = data.params?.length ? data.params[0] : undefined;
-        if (eventName === "notify_proc_stat_update") return;
-        await this.emitEvent(eventName, payload);
+        return this.socketState === _socketstatetype.SOCKET_STATE.closed || this.socketState === _socketstatetype.SOCKET_STATE.aborted;
     }
     async afterClosed(event) {
         this.setSocketState("closed");
         delete this.socket;
-        await this.emitEvent(_octoprintsockioadapter.WsMessage.WS_CLOSED, "connection closed");
+        await this.emitEvent(_octoprintwebsocketadapter.WsMessage.WS_CLOSED, "connection closed");
     }
     async onError(error) {
         this.setSocketState("error");
-        await this.emitEvent(_octoprintsockioadapter.WsMessage.WS_ERROR, error?.length ? error : "connection error");
+        await this.emitEvent(_octoprintwebsocketadapter.WsMessage.WS_ERROR, error?.length ? error : "connection error");
+    }
+    async emitCurrentEvent(printerObject) {
+        const originalKlipperObjects = printerObject.status;
+        const flags = {
+            operational: false,
+            printing: false,
+            cancelling: false,
+            pausing: false,
+            paused: false,
+            resuming: false,
+            finishing: false,
+            closedOrError: false,
+            error: false,
+            ready: false,
+            sdReady: false
+        };
+        let filename = "";
+        let printTime = null;
+        let stateText = originalKlipperObjects.display_status?.message ?? "Error";
+        let error = "";
+        if (originalKlipperObjects.print_stats?.state?.length) {
+            const systemState = originalKlipperObjects.webhooks;
+            const printState = originalKlipperObjects.print_stats.state;
+            const idleState = originalKlipperObjects.idle_timeout?.state;
+            filename = originalKlipperObjects.print_stats.filename;
+            printTime = originalKlipperObjects.print_stats.print_duration;
+            flags.operational = systemState.state === "ready";
+            if (flags.operational) {
+                flags.printing = printState === "printing";
+                flags.paused = printState === "paused";
+                flags.ready = printState === "standby" && idleState !== "Printing";
+                flags.sdReady = true;
+            } else {
+                flags.error = true;
+                stateText = "Klipper reports: " + (systemState.state ?? "unknown")?.toUpperCase();
+            }
+        }
+        const currentMessage = {
+            progress: {
+                printTime: printTime,
+                completion: (originalKlipperObjects.display_status?.progress * 100.0) ?? 0
+            },
+            state: {
+                text: stateText,
+                error,
+                flags
+            },
+            job: {
+                file: {
+                    name: filename,
+                    path: filename
+                }
+            }
+        };
+        await this.emitEvent("notify_status_update", originalKlipperObjects);
+        await this.emitEvent("current", currentMessage);
     }
     async emitEvent(event, payload) {
         await this.eventEmitter.emitAsync((0, _websocketconstants.moonrakerEvent)(event), {
@@ -127,16 +309,19 @@ class MoonrakerWebsocketAdapter extends _websocketadapter.WebsocketAdapter {
         if (this._debugMode) {
             this.logger.log(`${this.printerId} Socket state updated to: ` + state);
         }
-        this.emitEventSync(_octoprintsockioadapter.WsMessage.WS_STATE_UPDATED, state);
+        this.emitEventSync(_octoprintwebsocketadapter.WsMessage.WS_STATE_UPDATED, state);
     }
     setApiState(state) {
+        if (state === _apistatetype.API_STATE.globalKey) {
+            throw new Error("GlobalKey is an invalid WS state for Moonraker");
+        }
         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(_octoprintsockioadapter.WsMessage.API_STATE_UPDATED, state);
+        this.emitEventSync(_octoprintwebsocketadapter.WsMessage.API_STATE_UPDATED, state);
     }
 }
 

package/dist/services/moonraker/moonraker-websocket.adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/moonraker/moonraker-websocket.adapter.ts"],"names":["MoonrakerWebsocketAdapter","WebsocketAdapter","printerType","moonrakerClient","logger","eventEmitter","configService","socketState","SOCKET_STATE","unopened","lastMessageReceivedTimestamp","stateUpdated","stateUpdateTimestamp","apiStateUpdated","apiStateUpdateTimestamp","apiState","API_STATE","unset","loginDto","socketURL","sessionDto","printerId","username","constructor","loggerFactory","eventEmitter2","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","needsSetup","needsReauth","registerCredentials","socketLogin","protocol","httpUrl","normalizeUrl","printerURL","wsUrl","httpToWsUrl","pathname","open","socket","Error","close","setupSocketSession","oneshot","getAccessOneshotToken","log","data","result","emitEventSync","event","payload","emit","moonrakerEvent","resetSocketState","setSocketState","setApiState","isClosedOrAborted","closed","aborted","afterOpened","onMessage","message","Date","now","authenticated","JSON","parse","eventName","method","params","length","undefined","emitEvent","afterClosed","WsMessage","WS_CLOSED","onError","error","WS_ERROR","emitAsync","state","WS_STATE_UPDATED","API_STATE_UPDATED"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../../src/services/moonraker/moonraker-websocket.adapter.ts"],"names":["MoonrakerWebsocketAdapter","WebsocketRpcExtendedAdapter","printerType","client","logger","eventEmitter","configService","socketState","SOCKET_STATE","unopened","lastMessageReceivedTimestamp","stateUpdated","stateUpdateTimestamp","apiStateUpdated","apiStateUpdateTimestamp","apiState","API_STATE","unset","login","socketURL","printerId","serverVersion","refreshPrinterObjectsInterval","subscriptionObjects","pause_resume","idle_timeout","print_stats","heaters","heater_bed","extruder","display_status","webhooks","virtual_sdcard","gcode_move","stepper_enable","fan","motion_report","system_stats","printerObjects","eventtime","status","constructor","moonrakerClient","loggerFactory","eventEmitter2","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","needsSetup","needsReauth","registerCredentials","socketLogin","loginDto","protocol","httpUrl","normalizeUrl","printerURL","wsUrl","httpToWsUrl","pathname","open","socket","Error","close","clearInterval","setupSocketSession","getApiVersion","setApiState","responding","updateCurrentStateSafely","setInterval","query","objects","getPrinterObjectsQuery","data","result","emitCurrentEvent","e","castError","isAxiosError","response","Date","now","error","noResponse","afterOpened","_","setSocketState","opened","sendRequest","jsonrpc","method","params","client_name","version","type","url","githubUrl","id","postSubscribePrinterObjects","connection_id","ae","warn","PP","message","onEventMessage","event","authenticated","eventName","log","JSON","stringify","substring","payload","length","undefined","serviceChanged","klipper","active_state","klipper_mcu","moonraker","substate","Object","keys","includes","merge","emitEvent","emitEventSync","emit","moonrakerEvent","resetSocketState","isClosedOrAborted","closed","aborted","afterClosed","WsMessage","WS_CLOSED","onError","WS_ERROR","printerObject","originalKlipperObjects","flags","operational","printing","cancelling","pausing","paused","resuming","finishing","closedOrError","ready","sdReady","filename","printTime","stateText","state","systemState","printState","idleState","print_duration","toUpperCase","currentMessage","progress","completion","text","job","file","path","emitAsync","WS_STATE_UPDATED","globalKey","API_STATE_UPDATED"],"mappings":"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"}

package/dist/services/moonraker/moonraker.client.js

@@ -8,8 +8,8 @@ Object.defineProperty(exports, "MoonrakerClient", {
         return MoonrakerClient;
     }
 });
-const _axios = _interop_require_default(require("axios"));
-const _formdata = _interop_require_default(require("form-data"));
+const _axios = /*#__PURE__*/ _interop_require_default(require("axios"));
+const _formdata = /*#__PURE__*/ _interop_require_default(require("form-data"));
 const _fs = require("fs");
 const _eventconstants = require("../../constants/event.constants");
 function _interop_require_default(obj) {
@@ -67,12 +67,16 @@ class MoonrakerClient {
     async getPrinterObjectsList(login) {
         return this.httpClient.get(`${login.printerURL}/printer/objects/list`);
     }
-    async getPrinterObjectsQuery(login, query = {
-        gcode_move: [],
-        toolhead: [],
-        extruder: []
-    }) {
-        const queryString = Object.entries(query).reduce((acc, [key, value])=>{
+    async getPrinterObjectsQuery(login, query) {
+        const queryString = this.convertToQueryString(query);
+        return this.httpClient.get(`${login.printerURL}/printer/objects/query?${queryString}`);
+    }
+    postSubscribePrinterObjects(login, connectionId, query) {
+        const queryString = this.convertToQueryString(query);
+        return this.httpClient.post(`${login.printerURL}/printer/objects/subscribe?connection_id=${connectionId}&${queryString}`);
+    }
+    convertToQueryString(query) {
+        return Object.entries(query).reduce((acc, [key, value])=>{
             if (value.length > 0) {
                 acc.push(`${key}=${value.join(",")}`);
             } else {
@@ -80,7 +84,6 @@ class MoonrakerClient {
             }
             return acc;
         }, []).join("&");
-        return this.httpClient.get(`${login.printerURL}/printer/objects/query?${queryString}`);
     }
     async getPrinterQueryEndstops(login) {
         return this.httpClient.get(`${login.printerURL}/printer/query-endstops`);
@@ -192,7 +195,7 @@ class MoonrakerClient {
             responseType: "stream"
         });
     }
-    async postServerFileUpload(login, multerFileOrBuffer, root, path, checksum, progressToken) {
+    async postServerFileUpload(login, multerFileOrBuffer, progressToken, root, path, checksum) {
         const formData = new _formdata.default();
         if (root?.length) {
             formData.append("root", root);
@@ -221,7 +224,7 @@ class MoonrakerClient {
             ...formData.getHeaders(),
             "Content-Length": result
         };
-        return await (0, _axios.default)({
+        return await _axios.default.request({
             method: "POST",
             url: `${login.printerURL}/server/files/upload`,
             data: formData,
@@ -234,7 +237,8 @@ class MoonrakerClient {
         });
     }
     async deleteServerFile(login, root, path) {
-        return this.httpClient.delete(`${login.printerURL}/server/files/${root}}/${path}`);
+        const url = `${login.printerURL}/server/files/${root}/${path}`;
+        return this.httpClient.delete(url);
     }
     async getServerFileKlippyLogDownload(login) {
         return this.httpClient.get(`${login.printerURL}/server/files/klippy.log`);