Allow for mutual connections [WIP] #117
Conversation
| use super::packet::Packet; | ||
| use std::sync::mpsc::Sender; | ||
| use uuid::Uuid; | ||
|
|
||
| pub trait PatchworkState { | ||
| fn new_map(&self, peer: Peer); | ||
| fn route_player_packet(&self, packet: Packet, conn_id: Uuid); | ||
| fn connect_map(&self, map_index: usize, conn_id: PeerConnection); |
There was a problem hiding this comment.
this index thing blows, will be fixed with #118
| @@ -58,63 +61,56 @@ impl Map { | |||
| pub fn connect< | |||
| M: 'static + Messenger + Clone + Send, | |||
| PP: 'static + PacketProcessor + Clone + Send, | |||
| PA: 'static + PatchworkState + Clone + Send, | |||
There was a problem hiding this comment.
Establishing a new pattern here for async stuff- basically throw a copy of your own sender so they can call you back once it's done. There might be better ways of doing this, not really sure about the adoption of callbacks here
| pub fn start<M: Messenger>(receiver: Receiver<BlockStateOperations>, messenger: M) { | ||
| pub fn start<M: Messenger>( | ||
| receiver: Receiver<BlockStateOperations>, | ||
| _sender: Sender<BlockStateOperations>, |
There was a problem hiding this comment.
Since all the services are called by the same macro they all now take a sender (unused, hence the underscore). I think it's reasonable to give them all the ability to send messages to themselves. We'll see how this pattern turns out
| ) | ||
| } | ||
| PatchworkStateOperations::ConnectMap(msg) => { |
There was a problem hiding this comment.
This is the callback once the peer actually connects
| messenger.broadcast_packet( | ||
| msg.packet, | ||
| entity_conn_ids.get(&msg.entity_id).copied(), | ||
| true, | ||
| false, |
There was a problem hiding this comment.
This was a bug that was revealed when mutual connections started working. Certainly events from anchored players are not local events that should be broadcast to every peer
| messenger: M, | ||
| ) { | ||
| match msg { | ||
| PlayerStateOperations::New(msg) => { | ||
| let mut player = msg.player; | ||
| if player.entity_id == 0 { | ||
| player.entity_id = players.len().try_into().expect("too many players"); | ||
| player.entity_id = *entity_id; |
There was a problem hiding this comment.
Since we started deleting players when they disconnect we can't use length of the player map as an id anymore
Issue: #116
Why
What
Checks