fix: 单独创建线程防止阻塞主线程

This commit is contained in:
HYY
2025-03-14 20:02:03 +08:00
parent 321dfe4f56
commit 58edb3877a
2 changed files with 38 additions and 31 deletions

View File

@@ -1,4 +1,5 @@
import asyncio import asyncio
from .remote import main from .remote import main
asyncio.run(main()) # 启动心跳线程
heartbeat_thread = main()

View File

@@ -4,13 +4,12 @@ import uuid
import platform import platform
import os import os
import json import json
import threading
from loguru import logger from loguru import logger
import asyncio
# UUID文件路径 # UUID文件路径
UUID_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "client_uuid.json") UUID_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "client_uuid.json")
# 生成或获取客户端唯一ID # 生成或获取客户端唯一ID
def get_unique_id(): def get_unique_id():
# 检查是否已经有保存的UUID # 检查是否已经有保存的UUID
@@ -37,7 +36,6 @@ def get_unique_id():
return client_id return client_id
# 生成客户端唯一ID # 生成客户端唯一ID
def generate_unique_id(): def generate_unique_id():
# 结合主机名、系统信息和随机UUID生成唯一ID # 结合主机名、系统信息和随机UUID生成唯一ID
@@ -45,7 +43,6 @@ def generate_unique_id():
unique_id = f"{system_info}-{uuid.uuid4()}" unique_id = f"{system_info}-{uuid.uuid4()}"
return unique_id return unique_id
def send_heartbeat(server_url, client_id): def send_heartbeat(server_url, client_id):
"""向服务器发送心跳""" """向服务器发送心跳"""
sys = platform.system() sys = platform.system()
@@ -66,31 +63,40 @@ def send_heartbeat(server_url, client_id):
logger.debug(f"发送心跳时出错: {e}") logger.debug(f"发送心跳时出错: {e}")
return False return False
class HeartbeatThread(threading.Thread):
async def main(): """心跳线程类"""
# 配置
SERVER_URL = "http://hyybuth.xyz:10058" # 更改为你的服务器地址 def __init__(self, server_url, interval):
HEARTBEAT_INTERVAL = 300 # 5分钟 super().__init__(daemon=True) # 设置为守护线程,主程序结束时自动结束
self.server_url = server_url
# 获取或生成客户端ID self.interval = interval
client_id = get_unique_id() self.client_id = get_unique_id()
logger.debug(f"客户端已启动ID: {client_id}") self.running = True
# 主心跳循环 def run(self):
try: """线程运行函数"""
while True: logger.debug(f"心跳线程已启动客户端ID: {self.client_id}")
if send_heartbeat(SERVER_URL, client_id):
print(f"{HEARTBEAT_INTERVAL}秒后发送下一次心跳...") while self.running:
if send_heartbeat(self.server_url, self.client_id):
logger.info(f"{self.interval}秒后发送下一次心跳...")
else: else:
print(f"{HEARTBEAT_INTERVAL}秒后重试...") logger.info(f"{self.interval}秒后重试...")
time.sleep(self.interval) # 使用同步的睡眠
def stop(self):
"""停止线程"""
self.running = False
await asyncio.sleep(HEARTBEAT_INTERVAL) def main():
"""主函数,启动心跳线程"""
except KeyboardInterrupt: # 配置
print("用户已停止客户端") SERVER_URL = "http://hyybuth.xyz:10058"
except Exception as e: HEARTBEAT_INTERVAL = 300 # 5分钟
print(f"发生意外错误: {e}")
# 创建并启动心跳线程
heartbeat_thread = HeartbeatThread(SERVER_URL, HEARTBEAT_INTERVAL)
if __name__ == "__main__": heartbeat_thread.start()
asyncio.run(main())
return heartbeat_thread # 返回线程对象,便于外部控制