Skip to content
Merged
Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion livekit-rtc/livekit/rtc/room.py
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,8 @@ def _on_room_event(self, event: proto_room.RoomEvent) -> None:
elif which == "local_track_subscribed":
sid = event.local_track_subscribed.track_sid
lpublication = self.local_participant.track_publications[sid]
lpublication._first_subscription.set_result(None)
if not lpublication._first_subscription.done():
lpublication._first_subscription.set_result(None)
self.emit("local_track_subscribed", lpublication.track)
elif which == "track_published":
# The participant may already have been removed by a racing
Expand Down
32 changes: 32 additions & 0 deletions livekit-rtc/tests/test_audio_stream_room_lifecycle.py
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,38 @@ def test_local_track_republished_updates_track_sid_and_repushes_metadata() -> No
}


@pytest.mark.asyncio
async def test_repeated_local_track_subscribed_event_does_not_raise() -> None:
"""A full reconnect can repeat local_track_subscribed for a publication
whose first-subscription future is already complete.
"""
room = _make_room()
local = _make_local_participant("agent")
room._local_participant = local

track = _make_track(sid="TR_1")
publication = _make_local_publication(sid="TR_1")
publication._track = track
publication._first_subscription = asyncio.Future()
local._track_publications["TR_1"] = publication

subscribed_tracks: list[rtc.Track | None] = []

@room.on("local_track_subscribed")
def _on_local_track_subscribed(subscribed_track: rtc.Track | None) -> None:
subscribed_tracks.append(subscribed_track)

event = proto_room.RoomEvent(
local_track_subscribed=proto_room.LocalTrackSubscribed(track_sid="TR_1")
)
room._on_room_event(event)
await publication.wait_for_subscription()
room._on_room_event(event)

assert publication._first_subscription.done()
assert subscribed_tracks == [track, track]


# -- unpublish_track / room-event race ----------------------------------------


Expand Down
Loading