3 files changed, 65 insertions, 41 deletions

diff --git a/src/routes/device.rs b/src/routes/device.rs
index 678d117..c85df1b 100644
--- a/src/routes/device.rs
+++ b/src/routes/device.rs
@@ -1,18 +1,18 @@
 use std::sync::Arc;
 use axum::extract::State;
-use axum::headers::HeaderMap;
 use axum::Json;
+use axum::http::HeaderMap;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
 use tracing::{debug, info};
 use crate::auth::auth;
 use crate::db::Device;
-use crate::error::WebolError;
+use crate::error::Error;
 
-pub async fn get_device(State(state): State<Arc<crate::AppState>>, headers: HeaderMap, Json(payload): Json<GetDevicePayload>) -> Result<Json<Value>, WebolError> {
+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(WebolError::Auth)? {
+    if auth(&state.config, secret).map_err(Error::Auth)? {
         let device = sqlx::query_as!(
             Device,
             r#"
@@ -21,13 +21,13 @@ pub async fn get_device(State(state): State<Arc<crate::AppState>>, headers: Head
             WHERE id = $1;
             "#,
             payload.id
-        ).fetch_one(&state.db).await.map_err(WebolError::DB)?;
+        ).fetch_one(&state.db).await.map_err(Error::DB)?;
 
         debug!("got device {:?}", device);
 
         Ok(Json(json!(device)))
     } else {
-        Err(WebolError::Generic)
+        Err(Error::Generic)
     }
 }
 
@@ -36,10 +36,10 @@ pub struct GetDevicePayload {
     id: String,
 }
 
-pub async fn put_device(State(state): State<Arc<crate::AppState>>, headers: HeaderMap, Json(payload): Json<PutDevicePayload>) -> Result<Json<Value>, WebolError> {
+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(WebolError::Auth)? {
+    if auth(&state.config, secret).map_err(Error::Auth)? {
         sqlx::query!(
             r#"
             INSERT INTO devices (id, mac, broadcast_addr, ip)
@@ -49,11 +49,11 @@ pub async fn put_device(State(state): State<Arc<crate::AppState>>, headers: Head
             payload.mac,
             payload.broadcast_addr,
             payload.ip
-        ).execute(&state.db).await.map_err(WebolError::DB)?;
+        ).execute(&state.db).await.map_err(Error::DB)?;
 
         Ok(Json(json!(PutDeviceResponse { success: true })))
     } else {
-        Err(WebolError::Generic)
+        Err(Error::Generic)
     }
 }
 
@@ -70,10 +70,10 @@ pub struct PutDeviceResponse {
     success: bool
 }
 
-pub async fn post_device(State(state): State<Arc<crate::AppState>>, headers: HeaderMap, Json(payload): Json<PostDevicePayload>) -> Result<Json<Value>, WebolError> {
+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(WebolError::Auth)? {
+    if auth(&state.config, secret).map_err(Error::Auth)? {
         let device = sqlx::query_as!(
             Device,
             r#"
@@ -85,11 +85,11 @@ pub async fn post_device(State(state): State<Arc<crate::AppState>>, headers: Hea
             payload.broadcast_addr,
             payload.ip,
             payload.id
-        ).fetch_one(&state.db).await.map_err(WebolError::DB)?;
+        ).fetch_one(&state.db).await.map_err(Error::DB)?;
 
         Ok(Json(json!(device)))
     } else {
-        Err(WebolError::Generic)
+        Err(Error::Generic)
     }
 }
 
diff --git a/src/routes/start.rs b/src/routes/start.rs
index 1555db3..ce95bf3 100644
--- a/src/routes/start.rs
+++ b/src/routes/start.rs
@@ -1,23 +1,26 @@
-use axum::headers::HeaderMap;
+use crate::auth::auth;
+use crate::db::Device;
+use crate::error::Error;
+use crate::services::ping::Value as PingValue;
+use crate::wol::{create_buffer, send_packet};
+use axum::extract::State;
+use axum::http::HeaderMap;
 use axum::Json;
 use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-use axum::extract::State;
 use serde_json::{json, Value};
+use std::sync::Arc;
 use tracing::{debug, info};
 use uuid::Uuid;
-use crate::auth::auth;
-use crate::config::SETTINGS;
-use crate::wol::{create_buffer, send_packet};
-use crate::db::Device;
-use crate::error::WebolError;
-use crate::services::ping::PingValue;
 
 #[axum_macros::debug_handler]
-pub async fn start(State(state): State<Arc<crate::AppState>>, headers: HeaderMap, Json(payload): Json<StartPayload>) -> Result<Json<Value>, WebolError> {
+pub async fn start(
+    State(state): State<Arc<crate::AppState>>,
+    headers: HeaderMap,
+    Json(payload): Json<Payload>,
+) -> Result<Json<Value>, Error> {
     info!("POST request");
     let secret = headers.get("authorization");
-    let authorized = auth(secret).map_err(WebolError::Auth)?;
+    let authorized = auth(&state.config, secret).map_err(Error::Auth)?;
     if authorized {
         let device = sqlx::query_as!(
             Device,
@@ -27,18 +30,19 @@ pub async fn start(State(state): State<Arc<crate::AppState>>, headers: HeaderMap
             WHERE id = $1;
             "#,
             payload.id
-        ).fetch_one(&state.db).await.map_err(WebolError::DB)?;
+        )
+        .fetch_one(&state.db)
+        .await
+        .map_err(Error::DB)?;
 
         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(WebolError::IpParse)?,
-            &device.broadcast_addr.parse().map_err(WebolError::IpParse)?,
-            create_buffer(&device.mac)?
+            &bind_addr.parse().map_err(Error::IpParse)?,
+            &device.broadcast_addr.parse().map_err(Error::IpParse)?,
+            &create_buffer(&device.mac)?,
         )?;
         let dev_id = device.id.clone();
         let uuid = if payload.ping.is_some_and(|ping| ping) {
@@ -49,7 +53,7 @@ pub async fn start(State(state): State<Arc<crate::AppState>>, headers: HeaderMap
                     uuid = Some(key);
                     break;
                 }
-            };
+            }
             let uuid_gen = match uuid {
                 Some(u) => u,
                 None => Uuid::new_v4().to_string(),
@@ -58,26 +62,46 @@ pub async fn start(State(state): State<Arc<crate::AppState>>, headers: HeaderMap
 
             tokio::spawn(async move {
                 debug!("init ping service");
-                state.ping_map.insert(uuid_gen.clone(), PingValue { ip: device.ip.clone(), online: false });
+                state.ping_map.insert(
+                    uuid_gen.clone(),
+                    PingValue {
+                        ip: device.ip.clone(),
+                        online: false,
+                    },
+                );
 
-                crate::services::ping::spawn(state.ping_send.clone(), device, uuid_gen.clone(), &state.ping_map, &state.db).await
+                crate::services::ping::spawn(
+                    state.ping_send.clone(),
+                    &state.config,
+                    device,
+                    uuid_gen.clone(),
+                    &state.ping_map,
+                    &state.db,
+                )
+                .await;
             });
             Some(uuid_genc)
-        } else { None };
-        Ok(Json(json!(StartResponse { id: dev_id, boot: true, uuid })))
+        } else {
+            None
+        };
+        Ok(Json(json!(Response {
+            id: dev_id,
+            boot: true,
+            uuid
+        })))
     } else {
-        Err(WebolError::Generic)
+        Err(Error::Generic)
     }
 }
 
 #[derive(Deserialize)]
-pub struct StartPayload {
+pub struct Payload {
     id: String,
     ping: Option<bool>,
 }
 
 #[derive(Serialize)]
-struct StartResponse {
+struct Response {
     id: String,
     boot: bool,
     uuid: Option<String>,
diff --git a/src/routes/status.rs b/src/routes/status.rs
index 45f3e51..31ef996 100644
--- a/src/routes/status.rs
+++ b/src/routes/status.rs
@@ -7,4 +7,4 @@ use crate::services::ping::status_websocket;
 #[axum_macros::debug_handler]
 pub async fn status(State(state): State<Arc<AppState>>, ws: WebSocketUpgrade) -> Response {
     ws.on_upgrade(move |socket| status_websocket(socket, state))
-}
\ No newline at end of file
+}