api return peer key

binbat · Aug 18, 2023 · 5d3c014 · 5d3c014
1 parent 55b55af
commit 5d3c014
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 13 deletions.
diff --git a/src/forward/forward_internal.rs b/src/forward/forward_internal.rs
@@ -24,6 +24,16 @@ type SenderForwardData = UnboundedSender<ForwardData>;
 
 struct PeerWrap(Arc<RTCPeerConnection>);
 
+pub(crate) fn get_peer_key(peer: Arc<RTCPeerConnection>) -> String {
+    PeerWrap(peer).get_key().to_string()
+}
+
+impl PeerWrap {
+    fn get_key(&self) -> &str {
+        self.0.get_stats_id()
+    }
+}
+
 impl Clone for PeerWrap {
     fn clone(&self) -> Self {
         PeerWrap(self.0.clone())
@@ -34,17 +44,17 @@ impl Eq for PeerWrap {}
 
 impl PartialEq for PeerWrap {
     fn eq(&self, other: &Self) -> bool {
-        self.0.get_stats_id() == other.0.get_stats_id()
+        self.get_key() == other.get_key()
     }
 
     fn ne(&self, other: &Self) -> bool {
-        self.0.get_stats_id() != other.0.get_stats_id()
+        self.get_key() != other.get_key()
     }
 }
 
 impl Hash for PeerWrap {
     fn hash<H: Hasher>(&self, state: &mut H) {
-        self.0.get_stats_id().hash(state);
+        self.get_key().hash(state);
     }
 }
 

diff --git a/src/forward/mod.rs b/src/forward/mod.rs
@@ -17,7 +17,7 @@ use webrtc::sdp::{MediaDescription, SessionDescription};
 
 use constant::*;
 
-use crate::forward::forward_internal::PeerForwardInternal;
+use crate::forward::forward_internal::{get_peer_key, PeerForwardInternal};
 
 mod forward_internal;
 pub(crate) mod constant;
@@ -40,7 +40,7 @@ impl PeerForward {
         self.internal.id.clone()
     }
 
-    pub async fn set_anchor(&self, offer: RTCSessionDescription) -> Result<RTCSessionDescription> {
+    pub async fn set_anchor(&self, offer: RTCSessionDescription) -> Result<(RTCSessionDescription, String)> {
         if self.internal.anchor_is_some().await {
             return Err(anyhow::anyhow!("anchor is set"));
         }
@@ -103,14 +103,14 @@ impl PeerForward {
             .local_description()
             .await
             .ok_or(anyhow::anyhow!("failed to get local description"))?;
-        self.internal.set_anchor(peer).await?;
-        Ok(description)
+        self.internal.set_anchor(peer.clone()).await?;
+        Ok((description, get_peer_key(peer)))
     }
 
     pub async fn add_subscribe(
         &self,
         offer: RTCSessionDescription,
-    ) -> Result<RTCSessionDescription> {
+    ) -> Result<(RTCSessionDescription, String)> {
         let peer = new_peer().await?;
         let internal = self.internal.clone();
         let pc = peer.clone();
@@ -154,7 +154,7 @@ impl PeerForward {
             .local_description()
             .await
             .ok_or(anyhow::anyhow!("failed to get local description"))?;
-        Ok(description)
+        Ok((description, get_peer_key(peer)))
     }
 }
 

diff --git a/src/main.rs b/src/main.rs
@@ -59,7 +59,7 @@ async fn whip(
         original_forward.unwrap().clone()
     };
     drop(map);
-    let answer = forward.set_anchor(offer).await?;
+    let (answer, key) = forward.set_anchor(offer).await?;
     if is_none {
         let mut map = state.write().await;
         if map.contains_key(&id) {
@@ -71,7 +71,7 @@ async fn whip(
         .status(StatusCode::CREATED)
         .header("Content-Type", "application/sdp")
         .header("Accept-Patch", "application/trickle-ice-sdpfrag")
-        .header("E-Tag", id)
+        .header("E-Tag", key)
         .header("Location", uri.to_string())
         .body(answer.sdp)?)
 }
@@ -90,12 +90,12 @@ async fn whep(
     }
     let forward = forward.unwrap().clone();
     drop(map);
-    let answer = forward.add_subscribe(offer).await?;
+    let (answer, key) = forward.add_subscribe(offer).await?;
     Ok(Response::builder()
         .status(StatusCode::CREATED)
         .header("Content-Type", "application/sdp")
         .header("Accept-Patch", "application/trickle-ice-sdpfrag")
-        .header("E-Tag", forward.get_id())
+        .header("E-Tag", key)
         .header("Location", uri.to_string())
         .body(answer.sdp)?)
 }