fix: throw exceptions if url unreachable (#416)

* fix: throw exceptions if url unreachable

* formatting

Author: firstof9

openevsehttp/__main__.py

@@ -153,12 +153,12 @@ async def process_request(
                         await self.update()
                     return message
 
-            except (TimeoutError, ServerTimeoutError):
+            except (TimeoutError, ServerTimeoutError) as err:
                 _LOGGER.error("%s: %s", ERROR_TIMEOUT, url)
-                message = {"msg": ERROR_TIMEOUT}
+                raise err
             except ContentTypeError as err:
-                _LOGGER.error("%s", err)
-                message = {"msg": err}
+                _LOGGER.error("Content error: %s", err.message)
+                raise err
 
             await session.close()
             return message
@@ -263,7 +263,7 @@ async def _update_status(self, msgtype, data, error):
                 )
                 _LOGGER.debug("Disconnect message: %s", error)
                 self._ws_listening = False
-                self.ws_start()
+
             # Stopped websockets without errors are expected during shutdown
             # and ignored
             elif data == STATE_STOPPED and error:
@@ -273,7 +273,6 @@ async def _update_status(self, msgtype, data, error):
                     error,
                 )
                 self._ws_listening = False
-                await self.ws_disconnect()
 
         elif msgtype == "data":
             _LOGGER.debug("Websocket data: %s", data)
@@ -428,6 +427,7 @@ async def toggle_override(self) -> None:
         #   3.x: use RAPI commands $FE (enable) and $FS (sleep)
         #   4.x: use HTTP API call
         lower = "4.0.0"
+        msg = ""
         if self._version_check(lower):
             url = f"{self.url}override"
 

openevsehttp/websocket.py

@@ -110,7 +110,7 @@ async def running(self):
                 self._error_reason = error
             await OpenEVSEWebsocket.state.fset(self, STATE_STOPPED)
         except (aiohttp.ClientConnectionError, asyncio.TimeoutError) as error:
-            if self.failed_attempts >= MAX_FAILED_ATTEMPTS:
+            if self.failed_attempts > MAX_FAILED_ATTEMPTS:
                 self._error_reason = ERROR_TOO_MANY_RETRIES
                 await OpenEVSEWebsocket.state.fset(self, STATE_STOPPED)
             elif self.state != STATE_STOPPED:
@@ -150,8 +150,8 @@ async def keepalive(self):
             if time_delta < 0:
                 # Negitive time should indicate no pong reply so consider the
                 # websocket disconnected.
-                await OpenEVSEWebsocket.state.fset(self, STATE_DISCONNECTED)
                 self._error_reason = ERROR_PING_TIMEOUT
+                await OpenEVSEWebsocket.state.fset(self, STATE_DISCONNECTED)
 
         data = json.dumps({"ping": 1})
         _LOGGER.debug("Sending message: %s to websocket.", data)

tests/conftest.py

@@ -73,6 +73,16 @@ def test_charger(mock_aioclient):
     return main.OpenEVSE(TEST_TLD)
 
 
+@pytest.fixture(name="test_charger_timeout")
+def test_charger_timeout(mock_aioclient):
+    """Load the charger data."""
+    mock_aioclient.get(
+        TEST_URL_STATUS,
+        exception=TimeoutError,
+    )
+    return main.OpenEVSE(TEST_TLD)
+
+
 @pytest.fixture(name="test_charger_dev")
 def test_charger_dev(mock_aioclient):
     """Load the charger data."""

tests/test_main.py

@@ -154,7 +154,8 @@ async def test_send_command_async_timeout(test_charger_auth, mock_aioclient, cap
         exception=TimeoutError,
     )
     with caplog.at_level(logging.DEBUG):
-        await test_charger_auth.send_command("test")
+        with pytest.raises(TimeoutError):
+            await test_charger_auth.send_command("test")
     assert main.ERROR_TIMEOUT in caplog.text
 
 
@@ -165,7 +166,8 @@ async def test_send_command_server_timeout(test_charger_auth, mock_aioclient, ca
         exception=ServerTimeoutError,
     )
     with caplog.at_level(logging.DEBUG):
-        await test_charger_auth.send_command("test")
+        with pytest.raises(main.ServerTimeoutError):
+            await test_charger_auth.send_command("test")
     assert f"{main.ERROR_TIMEOUT}: {TEST_URL_RAPI}" in caplog.text
 
 
@@ -838,9 +840,10 @@ async def test_toggle_override_v2_err(test_charger_v2, mock_aioclient, caplog):
         ),
     )
     with caplog.at_level(logging.DEBUG):
-        await test_charger_v2.toggle_override()
+        with pytest.raises(main.ContentTypeError):
+            await test_charger_v2.toggle_override()
     assert (
-        "Toggle response: 0, message='Attempt to decode JSON with unexpected mimetype: text/html', url='http://openevse.test.tld/r'"
+        "Content error: Attempt to decode JSON with unexpected mimetype: text/html"
         in caplog.text
     )
 
@@ -2144,3 +2147,15 @@ async def test_get_shaper_updated(fixture, expected, request):
     status = charger.shaper_updated
     assert status == expected
     await charger.ws_disconnect()
+
+
+async def test_get_status(test_charger_timeout, caplog):
+    """Test v4 Status reply."""
+    with caplog.at_level(logging.DEBUG):
+        with pytest.raises(TimeoutError):
+            await test_charger_timeout.update()
+        assert test_charger_timeout.websocket is None
+        assert not test_charger_timeout._ws_listening
+    assert "Updating data from http://openevse.test.tld/status" in caplog.text
+    assert "Status update:" not in caplog.text
+    assert "Config update:" not in caplog.text