python-swidget 1.0.0__tar.gz → 1.0.1__tar.gz

{python_swidget-1.0.0 → python_swidget-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-swidget
-Version: 1.0.0
+Version: 1.0.1
 Summary: Python API for Swidget smart devices
 Home-page: https://github.com/swidget/python-swidget
 License: GPL-3.0-or-later

{python_swidget-1.0.0 → python_swidget-1.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-swidget"
-version = "1.0.0"
+version = "1.0.1"
 description = "Python API for Swidget smart devices"
 license = "GPL-3.0-or-later"
 authors = ["Swidget"]

{python_swidget-1.0.0 → python_swidget-1.0.1}/swidget/cli.py

@@ -127,7 +127,7 @@ def join(ssid, network_password, secret_key, friendly_name):
 
 
 @cli.command()
-@click.option("--timeout", default=5, required=False)
+@click.option("--timeout", default=10, required=False)
 @click.pass_context
 async def discover(ctx, timeout):
     """Discover devices in the network."""

{python_swidget-1.0.0 → python_swidget-1.0.1}/swidget/discovery.py

@@ -39,10 +39,7 @@ class SwidgetProtocol(ssdp.SimpleServiceDiscoveryProtocol):
             insert_type = headers["SERVER"].split(" ")[1].split("+")[1].split("/")[0]
             friendly_name = headers["SERVER"].split("/")[2].strip('"')
             devices[mac_address] = SwidgetDiscoveredDevice(mac_address, ip_address, friendly_name)
-<<<<<<< HEAD
-=======
             _LOGGER.debug(f"Swidget device '{friendly_name}' at {ip_address}")
->>>>>>> 690a0c560a8b2ff39245d1a8354ced968d79e5de
 
 
 async def discover_devices(timeout=RESPONSE_SEC):

{python_swidget-1.0.0 → python_swidget-1.0.1}/swidget/swidgetdevice.py

@@ -34,6 +34,7 @@ class SwidgetDevice:
         self.use_websockets = use_websockets
         self.device_type = DeviceType.Unknown
         self._friendly_name = "Unknown Swidget Device"
+        self.assemblies = {}
         headers = {self.token_name: self.secret_key,
                    'Connection': 'keep-alive'}
         connector = TCPConnector(verify_ssl=False, force_close=True)
@@ -64,8 +65,8 @@ class SwidgetDevice:
         if self.use_websockets:
             _LOGGER.debug("Calling self._websocket.connect()")
             await self._websocket.connect()
-            _LOGGER.debug("Calling self._websocket.listen() ")
-            asyncio.create_task(self._websocket.listen())
+        _LOGGER.debug("Calling self.update() ")
+        await self.update()
 
     async def stop(self):
         """Stop the websocket."""
@@ -74,6 +75,9 @@ class SwidgetDevice:
             await self._websocket.close()
         await self._session.close()
 
+    async def close(self):
+        await self.stop()
+
     async def message_callback(self, message):
         """Entrypoint for a websocket callback"""
         _LOGGER.debug("SwidgetDevice.message_callback() called")

{python_swidget-1.0.0 → python_swidget-1.0.1}/swidget/websocket.py

@@ -1,9 +1,23 @@
+import asyncio
 import aiohttp
+from aiohttp import ClientWebSocketResponse, WSMsgType
 import logging
 import socket
 
 _LOGGER = logging.getLogger(__name__)
 
+
+async def cancel_task(*tasks: asyncio.Task | None) -> None:
+    """Cancel task(s)."""
+    for task in tasks:
+        if task is not None and not task.done():
+            task.cancel()
+            try:
+                await task
+            except asyncio.CancelledError:
+                pass
+
+
 class SwidgetWebsocket:
     """A websocket connection to a Swidget Device"""
 
@@ -29,11 +43,17 @@ class SwidgetWebsocket:
         self.failed_attempts = 0
         self._error_reason = None
         self.headers = {'Connection': 'Upgrade'}
+        self._receiver_task: asyncio.Task | None = None
 
     @property
     def connected(self) -> bool:
         return self._client is not None and not self._client.closed
 
+    @property
+    def websocket(self) -> ClientWebSocketResponse | None:
+        """Return the web socket."""
+        return self._ws
+
     def get_uri(self, host, token_name, secret_key):
         """Generate the websocket URI"""
         if self.use_security:
@@ -43,7 +63,10 @@ class SwidgetWebsocket:
 
     async def connect(self) -> None:
         _LOGGER.debug("websocket.connect() called")
+        """Create a new connection and, optionally, start the monitor."""
+        await cancel_task(self._receiver_task)
         if self.connected:
+            _LOGGER.debug("Websocket already connected")
             return
 
         if not self.session:
@@ -51,6 +74,7 @@ class SwidgetWebsocket:
 
         try:
             self._client = await self.session.ws_connect(url=self.uri, headers=self.headers, verify_ssl=self._verify_ssl, heartbeat=30)
+            _LOGGER.debug("Websocket now connected")
         except (
             aiohttp.WSServerHandshakeError,
             aiohttp.ClientConnectionError,
@@ -60,7 +84,8 @@ class SwidgetWebsocket:
                 "Error occurred while communicating with WLED device"
                 f" on WebSocket at {self.host}"
             )
-            raise
+            raise(msg)
+        self._receiver_task = asyncio.ensure_future(self.listen())
 
     async def close(self) -> None:
         _LOGGER.debug("websocket.close() called")
@@ -88,7 +113,6 @@ class SwidgetWebsocket:
 
             if message.type == aiohttp.WSMsgType.TEXT:
                 message_data = message.json()
-                _LOGGER.debug(f"Data received from websocket: {message_data}")
                 await self.callback(message_data)
 
             if message.type in (