aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFxQnLr <[email protected]>2023-11-02 20:58:29 +0100
committerFxQnLr <[email protected]>2023-11-02 20:58:29 +0100
commit9e3afcfee276af982a1e1d11f24c9711defc124e (patch)
tree38c4b47ae97742560963e6b2b4cba3eb84bbaf8a
parent94104b621e2eec44dd90eb22fae2db2ce4938b87 (diff)
downloadwebol-9e3afcfee276af982a1e1d11f24c9711defc124e.tar
webol-9e3afcfee276af982a1e1d11f24c9711defc124e.tar.gz
webol-9e3afcfee276af982a1e1d11f24c9711defc124e.zip
Revert "update dependencies"
This reverts commit 94104b621e2eec44dd90eb22fae2db2ce4938b87.
-rw-r--r--src/routes/start.rs5
-rw-r--r--src/services/ping.rs23
2 files changed, 12 insertions, 16 deletions
diff --git a/src/routes/start.rs b/src/routes/start.rs
index 271f924..9cd358b 100644
--- a/src/routes/start.rs
+++ b/src/routes/start.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
4use std::sync::Arc; 4use std::sync::Arc;
5use axum::extract::State; 5use axum::extract::State;
6use serde_json::{json, Value}; 6use serde_json::{json, Value};
7use tracing::{debug, info}; 7use tracing::{debug, info, warn};
8use uuid::Uuid; 8use uuid::Uuid;
9use crate::auth::auth; 9use crate::auth::auth;
10use crate::config::SETTINGS; 10use crate::config::SETTINGS;
@@ -16,6 +16,7 @@ use crate::services::ping::PingValue;
16#[axum_macros::debug_handler] 16#[axum_macros::debug_handler]
17pub async fn start(State(state): State<Arc<crate::AppState>>, headers: HeaderMap, Json(payload): Json<StartPayload>) -> Result<Json<Value>, WebolError> { 17pub async fn start(State(state): State<Arc<crate::AppState>>, headers: HeaderMap, Json(payload): Json<StartPayload>) -> Result<Json<Value>, WebolError> {
18 info!("POST request"); 18 info!("POST request");
19 warn!("{:?}", state.ping_map);
19 let secret = headers.get("authorization"); 20 let secret = headers.get("authorization");
20 let authorized = auth(secret).map_err(WebolError::Auth)?; 21 let authorized = auth(secret).map_err(WebolError::Auth)?;
21 if authorized { 22 if authorized {
@@ -45,7 +46,7 @@ pub async fn start(State(state): State<Arc<crate::AppState>>, headers: HeaderMap
45 let uuid_gen = Uuid::new_v4().to_string(); 46 let uuid_gen = Uuid::new_v4().to_string();
46 let uuid_genc = uuid_gen.clone(); 47 let uuid_genc = uuid_gen.clone();
47 tokio::spawn(async move { 48 tokio::spawn(async move {
48 debug!("init ping service"); 49 debug!("Init ping service");
49 state.ping_map.insert(uuid_gen.clone(), PingValue { ip: device.ip.clone(), online: false }); 50 state.ping_map.insert(uuid_gen.clone(), PingValue { ip: device.ip.clone(), online: false });
50 51
51 crate::services::ping::spawn(state.ping_send.clone(), device.ip, uuid_gen.clone(), &state.ping_map).await 52 crate::services::ping::spawn(state.ping_send.clone(), device.ip, uuid_gen.clone(), &state.ping_map).await
diff --git a/src/services/ping.rs b/src/services/ping.rs
index d900acb..a26dacc 100644
--- a/src/services/ping.rs
+++ b/src/services/ping.rs
@@ -41,7 +41,7 @@ pub async fn spawn(tx: Sender<BroadcastCommands>, ip: String, uuid: String, ping
41 } 41 }
42 } else { 42 } else {
43 let (_, duration) = ping.map_err(|err| error!("{}", err.to_string())).expect("fatal error"); 43 let (_, duration) = ping.map_err(|err| error!("{}", err.to_string())).expect("fatal error");
44 debug!("ping took {:?}", duration); 44 debug!("Ping took {:?}", duration);
45 cont = false; 45 cont = false;
46 handle_broadcast_send(&tx, ip.clone(), ping_map, uuid.clone()).await; 46 handle_broadcast_send(&tx, ip.clone(), ping_map, uuid.clone()).await;
47 }; 47 };
@@ -50,12 +50,10 @@ pub async fn spawn(tx: Sender<BroadcastCommands>, ip: String, uuid: String, ping
50 50
51async fn handle_broadcast_send(tx: &Sender<BroadcastCommands>, ip: String, ping_map: &PingMap, uuid: String) { 51async fn handle_broadcast_send(tx: &Sender<BroadcastCommands>, ip: String, ping_map: &PingMap, uuid: String) {
52 debug!("send pingsuccess message"); 52 debug!("send pingsuccess message");
53 let _ = tx.send(BroadcastCommands::PingSuccess(uuid.clone()));
54 trace!("sent message");
55 ping_map.insert(uuid.clone(), PingValue { ip: ip.clone(), online: true }); 53 ping_map.insert(uuid.clone(), PingValue { ip: ip.clone(), online: true });
56 trace!("updated ping_map"); 54 let _ = tx.send(BroadcastCommands::PingSuccess(uuid.clone()));
57 tokio::time::sleep(tokio::time::Duration::from_secs(60)).await; 55 tokio::time::sleep(tokio::time::Duration::from_secs(60)).await;
58 debug!("remove {} from ping_map after success", uuid); 56 trace!("remove {} from ping_map after success", uuid);
59 ping_map.remove(&uuid); 57 ping_map.remove(&uuid);
60} 58}
61 59
@@ -72,12 +70,12 @@ pub async fn status_websocket(mut socket: WebSocket, state: Arc<AppState>) {
72 70
73 trace!("Search for uuid: {:?}", uuid); 71 trace!("Search for uuid: {:?}", uuid);
74 72
75 let device_exists = state.ping_map.contains_key(&uuid); 73 match state.ping_map.get(&uuid) {
76 match device_exists { 74 Some(device) => {
77 true => { 75 debug!("got device: {} (online: {})", device.ip, device.online);
78 let _ = socket.send(process_device(state.clone(), uuid).await).await; 76 let _ = socket.send(process_device(state.clone(), uuid, device.to_owned()).await).await;
79 }, 77 },
80 false => { 78 None => {
81 debug!("didn't find any device"); 79 debug!("didn't find any device");
82 let _ = socket.send(Message::Text(format!("notfound_{}", uuid))).await; 80 let _ = socket.send(Message::Text(format!("notfound_{}", uuid))).await;
83 }, 81 },
@@ -86,10 +84,7 @@ pub async fn status_websocket(mut socket: WebSocket, state: Arc<AppState>) {
86 let _ = socket.close().await; 84 let _ = socket.close().await;
87} 85}
88 86
89async fn process_device(state: Arc<AppState>, uuid: String) -> Message { 87async fn process_device(state: Arc<AppState>, uuid: String, device: PingValue) -> Message {
90 let pm = state.ping_map.clone().into_read_only();
91 let device = pm.get(&uuid).expect("fatal error");
92 debug!("got device: {} (online: {})", device.ip, device.online);
93 match device.online { 88 match device.online {
94 true => { 89 true => {
95 debug!("already started"); 90 debug!("already started");