pysmarlaapi 0.10.1__py3-none-any.whl → 0.10.3__py3-none-any.whl

pysmarlaapi/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.10.1"
+__version__ = "0.10.3"
 
 from .classes import Connection
 from .federwiege import Federwiege

pysmarlaapi/connection_hub/__init__.py

@@ -38,35 +38,32 @@ class ConnectionHub:
         self,
         event_loop: asyncio.AbstractEventLoop,
         connection: Connection,
+        listener,
         max_delay: int = 256,
-        forced_reconnect_interval: int = 86400,
     ):
         self.connection: Connection = connection
         self._loop = event_loop
         self._retry_delay = 1 # Initial connection retry delay
         self._max_delay = max_delay
-        self._forced_reconnect_interval = forced_reconnect_interval
 
         self.logger = logging.getLogger(f"{__package__}[{self.connection.token.serialNumber}]")
 
-        self.listeners = set()
+        self.connection_callback = listener
 
         self._running = False
         self._wake = asyncio.Event()
 
-        self._reconnect_future: asyncio.Future = None
-        self._reconnect_lock = asyncio.Lock()
-        self._reconnect_cancel_event = asyncio.Event()
-
         self.client = None
         self.setup()
 
     async def notifycontrollerconnection(self, args):
         value = args[0]
         if value == "ControllerConnected":
-            await self.notify_listeners(True)
+            self.logger.info("Controller connected")
+            await self.connection_callback(True)
         else:
-            await self.notify_listeners(False)
+            self.logger.info("Controller disconnected")
+            await self.connection_callback(False)
 
     def setup(self):
         self.client = SignalRClient(self.connection.url + "/MobileAppHub", retry_count=1)
@@ -75,28 +72,12 @@ class ConnectionHub:
         self.client.on_error(self.on_error)
         self.client.on("SetNotifyAppConnectionCallback", self.notifycontrollerconnection)
 
-    def add_listener(self, listener):
-        if self.running:
-            return
-        self.listeners.add(listener)
-
-    def remove_listener(self, listener):
-        if self.running:
-            return
-        self.listeners.remove(listener)
-
-    async def notify_listeners(self, value):
-        for listener in self.listeners:
-            await listener(value)
-
     async def on_open_function(self):
         self._retry_delay = 1
         self.logger.info("Connection to server established")
-        await self.start_reconnect_job()
 
     async def on_close_function(self):
         self.logger.info("Connection to server closed")
-        await self.cancel_reconnect_job()
 
     async def on_error(self, message):
         self.logger.error("Connection error occurred: %s", str(message))
@@ -138,30 +119,6 @@ class ConnectionHub:
     async def close_connection(self):
         if not self.connected:
             return
-        await self.cancel_reconnect_job()
-        await self.client._transport._ws.close()
-
-    async def start_reconnect_job(self):
-        async with self._reconnect_lock:
-            if self._reconnect_future and not self._reconnect_future.done():
-                return
-            self._reconnect_cancel_event.clear()
-            self._reconnect_future = asyncio.create_task(self.reconnect_job())
-
-    async def cancel_reconnect_job(self):
-        async with self._reconnect_lock:
-            if not self._reconnect_future or self._reconnect_future.done():
-                return
-            self._reconnect_cancel_event.set()
-            await self._reconnect_future
-
-    async def reconnect_job(self):
-        cancelled = await event_wait(self._reconnect_cancel_event, self._forced_reconnect_interval)
-        if cancelled:
-            return
-
-        # Close connection to trigger a reconnection
-        # Make sure that connection stays healthy
         await self.client._transport._ws.close()
 
     async def refresh_token(self):

pysmarlaapi/federwiege/__init__.py

@@ -18,14 +18,14 @@ class Federwiege:
     def connected(self):
         return self.hub.connected
 
-    async def on_controller_connection_change(self, value):
+    async def on_connection_change(self, value):
         self.available = value
-        if value:
+        if self.available:
             self.sync()
 
     def __init__(self, event_loop: asyncio.AbstractEventLoop, connection: Connection):
         self.serial_number = connection.token.serialNumber
-        self.hub = ConnectionHub(event_loop, connection)
+        self.hub = ConnectionHub(event_loop, connection, self.on_connection_change)
         self.services: dict[str, Service] = {
             "babywiege": BabywiegeService(self.hub),
             "analyser": AnalyserService(self.hub),
@@ -66,7 +66,6 @@ class Federwiege:
         with self._lock:
             if self.registered:
                 return
-            self.registered = True
-            self.hub.add_listener(self.on_controller_connection_change)
             for service in self.services.values():
                 service.register()
+            self.registered = True

{pysmarlaapi-0.10.1.dist-info → pysmarlaapi-0.10.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysmarlaapi
-Version: 0.10.1
+Version: 0.10.3
 Summary: Swing2Sleep Smarla API
 Author-email: Robin Lintermann <robin.lintermann@explicatis.com>
 Requires-Python: >=3.11

{pysmarlaapi-0.10.1.dist-info → pysmarlaapi-0.10.3.dist-info}/RECORD

@@ -1,9 +1,9 @@
-pysmarlaapi/__init__.py,sha256=1goHranjjV8lIuKigPYHQQMfvZxAQ_pPurcDaLQKYL4,91
+pysmarlaapi/__init__.py,sha256=8RGaOyUGbyQ_K8qBXrePMnucfknkt0WORdJ3M1d6DBw,91
 pysmarlaapi/classes/__init__.py,sha256=N-ZV3Id_t5ciovUlPUGCk5SLLiMUonRoQZWpfOU4ZsM,69
 pysmarlaapi/classes/auth_token.py,sha256=dpo0lBT9Advm3Iyxu-fT9sq078U2OxgXXBuF5gbBZkM,942
 pysmarlaapi/classes/connection.py,sha256=vVC0Ur0KQUb4pNDVuCYnfk-JXs-O-FwYVO-2y1E2g6g,1551
-pysmarlaapi/connection_hub/__init__.py,sha256=4cTBxvDPz0mOC8wICnFZikYp0RhFHcl06JVssZ48YDY,6153
-pysmarlaapi/federwiege/__init__.py,sha256=P3hpgf-okQDEpwCUiLHn1acnenURUorEDVFya9Dvk6M,2020
+pysmarlaapi/connection_hub/__init__.py,sha256=QUwB7j5BdF5dwal1_uFPUC7hqOMojLUeGlKHcd_32HQ,4624
+pysmarlaapi/federwiege/__init__.py,sha256=LH3Uw9AjO4OAYcMQAIIJ8_i95l50YqcwDWai0E28UJA,1973
 pysmarlaapi/federwiege/classes/__init__.py,sha256=DFJJVOKpra40S4ZX_oq2RyMazg6Nx0c8hoPggmj1bXA,60
 pysmarlaapi/federwiege/classes/property.py,sha256=S5Zzo9cXDJMFcQG1vCw1eO-oqeSpQs2YjxWouN_KRkU,1032
 pysmarlaapi/federwiege/classes/service.py,sha256=Y0OQxtQLaHp4qY8Vthj0zRroPoYTiD2WA9ZR96teZTo,632
@@ -16,7 +16,7 @@ pysmarlaapi/federwiege/types/__init__.py,sha256=XWB_IrNYbIyQjyR_oKAOvHAjGGRLSQqZ
 pysmarlaapi/federwiege/types/send_diag_status.py,sha256=hxpfNQmZs1YOztxLVnN3Bu50fXwf-hfV6K8GiQlBvkk,120
 pysmarlaapi/federwiege/types/spring_status.py,sha256=cJsWFf2ZG-NvnT3l_CxVJfMFB3Ruv_juTy7Lpb-YEsA,227
 pysmarlaapi/federwiege/types/update_status.py,sha256=YkajOEJ09pY9u4EBxw8ePEjPjYOLdK0i2l41cXbjb8Y,123
-pysmarlaapi-0.10.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pysmarlaapi-0.10.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-pysmarlaapi-0.10.1.dist-info/METADATA,sha256=9jlUhgfqTbyQWYfaOfIzKjO4ITrMiF8tfw3B5hvwC2c,1104
-pysmarlaapi-0.10.1.dist-info/RECORD,,
+pysmarlaapi-0.10.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pysmarlaapi-0.10.3.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+pysmarlaapi-0.10.3.dist-info/METADATA,sha256=SoziHBuB2_oZZHDlt1hsszyzMStlrGXhVUeie-hMoWM,1104
+pysmarlaapi-0.10.3.dist-info/RECORD,,