update(deps): webrtc version

Break change! Remove RTCIceCredentialType webrtc-rs/webrtc@d6b1d34
binbat · Jul 1, 2024 · 97a2d76 · 97a2d76
1 parent 3e9f3a9
commit 97a2d76
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 71 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ members = [
     "liveman",
 ]
 [workspace.dependencies]
-webrtc = { git = "https://github.com/webrtc-rs/webrtc", rev = "ae93e81" }
+webrtc = { git = "https://github.com/webrtc-rs/webrtc", rev = "40642c8" }
 
 anyhow = "1.0"
 clap = "4.5"

diff --git a/conf/live777.toml b/conf/live777.toml
@@ -16,7 +16,6 @@ urls = [
 # urls = [ "turn:turn.22333.fun", "turn:cn.22333.fun" ]
 # username = "live777"
 # credential = "live777"
-# credential_type = "password"
 
 # WHIP/WHEP auth token
 # Headers["Authorization"] = "Bearer {token}"

diff --git a/libs/libwish/src/lib.rs b/libs/libwish/src/lib.rs
@@ -118,12 +118,6 @@ impl Client {
                     urls: vec![link.raw_uri.to_string().replacen("://", ":", 1)],
                     username: link.params.remove("username").unwrap_or("".to_owned()),
                     credential: link.params.remove("credential").unwrap_or("".to_owned()),
-                    credential_type: link
-                        .params
-                        .remove("credential-type")
-                        .unwrap_or("".to_owned())
-                        .as_str()
-                        .into(),
                 })
             }
         }
@@ -174,7 +168,6 @@ mod tests {
     use http::header;
     use http::response::Builder;
     use reqwest::Response;
-    use webrtc::ice_transport::ice_credential_type::RTCIceCredentialType;
 
     use crate::Client;
 
@@ -183,7 +176,7 @@ mod tests {
         let response = Builder::new()
             .header(header::LINK, r#"<stun:stun.22333.fun>; rel="ice-server""#)
             .header(header::LINK, r#"<stun:stun.l.google.com:19302>; rel="ice-server""#)
-            .header(header::LINK, r#"<turn:turn.22333.fun>; rel="ice-server"; username="live777"; credential="live777"; credential-type="password""#)
+            .header(header::LINK, r#"<turn:turn.22333.fun>; rel="ice-server"; username="live777"; credential="live777""#)
             .body("")
             .unwrap();
         let response = Response::from(response);
@@ -205,10 +198,6 @@ mod tests {
         );
         assert_eq!(ice_servers.get(2).unwrap().username, "live777");
         assert_eq!(ice_servers.get(2).unwrap().credential, "live777");
-        assert_eq!(
-            ice_servers.get(2).unwrap().credential_type,
-            RTCIceCredentialType::Password
-        );
 
         println!("{:?}", ice_servers);
     }

diff --git a/liveion/src/config.rs b/liveion/src/config.rs
@@ -2,11 +2,7 @@ use base64::engine::general_purpose::STANDARD;
 use base64::Engine;
 use serde::{Deserialize, Serialize};
 use std::{env, fs, net::SocketAddr, str::FromStr};
-use webrtc::{
-    ice,
-    ice_transport::{ice_credential_type::RTCIceCredentialType, ice_server::RTCIceServer},
-    Error,
-};
+use webrtc::{ice, ice_transport::ice_server::RTCIceServer, Error};
 
 #[derive(Debug, Default, Clone, Deserialize, Serialize)]
 pub struct Config {
@@ -200,24 +196,7 @@ impl IceServer {
                     return Err(Error::ErrNoTurnCredentials);
                 }
                 url.username.clone_from(&self.username);
-
-                match self.credential_type.as_str().into() {
-                    RTCIceCredentialType::Password => {
-                        // https://www.w3.org/TR/webrtc/#set-the-configuration (step #11.3.3)
-                        url.password.clone_from(&self.credential);
-                    }
-                    RTCIceCredentialType::Oauth => {
-                        // https://www.w3.org/TR/webrtc/#set-the-configuration (step #11.3.4)
-                        /*if _, ok: = s.Credential.(OAuthCredential); !ok {
-                                return nil,
-                                &rtcerr.InvalidAccessError{Err: ErrTurnCredentials
-                            }
-                        }*/
-                    }
-                    _ => return Err(Error::ErrTurnCredentials),
-                };
             }
-
             urls.push(url);
         }
 
@@ -231,7 +210,6 @@ impl From<IceServer> for RTCIceServer {
             urls: val.urls,
             username: val.username,
             credential: val.credential,
-            credential_type: val.credential_type.as_str().into(),
         }
     }
 }

diff --git a/tools/whepfrom/src/main.rs b/tools/whepfrom/src/main.rs
@@ -9,7 +9,6 @@ use tokio::{
     sync::mpsc::{unbounded_channel, UnboundedSender},
 };
 use tracing::{debug, info, trace, warn, Level};
-use webrtc::ice_transport::ice_credential_type::RTCIceCredentialType;
 use webrtc::{
     api::{interceptor_registry::register_default_interceptors, media_engine::*, APIBuilder},
     ice_transport::ice_server::RTCIceServer,
@@ -190,7 +189,6 @@ async fn new_peer(
                 urls: vec!["stun:stun.l.google.com:19302".to_string()],
                 username: "".to_string(),
                 credential: "".to_string(),
-                credential_type: RTCIceCredentialType::Unspecified,
             }
         }],
         ..Default::default()

diff --git a/tools/whipinto/src/main.rs b/tools/whipinto/src/main.rs
@@ -12,7 +12,7 @@ use tokio::{
 use tracing::{debug, info, trace, warn, Level};
 use webrtc::{
     api::{interceptor_registry::register_default_interceptors, media_engine::*, APIBuilder},
-    ice_transport::{ice_credential_type::RTCIceCredentialType, ice_server::RTCIceServer},
+    ice_transport::ice_server::RTCIceServer,
     interceptor::registry::Registry,
     peer_connection::{
         configuration::RTCConfiguration, peer_connection_state::RTCPeerConnectionState,
@@ -180,7 +180,6 @@ async fn new_peer(
                 urls: vec!["stun:stun.l.google.com:19302".to_string()],
                 username: "".to_string(),
                 credential: "".to_string(),
-                credential_type: RTCIceCredentialType::Unspecified,
             }
         }],
         ..Default::default()

diff --git a/tools/whipinto/src/test.rs b/tools/whipinto/src/test.rs
@@ -9,7 +9,6 @@ mod tests {
     };
 
     use std::sync::Arc;
-    use webrtc::ice_transport::ice_credential_type::RTCIceCredentialType;
     use webrtc::peer_connection::policy::bundle_policy::RTCBundlePolicy;
     use webrtc::peer_connection::policy::ice_transport_policy::RTCIceTransportPolicy;
     use webrtc::peer_connection::policy::rtcp_mux_policy::RTCRtcpMuxPolicy;
@@ -35,7 +34,6 @@ mod tests {
                 urls: vec!["stun:stun.l.google.com:19302".to_string()],
                 username: "".to_string(),
                 credential: "".to_string(),
-                credential_type: RTCIceCredentialType::Unspecified,
             }],
             ..Default::default()
         };
@@ -55,7 +53,6 @@ mod tests {
                 ],
                 username: "live777".to_string(),
                 credential: "live777".to_string(),
-                credential_type: RTCIceCredentialType::Password,
             }],
             ..Default::default()
         };
@@ -77,10 +74,6 @@ mod tests {
         );
         assert_eq!(updated_config.ice_servers[0].username, "live777");
         assert_eq!(updated_config.ice_servers[0].credential, "live777");
-        assert_eq!(
-            updated_config.ice_servers[0].credential_type,
-            RTCIceCredentialType::Password
-        );
         assert_eq!(
             updated_config.ice_transport_policy,
             RTCIceTransportPolicy::Unspecified