Théo Monnom
Generated
+178
@@ -101,6 +101,22 @@ dependencies = [
|
|||||||
"unicode-width",
|
"unicode-width",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "core-foundation"
|
||||||
|
version = "0.9.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
|
||||||
|
dependencies = [
|
||||||
|
"core-foundation-sys",
|
||||||
|
"libc",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "core-foundation-sys"
|
||||||
|
version = "0.8.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cpufeatures"
|
name = "cpufeatures"
|
||||||
version = "0.2.4"
|
version = "0.2.4"
|
||||||
@@ -214,6 +230,21 @@ version = "1.0.7"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "foreign-types"
|
||||||
|
version = "0.3.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
|
||||||
|
dependencies = [
|
||||||
|
"foreign-types-shared",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "foreign-types-shared"
|
||||||
|
version = "0.1.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "form_urlencoded"
|
name = "form_urlencoded"
|
||||||
version = "1.0.1"
|
version = "1.0.1"
|
||||||
@@ -438,10 +469,13 @@ dependencies = [
|
|||||||
"anyhow",
|
"anyhow",
|
||||||
"env_logger",
|
"env_logger",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
|
"lazy_static",
|
||||||
|
"livekit-webrtc",
|
||||||
"log",
|
"log",
|
||||||
"prost 0.11.0",
|
"prost 0.11.0",
|
||||||
"prost-build",
|
"prost-build",
|
||||||
"prost-types 0.11.1",
|
"prost-types 0.11.1",
|
||||||
|
"serde_json",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tokio-tungstenite",
|
"tokio-tungstenite",
|
||||||
@@ -509,6 +543,24 @@ version = "0.8.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
|
checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "native-tls"
|
||||||
|
version = "0.2.10"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9"
|
||||||
|
dependencies = [
|
||||||
|
"lazy_static",
|
||||||
|
"libc",
|
||||||
|
"log",
|
||||||
|
"openssl",
|
||||||
|
"openssl-probe",
|
||||||
|
"openssl-sys",
|
||||||
|
"schannel",
|
||||||
|
"security-framework",
|
||||||
|
"security-framework-sys",
|
||||||
|
"tempfile",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num_cpus"
|
name = "num_cpus"
|
||||||
version = "1.13.1"
|
version = "1.13.1"
|
||||||
@@ -525,6 +577,51 @@ version = "1.13.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e"
|
checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "openssl"
|
||||||
|
version = "0.10.41"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags",
|
||||||
|
"cfg-if",
|
||||||
|
"foreign-types",
|
||||||
|
"libc",
|
||||||
|
"once_cell",
|
||||||
|
"openssl-macros",
|
||||||
|
"openssl-sys",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "openssl-macros"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "openssl-probe"
|
||||||
|
version = "0.1.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "openssl-sys"
|
||||||
|
version = "0.9.75"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f"
|
||||||
|
dependencies = [
|
||||||
|
"autocfg",
|
||||||
|
"cc",
|
||||||
|
"libc",
|
||||||
|
"pkg-config",
|
||||||
|
"vcpkg",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "parking_lot"
|
name = "parking_lot"
|
||||||
version = "0.12.1"
|
version = "0.12.1"
|
||||||
@@ -576,6 +673,12 @@ version = "0.1.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
|
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pkg-config"
|
||||||
|
version = "0.3.25"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ppv-lite86"
|
name = "ppv-lite86"
|
||||||
version = "0.2.16"
|
version = "0.2.16"
|
||||||
@@ -753,6 +856,22 @@ dependencies = [
|
|||||||
"winapi",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ryu"
|
||||||
|
version = "1.0.11"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "schannel"
|
||||||
|
version = "0.1.20"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
|
||||||
|
dependencies = [
|
||||||
|
"lazy_static",
|
||||||
|
"windows-sys",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "scopeguard"
|
name = "scopeguard"
|
||||||
version = "1.1.0"
|
version = "1.1.0"
|
||||||
@@ -765,6 +884,46 @@ version = "1.0.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
|
checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "security-framework"
|
||||||
|
version = "2.7.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags",
|
||||||
|
"core-foundation",
|
||||||
|
"core-foundation-sys",
|
||||||
|
"libc",
|
||||||
|
"security-framework-sys",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "security-framework-sys"
|
||||||
|
version = "2.6.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
|
||||||
|
dependencies = [
|
||||||
|
"core-foundation-sys",
|
||||||
|
"libc",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "serde"
|
||||||
|
version = "1.0.145"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "serde_json"
|
||||||
|
version = "1.0.85"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
|
||||||
|
dependencies = [
|
||||||
|
"itoa",
|
||||||
|
"ryu",
|
||||||
|
"serde",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sha-1"
|
name = "sha-1"
|
||||||
version = "0.10.0"
|
version = "0.10.0"
|
||||||
@@ -911,6 +1070,16 @@ dependencies = [
|
|||||||
"syn",
|
"syn",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tokio-native-tls"
|
||||||
|
version = "0.3.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
|
||||||
|
dependencies = [
|
||||||
|
"native-tls",
|
||||||
|
"tokio",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tokio-tungstenite"
|
name = "tokio-tungstenite"
|
||||||
version = "0.17.2"
|
version = "0.17.2"
|
||||||
@@ -919,7 +1088,9 @@ checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"log",
|
"log",
|
||||||
|
"native-tls",
|
||||||
"tokio",
|
"tokio",
|
||||||
|
"tokio-native-tls",
|
||||||
"tungstenite",
|
"tungstenite",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -935,6 +1106,7 @@ dependencies = [
|
|||||||
"http",
|
"http",
|
||||||
"httparse",
|
"httparse",
|
||||||
"log",
|
"log",
|
||||||
|
"native-tls",
|
||||||
"rand",
|
"rand",
|
||||||
"sha-1",
|
"sha-1",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
@@ -993,6 +1165,12 @@ version = "0.7.6"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
|
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "vcpkg"
|
||||||
|
version = "0.2.15"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "version_check"
|
name = "version_check"
|
||||||
version = "0.9.4"
|
version = "0.9.4"
|
||||||
|
|||||||
@@ -4,8 +4,9 @@ version = "0.1.0"
|
|||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
serde_json = "1.0"
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
tokio-tungstenite = "0.17.2"
|
tokio-tungstenite = { version = "0.17.2", features = ["native-tls"] }
|
||||||
tokio = { version = "1.20.1", features = ["full"] }
|
tokio = { version = "1.20.1", features = ["full"] }
|
||||||
url = "2.2.2"
|
url = "2.2.2"
|
||||||
futures-util = "0.3.23"
|
futures-util = "0.3.23"
|
||||||
@@ -13,6 +14,8 @@ thiserror = "1.0"
|
|||||||
prost = "0.11.0"
|
prost = "0.11.0"
|
||||||
prost-types = "0.11.1"
|
prost-types = "0.11.1"
|
||||||
anyhow = "1.0.63"
|
anyhow = "1.0.63"
|
||||||
|
livekit-webrtc = { path = "../livekit-webrtc" }
|
||||||
|
lazy_static = "1.4.0"
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
prost-build = { version = "0.10" }
|
prost-build = { version = "0.10" }
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ pub mod proto {
|
|||||||
include!(concat!(env!("OUT_DIR"), "/livekit.rs"));
|
include!(concat!(env!("OUT_DIR"), "/livekit.rs"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mod lk_runtime;
|
||||||
|
mod pc_transport;
|
||||||
mod rtc_engine;
|
mod rtc_engine;
|
||||||
mod signal_client;
|
mod signal_client;
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
use log::trace;
|
||||||
|
|
||||||
|
use livekit_webrtc::peer_connection_factory::PeerConnectionFactory;
|
||||||
|
use livekit_webrtc::webrtc::RTCRuntime;
|
||||||
|
|
||||||
|
pub struct LKRuntime {
|
||||||
|
pub rtc_runtime: RTCRuntime,
|
||||||
|
pub pc_factory: PeerConnectionFactory,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl LKRuntime {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
trace!("LKRuntime::new()");
|
||||||
|
Self {
|
||||||
|
rtc_runtime: RTCRuntime::new(),
|
||||||
|
pc_factory: PeerConnectionFactory::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Drop for LKRuntime {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
trace!("LKRuntime::drop()");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,122 @@
|
|||||||
|
use std::sync::Arc;
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use log::{error, trace};
|
||||||
|
|
||||||
|
use livekit_webrtc::jsep::{IceCandidate, SessionDescription};
|
||||||
|
use livekit_webrtc::peer_connection::{
|
||||||
|
PeerConnection, RTCOfferAnswerOptions, SignalingState,
|
||||||
|
};
|
||||||
|
use livekit_webrtc::peer_connection_factory::RTCConfiguration;
|
||||||
|
use livekit_webrtc::rtc_error::RTCError;
|
||||||
|
|
||||||
|
use crate::lk_runtime::LKRuntime;
|
||||||
|
|
||||||
|
const NEGOTIATION_FREQUENCY: Duration = Duration::from_millis(150); // TODO(theomonnom)
|
||||||
|
|
||||||
|
pub type OnOfferHandler = Box<dyn FnMut(SessionDescription) + Send>;
|
||||||
|
|
||||||
|
pub struct PCTransport {
|
||||||
|
peer_connection: PeerConnection,
|
||||||
|
pending_candidates: Vec<IceCandidate>,
|
||||||
|
on_offer_handler: Option<OnOfferHandler>,
|
||||||
|
restarting_ice: bool,
|
||||||
|
renegotiate: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PCTransport {
|
||||||
|
pub fn new(lk_runtime: Arc<LKRuntime>, cfg: RTCConfiguration) -> Result<Self, RTCError> {
|
||||||
|
let peer_connection = lk_runtime.pc_factory.create_peer_connection(cfg)?;
|
||||||
|
|
||||||
|
Ok(Self {
|
||||||
|
peer_connection,
|
||||||
|
pending_candidates: Vec::default(),
|
||||||
|
on_offer_handler: None,
|
||||||
|
restarting_ice: false,
|
||||||
|
renegotiate: false,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn peer_connection(&mut self) -> &mut PeerConnection {
|
||||||
|
&mut self.peer_connection
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn on_offer(&mut self, handler: OnOfferHandler) {
|
||||||
|
self.on_offer_handler = Some(handler);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn add_ice_candidate(&mut self, ice_candidate: IceCandidate) -> Result<(), RTCError> {
|
||||||
|
if self.peer_connection.remote_description().is_none() {
|
||||||
|
self.pending_candidates.push(ice_candidate);
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
self.peer_connection.add_ice_candidate(ice_candidate).await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn set_remote_description(
|
||||||
|
&mut self,
|
||||||
|
remote_description: SessionDescription,
|
||||||
|
) -> Result<(), RTCError> {
|
||||||
|
self.peer_connection
|
||||||
|
.set_remote_description(remote_description)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
for ic in self.pending_candidates.drain(..) {
|
||||||
|
self.peer_connection.add_ice_candidate(ic).await?;
|
||||||
|
}
|
||||||
|
self.restarting_ice = false;
|
||||||
|
|
||||||
|
if self.renegotiate {
|
||||||
|
self.renegotiate = false;
|
||||||
|
self.create_and_send_offer(RTCOfferAnswerOptions::default())
|
||||||
|
.await?;
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn negotiate(&mut self) -> Result<(), RTCError> {
|
||||||
|
// TODO(theomonnom) Debounce here with NEGOTIATION_FREQUENCY
|
||||||
|
self.create_and_send_offer(RTCOfferAnswerOptions::default())
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn create_and_send_offer(
|
||||||
|
&mut self,
|
||||||
|
options: RTCOfferAnswerOptions,
|
||||||
|
) -> Result<(), RTCError> {
|
||||||
|
if self.on_offer_handler.is_none() {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
if options.ice_restart {
|
||||||
|
trace!("restarting ICE");
|
||||||
|
self.restarting_ice = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if self.peer_connection.signaling_state() == SignalingState::HaveLocalOffer {
|
||||||
|
if options.ice_restart {
|
||||||
|
if let Some(remote_description) = self.peer_connection.remote_description() {
|
||||||
|
self.peer_connection
|
||||||
|
.set_remote_description(remote_description)
|
||||||
|
.await?;
|
||||||
|
} else {
|
||||||
|
error!("trying to ice restart when the pc doesn't have remote description");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
self.renegotiate = true;
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let offer = self.peer_connection.create_offer(options).await?;
|
||||||
|
trace!("created offer {:?}", offer);
|
||||||
|
self.peer_connection
|
||||||
|
.set_local_description(offer.clone())
|
||||||
|
.await?;
|
||||||
|
self.on_offer_handler.as_mut().unwrap()(offer);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,59 +1,419 @@
|
|||||||
use crate::proto::signal_response;
|
use std::sync::{Arc, Mutex, Weak};
|
||||||
use crate::signal_client::{SignalClient, SignalClientError};
|
use std::time::Duration;
|
||||||
use log::error;
|
|
||||||
use tokio::sync::broadcast;
|
|
||||||
|
|
||||||
pub struct RTCEngine {
|
use lazy_static::lazy_static;
|
||||||
signal_client: SignalClient,
|
use log::{error, trace};
|
||||||
|
use prost::Message as ProstMessage;
|
||||||
|
use thiserror::Error;
|
||||||
|
use tokio::sync::mpsc;
|
||||||
|
use tokio::time::sleep;
|
||||||
|
use tokio_tungstenite::tungstenite::protocol::frame::coding::Data;
|
||||||
|
|
||||||
|
use livekit_webrtc::data_channel::{DataChannel, DataChannelInit};
|
||||||
|
use livekit_webrtc::jsep::{IceCandidate, SdpParseError, SessionDescription};
|
||||||
|
use livekit_webrtc::peer_connection::{PeerConnectionState, RTCOfferAnswerOptions};
|
||||||
|
use livekit_webrtc::peer_connection_factory::{
|
||||||
|
ContinualGatheringPolicy, ICEServer, IceTransportsType, RTCConfiguration,
|
||||||
|
};
|
||||||
|
use livekit_webrtc::rtc_error::RTCError;
|
||||||
|
|
||||||
|
use crate::{proto, signal_client};
|
||||||
|
use crate::lk_runtime::LKRuntime;
|
||||||
|
use crate::pc_transport::PCTransport;
|
||||||
|
use crate::proto::{
|
||||||
|
DataPacket, JoinResponse, signal_request, signal_response, SignalTarget, TrickleRequest,
|
||||||
|
};
|
||||||
|
use crate::signal_client::{SignalClient, SignalError};
|
||||||
|
|
||||||
|
const LOSSY_DC_LABEL: &str = "_lossy";
|
||||||
|
const RELIABLE_DC_LABEL: &str = "_reliable";
|
||||||
|
|
||||||
|
#[derive(Error, Debug)]
|
||||||
|
pub enum EngineError {
|
||||||
|
#[error("signal failure")]
|
||||||
|
Signal(#[from] SignalError),
|
||||||
|
#[error("internal webrtc failure")]
|
||||||
|
Rtc(#[from] RTCError),
|
||||||
|
#[error("failed to parse sdp")]
|
||||||
|
Parse(#[from] SdpParseError),
|
||||||
|
#[error("serde error")]
|
||||||
|
Serde(#[from] serde_json::Error),
|
||||||
}
|
}
|
||||||
|
|
||||||
impl RTCEngine {
|
#[derive(PartialEq, Debug, Copy, Clone)]
|
||||||
pub fn new() -> RTCEngine {
|
enum PCState {
|
||||||
Self {
|
New,
|
||||||
signal_client: SignalClient::new(),
|
Connected,
|
||||||
|
Disconnected,
|
||||||
|
Reconnecting,
|
||||||
|
Closed,
|
||||||
|
}
|
||||||
|
|
||||||
|
lazy_static! {
|
||||||
|
// Share one LKRuntime across all RTCEngine instances
|
||||||
|
static ref LK_RUNTIME: Mutex<Weak<LKRuntime>> = Mutex::new(Weak::new());
|
||||||
|
}
|
||||||
|
|
||||||
|
enum EngineMessage {}
|
||||||
|
|
||||||
|
struct PeerInternal {
|
||||||
|
publisher_pc: PCTransport,
|
||||||
|
subscriber_pc: PCTransport,
|
||||||
|
|
||||||
|
lossy_dc: DataChannel,
|
||||||
|
reliable_dc: DataChannel,
|
||||||
|
|
||||||
|
pub_ice_rx: mpsc::Receiver<IceCandidate>,
|
||||||
|
sub_ice_rx: mpsc::Receiver<IceCandidate>,
|
||||||
|
|
||||||
|
pub_offer_rx: mpsc::Receiver<SessionDescription>,
|
||||||
|
|
||||||
|
primary_connection_state_rx: mpsc::Receiver<PeerConnectionState>,
|
||||||
|
secondary_connection_state_rx: mpsc::Receiver<PeerConnectionState>,
|
||||||
|
|
||||||
|
lossy_data_rx: mpsc::Receiver<DataPacket>,
|
||||||
|
reliable_data_rx: mpsc::Receiver<DataPacket>,
|
||||||
|
|
||||||
|
sub_dc_rx: mpsc::Receiver<DataChannel>,
|
||||||
|
|
||||||
|
pc_state: PCState,
|
||||||
|
}
|
||||||
|
|
||||||
|
struct RTCInternal {
|
||||||
|
#[allow(unused)]
|
||||||
|
lk_runtime: Arc<LKRuntime>,
|
||||||
|
signal_client: Arc<SignalClient>,
|
||||||
|
pc_internal: PeerInternal,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl RTCInternal {
|
||||||
|
async fn connect(url: &str, token: &str) -> Result<Self, EngineError> {
|
||||||
|
let mut lk_runtime = None;
|
||||||
|
{
|
||||||
|
// Acquire an existing/a new LKRuntime
|
||||||
|
let mut lk_runtime_ref = LK_RUNTIME.lock().unwrap();
|
||||||
|
lk_runtime = lk_runtime_ref.upgrade();
|
||||||
|
|
||||||
|
if lk_runtime.is_none() {
|
||||||
|
let new_runtime = Arc::new(LKRuntime::new());
|
||||||
|
*lk_runtime_ref = Arc::downgrade(&new_runtime);
|
||||||
|
lk_runtime = Some(new_runtime);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let lk_runtime = lk_runtime.unwrap();
|
||||||
|
let signal_client = Arc::new(signal_client::connect(url, token).await?);
|
||||||
|
|
||||||
|
trace!("waiting join_response..");
|
||||||
|
if let signal_response::Message::Join(join) = signal_client.recv().await? {
|
||||||
|
trace!("configuring peer_connections: {:?}", join);
|
||||||
|
let mut pc_internal = Self::configure(lk_runtime.clone(), join.clone())?;
|
||||||
|
|
||||||
|
if !join.subscriber_primary {
|
||||||
|
pc_internal.publisher_pc.negotiate().await?;
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(Self {
|
||||||
|
lk_runtime,
|
||||||
|
signal_client,
|
||||||
|
pc_internal,
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
panic!("the first received message isn't a JoinResponse");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn connect(&mut self, url: &str, token: &str) -> Result<(), SignalClientError> {
|
fn request_signal(&mut self, msg: signal_request::Message) {
|
||||||
self.signal_client.connect(url, token).await?;
|
tokio::spawn({
|
||||||
|
let sc = self.signal_client.clone();
|
||||||
|
|
||||||
tokio::spawn(Self::handle_rtc(
|
async move {
|
||||||
self.signal_client.response_rx.resubscribe(),
|
if let Err(err) = sc.send(msg).await {
|
||||||
));
|
error!("failed to send signal: {:?}", err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn handle_signal(&mut self, signal: signal_response::Message) -> Result<(), EngineError> {
|
||||||
|
match signal {
|
||||||
|
signal_response::Message::Answer(answer) => {
|
||||||
|
let sdp = SessionDescription::from(answer.r#type.parse().unwrap(), &answer.sdp)?;
|
||||||
|
self.pc_internal.publisher_pc.set_remote_description(sdp).await?;
|
||||||
|
},
|
||||||
|
signal_response::Message::Offer(offer) => {
|
||||||
|
let sdp = SessionDescription::from(offer.r#type.parse().unwrap(), &offer.sdp)?;
|
||||||
|
self.pc_internal.subscriber_pc.set_remote_description(sdp).await?;
|
||||||
|
let answer = self.pc_internal.subscriber_pc.peer_connection().create_answer(RTCOfferAnswerOptions::default()).await?;
|
||||||
|
self.pc_internal.subscriber_pc.peer_connection().set_local_description(answer.clone()).await?;
|
||||||
|
|
||||||
|
self.request_signal(signal_request::Message::Answer(proto::SessionDescription {
|
||||||
|
r#type: "answer".to_string(),
|
||||||
|
sdp: answer.to_string(),
|
||||||
|
}));
|
||||||
|
},
|
||||||
|
signal_response::Message::Trickle(trickle) => {
|
||||||
|
let json: serde_json::Value = serde_json::from_str(&trickle.candidate_init)?;
|
||||||
|
let ice = IceCandidate::from(
|
||||||
|
json["sdpMid"].as_str().unwrap(),
|
||||||
|
json["sdpMLineIndex"].as_i64().unwrap().try_into().unwrap(),
|
||||||
|
json["candidate"].as_str().unwrap()
|
||||||
|
)?;
|
||||||
|
|
||||||
|
if trickle.target == SignalTarget::Publisher as i32 {
|
||||||
|
self.pc_internal.publisher_pc.add_ice_candidate(ice).await?;
|
||||||
|
} else {
|
||||||
|
self.pc_internal.subscriber_pc.add_ice_candidate(ice).await?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => {},
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update(&self) {}
|
async fn run(&mut self) {
|
||||||
|
|
||||||
async fn handle_rtc(mut signal_receiver: broadcast::Receiver<signal_response::Message>) {
|
|
||||||
loop {
|
loop {
|
||||||
let msg = match signal_receiver.recv().await {
|
tokio::select! {
|
||||||
Ok(msg) => msg,
|
Ok(signal) = self.signal_client.recv() => {
|
||||||
Err(error) => {
|
if let Err(err) = self.handle_signal(signal).await {
|
||||||
error!("Failed to receive SignalResponse: {:?}", error);
|
error!("failed to handle signal: {:?}", err);
|
||||||
continue;
|
}
|
||||||
}
|
},
|
||||||
};
|
Some(ice_candidate) = self.pc_internal.pub_ice_rx.recv() => {
|
||||||
|
self.request_signal(signal_request::Message::Trickle(TrickleRequest {
|
||||||
|
candidate_init: ice_candidate.to_string(),
|
||||||
|
target: SignalTarget::Publisher as i32
|
||||||
|
}));
|
||||||
|
},
|
||||||
|
Some(ice_candidate) = self.pc_internal.sub_ice_rx.recv() => {
|
||||||
|
self.request_signal(signal_request::Message::Trickle(TrickleRequest {
|
||||||
|
candidate_init: ice_candidate.to_string(),
|
||||||
|
target: SignalTarget::Subscriber as i32
|
||||||
|
}));
|
||||||
|
},
|
||||||
|
Some(sdp) = self.pc_internal.pub_offer_rx.recv() => {
|
||||||
|
trace!("received publisher offer: {:?}", sdp);
|
||||||
|
self.request_signal(signal_request::Message::Offer(proto::SessionDescription {
|
||||||
|
r#type: "offer".to_string(),
|
||||||
|
sdp: sdp.to_string(),
|
||||||
|
}));
|
||||||
|
},
|
||||||
|
Some(state) = self.pc_internal.primary_connection_state_rx.recv() => {
|
||||||
|
if state == PeerConnectionState::Connected {
|
||||||
|
let old_state = self.pc_internal.pc_state;
|
||||||
|
self.pc_internal.pc_state = PCState::Connected;
|
||||||
|
|
||||||
match msg {
|
if old_state == PCState::New {
|
||||||
signal_response::Message::Join(join) => {}
|
// TODO(theomonnom) OnConnected
|
||||||
signal_response::Message::Trickle(trickle) => {}
|
}
|
||||||
signal_response::Message::Answer(answer) => {}
|
} else if state == PeerConnectionState::Failed {
|
||||||
signal_response::Message::Offer(offer) => {}
|
self.pc_internal.pc_state = PCState::Disconnected;
|
||||||
_ => {}
|
// TODO(theomonnom) Handle Disconnect
|
||||||
|
}
|
||||||
|
},
|
||||||
|
Some(state) = self.pc_internal.secondary_connection_state_rx.recv() => {
|
||||||
|
if state == PeerConnectionState::Failed {
|
||||||
|
self.pc_internal.pc_state = PCState::Disconnected;
|
||||||
|
// TODO(theomonnom) Handle Disconnect
|
||||||
|
}
|
||||||
|
},
|
||||||
|
Some(data) = self.pc_internal.lossy_data_rx.recv() => {
|
||||||
|
|
||||||
|
},
|
||||||
|
Some(data) = self.pc_internal.reliable_data_rx.recv() => {
|
||||||
|
|
||||||
|
},
|
||||||
|
Some(mut dc) = self.pc_internal.sub_dc_rx.recv() => {
|
||||||
|
// Subscriber DataChannels
|
||||||
|
// Only received when the subscriber_primary is enabled
|
||||||
|
trace!("using subscriber data channels");
|
||||||
|
|
||||||
|
let (data_tx, data_rx) = mpsc::channel(8);
|
||||||
|
Self::configure_dc(&mut dc, data_tx);
|
||||||
|
|
||||||
|
if dc.label() == RELIABLE_DC_LABEL {
|
||||||
|
self.pc_internal.reliable_dc = dc;
|
||||||
|
self.pc_internal.reliable_data_rx = data_rx;
|
||||||
|
} else {
|
||||||
|
self.pc_internal.lossy_dc = dc;
|
||||||
|
self.pc_internal.lossy_data_rx = data_rx;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn configure_dc(data_channel: &mut DataChannel, data_tx: mpsc::Sender<DataPacket>) {
|
||||||
|
let label = data_channel.label();
|
||||||
|
data_channel.on_message(Box::new(move |data, _| {
|
||||||
|
if let Ok(data) = DataPacket::decode(data) {
|
||||||
|
let _ = data_tx.blocking_send(data);
|
||||||
|
} else {
|
||||||
|
trace!("{} - failed to decode DataPacket", label);
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
fn configure(
|
||||||
|
lk_runtime: Arc<LKRuntime>,
|
||||||
|
join: JoinResponse,
|
||||||
|
) -> Result<PeerInternal, EngineError> {
|
||||||
|
let cfg = RTCConfiguration {
|
||||||
|
ice_servers: {
|
||||||
|
let mut servers = vec![];
|
||||||
|
for is in join.ice_servers {
|
||||||
|
servers.push(ICEServer {
|
||||||
|
urls: is.urls,
|
||||||
|
username: is.username,
|
||||||
|
password: is.credential,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
servers
|
||||||
|
},
|
||||||
|
continual_gathering_policy: ContinualGatheringPolicy::GatherContinually,
|
||||||
|
ice_transport_type: IceTransportsType::All,
|
||||||
|
};
|
||||||
|
|
||||||
|
// Create the PeerConnections
|
||||||
|
let mut publisher_pc = PCTransport::new(lk_runtime.clone(), cfg.clone())?;
|
||||||
|
let mut subscriber_pc = PCTransport::new(lk_runtime, cfg)?;
|
||||||
|
|
||||||
|
let (pub_ice_tx, pub_ice_rx) = mpsc::channel(8);
|
||||||
|
let (sub_ice_tx, sub_ice_rx) = mpsc::channel(8);
|
||||||
|
let (pub_offer_tx, pub_offer_rx) = mpsc::channel(8);
|
||||||
|
let (primary_connection_state_tx, primary_connection_state_rx) = mpsc::channel(8);
|
||||||
|
let (secondary_connection_state_tx, secondary_connection_state_rx) = mpsc::channel(8);
|
||||||
|
let (lossy_data_tx, lossy_data_rx) = mpsc::channel(8);
|
||||||
|
let (reliable_data_tx, reliable_data_rx) = mpsc::channel(8);
|
||||||
|
let (sub_dc_tx, sub_dc_rx) = mpsc::channel(8);
|
||||||
|
|
||||||
|
publisher_pc
|
||||||
|
.peer_connection()
|
||||||
|
.on_ice_candidate(Box::new(move |ice_candidate| {
|
||||||
|
trace!("publisher - on_ice_candidate: {:?}", ice_candidate);
|
||||||
|
let _ = pub_ice_tx.blocking_send(ice_candidate);
|
||||||
|
}));
|
||||||
|
|
||||||
|
subscriber_pc
|
||||||
|
.peer_connection()
|
||||||
|
.on_ice_candidate(Box::new(move |ice_candidate| {
|
||||||
|
trace!("subscriber - on_ice_candidate: {:?}", ice_candidate);
|
||||||
|
let _ = sub_ice_tx.blocking_send(ice_candidate);
|
||||||
|
}));
|
||||||
|
|
||||||
|
publisher_pc.on_offer(Box::new(move |offer| {
|
||||||
|
trace!("publisher - on_offer: {:?}", offer);
|
||||||
|
let _ = pub_offer_tx.blocking_send(offer); // TODO(theomonnom) Don't use blocking_send here
|
||||||
|
}));
|
||||||
|
|
||||||
|
let mut primary_pc = &mut publisher_pc;
|
||||||
|
let mut secondary_pc = &mut subscriber_pc;
|
||||||
|
if join.subscriber_primary {
|
||||||
|
primary_pc = &mut subscriber_pc;
|
||||||
|
secondary_pc = &mut publisher_pc;
|
||||||
|
|
||||||
|
primary_pc.peer_connection().on_data_channel(Box::new(move |dc| {
|
||||||
|
let _ = sub_dc_tx.blocking_send(dc);
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
primary_pc
|
||||||
|
.peer_connection()
|
||||||
|
.on_connection_change(Box::new(move |state| {
|
||||||
|
let _ = primary_connection_state_tx.blocking_send(state);
|
||||||
|
}));
|
||||||
|
|
||||||
|
secondary_pc
|
||||||
|
.peer_connection()
|
||||||
|
.on_connection_change(Box::new(move |state| {
|
||||||
|
let _ = secondary_connection_state_tx.blocking_send(state);
|
||||||
|
}));
|
||||||
|
|
||||||
|
// Note that when subscriber_primary feature is enabled,
|
||||||
|
// the subscriber uses his own data channels created by the server.
|
||||||
|
let mut lossy_dc = publisher_pc.peer_connection().create_data_channel(
|
||||||
|
LOSSY_DC_LABEL,
|
||||||
|
DataChannelInit {
|
||||||
|
ordered: true,
|
||||||
|
max_retransmits: Some(0),
|
||||||
|
..DataChannelInit::default()
|
||||||
|
},
|
||||||
|
)?;
|
||||||
|
|
||||||
|
let mut reliable_dc = publisher_pc.peer_connection().create_data_channel(
|
||||||
|
RELIABLE_DC_LABEL,
|
||||||
|
DataChannelInit {
|
||||||
|
ordered: true,
|
||||||
|
..DataChannelInit::default()
|
||||||
|
},
|
||||||
|
)?;
|
||||||
|
|
||||||
|
Self::configure_dc(&mut lossy_dc, lossy_data_tx);
|
||||||
|
Self::configure_dc(&mut reliable_dc, reliable_data_tx);
|
||||||
|
|
||||||
|
Ok(PeerInternal {
|
||||||
|
publisher_pc,
|
||||||
|
subscriber_pc,
|
||||||
|
lossy_dc,
|
||||||
|
reliable_dc,
|
||||||
|
pub_ice_rx,
|
||||||
|
sub_ice_rx,
|
||||||
|
pub_offer_rx,
|
||||||
|
primary_connection_state_rx,
|
||||||
|
secondary_connection_state_rx,
|
||||||
|
lossy_data_rx,
|
||||||
|
reliable_data_rx,
|
||||||
|
sub_dc_rx,
|
||||||
|
pc_state: PCState::New,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct RTCEngine {}
|
||||||
|
|
||||||
|
/// Initialize the SignalClient & the PeerConnections
|
||||||
|
pub async fn connect(url: &str, token: &str) -> Result<RTCEngine, EngineError> {
|
||||||
|
let mut rtc_internal = RTCInternal::connect(url, token).await?;
|
||||||
|
tokio::spawn(async move {
|
||||||
|
rtc_internal.run().await
|
||||||
|
});
|
||||||
|
|
||||||
|
Ok(RTCEngine{})
|
||||||
|
}
|
||||||
|
|
||||||
|
impl RTCEngine {
|
||||||
|
async fn rtc_handle() {
|
||||||
|
loop {}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_test() {
|
async fn test_test() {
|
||||||
env_logger::init();
|
env_logger::init();
|
||||||
|
|
||||||
let mut engine = RTCEngine::new();
|
let engine = connect("ws://localhost:7880", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NzEyMzk4NjAsImlzcyI6IkFQSXpLYkFTaUNWYWtnSiIsIm5hbWUiOiJ0ZXN0IiwibmJmIjoxNjY0MDM5ODYwLCJzdWIiOiJ0ZXN0IiwidmlkZW8iOnsicm9vbUFkbWluIjp0cnVlLCJyb29tQ3JlYXRlIjp0cnVlLCJyb29tSm9pbiI6dHJ1ZX19.0Bee2jI2cSZveAbZ8MLc-ADoMYQ4l8IRxcAxpXAS6a8").await.unwrap();
|
||||||
engine.connect("ws://localhost:7880", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NjQ1OTY4MDYsImlzcyI6IkFQSUNrSG04M01oZ2hQeCIsIm5hbWUiOiJ1c2VyMSIsIm5iZiI6MTY2MDk5NjgwNiwic3ViIjoidXNlcjEiLCJ2aWRlbyI6eyJyb29tIjoibXktZmlyc3Qtcm9vbSIsInJvb21Kb2luIjp0cnVlfX0.SWU_LETMK6ZmFOf38pYjVhpur0o7jJc6u61h8BH7g20").await.unwrap();
|
|
||||||
|
|
||||||
|
sleep(Duration::from_secs(60)).await;
|
||||||
|
|
||||||
// Wait before exiting the program
|
|
||||||
tokio::time::sleep(core::time::Duration::from_millis(1000 * 25)).await;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*sync fn handle_rtc(mut signal_receiver: broadcast::Receiver<Message>) {
|
||||||
|
loop {
|
||||||
|
let msg = match signal_receiver.recv().await {
|
||||||
|
Ok(msg) => msg,
|
||||||
|
Err(error) => {
|
||||||
|
error!("Failed to receive SignalResponse: {:?}", error);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
match msg {
|
||||||
|
Message::Join(join) => {}
|
||||||
|
Message::Trickle(trickle) => {}
|
||||||
|
Message::Answer(answer) => {}
|
||||||
|
Message::Offer(offer) => {}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}*/
|
||||||
|
|||||||
@@ -1,100 +1,186 @@
|
|||||||
use futures_util::SinkExt;
|
use futures_util::{SinkExt, StreamExt};
|
||||||
use futures_util::StreamExt;
|
use futures_util::stream::{SplitSink, SplitStream};
|
||||||
use log::{error, info};
|
use log::{error, info};
|
||||||
use prost::Message as ProtoMessage;
|
use prost::Message as ProstMessage;
|
||||||
use std::borrow::Borrow;
|
|
||||||
use thiserror::Error;
|
use thiserror::Error;
|
||||||
use tokio::net::TcpStream;
|
use tokio::net::TcpStream;
|
||||||
use tokio::sync::broadcast;
|
use tokio::sync::{mpsc, oneshot};
|
||||||
use tokio::task::JoinHandle;
|
use tokio::task::JoinHandle;
|
||||||
use tokio_tungstenite::tungstenite::Message;
|
|
||||||
use tokio_tungstenite::{connect_async, MaybeTlsStream, WebSocketStream};
|
use tokio_tungstenite::{connect_async, MaybeTlsStream, WebSocketStream};
|
||||||
|
use tokio_tungstenite::tungstenite::{
|
||||||
|
Error as WsError,
|
||||||
|
Message, protocol::frame::{CloseFrame, coding::CloseCode},
|
||||||
|
};
|
||||||
|
|
||||||
use crate::{proto, proto::signal_response};
|
use crate::proto::{signal_request, signal_response, SignalRequest, SignalResponse};
|
||||||
|
|
||||||
|
pub const PROTOCOL_VERSION: u32 = 8;
|
||||||
|
|
||||||
#[derive(Error, Debug)]
|
#[derive(Error, Debug)]
|
||||||
pub enum SignalClientError {
|
pub enum SignalError {
|
||||||
#[error("websocket failure")]
|
#[error("websocket failure")]
|
||||||
WebSocket(#[from] tokio_tungstenite::tungstenite::Error),
|
WsError(#[from] WsError),
|
||||||
#[error("failed to parse the url")]
|
#[error("failed to parse the url")]
|
||||||
UrlParse(#[from] url::ParseError),
|
UrlParse(#[from] url::ParseError),
|
||||||
#[error("failed to parse messages from server")]
|
#[error("failed to decode messages from server")]
|
||||||
ProtoParse(#[from] prost::DecodeError),
|
ProtoParse(#[from] prost::DecodeError),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type SignalResult<T> = Result<T, SignalError>;
|
||||||
|
type WebSocket = WebSocketStream<MaybeTlsStream<TcpStream>>;
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
struct RecvMessage {
|
||||||
|
response_chn: oneshot::Sender<SignalResult<signal_response::Message>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
struct SendMessage {
|
||||||
|
signal: signal_request::Message,
|
||||||
|
response_chn: oneshot::Sender<SignalResult<()>>,
|
||||||
|
}
|
||||||
|
|
||||||
pub struct SignalClient {
|
pub struct SignalClient {
|
||||||
ws_handle: Option<JoinHandle<Result<(), SignalClientError>>>,
|
read_sender: mpsc::Sender<RecvMessage>,
|
||||||
response_tx: broadcast::Sender<signal_response::Message>,
|
write_sender: mpsc::Sender<SendMessage>,
|
||||||
pub response_rx: broadcast::Receiver<signal_response::Message>,
|
write_shutdown_sender: oneshot::Sender<()>,
|
||||||
|
read_shutdown_sender: oneshot::Sender<()>,
|
||||||
|
read_handle: JoinHandle<()>,
|
||||||
|
write_handle: JoinHandle<()>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn connect(url: &str, token: &str) -> SignalResult<SignalClient> {
|
||||||
|
let mut lk_url = url::Url::parse(url)?;
|
||||||
|
lk_url.set_path("/rtc");
|
||||||
|
lk_url
|
||||||
|
.query_pairs_mut()
|
||||||
|
.append_pair("access_token", token)
|
||||||
|
.append_pair("protocol", PROTOCOL_VERSION.to_string().as_str());
|
||||||
|
|
||||||
|
let (ws_stream, _) = connect_async(lk_url).await?;
|
||||||
|
let (ws_writer, ws_reader) = ws_stream.split();
|
||||||
|
|
||||||
|
let (read_tx, read_rx) = mpsc::channel::<RecvMessage>(1);
|
||||||
|
let (write_tx, write_rx) = mpsc::channel::<SendMessage>(1);
|
||||||
|
let (read_shutdown_tx, read_shutdown_rx) = oneshot::channel();
|
||||||
|
let (write_shutdown_tx, write_shutdown_rx) = oneshot::channel();
|
||||||
|
|
||||||
|
let read_handle = tokio::spawn(SignalClient::ws_read(read_rx, ws_reader, read_shutdown_rx));
|
||||||
|
let write_handle = tokio::spawn(SignalClient::ws_write(
|
||||||
|
write_rx,
|
||||||
|
ws_writer,
|
||||||
|
write_shutdown_rx,
|
||||||
|
));
|
||||||
|
|
||||||
|
Ok(SignalClient {
|
||||||
|
read_sender: read_tx,
|
||||||
|
write_sender: write_tx,
|
||||||
|
write_shutdown_sender: write_shutdown_tx,
|
||||||
|
read_shutdown_sender: read_shutdown_tx,
|
||||||
|
read_handle,
|
||||||
|
write_handle,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
impl SignalClient {
|
impl SignalClient {
|
||||||
pub fn new() -> Self {
|
pub async fn close(self) {
|
||||||
let (tx, rx) = broadcast::channel(16);
|
let _ = self.write_shutdown_sender.send(());
|
||||||
|
let _ = self.write_handle.await;
|
||||||
Self {
|
let _ = self.read_shutdown_sender.send(());
|
||||||
response_tx: tx,
|
let _ = self.read_handle.await;
|
||||||
response_rx: rx,
|
|
||||||
ws_handle: None,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn connect(&mut self, url: &str, token: &str) -> Result<(), SignalClientError> {
|
pub async fn recv(&self) -> SignalResult<signal_response::Message> {
|
||||||
let mut lk_url = url::Url::parse(url)?;
|
let (send, recv) = oneshot::channel();
|
||||||
lk_url.set_path("/rtc");
|
let msg = RecvMessage { response_chn: send };
|
||||||
lk_url
|
let _ = self.read_sender.send(msg).await;
|
||||||
.query_pairs_mut()
|
recv.await.expect("channel closed")
|
||||||
.append_pair("access_token", token)
|
|
||||||
.append_pair("protocol", "8");
|
|
||||||
|
|
||||||
info!("Connecting to {}", lk_url);
|
|
||||||
let (ws, _) = connect_async(&lk_url).await?;
|
|
||||||
|
|
||||||
self.ws_handle = Some(tokio::spawn(Self::handle_ws(ws, self.response_tx.clone())));
|
|
||||||
Ok(())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn disconnect() {
|
pub async fn send(&self, signal: signal_request::Message) -> SignalResult<()> {
|
||||||
unimplemented!()
|
let (send, recv) = oneshot::channel();
|
||||||
|
let msg = SendMessage {
|
||||||
|
signal,
|
||||||
|
response_chn: send,
|
||||||
|
};
|
||||||
|
let _ = self.write_sender.send(msg).await;
|
||||||
|
recv.await.expect("channel closed")
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn handle_ws(
|
async fn ws_write(
|
||||||
mut ws: WebSocketStream<MaybeTlsStream<TcpStream>>,
|
mut write_receiver: mpsc::Receiver<SendMessage>,
|
||||||
response_tx: broadcast::Sender<signal_response::Message>,
|
mut ws_writer: SplitSink<WebSocket, Message>,
|
||||||
) -> Result<(), SignalClientError> {
|
mut shutdown_receiver: oneshot::Receiver<()>,
|
||||||
|
) {
|
||||||
loop {
|
loop {
|
||||||
tokio::select! {
|
tokio::select! {
|
||||||
next_msg = ws.next() => {
|
Some(msg) = write_receiver.recv() => {
|
||||||
let ws_msg = match next_msg {
|
let req = SignalRequest {
|
||||||
Some(msg) => msg?,
|
message: Some(msg.signal),
|
||||||
None => break,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
let data = match ws_msg {
|
let write_res = ws_writer.send(Message::Binary(req.encode_to_vec())).await;
|
||||||
Message::Binary(data) => data,
|
if let Err(err) = write_res {
|
||||||
Message::Ping(data) => {
|
error!("failed to send message to ws: {:?}", err);
|
||||||
ws.send(Message::Pong(data)).await?;
|
let _ = msg.response_chn.send(Err(err.into()));
|
||||||
continue
|
break;
|
||||||
},
|
|
||||||
Message::Close(_frame) => break,
|
|
||||||
_ => continue,
|
|
||||||
};
|
|
||||||
|
|
||||||
let proto_msg = proto::SignalResponse::decode(data.borrow())?;
|
|
||||||
let signal_response = proto_msg.message.unwrap();
|
|
||||||
|
|
||||||
match signal_response {
|
|
||||||
signal_response::Message::Pong(ts) => {
|
|
||||||
|
|
||||||
},
|
|
||||||
_ => {
|
|
||||||
response_tx.send(signal_response).unwrap();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let _ = msg.response_chn.send(Ok(()));
|
||||||
|
},
|
||||||
|
_ = (&mut shutdown_receiver) => {
|
||||||
|
let _ = ws_writer.send(Message::Close(Some(CloseFrame {
|
||||||
|
code: CloseCode::Normal,
|
||||||
|
reason: "disconnected by client".into()
|
||||||
|
}))).await;
|
||||||
|
let _ = ws_writer.flush().await;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
async fn ws_read(
|
||||||
|
mut write_receiver: mpsc::Receiver<RecvMessage>,
|
||||||
|
mut ws_reader: SplitStream<WebSocket>,
|
||||||
|
mut shutdown_receiver: oneshot::Receiver<()>,
|
||||||
|
) {
|
||||||
|
loop {
|
||||||
|
tokio::select! {
|
||||||
|
Some(msg) = write_receiver.recv() => {
|
||||||
|
let read = ws_reader.next().await;
|
||||||
|
if read.is_none() {
|
||||||
|
let _ = msg.response_chn.send(Err(SignalError::WsError(WsError::ConnectionClosed)));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
let read = read.unwrap();
|
||||||
|
match read {
|
||||||
|
Ok(Message::Binary(data)) => {
|
||||||
|
let res = SignalResponse::decode(data.as_slice()).expect("failed to decode incoming SignalResponse");
|
||||||
|
|
||||||
|
// TODO(theomonnon) Handle Message::Pong
|
||||||
|
let res = res.message.unwrap();
|
||||||
|
let _ = msg.response_chn.send(Ok(res));
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
error!("unhandled websocket message: {:?}", read);
|
||||||
|
let _ = msg.response_chn.send(Err(SignalError::WsError(WsError::ConnectionClosed)));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
_ = (&mut shutdown_receiver) => break
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn test_test() {
|
||||||
|
env_logger::init();
|
||||||
|
let client = connect("ws://localhost:7880", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NzEyMzk4NjAsImlzcyI6IkFQSXpLYkFTaUNWYWtnSiIsIm5hbWUiOiJ0ZXN0IiwibmJmIjoxNjY0MDM5ODYwLCJzdWIiOiJ0ZXN0IiwidmlkZW8iOnsicm9vbUFkbWluIjp0cnVlLCJyb29tQ3JlYXRlIjp0cnVlLCJyb29tSm9pbiI6dHJ1ZX19.0Bee2jI2cSZveAbZ8MLc-ADoMYQ4l8IRxcAxpXAS6a8").await.unwrap();
|
||||||
|
let msg = client.recv().await.unwrap();
|
||||||
|
|
||||||
|
client.close().await;
|
||||||
|
info!("Received message {:?}", msg);
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
[target.x86_64-pc-windows-msvc]
|
|
||||||
rustflags = ["-C", "target-feature=+crt-static"]
|
|
||||||
@@ -19,12 +19,15 @@ class IceCandidate {
|
|||||||
explicit IceCandidate(
|
explicit IceCandidate(
|
||||||
std::unique_ptr<webrtc::IceCandidateInterface> ice_candidate);
|
std::unique_ptr<webrtc::IceCandidateInterface> ice_candidate);
|
||||||
|
|
||||||
|
rust::String stringify() const;
|
||||||
std::unique_ptr<webrtc::IceCandidateInterface> release();
|
std::unique_ptr<webrtc::IceCandidateInterface> release();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::unique_ptr<webrtc::IceCandidateInterface> ice_candidate_;
|
std::unique_ptr<webrtc::IceCandidateInterface> ice_candidate_;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
std::unique_ptr<IceCandidate> create_ice_candidate(rust::String sdp_mid, int sdp_mline_index, rust::String sdp);
|
||||||
|
|
||||||
static std::unique_ptr<IceCandidate> _unique_ice_candidate() {
|
static std::unique_ptr<IceCandidate> _unique_ice_candidate() {
|
||||||
return nullptr; // Ignore
|
return nullptr; // Ignore
|
||||||
}
|
}
|
||||||
@@ -42,6 +45,8 @@ class SessionDescription {
|
|||||||
std::unique_ptr<webrtc::SessionDescriptionInterface> session_description_;
|
std::unique_ptr<webrtc::SessionDescriptionInterface> session_description_;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
std::unique_ptr<SessionDescription> create_session_description(SdpType type, rust::String sdp);
|
||||||
|
|
||||||
static std::unique_ptr<SessionDescription> _unique_session_description() {
|
static std::unique_ptr<SessionDescription> _unique_session_description() {
|
||||||
return nullptr; // Ignore
|
return nullptr; // Ignore
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,6 +34,10 @@ class PeerConnection {
|
|||||||
std::unique_ptr<NativeDataChannelInit> init);
|
std::unique_ptr<NativeDataChannelInit> init);
|
||||||
void add_ice_candidate(std::unique_ptr<IceCandidate> candidate,
|
void add_ice_candidate(std::unique_ptr<IceCandidate> candidate,
|
||||||
NativeAddIceCandidateObserver& observer);
|
NativeAddIceCandidateObserver& observer);
|
||||||
|
std::unique_ptr<SessionDescription> local_description() const;
|
||||||
|
std::unique_ptr<SessionDescription> remote_description() const;
|
||||||
|
SignalingState signaling_state() const;
|
||||||
|
IceGatheringState ice_gathering_state() const;
|
||||||
void close();
|
void close();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|||||||
@@ -17,6 +17,12 @@ struct DataChannelObserverWrapper;
|
|||||||
struct AddIceCandidateObserverWrapper;
|
struct AddIceCandidateObserverWrapper;
|
||||||
|
|
||||||
// Shared types
|
// Shared types
|
||||||
|
enum class PeerConnectionState;
|
||||||
|
enum class SignalingState;
|
||||||
|
enum class IceConnectionState;
|
||||||
|
enum class IceGatheringState;
|
||||||
|
enum class SdpType;
|
||||||
|
struct SdpParseError;
|
||||||
struct RTCOfferAnswerOptions;
|
struct RTCOfferAnswerOptions;
|
||||||
struct RTCError;
|
struct RTCError;
|
||||||
struct DataChannelInit;
|
struct DataChannelInit;
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ use std::slice;
|
|||||||
#[cxx::bridge(namespace = "livekit")]
|
#[cxx::bridge(namespace = "livekit")]
|
||||||
pub mod ffi {
|
pub mod ffi {
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
#[repr(u32)]
|
#[repr(i32)]
|
||||||
pub enum Priority {
|
pub enum Priority {
|
||||||
VeryLow,
|
VeryLow,
|
||||||
Low,
|
Low,
|
||||||
@@ -36,7 +36,7 @@ pub mod ffi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
#[repr(u32)]
|
#[repr(i32)]
|
||||||
pub enum DataState {
|
pub enum DataState {
|
||||||
Connecting,
|
Connecting,
|
||||||
Open,
|
Open,
|
||||||
|
|||||||
@@ -4,22 +4,51 @@
|
|||||||
|
|
||||||
#include "livekit/jsep.h"
|
#include "livekit/jsep.h"
|
||||||
|
|
||||||
|
#include <iomanip>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
#include "libwebrtc-sys/src/jsep.rs.h"
|
#include "libwebrtc-sys/src/jsep.rs.h"
|
||||||
#include "livekit/rtc_error.h"
|
#include "livekit/rtc_error.h"
|
||||||
#include "rtc_base/ref_counted_object.h"
|
|
||||||
|
|
||||||
namespace livekit {
|
namespace livekit {
|
||||||
|
|
||||||
|
const std::string& serialize_sdp_error(webrtc::SdpParseError error) {
|
||||||
|
std::stringstream ss;
|
||||||
|
ss << std::hex << std::setfill('0');
|
||||||
|
ss << std::setw(8) << (uint32_t)error.line.length();
|
||||||
|
ss << std::dec << std::setw(1) << error.line;
|
||||||
|
ss << std::dec << std::setw(1) << error.description;
|
||||||
|
return ss.str();
|
||||||
|
}
|
||||||
|
|
||||||
IceCandidate::IceCandidate(
|
IceCandidate::IceCandidate(
|
||||||
std::unique_ptr<webrtc::IceCandidateInterface> ice_candidate)
|
std::unique_ptr<webrtc::IceCandidateInterface> ice_candidate)
|
||||||
: ice_candidate_(std::move(ice_candidate)) {}
|
: ice_candidate_(std::move(ice_candidate)) {}
|
||||||
|
|
||||||
|
rust::String IceCandidate::stringify() const {
|
||||||
|
std::string str;
|
||||||
|
ice_candidate_->ToString(&str);
|
||||||
|
return rust::String{str};
|
||||||
|
}
|
||||||
|
|
||||||
std::unique_ptr<webrtc::IceCandidateInterface> IceCandidate::release() {
|
std::unique_ptr<webrtc::IceCandidateInterface> IceCandidate::release() {
|
||||||
return std::move(ice_candidate_);
|
return std::move(ice_candidate_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<IceCandidate> create_ice_candidate(rust::String sdp_mid,
|
||||||
|
int sdp_mline_index,
|
||||||
|
rust::String sdp) {
|
||||||
|
webrtc::SdpParseError error;
|
||||||
|
auto ice_rtc = webrtc::CreateIceCandidate(sdp_mid.c_str(), sdp_mline_index,
|
||||||
|
sdp.c_str(), &error);
|
||||||
|
if (!ice_rtc) {
|
||||||
|
throw std::runtime_error(serialize_sdp_error(error));
|
||||||
|
}
|
||||||
|
|
||||||
|
return std::make_unique<IceCandidate>(
|
||||||
|
std::unique_ptr<webrtc::IceCandidateInterface>(ice_rtc));
|
||||||
|
}
|
||||||
|
|
||||||
SessionDescription::SessionDescription(
|
SessionDescription::SessionDescription(
|
||||||
std::unique_ptr<webrtc::SessionDescriptionInterface> session_description)
|
std::unique_ptr<webrtc::SessionDescriptionInterface> session_description)
|
||||||
: session_description_(std::move(session_description)) {}
|
: session_description_(std::move(session_description)) {}
|
||||||
@@ -39,6 +68,19 @@ SessionDescription::release() {
|
|||||||
return std::move(session_description_);
|
return std::move(session_description_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<SessionDescription> create_session_description(
|
||||||
|
SdpType type,
|
||||||
|
rust::String sdp) {
|
||||||
|
webrtc::SdpParseError error;
|
||||||
|
auto rtc_sdp = webrtc::CreateSessionDescription(
|
||||||
|
static_cast<webrtc::SdpType>(type), sdp.c_str(), &error);
|
||||||
|
if (!rtc_sdp) {
|
||||||
|
throw std::runtime_error(serialize_sdp_error(error));
|
||||||
|
}
|
||||||
|
|
||||||
|
return std::make_unique<SessionDescription>(std::move(rtc_sdp));
|
||||||
|
}
|
||||||
|
|
||||||
// CreateSdpObserver
|
// CreateSdpObserver
|
||||||
|
|
||||||
NativeCreateSdpObserver::NativeCreateSdpObserver(
|
NativeCreateSdpObserver::NativeCreateSdpObserver(
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
use std::fmt::{Debug, Formatter};
|
use std::error::Error;
|
||||||
|
use std::fmt::{Debug, Display, Formatter};
|
||||||
|
use std::str::FromStr;
|
||||||
|
|
||||||
use cxx::UniquePtr;
|
use cxx::UniquePtr;
|
||||||
|
|
||||||
@@ -6,6 +8,21 @@ use crate::rtc_error::ffi::RTCError;
|
|||||||
|
|
||||||
#[cxx::bridge(namespace = "livekit")]
|
#[cxx::bridge(namespace = "livekit")]
|
||||||
pub mod ffi {
|
pub mod ffi {
|
||||||
|
#[derive(Debug)]
|
||||||
|
#[repr(i32)]
|
||||||
|
pub enum SdpType {
|
||||||
|
Offer,
|
||||||
|
PrAnswer,
|
||||||
|
Answer,
|
||||||
|
Rollback,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct SdpParseError {
|
||||||
|
pub line: String,
|
||||||
|
pub description: String,
|
||||||
|
}
|
||||||
|
|
||||||
extern "Rust" {
|
extern "Rust" {
|
||||||
type CreateSdpObserverWrapper;
|
type CreateSdpObserverWrapper;
|
||||||
fn on_success(
|
fn on_success(
|
||||||
@@ -32,6 +49,8 @@ pub mod ffi {
|
|||||||
type NativeSetLocalSdpObserverHandle;
|
type NativeSetLocalSdpObserverHandle;
|
||||||
type NativeSetRemoteSdpObserverHandle;
|
type NativeSetRemoteSdpObserverHandle;
|
||||||
|
|
||||||
|
fn stringify(self: &IceCandidate) -> String;
|
||||||
|
|
||||||
fn stringify(self: &SessionDescription) -> String;
|
fn stringify(self: &SessionDescription) -> String;
|
||||||
fn clone(self: &SessionDescription) -> UniquePtr<SessionDescription>;
|
fn clone(self: &SessionDescription) -> UniquePtr<SessionDescription>;
|
||||||
|
|
||||||
@@ -45,8 +64,19 @@ pub mod ffi {
|
|||||||
observer: Box<SetRemoteSdpObserverWrapper>,
|
observer: Box<SetRemoteSdpObserverWrapper>,
|
||||||
) -> UniquePtr<NativeSetRemoteSdpObserverHandle>;
|
) -> UniquePtr<NativeSetRemoteSdpObserverHandle>;
|
||||||
|
|
||||||
|
fn create_ice_candidate(sdp_mid: String, sdp_mline_index: i32, sdp: String) -> Result<UniquePtr<IceCandidate>>;
|
||||||
|
fn create_session_description(sdp_type: SdpType, sdp: String) -> Result<UniquePtr<SessionDescription>>;
|
||||||
|
|
||||||
fn _unique_ice_candidate() -> UniquePtr<IceCandidate>; // Ignore
|
fn _unique_ice_candidate() -> UniquePtr<IceCandidate>; // Ignore
|
||||||
fn _unique_session_description() -> UniquePtr<SessionDescription>; // Ignore
|
fn _unique_session_description() -> UniquePtr<SessionDescription>; // Ignore
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Error for ffi::SdpParseError {}
|
||||||
|
|
||||||
|
impl Display for ffi::SdpParseError {
|
||||||
|
fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
|
||||||
|
write!(f, "SdpParseError occurred {}: {}", self.line, self.description)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,14 +87,46 @@ impl Debug for ffi::SessionDescription {
|
|||||||
}
|
}
|
||||||
|
|
||||||
unsafe impl Send for ffi::SessionDescription {}
|
unsafe impl Send for ffi::SessionDescription {}
|
||||||
|
unsafe impl Sync for ffi::SessionDescription {}
|
||||||
|
|
||||||
impl Debug for ffi::IceCandidate {
|
impl Debug for ffi::IceCandidate {
|
||||||
fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
|
fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
|
||||||
write!(f, "TODO") // TODO(theomonnom)
|
write!(f, "{}", self.stringify())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
unsafe impl Send for ffi::IceCandidate {}
|
unsafe impl Send for ffi::IceCandidate {}
|
||||||
|
unsafe impl Sync for ffi::IceCandidate {}
|
||||||
|
|
||||||
|
impl ffi::SdpParseError {
|
||||||
|
/// # Safety
|
||||||
|
/// The value must be correctly encoded
|
||||||
|
pub unsafe fn from(value: &str) -> Self {
|
||||||
|
// Parse the hex encoded error from c++
|
||||||
|
let line_length = u32::from_str_radix(&value[0..8], 16).unwrap() as usize + 8;
|
||||||
|
let line = String::from(&value[8..line_length]);
|
||||||
|
let description = String::from(&value[line_length..]);
|
||||||
|
|
||||||
|
Self {
|
||||||
|
line,
|
||||||
|
description,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl FromStr for ffi::SdpType {
|
||||||
|
type Err = ();
|
||||||
|
|
||||||
|
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
||||||
|
match s {
|
||||||
|
"offer" => Ok(ffi::SdpType::Offer),
|
||||||
|
"pranswer" => Ok(ffi::SdpType::PrAnswer),
|
||||||
|
"answer" => Ok(ffi::SdpType::Answer),
|
||||||
|
"rollback" => Ok(ffi::SdpType::Rollback),
|
||||||
|
_ => Err(()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// CreateSdpObserver
|
// CreateSdpObserver
|
||||||
|
|
||||||
@@ -130,3 +192,37 @@ impl SetRemoteSdpObserverWrapper {
|
|||||||
self.observer.on_set_remote_description_complete(error);
|
self.observer.on_set_remote_description_complete(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use log::info;
|
||||||
|
|
||||||
|
use crate::jsep::ffi;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn throw_error() {
|
||||||
|
let sdp_string = "v=0
|
||||||
|
o=- 6549709950142776241 2 IN IP4 127.0.0.1
|
||||||
|
s=-
|
||||||
|
t=0 0
|
||||||
|
======================== ERROR HERE
|
||||||
|
a=group:BUNDLE 0
|
||||||
|
a=extmap-allow-mixed
|
||||||
|
a=msid-semantic: WMS
|
||||||
|
m=application 9 UDP/DTLS/SCTP webrtc-datachannel
|
||||||
|
c=IN IP4 0.0.0.0
|
||||||
|
a=ice-ufrag:Tw7h
|
||||||
|
a=ice-pwd:6XOVUD6HpcB4c1M8EB8jXJE9
|
||||||
|
a=ice-options:trickle
|
||||||
|
a=fingerprint:sha-256 4F:EC:23:59:5D:A5:E6:3E:3E:5D:8A:09:B6:FA:04:AA:19:99:49:67:BD:65:93:06:BB:EE:AC:D5:21:0F:57:D6
|
||||||
|
a=setup:actpass
|
||||||
|
a=mid:0
|
||||||
|
a=sctp-port:5000
|
||||||
|
a=max-message-size:262144
|
||||||
|
";
|
||||||
|
|
||||||
|
let sdp = ffi::create_session_description(ffi::SdpType::Offer, sdp_string.to_string());
|
||||||
|
let err = unsafe { ffi::SdpParseError::from(sdp.err().unwrap().what()) };
|
||||||
|
info!("parse err: {:?}", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -76,10 +76,35 @@ void PeerConnection::add_ice_candidate(
|
|||||||
[&](const webrtc::RTCError& err) { observer.OnComplete(to_error(err)); });
|
[&](const webrtc::RTCError& err) { observer.OnComplete(to_error(err)); });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<SessionDescription> PeerConnection::local_description() const {
|
||||||
|
auto local_description = peer_connection_->local_description();
|
||||||
|
if (local_description)
|
||||||
|
return std::make_unique<SessionDescription>(local_description->Clone());
|
||||||
|
|
||||||
|
return std::unique_ptr<SessionDescription>();
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<SessionDescription> PeerConnection::remote_description() const {
|
||||||
|
auto remote_description = peer_connection_->remote_description();
|
||||||
|
if (remote_description)
|
||||||
|
return std::make_unique<SessionDescription>(remote_description->Clone());
|
||||||
|
|
||||||
|
return std::unique_ptr<SessionDescription>();
|
||||||
|
}
|
||||||
|
|
||||||
|
SignalingState PeerConnection::signaling_state() const {
|
||||||
|
return static_cast<SignalingState>(peer_connection_->signaling_state());
|
||||||
|
}
|
||||||
|
|
||||||
|
IceGatheringState PeerConnection::ice_gathering_state() const {
|
||||||
|
return static_cast<IceGatheringState>(peer_connection_->ice_gathering_state());
|
||||||
|
}
|
||||||
|
|
||||||
void PeerConnection::close() {
|
void PeerConnection::close() {
|
||||||
peer_connection_->Close();
|
peer_connection_->Close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// AddIceCandidateObserver
|
// AddIceCandidateObserver
|
||||||
|
|
||||||
NativeAddIceCandidateObserver::NativeAddIceCandidateObserver(
|
NativeAddIceCandidateObserver::NativeAddIceCandidateObserver(
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ pub mod ffi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
#[repr(u32)]
|
#[repr(i32)]
|
||||||
pub enum PeerConnectionState {
|
pub enum PeerConnectionState {
|
||||||
New,
|
New,
|
||||||
Connecting,
|
Connecting,
|
||||||
@@ -34,7 +34,7 @@ pub mod ffi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
#[repr(u32)]
|
#[repr(i32)]
|
||||||
pub enum SignalingState {
|
pub enum SignalingState {
|
||||||
Stable,
|
Stable,
|
||||||
HaveLocalOffer,
|
HaveLocalOffer,
|
||||||
@@ -45,7 +45,7 @@ pub mod ffi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
#[repr(u32)]
|
#[repr(i32)]
|
||||||
pub enum IceConnectionState {
|
pub enum IceConnectionState {
|
||||||
IceConnectionNew,
|
IceConnectionNew,
|
||||||
IceConnectionChecking,
|
IceConnectionChecking,
|
||||||
@@ -58,7 +58,7 @@ pub mod ffi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
#[repr(u32)]
|
#[repr(i32)]
|
||||||
pub enum IceGatheringState {
|
pub enum IceGatheringState {
|
||||||
IceGatheringNew,
|
IceGatheringNew,
|
||||||
IceGatheringGathering,
|
IceGatheringGathering,
|
||||||
@@ -158,6 +158,14 @@ pub mod ffi {
|
|||||||
observer: Pin<&mut NativeAddIceCandidateObserver>,
|
observer: Pin<&mut NativeAddIceCandidateObserver>,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
fn local_description(self: &PeerConnection) -> UniquePtr<SessionDescription>;
|
||||||
|
|
||||||
|
fn remote_description(self: &PeerConnection) -> UniquePtr<SessionDescription>;
|
||||||
|
|
||||||
|
fn signaling_state(self: &PeerConnection) -> SignalingState;
|
||||||
|
|
||||||
|
fn ice_gathering_state(self: &PeerConnection) -> IceGatheringState;
|
||||||
|
|
||||||
fn close(self: Pin<&mut PeerConnection>);
|
fn close(self: Pin<&mut PeerConnection>);
|
||||||
|
|
||||||
fn create_native_peer_connection_observer(
|
fn create_native_peer_connection_observer(
|
||||||
@@ -245,11 +253,23 @@ pub mod ffi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// https://webrtc.github.io/webrtc-org/native-code/native-apis/
|
// https://webrtc.github.io/webrtc-org/native-code/native-apis/
|
||||||
|
unsafe impl Send for ffi::PeerConnection {}
|
||||||
unsafe impl Sync for ffi::PeerConnection {}
|
unsafe impl Sync for ffi::PeerConnection {}
|
||||||
|
|
||||||
unsafe impl Send for ffi::PeerConnection {}
|
|
||||||
|
|
||||||
unsafe impl Send for ffi::NativePeerConnectionObserver {}
|
unsafe impl Send for ffi::NativePeerConnectionObserver {}
|
||||||
|
unsafe impl Sync for ffi::NativePeerConnectionObserver {}
|
||||||
|
|
||||||
|
unsafe impl Sync for ffi::NativeAddIceCandidateObserver {}
|
||||||
|
unsafe impl Send for ffi::NativeAddIceCandidateObserver {}
|
||||||
|
|
||||||
|
unsafe impl Sync for ffi::NativeSetRemoteSdpObserverHandle {}
|
||||||
|
unsafe impl Send for ffi::NativeSetRemoteSdpObserverHandle {}
|
||||||
|
|
||||||
|
unsafe impl Sync for ffi::NativeSetLocalSdpObserverHandle {}
|
||||||
|
unsafe impl Send for ffi::NativeSetLocalSdpObserverHandle {}
|
||||||
|
|
||||||
|
unsafe impl Sync for ffi::NativeCreateSdpObserverHandle {}
|
||||||
|
unsafe impl Send for ffi::NativeCreateSdpObserverHandle {}
|
||||||
|
|
||||||
impl Default for ffi::RTCOfferAnswerOptions {
|
impl Default for ffi::RTCOfferAnswerOptions {
|
||||||
/*
|
/*
|
||||||
@@ -272,17 +292,21 @@ impl Default for ffi::RTCOfferAnswerOptions {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub trait AddIceCandidateObserver: Send {
|
||||||
|
fn on_complete(&self, error: RTCError);
|
||||||
|
}
|
||||||
|
|
||||||
pub struct AddIceCandidateObserverWrapper {
|
pub struct AddIceCandidateObserverWrapper {
|
||||||
observer: Box<dyn Fn(RTCError) + Send>,
|
observer: Box<dyn AddIceCandidateObserver>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AddIceCandidateObserverWrapper {
|
impl AddIceCandidateObserverWrapper {
|
||||||
pub fn new(observer: Box<dyn Fn(RTCError) + Send>) -> Self {
|
pub fn new(observer: Box<dyn AddIceCandidateObserver>) -> Self {
|
||||||
Self { observer }
|
Self { observer }
|
||||||
}
|
}
|
||||||
|
|
||||||
fn on_complete(&self, error: RTCError) {
|
fn on_complete(&self, error: RTCError) {
|
||||||
(self.observer)(error);
|
self.observer.on_complete(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -86,8 +86,13 @@ std::unique_ptr<NativeRTCConfiguration> create_rtc_configuration(
|
|||||||
for (auto& url : item.urls) {
|
for (auto& url : item.urls) {
|
||||||
ice_server.urls.emplace_back(url.c_str());
|
ice_server.urls.emplace_back(url.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
rtc->servers.push_back(ice_server);
|
rtc->servers.push_back(ice_server);
|
||||||
|
rtc->continual_gathering_policy =
|
||||||
|
static_cast<webrtc::PeerConnectionInterface::ContinualGatheringPolicy>(
|
||||||
|
conf.continual_gathering_policy);
|
||||||
|
|
||||||
|
rtc->type = static_cast<webrtc::PeerConnectionInterface::IceTransportsType>(
|
||||||
|
conf.ice_transport_type);
|
||||||
}
|
}
|
||||||
|
|
||||||
return rtc;
|
return rtc;
|
||||||
|
|||||||
@@ -12,9 +12,27 @@ pub mod ffi {
|
|||||||
pub password: String,
|
pub password: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
#[repr(i32)]
|
||||||
|
pub enum ContinualGatheringPolicy {
|
||||||
|
GatherOnce,
|
||||||
|
GatherContinually,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
#[repr(i32)]
|
||||||
|
pub enum IceTransportsType {
|
||||||
|
None,
|
||||||
|
Relay,
|
||||||
|
NoHost,
|
||||||
|
All,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct RTCConfiguration {
|
pub struct RTCConfiguration {
|
||||||
pub ice_servers: Vec<ICEServer>,
|
pub ice_servers: Vec<ICEServer>,
|
||||||
|
pub continual_gathering_policy: ContinualGatheringPolicy,
|
||||||
|
pub ice_transport_type: IceTransportsType,
|
||||||
}
|
}
|
||||||
|
|
||||||
unsafe extern "C++" {
|
unsafe extern "C++" {
|
||||||
@@ -22,7 +40,7 @@ pub mod ffi {
|
|||||||
|
|
||||||
type PeerConnection = crate::peer_connection::ffi::PeerConnection;
|
type PeerConnection = crate::peer_connection::ffi::PeerConnection;
|
||||||
type NativePeerConnectionObserver =
|
type NativePeerConnectionObserver =
|
||||||
crate::peer_connection::ffi::NativePeerConnectionObserver;
|
crate::peer_connection::ffi::NativePeerConnectionObserver;
|
||||||
type PeerConnectionFactory;
|
type PeerConnectionFactory;
|
||||||
type NativeRTCConfiguration;
|
type NativeRTCConfiguration;
|
||||||
|
|
||||||
@@ -38,3 +56,6 @@ pub mod ffi {
|
|||||||
) -> Result<UniquePtr<PeerConnection>>;
|
) -> Result<UniquePtr<PeerConnection>>;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unsafe impl Send for ffi::PeerConnectionFactory {}
|
||||||
|
unsafe impl Sync for ffi::PeerConnectionFactory {}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ use std::fmt::{Display, Formatter};
|
|||||||
#[cxx::bridge(namespace = "livekit")]
|
#[cxx::bridge(namespace = "livekit")]
|
||||||
pub mod ffi {
|
pub mod ffi {
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
#[repr(u32)]
|
#[repr(i32)]
|
||||||
pub enum RTCErrorType {
|
pub enum RTCErrorType {
|
||||||
None,
|
None,
|
||||||
UnsupportedOperation,
|
UnsupportedOperation,
|
||||||
@@ -24,7 +24,7 @@ pub mod ffi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
#[repr(u32)]
|
#[repr(i32)]
|
||||||
pub enum RTCErrorDetailType {
|
pub enum RTCErrorDetailType {
|
||||||
None,
|
None,
|
||||||
DataChannelFailure,
|
DataChannelFailure,
|
||||||
|
|||||||
@@ -10,3 +10,6 @@ pub mod ffi {
|
|||||||
fn create_rtc_runtime() -> UniquePtr<RTCRuntime>;
|
fn create_rtc_runtime() -> UniquePtr<RTCRuntime>;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unsafe impl Send for ffi::RTCRuntime {}
|
||||||
|
unsafe impl Sync for ffi::RTCRuntime {}
|
||||||
|
|||||||
@@ -128,14 +128,14 @@ impl Default for InternalDataChannelObserver {
|
|||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct DataChannelInit {
|
pub struct DataChannelInit {
|
||||||
#[deprecated]
|
#[deprecated]
|
||||||
reliable: bool,
|
pub reliable: bool,
|
||||||
ordered: bool,
|
pub ordered: bool,
|
||||||
max_retransmit_time: Option<i32>,
|
pub max_retransmit_time: Option<i32>,
|
||||||
max_retransmits: Option<i32>,
|
pub max_retransmits: Option<i32>,
|
||||||
protocol: String,
|
pub protocol: String,
|
||||||
negotiated: bool,
|
pub negotiated: bool,
|
||||||
id: i32,
|
pub id: i32,
|
||||||
priority: Option<Priority>,
|
pub priority: Option<Priority>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for DataChannelInit {
|
impl Default for DataChannelInit {
|
||||||
|
|||||||
@@ -1,13 +1,24 @@
|
|||||||
use cxx::UniquePtr;
|
use cxx::UniquePtr;
|
||||||
|
|
||||||
use libwebrtc_sys::jsep as sys_jsep;
|
use libwebrtc_sys::jsep as sys_jsep;
|
||||||
|
|
||||||
|
pub use sys_jsep::ffi::{SdpType, SdpParseError};
|
||||||
|
|
||||||
|
// TODO Maybe we can replace that by a serialized IceCandidateInit
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct IceCandidate {
|
pub struct IceCandidate {
|
||||||
cxx_handle: UniquePtr<sys_jsep::ffi::IceCandidate>,
|
cxx_handle: UniquePtr<sys_jsep::ffi::IceCandidate>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl IceCandidate {
|
impl IceCandidate {
|
||||||
|
pub fn from(sdp_mid: &str, sdp_mline_index: i32, sdp: &str) -> Result<IceCandidate, SdpParseError> {
|
||||||
|
let res = sys_jsep::ffi::create_ice_candidate(sdp_mid.to_string(), sdp_mline_index, sdp.to_string());
|
||||||
|
|
||||||
|
match res {
|
||||||
|
Ok(cxx_handle) => Ok(IceCandidate::new(cxx_handle)),
|
||||||
|
Err(e) => Err(unsafe { SdpParseError::from(e.what()) }),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub(crate) fn new(cxx_handle: UniquePtr<sys_jsep::ffi::IceCandidate>) -> Self {
|
pub(crate) fn new(cxx_handle: UniquePtr<sys_jsep::ffi::IceCandidate>) -> Self {
|
||||||
Self { cxx_handle }
|
Self { cxx_handle }
|
||||||
}
|
}
|
||||||
@@ -17,12 +28,27 @@ impl IceCandidate {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl ToString for IceCandidate {
|
||||||
|
fn to_string(&self) -> String {
|
||||||
|
self.cxx_handle.stringify()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct SessionDescription {
|
pub struct SessionDescription {
|
||||||
cxx_handle: UniquePtr<sys_jsep::ffi::SessionDescription>,
|
cxx_handle: UniquePtr<sys_jsep::ffi::SessionDescription>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl SessionDescription {
|
impl SessionDescription {
|
||||||
|
pub fn from(sdp_type: SdpType, description: &str) -> Result<SessionDescription, SdpParseError> {
|
||||||
|
let res = sys_jsep::ffi::create_session_description(sdp_type, description.to_string());
|
||||||
|
|
||||||
|
match res {
|
||||||
|
Ok(cxx_handle) => Ok(SessionDescription::new(cxx_handle)),
|
||||||
|
Err(e) => Err(unsafe { SdpParseError::from(e.what()) }),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub(crate) fn new(cxx_handle: UniquePtr<sys_jsep::ffi::SessionDescription>) -> Self {
|
pub(crate) fn new(cxx_handle: UniquePtr<sys_jsep::ffi::SessionDescription>) -> Self {
|
||||||
Self { cxx_handle }
|
Self { cxx_handle }
|
||||||
}
|
}
|
||||||
@@ -32,6 +58,12 @@ impl SessionDescription {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl ToString for SessionDescription {
|
||||||
|
fn to_string(&self) -> String {
|
||||||
|
self.cxx_handle.stringify()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl Clone for SessionDescription {
|
impl Clone for SessionDescription {
|
||||||
fn clone(&self) -> Self {
|
fn clone(&self) -> Self {
|
||||||
SessionDescription::new(self.cxx_handle.clone())
|
SessionDescription::new(self.cxx_handle.clone())
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
use std::fmt::Debug;
|
|
||||||
use std::sync::{Arc, Mutex};
|
use std::sync::{Arc, Mutex};
|
||||||
|
|
||||||
use cxx::UniquePtr;
|
use cxx::UniquePtr;
|
||||||
use log::trace;
|
use log::trace;
|
||||||
use thiserror::Error;
|
|
||||||
use tokio::sync::mpsc;
|
use tokio::sync::mpsc;
|
||||||
|
|
||||||
use libwebrtc_sys::data_channel as sys_dc;
|
use libwebrtc_sys::data_channel as sys_dc;
|
||||||
@@ -22,14 +20,6 @@ use crate::rtc_error::RTCError;
|
|||||||
use crate::rtp_receiver::RtpReceiver;
|
use crate::rtp_receiver::RtpReceiver;
|
||||||
use crate::rtp_transceiver::RtpTransceiver;
|
use crate::rtp_transceiver::RtpTransceiver;
|
||||||
|
|
||||||
#[derive(Error, Debug)]
|
|
||||||
pub enum SdpError {
|
|
||||||
#[error("recv failure: {0}")]
|
|
||||||
RecvError(String),
|
|
||||||
#[error("internal libwebrtc error")]
|
|
||||||
RTCError(#[from] RTCError),
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct PeerConnection {
|
pub struct PeerConnection {
|
||||||
cxx_handle: UniquePtr<sys_pc::ffi::PeerConnection>,
|
cxx_handle: UniquePtr<sys_pc::ffi::PeerConnection>,
|
||||||
observer: Box<InternalObserver>,
|
observer: Box<InternalObserver>,
|
||||||
@@ -51,7 +41,7 @@ impl PeerConnection {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn create_offer(&mut self) -> Result<SessionDescription, SdpError> {
|
pub async fn create_offer(&mut self, options: RTCOfferAnswerOptions) -> Result<SessionDescription, RTCError> {
|
||||||
let (tx, mut rx) = mpsc::channel(1);
|
let (tx, mut rx) = mpsc::channel(1);
|
||||||
|
|
||||||
let wrapper =
|
let wrapper =
|
||||||
@@ -62,16 +52,13 @@ impl PeerConnection {
|
|||||||
unsafe {
|
unsafe {
|
||||||
self.cxx_handle
|
self.cxx_handle
|
||||||
.pin_mut()
|
.pin_mut()
|
||||||
.create_offer(native_wrapper.pin_mut(), RTCOfferAnswerOptions::default());
|
.create_offer(native_wrapper.pin_mut(), options);
|
||||||
}
|
}
|
||||||
|
|
||||||
match rx.recv().await {
|
rx.recv().await.unwrap()
|
||||||
Some(value) => value.map_err(Into::into),
|
|
||||||
None => Err(SdpError::RecvError("channel closed".to_string())),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn create_answer(&mut self) -> Result<SessionDescription, SdpError> {
|
pub async fn create_answer(&mut self, options: RTCOfferAnswerOptions) -> Result<SessionDescription, RTCError> {
|
||||||
let (tx, mut rx) = mpsc::channel(1);
|
let (tx, mut rx) = mpsc::channel(1);
|
||||||
|
|
||||||
let wrapper =
|
let wrapper =
|
||||||
@@ -82,19 +69,16 @@ impl PeerConnection {
|
|||||||
unsafe {
|
unsafe {
|
||||||
self.cxx_handle
|
self.cxx_handle
|
||||||
.pin_mut()
|
.pin_mut()
|
||||||
.create_answer(native_wrapper.pin_mut(), RTCOfferAnswerOptions::default());
|
.create_answer(native_wrapper.pin_mut(), options);
|
||||||
}
|
}
|
||||||
|
|
||||||
match rx.recv().await {
|
rx.recv().await.unwrap()
|
||||||
Some(value) => value.map_err(Into::into),
|
|
||||||
None => Err(SdpError::RecvError("channel closed".to_string())),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn set_local_description(
|
pub async fn set_local_description(
|
||||||
&mut self,
|
&mut self,
|
||||||
desc: SessionDescription,
|
desc: SessionDescription,
|
||||||
) -> Result<(), SdpError> {
|
) -> Result<(), RTCError> {
|
||||||
let (tx, mut rx) = mpsc::channel(1);
|
let (tx, mut rx) = mpsc::channel(1);
|
||||||
let wrapper =
|
let wrapper =
|
||||||
sys_jsep::SetLocalSdpObserverWrapper::new(Box::new(InternalSetLocalSdpObserver { tx }));
|
sys_jsep::SetLocalSdpObserverWrapper::new(Box::new(InternalSetLocalSdpObserver { tx }));
|
||||||
@@ -107,16 +91,13 @@ impl PeerConnection {
|
|||||||
.set_local_description(desc.release(), native_wrapper.pin_mut());
|
.set_local_description(desc.release(), native_wrapper.pin_mut());
|
||||||
}
|
}
|
||||||
|
|
||||||
match rx.recv().await {
|
rx.recv().await.unwrap()
|
||||||
Some(value) => value.map_err(Into::into),
|
|
||||||
None => Err(SdpError::RecvError("channel closed".to_string())),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn set_remote_description(
|
pub async fn set_remote_description(
|
||||||
&mut self,
|
&mut self,
|
||||||
desc: SessionDescription,
|
desc: SessionDescription,
|
||||||
) -> Result<(), SdpError> {
|
) -> Result<(), RTCError> {
|
||||||
let (tx, mut rx) = mpsc::channel(1);
|
let (tx, mut rx) = mpsc::channel(1);
|
||||||
let wrapper =
|
let wrapper =
|
||||||
sys_jsep::SetRemoteSdpObserverWrapper::new(Box::new(InternalSetRemoteSdpObserver {
|
sys_jsep::SetRemoteSdpObserverWrapper::new(Box::new(InternalSetRemoteSdpObserver {
|
||||||
@@ -131,10 +112,7 @@ impl PeerConnection {
|
|||||||
.set_remote_description(desc.release(), native_wrapper.pin_mut());
|
.set_remote_description(desc.release(), native_wrapper.pin_mut());
|
||||||
}
|
}
|
||||||
|
|
||||||
match rx.recv().await {
|
rx.recv().await.unwrap()
|
||||||
Some(value) => value.map_err(Into::into),
|
|
||||||
None => Err(SdpError::RecvError("channel closed".to_string())),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn create_data_channel(
|
pub fn create_data_channel(
|
||||||
@@ -154,10 +132,11 @@ impl PeerConnection {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn add_ice_candidate(&mut self, candidate: IceCandidate) -> Result<(), SdpError> {
|
// TODO(theomonnom) Use IceCandidateInit instead of IceCandidate
|
||||||
|
pub async fn add_ice_candidate(&mut self, candidate: IceCandidate) -> Result<(), RTCError> {
|
||||||
let (tx, mut rx) = mpsc::channel(1);
|
let (tx, mut rx) = mpsc::channel(1);
|
||||||
let observer = sys_pc::AddIceCandidateObserverWrapper::new(Box::new(move |error| {
|
let observer = sys_pc::AddIceCandidateObserverWrapper::new(Box::new(InternalAddIceCandidateObserver {
|
||||||
tx.blocking_send(error).unwrap();
|
tx,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
let mut native_observer =
|
let mut native_observer =
|
||||||
@@ -166,12 +145,35 @@ impl PeerConnection {
|
|||||||
.pin_mut()
|
.pin_mut()
|
||||||
.add_ice_candidate(candidate.release(), native_observer.pin_mut());
|
.add_ice_candidate(candidate.release(), native_observer.pin_mut());
|
||||||
|
|
||||||
match rx.recv().await {
|
rx.recv().await.unwrap()
|
||||||
Some(value) => Ok(()),
|
}
|
||||||
None => Err(SdpError::RecvError("channel closed".to_string())),
|
|
||||||
|
pub fn local_description(&self) -> Option<SessionDescription> {
|
||||||
|
let local_description = self.cxx_handle.local_description();
|
||||||
|
if local_description.is_null() {
|
||||||
|
None
|
||||||
|
} else {
|
||||||
|
Some(SessionDescription::new(local_description))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn remote_description(&self) -> Option<SessionDescription> {
|
||||||
|
let remote_description = self.cxx_handle.remote_description();
|
||||||
|
if remote_description.is_null() {
|
||||||
|
None
|
||||||
|
} else {
|
||||||
|
Some(SessionDescription::new(remote_description))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn signaling_state(&self) -> SignalingState {
|
||||||
|
self.cxx_handle.signaling_state()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn ice_gathering_state(&self) -> IceGatheringState {
|
||||||
|
self.cxx_handle.ice_gathering_state()
|
||||||
|
}
|
||||||
|
|
||||||
pub fn close(&mut self) {
|
pub fn close(&mut self) {
|
||||||
self.cxx_handle.pin_mut().close();
|
self.cxx_handle.pin_mut().close();
|
||||||
}
|
}
|
||||||
@@ -286,6 +288,20 @@ impl PeerConnection {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// SetLocalSdpObserver
|
||||||
|
|
||||||
|
struct InternalAddIceCandidateObserver {
|
||||||
|
tx: mpsc::Sender<Result<(), RTCError>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl sys_pc::AddIceCandidateObserver for InternalAddIceCandidateObserver {
|
||||||
|
fn on_complete(&self, error: RTCError) {
|
||||||
|
let res = if error.ok() { Ok(()) } else { Err(error) };
|
||||||
|
let _ = self.tx.blocking_send(res);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// CreateSdpObserver
|
// CreateSdpObserver
|
||||||
|
|
||||||
struct InternalCreateSdpObserver {
|
struct InternalCreateSdpObserver {
|
||||||
@@ -297,13 +313,11 @@ impl sys_jsep::CreateSdpObserver for InternalCreateSdpObserver {
|
|||||||
&self,
|
&self,
|
||||||
session_description: UniquePtr<libwebrtc_sys::jsep::ffi::SessionDescription>,
|
session_description: UniquePtr<libwebrtc_sys::jsep::ffi::SessionDescription>,
|
||||||
) {
|
) {
|
||||||
self.tx
|
let _ = self.tx.blocking_send(Ok(SessionDescription::new(session_description)));
|
||||||
.blocking_send(Ok(SessionDescription::new(session_description)))
|
|
||||||
.unwrap();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn on_failure(&self, error: RTCError) {
|
fn on_failure(&self, error: RTCError) {
|
||||||
self.tx.blocking_send(Err(error)).unwrap();
|
let _ = self.tx.blocking_send(Err(error));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -316,7 +330,7 @@ struct InternalSetLocalSdpObserver {
|
|||||||
impl sys_jsep::SetLocalSdpObserver for InternalSetLocalSdpObserver {
|
impl sys_jsep::SetLocalSdpObserver for InternalSetLocalSdpObserver {
|
||||||
fn on_set_local_description_complete(&self, error: RTCError) {
|
fn on_set_local_description_complete(&self, error: RTCError) {
|
||||||
let res = if error.ok() { Ok(()) } else { Err(error) };
|
let res = if error.ok() { Ok(()) } else { Err(error) };
|
||||||
self.tx.blocking_send(res).unwrap();
|
let _ = self.tx.blocking_send(res);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -329,7 +343,7 @@ struct InternalSetRemoteSdpObserver {
|
|||||||
impl sys_jsep::SetRemoteSdpObserver for InternalSetRemoteSdpObserver {
|
impl sys_jsep::SetRemoteSdpObserver for InternalSetRemoteSdpObserver {
|
||||||
fn on_set_remote_description_complete(&self, error: RTCError) {
|
fn on_set_remote_description_complete(&self, error: RTCError) {
|
||||||
let res = if error.ok() { Ok(()) } else { Err(error) };
|
let res = if error.ok() { Ok(()) } else { Err(error) };
|
||||||
self.tx.blocking_send(res).unwrap();
|
let _ = self.tx.blocking_send(res);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -344,16 +358,16 @@ pub type OnRenegotiationNeededHandler = Box<dyn FnMut() + Send + Sync>;
|
|||||||
pub type OnNegotiationNeededEventHandler = Box<dyn FnMut(u32) + Send + Sync>;
|
pub type OnNegotiationNeededEventHandler = Box<dyn FnMut(u32) + Send + Sync>;
|
||||||
pub type OnIceConnectionChangeHandler = Box<dyn FnMut(IceConnectionState) + Send + Sync>;
|
pub type OnIceConnectionChangeHandler = Box<dyn FnMut(IceConnectionState) + Send + Sync>;
|
||||||
pub type OnStandardizedIceConnectionChangeHandler =
|
pub type OnStandardizedIceConnectionChangeHandler =
|
||||||
Box<dyn FnMut(IceConnectionState) + Send + Sync>;
|
Box<dyn FnMut(IceConnectionState) + Send + Sync>;
|
||||||
pub type OnConnectionChangeHandler = Box<dyn FnMut(PeerConnectionState) + Send + Sync>;
|
pub type OnConnectionChangeHandler = Box<dyn FnMut(PeerConnectionState) + Send + Sync>;
|
||||||
pub type OnIceGatheringChangeHandler = Box<dyn FnMut(IceGatheringState) + Send + Sync>;
|
pub type OnIceGatheringChangeHandler = Box<dyn FnMut(IceGatheringState) + Send + Sync>;
|
||||||
pub type OnIceCandidateHandler = Box<dyn FnMut(IceCandidate) + Send + Sync>;
|
pub type OnIceCandidateHandler = Box<dyn FnMut(IceCandidate) + Send + Sync>;
|
||||||
pub type OnIceCandidateErrorHandler =
|
pub type OnIceCandidateErrorHandler =
|
||||||
Box<dyn FnMut(String, i32, String, i32, String) + Send + Sync>;
|
Box<dyn FnMut(String, i32, String, i32, String) + Send + Sync>;
|
||||||
pub type OnIceCandidatesRemovedHandler = Box<dyn FnMut(Vec<IceCandidate>) + Send + Sync>;
|
pub type OnIceCandidatesRemovedHandler = Box<dyn FnMut(Vec<IceCandidate>) + Send + Sync>;
|
||||||
pub type OnIceConnectionReceivingChangeHandler = Box<dyn FnMut(bool) + Send + Sync>;
|
pub type OnIceConnectionReceivingChangeHandler = Box<dyn FnMut(bool) + Send + Sync>;
|
||||||
pub type OnIceSelectedCandidatePairChangedHandler =
|
pub type OnIceSelectedCandidatePairChangedHandler =
|
||||||
Box<dyn FnMut(libwebrtc_sys::peer_connection::ffi::CandidatePairChangeEvent) + Send + Sync>;
|
Box<dyn FnMut(libwebrtc_sys::peer_connection::ffi::CandidatePairChangeEvent) + Send + Sync>;
|
||||||
pub type OnAddTrackHandler = Box<dyn FnMut(RtpReceiver, Vec<MediaStream>) + Send + Sync>;
|
pub type OnAddTrackHandler = Box<dyn FnMut(RtpReceiver, Vec<MediaStream>) + Send + Sync>;
|
||||||
pub type OnTrackHandler = Box<dyn FnMut(RtpTransceiver) + Send + Sync>;
|
pub type OnTrackHandler = Box<dyn FnMut(RtpTransceiver) + Send + Sync>;
|
||||||
pub type OnRemoveTrackHandler = Box<dyn FnMut(RtpReceiver) + Send + Sync>;
|
pub type OnRemoveTrackHandler = Box<dyn FnMut(RtpReceiver) + Send + Sync>;
|
||||||
@@ -368,16 +382,16 @@ pub(crate) struct InternalObserver {
|
|||||||
on_negotiation_needed_event_handler: Arc<Mutex<Option<OnNegotiationNeededEventHandler>>>,
|
on_negotiation_needed_event_handler: Arc<Mutex<Option<OnNegotiationNeededEventHandler>>>,
|
||||||
on_ice_connection_change_handler: Arc<Mutex<Option<OnIceConnectionChangeHandler>>>,
|
on_ice_connection_change_handler: Arc<Mutex<Option<OnIceConnectionChangeHandler>>>,
|
||||||
on_standardized_ice_connection_change_handler:
|
on_standardized_ice_connection_change_handler:
|
||||||
Arc<Mutex<Option<OnStandardizedIceConnectionChangeHandler>>>,
|
Arc<Mutex<Option<OnStandardizedIceConnectionChangeHandler>>>,
|
||||||
on_connection_change_handler: Arc<Mutex<Option<OnConnectionChangeHandler>>>,
|
on_connection_change_handler: Arc<Mutex<Option<OnConnectionChangeHandler>>>,
|
||||||
on_ice_gathering_change_handler: Arc<Mutex<Option<OnIceGatheringChangeHandler>>>,
|
on_ice_gathering_change_handler: Arc<Mutex<Option<OnIceGatheringChangeHandler>>>,
|
||||||
on_ice_candidate_handler: Arc<Mutex<Option<OnIceCandidateHandler>>>,
|
on_ice_candidate_handler: Arc<Mutex<Option<OnIceCandidateHandler>>>,
|
||||||
on_ice_candidate_error_handler: Arc<Mutex<Option<OnIceCandidateErrorHandler>>>,
|
on_ice_candidate_error_handler: Arc<Mutex<Option<OnIceCandidateErrorHandler>>>,
|
||||||
on_ice_candidates_removed_handler: Arc<Mutex<Option<OnIceCandidatesRemovedHandler>>>,
|
on_ice_candidates_removed_handler: Arc<Mutex<Option<OnIceCandidatesRemovedHandler>>>,
|
||||||
on_ice_connection_receiving_change_handler:
|
on_ice_connection_receiving_change_handler:
|
||||||
Arc<Mutex<Option<OnIceConnectionReceivingChangeHandler>>>,
|
Arc<Mutex<Option<OnIceConnectionReceivingChangeHandler>>>,
|
||||||
on_ice_selected_candidate_pair_changed_handler:
|
on_ice_selected_candidate_pair_changed_handler:
|
||||||
Arc<Mutex<Option<OnIceSelectedCandidatePairChangedHandler>>>,
|
Arc<Mutex<Option<OnIceSelectedCandidatePairChangedHandler>>>,
|
||||||
on_add_track_handler: Arc<Mutex<Option<OnAddTrackHandler>>>,
|
on_add_track_handler: Arc<Mutex<Option<OnAddTrackHandler>>>,
|
||||||
on_track_handler: Arc<Mutex<Option<OnTrackHandler>>>,
|
on_track_handler: Arc<Mutex<Option<OnTrackHandler>>>,
|
||||||
on_remove_track_handler: Arc<Mutex<Option<OnRemoveTrackHandler>>>,
|
on_remove_track_handler: Arc<Mutex<Option<OnRemoveTrackHandler>>>,
|
||||||
@@ -607,6 +621,8 @@ impl sys_pc::PeerConnectionObserver for InternalObserver {
|
|||||||
mod tests {
|
mod tests {
|
||||||
use log::trace;
|
use log::trace;
|
||||||
use tokio::sync::mpsc;
|
use tokio::sync::mpsc;
|
||||||
|
use libwebrtc_sys::peer_connection::ffi::RTCOfferAnswerOptions;
|
||||||
|
use libwebrtc_sys::peer_connection_factory::ffi::{ContinualGatheringPolicy, IceTransportsType};
|
||||||
|
|
||||||
use crate::data_channel::{DataChannel, DataChannelInit};
|
use crate::data_channel::{DataChannel, DataChannelInit};
|
||||||
use crate::jsep::IceCandidate;
|
use crate::jsep::IceCandidate;
|
||||||
@@ -630,6 +646,8 @@ mod tests {
|
|||||||
username: "".into(),
|
username: "".into(),
|
||||||
password: "".into(),
|
password: "".into(),
|
||||||
}],
|
}],
|
||||||
|
continual_gathering_policy: ContinualGatheringPolicy::GatherOnce,
|
||||||
|
ice_transport_type: IceTransportsType::All
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut bob = factory.create_peer_connection(config.clone()).unwrap();
|
let mut bob = factory.create_peer_connection(config.clone()).unwrap();
|
||||||
@@ -655,12 +673,12 @@ mod tests {
|
|||||||
.create_data_channel("test_dc", DataChannelInit::default())
|
.create_data_channel("test_dc", DataChannelInit::default())
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
let offer = bob.create_offer().await.unwrap();
|
let offer = bob.create_offer(RTCOfferAnswerOptions::default()).await.unwrap();
|
||||||
trace!("Bob offer: {:?}", offer);
|
trace!("Bob offer: {:?}", offer);
|
||||||
bob.set_local_description(offer.clone()).await.unwrap();
|
bob.set_local_description(offer.clone()).await.unwrap();
|
||||||
alice.set_remote_description(offer).await.unwrap();
|
alice.set_remote_description(offer).await.unwrap();
|
||||||
|
|
||||||
let answer = alice.create_answer().await.unwrap();
|
let answer = alice.create_answer(RTCOfferAnswerOptions::default()).await.unwrap();
|
||||||
trace!("Alice answer: {:?}", answer);
|
trace!("Alice answer: {:?}", answer);
|
||||||
alice.set_local_description(answer.clone()).await.unwrap();
|
alice.set_local_description(answer.clone()).await.unwrap();
|
||||||
bob.set_remote_description(answer).await.unwrap();
|
bob.set_remote_description(answer).await.unwrap();
|
||||||
|
|||||||
@@ -2,7 +2,9 @@ use cxx::UniquePtr;
|
|||||||
|
|
||||||
use libwebrtc_sys::peer_connection as sys_pc;
|
use libwebrtc_sys::peer_connection as sys_pc;
|
||||||
use libwebrtc_sys::peer_connection_factory as sys_factory;
|
use libwebrtc_sys::peer_connection_factory as sys_factory;
|
||||||
pub use sys_factory::ffi::{ICEServer, RTCConfiguration};
|
pub use sys_factory::ffi::{
|
||||||
|
ContinualGatheringPolicy, ICEServer, IceTransportsType, RTCConfiguration,
|
||||||
|
};
|
||||||
|
|
||||||
use crate::peer_connection::{InternalObserver, PeerConnection};
|
use crate::peer_connection::{InternalObserver, PeerConnection};
|
||||||
use crate::rtc_error::RTCError;
|
use crate::rtc_error::RTCError;
|
||||||
|
|||||||
@@ -1,3 +1,2 @@
|
|||||||
// TODO(theomonnom) Wrap the RTCError ffi so we can use Option(u16)
|
// TODO(theomonnom) Wrap the RTCError ffi so we can use Option(u16)
|
||||||
pub use libwebrtc_sys::rtc_error::ffi::RTCError;
|
pub use libwebrtc_sys::rtc_error::ffi::RTCError;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user