Skip to content

Unpublish from remote tracks in RoomSession::close() #1382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
raparanjpe wants to merge 3 commits into
base: main
Choose a base branch
from
+13 −0
Open

Unpublish from remote tracks in RoomSession::close() #1382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
134b499
Remove published remote tracks
raparanjpe Aug 31, 2026
2a7b898
Changeset
raparanjpe Sep 2, 2026
117ff02
Rename
raparanjpe Sep 2, 2026
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
6 changes: 6 additions & 0 deletions .changeset/unpublish_from_remote_track_before_closing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
livekit: patch
livekit-ffi: patch
---

Unpublish from remote track participants before shutting down the RTC Engine to avoid leaking memory.
7 changes: 7 additions & 0 deletions livekit/src/room/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1172,6 +1172,13 @@ impl RoomSession {
let _ = self.local_participant.unpublish_track(sid).await;
}

// remove published remote tracks as well
for (_, participant) in self.remote_participants.read().clone() {
for (sid, _) in participant.track_publications() {
participant.unpublish_track(&sid);
Comment on lines +1176 to +1178

@devin-ai-integration devin-ai-integration Bot Aug 31, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Concurrent updates survive room closure

If an update arrives while close awaits engine shutdown, the earlier snapshot misses its participant or track. The closed room retains that publication.

Prompt for agents 
RoomSession::close cleans remote participant publications while room_task can still process EngineEvent::ParticipantUpdate and EngineEvent::MediaTrack. Because both the participant map and each publication map are snapshots, updates handled after those snapshots can add publications that survive closure. Reorder teardown so no room event can mutate remote participants before the final remote-publication cleanup, while preserving delivery of TrackUnsubscribed and TrackUnpublished events and the existing local-track shutdown requirements. Add a concurrency-focused test that queues a participant or track update during close and verifies every retained RemoteParticipant has no publications when close returns.
Devin Review

Was this helpful? React with 👍 or 👎 to provide feedback.

}
}

self.rtc_engine.close(reason).await;
self.e2ee_manager.cleanup();

Expand Down
Loading