feat: update receive_user_src_message

src/node.py

@@ -1,4 +1,4 @@
-from fastapi import FastAPI,Request
+from fastapi import FastAPI, Request, HTTPException
 import requests
 from contextlib import asynccontextmanager
 import socket
@@ -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" 
+server_address = "http://中心服务器IP地址/server"
 id = 0
-ip = ''
-client_ip_src = ''   # 发送信息用户的ip
-client_ip_des = ''   # 接收信息用户的ip
-processed_message = ()   # 重加密后的数据
+ip = ""
+client_ip_src = ""  # 发送信息用户的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():
     # 创建一个套接字对象
@@ -42,7 +46,7 @@ def get_local_ip():
     # 获取本地IP地址
     local_ip = s.getsockname()[0]
     s.close()
-    global ip 
+    global ip
     ip = local_ip
 
 
@@ -51,44 +55,56 @@ 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
+        global ip
+        url = server_address + "/get_node?ip = " + ip
         folderol = requests.get(url)
         timeout = 30
         # 删除超时的节点（假设你有一个异步的数据库操作函数）
         await asyncio.sleep(timeout)
 
 
-
-@app.post("/user_src")    # 接收用户1发送的信息
+@app.post("/user_src")  # 接收用户1发送的信息
 async def receive_user_src_message(message: Request):
-    json_data = await message.json()
-    global client_ip_src,client_ip_des
+    global client_ip_src, client_ip_des
     # kfrag , capsule_ct ,client_ip_src , client_ip_des   = json_data[]  # 看梁俊勇
-    global processed_message
-    processed_message =  ReEncrypt(kfrag, capsule_ct)
-
-
-
-def send_user_des_message():   # 发送消息给用户2
-    global processed_message,client_ip_src,client_ip_des
-
-    data = {
-    "Tuple": processed_message,   # 类型不匹配
-    "ip": client_ip_src
-}
+    '''
+    payload = {
+            "source_ip": local_ip,
+            "dest_ip": dest_ip,
+            "capsule_ct": capsule_ct,
+            "rk": rk_list[i],
+        }
+    '''
     
-# 发送 HTTP POST 请求
-    response = requests.post("http://"+ client_ip_des + "/receive_messages", json=data)
+    data = await message.json()
+    source_ip = data.get("source_ip")
+    dest_ip = data.get("dest_ip")
+    capsule_ct = data.get("capsule_ct")
+    rk = data.get("rk")
+    
+    processed_message = ReEncrypt(rk, capsule_ct)
+    await send_user_des_message(source_ip, dest_ip, processed_message)
+    return HTTPException(status_code=200, detail="message recieved")
+
+
+async def send_user_des_message(source_ip: str, dest_ip: str, re_message):  # 发送消息给用户2
+
+    data = {"Tuple": re_message, "ip": source_ip}  # 类型不匹配
+
+    # 发送 HTTP POST 请求
+    response = requests.post("http://" + dest_ip + "/receive_messages?message", json=data)
     print(response)
 
 
@@ -96,7 +112,3 @@ if __name__ == "__main__":
     import uvicorn  # pylint: disable=e0401
 
     uvicorn.run("node:app", host="0.0.0.0", port=8000, reload=True)
-
-
-
-