From 31f8271db6735a1c7abea4d93bb3b8d7a3ce4628 Mon Sep 17 00:00:00 2001 From: Ilion Beyst Date: Wed, 20 Jul 2022 23:43:19 +0200 Subject: [PATCH] update client for oneof messages --- planetwars-client/src/main.rs | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/planetwars-client/src/main.rs b/planetwars-client/src/main.rs index 3ece5b3..25a6725 100644 --- a/planetwars-client/src/main.rs +++ b/planetwars-client/src/main.rs @@ -57,16 +57,27 @@ async fn run_player(bot_config: BotConfig, player_key: String, channel: Channel) let (tx, rx) = mpsc::unbounded_channel(); let mut stream = client - .connect_bot(UnboundedReceiverStream::new(rx)) + .connect_player(UnboundedReceiverStream::new(rx)) .await .unwrap() .into_inner(); while let Some(message) = stream.message().await.unwrap() { - let moves = bot_process.communicate(&message.content).await.unwrap(); - tx.send(pb::PlayerRequestResponse { - request_id: message.request_id, - content: moves.as_bytes().to_vec(), - }) - .unwrap(); + use pb::client_message::ClientMessage; + use pb::server_message::ServerMessage; + + match message.server_message { + Some(ServerMessage::PlayerRequest(req)) => { + let moves = bot_process.communicate(&req.content).await.unwrap(); + let resp = pb::PlayerRequestResponse { + request_id: req.request_id, + content: moves.as_bytes().to_vec(), + }; + let msg = pb::ClientMessage { + client_message: Some(ClientMessage::RequestResponse(resp)), + }; + tx.send(msg).unwrap(); + } + _ => {} // pass + } } }