Add outer loop to ws listener

main.py

@@ -17,6 +17,7 @@ from aiohttp import ClientSession, CookieJar
 import settings
 
 from pyunifiprotect.unifi_protect_server import UpvServer
+from pyunifiprotect.exceptions import NvrError
 
 RELAY_ON = False
 RELAY_OFF = True
@@ -44,10 +45,10 @@ def ring_bell(mac):
     except KeyError:
         logging.error('Doorbell %s not found!', mac)
 
-def subscriber(updated):
+def subscriber(updates):
-    logging.debug('Subscription: updated=%s', updated)
+    logging.debug('Subscription: updates=%s', updates)
 
-    for _, data in updated.items():
+    for _, data in updates.items():
         if data['event_type'] == 'ring' and data['event_ring_on']:
             logging.info('%s: %s is ringing!', data['mac'], data['name'])
             ring_bell(data['mac'])
@@ -57,28 +58,46 @@ def feed_watchdog():
         wdt.write('1')
 
 async def ws_listener():
-    session = ClientSession(cookie_jar=CookieJar(unsafe=True))
+    while True:
+        session = ClientSession(cookie_jar=CookieJar(unsafe=True))
 
-    unifiprotect = UpvServer(
+        unifiprotect = UpvServer(
-        session,
+            session,
-        settings.UFP_ADDRESS,
+            settings.UFP_ADDRESS,
-        settings.UFP_PORT,
+            settings.UFP_PORT,
-        settings.UFP_USERNAME,
+            settings.UFP_USERNAME,
-        settings.UFP_PASSWORD,
+            settings.UFP_PASSWORD,
-    )
+        )
 
-    await unifiprotect.check_unifi_os()
+        await unifiprotect.check_unifi_os()
-    await unifiprotect.update()
+        await unifiprotect.update()
 
-    unsub = unifiprotect.subscribe_websocket(subscriber)
+        unsub = unifiprotect.subscribe_websocket(subscriber)
 
-    while True:
+        while True:
-        if allow_watchdog and not DEBUG:
+            try:
-            feed_watchdog()
+                updates = await unifiprotect.update()
-        await asyncio.sleep(1)
+                logging.debug('Updates: %s', str(updates))
+            except NvrError:
+                logging.error('Problem connecting to Unifi Protect. Reconnecting...')
+                break
+
+            logging.debug('unifiprotect: %s', unifiprotect.__dict__)
+            logging.debug('ws_session %s', unifiprotect.ws_session.__dict__)
+
+            breakpoint()
 
-    await session.close()
+            #active_ws = await unifiprotect.check_ws()
-    unsub()
+            #if not active_ws:
+            #    logging.error('Websocket unactive. Reconnecting...')
+
+            if allow_watchdog and not DEBUG:
+                feed_watchdog()
+
+            await asyncio.sleep(1)
+
+        await session.close()
+        unsub()
 
 def disable_relays_on_exit(*args):
     logging.info('Exiting, disabling relays...')
@@ -93,7 +112,7 @@ def init():
 
     for _, doorbell in settings.DOORBELLS.items():
         GPIO.setup(doorbell['gpio'], GPIO.OUT)
-        pulse_relay(doorbell['gpio'])
+        #pulse_relay(doorbell['gpio'])
         time.sleep(1)
     logging.info('GPIO initialized')
 

requirements.txt

@@ -1,4 +1,5 @@
 aiohttp==3.7.4.post0
+aioshutil==1.1
 async-timeout==3.0.1
 asyncio==3.4.3
 attrs==21.2.0
@@ -7,10 +8,14 @@ click==8.0.3
 idna==3.3
 importlib-metadata==4.8.1
 multidict==5.2.0
+packaging==21.3
 Pillow==8.4.0
+pydantic==1.8.2
 PyJWT==2.2.0
+pyparsing==3.0.6
 python-dotenv==0.19.1
-pyunifiprotect==0.33.0
+pytz==2021.3
+pyunifiprotect==1.1.0
 RPi.GPIO==0.7.0
 typer==0.4.0
 typing-extensions==3.10.0.2