[DO NOT MERGE] Add web socket server

.vscode/settings.json

@@ -4,5 +4,6 @@
   ],
   "python.testing.pytestEnabled": true,
   "editor.formatOnSave": true,
-  "python.testing.unittestEnabled": false
-}
+  "python.testing.unittestEnabled": false,
+  "debugpy.debugJustMyCode": false,
+}

examples/server_config.json

@@ -0,0 +1,66 @@
+{
+  "ws_server_config": {
+    "host": "localhost",
+    "port": 8001,
+    "network_auto_start": false
+  },
+  "ws_client_config": {
+    "host": "localhost",
+    "port": 8001,
+    "aiohttp_session": null
+  },
+  "zha_config": {
+    "coordinator_configuration": {
+      "path": "/dev/cu.wchusbserial971207DO",
+      "baudrate": 115200,
+      "flow_control": "hardware",
+      "radio_type": "ezsp"
+    },
+    "quirks_configuration": {
+      "enabled": true,
+      "custom_quirks_path": "/Users/davidmulcahey/.homeassistant/quirks"
+    },
+    "device_overrides": {},
+    "light_options": {
+      "default_light_transition": 0.0,
+      "enable_enhanced_light_transition": false,
+      "enable_light_transitioning_flag": true,
+      "always_prefer_xy_color_mode": true,
+      "group_members_assume_state": true
+    },
+    "device_options": {
+      "enable_identify_on_join": true,
+      "consider_unavailable_mains": 7200,
+      "consider_unavailable_battery": 21600,
+      "enable_mains_startup_polling": true
+    },
+    "alarm_control_panel_options": {
+      "master_code": "1234",
+      "failed_tries": 3,
+      "arm_requires_code": false
+    }
+  },
+  "zigpy_config": {
+    "startup_energy_scan": false,
+    "handle_unknown_devices": true,
+    "source_routing": true,
+    "max_concurrent_requests": 128,
+    "ezsp_config": {
+      "CONFIG_PACKET_BUFFER_COUNT": 255,
+      "CONFIG_MTORR_FLOW_CONTROL": 1,
+      "CONFIG_KEY_TABLE_SIZE": 12,
+      "CONFIG_ROUTE_TABLE_SIZE": 200
+    },
+    "ota": {
+      "otau_directory": "/Users/davidmulcahey/.homeassistant/zigpy_ota",
+      "inovelli_provider": false,
+      "thirdreality_provider": true
+    },
+    "database_path": "/Users/davidmulcahey/.homeassistant/zigbee.db",
+    "device": {
+      "baudrate": 115200,
+      "flow_control": "hardware",
+      "path": "/dev/cu.wchusbserial971207DO"
+    }
+  }
+}

pyproject.toml

@@ -23,6 +23,9 @@ dependencies = [
     "zha-quirks==0.0.124",
     "pyserial==3.5",
     "pyserial-asyncio-fast",
+    "pydantic==2.9.2",
+    "websockets<14.0",
+    "aiohttp"
 ]
 
 [tool.setuptools.packages.find]
@@ -231,4 +234,7 @@ show_missing = true
 exclude_also = [
     "if TYPE_CHECKING:",
     "raise NotImplementedError",
+]
+omit =[
+    "*/__main__.py",
 ]

script/run_websocket_server

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# Stop on errors
+set -e
+
+cd "$(dirname "$0")/.."
+
+source venv/bin/activate
+
+python -m zha.websocket.server --config=./examples/server_config.json

tests/common.py

@@ -238,7 +238,10 @@ def get_entity(
         if not isinstance(entity, entity_type):
             continue
 
-        if exact_entity_type is not None and type(entity) is not exact_entity_type:
+        if (
+            exact_entity_type is not None
+            and entity.info_object.class_name != exact_entity_type.__name__
+        ):
             continue
 
         if qualifier is not None and qualifier not in entity.info_object.unique_id:
@@ -262,45 +265,45 @@ async def group_entity_availability_test(
     assert entity.state["available"] is True
 
     device_1.on_network = False
-    await asyncio.sleep(0.1)
+    await asyncio.sleep(1)
     await zha_gateway.async_block_till_done()
     assert entity.state["available"] is True
 
     device_2.on_network = False
-    await asyncio.sleep(0.1)
+    await asyncio.sleep(1)
     await zha_gateway.async_block_till_done()
 
     assert entity.state["available"] is False
 
     device_1.on_network = True
-    await asyncio.sleep(0.1)
+    await asyncio.sleep(1)
     await zha_gateway.async_block_till_done()
     assert entity.state["available"] is True
 
     device_2.on_network = True
-    await asyncio.sleep(0.1)
+    await asyncio.sleep(1)
     await zha_gateway.async_block_till_done()
 
     assert entity.state["available"] is True
 
-    device_1.available = False
-    await asyncio.sleep(0.1)
+    device_1.update_available(available=False, on_network=device_1.on_network)
+    await asyncio.sleep(1)
     await zha_gateway.async_block_till_done()
     assert entity.state["available"] is True
 
-    device_2.available = False
-    await asyncio.sleep(0.1)
+    device_2.update_available(available=False, on_network=device_2.on_network)
+    await asyncio.sleep(1)
     await zha_gateway.async_block_till_done()
 
     assert entity.state["available"] is False
 
-    device_1.available = True
-    await asyncio.sleep(0.1)
+    device_1.update_available(available=True, on_network=device_1.on_network)
+    await asyncio.sleep(1)
     await zha_gateway.async_block_till_done()
     assert entity.state["available"] is True
 
-    device_2.available = True
-    await asyncio.sleep(0.1)
+    device_2.update_available(available=True, on_network=device_2.on_network)
+    await asyncio.sleep(1)
     await zha_gateway.async_block_till_done()
 
     assert entity.state["available"] is True
@@ -504,6 +507,9 @@ def create_mock_zigpy_device(
             descriptor_capability_field=zdo_t.NodeDescriptor.DescriptorCapability.NONE,
         )
 
+    if isinstance(node_descriptor, bytes):
+        node_descriptor = zdo_t.NodeDescriptor.deserialize(node_descriptor)[0]
+
     device.node_desc = node_descriptor
     device.last_seen = time.time()