move unpublish() from local_data_track.h to local_participant.h

Author: stephen-derosa

bridge/include/livekit_bridge/bridge_data_track.h

@@ -25,6 +25,7 @@
 
 namespace livekit {
 class LocalDataTrack;
+class LocalParticipant;
 } // namespace livekit
 
 namespace livekit_bridge {
@@ -104,7 +105,8 @@ class BridgeDataTrack {
   friend class test::BridgeDataTrackTest;
 
   BridgeDataTrack(std::string name,
-                  std::shared_ptr<livekit::LocalDataTrack> track);
+                  std::shared_ptr<livekit::LocalDataTrack> track,
+                  livekit::LocalParticipant *participant);
 
   /** Protects released_ and track_ for thread-safe access. */
   mutable std::mutex mutex_;
@@ -117,6 +119,9 @@ class BridgeDataTrack {
 
   /** Underlying SDK data track handle. Nulled on release(). */
   std::shared_ptr<livekit::LocalDataTrack> track_;
+
+  /** Participant that published this track; used for unpublish. Not owned. */
+  livekit::LocalParticipant *participant_ = nullptr;
 };
 
 } // namespace livekit_bridge

bridge/src/bridge_data_track.cpp

@@ -18,14 +18,17 @@
 
 #include "livekit/data_frame.h"
 #include "livekit/local_data_track.h"
+#include "livekit/local_participant.h"
 
 #include <iostream>
 
 namespace livekit_bridge {
 
 BridgeDataTrack::BridgeDataTrack(std::string name,
-                                 std::shared_ptr<livekit::LocalDataTrack> track)
-    : name_(std::move(name)), track_(std::move(track)) {}
+                                 std::shared_ptr<livekit::LocalDataTrack> track,
+                                 livekit::LocalParticipant *participant)
+    : name_(std::move(name)), track_(std::move(track)),
+      participant_(participant) {}
 
 BridgeDataTrack::~BridgeDataTrack() { release(); }
 
@@ -77,16 +80,17 @@ void BridgeDataTrack::release() {
   }
   released_ = true;
 
-  if (track_) {
+  if (participant_ && track_) {
     try {
-      track_->unpublish();
+      participant_->unpublishDataTrack(track_);
     } catch (...) {
-      std::cerr << "[BridgeDataTrack] unpublish error, continuing with "
-                   "cleanup\n";
+      std::cerr << "[BridgeDataTrack] unpublishDataTrack error, continuing "
+                   "with cleanup\n";
     }
   }
 
   track_.reset();
+  participant_ = nullptr;
 }
 
 } // namespace livekit_bridge

bridge/src/livekit_bridge.cpp

@@ -312,7 +312,7 @@ LiveKitBridge::createDataTrack(const std::string &name) {
             << "(sid=" << track->info().sid << ").\n";
 
   auto bridge_track = std::shared_ptr<BridgeDataTrack>(
-      new BridgeDataTrack(name, std::move(track)));
+      new BridgeDataTrack(name, std::move(track), room_->localParticipant()));
   published_data_tracks_.emplace_back(bridge_track);
   return bridge_track;
 }

include/livekit/local_data_track.h

@@ -40,11 +40,12 @@ class OwnedLocalDataTrack;
  *
  * Typical usage:
  *
- *   auto dt = room->localParticipant()->publishDataTrack("sensor-data");
+ *   auto lp = room->localParticipant();
+ *   auto dt = lp->publishDataTrack("sensor-data");
  *   DataFrame frame;
  *   frame.payload = {0x01, 0x02, 0x03};
  *   dt->tryPush(frame);
- *   dt->unpublish();
+ *   lp->unpublishDataTrack(dt);
  */
 class LocalDataTrack {
 public:
@@ -67,18 +68,12 @@ class LocalDataTrack {
   /// Whether the track is still published in the room.
   bool isPublished() const;
 
-  /**
-   * Unpublish this data track from the room.
-   *
-   * After this call, tryPush() will fail and the track cannot be
-   * re-published. The underlying FFI handle is released.
-   */
-  void unpublish();
-
   /// Construct from an owned proto (called by LocalParticipant).
   explicit LocalDataTrack(const proto::OwnedLocalDataTrack &owned);
 
 private:
+  friend class LocalParticipant;
+
   /// Raw FFI handle id for internal use.
   uintptr_t ffi_handle_id() const noexcept { return handle_.get(); }
 

include/livekit/local_participant.h

@@ -147,7 +147,7 @@ class LocalParticipant : public Participant {
    *
    * Data tracks carry arbitrary binary frames and are independent of the
    * audio/video track hierarchy. The returned LocalDataTrack can push
-   * frames via tryPush() and be unpublished via unpublish().
+   * frames via tryPush() and be unpublished via unpublishDataTrack().
    *
    * @param name  Unique track name visible to other participants.
    * @return Shared pointer to the published data track.
@@ -156,6 +156,16 @@ class LocalParticipant : public Participant {
   std::shared_ptr<LocalDataTrack>
   publishDataTrack(const std::string &name);
 
+  /**
+   * Unpublish a data track from the room.
+   *
+   * After this call, tryPush() on the track will fail and the track
+   * cannot be re-published.
+   *
+   * @param track  The data track to unpublish. Must not be null.
+   */
+  void unpublishDataTrack(const std::shared_ptr<LocalDataTrack> &track);
+
   /**
    * Initiate an RPC call to a remote participant.
    *

src/local_data_track.cpp

@@ -62,16 +62,4 @@ bool LocalDataTrack::isPublished() const {
   return resp.local_data_track_is_published().is_published();
 }
 
-void LocalDataTrack::unpublish() {
-  if (!handle_.valid()) {
-    return;
-  }
-
-  proto::FfiRequest req;
-  auto *msg = req.mutable_local_data_track_unpublish();
-  msg->set_track_handle(static_cast<uint64_t>(handle_.get()));
-
-  (void)FfiClient::instance().sendRequest(req);
-}
-
 } // namespace livekit

src/local_participant.cpp

@@ -240,6 +240,24 @@ LocalParticipant::publishDataTrack(const std::string &name) {
   return std::make_shared<LocalDataTrack>(owned);
 }
 
+void LocalParticipant::unpublishDataTrack(
+    const std::shared_ptr<LocalDataTrack> &track) {
+  if (!track) {
+    return;
+  }
+
+  auto handle_id = track->ffi_handle_id();
+  if (handle_id == 0) {
+    return;
+  }
+
+  proto::FfiRequest req;
+  auto *msg = req.mutable_local_data_track_unpublish();
+  msg->set_track_handle(static_cast<uint64_t>(handle_id));
+
+  (void)FfiClient::instance().sendRequest(req);
+}
+
 std::string LocalParticipant::performRpc(
     const std::string &destination_identity, const std::string &method,
     const std::string &payload, std::optional<double> response_timeout) {