PyChromecast 14.0.1__tar.gz → 14.0.2__tar.gz

{PyChromecast-14.0.1 → PyChromecast-14.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyChromecast
-Version: 14.0.1
+Version: 14.0.2
 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
@@ -192,3 +192,9 @@ work. Without him it would not have been possible!
 
 .. _Linux style wildcard: http://tldp.org/LDP/GNU-Linux-Tools-Summary/html/x11655.htm
 .. _Fred Clift: https://github.com/minektur
+
+|ohf-logo|
+
+.. |ohf-logo| image:: https://www.openhomefoundation.org/badges/pychromecast.png
+   :alt: PyChromecast - A library from the Open Home Foundation
+   :target: https://www.openhomefoundation.org/

{PyChromecast-14.0.1 → PyChromecast-14.0.2}/PyChromecast.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyChromecast
-Version: 14.0.1
+Version: 14.0.2
 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
@@ -192,3 +192,9 @@ work. Without him it would not have been possible!
 
 .. _Linux style wildcard: http://tldp.org/LDP/GNU-Linux-Tools-Summary/html/x11655.htm
 .. _Fred Clift: https://github.com/minektur
+
+|ohf-logo|
+
+.. |ohf-logo| image:: https://www.openhomefoundation.org/badges/pychromecast.png
+   :alt: PyChromecast - A library from the Open Home Foundation
+   :target: https://www.openhomefoundation.org/

{PyChromecast-14.0.1 → PyChromecast-14.0.2}/README.rst

@@ -175,3 +175,9 @@ work. Without him it would not have been possible!
 
 .. _Linux style wildcard: http://tldp.org/LDP/GNU-Linux-Tools-Summary/html/x11655.htm
 .. _Fred Clift: https://github.com/minektur
+
+|ohf-logo|
+
+.. |ohf-logo| image:: https://www.openhomefoundation.org/badges/pychromecast.png
+   :alt: PyChromecast - A library from the Open Home Foundation
+   :target: https://www.openhomefoundation.org/

{PyChromecast-14.0.1 → PyChromecast-14.0.2}/pychromecast/const.py

@@ -43,6 +43,7 @@ CAST_TYPES = {
     "nest audio": (CAST_TYPE_AUDIO, MF_GOOGLE),
     "nest wifi point": (CAST_TYPE_AUDIO, MF_GOOGLE),
     "bravia 4k vh2": (CAST_TYPE_CHROMECAST, MF_SONY),
+    "bravia 4k vh21": (CAST_TYPE_CHROMECAST, MF_SONY),
     "C4A": (CAST_TYPE_AUDIO, MF_SONY),
     "JBL Link 10": (CAST_TYPE_AUDIO, MF_JBL),
     "JBL Link 20": (CAST_TYPE_AUDIO, MF_JBL),

{PyChromecast-14.0.1 → PyChromecast-14.0.2}/pychromecast/controllers/plex.py

@@ -108,6 +108,8 @@ def media_to_chromecast_command(  # pylint: disable=invalid-name, too-many-local
         dict: Returs a dict formatted correctly to start playback on a Chromecast.
     """
 
+    machineIdentifier = None
+    token = None
     if media is not None:
         # Lets set some params for the user if they use plexapi.
         server: PlexServer = (

{PyChromecast-14.0.1 → PyChromecast-14.0.2}/pychromecast/controllers/youtube.py

@@ -84,6 +84,7 @@ class YouTubeController(QuickPlayController):
         super().__init__(YOUTUBE_NAMESPACE, APP_YOUTUBE)
         self.status_update_event = threading.Event()
         self._timeout = timeout
+        self._session = None
 
     def start_session_if_none(self) -> None:
         """

{PyChromecast-14.0.1 → PyChromecast-14.0.2}/pychromecast/socket_client.py

@@ -10,31 +10,31 @@ Without him this would not have been possible.
 from __future__ import annotations
 
 import abc
-from dataclasses import dataclass
 import errno
 import json
 import logging
-import select
+import selectors
 import socket
 import ssl
 import threading
 import time
 from collections import defaultdict
+from dataclasses import dataclass
 from struct import pack, unpack
 
 import zeroconf
 
-from .controllers import CallbackType, BaseController
+from .const import MESSAGE_TYPE, REQUEST_ID, SESSION_ID
+from .controllers import BaseController, CallbackType
 from .controllers.media import MediaController
 from .controllers.receiver import CastStatus, CastStatusListener, ReceiverController
-from .const import MESSAGE_TYPE, REQUEST_ID, SESSION_ID
 from .dial import get_host_from_service
 from .error import (
     ChromecastConnectionError,
     ControllerNotRegistered,
-    UnsupportedNamespace,
     NotConnected,
     PyChromecastStopped,
+    UnsupportedNamespace,
 )
 
 # pylint: disable-next=no-name-in-module
@@ -64,13 +64,9 @@ CONNECTION_STATUS_FAILED = "FAILED"
 CONNECTION_STATUS_FAILED_RESOLVE = "FAILED_RESOLVE"
 # The socket connection was lost and needs to be retried
 CONNECTION_STATUS_LOST = "LOST"
-# Check for select poll method
-SELECT_HAS_POLL = hasattr(select, "poll")
 
 HB_PING_TIME = 10
 HB_PONG_TIME = 10
-POLL_TIME_BLOCKING = 5.0
-POLL_TIME_NON_BLOCKING = 0.01
 TIMEOUT_TIME = 30.0
 RETRY_TIME = 5.0
 
@@ -215,6 +211,11 @@ class SocketClient(threading.Thread, CastStatusListener):
         self.connecting = True
         self.first_connection = True
         self.socket: socket.socket | ssl.SSLSocket | None = None
+        self.selector = selectors.DefaultSelector()
+        self.wakeup_selector_key = self.selector.register(
+            self.socketpair[0], selectors.EVENT_READ
+        )
+        self.remote_selector_key: selectors.SelectorKey | None = None
 
         # dict mapping namespace on Controller objects
         self._handlers: dict[str, set[BaseController]] = defaultdict(set)
@@ -238,8 +239,10 @@ class SocketClient(threading.Thread, CastStatusListener):
         tries = self.tries
 
         if self.socket is not None:
+            self.selector.unregister(self.socket)
             self.socket.close()
             self.socket = None
+            self.remote_selector_key = None
 
         # Make sure nobody is blocking.
         for callback_function in self._request_callbacks.values():
@@ -288,10 +291,15 @@ class SocketClient(threading.Thread, CastStatusListener):
                 try:
                     if self.socket is not None:
                         # If we retry connecting, we need to clean up the socket again
-                        self.socket.close()  # type: ignore[unreachable]
+                        self.selector.unregister(self.socket)  # type: ignore[unreachable]
+                        self.socket.close()
                         self.socket = None
+                        self.remote_selector_key = None
 
                     self.socket = new_socket()
+                    self.remote_selector_key = self.selector.register(
+                        self.socket, selectors.EVENT_READ
+                    )
                     self.socket.settimeout(self.timeout)
                     self._report_connection_status(
                         ConnectionStatus(
@@ -530,7 +538,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
@@ -545,7 +553,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
 
@@ -559,20 +567,8 @@ class SocketClient(threading.Thread, CastStatusListener):
         assert self.socket is not None
 
         # poll the socket, as well as the socketpair to allow us to be interrupted
-        rlist = [self.socket, self.socketpair[0]]
         try:
-            if SELECT_HAS_POLL is True:
-                # Map file descriptors to socket objects because select.select does not support fd > 1024
-                # https://stackoverflow.com/questions/14250751/how-to-increase-filedescriptors-range-in-python-select
-                fd_to_socket = {rlist_item.fileno(): rlist_item for rlist_item in rlist}
-
-                poll_obj = select.poll()
-                for poll_fd in rlist:
-                    poll_obj.register(poll_fd, select.POLLIN)
-                poll_result = poll_obj.poll(timeout * 1000)  # timeout in milliseconds
-                can_read = [fd_to_socket[fd] for fd, _status in poll_result]
-            else:
-                can_read, _, _ = select.select(rlist, [], [], timeout)
+            ready = self.selector.select()
         except (ValueError, OSError) as exc:
             self.logger.error(
                 "[%s(%s):%s] Error in select call: %s",
@@ -584,9 +580,10 @@ class SocketClient(threading.Thread, CastStatusListener):
             self._force_recon = True
             return 0
 
+        can_read = {key for key, _ in ready}
         # read message from chromecast
         message = None
-        if self.socket in can_read and not self._force_recon:
+        if self.remote_selector_key in can_read and not self._force_recon:
             try:
                 message = self._read_message()
             except InterruptLoop as exc:
@@ -611,18 +608,17 @@ class SocketClient(threading.Thread, CastStatusListener):
                     if self.stop.is_set():
                         return 1
                 raise
-            except socket.error:
+            except socket.error as exc:
                 self._force_recon = True
                 self.logger.error(
-                    "[%s(%s):%s] Error reading from socket.",
+                    "[%s(%s):%s] Error reading from socket: %s",
                     self.fn or "",
                     self.host,
                     self.port,
+                    exc,
                 )
-            else:
-                data = _dict_from_message_payload(message)
 
-        if self.socketpair[0] in can_read:
+        if self.wakeup_selector_key in can_read:
             # Clear the socket's buffer
             self.socketpair[0].recv(128)
 
@@ -635,6 +631,7 @@ class SocketClient(threading.Thread, CastStatusListener):
             return 0
 
         # See if any handlers will accept this message
+        data = _dict_from_message_payload(message)
         self._route_message(message, data)
 
         if REQUEST_ID in data and data[REQUEST_ID] in self._request_callbacks:
@@ -652,8 +649,8 @@ class SocketClient(threading.Thread, CastStatusListener):
         # check if connection is expired
         reset = False
         if self._force_recon:
-            self.logger.warning(
-                "[%s(%s):%s] Error communicating with socket, resetting connection",
+            self.logger.debug(
+                "[%s(%s):%s] Forced reconnection",
                 self.fn or "",
                 self.host,
                 self.port,
@@ -661,7 +658,7 @@ class SocketClient(threading.Thread, CastStatusListener):
             reset = True
 
         elif self.heartbeat_controller.is_expired():
-            self.logger.warning(
+            self.logger.info(
                 "[%s(%s):%s] Heartbeat timeout, resetting connection",
                 self.fn or "",
                 self.host,
@@ -767,6 +764,7 @@ class SocketClient(threading.Thread, CastStatusListener):
 
         self.socketpair[0].close()
         self.socketpair[1].close()
+        self.selector.close()
 
         self.connecting = True
 
@@ -897,17 +895,18 @@ class SocketClient(threading.Thread, CastStatusListener):
                     else:
                         callback_function(True, None)
                 self.socket.sendall(be_size + msg.SerializeToString())
-            except socket.error:
+            except socket.error as exc:
                 if callback_function:
                     callback_function(False, None)
                 if not no_add_request_id:
                     self._request_callbacks.pop(request_id, None)
                 self._force_recon = True
-                self.logger.info(
-                    "[%s(%s):%s] Error writing to socket.",
+                self.logger.warning(
+                    "[%s(%s):%s] Error writing to socket: %s",
                     self.fn or "",
                     self.host,
                     self.port,
+                    exc,
                 )
         else:
             if callback_function:

{PyChromecast-14.0.1 → PyChromecast-14.0.2}/pyproject.toml

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

{PyChromecast-14.0.1 → PyChromecast-14.0.2}/requirements.txt

@@ -1,3 +1,3 @@
 casttube==0.2.1
 protobuf==4.25.2
-zeroconf==0.131.0
+zeroconf==0.135.0