feat: return better messages from websocket handler (#405)

* feat: return better messages from websocket handler

* formatting

Author: firstof9

openevsehttp/__main__.py

@@ -231,12 +231,13 @@ def ws_start(self) -> None:
 
     def _start_listening(self):
         """Start the websocket listener."""
-        try:
-            _LOGGER.debug("Attempting to find running loop...")
-            self._loop = asyncio.get_running_loop()
-        except RuntimeError:
-            self._loop = asyncio.get_event_loop()
-            _LOGGER.debug("Using new event loop...")
+        if not self._loop:
+            try:
+                _LOGGER.debug("Attempting to find running loop...")
+                self._loop = asyncio.get_running_loop()
+            except RuntimeError:
+                self._loop = asyncio.get_event_loop()
+                _LOGGER.debug("Using new event loop...")
 
         if not self._ws_listening:
             _LOGGER.debug("Setting up websocket ping...")
@@ -260,6 +261,7 @@ async def _update_status(self, msgtype, data, error):
                     "Websocket to %s disconnected, retrying",
                     self.websocket.uri,
                 )
+                _LOGGER.debug("Disconnect message: %s", error)
                 self._ws_listening = False
                 self.ws_start()
             # Stopped websockets without errors are expected during shutdown
@@ -291,9 +293,9 @@ async def _update_status(self, msgtype, data, error):
 
     async def ws_disconnect(self) -> None:
         """Disconnect the websocket listener."""
+        self._ws_listening = False
         assert self.websocket
         await self.websocket.close()
-        self._ws_listening = False
 
     def is_coroutine_function(self, callback):
         """Check if a callback is a coroutine function."""

openevsehttp/websocket.py

@@ -107,7 +107,7 @@ async def running(self):
                 self._error_reason = ERROR_AUTH_FAILURE
             else:
                 _LOGGER.error("Unexpected response received: %s", error)
-                self._error_reason = ERROR_UNKNOWN
+                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:
@@ -126,7 +126,7 @@ async def running(self):
         except Exception as error:  # pylint: disable=broad-except
             if self.state != STATE_STOPPED:
                 _LOGGER.exception("Unexpected exception occurred: %s", error)
-                self._error_reason = ERROR_UNKNOWN
+                self._error_reason = error
                 await OpenEVSEWebsocket.state.fset(self, STATE_STOPPED)
         else:
             if self.state != STATE_STOPPED:

setup.py

@@ -6,7 +6,7 @@
 
 PROJECT_DIR = Path(__file__).parent.resolve()
 README_FILE = PROJECT_DIR / "README.md"
-VERSION = "0.1.69"
+VERSION = "0.1.70"
 
 setup(
     name="python_openevse_http",