allow empty passwords for authentication and improve websocket state management for proper reconnection

Author: firstof9

openevsehttp/client.py

@@ -192,8 +192,8 @@ async def ws_start(self) -> None:
 
     async def _start_listening(self):
         """Websocket setup."""
-        if not self.websocket:
-            _LOGGER.debug("Websocket not initialized, creating...")
+        if not self.websocket or self.websocket.state == STATE_STOPPED:
+            _LOGGER.debug("Websocket not initialized or stopped, creating...")
             self.websocket = OpenEVSEWebsocket(
                 self.url, self._update_status, self._user, self._pwd, self._session
             )

openevsehttp/requester.py

@@ -59,7 +59,7 @@ async def process_request(
             raise MissingMethod
         method = method.lower()
 
-        if self._user and self._pwd:
+        if self._user:
             auth = aiohttp.BasicAuth(self._user, self._pwd)
 
         if data is not None and rapi is not None:

openevsehttp/websocket.py

@@ -84,7 +84,7 @@ async def running(self):
         await self._set_state(STATE_STARTING)
         auth = None
 
-        if self._user and self._password:
+        if self._user:
             auth = aiohttp.BasicAuth(self._user, self._password)
 
         try:

tests/test_client.py

@@ -1600,7 +1600,7 @@ async def pending_stub(*args, **kwargs):
         caplog.at_level(logging.DEBUG),
     ):
         await charger.ws_start()
-        assert "Websocket not initialized, creating..." in caplog.text
+        assert "Websocket not initialized or stopped, creating..." in caplog.text
 
         # Now task is active. Call ws_start AGAIN to trigger orphan check.
         # Force _ws_listening to False so it attempts setup again
@@ -1708,6 +1708,17 @@ async def noop():
     with pytest.raises(AlreadyListening):
         await charger.ws_start()
 
+    # Verify recreation of stopped websocket (fix for reuse bug)
+    charger.websocket.state = STATE_STOPPED
+    first_ws = charger.websocket
+    await charger.ws_start()
+    assert charger.websocket is not first_ws
+    # Cleanup tasks from the new websocket
+    for task in list(charger.tasks):
+        task.cancel()
+    await asyncio.gather(*charger.tasks, return_exceptions=True)
+    charger.tasks = set()
+
     # Verify idempotence on a fresh instance
     charger_fresh = OpenEVSE(SERVER_URL)
     await charger_fresh.ws_disconnect()  # Disconnect immediately

tests/test_override.py

@@ -566,7 +566,18 @@ async def test_override_failure_logic(mock_aioclient):
         f"http://{SERVER_URL}/config", status=200, body='{"version": "4.1.0"}'
     )
     mock_aioclient.get(
-        f"http://{SERVER_URL}/override", status=200, body='{"state": "disabled"}'
+        f"http://{SERVER_URL}/override",
+        status=200,
+        body=json.dumps(
+            {
+                "state": "disabled",
+                "charge_current": 0,
+                "max_current": 0,
+                "energy_limit": 0,
+                "time_limit": 0,
+                "auto_release": True,
+            }
+        ),
     )
 
     charger = OpenEVSE(SERVER_URL)

tests/test_websocket.py

@@ -100,6 +100,34 @@ async def test_auth_failure(ws_client, mock_callback):
         )
 
 
+@pytest.mark.asyncio
+async def test_auth_empty_password(mock_callback):
+    """Verify that an empty password still triggers BasicAuth in websocket."""
+    client = OpenEVSEWebsocket(SERVER_URL, mock_callback, user="admin", password="")
+
+    mock_ws = MagicMock()
+    mock_ws.__aenter__ = AsyncMock(return_value=mock_ws)
+    mock_ws.__aexit__ = AsyncMock(return_value=None)
+
+    async def async_iter():
+        yield MagicMock(type=aiohttp.WSMsgType.CLOSED)
+
+    mock_ws.__aiter__.side_effect = async_iter
+
+    with (
+        patch("aiohttp.ClientSession.ws_connect", return_value=mock_ws) as mock_connect,
+        patch("asyncio.sleep", new_callable=AsyncMock),
+    ):
+        await client.running()
+
+        args, kwargs = mock_connect.call_args
+        auth = kwargs.get("auth")
+        assert auth is not None
+        assert auth.login == "admin"
+        assert auth.password == ""
+    await client.session.close()
+
+
 @pytest.mark.asyncio
 async def test_connection_error_retry(ws_client, mock_callback):
     """Test connection retry logic."""