aboutsummaryrefslogtreecommitdiff
path: root/planetwars-server
diff options
context:
space:
mode:
authorIlion Beyst <ilion.beyst@gmail.com>2022-07-04 22:33:35 +0200
committerIlion Beyst <ilion.beyst@gmail.com>2022-07-04 22:33:35 +0200
commitea05674b4473d9399f5aa6dca982ae73aad0ebcf (patch)
tree708b31b66295bde57b49ac9854c6778450de7132 /planetwars-server
parent268e080ec1b11e75309c3b134e16cf6ea7004ac6 (diff)
downloadplanetwars.dev-ea05674b4473d9399f5aa6dca982ae73aad0ebcf.tar.xz
planetwars.dev-ea05674b4473d9399f5aa6dca982ae73aad0ebcf.zip
remove obsolete create match route
Diffstat (limited to 'planetwars-server')
-rw-r--r--planetwars-server/src/lib.rs2
-rw-r--r--planetwars-server/src/routes/matches.rs103
2 files changed, 4 insertions, 101 deletions
diff --git a/planetwars-server/src/lib.rs b/planetwars-server/src/lib.rs
index 9c9a03c..8798945 100644
--- a/planetwars-server/src/lib.rs
+++ b/planetwars-server/src/lib.rs
@@ -85,7 +85,7 @@ pub fn api() -> Router {
)
.route(
"/matches",
- get(routes::matches::list_matches).post(routes::matches::play_match),
+ get(routes::matches::list_matches),
)
.route("/matches/:match_id", get(routes::matches::get_match_data))
.route(
diff --git a/planetwars-server/src/routes/matches.rs b/planetwars-server/src/routes/matches.rs
index 874c775..5f95ce9 100644
--- a/planetwars-server/src/routes/matches.rs
+++ b/planetwars-server/src/routes/matches.rs
@@ -1,102 +1,13 @@
use std::path::PathBuf;
-
-use axum::{
- extract::{Extension, Path},
- Json,
-};
+use axum::{extract::Path, Json};
use hyper::StatusCode;
-use planetwars_matchrunner::{docker_runner::DockerBotSpec, run_match, MatchConfig, MatchPlayer};
-use rand::{distributions::Alphanumeric, Rng};
use serde::{Deserialize, Serialize};
use crate::{
- db::{
- bots,
- matches::{self, MatchState},
- users::User,
- },
- ConnectionPool, DatabaseConnection, BOTS_DIR, MAPS_DIR, MATCHES_DIR,
+ db::matches::{self, MatchState},
+ DatabaseConnection, MATCHES_DIR,
};
-#[derive(Serialize, Deserialize, Debug)]
-pub struct MatchParams {
- // Just bot ids for now
- players: Vec<i32>,
-}
-
-pub async fn play_match(
- _user: User,
- Extension(pool): Extension<ConnectionPool>,
- Json(params): Json<MatchParams>,
-) -> Result<(), StatusCode> {
- let conn = pool.get().await.expect("could not get database connection");
- let map_path = PathBuf::from(MAPS_DIR).join("hex.json");
-
- let slug: String = rand::thread_rng()
- .sample_iter(&Alphanumeric)
- .take(16)
- .map(char::from)
- .collect();
- let log_file_name = format!("{}.log", slug);
-
- let mut players = Vec::new();
- let mut bot_ids = Vec::new();
- for bot_name in params.players {
- let bot = bots::find_bot(bot_name, &conn).map_err(|_| StatusCode::BAD_REQUEST)?;
- let code_bundle =
- bots::active_code_bundle(bot.id, &conn).map_err(|_| StatusCode::BAD_REQUEST)?;
-
- let bundle_path = PathBuf::from(BOTS_DIR).join(&code_bundle.path);
- let bot_config: BotConfig = std::fs::read_to_string(bundle_path.join("botconfig.toml"))
- .and_then(|config_str| toml::from_str(&config_str).map_err(|e| e.into()))
- .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
-
- players.push(MatchPlayer {
- bot_spec: Box::new(DockerBotSpec {
- code_path: PathBuf::from(BOTS_DIR).join(code_bundle.path),
- image: "python:3.10-slim-buster".to_string(),
- argv: shlex::split(&bot_config.run_command)
- .ok_or(StatusCode::INTERNAL_SERVER_ERROR)?,
- }),
- });
-
- bot_ids.push(matches::MatchPlayerData {
- code_bundle_id: Some(code_bundle.id),
- });
- }
-
- let match_config = MatchConfig {
- map_name: "hex".to_string(),
- map_path,
- log_path: PathBuf::from(MATCHES_DIR).join(&log_file_name),
- players,
- };
-
- tokio::spawn(run_match_task(
- match_config,
- log_file_name,
- bot_ids,
- pool.clone(),
- ));
- Ok(())
-}
-
-async fn run_match_task(
- config: MatchConfig,
- log_file_name: String,
- match_players: Vec<matches::MatchPlayerData>,
- pool: ConnectionPool,
-) {
- let match_data = matches::NewMatch {
- state: MatchState::Finished,
- log_path: &log_file_name,
- };
-
- run_match(config).await;
- let conn = pool.get().await.expect("could not get database connection");
- matches::create_match(&match_data, &match_players, &conn).expect("could not create match");
-}
-
#[derive(Serialize, Deserialize)]
pub struct ApiMatch {
id: i32,
@@ -135,14 +46,6 @@ pub fn match_data_to_api(data: matches::FullMatchData) -> ApiMatch {
}
}
-// TODO: this is duplicated from planetwars-cli
-// clean this up and move to matchrunner crate
-#[derive(Serialize, Deserialize)]
-pub struct BotConfig {
- pub name: String,
- pub run_command: String,
- pub build_command: Option<String>,
-}
pub async fn get_match_data(
Path(match_id): Path<i32>,