Merge pull request 'test: temp test' (#21) from sangge/mimajingsai:main into main

Reviewed-on: dqy/mimajingsai#21

src/node.py

@@ -9,17 +9,15 @@ from tpre import *
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
-    # Load the ML model
     init()
     yield
-    # Clean up the ML models and release the resources
     clear()
 
 
 app = FastAPI(lifespan=lifespan)
-server_address = "http://中心服务器IP地址/server"
+server_address = "http://10.20.14.232:8000/server"
 id = 0
-ip = ""
+ip = "10.16.21.163"
 client_ip_src = ""  # 发送信息用户的ip
 client_ip_des = ""  # 接收信息用户的ip
 processed_message = ()  # 重加密后的数据
@@ -31,8 +29,8 @@ processed_message = ()  # 重加密后的数据
 
 # 向中心服务器发送自己的IP地址,并获取自己的id
 def send_ip():
-    url = server_address + "/get_node?ip = " + ip
-    # ip = get_local_ip # type: ignore
+    url = server_address + "/get_node?ip=" + ip
+    # ip = get_local_ip() # type: ignore
     global id
     id = requests.get(url)
 
@@ -51,10 +49,11 @@ def get_local_ip():
 
 
 def init():
-    get_local_ip()
+    # get_local_ip()
     global id
     send_ip()
     task = asyncio.create_task(send_heartbeat_internal())
+    print("Finish init")
 
 
 def clear():
@@ -65,12 +64,16 @@ def clear():
 
 
 async def send_heartbeat_internal() -> None:
+    timeout = 3
+    global ip
+    url = server_address + "/heartbeat?ip=" + ip
     while True:
         # print('successful send my_heart')
-        global ip
-        url = server_address + "/get_node?ip = " + ip
+        try:
             folderol = requests.get(url)
-        timeout = 30
+        except:
+            print("Central server error")
+        
         # 删除超时的节点（假设你有一个异步的数据库操作函数）
         await asyncio.sleep(timeout)
 
@@ -112,4 +115,4 @@ async def send_user_des_message(source_ip: str, dest_ip: str, re_message):  #
 if __name__ == "__main__":
     import uvicorn  # pylint: disable=e0401
 
-    uvicorn.run("node:app", host="0.0.0.0", port=8000, reload=True)
+    uvicorn.run("node:app", host="0.0.0.0", port=8001, reload=True)