zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-18 18:08:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Delete room when no participants are left

Browse Source
This commit is contained in:
Antonio Scandurra 2022-10-18 14:57:31 +02:00
parent 9cf39b1da6
commit 48a1dd1588
5 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -3197,6 +3197,7 @@ dependencies = [
"futures 0.3.24",
"hmac 0.12.1",
"jwt",
"log",
"prost 0.8.0",
"prost-build",
"prost-types 0.8.0",

7
crates/collab/src/rpc.rs
View File

@ -890,11 +890,16 @@ impl Server {
) -> impl Future<Output = Result<()>> {
let client = self.app_state.live_kit_client.clone();
let room_name = room.live_kit_room.clone();
let participant_count = room.participants.len();
async move {
if let Some(client) = client {
client
.remove_participant(room_name, connection_id.to_string())
.remove_participant(room_name.clone(), connection_id.to_string())
.await?;
if participant_count == 0 {
client.delete_room(room_name).await?;
}
}
Ok(())

2
crates/collab/src/rpc/store.rs
View File

@ -495,7 +495,7 @@ impl Store {
}
});
let room = if room.participants.is_empty() && room.pending_participant_user_ids.is_empty() {
let room = if room.participants.is_empty() {
Cow::Owned(self.rooms.remove(&room_id).unwrap())
} else {
Cow::Borrowed(self.rooms.get(&room_id).unwrap())

1
crates/live_kit_server/Cargo.toml
View File

@ -12,6 +12,7 @@ doctest = false
anyhow = "1.0.38"
futures = "0.3"
hmac = "0.12"
log = "0.4"
jwt = "0.16"
prost = "0.8"
prost-types = "0.8"

4
crates/live_kit_server/src/api.rs
View File

@ -110,6 +110,7 @@ impl Client {
let client = self.http.clone();
let token = token::create(&self.key, &self.secret, None, grant);
let url = format!("{}/{}", self.url, path);
log::info!("Request {}: {:?}", url, body);
async move {
let token = token?;
let response = client
@ -119,9 +120,12 @@ impl Client {
.body(body.encode_to_vec())
.send()
.await?;
if response.status().is_success() {
log::info!("Response {}: {:?}", url, response.status());
Ok(Res::decode(response.bytes().await?)?)
} else {
log::error!("Response {}: {:?}", url, response.status());
Err(anyhow!(
"POST {} failed with status code {:?}, {:?}",
url,