Upload 3 files

getNode.py

@@ -5,7 +5,7 @@ from server.decoder import decode_url_to_configs
 import random
 from fastapi import APIRouter,BackgroundTasks
 from server.utils import subscription_link_list,getRandomSubscribeUrl,delete_invalid_url_in_txt
-
+from func_timeout import func_set_timeout, FunctionTimedOut
 
 router = APIRouter()
 @router.get('/')
@@ -14,17 +14,26 @@ def getNode(background_tasks: BackgroundTasks)->str:
     SubscribeUrlList = subscription_link_list(router.fileName)
     # 直接用现成的认为可用然后直接返回，之后再删不可用的
     randomSubscribeUrl= getRandomSubscribeUrl(SubscribeUrlList)
-    NodeList = dump_configs(randomSubscribeUrl)
-    NodeStr = RandomNode(NodeList)
+    try:
+        NodeList = dump_configs(randomSubscribeUrl)
+        NodeStr = RandomNode(NodeList)
+        # background_tasks.add_task(delete_invalid_url_in_txt, router.fileName)
+        return NodeStr
+    except FunctionTimedOut:
+        print(f"解析订阅链接{randomSubscribeUrl} 时超时")
+        return ''
+    except Exception as e:
+        # 如果解析失败，打印错误信息并继续处理下一个订阅链接
+        print(f"解析订阅链接 {randomSubscribeUrl} 时发生错误: {e}")
+        return ''
+
 
-    #background_tasks.add_task(delete_invalid_url_in_txt, router.fileName)
-    return NodeStr
 
 def RandomNode(NodeList:list)->str:
     #返回一个节点信息
     return random.choice(NodeList)
 
-
+@func_set_timeout(5)  # 设置超时时间为5秒
 def dump_configs(url:str)->list:
     #返回全部节点信息的列表
     configs = decode_url_to_configs(url)

getServerList.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+from func_timeout import func_set_timeout, FunctionTimedOut
+
 from server.decoder import decode_url_to_configs
 import base64
 from fastapi import APIRouter,BackgroundTasks
@@ -20,6 +22,8 @@ def getServerList(background_tasks: BackgroundTasks)->str:
             NodeList = dump_configs(subscribe_url)
             # 如果解析成功，将解析出的节点列表添加到总列表中
             all_node_lists.extend(NodeList)
+        except FunctionTimedOut:
+            print(f"解析订阅链接{subscribe_url} 时超时")
         except Exception as e:
             # 如果解析失败，打印错误信息并继续处理下一个订阅链接
             print(f"解析订阅链接 {subscribe_url} 时发生错误: {e}")
@@ -38,6 +42,7 @@ def getServerList(background_tasks: BackgroundTasks)->str:
 
 
 
+@func_set_timeout(5)  # 设置超时时间为5秒
 def dump_configs(url:str)->list:
     #返回全部节点信息的列表
     configs = decode_url_to_configs(url)

requirements.txt

@@ -5,4 +5,5 @@ aiohttp==3.7.3
 fastapi==0.95.0
 urllib3==2.0.7
 uvicorn
+func_timeout
 #这个适用hf和windows