From 00dd8a9abee6b9f0cfc37c6f20f30f0d99dfe91a Mon Sep 17 00:00:00 2001
From: fx <felixquinn03@gmail.com>
Date: Wed, 25 Oct 2023 12:53:31 +0200
Subject: runs, no error handling

---
 src/routes/mod.rs    |  3 ++-
 src/routes/start.rs  | 24 +++++++++++++++++-------
 src/routes/status.rs | 12 ++++++++++++
 3 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 src/routes/status.rs

(limited to 'src/routes')

diff --git a/src/routes/mod.rs b/src/routes/mod.rs
index 12fbfab..d5ab0d6 100644
--- a/src/routes/mod.rs
+++ b/src/routes/mod.rs
@@ -1,2 +1,3 @@
 pub mod start;
-pub mod device;
\ No newline at end of file
+pub mod device;
+pub mod status;
\ No newline at end of file
diff --git a/src/routes/start.rs b/src/routes/start.rs
index 863ef16..45e7ec8 100644
--- a/src/routes/start.rs
+++ b/src/routes/start.rs
@@ -4,15 +4,18 @@ use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 use axum::extract::State;
 use serde_json::{json, Value};
-use tracing::{debug, info};
+use tracing::{debug, info, warn};
+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;
 
+#[axum_macros::debug_handler]
 pub async fn start(State(state): State<Arc<crate::AppState>>, headers: HeaderMap, Json(payload): Json<StartPayload>) -> Result<Json<Value>, WebolError> {
     info!("POST request");
+    warn!("{:?}", state.ping_map);
     let secret = headers.get("authorization");
     let authorized = auth(secret).map_err(WebolError::Auth)?;
     if authorized {
@@ -38,14 +41,20 @@ pub async fn start(State(state): State<Arc<crate::AppState>>, headers: HeaderMap
             create_buffer(&device.mac)?
         )?;
 
-        if payload.ping.is_some_and(|ping| ping) {
-            debug!("ping true");
-            tokio::spawn(async move {
+        let uuid = if payload.ping.is_some_and(|ping| ping) {
+            let uuid_gen = Uuid::new_v4().to_string();
+            let uuid_genc = uuid_gen.clone();
+            tokio::spawn(async move{
                 debug!("Init ping service");
-                crate::services::ping::spawn(state.ping_send.clone()).await
+                state.ping_map.lock().await.insert(uuid_gen, ("192.168.178.94".to_string(), false));
+
+                warn!("{:?}", state.ping_map);
+
+                crate::services::ping::spawn(state.ping_send.clone(), "192.168.178.94".to_string()).await;
             });
-        };
-        Ok(Json(json!(StartResponse { id: device.id, boot: true })))
+            Some(uuid_genc)
+        } else { None };
+        Ok(Json(json!(StartResponse { id: device.id, boot: true, uuid })))
     } else {
         Err(WebolError::Generic)
     }
@@ -61,4 +70,5 @@ pub struct StartPayload {
 struct StartResponse {
     id: String,
     boot: bool,
+    uuid: Option<String>,
 }
diff --git a/src/routes/status.rs b/src/routes/status.rs
new file mode 100644
index 0000000..cdecf6a
--- /dev/null
+++ b/src/routes/status.rs
@@ -0,0 +1,12 @@
+use std::sync::Arc;
+use axum::extract::{State, WebSocketUpgrade};
+use axum::response::Response;
+use serde::Deserialize;
+use crate::AppState;
+use crate::services::ping::status_websocket;
+
+#[axum_macros::debug_handler]
+pub async fn status(State(state): State<Arc<AppState>>, ws: WebSocketUpgrade) -> Response {
+    // TODO: remove unwrap
+    ws.on_upgrade(move |socket| status_websocket(socket, state.ping_send.clone(), state.ping_map.clone()))
+}
\ No newline at end of file
-- 
cgit v1.2.3