Update bot/core/speedtest.py

bot/core/speedtest.py

@@ -21,6 +21,7 @@ def bytes_per_sec_to_mb_s(bps: float) -> float:
 def disk_total_free(path: str = "/") -> dict:
     st = os.statvfs(path)
     total = st.f_frsize * st.f_blocks
+    free = st.f_frsize * st.f_frsize * (st.f_bavail // st.f_frsize) if st.f_frsize else st.f_frsize * st.f_bavail
     free = st.f_frsize * st.f_bavail
     return {"total": int(total), "free": int(free)}
 
@@ -45,22 +46,35 @@ 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 = 4.0) -> Optional[str]:
+async def public_ip(timeout: float = 6.0) -> Optional[str]:
     """
-    Gets public IP using Cloudflare trace.
-    Returns string IP or None.
+    Best-effort public IP.
+    Tries ipify, then 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:
-                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
+            r = await c.get("https://api.ipify.org?format=json")
+            if r.status_code < 400:
+                j = r.json()
+                ip = str(j.get("ip") or "").strip()
+                if ip:
+                    return ip
     except Exception:
-        return None
+        pass
+
+    try:
+        async with httpx.AsyncClient(timeout=timeout, follow_redirects=True) as c:
+            r = await c.get("https://cloudflare.com/cdn-cgi/trace")
+            if r.status_code < 400:
+                txt = r.text or ""
+                for ln in txt.splitlines():
+                    if ln.startswith("ip="):
+                        ip = ln.split("=", 1)[1].strip()
+                        if ip:
+                            return ip
+    except Exception:
+        pass
+
     return None