modified: src/client.ini

modified:   src/client.py
	modified:   src/node.py

src/client.ini

@@ -1,3 +1,3 @@
 [settings]
-server_address = 10.20.127.226:8000
+server_address = 10.20.14.232:8000
 version = 1.0

src/client.py

@@ -17,6 +17,7 @@ async def lifespan(app: FastAPI):
     yield
     clean_env()
 
+
 app = FastAPI(lifespan=lifespan)
 
 
@@ -25,7 +26,7 @@ def init():
     init_db()
     pk, sk = GenerateKeyPair()
     init_config()
-    get_node_list(6, server_address)  # type: ignore
+    get_node_list(2, server_address)  # type: ignore
 
 
 def init_db():
@@ -93,6 +94,7 @@ class C(BaseModel):
     Tuple: Tuple[capsule, int]
     ip: str
 
+
 # receive messages from node
 @app.post("/receive_messages")
 async def receive_messages(message: C):
@@ -170,11 +172,8 @@ async def check_merge(db, ct: int, ip: str):
 
 
 # send message to node
-async def send_messages(node_ips: tuple[str, ...], 
+async def send_messages(
-                        message: bytes, 
+    node_ips: tuple[str, ...], message: bytes, dest_ip: str, pk_B: point, shreshold: int
-                        dest_ip: str, 
-                        pk_B: point,
-                        shreshold: int
 ):
     global pk, sk
     id_list = []
@@ -191,7 +190,7 @@ async def send_messages(node_ips: tuple[str, ...],
             "source_ip": local_ip,
             "dest_ip": dest_ip,
             "message": message,
-            "rk": rk_list[i]
+            "rk": rk_list[i],
         }
         response = requests.post(url, json=payload)
     return 0
@@ -203,6 +202,7 @@ class IP_Message(BaseModel):
     source_ip: str
     pk: int
 
+
 # request message from others
 @app.post("/request_message")
 async def request_message(i_m: IP_Message):
@@ -212,10 +212,11 @@ async def request_message(i_m: IP_Message):
     source_ip = get_own_ip()
     dest_port = "8003"
     url = "http://" + dest_ip + dest_port + "/recieve_request"
-    payload = {"dest_ip": dest_ip, 
+    payload = {
+        "dest_ip": dest_ip,
         "message_name": message_name,
         "source_ip": source_ip,
-               "pk": pk
+        "pk": pk,
     }
     response = requests.post(url, json=payload)
     if response.status_code == 200:
@@ -257,11 +258,14 @@ async def recieve_request(i_m: IP_Message):
     pk_B = i_m.pk
 
     with sqlite3.connect("client.db") as db:
-        cursor = db.execute("""
+        cursor = db.execute(
+            """
                    SELECT nodeip
                    FROM node
                    LIMIT ?
-                   """,(threshold,))
+                   """,
+            (threshold,),
+        )
         node_ips = cursor.fetchall()
     message = b"hello world" + random.randbytes(8)
     await send_messages(node_ips, message, dest_ip, pk_B, threshold)  # type: ignore
@@ -303,7 +307,6 @@ def get_node_list(count: int, server_addr: str):
         print("Failed:", response.status_code, response.text)
 
 
-
 pk = point
 sk = int
 server_address = str
@@ -314,4 +317,4 @@ local_ip = get_own_ip()
 if __name__ == "__main__":
     import uvicorn  # pylint: disable=e0401
 
-    uvicorn.run("client:app", host="0.0.0.0", port=8003, reload=True)
+    uvicorn.run("client:app", host="0.0.0.0", port=8002, reload=True)

src/node.py

@@ -6,6 +6,7 @@ import asyncio
 from pydantic import BaseModel
 from tpre import *
 
+
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     # Load the ML model
@@ -14,25 +15,28 @@ async def lifespan(app: FastAPI):
     # Clean up the ML models and release the resources
     clear()
 
+
 app = FastAPI(lifespan=lifespan)
 server_address = "http://中心服务器IP地址/server"
 id = 0
-ip = ''
+ip = ""
-client_ip_src = ''   # 发送信息用户的ip
+client_ip_src = ""  # 发送信息用户的ip
-client_ip_des = ''   # 接收信息用户的ip
+client_ip_des = ""  # 接收信息用户的ip
 processed_message = ()  # 重加密后的数据
 
 # class C(BaseModel):
 #     Tuple: Tuple[capsule, int]
 #     ip_src: str
 
+
 # 向中心服务器发送自己的IP地址,并获取自己的id
 def send_ip():
-    url = server_address + '/get_node?ip = ' + ip
+    url = server_address + "/get_node?ip = " + ip
     # ip = get_local_ip # type: ignore
     global id
     id = requests.get(url)
 
+
 # 用socket获取本机ip
 def get_local_ip():
     # 创建一个套接字对象
@@ -51,24 +55,26 @@ def init():
     global id
     send_ip()
     task = asyncio.create_task(send_heartbeat_internal())
-def clear():
 
+
+def clear():
     pass
 
+
 # 接收用户发来的消息，经过处理之后，再将消息发送给其他用户
 
+
 async def send_heartbeat_internal() -> None:
     while True:
         # print('successful send my_heart')
         global ip
-        url = server_address + '/get_node?ip = ' + ip
+        url = server_address + "/get_node?ip = " + ip
         folderol = requests.get(url)
         timeout = 30
         # 删除超时的节点（假设你有一个异步的数据库操作函数）
         await asyncio.sleep(timeout)
 
 
-
 @app.post("/user_src")  # 接收用户1发送的信息
 async def receive_user_src_message(message: Request):
     json_data = await message.json()
@@ -78,14 +84,10 @@ async def receive_user_src_message(message: Request):
     processed_message = ReEncrypt(kfrag, capsule_ct)
 
 
-
 def send_user_des_message():  # 发送消息给用户2
     global processed_message, client_ip_src, client_ip_des
 
-    data = {
+    data = {"Tuple": processed_message, "ip": client_ip_src}  # 类型不匹配
-    "Tuple": processed_message,   # 类型不匹配
-    "ip": client_ip_src
-}
 
     # 发送 HTTP POST 请求
     response = requests.post("http://" + client_ip_des + "/receive_messages", json=data)
@@ -95,8 +97,4 @@ def send_user_des_message():   # 发送消息给用户2
 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)
-
-
-
-