Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions etebase_server/fastapi/routers/websocket.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,17 +119,17 @@ async def producer_handler(r: aioredis.Redis, ws: WebSocket):

async def handle_message():
msg = await pubsub.get_message(ignore_subscribe_messages=True, timeout=20)
message_raw = t.cast(t.Optional[t.Tuple[str, bytes]], msg)
if message_raw:
_, message = message_raw
if msg and msg['type'] == 'message':
message = msg['data']
await ws.send_bytes(message)

try:
while True:
# We wait on the websocket so we fail if web sockets fail or get data
receive = asyncio.create_task(websocket.receive())
handle = asyncio.create_task(handle_message())
done, pending = await asyncio.wait(
{receive, handle_message()},
{receive, handle},
return_when=asyncio.FIRST_COMPLETED,
)
for task in pending:
Expand Down