diff --git a/Cargo.lock b/Cargo.lock index 3c14f61..adc5357 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -81,6 +81,56 @@ dependencies = [ "libc", ] +[[package]] +name = "anstream" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" + +[[package]] +name = "anstyle-parse" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" +dependencies = [ + "anstyle", + "once_cell", + "windows-sys 0.59.0", +] + [[package]] name = "anyhow" version = "1.0.98" @@ -811,6 +861,46 @@ dependencies = [ "windows-link", ] +[[package]] +name = "clap" +version = "4.5.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", +] + +[[package]] +name = "clap_derive" +version = "4.5.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "clap_lex" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" + [[package]] name = "cloudabi" version = "0.0.3" @@ -820,6 +910,12 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "colorchoice" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" + [[package]] name = "combine" version = "4.6.7" @@ -2831,6 +2927,12 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.14.0" @@ -2928,6 +3030,7 @@ dependencies = [ "build-info-build", "cacher", "chrono", + "clap", "css-inline", "futures 0.3.31", "headers", @@ -6816,6 +6919,12 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + [[package]] name = "uuid" version = "1.16.0" diff --git a/dev.sh b/dev.sh index bc6a758..c8e1653 100755 --- a/dev.sh +++ b/dev.sh @@ -3,5 +3,5 @@ tmux new-session -d -s letterbox-dev tmux rename-window web tmux send-keys "cd web; trunk serve -w ../.git -w ../shared -w ../notmuch -w ./" C-m tmux new-window -n server -tmux send-keys "cd server; cargo watch -c -x run -w ../.git -w ../shared -w ../notmuch -w ./" C-m +tmux send-keys "cd server; cargo watch -c -w ../.git -w ../shared -w ../notmuch -w ./ -x 'run postgres://newsreader@nixos-07.h.xinu.tv/newsreader ../target/database/newsreader /tmp/letterbox/slurp'" C-m tmux attach -d -t letterbox-dev diff --git a/server/Cargo.toml b/server/Cargo.toml index 256841d..34db5b5 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -22,6 +22,7 @@ axum-macros = "0.5.0" build-info = "0.0.40" cacher = { version = "0.2.0", registry = "xinu" } chrono = "0.4.39" +clap = { version = "4.5.36", features = ["derive"] } css-inline = "0.14.0" futures = "0.3.31" headers = "0.4.0" diff --git a/server/src/bin/letterbox-server.rs b/server/src/bin/letterbox-server.rs index 4d03437..a780ff4 100644 --- a/server/src/bin/letterbox-server.rs +++ b/server/src/bin/letterbox-server.rs @@ -15,11 +15,11 @@ use axum::{ Router, }; use cacher::FilesystemCacher; +use clap::Parser; use letterbox_notmuch::Notmuch; #[cfg(feature = "tantivy")] use letterbox_server::tantivy::TantivyConnection; use letterbox_server::{ - config::Config, graphql::{compute_catchup_ids, Attachment, MutationRoot, QueryRoot, SubscriptionRoot}, nm::{attachment_bytes, cid_attachment_bytes}, ws::ConnectionTracker, @@ -201,29 +201,33 @@ struct AppState { connection_tracker: Arc>, } +#[derive(Parser)] +#[command(version, about, long_about = None)] +struct Cli { + #[arg(short, long, default_value = "0.0.0.0:9345")] + addr: SocketAddr, + newsreader_database_url: String, + newsreader_tantivy_db_path: String, + slurp_cache_path: String, +} + #[tokio::main] async fn main() -> Result<(), Box> { + let cli = Cli::parse(); let _guard = xtracing::init(env!("CARGO_BIN_NAME"))?; build_info::build_info!(fn bi); info!("Build Info: {}", letterbox_shared::build_version(bi)); - // TODO: move these to config - let port = 9345; - let config = Config { - newsreader_database_url: "postgres://newsreader@nixos-07.h.xinu.tv/newsreader".to_string(), - newsreader_tantivy_db_path: "../target/database/newsreader".to_string(), - slurp_cache_path: "/tmp/letterbox/slurp".to_string(), - }; - if !std::fs::exists(&config.slurp_cache_path)? { - info!("Creating slurp cache @ '{}'", &config.slurp_cache_path); - std::fs::create_dir_all(&config.slurp_cache_path)?; + if !std::fs::exists(&cli.slurp_cache_path)? { + info!("Creating slurp cache @ '{}'", &cli.slurp_cache_path); + std::fs::create_dir_all(&cli.slurp_cache_path)?; } - let pool = PgPool::connect(&config.newsreader_database_url).await?; + let pool = PgPool::connect(&cli.newsreader_database_url).await?; let nm = Notmuch::default(); sqlx::migrate!("./migrations").run(&pool).await?; #[cfg(feature = "tantivy")] - let tantivy_conn = TantivyConnection::new(&config.newsreader_tantivy_db_path)?; + let tantivy_conn = TantivyConnection::new(&cli.newsreader_tantivy_db_path)?; - let cacher = FilesystemCacher::new(&config.slurp_cache_path)?; + let cacher = FilesystemCacher::new(&cli.slurp_cache_path)?; let schema = Schema::build(QueryRoot, MutationRoot, SubscriptionRoot) .data(nm.clone()) .data(cacher) @@ -262,9 +266,7 @@ async fn main() -> Result<(), Box> { .make_span_with(DefaultMakeSpan::default().include_headers(true)), ); - let listener = TcpListener::bind(SocketAddr::from(([0, 0, 0, 0], port))) - .await - .unwrap(); + let listener = TcpListener::bind(cli.addr).await.unwrap(); tracing::info!("listening on {}", listener.local_addr().unwrap()); axum::serve( listener,