Update app.py

app.py

@@ -9,23 +9,23 @@ from aiohttp import web, ClientTimeout, TCPConnector
 from urllib.parse import parse_qs
 from cachetools import TTLCache
 
-# 创建一个TTL缓存，最多存储1000个项目，每个项目的有效期为30分钟
-cache = TTLCache(maxsize=1000, ttl=1800)  # 1800秒 = 30分钟
+cache = TTLCache(maxsize=1000, 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):
-    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'
-    }
+    headers = {"User-Agent": CHROME_USER_AGENT}
     for attempt in range(max_retries):
         try:
-            async with session.get(url, headers=headers, timeout=ClientTimeout(total=120)) as response:
+            async with session.get(url, headers=headers, timeout=ClientTimeout(total=40)) as response:
                 response.raise_for_status()
-                return await response.text()
+                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)
             if attempt == max_retries - 1:
                 raise
-            await asyncio.sleep(1)  # 在重试之前等待1秒
+            await asyncio.sleep(1)
 
 async def extract_and_transform_proxies(input_text):
     try:
@@ -50,80 +50,37 @@ async def extract_and_transform_proxies(input_text):
     transformed_proxies = []
 
     for proxy in proxies_list:
-        if proxy.get('type') == 'ss':
+        if proxy.get('type') in ['ss', 'trojan']:
             name = proxy.get('name', '').strip()
             server = proxy.get('server', '').strip()
             port = str(proxy.get('port', '')).strip()
             
-            ss_parts = [f"{name} = ss, {server}, {port}"]
-            
-            if 'cipher' in proxy:
-                ss_parts.append(f"encrypt-method={proxy['cipher'].strip()}")
-            if 'password' in proxy:
-                ss_parts.append(f"password={proxy['password'].strip()}")
-            if 'udp' in proxy:
-                ss_parts.append(f"udp-relay={'true' if proxy['udp'] in [True, 'true', 'True'] else 'false'}")
-
-            transformed = ", ".join(ss_parts)
-            transformed_proxies.append(transformed)
-
-        elif proxy.get('type') == 'trojan':
-            name = proxy.get('name', '').strip()
-            server = proxy.get('server', '').strip()
-            port = str(proxy.get('port', '')).strip()
+            parts = [f"{name} = {proxy['type']}, {server}, {port}"]
             
-            trojan_parts = [f"{name} = trojan, {server}, {port}"]
+            if proxy['type'] == 'ss':
+                if 'cipher' in proxy:
+                    parts.append(f"encrypt-method={proxy['cipher'].strip()}")
+            elif proxy['type'] == 'trojan':
+                if 'password' in proxy:
+                    parts.append(f"password={proxy['password'].strip()}")
+                if 'sni' in proxy:
+                    parts.append(f"sni={proxy['sni'].strip()}")
+                if 'skip-cert-verify' in proxy:
+                    parts.append(f"skip-cert-verify={str(proxy['skip-cert-verify']).lower()}")
             
-            if 'password' in proxy:
-                trojan_parts.append(f"password={proxy['password'].strip()}")
-            if 'sni' in proxy:
-                trojan_parts.append(f"sni={proxy['sni'].strip()}")
-            if 'skip-cert-verify' in proxy:
-                trojan_parts.append(f"skip-cert-verify={str(proxy['skip-cert-verify']).lower()}")
             if 'udp' in proxy:
-                trojan_parts.append(f"udp={'true' if proxy['udp'] in [True, 'true', 'True'] else 'false'}")
+                parts.append(f"udp-relay={'true' if proxy['udp'] in [True, 'true', 'True'] else 'false'}")
 
-            transformed = ", ".join(trojan_parts)
-            transformed_proxies.append(transformed)
+            transformed_proxies.append(", ".join(parts))
 
     return "\n".join(transformed_proxies) if transformed_proxies else "未找到有效的SS或Trojan代理配置"
 
-async def log_request(request, response):
-    timestamp = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-    client_ip = request.remote
-    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
-
-    log_message = f"{timestamp} - {client_ip} - \"{request_line}\" {status_code} {content_length}"
-    print(log_message, flush=True)
-
-@web.middleware
-async def logging_middleware(request, handler):
-    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]
             
-            # 检查缓存
             if url in cache:
                 print(f"Cache hit for URL: {url}", flush=True)
                 return web.Response(text=cache[url], content_type='text/plain')
@@ -136,7 +93,6 @@ async def handle_request(request):
                 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')
@@ -159,11 +115,27 @@ async def handle_request(request):
         return web.Response(text="Not Found", status=404)
 
 async def init_app():
-    app = web.Application(middlewares=[logging_middleware])
+    app = web.Application(middlewares=[web.middleware(lambda _, handler: logging_middleware(handler))])
     app.router.add_get('/', handle_request)
     return app
 
+async def logging_middleware(handler, request):
+    start_time = datetime.datetime.now()
+    try:
+        response = await handler(request)
+        end_time = datetime.datetime.now()
+        print(f"{end_time.strftime('%Y-%m-%d %H:%M:%S')} - {request.remote} - \"{request.method} {request.path}\" {response.status} {response.content_length}", flush=True)
+        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)
+
 if __name__ == "__main__":
     print(f"===== Application Startup at {datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')} =====")
     print("Server running on port 8080")
-    web.run_app(init_app(), port=8080, print=lambda _: None)  # Disable default startup message
+    web.run_app(init_app(), port=8080, print=lambda _: None)