Split ServiceInfo class in two classes

pychromecast/__init__.py

@@ -16,16 +16,15 @@
     DISCOVER_TIMEOUT,
     CastBrowser,
     CastListener,  # Deprecated
-    ServiceInfo,
     SimpleCastListener,
     discover_chromecasts,
     start_discovery,
     stop_discovery,
 )
 from .dial import get_cast_type
-from .const import CAST_TYPE_CHROMECAST, REQUEST_TIMEOUT, SERVICE_TYPE_HOST
+from .const import CAST_TYPE_CHROMECAST, REQUEST_TIMEOUT
 from .controllers.media import STREAM_TYPE_BUFFERED  # noqa: F401
-from .models import CastInfo
+from .models import CastInfo, HostServiceInfo
 from .response_handler import WaitResponse
 
 __all__ = ("get_chromecasts", "Chromecast")
@@ -44,7 +43,7 @@ def get_chromecast_from_host(host, tries=None, retry_wait=None, timeout=None):
     ip_address, port, uuid, model_name, friendly_name = host
     _LOGGER.debug("get_chromecast_from_host %s", host)
     port = port or 8009
-    services = [ServiceInfo(SERVICE_TYPE_HOST, (ip_address, port))]
+    services = [HostServiceInfo(ip_address, port)]
     cast_info = CastInfo(
         services, uuid, model_name, friendly_name, ip_address, port, None, None
     )

pychromecast/const.py

@@ -62,8 +62,6 @@
     "V705-H3": (CAST_TYPE_CHROMECAST, MF_VIZIO),
 }
 
-SERVICE_TYPE_HOST = "host"
-SERVICE_TYPE_MDNS = "mdns"
 
 MESSAGE_TYPE = "type"
 REQUEST_ID = "requestId"

pychromecast/dial.py

@@ -11,13 +11,8 @@
 
 import zeroconf
 
-from .const import (
-    CAST_TYPE_AUDIO,
-    CAST_TYPE_CHROMECAST,
-    CAST_TYPE_GROUP,
-    SERVICE_TYPE_HOST,
-)
-from .models import ZEROCONF_ERRORS, CastInfo, ServiceInfo
+from .const import CAST_TYPE_AUDIO, CAST_TYPE_CHROMECAST, CAST_TYPE_GROUP
+from .models import ZEROCONF_ERRORS, CastInfo, HostServiceInfo
 
 XML_NS_UPNP_DEVICE = "{urn:schemas-upnp-org:device-1-0}"
 
@@ -31,8 +26,8 @@ def get_host_from_service(service, zconf):
     """Resolve host and port from service."""
     service_info = None
 
-    if service.type == SERVICE_TYPE_HOST:
-        return service.data + (None,)
+    if isinstance(service, HostServiceInfo):
+        return (service.host, service.port, None)
 
     try:
         service_info = zconf.get_service_info("_googlecast._tcp.local.", service.data)
@@ -177,7 +172,7 @@ def get_device_info(  # pylint: disable=too-many-locals
 
     try:
         if services is None:
-            services = [ServiceInfo(SERVICE_TYPE_HOST, (host, 8009))]
+            services = [HostServiceInfo(host, 8009)]
 
         # Try connection with SSL first, and if it fails fall back to non-SSL
         try:
@@ -271,7 +266,7 @@ def get_multizone_status(host, services=None, zconf=None, timeout=30, context=No
 
     try:
         if services is None:
-            services = [ServiceInfo(SERVICE_TYPE_HOST, (host, 8009))]
+            services = [HostServiceInfo(host, 8009)]
         _, status = _get_status(
             services,
             zconf,

pychromecast/discovery.py

@@ -9,16 +9,9 @@
 
 import zeroconf
 
-from .const import (
-    CAST_TYPE_AUDIO,
-    CAST_TYPE_GROUP,
-    CAST_TYPES,
-    MF_GOOGLE,
-    SERVICE_TYPE_HOST,
-    SERVICE_TYPE_MDNS,
-)
+from .const import CAST_TYPE_AUDIO, CAST_TYPE_GROUP, CAST_TYPES, MF_GOOGLE
 from .dial import get_device_info, get_multizone_status, get_ssl_context
-from .models import ZEROCONF_ERRORS, CastInfo, ServiceInfo
+from .models import ZEROCONF_ERRORS, CastInfo, HostServiceInfo, MDNSServiceInfo
 
 DISCOVER_TIMEOUT = 5
 
@@ -111,7 +104,7 @@ def remove_service(self, _zconf, typ, name):
         cast_info = None
         device_removed = False
         uuid = None
-        service_info = ServiceInfo(SERVICE_TYPE_MDNS, name)
+        service_info = MDNSServiceInfo(name)
         # Lock because the HostBrowser may also add or remove items
         with self._services_lock:
             for uuid, info_for_uuid in self._devices.items():
@@ -204,7 +197,7 @@ def get_value(key):
             )
             return
 
-        service_info = ServiceInfo(SERVICE_TYPE_MDNS, name)
+        service_info = MDNSServiceInfo(name)
 
         # Lock because the HostBrowser may also add or remove items
         with self._services_lock:
@@ -419,8 +412,8 @@ def _update_devices(self, host, devices, host_uuids):
             for uuid in self._devices:
                 for service in self._devices[uuid].services.copy():
                     if (
-                        service.type == SERVICE_TYPE_HOST
-                        and service.data[0] == host
+                        isinstance(service, HostServiceInfo)
+                        and service.host == host
                         and uuid not in host_uuids
                     ):
                         self._remove_host_service(host, uuid, callbacks)
@@ -440,7 +433,7 @@ def _add_host_service(
         cast_type,
         manufacturer,
     ):
-        service_info = ServiceInfo(SERVICE_TYPE_HOST, (host, port))
+        service_info = HostServiceInfo(host, port)
 
         callback = self._cast_listener.add_cast
         if uuid in self._devices:
@@ -493,9 +486,9 @@ def _remove_host_service(self, host, uuid, callbacks):
 
         info_for_uuid = self._devices[uuid]
         for service in info_for_uuid.services:
-            if service.type == SERVICE_TYPE_HOST and service.data[0] == host:
+            if isinstance(service, HostServiceInfo) and service.host == host:
                 info_for_uuid.services.remove(service)
-                port = service.data[1]
+                port = service.port
                 name = f"{host}:{port}"
                 _LOGGER.debug(
                     "Host %s down or no longer handles uuid %s, removing host based service",

pychromecast/models.py

@@ -19,7 +19,7 @@
 class CastInfo:
     """Cast info container."""
 
-    services: list[ServiceInfo]
+    services: list[HostServiceInfo | MDNSServiceInfo]
     uuid: UUID
     model_name: str | None
     friendly_name: str | None
@@ -30,8 +30,15 @@ class CastInfo:
 
 
 @dataclass(frozen=True)
-class ServiceInfo:
+class HostServiceInfo:
     """Service info container."""
 
-    type: str
-    data: tuple[str, int] | str
+    host: str
+    port: int
+
+
+@dataclass(frozen=True)
+class MDNSServiceInfo:
+    """Service info container."""
+
+    name: str