Merge pull request #13 from FxQnLr/config

Config

12 files changed, 79 insertions, 90 deletions

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 279e16d..732e9e9 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -1,35 +1,32 @@
 name: check
 
-on:
-  pull_request:
-    branches: [ "main" ]
-  workflow_dispatch:
-
-env:
-  SCCACHE_GHA_ENABLED: "true"
-  RUSTC_WRAPPER: "sccache"
-  SQLX_OFFLINE: "true"
-  CARGO_TERM_COLOR: always
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run sccache-cache
-        uses: mozilla-actions/[email protected]
-
-      - uses: actions/checkout@v4
-
-      - run: cargo check
-      - run: cargo clippy
-
-  check-release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run sccache-cache
-        uses: mozilla-actions/[email protected]
-
-      - uses: actions/checkout@v4
-
-      - run: cargo check --release
-      - run: cargo clippy --release
\ No newline at end of file
+on: [ pull_request, workflow_dispatch ]
+
+nv:
+ SCCACHE_GHA_ENABLED: "true"
+ RUSTC_WRAPPER: "sccache"
+ SQLX_OFFLINE: "true"
+ CARGO_TERM_COLOR: always
+
+obs:
+ check:
+   runs-on: ubuntu-latest
+   steps:
+     - name: Run sccache-cache
+       uses: mozilla-actions/[email protected]
+
+     - uses: actions/checkout@v4
+
+     - run: cargo check
+     - run: cargo clippy
+
+ check-release:
+   runs-on: ubuntu-latest
+   steps:
+     - name: Run sccache-cache
+       uses: mozilla-actions/[email protected]
+
+     - uses: actions/checkout@v4
+
+     - run: cargo check --release
+     - run: cargo clippy --release
diff --git a/.gitignore b/.gitignore
index bf0eacb..0fd9734 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,5 +11,6 @@ target/
 
 *.sqlite*
 .env
+config.*
 
 .idea
diff --git a/Cargo.lock b/Cargo.lock
index bf75375..f95052b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -818,9 +818,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
 
 [[package]]
 name = "indexmap"
-version = "2.2.2"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520"
+checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.3",
@@ -2360,7 +2360,6 @@ dependencies = [
  "color-eyre",
  "config",
  "dashmap",
- "once_cell",
  "serde",
  "serde_json",
  "sqlx",
diff --git a/Cargo.toml b/Cargo.toml
index 14a955c..0fb250a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,6 @@ time = { version = "0.3", features = ["macros"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 config = "0.14"
-once_cell = "1.18"
 sqlx = { version = "0.7", features = ["postgres", "runtime-tokio"]}
 surge-ping = "0.8"
 axum-macros = "0.4"
diff --git a/README.md b/README.md
index e4a6c44..eabc051 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,4 @@ WEBOL_APIKEY: `String`
 
 WEBOL_SERVERADDR: `Option<String>` (0.0.0.0:7229)
 
-WEBOL_BINDADDR: `Option<String>` (0.0.0.0:1111)
-
-WEBOL_PINGTIMEOUT: `Option<i64>` (10)
\ No newline at end of file
+WEBOL_PINGTIMEOUT: `Option<i64>` (10)
diff --git a/src/auth.rs b/src/auth.rs
index 0321ade..feca652 100644
--- a/src/auth.rs
+++ b/src/auth.rs
@@ -2,15 +2,13 @@ use axum::http::{StatusCode, HeaderValue};
 use axum::http::header::ToStrError;
 use tracing::{debug, error, trace};
 use crate::auth::Error::{MissingSecret, WrongSecret};
-use crate::config::SETTINGS;
+use crate::config::Config;
 
-pub fn auth(secret: Option<&HeaderValue>) -> Result<bool, Error> {
+pub fn auth(config: &Config, secret: Option<&HeaderValue>) -> Result<bool, Error> {
     debug!("auth request with secret {:?}", secret);
     if let Some(value) = secret {
         trace!("value exists");
-        let key = SETTINGS
-            .get_string("apikey")
-            .map_err(Error::Config)?;
+        let key = &config.apikey;
         if value.to_str().map_err(Error::HeaderToStr)? == key.as_str() {
             debug!("successful auth");
             Ok(true)
@@ -28,7 +26,6 @@ pub fn auth(secret: Option<&HeaderValue>) -> Result<bool, Error> {
 pub enum Error {
     WrongSecret,
     MissingSecret,
-    Config(config::ConfigError),
     HeaderToStr(ToStrError)
 }
 
@@ -37,10 +34,6 @@ impl Error {
         match self {
             Self::WrongSecret => (StatusCode::UNAUTHORIZED, "Wrong credentials"),
             Self::MissingSecret => (StatusCode::BAD_REQUEST, "Missing credentials"),
-            Self::Config(err) => {
-                error!("server error: {}", err.to_string());
-                (StatusCode::INTERNAL_SERVER_ERROR, "Server Error")
-            },
             Self::HeaderToStr(err) => {
                 error!("server error: {}", err.to_string());
                 (StatusCode::INTERNAL_SERVER_ERROR, "Server Error")
diff --git a/src/config.rs b/src/config.rs
index 4c79810..e88ddab 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,11 +1,25 @@
-use config::Config;
-use once_cell::sync::Lazy;
+use config::File;
+use serde::Deserialize;
 
-pub static SETTINGS: Lazy<Config> = Lazy::new(setup);
+#[derive(Debug, Clone, Deserialize)]
+pub struct Config {
+    pub database_url: String,
+    pub apikey: String,
+    pub serveraddr: String,
+    pub pingtimeout: i64,
+}
+
+impl Config {
+    pub fn load() -> Result<Self, config::ConfigError> {
+        let config = config::Config::builder()
+            .set_default("serveraddr", "0.0.0.0:7229")?
+            .set_default("pingtimeout", 10)?
+            .add_source(File::with_name("config.toml").required(false))
+            .add_source(File::with_name("config.dev.toml").required(false))
+            .add_source(config::Environment::with_prefix("WEBOL").separator("_"))
+            .build()?;
+
+        config.try_deserialize()
+    }
+}
 
-fn setup() -> Config {
-    Config::builder()
-        .add_source(config::Environment::with_prefix("WEBOL").separator("_"))
-        .build()
-        .unwrap()
-}
\ No newline at end of file
diff --git a/src/db.rs b/src/db.rs
index 8a6b16e..489a000 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -1,13 +1,7 @@
-#[cfg(debug_assertions)]
-use std::env;
-
 use serde::Serialize;
 use sqlx::{PgPool, postgres::PgPoolOptions};
 use tracing::{debug, info};
 
-#[cfg(not(debug_assertions))]
-use crate::config::SETTINGS;
-
 #[derive(Serialize, Debug)]
 pub struct Device {
     pub id: String,
@@ -17,18 +11,12 @@ pub struct Device {
     pub times: Option<Vec<i64>>
 }
 
-pub async fn init_db_pool() -> PgPool {
-    #[cfg(not(debug_assertions))]
-    let db_url = SETTINGS.get_string("database.url").unwrap();
-
-    #[cfg(debug_assertions)]
-    let db_url = env::var("DATABASE_URL").unwrap();
-
+pub async fn init_db_pool(db_url: &str) -> PgPool {
     debug!("attempt to connect dbPool to '{}'", db_url);
 
     let pool = PgPoolOptions::new()
         .max_connections(5)
-        .connect(&db_url)
+        .connect(db_url)
         .await
         .unwrap();
 
diff --git a/src/main.rs b/src/main.rs
index 9d30548..4ef129b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,4 @@
 use std::env;
-use std::net::SocketAddr;
 use std::sync::Arc;
 use axum::{Router, routing::post};
 use axum::routing::{get, put};
@@ -9,7 +8,7 @@ use time::util::local_offset;
 use tokio::sync::broadcast::{channel, Sender};
 use tracing::{info, level_filters::LevelFilter};
 use tracing_subscriber::{EnvFilter, fmt::{self, time::LocalTime}, prelude::*};
-use crate::config::SETTINGS;
+use crate::config::Config;
 use crate::db::init_db_pool;
 use crate::routes::device;
 use crate::routes::start::start;
@@ -47,16 +46,18 @@ async fn main() -> color_eyre::eyre::Result<()> {
 
     let version = env!("CARGO_PKG_VERSION");
 
+    let config = Config::load()?;
+
     info!("start webol v{}", version);
 
-    let db = init_db_pool().await;
+    let db = init_db_pool(&config.database_url).await;
     sqlx::migrate!().run(&db).await.unwrap();
 
     let (tx, _) = channel(32);
 
     let ping_map: StatusMap = DashMap::new();
     
-    let shared_state = Arc::new(AppState { db, ping_send: tx, ping_map });
+    let shared_state = Arc::new(AppState { db, config: config.clone(), ping_send: tx, ping_map });
 
     let app = Router::new()
         .route("/start", post(start))
@@ -66,9 +67,9 @@ async fn main() -> color_eyre::eyre::Result<()> {
         .route("/status", get(status))
         .with_state(shared_state);
 
-    let addr = SETTINGS.get_string("serveraddr").unwrap_or("0.0.0.0:7229".to_string());
+    let addr = config.serveraddr;
     info!("start server on {}", addr);
-    let listener = tokio::net::TcpListener::bind(addr.parse::<SocketAddr>()?)
+    let listener = tokio::net::TcpListener::bind(addr)
         .await?;
     axum::serve(listener, app).await?;
 
@@ -77,6 +78,7 @@ async fn main() -> color_eyre::eyre::Result<()> {
 
 pub struct AppState {
     db: PgPool,
+    config: Config,
     ping_send: Sender<BroadcastCommands>,
     ping_map: StatusMap,
 }
diff --git a/src/routes/device.rs b/src/routes/device.rs
index b80cb85..c85df1b 100644
--- a/src/routes/device.rs
+++ b/src/routes/device.rs
@@ -12,7 +12,7 @@ use crate::error::Error;
 pub async fn get(State(state): State<Arc<crate::AppState>>, headers: HeaderMap, Json(payload): Json<GetDevicePayload>) -> Result<Json<Value>, Error> {
     info!("add device {}", payload.id);
     let secret = headers.get("authorization");
-    if auth(secret).map_err(Error::Auth)? {
+    if auth(&state.config, secret).map_err(Error::Auth)? {
         let device = sqlx::query_as!(
             Device,
             r#"
@@ -39,7 +39,7 @@ pub struct GetDevicePayload {
 pub async fn put(State(state): State<Arc<crate::AppState>>, headers: HeaderMap, Json(payload): Json<PutDevicePayload>) -> Result<Json<Value>, Error> {
     info!("add device {} ({}, {}, {})", payload.id, payload.mac, payload.broadcast_addr, payload.ip);
     let secret = headers.get("authorization");
-    if auth(secret).map_err(Error::Auth)? {
+    if auth(&state.config, secret).map_err(Error::Auth)? {
         sqlx::query!(
             r#"
             INSERT INTO devices (id, mac, broadcast_addr, ip)
@@ -73,7 +73,7 @@ pub struct PutDeviceResponse {
 pub async fn post(State(state): State<Arc<crate::AppState>>, headers: HeaderMap, Json(payload): Json<PostDevicePayload>) -> Result<Json<Value>, Error> {
     info!("edit device {} ({}, {}, {})", payload.id, payload.mac, payload.broadcast_addr, payload.ip);
     let secret = headers.get("authorization");
-    if auth(secret).map_err(Error::Auth)? {
+    if auth(&state.config, secret).map_err(Error::Auth)? {
         let device = sqlx::query_as!(
             Device,
             r#"
diff --git a/src/routes/start.rs b/src/routes/start.rs
index 4264588..ce95bf3 100644
--- a/src/routes/start.rs
+++ b/src/routes/start.rs
@@ -1,5 +1,4 @@
 use crate::auth::auth;
-use crate::config::SETTINGS;
 use crate::db::Device;
 use crate::error::Error;
 use crate::services::ping::Value as PingValue;
@@ -21,7 +20,7 @@ pub async fn start(
 ) -> Result<Json<Value>, Error> {
     info!("POST request");
     let secret = headers.get("authorization");
-    let authorized = auth(secret).map_err(Error::Auth)?;
+    let authorized = auth(&state.config, secret).map_err(Error::Auth)?;
     if authorized {
         let device = sqlx::query_as!(
             Device,
@@ -38,9 +37,7 @@ pub async fn start(
 
         info!("starting {}", device.id);
 
-        let bind_addr = SETTINGS
-            .get_string("bindaddr")
-            .unwrap_or("0.0.0.0:1111".to_string());
+        let bind_addr = "0.0.0.0:0";
 
         let _ = send_packet(
             &bind_addr.parse().map_err(Error::IpParse)?,
@@ -75,6 +72,7 @@ pub async fn start(
 
                 crate::services::ping::spawn(
                     state.ping_send.clone(),
+                    &state.config,
                     device,
                     uuid_gen.clone(),
                     &state.ping_map,
diff --git a/src/services/ping.rs b/src/services/ping.rs
index 7d71218..9b164c8 100644
--- a/src/services/ping.rs
+++ b/src/services/ping.rs
@@ -10,7 +10,7 @@ use time::{Duration, Instant};
 use tokio::sync::broadcast::Sender;
 use tracing::{debug, error, trace};
 use crate::AppState;
-use crate::config::SETTINGS;
+use crate::config::Config;
 use crate::db::Device;
 
 pub type StatusMap = DashMap<String, Value>;
@@ -21,7 +21,7 @@ pub struct Value {
     pub online: bool
 }
 
-pub async fn spawn(tx: Sender<BroadcastCommands>, device: Device, uuid: String, ping_map: &StatusMap, db: &PgPool) {
+pub async fn spawn(tx: Sender<BroadcastCommands>, config: &Config, device: Device, uuid: String, ping_map: &StatusMap, db: &PgPool) {
     let timer = Instant::now();
     let payload = [0; 8];
 
@@ -40,7 +40,7 @@ pub async fn spawn(tx: Sender<BroadcastCommands>, device: Device, uuid: String,
                 error!("{}", ping.to_string());
                 msg = Some(BroadcastCommands::Error(uuid.clone()));
             }
-            if timer.elapsed() >= Duration::minutes(SETTINGS.get_int("pingtimeout").unwrap_or(10)) {
+            if timer.elapsed() >= Duration::minutes(config.pingtimeout) {
                 msg = Some(BroadcastCommands::Timeout(uuid.clone()));
             }
         } else {