@@ -74,8 +75,14 @@ fn Ready(data: InitialData) -> impl leptos::IntoView {
let grid_classes = format!("grid grid-rows-{} grid-cols-{} gap-3", data.wall.rows, data.wall.cols);
view! {
-
+ // Render the wall
+
{cells}
+
+
+
+
+
}
}
diff --git a/crates/ascend/src/server.rs b/crates/ascend/src/server.rs
index 111c057..c28e5e8 100644
--- a/crates/ascend/src/server.rs
+++ b/crates/ascend/src/server.rs
@@ -1,80 +1,24 @@
//! Server-only features
-use crate::models;
-use models::HoldPosition;
-use models::HoldRole;
-use models::Problem;
+use cli::Cli;
+use config::Config;
+use confik::Configuration;
+use confik::EnvSource;
use persistence::Persistent;
use state::PersistentState;
use state::State;
-use std::collections::BTreeMap;
use std::path::Path;
use std::path::PathBuf;
use tower_http::services::ServeDir;
use tracing::level_filters::LevelFilter;
use type_toppings::ResultExt;
-pub mod cli {
- //! Server CLI interface
-
- use std::path::PathBuf;
-
- #[derive(clap::Parser)]
- #[command(version, about, long_about = None)]
- pub struct Cli {
- #[command(subcommand)]
- pub command: Command,
- }
-
- #[derive(clap::Subcommand, Default)]
- pub enum Command {
- #[default]
- Serve,
-
- /// Resets state, replacing it with defaults
- ResetState,
-
- ImportMiniMoonboardProblems {
- file_path: PathBuf,
- },
- }
-}
-
-pub mod state {
- //! Server state
-
- const STATE_VERSION: u64 = 1;
-
- use super::persistence::Persistent;
- use crate::models;
- use crate::models::Wall;
- use serde::Deserialize;
- use serde::Serialize;
- use smart_default::SmartDefault;
- use std::collections::BTreeSet;
-
- #[derive(Clone, Debug)]
- pub struct State {
- pub persistent: Persistent
,
- }
-
- #[derive(Serialize, Deserialize, Clone, Debug, SmartDefault)]
- pub struct PersistentState {
- /// State schema version
- #[default(STATE_VERSION)]
- pub version: u64,
-
- pub wall: Wall,
- pub problems: Problems,
- }
-
- #[derive(Serialize, Deserialize, Clone, Debug, Default)]
- pub struct Problems {
- pub problems: BTreeSet,
- }
-}
-
+mod cli;
+pub mod config;
+mod migrations;
+pub mod operations;
pub mod persistence;
+pub mod state;
pub const STATE_FILE: &str = "datastore/private/state.ron";
@@ -96,19 +40,9 @@ pub async fn main() {
.init();
let cli = Cli::parse();
+
match cli.command {
- Command::Serve => serve().await.unwrap_or_report(),
- Command::ImportMiniMoonboardProblems { file_path } => {
- let problems = import_mini_moonboard_problems(&file_path).await.unwrap_or_report();
- let state = load_state().await.unwrap_or_report();
- state
- .persistent
- .update(|s| {
- s.problems.problems.extend(problems);
- })
- .await
- .unwrap_or_report();
- }
+ Command::Serve => serve(cli).await.unwrap_or_report(),
Command::ResetState => {
let s = PersistentState::default();
let p = Path::new(STATE_FILE);
@@ -118,8 +52,8 @@ pub async fn main() {
}
}
-#[tracing::instrument(err)]
-async fn serve() -> Result<(), Error> {
+#[tracing::instrument(skip(cli), err)]
+async fn serve(cli: Cli) -> Result<(), Error> {
use crate::app::App;
use crate::app::shell;
use axum::Router;
@@ -127,25 +61,34 @@ async fn serve() -> Result<(), Error> {
use leptos_axum::LeptosRoutes;
use leptos_axum::generate_route_list;
- run_migrations().await.map_err(self::Error::Migration)?;
+ migrations::run_migrations().await;
// Setting get_configuration(None) means we'll be using cargo-leptos's env values
// For deployment these variables are:
//
// Alternately a file can be specified such as Some("Cargo.toml")
// The file would need to be included with the executable when moved to deployment
- let conf = get_configuration(None).unwrap_or_report();
- let leptos_options = conf.leptos_options;
+ let leptos_conf_file = get_configuration(None).unwrap_or_report();
+ let leptos_options = leptos_conf_file.leptos_options;
let addr = leptos_options.site_addr;
let routes = generate_route_list(App);
+ let config = load_config(cli)?;
let server_state = load_state().await?;
let app = Router::new()
- .leptos_routes_with_context(&leptos_options, routes, move || provide_context(server_state.clone()), {
- let leptos_options = leptos_options.clone();
- move || shell(leptos_options.clone())
- })
+ .leptos_routes_with_context(
+ &leptos_options,
+ routes,
+ move || {
+ provide_context(server_state.clone());
+ provide_context(config.clone())
+ },
+ {
+ let leptos_options = leptos_options.clone();
+ move || shell(leptos_options.clone())
+ },
+ )
.nest_service("/files", file_service("datastore/public"))
.fallback(leptos_axum::file_and_error_handler(shell))
.with_state(leptos_options);
@@ -179,46 +122,17 @@ async fn load_state() -> Result {
Ok(State { persistent })
}
-#[tracing::instrument]
-pub(crate) async fn import_mini_moonboard_problems(file_path: &Path) -> Result, Error> {
- let mut problems = Vec::new();
-
- tracing::info!("Parsing mini moonboard problems from {}", file_path.display());
- let mini_moonboard = moonboard_parser::mini_moonboard::parse(file_path).await?;
- for problem in mini_moonboard.problems {
- let mut holds = BTreeMap::::new();
- for mv in problem.moves {
- let row = mv.description.row();
- let col = mv.description.column();
- let hold_position = HoldPosition { row, col };
-
- let role = match (mv.is_start, mv.is_end) {
- (true, true) => unreachable!(),
- (true, false) => HoldRole::Start,
- (false, true) => HoldRole::End,
- (false, false) => HoldRole::Normal,
- };
- holds.insert(hold_position, role);
- }
- let route = Problem { holds };
- problems.push(route);
- }
- Ok(problems)
-}
-
-async fn run_migrations() -> Result<(), Box> {
- // State file moved to datastore/private
+fn load_config(cli: Cli) -> Result {
+ let mut builder = config::Config::builder();
+ if cli
+ .config
+ .try_exists()
+ .expect_or_report_with(|| format!("Failed to look up config file at {}", cli.config))
{
- let m = PathBuf::from("state.ron");
- if m.try_exists()? {
- tracing::warn!("MIGRATING STATE FILE");
- let p = PathBuf::from(STATE_FILE);
- tokio::fs::create_dir_all(p.parent().unwrap()).await?;
- tokio::fs::rename(m, &p).await?;
- }
+ builder.override_with(confik::FileSource::new(cli.config));
}
-
- Ok(())
+ let config = builder.override_with(EnvSource::new().allow_secrets()).try_build()?;
+ Ok(config)
}
#[derive(Debug, derive_more::Error, derive_more::Display, derive_more::From)]
@@ -230,4 +144,6 @@ pub enum Error {
#[display("Failed migration")]
Migration(Box),
+
+ Confik(confik::Error),
}
diff --git a/crates/ascend/src/server/cli.rs b/crates/ascend/src/server/cli.rs
new file mode 100644
index 0000000..4b25089
--- /dev/null
+++ b/crates/ascend/src/server/cli.rs
@@ -0,0 +1,33 @@
+//! Server CLI interface
+
+#[derive(clap::Parser)]
+#[command(version, about, long_about = None)]
+pub struct Cli {
+ #[command(subcommand)]
+ pub command: Command,
+
+ /// Path to configuration file.
+ #[arg(long, default_value_t = default_config_location())]
+ pub config: camino::Utf8PathBuf,
+}
+
+#[derive(clap::Subcommand, Default)]
+pub enum Command {
+ #[default]
+ Serve,
+
+ /// Resets state, replacing it with defaults
+ ResetState,
+}
+
+fn default_config_location() -> camino::Utf8PathBuf {
+ let xdg_dirs = xdg::BaseDirectories::with_prefix("ascend").unwrap();
+ let config_path = xdg_dirs.get_config_file("config.toml");
+ camino::Utf8PathBuf::from_path_buf(config_path).unwrap()
+}
+
+#[cfg(test)]
+#[test]
+fn verify_cli() {
+ ::command().debug_assert()
+}
diff --git a/crates/ascend/src/server/config.rs b/crates/ascend/src/server/config.rs
new file mode 100644
index 0000000..fb7dc14
--- /dev/null
+++ b/crates/ascend/src/server/config.rs
@@ -0,0 +1,7 @@
+use camino::Utf8PathBuf;
+
+#[derive(Clone, Debug, confik::Configuration)]
+pub struct Config {
+ /// The location of the moonboard problems directory.
+ pub moonboard_problems: Utf8PathBuf,
+}
diff --git a/crates/ascend/src/server/migrations.rs b/crates/ascend/src/server/migrations.rs
new file mode 100644
index 0000000..7c8e26f
--- /dev/null
+++ b/crates/ascend/src/server/migrations.rs
@@ -0,0 +1,20 @@
+use crate::server::STATE_FILE;
+use std::path::PathBuf;
+use type_toppings::ResultExt;
+
+#[tracing::instrument]
+pub async fn run_migrations() {
+ migrate_state_file().await;
+}
+
+/// State file moved to datastore/private
+#[tracing::instrument]
+async fn migrate_state_file() {
+ let m = PathBuf::from("state.ron");
+ if m.try_exists().expect_or_report_with(|| format!("Failed to read {}", m.display())) {
+ tracing::warn!("MIGRATING STATE FILE");
+ let p = PathBuf::from(STATE_FILE);
+ tokio::fs::create_dir_all(p.parent().unwrap()).await.unwrap_or_report();
+ tokio::fs::rename(m, &p).await.unwrap_or_report();
+ }
+}
diff --git a/crates/ascend/src/server/operations.rs b/crates/ascend/src/server/operations.rs
new file mode 100644
index 0000000..54063ec
--- /dev/null
+++ b/crates/ascend/src/server/operations.rs
@@ -0,0 +1,54 @@
+//! Server lib module to host re-usable server operations.
+
+use crate::models::HoldPosition;
+use crate::models::HoldRole;
+use crate::models::Problem;
+use crate::server::config::Config;
+use crate::server::persistence;
+use crate::server::state::State;
+use std::collections::BTreeMap;
+
+#[tracing::instrument(skip(state))]
+pub(crate) async fn import_mini_moonboard_problems(config: &Config, state: &State) -> Result<(), Error> {
+ let mut problems = Vec::new();
+
+ let file_name = "problems Mini MoonBoard 2020 40.json";
+ let file_path = config.moonboard_problems.join(file_name);
+
+ tracing::info!("Parsing mini moonboard problems from {file_path}");
+
+ let mini_moonboard = moonboard_parser::mini_moonboard::parse(file_path.as_std_path()).await?;
+ for problem in mini_moonboard.problems {
+ let mut holds = BTreeMap::::new();
+ for mv in problem.moves {
+ let row = mv.description.row();
+ let col = mv.description.column();
+ let hold_position = HoldPosition { row, col };
+
+ let role = match (mv.is_start, mv.is_end) {
+ (true, true) => unreachable!(),
+ (true, false) => HoldRole::Start,
+ (false, true) => HoldRole::End,
+ (false, false) => HoldRole::Normal,
+ };
+ holds.insert(hold_position, role);
+ }
+ let route = Problem { holds };
+ problems.push(route);
+ }
+
+ state
+ .persistent
+ .update(|s| {
+ s.problems.problems.extend(problems);
+ })
+ .await?;
+
+ Ok(())
+}
+
+#[derive(Debug, derive_more::Error, derive_more::Display, derive_more::From)]
+pub enum Error {
+ Parser(moonboard_parser::Error),
+ Persistence(persistence::Error),
+}
diff --git a/crates/ascend/src/server/state.rs b/crates/ascend/src/server/state.rs
new file mode 100644
index 0000000..cdf6def
--- /dev/null
+++ b/crates/ascend/src/server/state.rs
@@ -0,0 +1,31 @@
+//! Server state
+
+const STATE_VERSION: u64 = 1;
+
+use super::persistence::Persistent;
+use crate::models;
+use crate::models::Wall;
+use serde::Deserialize;
+use serde::Serialize;
+use smart_default::SmartDefault;
+use std::collections::BTreeSet;
+
+#[derive(Clone, Debug)]
+pub struct State {
+ pub persistent: Persistent,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, SmartDefault)]
+pub struct PersistentState {
+ /// State schema version
+ #[default(STATE_VERSION)]
+ pub version: u64,
+
+ pub wall: Wall,
+ pub problems: Problems,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, Default)]
+pub struct Problems {
+ pub problems: BTreeSet,
+}
diff --git a/flake.nix b/flake.nix
index 669fc31..279377a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -148,6 +148,7 @@
];
env.RUST_LOG = "info,ascend=trace";
+ env.MOONBOARD_PROBLEMS = "moonboard-problems";
};
};
}
diff --git a/justfile b/justfile
index 3b7eafe..abccf0b 100644
--- a/justfile
+++ b/justfile
@@ -25,7 +25,6 @@ run-release:
reset-state:
cargo run --features ssr -- reset-state
- cargo run --features ssr -- import-mini-moonboard-problems "moonboard-problems/problems Mini MoonBoard 2020 40.json"
# Open firewall port for development
open-firewall:
