Update app.py

app.py

@@ -5,8 +5,7 @@ import asyncio
 import datetime
 import sys
 import traceback
-from aiohttp import web, ClientTimeout, TCPConnector
-from urllib.parse import parse_qs
+from aiohttp import web, ClientTimeout, TCPConnector, ClientError, ServerTimeoutError, TooManyRedirects
 from collections import namedtuple
 
 CacheEntry = namedtuple('CacheEntry', ['data', 'timestamp'])
@@ -30,19 +29,21 @@ cache = CustomCache(ttl=1800)  # 30 minutes cache
 
 CHROME_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36"
 
-async def fetch_url(url, session, max_retries=3):
+async def fetch_url(url, session, max_retries=5):
     headers = {"User-Agent": CHROME_USER_AGENT}
     for attempt in range(max_retries):
         try:
-            async with session.get(url, headers=headers, timeout=ClientTimeout(total=40)) as response:
+            timeout = ClientTimeout(total=40 * (attempt + 1))  # 递增的超时时间
+            async with session.get(url, headers=headers, timeout=timeout) as response:
                 response.raise_for_status()
                 content = await response.read()
                 return content.decode('utf-8', errors='ignore')
-        except aiohttp.ClientError as e:
-            print(f"Attempt {attempt + 1} failed: {str(e)}", flush=True)
+        except (ClientError, asyncio.TimeoutError, ServerTimeoutError, TooManyRedirects) as e:
+            wait_time = 2 ** attempt  # 指数退避
+            print(f"Attempt {attempt + 1} failed: {str(e)}. Retrying in {wait_time} seconds...", flush=True)
             if attempt == max_retries - 1:
                 raise
-            await asyncio.sleep(1)
+            await asyncio.sleep(wait_time)
 
 async def extract_and_transform_proxies(input_text):
     try:
@@ -110,13 +111,11 @@ def get_client_ip(request):
 
 async def handle_request(request):
     if request.path == '/':
-        # 使用 request.query 替代 parse_qs
         if 'url' in request.query:
             url = request.query['url']
             no_cache = 'nocache' in request.query
             cache_entry = None if no_cache else cache.get(url)
             cache_hit = False
-            new_data = False
 
             if cache_entry and not no_cache:
                 result = cache_entry.data
@@ -131,23 +130,27 @@ async def handle_request(request):
                     if new_result != "未找到有效的代理配置" and new_result != "YAML解析错误":
                         result = new_result
                         cache.set(url, result)
-                        new_data = True
                         cache_time = datetime.datetime.now()
                     elif not cache_hit:
                         result = new_result
                         cache_time = datetime.datetime.now()
                 except Exception as e:
-                    if not cache_hit:
-                        print(f"Error processing request: {str(e)}", flush=True)
-                        traceback.print_exc()
-                        return web.Response(text=f"Error: {str(e)}", status=500)
+                    error_message = f"Error processing request: {str(e)}"
+                    print(error_message, flush=True)
+                    traceback.print_exc()
+                    if cache_entry:
+                        print("Using cached data due to error", flush=True)
+                        result = cache_entry.data
+                        cache_time = cache_entry.timestamp
+                        cache_hit = True
+                    else:
+                        return web.Response(text=error_message, status=500)
             
             proxy_count = result.count('\n') + 1 if result and result != "未找到有效的代理配置" else 0
             return web.Response(text=result, content_type='text/plain', headers={
                 'X-Proxy-Count': str(proxy_count),
                 'X-Cache-Hit': str(cache_hit),
                 'X-Cache-Time': cache_time.strftime('%Y-%m-%d %H:%M:%S'),
-                'X-New-Data': str(new_data),
                 'X-No-Cache': str(no_cache)
             })
         else:
@@ -180,9 +183,8 @@ async def logging_middleware(request, handler):
         proxy_count = response.headers.get('X-Proxy-Count', '0')
         cache_hit = "Hit" if response.headers.get('X-Cache-Hit') == 'True' else "Miss"
         cache_time = response.headers.get('X-Cache-Time', '-')
-        new_data = "Yes" if response.headers.get('X-New-Data') == 'True' else "No"
         
-        log_message = f"{timestamp} - {client_ip} - \"GET /?url={target_url}{'&nocache' if no_cache else ''}\" - Status: {status_code} - Proxies: {proxy_count} - Cache: {cache_hit} - CacheTime: {cache_time} - NewData: {new_data} - NoCache: {'Yes' if no_cache else 'No'}"
+        log_message = f"{timestamp} - {client_ip} - \"GET /?url={target_url}{'&nocache' if no_cache else ''}\" - Status: {status_code} - Proxies: {proxy_count} - Cache: {cache_hit} - CacheTime: {cache_time} - NoCache: {'Yes' if no_cache else 'No'}"
         print(log_message, flush=True)
         
         return response