Update app.py

app.py

@@ -8,24 +8,23 @@ import traceback
 from aiohttp import web
 from urllib.parse import parse_qs
 from cachetools import TTLCache
+from functools import partial
 
-# 创建一个TTL缓存，最多存储1000个项目，每个项目的有效期为30分钟
+# 创建一个TTL缓存，最多存储1000个项目，每个项目的有效期为1小时
 cache = TTLCache(maxsize=1000, ttl=1800)
 
 async def fetch_url(url, session):
     async with session.get(url) as response:
         return await response.text()
 
-def extract_and_transform_proxies(input_text):
+async def extract_and_transform_proxies(input_text):
     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)
             if proxies_match:
                 proxies_text = proxies_match.group(1)
@@ -79,11 +78,12 @@ def extract_and_transform_proxies(input_text):
 
     return "\n".join(transformed_proxies) if transformed_proxies else "未找到有效的SS或Trojan代理配置"
 
-
 async def log_request(request, response, cache_status):
     timestamp = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
     client_ip = request.remote
-    request_line = f"{request.method} {request.path_qs}"
+    request_line = f"{request.method} {request.path}"
+    if request.query_string:
+        request_line += f"?{request.query_string}"
     status_code = response.status
     content_length = response.content_length
     user_agent = request.headers.get('User-Agent', 'Unknown')
@@ -94,36 +94,51 @@ async def log_request(request, response, cache_status):
     )
     print(log_message, flush=True)
 
+
 @web.middleware
 async def logging_middleware(request, handler):
-    response, cache_status = await handler(request)
-    await log_request(request, response, cache_status)
-    return response
+    start_time = datetime.datetime.now()
+    try:
+        response = await handler(request)
+        await log_request(request, response)
+        end_time = datetime.datetime.now()
+        print(f"Request processing time: {end_time - start_time}", flush=True)
+        return response
+    except Exception as e:
+        end_time = datetime.datetime.now()
+        print(f"Error occurred: {str(e)}", flush=True)
+        print(f"Request processing time: {end_time - start_time}", flush=True)
+        print("Traceback:", flush=True)
+        traceback.print_exc()
+        return web.Response(text=f"Internal Server Error: {str(e)}", status=500)
 
 async def handle_request(request):
     if request.path == '/':
         query_params = parse_qs(request.query_string)
         if 'url' in query_params:
             url = query_params['url'][0]
-            force_refresh = 'nocache' in query_params
             
-            cache_status = "Miss"
+            # 检查缓存
+            if url in cache:
+                print(f"Cache hit for URL: {url}", flush=True)
+                return web.Response(text=cache[url], content_type='text/plain')
+            
             try:
-                if not force_refresh and url in cache:
-                    result = cache[url]
-                    cache_status = "Hit"
-                else:
-                    async with aiohttp.ClientSession() as session:
-                        input_text = await fetch_url(url, session)
-                    result = await extract_and_transform_proxies(input_text)
-                    
-                    # 只有在不是强制刷新的情况下才存入缓存
-                    if not force_refresh:
-                        cache[url] = result
+                print(f"Fetching URL: {url}", flush=True)
+                async with aiohttp.ClientSession() as session:
+                    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)
+                
+                # 将结果存入缓存
+                cache[url] = result
                 
-                return web.Response(text=result, content_type='text/plain'), cache_status
+                return web.Response(text=result, content_type='text/plain')
             except Exception as e:
-                return web.Response(text=f"Error: {str(e)}", status=500), "Error"
+                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>
@@ -131,13 +146,12 @@ async def handle_request(request):
             <h1>代理配置转换工具</h1>
             <p>使用方法：在URL参数中提供包含代理配置的网址。</p>
             <p>示例：<code>http://localhost:8080/?url=https://example.com/path-to-proxy-config</code></p>
-            <p>强制刷新缓存：<code>http://localhost:8080/?url=https://example.com/path-to-proxy-config&nocache</code></p>
             </body>
             </html>
             """
-            return web.Response(text=usage_guide, content_type='text/html'), "Guide"
+            return web.Response(text=usage_guide, content_type='text/html')
     else:
-        return web.Response(text="Not Found", status=404), "NotFound"
+        return web.Response(text="Not Found", status=404)
 
 async def init_app():
     app = web.Application(middlewares=[logging_middleware])