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

Associate Peers with a user_id

Browse source 
This will help us render the collaborator avatars for the active worktree when we know its peers.
This commit is contained in:
Nathan Sobo 2021-11-26 10:22:34 -07:00
parent f453928b44
commit 9f29eeda03
3 changed files with 30 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/rpc/proto/zed.proto
View file

@ -199,6 +199,7 @@ message UpdateCollaborators {
message Peer { message Peer {
uint32 peer_id = 1; uint32 peer_id = 1;
uint32 replica_id = 2; uint32 replica_id = 2;
uint64 user_id = 3;
} }
message User { message User {

12
crates/server/src/rpc.rs
View file

@ -173,7 +173,7 @@ impl Server {
if let Some(share) = worktree.share { if let Some(share) = worktree.share {
broadcast( broadcast(
connection_id, connection_id,
share.guest_connection_ids.keys().copied().collect(), share.guests.keys().copied().collect(),
|conn_id| { |conn_id| {
self.peer self.peer
.send(conn_id, proto::UnshareWorktree { worktree_id }) .send(conn_id, proto::UnshareWorktree { worktree_id })
@ -234,6 +234,7 @@ impl Server {
let collaborator_user_ids = collaborator_user_ids.into_iter().collect::<Vec<_>>(); let collaborator_user_ids = collaborator_user_ids.into_iter().collect::<Vec<_>>();
let worktree_id = self.state_mut().add_worktree(Worktree { let worktree_id = self.state_mut().add_worktree(Worktree {
host_connection_id: request.sender_id, host_connection_id: request.sender_id,
host_user_id,
collaborator_user_ids: collaborator_user_ids.clone(), collaborator_user_ids: collaborator_user_ids.clone(),
root_name: request.payload.root_name, root_name: request.payload.root_name,
share: None, share: None,
@ -260,7 +261,7 @@ impl Server {
if let Some(share) = worktree.share { if let Some(share) = worktree.share {
broadcast( broadcast(
request.sender_id, request.sender_id,
share.guest_connection_ids.keys().copied().collect(), share.guests.keys().copied().collect(),
|conn_id| { |conn_id| {
self.peer self.peer
.send(conn_id, proto::UnshareWorktree { worktree_id }) .send(conn_id, proto::UnshareWorktree { worktree_id })
@ -341,17 +342,19 @@ impl Server {
.join_worktree(request.sender_id, user_id, worktree_id) .join_worktree(request.sender_id, user_id, worktree_id)
.and_then(|joined| { .and_then(|joined| {
let share = joined.worktree.share()?; let share = joined.worktree.share()?;
let peer_count = share.guest_connection_ids.len(); let peer_count = share.guests.len();
let mut peers = Vec::with_capacity(peer_count); let mut peers = Vec::with_capacity(peer_count);
peers.push(proto::Peer { peers.push(proto::Peer {
peer_id: joined.worktree.host_connection_id.0, peer_id: joined.worktree.host_connection_id.0,
replica_id: 0, replica_id: 0,
user_id: joined.worktree.host_user_id.to_proto(),
}); });
for (peer_conn_id, peer_replica_id) in &share.guest_connection_ids { for (peer_conn_id, (peer_replica_id, peer_user_id)) in &share.guests {
if *peer_conn_id != request.sender_id { if *peer_conn_id != request.sender_id {
peers.push(proto::Peer { peers.push(proto::Peer {
peer_id: peer_conn_id.0, peer_id: peer_conn_id.0,
replica_id: *peer_replica_id as u32, replica_id: *peer_replica_id as u32,
user_id: peer_user_id.to_proto(),
}); });
} }
} }
@ -379,6 +382,7 @@ impl Server {
peer: Some(proto::Peer { peer: Some(proto::Peer {
peer_id: request.sender_id.0, peer_id: request.sender_id.0,
replica_id: response.replica_id, replica_id: response.replica_id,
user_id: user_id.to_proto(),
}), }),
}, },
) )

50
crates/server/src/rpc/store.rs
View file

@ -1,7 +1,7 @@
use crate::db::{ChannelId, UserId}; use crate::db::{ChannelId, UserId};
use anyhow::anyhow; use anyhow::anyhow;
use std::collections::{hash_map, HashMap, HashSet};
use rpc::{proto, ConnectionId}; use rpc::{proto, ConnectionId};
use std::collections::{hash_map, HashMap, HashSet};
#[derive(Default)] #[derive(Default)]
pub struct Store { pub struct Store {
@ -21,13 +21,14 @@ struct ConnectionState {
pub struct Worktree { pub struct Worktree {
pub host_connection_id: ConnectionId, pub host_connection_id: ConnectionId,
pub host_user_id: UserId,
pub collaborator_user_ids: Vec<UserId>, pub collaborator_user_ids: Vec<UserId>,
pub root_name: String, pub root_name: String,
pub share: Option<WorktreeShare>, pub share: Option<WorktreeShare>,
} }
pub struct WorktreeShare { pub struct WorktreeShare {
pub guest_connection_ids: HashMap<ConnectionId, ReplicaId>, pub guests: HashMap<ConnectionId, (ReplicaId, UserId)>,
pub active_replica_ids: HashSet<ReplicaId>, pub active_replica_ids: HashSet<ReplicaId>,
pub entries: HashMap<u64, proto::Entry>, pub entries: HashMap<u64, proto::Entry>,
} }
@ -181,7 +182,7 @@ impl Store {
let mut guests = HashSet::new(); let mut guests = HashSet::new();
if let Ok(share) = worktree.share() { if let Ok(share) = worktree.share() {
for guest_connection_id in share.guest_connection_ids.keys() { for guest_connection_id in share.guests.keys() {
if let Ok(user_id) = self.user_id_for_connection(*guest_connection_id) { if let Ok(user_id) = self.user_id_for_connection(*guest_connection_id) {
guests.insert(user_id.to_proto()); guests.insert(user_id.to_proto());
} }
@ -247,7 +248,7 @@ impl Store {
} }
if let Some(share) = &worktree.share { if let Some(share) = &worktree.share {
for connection_id in share.guest_connection_ids.keys() { for connection_id in share.guests.keys() {
if let Some(connection) = self.connections.get_mut(connection_id) { if let Some(connection) = self.connections.get_mut(connection_id) {
connection.worktrees.remove(&worktree_id); connection.worktrees.remove(&worktree_id);
} }
@ -278,7 +279,7 @@ impl Store {
if let Some(worktree) = self.worktrees.get_mut(&worktree_id) { if let Some(worktree) = self.worktrees.get_mut(&worktree_id) {
if worktree.host_connection_id == connection_id { if worktree.host_connection_id == connection_id {
worktree.share = Some(WorktreeShare { worktree.share = Some(WorktreeShare {
guest_connection_ids: Default::default(), guests: Default::default(),
active_replica_ids: Default::default(), active_replica_ids: Default::default(),
entries, entries,
}); });
@ -306,7 +307,7 @@ impl Store {
let connection_ids = worktree.connection_ids(); let connection_ids = worktree.connection_ids();
let collaborator_ids = worktree.collaborator_user_ids.clone(); let collaborator_ids = worktree.collaborator_user_ids.clone();
if let Some(share) = worktree.share.take() { if let Some(share) = worktree.share.take() {
for connection_id in share.guest_connection_ids.into_keys() { for connection_id in share.guests.into_keys() {
if let Some(connection) = self.connections.get_mut(&connection_id) { if let Some(connection) = self.connections.get_mut(&connection_id) {
connection.worktrees.remove(&worktree_id); connection.worktrees.remove(&worktree_id);
} }
@ -354,7 +355,7 @@ impl Store {
replica_id += 1; replica_id += 1;
} }
share.active_replica_ids.insert(replica_id); share.active_replica_ids.insert(replica_id);
share.guest_connection_ids.insert(connection_id, replica_id); share.guests.insert(connection_id, (replica_id, user_id));
#[cfg(test)] #[cfg(test)]
self.check_invariants(); self.check_invariants();
@ -372,7 +373,7 @@ impl Store {
) -> Option<LeftWorktree> { ) -> Option<LeftWorktree> {
let worktree = self.worktrees.get_mut(&worktree_id)?; let worktree = self.worktrees.get_mut(&worktree_id)?;
let share = worktree.share.as_mut()?; let share = worktree.share.as_mut()?;
let replica_id = share.guest_connection_ids.remove(&connection_id)?; let (replica_id, _) = share.guests.remove(&connection_id)?;
share.active_replica_ids.remove(&replica_id); share.active_replica_ids.remove(&replica_id);
if let Some(connection) = self.connections.get_mut(&connection_id) { if let Some(connection) = self.connections.get_mut(&connection_id) {
@ -427,7 +428,7 @@ impl Store {
Ok(self Ok(self
.read_worktree(worktree_id, connection_id)? .read_worktree(worktree_id, connection_id)?
.share()? .share()?
.guest_connection_ids .guests
.keys() .keys()
.copied() .copied()
.collect()) .collect())
@ -458,10 +459,7 @@ impl Store {
.ok_or_else(|| anyhow!("worktree not found"))?; .ok_or_else(|| anyhow!("worktree not found"))?;
if worktree.host_connection_id == connection_id if worktree.host_connection_id == connection_id
|| worktree || worktree.share()?.guests.contains_key(&connection_id)
.share()?
.guest_connection_ids
.contains_key(&connection_id)
{ {
Ok(worktree) Ok(worktree)
} else { } else {
@ -484,9 +482,10 @@ impl Store {
.ok_or_else(|| anyhow!("worktree not found"))?; .ok_or_else(|| anyhow!("worktree not found"))?;
if worktree.host_connection_id == connection_id if worktree.host_connection_id == connection_id
|| worktree.share.as_ref().map_or(false, |share| { || worktree
share.guest_connection_ids.contains_key(&connection_id) .share
}) .as_ref()
.map_or(false, |share| share.guests.contains_key(&connection_id))
{ {
Ok(worktree) Ok(worktree)
} else { } else {
@ -504,11 +503,7 @@ impl Store {
for worktree_id in &connection.worktrees { for worktree_id in &connection.worktrees {
let worktree = &self.worktrees.get(&worktree_id).unwrap(); let worktree = &self.worktrees.get(&worktree_id).unwrap();
if worktree.host_connection_id != *connection_id { if worktree.host_connection_id != *connection_id {
assert!(worktree assert!(worktree.share().unwrap().guests.contains_key(connection_id));
.share()
.unwrap()
.guest_connection_ids
.contains_key(connection_id));
} }
} }
for channel_id in &connection.channels { for channel_id in &connection.channels {
@ -544,20 +539,17 @@ impl Store {
} }
if let Some(share) = &worktree.share { if let Some(share) = &worktree.share {
for guest_connection_id in share.guest_connection_ids.keys() { for guest_connection_id in share.guests.keys() {
let guest_connection = self.connections.get(guest_connection_id).unwrap(); let guest_connection = self.connections.get(guest_connection_id).unwrap();
assert!(guest_connection.worktrees.contains(worktree_id)); assert!(guest_connection.worktrees.contains(worktree_id));
} }
assert_eq!( assert_eq!(share.active_replica_ids.len(), share.guests.len(),);
share.active_replica_ids.len(),
share.guest_connection_ids.len(),
);
assert_eq!( assert_eq!(
share.active_replica_ids, share.active_replica_ids,
share share
.guest_connection_ids .guests
.values() .values()
.copied() .map(|(replica_id, _)| *replica_id)
.collect::<HashSet<_>>(), .collect::<HashSet<_>>(),
); );
} }
@ -583,7 +575,7 @@ impl Worktree {
pub fn connection_ids(&self) -> Vec<ConnectionId> { pub fn connection_ids(&self) -> Vec<ConnectionId> {
if let Some(share) = &self.share { if let Some(share) = &self.share {
share share
.guest_connection_ids .guests
.keys() .keys()
.copied() .copied()
.chain(Some(self.host_connection_id)) .chain(Some(self.host_connection_id))