python-openevse-http 0.1.65__tar.gz → 0.1.66__tar.gz

{python-openevse-http-0.1.65/python_openevse_http.egg-info → python_openevse_http-0.1.66}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
-Name: python-openevse-http
-Version: 0.1.65
+Name: python_openevse_http
+Version: 0.1.66
 Summary: Python wrapper for OpenEVSE HTTP API
 Home-page: https://github.com/firstof9/python-openevse-http
 Author: firstof9

{python-openevse-http-0.1.65 → python_openevse_http-0.1.66}/openevsehttp/__main__.py

@@ -240,6 +240,7 @@ class OpenEVSE:
 
         if not self._ws_listening:
             self._loop.create_task(self.websocket.listen())
+            self._loop.create_task(self.repeat(300, self.websocket.keepalive()))
             pending = asyncio.all_tasks()
             self._ws_listening = True
             try:
@@ -301,6 +302,20 @@ class OpenEVSE:
         assert self.websocket
         return self.websocket.state
 
+    async def repeat(self, interval, func, *args, **kwargs):
+        """Run func every interval seconds.
+
+        If func has not finished before *interval*, will run again
+        immediately when the previous iteration finished.
+
+        *args and **kwargs are passed as the arguments to func.
+        """
+        while True:
+            await asyncio.gather(
+                func(*args, **kwargs),
+                asyncio.sleep(interval),
+            )
+
     async def get_schedule(self) -> Union[Dict[str, str], Dict[str, Any]]:
         """Return the current schedule."""
         url = f"{self.url}schedule"

{python-openevse-http-0.1.65 → python_openevse_http-0.1.66}/openevsehttp/const.py

@@ -14,4 +14,5 @@ SHAPER_LIVE = "shaper_live_pwr"
 TYPE = "type"
 VALUE = "value"
 RELEASE = "release"
-CLIENT = 4
+# https://github.com/OpenEVSE/openevse_esp32_firmware/blob/master/src/evse_man.h#L28
+CLIENT = 20

{python-openevse-http-0.1.65 → python_openevse_http-0.1.66}/openevsehttp/websocket.py

@@ -1,6 +1,7 @@
 """Websocket class for OpenEVSE HTTP."""
 
 import asyncio
+import json
 import logging
 
 import aiohttp  # type: ignore
@@ -39,6 +40,7 @@ class OpenEVSEWebsocket:
         self._state = None
         self.failed_attempts = 0
         self._error_reason = None
+        self._client = None
 
     @property
     def state(self):
@@ -74,6 +76,7 @@ class OpenEVSEWebsocket:
             ) as ws_client:
                 await OpenEVSEWebsocket.state.fset(self, STATE_CONNECTED)
                 self.failed_attempts = 0
+                self._client = ws_client
 
                 async for message in ws_client:
                     if self.state == STATE_STOPPED:
@@ -133,3 +136,16 @@ class OpenEVSEWebsocket:
     async def close(self):
         """Close the listening websocket."""
         await OpenEVSEWebsocket.state.fset(self, STATE_STOPPED)
+
+    async def keepalive(self):
+        """Send ping requests to websocket."""
+        data = json.dumps({"ping": 1})
+        _LOGGER.debug("Sending message: %s to websocket.", data)
+        try:
+            await self._client.send_str(data)
+            _LOGGER.debug("Ping message sent.")
+        except TypeError as err:
+            _LOGGER.error("Attempt to send ping data failed: %s", err)
+        except Exception as err:  # pylint: disable=broad-exception-caught
+            _LOGGER.error("Problem sending ping request: %s", err)
+            await OpenEVSEWebsocket.state.fset(self, STATE_STOPPED)

{python-openevse-http-0.1.65 → python_openevse_http-0.1.66/python_openevse_http.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-openevse-http
-Version: 0.1.65
+Version: 0.1.66
 Summary: Python wrapper for OpenEVSE HTTP API
 Home-page: https://github.com/firstof9/python-openevse-http
 Author: firstof9

{python-openevse-http-0.1.65 → python_openevse_http-0.1.66}/setup.py

@@ -6,10 +6,10 @@ from setuptools import find_packages, setup
 
 PROJECT_DIR = Path(__file__).parent.resolve()
 README_FILE = PROJECT_DIR / "README.md"
-VERSION = "0.1.65"
+VERSION = "0.1.66"
 
 setup(
-    name="python-openevse-http",
+    name="python_openevse_http",
     version=VERSION,
     url="https://github.com/firstof9/python-openevse-http",
     download_url="https://github.com/firstof9/python-openevse-http",