Update app.py

app.py

@@ -7,9 +7,26 @@ import sys
 import traceback
 from aiohttp import web, ClientTimeout, TCPConnector
 from urllib.parse import parse_qs
-from cachetools import TTLCache
+from collections import namedtuple
 
-cache = TTLCache(maxsize=1000, ttl=1800)  # 30 minutes cache
+CacheEntry = namedtuple('CacheEntry', ['data', 'timestamp'])
+
+class CustomCache:
+    def __init__(self, ttl=1800):
+        self.cache = {}
+        self.ttl = ttl
+
+    def get(self, key):
+        if key in self.cache:
+            entry = self.cache[key]
+            if (datetime.datetime.now() - entry.timestamp).total_seconds() < self.ttl:
+                return entry
+        return None
+
+    def set(self, key, value):
+        self.cache[key] = CacheEntry(value, datetime.datetime.now())
+
+cache = CustomCache(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"
 
@@ -78,20 +95,17 @@ async def extract_and_transform_proxies(input_text):
     return "\n".join(transformed_proxies)
 
 def get_client_ip(request):
-    """获取客户端真实IP地址"""
     headers_to_check = [
         'X-Forwarded-For',
         'X-Real-IP',
-        'CF-Connecting-IP',  # Cloudflare
-        'True-Client-IP',    # Akamai and Cloudflare
+        'CF-Connecting-IP',
+        'True-Client-IP',
         'X-Client-IP',
     ]
     for header in headers_to_check:
         ip = request.headers.get(header)
         if ip:
-            # X-Forwarded-For可能包含多个IP，我们取第一个
             return ip.split(',')[0].strip()
-    # 如果没有找到，返回远程地址
     return request.remote
 
 async def handle_request(request):
@@ -99,24 +113,41 @@ async def handle_request(request):
         query_params = parse_qs(request.query_string)
         if 'url' in query_params:
             url = query_params['url'][0]
+            cache_entry = cache.get(url)
             cache_hit = False
-            
-            if url in cache:
-                result = cache[url]
+            new_data = False
+
+            if cache_entry:
+                result = cache_entry.data
                 cache_hit = True
-            else:
+                cache_time = cache_entry.timestamp
+            
+            if not cache_hit or (datetime.datetime.now() - cache_entry.timestamp).total_seconds() >= 1800:
                 try:
                     async with aiohttp.ClientSession(connector=TCPConnector(ssl=False)) as session:
                         input_text = await fetch_url(url, session)
-                    result = await extract_and_transform_proxies(input_text)
-                    cache[url] = result
+                    new_result = await extract_and_transform_proxies(input_text)
+                    if new_result != "未找到有效的代理配置" and new_result != "YAML解析错误":
+                        result = new_result
+                        cache.set(url, result)
+                        new_data = True
+                        cache_time = datetime.datetime.now()
+                    elif not cache_hit:
+                        result = new_result
+                        cache_time = datetime.datetime.now()
                 except Exception as e:
-                    print(f"Error processing request: {str(e)}", flush=True)
-                    traceback.print_exc()
-                    return web.Response(text=f"Error: {str(e)}", status=500)
+                    if not cache_hit:
+                        print(f"Error processing request: {str(e)}", flush=True)
+                        traceback.print_exc()
+                        return web.Response(text=f"Error: {str(e)}", status=500)
             
             proxy_count = result.count('\n') + 1 if result and result != "未找到有效的代理配置" else 0
-            return web.Response(text=result, content_type='text/plain', headers={'X-Proxy-Count': str(proxy_count), 'X-Cache-Hit': str(cache_hit)})
+            return web.Response(text=result, content_type='text/plain', headers={
+                'X-Proxy-Count': str(proxy_count),
+                'X-Cache-Hit': str(cache_hit),
+                'X-Cache-Time': cache_time.strftime('%Y-%m-%d %H:%M:%S'),
+                'X-New-Data': str(new_data)
+            })
         else:
             usage_guide = """
             <html>
@@ -144,8 +175,10 @@ async def logging_middleware(request, handler):
         status_code = response.status
         proxy_count = response.headers.get('X-Proxy-Count', '0')
         cache_hit = "Hit" if response.headers.get('X-Cache-Hit') == 'True' else "Miss"
+        cache_time = response.headers.get('X-Cache-Time', '-')
+        new_data = "Yes" if response.headers.get('X-New-Data') == 'True' else "No"
         
-        log_message = f"{timestamp} - {client_ip} - \"{request.method} /?url={target_url}\" - {status_code} Proxies: {proxy_count} - Cache: {cache_hit}"
+        log_message = f"{timestamp} - {client_ip} - \"GET /?url={target_url}\" - Status: {status_code} - Proxies: {proxy_count} - Cache: {cache_hit} - CacheTime: {cache_time} - NewData: {new_data}"
         print(log_message, flush=True)
         
         return response