Merge pull request #28 from FxQnLr/0.3.4

0.3.4

2 files changed, 119 insertions, 36 deletions

diff --git a/src/routes/device.rs b/src/routes/device.rs
index d01d9f0..40b5cd8 100644
--- a/src/routes/device.rs
+++ b/src/routes/device.rs
@@ -20,7 +20,7 @@ use utoipa::ToSchema;
     security(("api_key" = []))
 )]
 #[deprecated]
-pub async fn get(
+pub async fn get_payload(
     State(state): State<Arc<crate::AppState>>,
     Json(payload): Json<GetDevicePayload>,
 ) -> Result<Json<Value>, Error> {
@@ -49,11 +49,11 @@ pub async fn get(
         (status = 200, description = "Get `Device` information", body = [Device])
     ),
     params(
-        ("id" = String, Path, description = "Device id")
+        ("id" = String, Path, description = "device id")
     ),
-    security(("api_key" = []))
+    security((), ("api_key" = []))
 )]
-pub async fn get_path(
+pub async fn get(
     State(state): State<Arc<crate::AppState>>,
     Path(path): Path<String>,
 ) -> Result<Json<Value>, Error> {
@@ -76,22 +76,31 @@ pub async fn get_path(
 }
 
 #[derive(Deserialize, ToSchema)]
+#[deprecated]
 pub struct GetDevicePayload {
     id: String,
 }
 
+#[derive(Deserialize, ToSchema)]
+pub struct DevicePayload {
+    id: String,
+    mac: String,
+    broadcast_addr: String,
+    ip: String,
+}
+
 #[utoipa::path(
     put,
     path = "/device",
-    request_body = PutDevicePayload,
+    request_body = DevicePayload,
     responses(
-        (status = 200, description = "List matching todos by query", body = [DeviceSchema])
+        (status = 200, description = "add device to storage", body = [DeviceSchema])
     ),
-    security(("api_key" = []))
+    security((), ("api_key" = []))
 )]
 pub async fn put(
     State(state): State<Arc<crate::AppState>>,
-    Json(payload): Json<PutDevicePayload>,
+    Json(payload): Json<DevicePayload>,
 ) -> Result<Json<Value>, Error> {
     info!(
         "add device {} ({}, {}, {})",
@@ -118,26 +127,18 @@ pub async fn put(
     Ok(Json(json!(device)))
 }
 
-#[derive(Deserialize, ToSchema)]
-pub struct PutDevicePayload {
-    id: String,
-    mac: String,
-    broadcast_addr: String,
-    ip: String,
-}
-
 #[utoipa::path(
     post,
     path = "/device",
-    request_body = PostDevicePayload,
+    request_body = DevicePayload,
     responses(
-        (status = 200, description = "List matching todos by query", body = [DeviceSchema])
+        (status = 200, description = "update device in storage", body = [DeviceSchema])
     ),
-    security(("api_key" = []))
+    security((), ("api_key" = []))
 )]
 pub async fn post(
     State(state): State<Arc<crate::AppState>>,
-    Json(payload): Json<PostDevicePayload>,
+    Json(payload): Json<DevicePayload>,
 ) -> Result<Json<Value>, Error> {
     info!(
         "edit device {} ({}, {}, {})",
@@ -162,11 +163,3 @@ pub async fn post(
 
     Ok(Json(json!(device)))
 }
-
-#[derive(Deserialize, ToSchema)]
-pub struct PostDevicePayload {
-    id: String,
-    mac: String,
-    broadcast_addr: String,
-    ip: String,
-}
diff --git a/src/routes/start.rs b/src/routes/start.rs
index ef6e8f2..ff3d1be 100644
--- a/src/routes/start.rs
+++ b/src/routes/start.rs
@@ -2,27 +2,28 @@ 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::extract::{Path, State};
 use axum::Json;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
-use utoipa::ToSchema;
 use std::sync::Arc;
 use tracing::{debug, info};
+use utoipa::ToSchema;
 use uuid::Uuid;
 
 #[utoipa::path(
     post,
     path = "/start",
-    request_body = Payload,
+    request_body = PayloadOld,
     responses(
-        (status = 200, description = "List matching todos by query", body = [Response])
+        (status = 200, description = "DEP", body = [Response])
     ),
-    security(("api_key" = []))
+    security((), ("api_key" = []))
 )]
-pub async fn start(
+#[deprecated]
+pub async fn start_payload(
     State(state): State<Arc<crate::AppState>>,
-    Json(payload): Json<Payload>,
+    Json(payload): Json<PayloadOld>,
 ) -> Result<Json<Value>, Error> {
     info!("POST request");
     let device = sqlx::query_as!(
@@ -59,6 +60,89 @@ pub async fn start(
     })))
 }
 
+#[utoipa::path(
+    post,
+    path = "/start/{id}",
+    request_body = Option<Payload>,
+    responses(
+        (status = 200, description = "start the device with the given id", body = [Response])
+    ),
+    params(
+        ("id" = String, Path, description = "device id")
+    ),
+    security((), ("api_key" = []))
+)]
+pub async fn post(
+    State(state): State<Arc<crate::AppState>>,
+    Path(id): Path<String>,
+    payload: Option<Json<Payload>>,
+) -> Result<Json<Value>, Error> {
+    send_wol(state, &id, payload).await
+}
+
+#[utoipa::path(
+    get,
+    path = "/start/{id}",
+    responses(
+        (status = 200, description = "start the device with the given id", body = [Response])
+    ),
+    params(
+        ("id" = String, Path, description = "device id")
+    ),
+    security((), ("api_key" = []))
+)]
+pub async fn get(
+    State(state): State<Arc<crate::AppState>>,
+    Path(id): Path<String>,
+) -> Result<Json<Value>, Error> {
+    send_wol(state, &id, None).await
+}
+
+async fn send_wol(
+    state: Arc<crate::AppState>,
+    id: &str,
+    payload: Option<Json<Payload>>,
+) -> Result<Json<Value>, Error> {
+    info!("Start request for {id}");
+    let device = sqlx::query_as!(
+        Device,
+        r#"
+        SELECT id, mac, broadcast_addr, ip, times
+        FROM devices
+        WHERE id = $1;
+        "#,
+        id
+    )
+    .fetch_one(&state.db)
+    .await?;
+
+    info!("starting {}", device.id);
+
+    let bind_addr = "0.0.0.0:0";
+
+    let _ = send_packet(
+        bind_addr,
+        &device.broadcast_addr,
+        &create_buffer(&device.mac.to_string())?,
+    )?;
+    let dev_id = device.id.clone();
+    let uuid = if let Some(pl) = payload {
+        if pl.ping.is_some_and(|ping| ping) {
+            Some(setup_ping(state, device))
+        } else {
+            None
+        }
+    } else {
+        None
+    };
+
+    Ok(Json(json!(Response {
+        id: dev_id,
+        boot: true,
+        uuid
+    })))
+}
+
 fn setup_ping(state: Arc<crate::AppState>, device: Device) -> String {
     let mut uuid: Option<String> = None;
     for (key, value) in state.ping_map.clone() {
@@ -99,11 +183,17 @@ fn setup_ping(state: Arc<crate::AppState>, device: Device) -> String {
 }
 
 #[derive(Deserialize, ToSchema)]
-pub struct Payload {
+#[deprecated]
+pub struct PayloadOld {
     id: String,
     ping: Option<bool>,
 }
 
+#[derive(Deserialize, ToSchema)]
+pub struct Payload {
+    ping: Option<bool>,
+}
+
 #[derive(Serialize, ToSchema)]
 pub struct Response {
     id: String,