Robust curl retries (--retry 4 --retry-all-errors) + aligned subprocess timeouts + download validation

app.py

@@ -1319,12 +1319,14 @@ def _raw_get_file_path(file_id: str) -> str:
     import subprocess, json as _json
     result = subprocess.run(
         [
-            "curl", "--ipv4", "-s", "-S", "--max-time", "15", "--connect-timeout", "10",
+            "curl", "--ipv4", "-s", "-S", "--retry", "4", "--retry-delay", "2", "--retry-all-errors", "--max-time", "15", "--connect-timeout", "10",
             "-d", f"file_id={file_id}",
             f"https://api.telegram.org/bot{TELEGRAM_BOT_TOKEN}/getFile",
         ],
-        capture_output=True, text=True, timeout=20,
+        capture_output=True, text=True, timeout=75,
     )
+    if not result.stdout.strip():
+        raise RuntimeError(f"getFile empty (curl rc={result.returncode}): {result.stderr[:150]}")
     return _json.loads(result.stdout)["result"]["file_path"]
 
 
@@ -1354,14 +1356,16 @@ async def download_photo(update: Update, context: ContextTypes.DEFAULT_TYPE) ->
         with tempfile.NamedTemporaryFile(suffix=".bin", delete=False) as f:
             tmp = f.name
         try:
-            subprocess.run(
-                ["curl", "--ipv4", "-s", "-S", "--max-time", "30", "--connect-timeout", "10",
+            r = subprocess.run(
+                ["curl", "--ipv4", "-s", "-S", "--retry", "4", "--retry-delay", "2", "--retry-all-errors", "--max-time", "30", "--connect-timeout", "10",
                  "-o", tmp, url],
-                capture_output=True, text=True, timeout=35,
+                capture_output=True, text=True, timeout=160,
             )
             with open(tmp, "rb") as fh:
                 data = fh.read()
             logger.info(f"Downloaded {len(data)} bytes, magic={data[:4]!r}")
+            if not data:
+                raise RuntimeError(f"empty download (curl rc={r.returncode}): {r.stderr[:150]}")
             img = Image.open(io.BytesIO(data))
             img.load()
             return img.convert("RGB")
@@ -2108,12 +2112,12 @@ def _raw_send_message(chat_id: int, text: str):
     try:
         result = subprocess.run(
             [
-                "curl", "--ipv4", "-s", "-S", "--max-time", "20", "--connect-timeout", "10",
+                "curl", "--ipv4", "-s", "-S", "--retry", "4", "--retry-delay", "2", "--retry-all-errors", "--max-time", "20", "--connect-timeout", "10",
                 "-d", f"chat_id={chat_id}",
                 "--data-urlencode", f"text={text}",
                 f"https://api.telegram.org/bot{TELEGRAM_BOT_TOKEN}/sendMessage",
             ],
-            capture_output=True, text=True, timeout=25,
+            capture_output=True, text=True, timeout=90,
         )
         ok = '"ok":true' in result.stdout
         if not ok:
@@ -2143,13 +2147,13 @@ def _raw_send_photo(chat_id: int, img_bytes: bytes, caption: str = ""):
             tmp = f.name
         result = subprocess.run(
             [
-                "curl", "--ipv4", "-s", "-S", "--max-time", "60", "--connect-timeout", "10",
+                "curl", "--ipv4", "-s", "-S", "--retry", "4", "--retry-delay", "2", "--retry-all-errors", "--max-time", "60", "--connect-timeout", "10",
                 "-F", f"chat_id={chat_id}",
                 "-F", f"caption={caption}",
                 "-F", f"photo=@{tmp};type=image/jpeg",
                 f"https://api.telegram.org/bot{TELEGRAM_BOT_TOKEN}/sendPhoto",
             ],
-            capture_output=True, text=True, timeout=70,
+            capture_output=True, text=True, timeout=140,
         )
         ok = '"ok":true' in result.stdout
         if not ok:
@@ -2215,13 +2219,13 @@ def _archive_photo(img_bytes: bytes, caption: str = ""):
             tmp = f.name
         result = subprocess.run(
             [
-                "curl", "--ipv4", "-s", "-S", "--max-time", "30", "--connect-timeout", "10",
+                "curl", "--ipv4", "-s", "-S", "--retry", "4", "--retry-delay", "2", "--retry-all-errors", "--max-time", "30", "--connect-timeout", "10",
                 "-F", f"chat_id={ARCHIVE_CHANNEL_ID}",
                 "-F", f"caption={caption[:1024]}",
                 "-F", f"photo=@{tmp};type=image/jpeg",
                 f"https://api.telegram.org/bot{TELEGRAM_BOT_TOKEN}/sendPhoto",
             ],
-            capture_output=True, text=True, timeout=40,
+            capture_output=True, text=True, timeout=100,
         )
         if '"ok":true' not in result.stdout:
             logger.warning(f"Archive photo failed: {result.stdout[:120]}")
@@ -3093,7 +3097,7 @@ class CurlCffiRequest(BaseRequest):
                 body_path = bf.name
             tmp_files.append(body_path)
             try:
-                cmd = ["curl", "--ipv4", "-s", "-S", "--max-time", str(mt),
+                cmd = ["curl", "--ipv4", "-s", "-S", "--retry", "4", "--retry-delay", "2", "--retry-all-errors", "--max-time", str(mt),
                        "--connect-timeout", "10", "-o", body_path,
                        "-w", "%{http_code}", "-X", method]
                 if request_data is not None:
@@ -3119,7 +3123,7 @@ class CurlCffiRequest(BaseRequest):
                         for k, v in params.items():
                             cmd += ["--data-urlencode", f"{k}={v}"]
                 cmd.append(url)
-                r = subprocess.run(cmd, capture_output=True, text=True, timeout=mt + 10)
+                r = subprocess.run(cmd, capture_output=True, text=True, timeout=mt * 4 + 20)
                 code = int((r.stdout or "0").strip() or "0")
                 with open(body_path, "rb") as fh:
                     body = fh.read()