haskal
/
gst-meet
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Response to E2E ping requests

This commit is contained in:
Jasper Hugo 2022-03-06 17:54:15 +07:00
parent 68c9935823
commit 43afe4696a
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -175,9 +175,9 @@ dependencies = [
[[package]] [[package]]
name = "colibri" name = "colibri"
version = "0.1.8" version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2a17c805592bcb654dc14d11cd8f3ccb9d34ab2af7bdbde6e437aa055092df8" checksum = "3c3218f52768bd253336854a154bda06c4e9a10bfea4186d6e7a86dad86704d9"
dependencies = [ dependencies = [
"serde", "serde",
"serde_json", "serde_json",

1
lib-gst-meet/src/colibri.rs
View File

@ -23,6 +23,7 @@ use crate::tls::wss_connector;
const MAX_CONNECT_RETRIES: u8 = 3; const MAX_CONNECT_RETRIES: u8 = 3;
const CONNECT_RETRY_SLEEP: Duration = Duration::from_secs(3); const CONNECT_RETRY_SLEEP: Duration = Duration::from_secs(3);
#[derive(Clone)]
pub(crate) struct ColibriChannel { pub(crate) struct ColibriChannel {
send_tx: mpsc::Sender<ColibriMessage>, send_tx: mpsc::Sender<ColibriMessage>,
recv_tx: Arc<Mutex<Vec<mpsc::Sender<ColibriMessage>>>>, recv_tx: Arc<Mutex<Vec<mpsc::Sender<ColibriMessage>>>>,

24
lib-gst-meet/src/conference.rs
View File

@ -2,7 +2,7 @@ use std::{collections::HashMap, convert::TryFrom, fmt, future::Future, pin::Pin,
use anyhow::{anyhow, bail, Context, Result}; use anyhow::{anyhow, bail, Context, Result};
use async_trait::async_trait; use async_trait::async_trait;
use colibri::ColibriMessage; use colibri::{ColibriMessage, JsonMessage};
use futures::stream::StreamExt; use futures::stream::StreamExt;
use gstreamer::prelude::{ElementExt, ElementExtManual, GstBinExt}; use gstreamer::prelude::{ElementExt, ElementExtManual, GstBinExt};
use jitsi_xmpp_parsers::jingle::{Action, Jingle}; use jitsi_xmpp_parsers::jingle::{Action, Jingle};
@ -597,6 +597,7 @@ impl StanzaFilter for JitsiConference {
ColibriChannel::new(&colibri_url, self.tls_insecure).await?; ColibriChannel::new(&colibri_url, self.tls_insecure).await?;
let (tx, rx) = mpsc::channel(8); let (tx, rx) = mpsc::channel(8);
colibri_channel.subscribe(tx).await; colibri_channel.subscribe(tx).await;
let colibri_channel_ = colibri_channel.clone();
jingle_session.colibri_channel = Some(colibri_channel); jingle_session.colibri_channel = Some(colibri_channel);
let self_ = self.clone(); let self_ = self.clone();
@ -606,8 +607,25 @@ impl StanzaFilter for JitsiConference {
// Some message types are handled internally rather than passed to the on_colibri_message handler. // Some message types are handled internally rather than passed to the on_colibri_message handler.
// End-to-end ping // End-to-end ping
if let ColibriMessage::EndpointMessage { to, .. } = &msg { if let ColibriMessage::EndpointMessage { to, from, msg_payload } = &msg {
// if to == if let Some(to) = to {
let my_endpoint_id = self_.jid.to_string().split('-').next().unwrap().to_owned();
if to == &my_endpoint_id {
match serde_json::from_value::<JsonMessage>(msg_payload.clone()) {
Ok(JsonMessage::E2ePingRequest { id }) => {
if let Err(e) = colibri_channel_.send(ColibriMessage::EndpointMessage {
from: Some(my_endpoint_id),
to: from.clone(),
msg_payload: serde_json::to_value(JsonMessage::E2ePingResponse { id }).unwrap(),
}).await {
warn!("failed to send e2e ping response: {:?}", e);
}
continue;
},
_ => {},
}
}
}
} }
let locked_inner = self_.inner.lock().await; let locked_inner = self_.inner.lock().await;