fix voice rooms
This commit is contained in:
@ -9,18 +9,27 @@ async def voice_ws(
|
||||
room_id: str = Query(...),
|
||||
username: str = Query(...)
|
||||
):
|
||||
if username in voice_hub.rooms.get(room_id, {}):
|
||||
await ws.close(code=4001)
|
||||
return
|
||||
|
||||
await voice_hub.connect(room_id, username, ws)
|
||||
|
||||
# уведомим остальных
|
||||
await voice_hub.broadcast(
|
||||
users = list(voice_hub.rooms.get(room_id, {}).keys())
|
||||
await ws.send_json({
|
||||
"type": "users",
|
||||
"users": users
|
||||
})
|
||||
|
||||
await voice_hub.broadcast_except(
|
||||
room_id,
|
||||
username,
|
||||
{"type": "join", "user": username}
|
||||
)
|
||||
|
||||
try:
|
||||
while True:
|
||||
msg = await ws.receive_json()
|
||||
|
||||
if msg["type"] == "signal":
|
||||
await voice_hub.send_to(
|
||||
room_id,
|
||||
|
||||
@ -25,6 +25,17 @@ class VoiceHub:
|
||||
|
||||
async def broadcast(self, room_id: str, payload: dict):
|
||||
for ws in self.rooms.get(room_id, {}).values():
|
||||
try:
|
||||
await ws.send_json(payload)
|
||||
except:
|
||||
pass
|
||||
|
||||
async def broadcast_except(self, room_id: str, except_user: str, payload: dict):
|
||||
for user, ws in self.rooms.get(room_id, {}).items():
|
||||
if user != except_user:
|
||||
try:
|
||||
await ws.send_json(payload)
|
||||
except:
|
||||
pass
|
||||
|
||||
voice_hub = VoiceHub()
|
||||
|
||||
Reference in New Issue
Block a user