Update app.py

app.py

@@ -7,106 +7,65 @@ import sys
 import traceback
 from aiohttp import web
 from urllib.parse import parse_qs
+from cachetools import TTLCache
+from functools import partial
+
+# 创建一个TTL缓存，最多存储1000个项目，每个项目的有效期为30分钟
+cache = TTLCache(maxsize=1000, ttl=1800)
 
 async def fetch_url(url, session):
     async with session.get(url) as response:
         return await response.text()
 
 async def extract_and_transform_proxies(input_text):
-    try:
-        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_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:
-        return "YAML解析错误"
-
-    if not proxies_list:
-        return "未找到有效的代理配置"
-
-    transformed_proxies = []
-
-    for proxy in proxies_list:
-        if proxy.get('type') == 'ss':
-            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'}")
+    # 使用正则表达式提取代理信息
+    pattern = r'([a-zA-Z0-9+/=]+)(?:@|:\/\/)([^:]+):(\d+)'
+    matches = re.findall(pattern, input_text)
 
-            transformed = ", ".join(ss_parts)
-            transformed_proxies.append(transformed)
+    proxies = []
+    for match in matches:
+        encoded_info, server, port = match
+        try:
+            decoded_info = base64.b64decode(encoded_info).decode('utf-8')
+            method, password = decoded_info.split(':')
+            proxy = {
+                'name': f'{server}:{port}',
+                'type': 'ss',
+                'server': server,
+                'port': int(port),
+                'cipher': method,
+                'password': password
+            }
+            proxies.append(proxy)
+        except:
+            continue
 
-        elif proxy.get('type') == 'trojan':
-            name = proxy.get('name', '').strip()
-            server = proxy.get('server', '').strip()
-            port = str(proxy.get('port', '')).strip()
-            
-            trojan_parts = [f"{name} = trojan, {server}, {port}"]
-            
-            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'}")
-
-            transformed = ", ".join(trojan_parts)
-            transformed_proxies.append(transformed)
-
-    return "\n".join(transformed_proxies) if transformed_proxies else "未找到有效的SS或Trojan代理配置"
+    # 转换为YAML格式
+    yaml_data = yaml.dump({'proxies': proxies}, allow_unicode=True)
+    return yaml_data
 
 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)
+    print(f"{datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')} - "
+          f"Request: {request.method} {request.path} - "
+          f"Response: {response.status}", 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)
+    response = await handler(request)
+    await log_request(request, response)
+    return response
 
 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
+            
+            if not force_refresh and url in cache:
+                print(f"Cache hit for URL: {url}", flush=True)
+                return web.Response(text=cache[url], content_type='text/plain')
+            
             try:
                 print(f"Fetching URL: {url}", flush=True)
                 async with aiohttp.ClientSession() as session:
@@ -114,6 +73,10 @@ 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)
+                
+                # 将结果存入缓存
+                cache[url] = result
+                
                 return web.Response(text=result, content_type='text/plain')
             except Exception as e:
                 print(f"Error processing request: {str(e)}", flush=True)
@@ -126,6 +89,7 @@ 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>
             """