jason/socktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove dead code and increment version

Browse Source
This commit is contained in:
jasonwitty 2025-08-16 17:31:32 -07:00
parent c6b8c9c905
commit 2e8cc24e81
4 changed files with 5 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -1518,7 +1518,7 @@ dependencies = [
[[package]] [[package]]
name = "socktop" name = "socktop"
version = "0.1.1" version = "0.1.11"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chrono", "chrono",
@ -1537,7 +1537,7 @@ dependencies = [
[[package]] [[package]]
name = "socktop_agent" name = "socktop_agent"
version = "0.1.1" version = "0.1.11"
dependencies = [ dependencies = [
"axum", "axum",
"flate2", "flate2",

2
socktop/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "socktop" name = "socktop"
version = "0.1.1" version = "0.1.11"
authors = ["Jason Witty <jasonpwitty+socktop@proton.me>"] authors = ["Jason Witty <jasonpwitty+socktop@proton.me>"]
description = "Remote system monitor over WebSocket, TUI like top" description = "Remote system monitor over WebSocket, TUI like top"
edition = "2021" edition = "2021"

57
socktop/src/ws.rs
View File

@ -5,7 +5,7 @@ use futures_util::{SinkExt, StreamExt};
use std::io::{Cursor, Read}; use std::io::{Cursor, Read};
use std::sync::OnceLock; use std::sync::OnceLock;
use tokio::net::TcpStream; use tokio::net::TcpStream;
use tokio::time::{interval, timeout, Duration}; use tokio::time::{timeout, Duration};
use tokio_tungstenite::{connect_async, tungstenite::Message, MaybeTlsStream, WebSocketStream}; use tokio_tungstenite::{connect_async, tungstenite::Message, MaybeTlsStream, WebSocketStream};
use crate::types::{DiskInfo, Metrics, ProcessesPayload}; use crate::types::{DiskInfo, Metrics, ProcessesPayload};
@ -85,7 +85,6 @@ pub enum Payload {
Processes(ProcessesPayload), Processes(ProcessesPayload),
} }
#[allow(dead_code)]
fn parse_any_payload(json: &str) -> Result<Payload, serde_json::Error> { fn parse_any_payload(json: &str) -> Result<Payload, serde_json::Error> {
if let Ok(m) = serde_json::from_str::<Metrics>(json) { if let Ok(m) = serde_json::from_str::<Metrics>(json) {
return Ok(Payload::Metrics(m)); return Ok(Payload::Metrics(m));
@ -251,57 +250,3 @@ pub async fn request_processes(ws: &mut WsStream) -> Option<ProcessesPayload> {
} }
None None
} }
#[allow(dead_code)]
pub async fn start_ws_polling(mut ws: WsStream) {
let mut t_fast = interval(Duration::from_millis(500));
let mut t_procs = interval(Duration::from_secs(2));
let mut t_disks = interval(Duration::from_secs(5));
let _ = ws.send(Message::Text("get_metrics".into())).await;
let _ = ws.send(Message::Text("get_processes".into())).await;
let _ = ws.send(Message::Text("get_disks".into())).await;
loop {
tokio::select! {
_ = t_fast.tick() => {
let _ = ws.send(Message::Text("get_metrics".into())).await;
}
_ = t_procs.tick() => {
let _ = ws.send(Message::Text("get_processes".into())).await;
}
_ = t_disks.tick() => {
let _ = ws.send(Message::Text("get_disks".into())).await;
}
maybe = ws.next() => {
let Some(result) = maybe else { break; };
let Ok(msg) = result else { break; };
if debug_on() { log_msg(&msg); }
match msg {
Message::Binary(b) => {
if let Some(json) = gunzip_to_string(&b) {
if let Ok(payload) = parse_any_payload(&json) {
match payload {
Payload::Metrics(_m) => {},
Payload::Disks(_d) => {},
Payload::Processes(_p) => {},
}
}
}
}
Message::Text(s) => {
if let Ok(payload) = parse_any_payload(&s) {
match payload {
Payload::Metrics(_m) => {},
Payload::Disks(_d) => {},
Payload::Processes(_p) => {},
}
}
}
Message::Close(_) => break,
_ => {}
}
}
}
}
}

2
socktop_agent/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "socktop_agent" name = "socktop_agent"
version = "0.1.1" version = "0.1.11"
authors = ["Jason Witty <jasonpwitty+socktop@proton.me>"] authors = ["Jason Witty <jasonpwitty+socktop@proton.me>"]
description = "Remote system monitor over WebSocket, TUI like top" description = "Remote system monitor over WebSocket, TUI like top"
edition = "2021" edition = "2021"