properly cleanup pointers on destrcution

Author: stephen-derosa

include/livekit/room.h

@@ -146,13 +146,15 @@ class LIVEKIT_API Room {
   ///   - published tracks (audio/video/screen)
   ///   - identity, SID, metadata
   ///   - publishing/unpublishing operations
-  /// @return Non-null pointer after successful connect().
+  /// @return Non-null pointer while connected; nullptr before connect, after
+  ///   room end-of-stream teardown, or when the room is destroyed.
   LocalParticipant* localParticipant() const;
 
   /// Look up a remote participant by identity.
   ///
   /// @param identity The participant’s identity string (not SID)
-  /// @return Pointer to RemoteParticipant if present, otherwise nullptr.
+  /// @return Pointer to RemoteParticipant if present, otherwise nullptr (also
+  ///   nullptr after room teardown or when the room is destroyed).
   /// RemoteParticipant contains:
   ///   - identity/name/metadata
   ///   - track publications
@@ -163,7 +165,7 @@ class LIVEKIT_API Room {
   ///
   /// @return Vector of non-null pointers to the current remote participants.
   ///   The pointers are owned by the Room and remain valid until the
-  ///   corresponding participant disconnects.
+  ///   corresponding participant disconnects or the room is torn down.
   std::vector<RemoteParticipant*> remoteParticipants() const;
 
   /// Returns the current connection state of the room.

src/room.cpp

@@ -82,12 +82,19 @@ Room::~Room() {
 
   int listener_to_remove = 0;
   std::unique_ptr<LocalParticipant> local_participant_to_cleanup;
+  std::unordered_map<std::string, std::shared_ptr<RemoteParticipant>> remote_participants_to_cleanup;
   {
     const std::scoped_lock<std::mutex> g(lock_);
     listener_to_remove = listener_id_;
     listener_id_ = 0;
-    // Move local participant out for cleanup outside the lock
+    connection_state_ = ConnectionState::Disconnected;
+    // Move participant state out so accessors return nullptr during teardown.
     local_participant_to_cleanup = std::move(local_participant_);
+    remote_participants_to_cleanup = std::move(remote_participants_);
+    room_handle_.reset();
+    e2ee_manager_.reset();
+    text_stream_readers_.clear();
+    byte_stream_readers_.clear();
   }
 
   // Shutdown local participant (unregisters RPC handlers, etc.) before
@@ -1158,7 +1165,11 @@ void Room::onEvent(const FfiEvent& event) {
             FfiClient::instance().removeListener(listener_to_remove);
           }
 
-          // Old state will be destroyed here when going out of scope
+          if (old_local_participant) {
+            old_local_participant->shutdown();
+          }
+
+          // old_* state is destroyed here when going out of scope
 
           const RoomEosEvent ev;
           if (delegate_snapshot) {

src/tests/unit/test_room.cpp

@@ -33,6 +33,10 @@ TEST_F(RoomTest, ConnectWithoutInitialize) {
   Room room;
   bool result = room.connect("wss://localhost:7880", "test", livekit::RoomOptions());
   EXPECT_FALSE(result) << "Connecting without initializing should return false";
+  EXPECT_EQ(room.localParticipant(), nullptr)
+      << "Local participant should be null after failed connect";
+  EXPECT_TRUE(room.remoteParticipants().empty())
+      << "Remote participants should be empty after failed connect";
 }
 
 TEST_F(RoomTest, CreateRoom) {