Update app.py

app.py

@@ -9,54 +9,44 @@ from aiohttp import web, ClientTimeout, TCPConnector
 from urllib.parse import parse_qs
 from cachetools import TTLCache
 
-# 创建一个TTL缓存，最多存储1000个项目，每个项目的有效期为1小时
-cache = TTLCache(maxsize=1000, ttl=3600)
+# 创建一个TTL缓存，最多存储1000个项目，每个项目的有效期为30分钟
+cache = TTLCache(maxsize=1000, ttl=1800)  # 1800秒 = 30分钟
 
-async def fetch_url(url, session, max_retries=3, timeout=180):
+async def fetch_url(url, session, max_retries=3):
+    headers = {
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36'
+    }
     for attempt in range(max_retries):
         try:
-            async with session.get(url, timeout=ClientTimeout(total=timeout)) as response:
+            async with session.get(url, headers=headers, timeout=ClientTimeout(total=120)) as response:
                 response.raise_for_status()
                 return await response.text()
-        except asyncio.TimeoutError:
-            print(f"Attempt {attempt + 1} timed out after {timeout} seconds", flush=True)
         except aiohttp.ClientError as e:
             print(f"Attempt {attempt + 1} failed: {str(e)}", flush=True)
-        
-        if attempt < max_retries - 1:
-            await asyncio.sleep(5)  # 在重试之前等待5秒
-    
-    raise Exception(f"Failed to fetch URL after {max_retries} attempts")
+            if attempt == max_retries - 1:
+                raise
+            await asyncio.sleep(1)  # 在重试之前等待1秒
 
 async def extract_and_transform_proxies(input_text):
-    print("Complete original input data:")
-    print(input_text)
-    print("------------------------")
-
     try:
-        # 尝试直接解析整个输入作为YAML
         data = yaml.safe_load(input_text)
         if isinstance(data, dict) and 'proxies' in data:
             proxies_list = data['proxies']
+        elif isinstance(data, list):
+            proxies_list = data
         else:
-            # 如果不是预期的格式，尝试提取proxies部分
-            proxies_match = re.search(r'proxies:\s*\n((?:[-\s]*{.*\n?)*)', input_text, re.MULTILINE | re.DOTALL)
+            proxies_match = re.search(r'proxies:\s*\n((?:[-\s]*{.*\n?)*)', input_text, re.MULTILINE)
             if proxies_match:
                 proxies_text = proxies_match.group(1)
                 proxies_list = yaml.safe_load(proxies_text)
             else:
                 return "未找到有效的代理配置"
-    except yaml.YAMLError as e:
-        return f"YAML解析错误: {str(e)}"
+    except yaml.YAMLError:
+        return "YAML解析错误"
 
     if not proxies_list:
         return "未找到有效的代理配置"
 
-    print(f"Found {len(proxies_list)} possible proxy configurations")
-    print("Sample of parsed proxies list:")
-    print(proxies_list[:5])  # 只打印前5个代理配置
-    print("------------------------")
-
     transformed_proxies = []
 
     for proxy in proxies_list:
@@ -141,22 +131,19 @@ async def handle_request(request):
             try:
                 print(f"Fetching URL: {url}", flush=True)
                 async with aiohttp.ClientSession(connector=TCPConnector(ssl=False)) as session:
-                    input_text = await fetch_url(url, session, max_retries=3, timeout=180)
+                    input_text = await fetch_url(url, session)
                 print(f"URL content length: {len(input_text)}", flush=True)
                 result = await extract_and_transform_proxies(input_text)
                 print(f"Transformed result length: {len(result)}", flush=True)
-                print("First 1000 characters of transformed result:")
-                print(result[:1000])
-                print("------------------------")
                 
                 # 将结果存入缓存
                 cache[url] = result
                 
                 return web.Response(text=result, content_type='text/plain')
             except Exception as e:
-                error_message = f"Error processing request: {str(e)}\n{traceback.format_exc()}"
-                print(error_message, flush=True)
-                return web.Response(text=error_message, status=500)
+                print(f"Error processing request: {str(e)}", flush=True)
+                traceback.print_exc()
+                return web.Response(text=f"Error: {str(e)}", status=500)
         else:
             usage_guide = """
             <html>