fix: numerous issues

ovos_PHAL_plugin_homeassistant/__init__.py

@@ -3,23 +3,34 @@
 from os.path import dirname, join
 from typing import Optional
 
-from ovos_utils.log import LOG
 from ovos_bus_client import Message
-from ovos_plugin_manager.phal import PHALPlugin
 from ovos_bus_client.apis.gui import GUIInterface
+from ovos_config.config import update_mycroft_config
+from ovos_plugin_manager.phal import PHALPlugin
+from ovos_utils import classproperty
+from ovos_utils.log import LOG
 from ovos_utils.parse import match_one
+from ovos_utils.process_utils import RuntimeRequirements
+
 from ovos_PHAL_plugin_homeassistant.logic.connector import HomeAssistantRESTConnector, HomeAssistantWSConnector
-from ovos_PHAL_plugin_homeassistant.logic.device import (HomeAssistantSensor,
-                                                         HomeAssistantBinarySensor,
-                                                         HomeAssistantLight, HomeAssistantAutomation,
-                                                         HomeAssistantMediaPlayer, HomeAssistantScene,
-                                                         HomeAssistantVacuum, HomeAssistantSwitch,
-                                                         HomeAssistantClimate, HomeAssistantCamera)
+from ovos_PHAL_plugin_homeassistant.logic.device import (
+    HomeAssistantAutomation,
+    HomeAssistantBinarySensor,
+    HomeAssistantCamera,
+    HomeAssistantClimate,
+    HomeAssistantLight,
+    HomeAssistantMediaPlayer,
+    HomeAssistantScene,
+    HomeAssistantSensor,
+    HomeAssistantSwitch,
+    HomeAssistantVacuum,
+)
 from ovos_PHAL_plugin_homeassistant.logic.integration import Integrator
-from ovos_PHAL_plugin_homeassistant.logic.utils import (map_entity_to_device_type,
-                                                        check_if_device_type_is_group,
-                                                        get_percentage_brightness_from_ha_value)
-from ovos_config.config import update_mycroft_config
+from ovos_PHAL_plugin_homeassistant.logic.utils import (
+    check_if_device_type_is_group,
+    get_percentage_brightness_from_ha_value,
+    map_entity_to_device_type,
+)
 
 SUPPORTED_DEVICES = {
             "sensor": HomeAssistantSensor,
@@ -115,6 +126,15 @@ def __init__(self, bus=None, config=None):
 
         self.init_configuration()
 
+    @classproperty
+    def runtime_requirements(self):
+        return RuntimeRequirements(internet_before_load=False,
+                                   network_before_load=True,
+                                   requires_internet=False,
+                                   requires_network=True,
+                                   no_internet_fallback=True,
+                                   no_network_fallback=False)
+
     def handle_check_connected(self, message: Message):
         """Return a bus response indicating whether the plugin is connected to a Home Assistant instance."""
         self.bus.emit(message.response(data={"connected": self.instance_available}))

ovos_PHAL_plugin_homeassistant/logic/socketclient.py

@@ -46,7 +46,7 @@ async def authenticate(self):
     async def _connect(self):
         try:
             uri = f"{self.url}/api/websocket"
-            self.websocket = await websockets.connect(uri)
+            self.websocket = await websockets.connect(uri=uri, close_timeout=5, open_timeout=5)
 
             # Wait for the auth_required message
             message = await self.websocket.recv()
@@ -61,6 +61,14 @@ async def _connect(self):
                     return
             else:
                 raise Exception("Expected auth_required message")
+        except asyncio.CancelledError:
+            LOG.exception("Connection cancelled, likely due to change in network configuration")
+            await self._disconnect()
+            return
+        except TimeoutError:
+            LOG.exception("Connection timed out, disconnecting")
+            await self._disconnect()
+            return
         except Exception as e:
             LOG.exception(e)
             await self._disconnect()

requirements.txt

@@ -3,7 +3,7 @@ ovos-utils<0.2.0,>=0.0.27
 ovos-config~=0.0.5
 youtube-search~=2.1
 pytube~=12.1
-websockets~=10.4
+websockets>=0.54.0,<13.0
 ovos-PHAL-plugin-oauth~=0.0.1,>=0.0.3a2
 nested-lookup~=0.2
 ovos-bus-client<0.2.0,>=0.0.8