simplepush 3.7.0__tar.gz → 3.7.1__tar.gz

{simplepush-3.7.0 → simplepush-3.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: simplepush
-Version: 3.7.0
+Version: 3.7.1
 Summary: Python client for Simplepush (tasks, notifications, events, end-to-end encryption).
 Project-URL: Homepage, https://simplepu.sh
 Project-URL: Documentation, https://simplepu.sh/guide/python-sdk

{simplepush-3.7.0 → simplepush-3.7.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "simplepush"
-version = "3.7.0"
+version = "3.7.1"
 description = "Python client for Simplepush (tasks, notifications, events, end-to-end encryption)."
 readme = "README.md"
 license = { file = "LICENSE" }

{simplepush-3.7.0 → simplepush-3.7.1}/src/simplepush/api.py

@@ -56,7 +56,7 @@ from .client import (
     Event, GroupCancelResult, InputEvent, Notification, NotificationGroup,
     NotificationGroupRecipient, RawEvents, Reply, Subtask, Submissions, Task,
     TaskGroup, TaskGroupRecipient,
-    _DownloadTransport, _FileBinder, _Hub,
+    _HTTP_TIMEOUT, _DownloadTransport, _FileBinder, _Hub,
 )
 
 
@@ -568,7 +568,7 @@ class _BaseClient:
             method="GET",
         )
         try:
-            with urllib.request.urlopen(req) as resp:
+            with urllib.request.urlopen(req, timeout=_HTTP_TIMEOUT) as resp:
                 info = json.loads(resp.read().decode("utf-8"))
         except urllib.error.HTTPError as e:
             raise ApiError(e.code, e.read().decode("utf-8")) from e
@@ -1524,7 +1524,7 @@ class _BaseClient:
             attempt += 1
             req = urllib.request.Request(url, data=data, headers=req_headers, method="POST")
             try:
-                with urllib.request.urlopen(req) as resp:
+                with urllib.request.urlopen(req, timeout=_HTTP_TIMEOUT) as resp:
                     resp_body = resp.read().decode("utf-8")
                     if resp_body:
                         return json.loads(resp_body)
@@ -1535,8 +1535,9 @@ class _BaseClient:
                 if not (retry and retryable) or attempt >= self._RETRY_MAX_ATTEMPTS:
                     raise ApiError(e.code, payload) from e
                 time.sleep(self._retry_delay(attempt, e.headers.get("Retry-After")))
-            except urllib.error.URLError as e:
-                # Network-level failure (connection refused/reset, DNS).
+            except (urllib.error.URLError, TimeoutError) as e:
+                # Network-level failure (connection refused/reset, DNS, or no
+                # response within the timeout).
                 if not retry or attempt >= self._RETRY_MAX_ATTEMPTS:
                     raise
                 time.sleep(self._retry_delay(attempt, None))
@@ -1548,7 +1549,7 @@ class _BaseClient:
         url = f"{self._base}{path}"
         req = urllib.request.Request(url, data=b"", headers=dict(headers or {}), method="POST")
         try:
-            with urllib.request.urlopen(req) as resp:
+            with urllib.request.urlopen(req, timeout=_HTTP_TIMEOUT) as resp:
                 resp_body = resp.read().decode("utf-8")
                 return json.loads(resp_body) if resp_body else None
         except urllib.error.HTTPError as e:
@@ -1561,7 +1562,7 @@ class _BaseClient:
         req = urllib.request.Request(url, data=data, method="PUT")
         req.add_header("Content-Type", "application/octet-stream")
         try:
-            with urllib.request.urlopen(req) as resp:
+            with urllib.request.urlopen(req, timeout=_HTTP_TIMEOUT) as resp:
                 resp.read()
         except urllib.error.HTTPError as e:
             raise ApiError(e.code, e.read().decode("utf-8")) from e

{simplepush-3.7.0 → simplepush-3.7.1}/src/simplepush/client.py

@@ -49,6 +49,10 @@ from urllib.parse import quote
 import websockets
 import websockets.exceptions
 
+# Seconds an HTTP request waits for the connection or the next data before it
+# fails. It bounds each wait, not a whole upload or download.
+_HTTP_TIMEOUT = 30
+
 if TYPE_CHECKING:
     # Type-only: api.py imports from this module at runtime, so a real import
     # here would be circular. The enum-or-Literal unions below give static
@@ -276,7 +280,7 @@ class _DownloadTransport:
         url = f"{self._base}/{scope}/{quote(str(scope_id))}/{kind}/{quote(str(file_id))}/download-url"
         req = urllib.request.Request(url, data=b"", headers=self._headers, method="POST")
         try:
-            with urllib.request.urlopen(req) as resp:
+            with urllib.request.urlopen(req, timeout=_HTTP_TIMEOUT) as resp:
                 body = resp.read().decode("utf-8")
         except urllib.error.HTTPError as e:
             detail = e.read().decode("utf-8", "replace")
@@ -286,7 +290,7 @@ class _DownloadTransport:
 
     def get(self, url: str) -> bytes:
         try:
-            with urllib.request.urlopen(url) as resp:
+            with urllib.request.urlopen(url, timeout=_HTTP_TIMEOUT) as resp:
                 return resp.read()
         except urllib.error.HTTPError as e:
             raise DownloadError(f"file fetch failed: HTTP {e.code}", status_code=e.code) from e