issues, chat FPS; optimisations
This commit is contained in:
Dobromir Popov
@@ -273,7 +273,7 @@ class RelayServer:
|
||||
)
|
||||
|
||||
async def _handle_rpc(self, ws_requester, target_peer_id: str) -> None:
|
||||
"""Send one HTTP-shaped request to a connected peer and relay its response."""
|
||||
"""Relay sequential HTTP-shaped requests over one requester connection."""
|
||||
target = self._registry.get(target_peer_id)
|
||||
if target is None:
|
||||
await ws_requester.send(json.dumps({
|
||||
@@ -284,64 +284,76 @@ class RelayServer:
|
||||
await ws_requester.close()
|
||||
return
|
||||
|
||||
try:
|
||||
raw = await asyncio.wait_for(ws_requester.recv(), timeout=30.0)
|
||||
if isinstance(raw, (bytes, bytearray)):
|
||||
header, body = decode_binary_frame(bytes(raw))
|
||||
request_id = str(header.get("request_id") or uuid.uuid4())
|
||||
header["request_id"] = request_id
|
||||
header["target_peer"] = target_peer_id
|
||||
outbound: str | bytes = encode_binary_frame(header, body)
|
||||
else:
|
||||
payload = json.loads(raw)
|
||||
request_id = str(payload.get("request_id") or uuid.uuid4())
|
||||
payload["request_id"] = request_id
|
||||
payload["target_peer"] = target_peer_id
|
||||
outbound = json.dumps({
|
||||
"topic": "relay-http-request",
|
||||
"version": 1,
|
||||
"from_peer": "relay",
|
||||
"payload": payload,
|
||||
})
|
||||
except Exception:
|
||||
await ws_requester.close(1003, "invalid relay rpc request")
|
||||
return
|
||||
while True:
|
||||
try:
|
||||
raw = await ws_requester.recv()
|
||||
except Exception:
|
||||
return
|
||||
|
||||
queue: asyncio.Queue = asyncio.Queue()
|
||||
self._pending_rpc[request_id] = queue
|
||||
overall_timeout = 310.0
|
||||
idle_timeout = 120.0
|
||||
loop = asyncio.get_running_loop()
|
||||
deadline = loop.time() + overall_timeout
|
||||
try:
|
||||
await target.ws.send(outbound)
|
||||
# Forward frames until a terminal one: streamed responses (US-036)
|
||||
# end with {"stream": true, "done": true}; a frame without "stream"
|
||||
# is a complete legacy single response. A binary frame is always a
|
||||
# complete single response.
|
||||
while True:
|
||||
remaining = deadline - loop.time()
|
||||
if remaining <= 0:
|
||||
raise asyncio.TimeoutError
|
||||
frame = await asyncio.wait_for(
|
||||
queue.get(), timeout=min(idle_timeout, remaining)
|
||||
)
|
||||
if isinstance(frame, (bytes, bytearray)):
|
||||
await ws_requester.send(frame)
|
||||
break
|
||||
await ws_requester.send(json.dumps(frame))
|
||||
if not frame.get("stream") or frame.get("done"):
|
||||
break
|
||||
except asyncio.TimeoutError:
|
||||
await ws_requester.send(json.dumps({
|
||||
"request_id": request_id,
|
||||
"status": 504,
|
||||
"headers": {"Content-Type": "application/json"},
|
||||
"body": json.dumps({"error": "relay rpc timed out"}),
|
||||
}))
|
||||
finally:
|
||||
self._pending_rpc.pop(request_id, None)
|
||||
await ws_requester.close()
|
||||
request_id: str | None = None
|
||||
try:
|
||||
if isinstance(raw, (bytes, bytearray)):
|
||||
header, body = decode_binary_frame(bytes(raw))
|
||||
request_id = str(header.get("request_id") or uuid.uuid4())
|
||||
header["request_id"] = request_id
|
||||
header["target_peer"] = target_peer_id
|
||||
outbound: str | bytes = encode_binary_frame(header, body)
|
||||
else:
|
||||
payload = json.loads(raw)
|
||||
request_id = str(payload.get("request_id") or uuid.uuid4())
|
||||
payload["request_id"] = request_id
|
||||
payload["target_peer"] = target_peer_id
|
||||
outbound = json.dumps({
|
||||
"topic": "relay-http-request",
|
||||
"version": 1,
|
||||
"from_peer": "relay",
|
||||
"payload": payload,
|
||||
})
|
||||
except Exception:
|
||||
await ws_requester.close(1003, "invalid relay rpc request")
|
||||
return
|
||||
|
||||
queue: asyncio.Queue = asyncio.Queue()
|
||||
self._pending_rpc[request_id] = queue
|
||||
overall_timeout = 310.0
|
||||
idle_timeout = 120.0
|
||||
loop = asyncio.get_running_loop()
|
||||
deadline = loop.time() + overall_timeout
|
||||
target = self._registry.get(target_peer_id)
|
||||
try:
|
||||
if target is None:
|
||||
await ws_requester.send(json.dumps({
|
||||
"request_id": request_id,
|
||||
"status": 503,
|
||||
"headers": {"Content-Type": "application/json"},
|
||||
"body": json.dumps({"error": f"peer {target_peer_id!r} disconnected"}),
|
||||
}))
|
||||
continue
|
||||
await target.ws.send(outbound)
|
||||
# Streamed responses end with done=true. Binary and legacy JSON
|
||||
# responses are complete in one frame.
|
||||
while True:
|
||||
remaining = deadline - loop.time()
|
||||
if remaining <= 0:
|
||||
raise asyncio.TimeoutError
|
||||
frame = await asyncio.wait_for(
|
||||
queue.get(), timeout=min(idle_timeout, remaining)
|
||||
)
|
||||
if isinstance(frame, (bytes, bytearray)):
|
||||
await ws_requester.send(frame)
|
||||
break
|
||||
await ws_requester.send(json.dumps(frame))
|
||||
if not frame.get("stream") or frame.get("done"):
|
||||
break
|
||||
except asyncio.TimeoutError:
|
||||
await ws_requester.send(json.dumps({
|
||||
"request_id": request_id,
|
||||
"status": 504,
|
||||
"headers": {"Content-Type": "application/json"},
|
||||
"body": json.dumps({"error": "relay rpc timed out"}),
|
||||
}))
|
||||
finally:
|
||||
self._pending_rpc.pop(request_id, None)
|
||||
|
||||
|
||||
async def _broadcast(raw: str | bytes, peers: list) -> None:
|
||||
|
||||
Reference in New Issue
Block a user