raw ptr to weak_ptr

stephen-derosa · stephen-derosa · commit 402e6fbcc3cb · 2026-05-29T13:46:58.000-06:00
diff --git a/basic_room/main.cpp b/basic_room/main.cpp
@@ -132,7 +132,9 @@ int main(int argc, char* argv[]) {
 
   std::shared_ptr<LocalTrackPublication> audioPub;
   try {
-    room->localParticipant()->publishTrack(audioTrack, audioOpts);
+    auto lp = room->localParticipant().lock();
+    if (!lp) throw std::runtime_error("local participant unavailable");
+    lp->publishTrack(audioTrack, audioOpts);
     audioPub = audioTrack->publication();
     std::cout << "Published audio: sid=" << audioPub->sid() << "\n";
   } catch (const std::exception& e) {
@@ -151,7 +153,9 @@ int main(int argc, char* argv[]) {
 
   std::shared_ptr<LocalTrackPublication> videoPub;
   try {
-    room->localParticipant()->publishTrack(videoTrack, videoOpts);
+    auto lp = room->localParticipant().lock();
+    if (!lp) throw std::runtime_error("local participant unavailable");
+    lp->publishTrack(videoTrack, videoOpts);
     videoPub = videoTrack->publication();
     std::cout << "Published video: sid=" << videoPub->sid() << "\n";
   } catch (const std::exception& e) {
@@ -179,8 +183,10 @@ int main(int argc, char* argv[]) {
 
   // Best-effort unpublish
   try {
-    if (audioPub) room->localParticipant()->unpublishTrack(audioPub->sid());
-    if (videoPub) room->localParticipant()->unpublishTrack(videoPub->sid());
+    if (auto lp = room->localParticipant().lock()) {
+      if (audioPub) lp->unpublishTrack(audioPub->sid());
+      if (videoPub) lp->unpublishTrack(videoPub->sid());
+    }
   } catch (...) {
   }
 
diff --git a/hello_livekit/receiver/main.cpp b/hello_livekit/receiver/main.cpp
@@ -83,7 +83,7 @@ int main(int argc, char* argv[]) {
     return 1;
   }
 
-  LocalParticipant* lp = room->localParticipant();
+  auto lp = room->localParticipant().lock();
   assert(lp);
 
   std::cout << "[info] [receiver] Connected as identity='" << lp->identity() << "' room='" << room->roomInfo().name
diff --git a/hello_livekit/sender/main.cpp b/hello_livekit/sender/main.cpp
@@ -84,7 +84,7 @@ int main(int argc, char* argv[]) {
     return 1;
   }
 
-  LocalParticipant* lp = room->localParticipant();
+  auto lp = room->localParticipant().lock();
   assert(lp);
 
   std::cout << "[info] [sender] Connected as identity='" << lp->identity() << "' room='" << room->roomInfo().name
diff --git a/ping_pong/ping/main.cpp b/ping_pong/ping/main.cpp
@@ -98,7 +98,7 @@ int main(int argc, char* argv[]) {
     return 1;
   }
 
-  LocalParticipant* local_participant = room->localParticipant();
+  auto local_participant = room->localParticipant().lock();
   assert(local_participant);
 
   std::cout << "[info] ping connected as identity='" << local_participant->identity() << "' room='"
diff --git a/ping_pong/pong/main.cpp b/ping_pong/pong/main.cpp
@@ -77,7 +77,7 @@ int main(int argc, char* argv[]) {
     return 1;
   }
 
-  LocalParticipant* local_participant = room->localParticipant();
+  auto local_participant = room->localParticipant().lock();
   assert(local_participant);
 
   std::cout << "[info] pong connected as identity='" << local_participant->identity() << "' room='"
diff --git a/simple_data_stream/main.cpp b/simple_data_stream/main.cpp
@@ -64,7 +64,7 @@ std::string randomHexId(std::size_t nbytes = 16) {
 void greetParticipant(Room* room, const std::string& identity) {
   std::cout << "[DataStream] Greeting participant: " << identity << "\n";
 
-  LocalParticipant* lp = room->localParticipant();
+  auto lp = room->localParticipant().lock();
   if (!lp) {
     std::cerr << "[DataStream] No local participant, cannot greet.\n";
     return;
@@ -240,7 +240,8 @@ int main(int argc, char* argv[]) {
   // Greet existing participants
   {
     auto remotes = room->remoteParticipants();
-    for (const auto& rp : remotes) {
+    for (const auto& weak_rp : remotes) {
+      auto rp = weak_rp.lock();
       if (!rp) continue;
       std::cout << "Remote: " << rp->identity() << "\n";
       greetParticipant(room.get(), rp->identity());
diff --git a/simple_joystick/receiver/main.cpp b/simple_joystick/receiver/main.cpp
@@ -78,7 +78,14 @@ int main(int argc, char* argv[]) {
   std::cout << "[Receiver] Waiting for sender peer (up to 2 minutes)...\n";
 
   // Register RPC handler for joystick commands
-  LocalParticipant* lp = room->localParticipant();
+  auto lp = room->localParticipant().lock();
+  if (!lp) {
+    std::cerr << "[Receiver] No local participant; cannot register RPC handler.\n";
+    room->setDelegate(nullptr);
+    room.reset();
+    livekit::shutdown();
+    return 1;
+  }
   lp->registerRpcMethod("joystick_command", [](const RpcInvocationData& data) -> std::optional<std::string> {
     try {
       auto cmd = simple_joystick::json_to_joystick(data.payload);
diff --git a/simple_joystick/sender/main.cpp b/simple_joystick/sender/main.cpp
@@ -150,7 +150,6 @@ int main(int argc, char* argv[]) {
   std::cout << "[Sender] Waiting for 'robot' to join (checking every 2s)...\n";
   printControls();
 
-  LocalParticipant* lp = room->localParticipant();
   double x = 0.0, y = 0.0, z = 0.0;
   bool receiver_connected = false;
   auto last_receiver_check = std::chrono::steady_clock::now();
@@ -160,7 +159,7 @@ int main(int argc, char* argv[]) {
     auto now = std::chrono::steady_clock::now();
     if (now - last_receiver_check >= 2s) {
       last_receiver_check = now;
-      bool receiver_present = (room->remoteParticipant("robot") != nullptr);
+      bool receiver_present = (room->remoteParticipant("robot").lock() != nullptr);
 
       if (receiver_present && !receiver_connected) {
         std::cout << "[Sender] Receiver connected! Use keys to send commands.\n";
@@ -235,6 +234,8 @@ int main(int argc, char* argv[]) {
     std::cout << "[Sender] Sending: x=" << x << " y=" << y << " z=" << z << "\n";
 
     try {
+      auto lp = room->localParticipant().lock();
+      if (!lp) throw std::runtime_error("local participant unavailable");
       std::string response = lp->performRpc("robot", "joystick_command", payload, 5.0);
       std::cout << "[Sender] Receiver acknowledged: " << response << "\n";
     } catch (const RpcError& e) {
diff --git a/simple_room/main.cpp b/simple_room/main.cpp
@@ -304,7 +304,9 @@ int main(int argc, char* argv[]) {
   audioOpts.dtx = false;
   audioOpts.simulcast = false;
   try {
-    room->localParticipant()->publishTrack(audioTrack, audioOpts);
+    auto lp = room->localParticipant().lock();
+    if (!lp) throw std::runtime_error("local participant unavailable");
+    lp->publishTrack(audioTrack, audioOpts);
     const auto audioPub = audioTrack->publication();
 
     std::cout << "Published track:\n"
@@ -331,7 +333,9 @@ int main(int argc, char* argv[]) {
   try {
     // publishTrack takes std::shared_ptr<Track>, LocalAudioTrack derives from
     // Track
-    room->localParticipant()->publishTrack(videoTrack, videoOpts);
+    auto lp = room->localParticipant().lock();
+    if (!lp) throw std::runtime_error("local participant unavailable");
+    lp->publishTrack(videoTrack, videoOpts);
 
     const auto videoPub = videoTrack->publication();
 
@@ -368,11 +372,13 @@ int main(int argc, char* argv[]) {
   // Must be cleaned up before FfiClient::instance().shutdown();
   room->setDelegate(nullptr);
 
-  if (audioTrack->publication()) {
-    room->localParticipant()->unpublishTrack(audioTrack->publication()->sid());
-  }
-  if (videoTrack->publication()) {
-    room->localParticipant()->unpublishTrack(videoTrack->publication()->sid());
+  if (auto lp = room->localParticipant().lock()) {
+    if (audioTrack->publication()) {
+      lp->unpublishTrack(audioTrack->publication()->sid());
+    }
+    if (videoTrack->publication()) {
+      lp->unpublishTrack(videoTrack->publication()->sid());
+    }
   }
   audioTrack.reset();
   videoTrack.reset();
diff --git a/simple_rpc/main.cpp b/simple_rpc/main.cpp
@@ -66,7 +66,7 @@ bool waitForParticipant(Room* room, const std::string& identity, std::chrono::mi
   auto start = std::chrono::steady_clock::now();
 
   while (std::chrono::steady_clock::now() - start < timeout) {
-    if (room->remoteParticipant(identity) != nullptr) {
+    if (room->remoteParticipant(identity).lock() != nullptr) {
       return true;
     }
     std::this_thread::sleep_for(100ms);
@@ -207,8 +207,11 @@ std::string parseStringFromJson(const std::string& json) {
 
 // RPC handler registration
 void registerReceiverMethods(Room* greeters_room, Room* math_genius_room) {
-  LocalParticipant* greeter_lp = greeters_room->localParticipant();
-  LocalParticipant* math_genius_lp = math_genius_room->localParticipant();
+  auto greeter_lp = greeters_room->localParticipant().lock();
+  auto math_genius_lp = math_genius_room->localParticipant().lock();
+  if (!greeter_lp || !math_genius_lp) {
+    throw std::runtime_error("local participant unavailable");
+  }
 
   // arrival
   greeter_lp->registerRpcMethod("arrival", [](const RpcInvocationData& data) -> std::optional<std::string> {
@@ -274,7 +277,9 @@ void performGreeting(Room* room) {
   std::cout << "[Caller] Letting the greeter know that I've arrived\n";
   double t0 = nowMs();
   try {
-    std::string response = room->localParticipant()->performRpc("greeter", "arrival", "Hello", std::nullopt);
+    auto lp = room->localParticipant().lock();
+    if (!lp) throw std::runtime_error("local participant unavailable");
+    std::string response = lp->performRpc("greeter", "arrival", "Hello", std::nullopt);
     double t1 = nowMs();
     std::cout << "[Caller] RTT: " << (t1 - t0) << " ms\n";
     std::cout << "[Caller] That's nice, the greeter said: \"" << response << "\"\n";
@@ -291,7 +296,9 @@ void performSquareRoot(Room* room) {
   double t0 = nowMs();
   try {
     std::string payload = makeNumberJson("number", 16.0);
-    std::string response = room->localParticipant()->performRpc("math-genius", "square-root", payload, std::nullopt);
+    auto lp = room->localParticipant().lock();
+    if (!lp) throw std::runtime_error("local participant unavailable");
+    std::string response = lp->performRpc("math-genius", "square-root", payload, std::nullopt);
     double t1 = nowMs();
     std::cout << "[Caller] RTT: " << (t1 - t0) << " ms\n";
     double result = parseNumberFromJson(response);
@@ -311,8 +318,10 @@ void performQuantumHyperGeometricSeries(Room* room) {
   double t0 = nowMs();
   try {
     std::string payload = makeNumberJson("number", 42.0);
+    auto lp = room->localParticipant().lock();
+    if (!lp) throw std::runtime_error("local participant unavailable");
     std::string response =
-        room->localParticipant()->performRpc("math-genius", "quantum-hypergeometric-series", payload, std::nullopt);
+        lp->performRpc("math-genius", "quantum-hypergeometric-series", payload, std::nullopt);
     double t1 = nowMs();
     std::cout << "[Caller] (Unexpected success) RTT=" << (t1 - t0) << " ms\n";
     std::cout << "[Caller] Result: " << response << "\n";
@@ -337,7 +346,9 @@ void performDivide(Room* room) {
   double t0 = nowMs();
   try {
     std::string payload = "{\"dividend\":10,\"divisor\":0}";
-    std::string response = room->localParticipant()->performRpc("math-genius", "divide", payload, std::nullopt);
+    auto lp = room->localParticipant().lock();
+    if (!lp) throw std::runtime_error("local participant unavailable");
+    std::string response = lp->performRpc("math-genius", "divide", payload, std::nullopt);
     double t1 = nowMs();
     std::cout << "[Caller] (Unexpected success) RTT=" << (t1 - t0) << " ms\n";
     std::cout << "[Caller] Result = " << response << "\n";
@@ -361,7 +372,9 @@ void performLongCalculation(Room* room) {
   std::cout << "[Caller] Giving only 10s to respond. EXPECTED RESULT: TIMEOUT.\n";
   double t0 = nowMs();
   try {
-    std::string response = room->localParticipant()->performRpc("math-genius", "long-calculation", "{}", 10.0);
+    auto lp = room->localParticipant().lock();
+    if (!lp) throw std::runtime_error("local participant unavailable");
+    std::string response = lp->performRpc("math-genius", "long-calculation", "{}", 10.0);
     double t1 = nowMs();
     std::cout << "[Caller] (Unexpected success) RTT=" << (t1 - t0) << " ms\n";
     std::cout << "[Caller] Result: " << response << "\n";
diff --git a/user_timestamped_video/consumer/main.cpp b/user_timestamped_video/consumer/main.cpp
@@ -59,8 +59,8 @@ class UserTimestampedVideoConsumerDelegate : public RoomDelegate {
       : room_(room), read_user_timestamp_(read_user_timestamp) {}
 
   void registerExistingParticipants() {
-    for (const auto& participant : room_.remoteParticipants()) {
-      if (participant) {
+    for (const auto& weak_participant : room_.remoteParticipants()) {
+      if (auto participant = weak_participant.lock()) {
         registerRemoteVideoCallback(participant->identity());
       }
     }
@@ -163,7 +163,8 @@ int main(int argc, char* argv[]) {
       std::cerr << "[consumer] failed to connect\n";
       exit_code = 1;
     } else {
-      std::cout << "[consumer] connected as " << room.localParticipant()->identity() << " to room '"
+      auto lp = room.localParticipant().lock();
+      std::cout << "[consumer] connected as " << (lp ? lp->identity() : std::string("<unknown>")) << " to room '"
                 << room.roomInfo().name << "' with user timestamp "
                 << (cli_options.use_user_timestamp ? "enabled" : "ignored") << "\n";
 
@@ -173,8 +174,8 @@ int main(int argc, char* argv[]) {
         std::this_thread::sleep_for(std::chrono::milliseconds(50));
       }
 
-      for (const auto& participant : room.remoteParticipants()) {
-        if (participant) {
+      for (const auto& weak_participant : room.remoteParticipants()) {
+        if (auto participant = weak_participant.lock()) {
           room.clearOnVideoFrameCallback(participant->identity(), std::string(kTrackName));
         }
       }
diff --git a/user_timestamped_video/producer/main.cpp b/user_timestamped_video/producer/main.cpp
@@ -93,7 +93,8 @@ int main(int argc, char* argv[]) {
       std::cerr << "[producer] failed to connect\n";
       exit_code = 1;
     } else {
-      std::cout << "[producer] connected as " << room.localParticipant()->identity() << " to room '"
+      auto lp = room.localParticipant().lock();
+      std::cout << "[producer] connected as " << (lp ? lp->identity() : std::string("<unknown>")) << " to room '"
                 << room.roomInfo().name << "'\n";
 
       auto source = std::make_shared<VideoSource>(kFrameWidth, kFrameHeight);
@@ -104,7 +105,8 @@ int main(int argc, char* argv[]) {
         publish_options.source = TrackSource::SOURCE_CAMERA;
         publish_options.packet_trailer_features.user_timestamp = cli_options.use_user_timestamp;
 
-        room.localParticipant()->publishTrack(track, publish_options);
+        if (!lp) throw std::runtime_error("local participant unavailable");
+        lp->publishTrack(track, publish_options);
         std::cout << "[producer] published camera track with user timestamp "
                   << (cli_options.use_user_timestamp ? "enabled" : "disabled") << "\n";
 
@@ -147,8 +149,8 @@ int main(int argc, char* argv[]) {
         exit_code = 1;
       }
 
-      if (track->publication()) {
-        room.localParticipant()->unpublishTrack(track->publication()->sid());
+      if (lp && track->publication()) {
+        lp->unpublishTrack(track->publication()->sid());
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ int main(int argc, char* argv[]) {`
`83`	`83`	`return 1;`
`84`	`84`	`}`
`85`	`85`
`86`		`- LocalParticipant* lp = room->localParticipant();`
	`86`	`+ auto lp = room->localParticipant().lock();`
`87`	`87`	`assert(lp);`
`88`	`88`
`89`	`89`	`std::cout << "[info] [receiver] Connected as identity='" << lp->identity() << "' room='" << room->roomInfo().name`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ int main(int argc, char* argv[]) {`
`84`	`84`	`return 1;`
`85`	`85`	`}`
`86`	`86`
`87`		`- LocalParticipant* lp = room->localParticipant();`
	`87`	`+ auto lp = room->localParticipant().lock();`
`88`	`88`	`assert(lp);`
`89`	`89`
`90`	`90`	`std::cout << "[info] [sender] Connected as identity='" << lp->identity() << "' room='" << room->roomInfo().name`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ int main(int argc, char* argv[]) {`
`98`	`98`	`return 1;`
`99`	`99`	`}`
`100`	`100`
`101`		`- LocalParticipant* local_participant = room->localParticipant();`
	`101`	`+ auto local_participant = room->localParticipant().lock();`
`102`	`102`	`assert(local_participant);`
`103`	`103`
`104`	`104`	`std::cout << "[info] ping connected as identity='" << local_participant->identity() << "' room='"`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ int main(int argc, char* argv[]) {`
`77`	`77`	`return 1;`
`78`	`78`	`}`
`79`	`79`
`80`		`- LocalParticipant* local_participant = room->localParticipant();`
	`80`	`+ auto local_participant = room->localParticipant().lock();`
`81`	`81`	`assert(local_participant);`
`82`	`82`
`83`	`83`	`std::cout << "[info] pong connected as identity='" << local_participant->identity() << "' room='"`