aboutsummaryrefslogtreecommitdiff
path: root/planetwars-server/src
diff options
context:
space:
mode:
authorIlion Beyst <ilion.beyst@gmail.com>2022-06-08 22:37:38 +0200
committerIlion Beyst <ilion.beyst@gmail.com>2022-06-08 22:37:38 +0200
commit1b2472fbfc876c3f8b6cf5dd6164308123fed133 (patch)
tree95379aef5fe02e9e9a81b77feb86037985233fd1 /planetwars-server/src
parent028d4a99e4033f9289239600c0dd6ec499a99c04 (diff)
downloadplanetwars.dev-1b2472fbfc876c3f8b6cf5dd6164308123fed133.tar.xz
planetwars.dev-1b2472fbfc876c3f8b6cf5dd6164308123fed133.zip
implement grpc match creation PoC
Diffstat (limited to 'planetwars-server/src')
-rw-r--r--planetwars-server/src/modules/bot_api.rs86
1 files changed, 54 insertions, 32 deletions
diff --git a/planetwars-server/src/modules/bot_api.rs b/planetwars-server/src/modules/bot_api.rs
index 2fffc79..8aa5d29 100644
--- a/planetwars-server/src/modules/bot_api.rs
+++ b/planetwars-server/src/modules/bot_api.rs
@@ -19,11 +19,13 @@ use tonic::{Request, Response, Status, Streaming};
use planetwars_matchrunner as runner;
use crate::db;
+use crate::util::gen_alphanumeric;
use crate::{ConnectionPool, MAPS_DIR, MATCHES_DIR};
use super::matches::code_bundle_to_botspec;
pub struct BotApiServer {
+ conn_pool: ConnectionPool,
router: PlayerRouter,
}
@@ -85,6 +87,50 @@ impl pb::bot_api_service_server::BotApiService for BotApiServer {
sync_data.server_messages,
)))
}
+
+ async fn create_match(
+ &self,
+ req: Request<pb::MatchRequest>,
+ ) -> Result<Response<pb::CreatedMatch>, Status> {
+ // TODO: unify with matchrunner module
+ let conn = self.conn_pool.get().await.unwrap();
+
+ let match_request = req.get_ref();
+
+ let opponent = db::bots::find_bot_by_name(&match_request.opponent_name, &conn)
+ .map_err(|_| Status::not_found("opponent not found"))?;
+ let opponent_code_bundle = db::bots::active_code_bundle(opponent.id, &conn)
+ .map_err(|_| Status::not_found("opponent has no code"))?;
+
+ let log_file_name = "remote_match.log";
+ let player_key = gen_alphanumeric(32);
+
+ let remote_bot_spec = RemoteBotSpec {
+ player_key: player_key.clone(),
+ router: self.router.clone(),
+ };
+
+ let match_config = runner::MatchConfig {
+ map_path: PathBuf::from(MAPS_DIR).join("hex.json"),
+ map_name: "hex".to_string(),
+ log_path: PathBuf::from(MATCHES_DIR).join(&log_file_name),
+ players: vec![
+ runner::MatchPlayer {
+ bot_spec: Box::new(remote_bot_spec),
+ },
+ runner::MatchPlayer {
+ bot_spec: code_bundle_to_botspec(&opponent_code_bundle),
+ },
+ ],
+ };
+
+ tokio::spawn(runner::run_match(match_config));
+ Ok(Response::new(pb::CreatedMatch {
+ // TODO
+ match_id: 0,
+ player_key,
+ }))
+ }
}
struct SyncThingData {
@@ -93,6 +139,7 @@ struct SyncThingData {
}
struct RemoteBotSpec {
+ player_key: String,
router: PlayerRouter,
}
@@ -106,9 +153,8 @@ impl runner::BotSpec for RemoteBotSpec {
) -> Box<dyn PlayerHandle> {
let (tx, rx) = oneshot::channel();
let (server_msg_snd, server_msg_recv) = mpsc::unbounded_channel();
- let player_key = "test_player".to_string();
self.router.put(
- player_key.clone(),
+ self.player_key.clone(),
SyncThingData {
tx,
server_messages: server_msg_recv,
@@ -127,7 +173,7 @@ impl runner::BotSpec for RemoteBotSpec {
}
_ => {
// ensure router cleanup
- self.router.take(&player_key);
+ self.router.take(&self.player_key);
}
};
@@ -183,6 +229,7 @@ impl PlayerHandle for RemoteBotHandle {
// directly mark all requests as timed out.
// TODO: create a dedicated error type for this.
// should it be logged?
+ println!("send error: {:?}", _send_error);
self.event_bus
.lock()
.unwrap()
@@ -212,37 +259,12 @@ async fn schedule_timeout(
.resolve_request(request_id, Err(RequestError::Timeout));
}
-async fn run_match(router: PlayerRouter, pool: ConnectionPool) {
- let conn = pool.get().await.unwrap();
-
- let opponent = db::bots::find_bot_by_name("simplebot", &conn).unwrap();
- let opponent_code_bundle = db::bots::active_code_bundle(opponent.id, &conn).unwrap();
-
- let log_file_name = "remote_match.log";
-
- let remote_bot_spec = RemoteBotSpec { router };
-
- let match_config = runner::MatchConfig {
- map_path: PathBuf::from(MAPS_DIR).join("hex.json"),
- map_name: "hex".to_string(),
- log_path: PathBuf::from(MATCHES_DIR).join(&log_file_name),
- players: vec![
- runner::MatchPlayer {
- bot_spec: Box::new(remote_bot_spec),
- },
- runner::MatchPlayer {
- bot_spec: code_bundle_to_botspec(&opponent_code_bundle),
- },
- ],
- };
-
- runner::run_match(match_config).await;
-}
-
pub async fn run_bot_api(pool: ConnectionPool) {
let router = PlayerRouter::new();
- tokio::spawn(run_match(router.clone(), pool));
- let server = BotApiServer { router };
+ let server = BotApiServer {
+ router,
+ conn_pool: pool.clone(),
+ };
let addr = SocketAddr::from(([127, 0, 0, 1], 50051));
Server::builder()