xerbalind/planetwars.dev
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

consistently use player_key and player_id

Browse source
This commit is contained in:
Ilion Beyst 2022-06-09 20:57:45 +02:00
parent e3cf0df450
commit d1977b95c8
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
planetwars-client/src/main.rs
View file

@ -44,8 +44,8 @@ async fn create_match(channel: Channel) -> Result<pb::CreatedMatch, Status> {
async fn run_player(bot_config: BotConfig, player_key: String, channel: Channel) { async fn run_player(bot_config: BotConfig, player_key: String, channel: Channel) {
let mut client = BotApiServiceClient::with_interceptor(channel, |mut req: Request<()>| { let mut client = BotApiServiceClient::with_interceptor(channel, |mut req: Request<()>| {
let player_id: MetadataValue<_> = player_key.parse().unwrap(); let player_key: MetadataValue<_> = player_key.parse().unwrap();
req.metadata_mut().insert("player_id", player_id); req.metadata_mut().insert("player_key", player_key);
Ok(req) Ok(req)
}); });

20
planetwars-server/src/modules/bot_api.rs
View file

@ -45,15 +45,15 @@ impl PlayerRouter {
// TODO: implement a way to expire entries // TODO: implement a way to expire entries
impl PlayerRouter { impl PlayerRouter {
fn put(&self, player_id: String, entry: SyncThingData) { fn put(&self, player_key: String, entry: SyncThingData) {
let mut routing_table = self.routing_table.lock().unwrap(); let mut routing_table = self.routing_table.lock().unwrap();
routing_table.insert(player_id, entry); routing_table.insert(player_key, entry);
} }
fn take(&self, player_id: &str) -> Option<SyncThingData> { fn take(&self, player_key: &str) -> Option<SyncThingData> {
// TODO: this design does not allow for reconnects. Is this desired? // TODO: this design does not allow for reconnects. Is this desired?
let mut routing_table = self.routing_table.lock().unwrap(); let mut routing_table = self.routing_table.lock().unwrap();
routing_table.remove(player_id) routing_table.remove(player_key)
} }
} }
@ -66,19 +66,19 @@ impl pb::bot_api_service_server::BotApiService for BotApiServer {
req: Request<Streaming<pb::PlayerRequestResponse>>, req: Request<Streaming<pb::PlayerRequestResponse>>,
) -> Result<Response<Self::ConnectBotStream>, Status> { ) -> Result<Response<Self::ConnectBotStream>, Status> {
// TODO: clean up errors // TODO: clean up errors
let player_id = req let player_key = req
.metadata() .metadata()
.get("player_id") .get("player_key")
.ok_or_else(|| Status::unauthenticated("no player_id provided"))?; .ok_or_else(|| Status::unauthenticated("no player_key provided"))?;
let player_id_str = player_id let player_key_str = player_key
.to_str() .to_str()
.map_err(|_| Status::invalid_argument("unreadable string"))?; .map_err(|_| Status::invalid_argument("unreadable string"))?;
let sync_data = self let sync_data = self
.router .router
.take(player_id_str) .take(player_key_str)
.ok_or_else(|| Status::not_found("player_id not found"))?; .ok_or_else(|| Status::not_found("player_key not found"))?;
let stream = req.into_inner(); let stream = req.into_inner();