Merge branch 'main' of https://git.mamahaha.work/sangge/mimajingsai into sangge-main

requirements.txt

@@ -1,3 +1,4 @@
 gmssl-python
 fastapi
-uvicorn
+uvicorn
+requests

src/client.py

@@ -212,7 +212,7 @@ class IP_Message(BaseModel):
     dest_ip: str
     message_name: str
     source_ip: str
-    pk: int
+    pk: Tuple[int, int]
 
 
 class Request_Message(BaseModel):
@@ -301,7 +301,7 @@ async def recieve_request(i_m: IP_Message):
     if source_ip != i_m.dest_ip:
         return HTTPException(status_code=400, detail="Wrong ip")
     dest_ip = i_m.source_ip
-    threshold = random.randrange(1, 6)
+    threshold = random.randrange(1, 2)
     own_public_key = pk
     pk_B = i_m.pk
 
@@ -320,7 +320,7 @@ async def recieve_request(i_m: IP_Message):
     message = b"hello world" + random.randbytes(8)
     
     # send message to nodes
-    await send_messages(node_ips, message, dest_ip, pk_B, threshold)  # type: ignore
+    await send_messages(tuple(node_ips), message, dest_ip, pk_B, threshold)  
     response = {"threshold": threshold, "public_key": own_public_key}
     return response
 

src/server.py

@@ -35,6 +35,7 @@ def init():
 
 
 def clean_env():
+    clear_database()
     # 关闭游标和连接
     cursor.close()
     conn.close()
@@ -99,7 +100,7 @@ async def delete_node(ip: str) -> None:
 
 
 # 接收节点心跳包
-@app.post("/server/heartbeat")
+@app.get("/server/heartbeat")
 async def receive_heartbeat(ip: str):
     cursor.execute(
         "UPDATE nodes SET last_heartbeat = ? WHERE ip = ?", (time.time(), ip)
@@ -109,7 +110,7 @@ async def receive_heartbeat(ip: str):
 
 async def receive_heartbeat_internal():
     while 1:
-        timeout = 70
+        timeout = 7
         # 删除超时的节点
         # cursor.execute("DELETE FROM nodes WHERE last_heartbeat < ?", (time.time() - timeout,))
         # conn.commit()
@@ -137,8 +138,8 @@ async def send_nodes_list(count: int) -> list:
     return nodes_list
 
 
-@app.get("/server/clear_database")
-async def clear_database() -> None:
+# @app.get("/server/clear_database")
+def clear_database() -> None:
     cursor.execute("DELETE FROM nodes")
     conn.commit()