PyChromecast 14.0.3__tar.gz → 14.0.4__tar.gz

{PyChromecast-14.0.3 → PyChromecast-14.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyChromecast
-Version: 14.0.3
+Version: 14.0.4
 Summary: Python module to talk to Google Chromecast.
 Author-email: Paulus Schoutsen <paulus@paulusschoutsen.nl>
 Project-URL: Homepage, https://github.com/home-assistant-libs/pychromecast

{PyChromecast-14.0.3 → PyChromecast-14.0.4}/PyChromecast.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyChromecast
-Version: 14.0.3
+Version: 14.0.4
 Summary: Python module to talk to Google Chromecast.
 Author-email: Paulus Schoutsen <paulus@paulusschoutsen.nl>
 Project-URL: Homepage, https://github.com/home-assistant-libs/pychromecast

{PyChromecast-14.0.3 → PyChromecast-14.0.4}/PyChromecast.egg-info/SOURCES.txt

@@ -25,6 +25,7 @@ pychromecast/controllers/bbciplayer.py
 pychromecast/controllers/bbcsounds.py
 pychromecast/controllers/bubbleupnp.py
 pychromecast/controllers/dashcast.py
+pychromecast/controllers/heartbeat.py
 pychromecast/controllers/homeassistant.py
 pychromecast/controllers/homeassistant_media.py
 pychromecast/controllers/media.py

{PyChromecast-14.0.3 → PyChromecast-14.0.4}/pychromecast/const.py

@@ -70,3 +70,5 @@ CAST_TYPES = {
 MESSAGE_TYPE = "type"
 REQUEST_ID = "requestId"
 SESSION_ID = "sessionId"
+
+PLATFORM_DESTINATION_ID = "receiver-0"

PyChromecast-14.0.4/pychromecast/controllers/heartbeat.py

@@ -0,0 +1,90 @@
+"""Controller to send and respond to heartbeat messages."""
+
+from __future__ import annotations
+
+import logging
+import time
+
+from . import BaseController
+
+from ..const import MESSAGE_TYPE, PLATFORM_DESTINATION_ID
+from ..error import ControllerNotRegistered, NotConnected, PyChromecastStopped
+
+# pylint: disable-next=no-name-in-module
+from ..generated.cast_channel_pb2 import CastMessage
+
+NS_HEARTBEAT = "urn:x-cast:com.google.cast.tp.heartbeat"
+
+TYPE_PING = "PING"
+TYPE_PONG = "PONG"
+
+HB_PING_TIME = 10
+HB_PONG_TIME = 10
+
+
+class HeartbeatController(BaseController):
+    """Controller to send and respond to heartbeat messages."""
+
+    def __init__(self) -> None:
+        super().__init__(NS_HEARTBEAT, target_platform=True)
+        self.last_ping = 0.0
+        self.last_pong = time.time()
+        self.logger = logging.getLogger(__name__)
+
+    def receive_message(self, _message: CastMessage, data: dict) -> bool:
+        """
+        Called when a heartbeat message is received.
+
+        data is message.payload_utf8 interpreted as a JSON dict.
+        """
+        if self._socket_client is None:
+            raise ControllerNotRegistered
+
+        if self._socket_client.is_stopped:
+            return True
+
+        if data[MESSAGE_TYPE] == TYPE_PING:
+            try:
+                self._socket_client.send_message(
+                    PLATFORM_DESTINATION_ID,
+                    self.namespace,
+                    {MESSAGE_TYPE: TYPE_PONG},
+                    no_add_request_id=True,
+                )
+            except PyChromecastStopped:
+                self._socket_client.logger.debug(
+                    "Heartbeat error when sending response, "
+                    "Chromecast connection has stopped"
+                )
+
+            return True
+
+        if data[MESSAGE_TYPE] == TYPE_PONG:
+            self.reset()
+            return True
+
+        return False
+
+    def ping(self) -> None:
+        """Send a ping message."""
+        if self._socket_client is None:
+            raise ControllerNotRegistered
+
+        self.last_ping = time.time()
+        try:
+            self.send_message({MESSAGE_TYPE: TYPE_PING})
+        except NotConnected:
+            self._socket_client.logger.error(
+                "Chromecast is disconnected. Cannot ping until reconnected."
+            )
+
+    def reset(self) -> None:
+        """Reset expired counter."""
+        self.last_pong = time.time()
+
+    def is_expired(self) -> bool:
+        """Indicates if connection has expired."""
+        if time.time() - self.last_ping > HB_PING_TIME:
+            self.ping()
+
+        return (time.time() - self.last_pong) > HB_PING_TIME + HB_PONG_TIME

{PyChromecast-14.0.3 → PyChromecast-14.0.4}/pychromecast/socket_client.py

@@ -24,8 +24,9 @@ from struct import pack, unpack
 
 import zeroconf
 
-from .const import MESSAGE_TYPE, REQUEST_ID, SESSION_ID
+from .const import MESSAGE_TYPE, PLATFORM_DESTINATION_ID, REQUEST_ID, SESSION_ID
 from .controllers import BaseController, CallbackType
+from .controllers.heartbeat import NS_HEARTBEAT, HeartbeatController
 from .controllers.media import MediaController
 from .controllers.receiver import CastStatus, CastStatusListener, ReceiverController
 from .dial import get_host_from_service
@@ -42,12 +43,7 @@ from .generated.cast_channel_pb2 import CastMessage
 from .models import HostServiceInfo, MDNSServiceInfo
 
 NS_CONNECTION = "urn:x-cast:com.google.cast.tp.connection"
-NS_HEARTBEAT = "urn:x-cast:com.google.cast.tp.heartbeat"
 
-PLATFORM_DESTINATION_ID = "receiver-0"
-
-TYPE_PING = "PING"
-TYPE_PONG = "PONG"
 TYPE_CONNECT = "CONNECT"
 TYPE_CLOSE = "CLOSE"
 TYPE_LOAD = "LOAD"
@@ -65,10 +61,7 @@ CONNECTION_STATUS_FAILED_RESOLVE = "FAILED_RESOLVE"
 # The socket connection was lost and needs to be retried
 CONNECTION_STATUS_LOST = "LOST"
 
-HB_PING_TIME = 10
-HB_PONG_TIME = 10
-POLL_TIME_BLOCKING = 5.0
-POLL_TIME_NON_BLOCKING = 0.01
+SELECT_TIMEOUT = 5.0
 TIMEOUT_TIME = 30.0
 RETRY_TIME = 5.0
 
@@ -540,7 +533,7 @@ class SocketClient(threading.Thread, CastStatusListener):
         self.logger.debug("Thread started...")
         while not self.stop.is_set():
             try:
-                if self._run_once(timeout=POLL_TIME_BLOCKING) == 1:
+                if self._run_once() == 1:
                     break
             except Exception:  # pylint: disable=broad-except
                 self._force_recon = True
@@ -555,7 +548,7 @@ class SocketClient(threading.Thread, CastStatusListener):
         # Clean up
         self._cleanup()
 
-    def _run_once(self, timeout: float = POLL_TIME_NON_BLOCKING) -> int:
+    def _run_once(self) -> int:
         """Receive from the socket and handle data."""
         # pylint: disable=too-many-branches, too-many-statements, too-many-return-statements
 
@@ -568,9 +561,13 @@ class SocketClient(threading.Thread, CastStatusListener):
         # A connection has been established at this point by self._check_connection
         assert self.socket is not None
 
-        # poll the socket, as well as the socketpair to allow us to be interrupted
+        # Poll the socket and the socketpair, with a timeout of SELECT_TIMEOUT
+        # The timeout ensures we call _check_connection often enough to avoid
+        # the HeartbeatController from detecting a timeout
+        # The socketpair allow us to be interrupted on shutdown without waiting
+        # for the SELECT_TIMEOUT timout to expire
         try:
-            ready = self.selector.select(timeout)
+            ready = self.selector.select(SELECT_TIMEOUT)
         except (ValueError, OSError) as exc:
             self.logger.error(
                 "[%s(%s):%s] Error in select call: %s",
@@ -689,7 +686,10 @@ class SocketClient(threading.Thread, CastStatusListener):
         # route message to handlers
         if message.namespace in self._handlers:
             # debug messages
-            if message.namespace != NS_HEARTBEAT:
+            if (
+                message.namespace != NS_HEARTBEAT
+                or self.heartbeat_controller.logger.isEnabledFor(logging.DEBUG)
+            ):
                 self.logger.debug(
                     "[%s(%s):%s] Received: %s",
                     self.fn or "",
@@ -873,7 +873,10 @@ class SocketClient(threading.Thread, CastStatusListener):
         be_size = pack(">I", msg.ByteSize())
 
         # Log all messages except heartbeat
-        if msg.namespace != NS_HEARTBEAT:
+        if (
+            msg.namespace != NS_HEARTBEAT
+            or self.heartbeat_controller.logger.isEnabledFor(logging.DEBUG)
+        ):
             self.logger.debug(
                 "[%s(%s):%s] Sending: %s",
                 self.fn or "",
@@ -1062,73 +1065,6 @@ class ConnectionController(BaseController):
         return False
 
 
-class HeartbeatController(BaseController):
-    """Controller to respond to heartbeat messages."""
-
-    def __init__(self) -> None:
-        super().__init__(NS_HEARTBEAT, target_platform=True)
-        self.last_ping = 0.0
-        self.last_pong = time.time()
-
-    def receive_message(self, _message: CastMessage, data: dict) -> bool:
-        """
-        Called when a heartbeat message is received.
-
-        data is message.payload_utf8 interpreted as a JSON dict.
-        """
-        if self._socket_client is None:
-            raise ControllerNotRegistered
-
-        if self._socket_client.is_stopped:
-            return True
-
-        if data[MESSAGE_TYPE] == TYPE_PING:
-            try:
-                self._socket_client.send_message(
-                    PLATFORM_DESTINATION_ID,
-                    self.namespace,
-                    {MESSAGE_TYPE: TYPE_PONG},
-                    no_add_request_id=True,
-                )
-            except PyChromecastStopped:
-                self._socket_client.logger.debug(
-                    "Heartbeat error when sending response, "
-                    "Chromecast connection has stopped"
-                )
-
-            return True
-
-        if data[MESSAGE_TYPE] == TYPE_PONG:
-            self.reset()
-            return True
-
-        return False
-
-    def ping(self) -> None:
-        """Send a ping message."""
-        if self._socket_client is None:
-            raise ControllerNotRegistered
-
-        self.last_ping = time.time()
-        try:
-            self.send_message({MESSAGE_TYPE: TYPE_PING})
-        except NotConnected:
-            self._socket_client.logger.error(
-                "Chromecast is disconnected. Cannot ping until reconnected."
-            )
-
-    def reset(self) -> None:
-        """Reset expired counter."""
-        self.last_pong = time.time()
-
-    def is_expired(self) -> bool:
-        """Indicates if connection has expired."""
-        if time.time() - self.last_ping > HB_PING_TIME:
-            self.ping()
-
-        return (time.time() - self.last_pong) > HB_PING_TIME + HB_PONG_TIME
-
-
 def new_socket() -> socket.socket:
     """
     Create a new socket with OS-specific parameters

{PyChromecast-14.0.3 → PyChromecast-14.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name         = "PyChromecast"
-version      = "14.0.3"
+version      = "14.0.4"
 description  = "Python module to talk to Google Chromecast."
 readme       = "README.rst"
 authors      = [