TISControlProtocol 1.1.2__tar.gz → 1.1.4__tar.gz

{tiscontrolprotocol-1.1.2 → tiscontrolprotocol-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TISControlProtocol
-Version: 1.1.2
+Version: 1.1.4
 Summary: A library for TIS Control Protocol
 Project-URL: Homepage, https://github.com/TISControlHass
 Project-URL: Issues, https://github.com/TISControlHass/issues

{tiscontrolprotocol-1.1.2 → tiscontrolprotocol-1.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "TISControlProtocol"
-version = "1.1.2"
+version = "1.1.4"
 description = "A library for TIS Control Protocol"
 readme = "README.md"
 requires-python = ">=3.11"

{tiscontrolprotocol-1.1.2 → tiscontrolprotocol-1.1.4}/src/TISControlProtocol/Protocols/udp/ProtocolHandler.py

@@ -540,3 +540,12 @@ class TISProtocolHandler:
             destination_ip=entity.gateway,
             additional_bytes=[entity.channel_number, entity.universal_type],
         )
+
+    def generate_heartbeat_packet(self, device) -> TISPacket:
+        return TISPacket(
+            device_id=device.device_id,
+            operation_code=TISProtocolHandler.OPERATION_DISCOVERY,
+            source_ip=device.api.host,
+            destination_ip=device.gateway,
+            additional_bytes=[],
+        )

{tiscontrolprotocol-1.1.2 → tiscontrolprotocol-1.1.4}/src/TISControlProtocol/api.py

@@ -166,6 +166,9 @@ class TISApi:
             for appliance, details in data["appliances"].items()
         }
 
+        self.raw_devices = data["devices"]
+        logging.info(f"raw devices: {self.raw_devices}")
+
         grouped = defaultdict(list)
         for appliance, details in converted.items():
             grouped[details["appliance_type"]].append({appliance: details})

{tiscontrolprotocol-1.1.2 → tiscontrolprotocol-1.1.4}/src/TISControlProtocol/services/device_scan.py

@@ -16,6 +16,19 @@ from .cms import CMSDataSender
 protocol_handler = TISProtocolHandler()
 
 
+class TISDevice:
+    def __init__(self, tis_api, device) -> None:
+        self.api = tis_api
+        addr = device["device_address"]
+        if isinstance(addr, str):
+            self.device_id = [int(x.strip()) for x in addr.split(",") if x.strip()]
+        else:
+            self.device_id = [int(x) for x in addr]
+        self.device_type_code = device["device_type_code"]
+        self.device_type_name = device["device_name"]
+        self.gateway = str(device["gateway"])
+
+
 class DeviceScanService(BaseService):
     """Service to periodically scan TIS network devices and report to CMS."""
 
@@ -30,7 +43,6 @@ class DeviceScanService(BaseService):
         self.api = tis_api
         self.cms_url = cms_url
         self._scan_task_unsub = None
-        self.discovery_packet = protocol_handler.generate_discovery_packet()
         self.sender = CMSDataSender(
             external_url=f"{self.cms_url}/api/scan-devices",
             hass=self.hass,
@@ -98,17 +110,15 @@ class DeviceScanService(BaseService):
     async def scan_and_send(self) -> bool:
         """Perform network device scan and send payload to CMS."""
         logging.info("Starting periodic device scan for CMS")
-        raw_devices = await self.discover_network_devices()
+        connected_devices = await self.discover_network_devices()
         devices = [
             {
-                "device_id": device["device_id"],
-                "device_type_code": device["device_type"],
-                "device_type_name": self.api.devices_dict.get(
-                    tuple(device["device_type"]), tuple(device["device_type"])
-                ),
-                "gateway": device["source_ip"],
+                "device_id": device.device_id,
+                "device_type_code": device.device_type_code,
+                "device_type_name": device.device_type_name,
+                "gateway": device.gateway,
             }
-            for device in raw_devices
+            for device in connected_devices
         ]
 
         mac_address = await get_real_mac("end0")
@@ -119,16 +129,14 @@ class DeviceScanService(BaseService):
 
         return await self.sender.send_data(payload)
 
-    async def discover_network_devices(self, broadcast_attempts: int = 30) -> list:
+    async def discover_network_devices(self, attempts=5) -> list:
         """Discover network devices by broadcasting discovery packets."""
         self.api.hass.data[self.api.domain]["discovered_devices"] = []
-        for _ in range(broadcast_attempts):
-            if (
-                self.api.protocol
-                and hasattr(self.api.protocol, "sender")
-                and self.api.protocol.sender
-            ):
-                await self.api.protocol.sender.broadcast_packet(self.discovery_packet)
-            await asyncio.sleep(1)
 
+        for device_dict in self.api.raw_devices:
+            device = TISDevice(self.api, device_dict)
+            packet = protocol_handler.generate_heartbeat_packet(device)
+            await self.api.protocol.sender.send_packet_with_ack(
+                packet, attempts=attempts
+            )
         return self.api.hass.data[self.api.domain]["discovered_devices"]