Update bot/core/speedtest.py

bot/core/speedtest.py

@@ -45,35 +45,22 @@ async def ping_ms(host: str = "1.1.1.1", port: int = 443, timeout: float = 3.0)
         return None
 
 
-async def public_ip(timeout: float = 5.0) -> Optional[str]:
+async def public_ip(timeout: float = 4.0) -> Optional[str]:
     """
-    Best-effort public IP detect.
-    Tries ipify, then Cloudflare trace.
+    Gets public IP using Cloudflare trace.
+    Returns string IP or None.
     """
-    try:
-        async with httpx.AsyncClient(timeout=timeout, follow_redirects=True) as c:
-            r = await c.get("https://api.ipify.org", params={"format": "json"})
-            if r.status_code < 400:
-                j = r.json()
-                ip = str(j.get("ip") or "").strip()
-                if ip:
-                    return ip
-    except Exception:
-        pass
-
-    # fallback: Cloudflare trace
     try:
         async with httpx.AsyncClient(timeout=timeout, follow_redirects=True) as c:
             r = await c.get("https://1.1.1.1/cdn-cgi/trace")
-            if r.status_code < 400:
-                # lines like: ip=1.2.3.4
-                for line in (r.text or "").splitlines():
-                    if line.startswith("ip="):
-                        ip = line.split("=", 1)[1].strip()
-                        return ip or None
+            if r.status_code >= 400:
+                return None
+            # trace format: key=value lines
+            for line in (r.text or "").splitlines():
+                if line.startswith("ip="):
+                    return line.split("=", 1)[1].strip() or None
     except Exception:
-        pass
-
+        return None
     return None