fix: don't push changes to service and management pages

The services page only used changes for updating the time, which wasn't really worth it if there was more than a minute on the timer. Management has been switched to a minute instead of seconds, which won't be updated without re-clicking the tab.

src/backend/src/sockets.rs

@@ -133,21 +133,15 @@ async fn management_handler(
  socket_ptr: Arc<Mutex<SplitSink<warp::ws::WebSocket, warp::ws::Message>>>,
  data_recv: &mut Receiver<Option<types::Request>>,
 ) {
- let handle = tokio::spawn(async move {
- loop {
- let mut socket_send = socket_ptr.lock().await;
- let _send = (*socket_send)
- .send(Message::text(SerJson::serialize_json(
- &systemdata::host().await,
- )))
- .await;
- sleep(Duration::from_secs(1)).await;
- }
- });
+ let mut socket_send = socket_ptr.lock().await;
+ let _send = (*socket_send)
+ .send(Message::text(SerJson::serialize_json(
+ &systemdata::host().await,
+ )))
+ .await;
  loop {
  match data_recv.recv().await {
  Some(None) | None => {
- handle.abort();
  break;
  }
  Some(Some(data)) => {
@@ -161,30 +155,31 @@ async fn service_handler(
  socket_ptr: Arc<Mutex<SplitSink<warp::ws::WebSocket, warp::ws::Message>>>,
  data_recv: &mut Receiver<Option<types::Request>>,
 ) {
- let handle = tokio::spawn(async move {
- loop {
- let mut socket_send = socket_ptr.lock().await;
- let _send = (*socket_send)
- .send(Message::text(SerJson::serialize_json(
- &types::ServiceList {
- services: systemdata::services(),
- },
- )))
- .await;
- sleep(Duration::from_secs(2)).await;
- }
- });
+ let mut socket_send = socket_ptr.lock().await;
+ let _send = (*socket_send)
+ .send(Message::text(SerJson::serialize_json(
+ &types::ServiceList {
+ services: systemdata::services(),
+ },
+ )))
+ .await;
  loop {
  match data_recv.recv().await {
  Some(None) | None => {
- handle.abort();
  break;
  }
  Some(Some(data)) => {
  Command::new("systemctl")
  .args([data.cmd, (&*data.args[0]).to_string()])
  .spawn()
  .unwrap();
+ let _send = (*socket_send)
+ .send(Message::text(SerJson::serialize_json(
+ &types::ServiceList {
+ services: systemdata::services(),
+ },
+ )))
+ .await;
  }
  }
  }

src/backend/src/systemdata.rs

@@ -4,7 +4,7 @@ use heim::{
  units::{
  information::{byte, mebibyte},
  ratio::percent,
- time::second,
+ time::minute,
  },
 };
 use lazy_static::lazy_static;
@@ -277,7 +277,7 @@ pub fn dpsoftware() -> Vec<types::DPSoftwareData> {
 #[allow(clippy::cast_sign_loss, clippy::cast_possible_truncation)]
 pub async fn host() -> types::HostData {
  let info = host::platform().await.unwrap();
- let uptime = host::uptime().await.unwrap().get::<second>().round() as u64;
+ let uptime = host::uptime().await.unwrap().get::<minute>().round() as u64;
  let dp_file = fs::read_to_string(&std::path::Path::new("/boot/dietpi/.version")).unwrap();
  let dp_version: Vec<&str> = dp_file.split(&['=', '\n'][..]).collect();
  let installed_pkgs = from_utf8(

src/frontend/src/pages/Management.svelte

@@ -10,7 +10,7 @@
  let msg = "";
 
  $: socketData.uptime &&
- ((uptime = humanizeDuration(socketData.uptime * 1000)),
+ ((uptime = humanizeDuration(socketData.uptime * 60000)),
  (dialog = false));
 
  function sendData(data) {