diff --git a/Cargo.lock b/Cargo.lock index 577a202..a57bb22 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -357,10 +357,8 @@ checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" dependencies = [ "android-tzdata", "iana-time-zone", - "js-sys", "num-traits", "serde", - "wasm-bindgen", "windows-link", ] @@ -1761,18 +1759,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" -dependencies = [ - "rand_chacha 0.9.0", - "rand_core 0.9.3", + "rand_chacha", + "rand_core", ] [[package]] @@ -1782,17 +1770,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" -dependencies = [ - "ppv-lite86", - "rand_core 0.9.3", + "rand_core", ] [[package]] @@ -1804,15 +1782,6 @@ dependencies = [ "getrandom 0.2.16", ] -[[package]] -name = "rand_core" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" -dependencies = [ - "getrandom 0.3.3", -] - [[package]] name = "ratatui" version = "0.28.1" @@ -2197,12 +2166,9 @@ version = "0.1.25" dependencies = [ "anyhow", "assert_cmd", - "bytes", - "chrono", "crossterm 0.27.0", "dirs-next", "flate2", - "futures", "futures-util", "prost", "prost-build", @@ -2226,17 +2192,13 @@ dependencies = [ "assert_cmd", "axum", "axum-server", - "bytes", "flate2", - "futures", "futures-util", "gfxinfo", "hostname", - "nvml-wrapper", "once_cell", "prost", "prost-build", - "prost-types", "protoc-bin-vendored", "rcgen", "rustls 0.23.31", @@ -2250,7 +2212,6 @@ dependencies = [ "tonic-build", "tracing", "tracing-subscriber", - "tungstenite 0.27.0", ] [[package]] @@ -2513,7 +2474,7 @@ dependencies = [ "rustls-pki-types", "tokio", "tokio-rustls 0.26.2", - "tungstenite 0.24.0", + "tungstenite", ] [[package]] @@ -2658,7 +2619,7 @@ dependencies = [ "http", "httparse", "log", - "rand 0.8.5", + "rand", "rustls 0.23.31", "rustls-pki-types", "sha1", @@ -2666,23 +2627,6 @@ dependencies = [ "utf-8", ] -[[package]] -name = "tungstenite" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eadc29d668c91fcc564941132e17b28a7ceb2f3ebf0b9dae3e03fd7a6748eb0d" -dependencies = [ - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand 0.9.2", - "sha1", - "thiserror 2.0.12", - "utf-8", -] - [[package]] name = "typenum" version = "1.18.0" diff --git a/Cargo.toml b/Cargo.toml index c3aad7a..0da0f00 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,19 +8,16 @@ members = [ [workspace.dependencies] # async + streams tokio = { version = "1", features = ["full"] } -futures = "0.3" futures-util = "0.3" anyhow = "1.0" # websocket tokio-tungstenite = { version = "0.24", features = ["__rustls-tls", "connect"] } -tungstenite = "0.24" url = "2.5" # JSON + error handling serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -thiserror = "1.0" # system stats sysinfo = "0.32" @@ -29,16 +26,12 @@ sysinfo = "0.32" ratatui = "0.28" crossterm = "0.27" -# date/time -chrono = { version = "0.4", features = ["serde"] } # web server (remote-agent) axum = { version = "0.7", features = ["ws"] } # protobuf prost = "0.13" -prost-types = "0.13" -bytes = "1" dirs-next = "2" [profile.release] diff --git a/socktop/Cargo.toml b/socktop/Cargo.toml index b17ba0e..7b512b5 100644 --- a/socktop/Cargo.toml +++ b/socktop/Cargo.toml @@ -9,21 +9,18 @@ license = "MIT" [dependencies] tokio = { workspace = true } tokio-tungstenite = { workspace = true } -futures = { workspace = true } futures-util = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } url = { workspace = true } ratatui = { workspace = true } crossterm = { workspace = true } -chrono = { workspace = true } anyhow = { workspace = true } flate2 = { version = "1", default-features = false, features = ["rust_backend"] } dirs-next = { workspace = true } rustls = "0.23" rustls-pemfile = "2.1" prost = { workspace = true } -bytes = { workspace = true } [dev-dependencies] assert_cmd = "2.0" diff --git a/socktop_agent/Cargo.toml b/socktop_agent/Cargo.toml index d450701..c4bc429 100644 --- a/socktop_agent/Cargo.toml +++ b/socktop_agent/Cargo.toml @@ -13,13 +13,11 @@ sysinfo = { version = "0.37", features = ["network", "disk", "component"] } serde = { version = "1", features = ["derive"] } serde_json = "1" flate2 = { version = "1", default-features = false, features = ["rust_backend"] } -futures = "0.3" futures-util = "0.3.31" tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } -nvml-wrapper = "0.10" +# nvml-wrapper removed (unused; GPU metrics via gfxinfo only now) gfxinfo = "0.1.2" -tungstenite = "0.27.0" once_cell = "1.19" axum-server = { version = "0.6", features = ["tls-rustls"] } rustls = "0.23" @@ -27,13 +25,11 @@ rustls-pemfile = "2.1" rcgen = "0.13" # pure-Rust self-signed cert generation (replaces openssl vendored build) anyhow = "1" hostname = "0.3" -bytes = { workspace = true } prost = { workspace = true } time = { version = "0.3", default-features = false, features = ["formatting", "macros", "parsing" ] } [build-dependencies] prost-build = "0.13" -prost-types = { workspace = true } tonic-build = { version = "0.12", default-features = false, optional = true } protoc-bin-vendored = "3" [dev-dependencies]