fix: Use http api for EVSE restart on firmware 5.x+

openevsehttp/__main__.py

@@ -171,8 +171,8 @@
         value = await self.process_request(url=url, method="post", rapi=data)
         if "ret" not in value:
             if "msg" in value:
-                return False, value["msg"]
-            return False, ""
+                return (False, value["msg"])
+            return (False, "")
         return (value["cmd"], value["ret"])
 
     async def update(self) -> None:
@@ -474,19 +474,26 @@
     async def restart_wifi(self) -> None:
         """Restart OpenEVSE WiFi module."""
         url = f"{self.url}restart"
+        data = {"device": "gateway"}
 
-        response = await self.process_request(url=url, method="get")
-        _LOGGER.debug("WiFi Restart response: %s", response)
+        response = await self.process_request(url=url, method="post", data=data)
+        _LOGGER.debug("WiFi Restart response: %s", response["msg"])
 
     # Restart EVSE module
     async def restart_evse(self) -> None:
         """Restart EVSE module."""
-        _LOGGER.debug("Restarting EVSE module via RAPI")
-        command = "$FR"
+        if self._version_check("5.0.0"):
+            _LOGGER.debug("Restarting EVSE module via HTTP")
+            url = f"{self.url}restart"
+            data = {"device": "evse"}
+            reply = await self.process_request(url=url, method="post", data=data)
+            response = reply["msg"]
+
+        else:
+            _LOGGER.debug("Restarting EVSE module via RAPI")
+            command = "$FR"
+            reply, response = await self.send_command(command)
 
-        response = await self.send_command(command)
-        if isinstance(response, tuple):
-            response = response[1]
         _LOGGER.debug("EVSE Restart response: %s", response)
 
     # Firmwave version

setup.py

@@ -6,7 +6,7 @@
 
 PROJECT_DIR = Path(__file__).parent.resolve()
 README_FILE = PROJECT_DIR / "README.md"
-VERSION = "0.1.59"
+VERSION = "0.1.60"
 
 setup(
     name="python-openevse-http",

tests/test_main.py

@@ -947,16 +947,17 @@ async def test_test_and_get(test_charger, test_charger_v2, mock_aioclient, caplo
     assert "Older firmware detected, missing serial." in caplog.text
 
 
-async def test_restart(test_charger_v2, mock_aioclient, caplog):
+async def test_restart(test_charger_modified_ver, mock_aioclient, caplog):
     """Test v4 set divert mode."""
-    mock_aioclient.get(
+    await test_charger_modified_ver.update()
+    mock_aioclient.post(
         TEST_URL_RESTART,
         status=200,
-        body="1",
+        body='{"msg": "restart gateway"}',
     )
     with caplog.at_level(logging.DEBUG):
-        await test_charger_v2.restart_wifi()
-    assert "Restart response: 1" in caplog.text
+        await test_charger_modified_ver.restart_wifi()
+    assert "Restart response: restart gateway" in caplog.text
 
 
 async def test_firmware_check(