Setting timeout for HTTP: requests does not hanging forever if the download speed is zero (addressing an issue when Apple does not response to HTTP GET)

Author: naszta

src/icloudpd/download.py

@@ -6,7 +6,7 @@
 import socket
 import time
 
-from requests import Response
+from requests import Response, Timeout
 from requests.exceptions import ConnectionError
 from tzlocal import get_localzone
 
@@ -125,7 +125,7 @@ def download_media(
             )
             break
 
-        except (ConnectionError, socket.timeout, PyiCloudAPIResponseException) as ex:
+        except (ConnectionError, socket.timeout, PyiCloudAPIResponseException, Timeout) as ex:
             if "Invalid global session" in str(ex):
                 logger.error("Session error, re-authenticating...")
                 if retries > 0:

src/pyicloud_ipd/session.py

@@ -35,7 +35,7 @@ def filter(self, record: logging.LogRecord) -> bool:
         message = record.getMessage()
         if self.name in message:
             record.msg = message.replace(self.name, "********")
-            record.args = [] # type: ignore[assignment] 
+            record.args = [] # type: ignore[assignment]
 
         return True
 
@@ -45,11 +45,12 @@ class PyiCloudSession(Session):
 
     def __init__(self, service: Any):
         self.service = service
+        self._timeout = 30.0
         super().__init__()
 
     @override
-    # type: ignore 
-    def request(self, method: str, url, **kwargs):  
+    # type: ignore
+    def request(self, method: str, url, **kwargs):
 
         # Charge logging to the right service endpoint
         callee = inspect.stack()[2]
@@ -62,6 +63,8 @@ def request(self, method: str, url, **kwargs):
 
         has_retried = kwargs.get("retried")
         kwargs.pop("retried", None)
+        if "timeout" not in kwargs and self._timeout is not None:
+            kwargs["timeout"] = self._timeout
         response = super().request(method, url, **kwargs)
 
         content_type = response.headers.get("Content-Type", "").split(";")[0]
@@ -131,7 +134,7 @@ def request(self, method: str, url, **kwargs):
 
         try:
             data = response.json() if response.status_code != 204 else {}
-        except:  
+        except:
             request_logger.warning("Failed to parse response with JSON mimetype")
             return response