Update app.py

app.py

@@ -39,35 +39,98 @@ if not NOTDIAMOND_DOMAIN:
     logger.error("NOTDIAMOND_DOMAIN environment variable is not set!")
     raise ValueError("NOTDIAMOND_DOMAIN must be set")
 
-# 动态IP缓存，设置1小时过期
-ip_cache = TTLCache(maxsize=1, ttl=3600)
+# IP缓存配置
+IP_CACHE_TTL = 3600  # IP缓存1小时过期
+MAX_IP_RETRIES = 3   # 最大重试次数
+RETRY_DELAY = 5      # 重试延迟（秒）
+
+# 动态IP缓存
+ip_cache = TTLCache(maxsize=1, ttl=IP_CACHE_TTL)
 ip_refresh_lock = threading.Lock()
 
-def get_current_ip():
-    """动态获取当前域名对应的IP地址"""
+def resolve_domain_ip(domain: str, retry_count: int = 0) -> str:
+    """
+    解析域名对应的IP地址，带重试机制
+    
+    Args:
+        domain: 要解析的域名
+        retry_count: 当前重试次数
+        
+    Returns:
+        str: 解析得到的IP地址
+        
+    Raises:
+        Exception: 当所有重试都失败时抛出异常
+    """
+    try:
+        logger.info(f"Attempting to resolve IP for domain: {domain} (attempt {retry_count + 1})")
+        ip = socket.gethostbyname(domain)
+        logger.info(f"Successfully resolved IP: {ip} for domain: {domain}")
+        return ip
+    except socket.gaierror as e:
+        if retry_count < MAX_IP_RETRIES - 1:
+            logger.warning(f"DNS resolution failed for {domain} (attempt {retry_count + 1}): {e}")
+            time.sleep(RETRY_DELAY)
+            return resolve_domain_ip(domain, retry_count + 1)
+        else:
+            logger.error(f"DNS resolution failed after {MAX_IP_RETRIES} attempts for {domain}: {e}")
+            raise Exception(f"Failed to resolve IP for {domain} after {MAX_IP_RETRIES} attempts")
+
+def get_current_ip() -> str:
+    """
+    获取当前域名对应的IP地址，使用缓存机制
+    
+    Returns:
+        str: 当前域名对应的IP地址
+        
+    Raises:
+        Exception: 当IP解析失败时抛出异常
+    """
     try:
         with ip_refresh_lock:
             if 'current_ip' not in ip_cache:
-                logger.info(f"Resolving IP for domain: {NOTDIAMOND_DOMAIN}")
-                ip = socket.gethostbyname(NOTDIAMOND_DOMAIN)
+                logger.info(f"IP cache miss for domain: {NOTDIAMOND_DOMAIN}")
+                ip = resolve_domain_ip(NOTDIAMOND_DOMAIN)
                 ip_cache['current_ip'] = ip
-                logger.info(f"Successfully resolved IP: {ip}")
+                logger.info(f"Updated IP cache with: {ip}")
             return ip_cache['current_ip']
-    except socket.gaierror as e:
-        logger.error(f"DNS resolution failed for {NOTDIAMOND_DOMAIN}: {e}")
-        raise Exception(f"Failed to resolve IP for {NOTDIAMOND_DOMAIN}")
+    except Exception as e:
+        logger.error(f"Failed to get current IP: {e}")
+        raise
 
-refresh_token_cache = TTLCache(maxsize=1000, ttl=3600)
-headers_cache = TTLCache(maxsize=1, ttl=3600)  # 1小时过期
-token_refresh_lock = threading.Lock()
+def refresh_ip_cache() -> None:
+    """
+    强制刷新IP缓存
+    """
+    try:
+        with ip_refresh_lock:
+            ip_cache.clear()
+            logger.info("IP cache cleared for refresh")
+            _ = get_current_ip()  # 触发新的IP解析
+            logger.info("IP cache refreshed successfully")
+    except Exception as e:
+        logger.error(f"Error refreshing IP cache: {e}")
+        raise
 
 # 自定义连接函数
 def patched_create_connection(address, *args, **kwargs):
+    """
+    自定义连接函数，用于替换默认的连接函数
+    支持动态IP解析和自动重试
+    """
     host, port = address
     if host == NOTDIAMOND_DOMAIN:
-        current_ip = get_current_ip()
-        logger.info(f"Connecting to {NOTDIAMOND_DOMAIN} using IP: {current_ip}")
-        return create_connection((current_ip, port), *args, **kwargs)
+        try:
+            current_ip = get_current_ip()
+            logger.info(f"Using resolved IP: {current_ip} for connection to {NOTDIAMOND_DOMAIN}")
+            return create_connection((current_ip, port), *args, **kwargs)
+        except Exception as e:
+            logger.error(f"Connection failed using resolved IP: {e}")
+            # 如果连接失败，尝试刷新IP缓存并重试
+            refresh_ip_cache()
+            current_ip = get_current_ip()
+            logger.info(f"Retrying connection with fresh IP: {current_ip}")
+            return create_connection((current_ip, port), *args, **kwargs)
     return create_connection(address, *args, **kwargs)
 
 # 替换 urllib3 的默认连接函数