Add klipper service restart button

Author: TheSin-

octoprint_moonraker_connector/__init__.py

@@ -3,6 +3,7 @@
 from urllib.parse import urljoin
 
 import requests
+import subprocess
 from flask import jsonify
 from flask_babel import gettext
 
@@ -93,6 +94,22 @@ def on_api_get(self, request):
         )
         return jsonify(response.model_dump(by_alias=True))
 
+    def get_api_commands(self):
+        return dict(
+            restart_klipper_service=[]
+        )
+
+    def on_api_command(self, command, data):
+        if command == "restart_klipper_service":
+            self._logger.info(f"Command '{command}' received")
+            if hasattr(self, "_client") and self._client.is_connected():
+                self._client.restart_klipper_service(self)
+            
+                return jsonify(success=True, message="Restart sent")
+            else:
+                self._logger.warning("Moonraker client not connected.")
+                return jsonify(success=False, message="Moonraker client not connected.")
+
     def is_api_protected(self):
         return True
 

octoprint_moonraker_connector/client.py

@@ -621,6 +621,17 @@ def on_printer_objects_subscribed(future: Future) -> None:
 
     ##~~ Method calls & callbacks
 
+    def restart_klipper_service(self) -> Future:
+        def on_result(future: Future) -> None:
+            try:
+                results = future.result()
+            except Exception as e:
+                self._logger.exception(f"Error while restarting klipper service: {e}")
+
+        self.call_method("machine.service.restart", {"service": "klipper"}).add_done_callback(
+            on_result
+        )
+
     def query_printer_objects(self, objs: list[str] = None) -> Future:
         if objs is None:
             objs = self._subbed_objs

octoprint_moonraker_connector/static/js/moonraker_connector.js

@@ -15,6 +15,30 @@ $(function () {
             OctoPrint.control.sendGcode('FIRMWARE_RESTART');
         }
 
+        self.btnKlipperRestartClick = function() {
+            showConfirmationDialog({
+                message: gettext("<strong>This will restart the Klipper service.</strong></p><p>This might disrupt any ongoing operations related to Klipper."),
+                onproceed: function() {
+                    OctoPrint.simpleApiCommand(
+                        "moonraker_connector",
+                        "restart_klipper_service"
+                    ).done(function(response) {
+                        new PNotify({
+                            title: gettext("Success"),
+                            text: gettext("System command sent: ") + response.command,
+                            type: "success"
+                        });
+                    }).fail(function(jqXHR, textStatus, errorThrown) {
+                        new PNotify({
+                            title: gettext("Error"),
+                            text: gettext("Failed to execute command: ") + jqXHR.responseJSON.message,
+                            type: "error"
+                        });
+                    });
+                }
+            });
+        }
+
         self.initializeButton = function() {
             var buttonContainer = $('#job_print')[0].parentElement;
             var container = document.createElement("div");
@@ -24,39 +48,66 @@ $(function () {
 
             var btnRestart = document.createElement("button");
             btnRestart.id = "job_restart";
-            btnRestart.title = "Reload configuration file and performs an internal reset of the host software. It does not clear the error state from the micro-controller.";
+            btnRestart.title = gettext("Reload configuration file and performs an internal reset of the host software. It does not clear the error state from the micro-controller.");
             btnRestart.classList.add("btn");
             btnRestart.classList.add("span6");
             btnRestart.addEventListener("click", self.btnRestartClick);
 
             var btnRestartIcon = document.createElement("i");
-            btnRestartIcon.classList.add("fa", "fa-redo");
+            btnRestartIcon.classList.add("fas", "fa-sync-alt");
+            btnRestartIcon.style.marginRight = "5px";
             btnRestart.appendChild(btnRestartIcon);
 
             var btnRestartText = document.createElement("span");
-            btnRestartText.textContent = " Restart";
+            btnRestartText.textContent = gettext("Restart");
             btnRestart.appendChild(btnRestartText);
 
             container.appendChild(btnRestart);
 
             var btnFirmwareRestart = document.createElement("button");
             btnFirmwareRestart.id = "job_firmware_restart";
-            btnFirmwareRestart.title = "Reload configuration file and performs an internal reset of the host software, but it also clears any error states from the micro-controller.";
+            btnFirmwareRestart.title = gettext("Reload configuration file and performs an internal reset of the host software, but it also clears any error states from the micro-controller.");
             btnFirmwareRestart.classList.add("btn");
             btnFirmwareRestart.classList.add("span6");
             btnFirmwareRestart.addEventListener("click", self.btnFirmwareRestartClick);
 
             var btnFirmwareRestartIcon = document.createElement("i");
-            btnFirmwareRestartIcon.classList.add("fa", "fa-sync");
+            btnFirmwareRestartIcon.classList.add("fas", "fa-microchip");
+            btnFirmwareRestartIcon.style.marginRight = "5px";
             btnFirmwareRestart.appendChild(btnFirmwareRestartIcon);
 
             var btnFirmwareRestartText = document.createElement("span");
-            btnFirmwareRestartText.textContent = " Firmware Restart";
+            btnFirmwareRestartText.textContent = gettext("Firmware Restart");
             btnFirmwareRestart.appendChild(btnFirmwareRestartText);
 
             container.appendChild(btnFirmwareRestart);
 
             buttonContainer.after(container);
+
+            var container2 = document.createElement("div");
+            container2.classList.add("row-fluid", "print-control");
+            container2.style.marginTop = "10px";
+            container2.setAttribute("data-bind", "visible: $root.loginState.hasPermissionKo($root.access.permissions.PRINT)");
+
+            var btnKlipperRestart = document.createElement("button");
+            btnKlipperRestart.id = "job_klipper_restart";
+            btnKlipperRestart.title = gettext("Restart klipper process.");
+            btnKlipperRestart.classList.add("btn");
+            btnKlipperRestart.classList.add("span12");
+            btnKlipperRestart.addEventListener("click", self.btnKlipperRestartClick);
+
+            var btnKlipperRestartIcon = document.createElement("i");
+            btnKlipperRestartIcon.classList.add("fas", "fa-power-off");
+            btnKlipperRestartIcon.style.marginRight = "5px";
+            btnKlipperRestart.appendChild(btnKlipperRestartIcon);
+
+            var btnKlipperRestartText = document.createElement("span");
+            btnKlipperRestartText.textContent = gettext("Restart Klipper");
+            btnKlipperRestart.appendChild(btnKlipperRestartText);
+
+            container2.appendChild(btnKlipperRestart);
+
+            container.after(container2);
         };
 
         self.webcams = ko.observableArray([]);