mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-11-29 06:50:59 +00:00
Code Issues Projects Releases Wiki Activity

janusvr: Add secret-key property

Browse source 
Every API calls have an optional "apisecret" argument.

Sponsored-by: Netflix Inc.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1465>
This commit is contained in:
Xavier Claessens 2024-02-15 16:18:31 -05:00 committed by GStreamer Marge Bot
parent 0faac3b875
commit 2572afbf15
1 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
net/webrtc/src/janusvr_signaller/imp.rs
View file

@ -47,12 +47,14 @@ struct KeepAliveMsg {
janus: String, janus: String,
transaction: String, transaction: String,
session_id: u64, session_id: u64,
apisecret: Option<String>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)] #[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
struct CreateSessionMsg { struct CreateSessionMsg {
janus: String, janus: String,
transaction: String, transaction: String,
apisecret: Option<String>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)] #[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
@ -61,6 +63,7 @@ struct AttachPluginMsg {
transaction: String, transaction: String,
plugin: String, plugin: String,
session_id: u64, session_id: u64,
apisecret: Option<String>,
} }
#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)] #[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
@ -79,6 +82,7 @@ struct RoomRequestMsg {
transaction: String, transaction: String,
session_id: u64, session_id: u64,
handle_id: u64, handle_id: u64,
apisecret: Option<String>,
body: RoomRequestBody, body: RoomRequestBody,
} }
@ -102,6 +106,7 @@ struct PublishMsg {
transaction: String, transaction: String,
session_id: u64, session_id: u64,
handle_id: u64, handle_id: u64,
apisecret: Option<String>,
body: PublishBody, body: PublishBody,
jsep: Jsep, jsep: Jsep,
} }
@ -119,6 +124,7 @@ struct TrickleMsg {
transaction: String, transaction: String,
session_id: u64, session_id: u64,
handle_id: u64, handle_id: u64,
apisecret: Option<String>,
candidate: Candidate, candidate: Candidate,
} }
@ -221,6 +227,7 @@ struct Settings {
room_id: Option<String>, room_id: Option<String>,
feed_id: u32, feed_id: u32,
display_name: Option<String>, display_name: Option<String>,
secret_key: Option<String>,
} }
impl Default for Settings { impl Default for Settings {
@ -230,6 +237,7 @@ impl Default for Settings {
room_id: None, room_id: None,
feed_id: feed_id(), feed_id: feed_id(),
display_name: None, display_name: None,
secret_key: None,
} }
} }
} }
@ -242,6 +250,7 @@ pub struct Signaller {
#[property(name="room-id", get, set, type = String, member = room_id, blurb = "The Janus Room ID that will be joined to")] #[property(name="room-id", get, set, type = String, member = room_id, blurb = "The Janus Room ID that will be joined to")]
#[property(name="feed-id", get, set, type = u32, member = feed_id, blurb = "The Janus Feed ID to identify where the track is coming from")] #[property(name="feed-id", get, set, type = u32, member = feed_id, blurb = "The Janus Feed ID to identify where the track is coming from")]
#[property(name="display-name", get, set, type = String, member = display_name, blurb = "The name of the publisher in the Janus Video Room")] #[property(name="display-name", get, set, type = String, member = display_name, blurb = "The name of the publisher in the Janus Video Room")]
#[property(name="secret-key", get, set, type = String, member = secret_key, blurb = "The secret API key to communicate with Janus server")]
settings: Mutex<Settings>, settings: Mutex<Settings>,
} }
@ -292,15 +301,20 @@ impl Signaller {
}, },
_ = tokio::time::sleep(Duration::from_secs(10)) => { _ = tokio::time::sleep(Duration::from_secs(10)) => {
if let Some(ref this) = this { if let Some(ref this) = this {
let (transaction, session_id) = { let (transaction, session_id, apisecret) = {
let state = this.state.lock().unwrap(); let state = this.state.lock().unwrap();
(state.transaction_id.clone().unwrap(), let settings = this.settings.lock().unwrap();
state.session_id.unwrap()) (
state.transaction_id.clone().unwrap(),
state.session_id.unwrap(),
settings.secret_key.clone(),
)
}; };
let msg = OutgoingMessage::KeepAlive(KeepAliveMsg { let msg = OutgoingMessage::KeepAlive(KeepAliveMsg {
janus: "keepalive".to_string(), janus: "keepalive".to_string(),
transaction, transaction,
session_id, session_id,
apisecret,
}); });
res = ws_sink res = ws_sink
.send(WsMessage::Text(serde_json::to_string(&msg).unwrap())) .send(WsMessage::Text(serde_json::to_string(&msg).unwrap()))
@ -466,9 +480,12 @@ impl Signaller {
fn create_session(&self) { fn create_session(&self) {
let transaction = transaction_id(); let transaction = transaction_id();
self.set_transaction_id(transaction.clone()); self.set_transaction_id(transaction.clone());
let settings = self.settings.lock().unwrap();
let apisecret = settings.secret_key.clone();
self.send(OutgoingMessage::CreateSession(CreateSessionMsg { self.send(OutgoingMessage::CreateSession(CreateSessionMsg {
janus: "create".to_string(), janus: "create".to_string(),
transaction, transaction,
apisecret,
})); }));
} }
@ -481,12 +498,14 @@ impl Signaller {
} }
fn attach_plugin(&self) { fn attach_plugin(&self) {
let (transaction, session_id) = { let (transaction, session_id, apisecret) = {
let state = self.state.lock().unwrap(); let state = self.state.lock().unwrap();
let settings = self.settings.lock().unwrap();
( (
state.transaction_id.clone().unwrap(), state.transaction_id.clone().unwrap(),
state.session_id.unwrap(), state.session_id.unwrap(),
settings.secret_key.clone(),
) )
}; };
self.send(OutgoingMessage::AttachPlugin(AttachPluginMsg { self.send(OutgoingMessage::AttachPlugin(AttachPluginMsg {
@ -494,11 +513,12 @@ impl Signaller {
transaction, transaction,
plugin: "janus.plugin.videoroom".to_string(), plugin: "janus.plugin.videoroom".to_string(),
session_id, session_id,
apisecret,
})); }));
} }
fn join_room(&self) { fn join_room(&self) {
let (transaction, session_id, handle_id, room, feed_id, display) = { let (transaction, session_id, handle_id, room, feed_id, display, apisecret) = {
let state = self.state.lock().unwrap(); let state = self.state.lock().unwrap();
let settings = self.settings.lock().unwrap(); let settings = self.settings.lock().unwrap();
@ -514,6 +534,7 @@ impl Signaller {
settings.room_id.as_ref().unwrap().parse().unwrap(), settings.room_id.as_ref().unwrap().parse().unwrap(),
settings.feed_id, settings.feed_id,
settings.display_name.clone(), settings.display_name.clone(),
settings.secret_key.clone(),
) )
}; };
self.send(OutgoingMessage::RoomRequest(RoomRequestMsg { self.send(OutgoingMessage::RoomRequest(RoomRequestMsg {
@ -521,6 +542,7 @@ impl Signaller {
transaction, transaction,
session_id, session_id,
handle_id, handle_id,
apisecret,
body: RoomRequestBody { body: RoomRequestBody {
request: "join".to_string(), request: "join".to_string(),
ptype: "publisher".to_string(), ptype: "publisher".to_string(),
@ -532,7 +554,7 @@ impl Signaller {
} }
fn leave_room(&self) { fn leave_room(&self) {
let (transaction, session_id, handle_id, room, feed_id, display) = { let (transaction, session_id, handle_id, room, feed_id, display, apisecret) = {
let state = self.state.lock().unwrap(); let state = self.state.lock().unwrap();
let settings = self.settings.lock().unwrap(); let settings = self.settings.lock().unwrap();
@ -548,6 +570,7 @@ impl Signaller {
settings.room_id.as_ref().unwrap().parse().unwrap(), settings.room_id.as_ref().unwrap().parse().unwrap(),
settings.feed_id, settings.feed_id,
settings.display_name.clone(), settings.display_name.clone(),
settings.secret_key.clone(),
) )
}; };
self.send_blocking(OutgoingMessage::RoomRequest(RoomRequestMsg { self.send_blocking(OutgoingMessage::RoomRequest(RoomRequestMsg {
@ -555,6 +578,7 @@ impl Signaller {
transaction, transaction,
session_id, session_id,
handle_id, handle_id,
apisecret,
body: RoomRequestBody { body: RoomRequestBody {
request: "leave".to_string(), request: "leave".to_string(),
ptype: "publisher".to_string(), ptype: "publisher".to_string(),
@ -566,7 +590,7 @@ impl Signaller {
} }
fn publish(&self, offer: &gst_webrtc::WebRTCSessionDescription) { fn publish(&self, offer: &gst_webrtc::WebRTCSessionDescription) {
let (transaction, session_id, handle_id) = { let (transaction, session_id, handle_id, apisecret) = {
let state = self.state.lock().unwrap(); let state = self.state.lock().unwrap();
let settings = self.settings.lock().unwrap(); let settings = self.settings.lock().unwrap();
@ -579,6 +603,7 @@ impl Signaller {
state.transaction_id.clone().unwrap(), state.transaction_id.clone().unwrap(),
state.session_id.unwrap(), state.session_id.unwrap(),
state.handle_id.unwrap(), state.handle_id.unwrap(),
settings.secret_key.clone(),
) )
}; };
let sdp_data = offer.sdp().as_text().unwrap(); let sdp_data = offer.sdp().as_text().unwrap();
@ -587,6 +612,7 @@ impl Signaller {
transaction, transaction,
session_id, session_id,
handle_id, handle_id,
apisecret,
body: PublishBody { body: PublishBody {
request: "publish".to_string(), request: "publish".to_string(),
audio: true, audio: true,
@ -601,7 +627,7 @@ impl Signaller {
} }
fn trickle(&self, candidate: &str, sdp_m_line_index: u32) { fn trickle(&self, candidate: &str, sdp_m_line_index: u32) {
let (transaction, session_id, handle_id) = { let (transaction, session_id, handle_id, apisecret) = {
let state = self.state.lock().unwrap(); let state = self.state.lock().unwrap();
let settings = self.settings.lock().unwrap(); let settings = self.settings.lock().unwrap();
@ -614,6 +640,7 @@ impl Signaller {
state.transaction_id.clone().unwrap(), state.transaction_id.clone().unwrap(),
state.session_id.unwrap(), state.session_id.unwrap(),
state.handle_id.unwrap(), state.handle_id.unwrap(),
settings.secret_key.clone(),
) )
}; };
self.send(OutgoingMessage::Trickle(TrickleMsg { self.send(OutgoingMessage::Trickle(TrickleMsg {
@ -621,6 +648,7 @@ impl Signaller {
transaction, transaction,
session_id, session_id,
handle_id, handle_id,
apisecret,
candidate: Candidate { candidate: Candidate {
candidate: candidate.to_string(), candidate: candidate.to_string(),
sdp_m_line_index, sdp_m_line_index,