Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't wait for host's reply before broadcasting buffer updates to guests

Browse source
This commit is contained in:
Max Brunsfeld 2023-04-11 12:37:08 -07:00
parent 727afae4ff
commit 61d048cb25
1 changed files with 23 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

50
crates/collab/src/rpc.rs
View file

@ -1610,20 +1610,35 @@ async fn update_buffer(
) -> Result<()> { ) -> Result<()> {
session.executor.record_backtrace(); session.executor.record_backtrace();
let project_id = ProjectId::from_proto(request.project_id); let project_id = ProjectId::from_proto(request.project_id);
let host_connection_id = { let mut guest_connection_ids;
let mut host_connection_id = None;
{
let collaborators = session let collaborators = session
.db() .db()
.await .await
.project_collaborators(project_id, session.connection_id) .project_collaborators(project_id, session.connection_id)
.await?; .await?;
guest_connection_ids = Vec::with_capacity(collaborators.len() - 1);
for collaborator in collaborators.iter() {
if collaborator.is_host {
host_connection_id = Some(collaborator.connection_id);
} else {
guest_connection_ids.push(collaborator.connection_id);
}
}
}
let host_connection_id = host_connection_id.ok_or_else(|| anyhow!("host not found"))?;
let host = collaborators session.executor.record_backtrace();
.iter() broadcast(
.find(|collaborator| collaborator.is_host) Some(session.connection_id),
.ok_or_else(|| anyhow!("host not found"))?; guest_connection_ids,
host.connection_id |connection_id| {
}; session
.peer
.forward_send(session.connection_id, connection_id, request.clone())
},
);
if host_connection_id != session.connection_id { if host_connection_id != session.connection_id {
session session
.peer .peer
@ -1631,25 +1646,6 @@ async fn update_buffer(
.await?; .await?;
} }
session.executor.record_backtrace();
let collaborators = session
.db()
.await
.project_collaborators(project_id, session.connection_id)
.await?;
broadcast(
Some(session.connection_id),
collaborators
.iter()
.filter(|collaborator| !collaborator.is_host)
.map(|collaborator| collaborator.connection_id),
|connection_id| {
session
.peer
.forward_send(session.connection_id, connection_id, request.clone())
},
);
response.send(proto::Ack {})?; response.send(proto::Ack {})?;
Ok(()) Ok(())
} }