Github/GitHub520
1
0
Fork 0
mirror of synced 2026-04-30 23:08:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: do not select when all timeout

Browse Source
This commit is contained in:
MiyakoMeow
2025-03-03 06:11:15 +08:00
parent c8b7df7c4f
commit 7a0019f45f
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fetch_ips.py
View File

@@ -19,16 +19,18 @@ from retry import retry
from common import GITHUB_URLS, write_hosts_content from common import GITHUB_URLS, write_hosts_content
PING_LIST: Dict[str, int] = dict() PING_TIMEOUT_SEC: int = 1
DISCARD_LIST: List[str] = ["1.0.1.1", "1.2.1.1", "127.0.0.1"] DISCARD_LIST: List[str] = ["1.0.1.1", "1.2.1.1", "127.0.0.1"]
PING_LIST: Dict[str, int] = dict()
def ping_cached(ip: str) -> int: def ping_cached(ip: str) -> int:
global PING_LIST global PING_LIST
if ip in PING_LIST: if ip in PING_LIST:
return PING_LIST[ip] return PING_LIST[ip]
ping_timeout_sec = 1 ping_times = [ping(ip, timeout=PING_TIMEOUT_SEC).rtt_avg_ms for _ in range(3)]
ping_times = [ping(ip, timeout=ping_timeout_sec).rtt_avg_ms for _ in range(3)]
ping_times.sort() ping_times.sort()
print(f'Ping {ip}: {ping_times} ms') print(f'Ping {ip}: {ping_times} ms')
PING_LIST[ip] = ping_times[1] # 取中位数 PING_LIST[ip] = ping_times[1] # 取中位数
@@ -41,6 +43,10 @@ def select_ip_from_list(ip_list: List[str]) -> Optional[str]:
ping_results = [(ip, ping_cached(ip)) for ip in ip_list] ping_results = [(ip, ping_cached(ip)) for ip in ip_list]
ping_results.sort(key=lambda x: x[1]) ping_results.sort(key=lambda x: x[1])
best_ip = ping_results[0][0] best_ip = ping_results[0][0]
# 全都超时？那就不选了
if ping_results[0][1] == PING_TIMEOUT_SEC * 1000:
print(f"{ping_results}, no selection")
return None
print(f"{ping_results}, selected {best_ip}") print(f"{ping_results}, selected {best_ip}")
return best_ip return best_ip