Update app.py

app.py

@@ -13,28 +13,11 @@ from cachetools import TTLCache
 cache = TTLCache(maxsize=1000, ttl=3600)
 
 async def fetch_url(url, session, max_retries=3, timeout=180):
-    total_content = b""
     for attempt in range(max_retries):
         try:
             async with session.get(url, timeout=ClientTimeout(total=timeout)) as response:
                 response.raise_for_status()
-                while True:
-                    chunk = await response.content.read(8192)  # 每次读取8KB
-                    if not chunk:
-                        break
-                    total_content += chunk
-                
-                if response.content_length is not None and len(total_content) < response.content_length:
-                    print(f"Warning: Received content length ({len(total_content)}) is less than expected ({response.content_length})")
-                    if attempt == max_retries - 1:
-                        print("This was the last attempt. Returning partial content.")
-                        return total_content.decode('utf-8', errors='ignore')
-                    else:
-                        print("Retrying...")
-                        await asyncio.sleep(5)
-                        continue
-                
-                return total_content.decode('utf-8', errors='ignore')
+                return await response.text()
         except asyncio.TimeoutError:
             print(f"Attempt {attempt + 1} timed out after {timeout} seconds", flush=True)
         except aiohttp.ClientError as e:
@@ -55,8 +38,6 @@ async def extract_and_transform_proxies(input_text):
         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)
@@ -64,10 +45,7 @@ async def extract_and_transform_proxies(input_text):
                 proxies_text = proxies_match.group(1)
                 proxies_list = yaml.safe_load(proxies_text)
             else:
-                # 如果仍然找不到，尝试提取所有看起来像代理配置的部分
-                proxy_pattern = r'{[^}]+}'
-                possible_proxies = re.findall(proxy_pattern, input_text)
-                proxies_list = [yaml.safe_load(proxy) for proxy in possible_proxies]
+                return "未找到有效的代理配置"
     except yaml.YAMLError as e:
         return f"YAML解析错误: {str(e)}"
 
@@ -167,6 +145,9 @@ async def handle_request(request):
                 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