feat: upgrade dependencies

Cargo.toml

@@ -7,40 +7,40 @@ description = "Just a stub"
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-anyhow = "1.0.38"
-tokio = { version = "1.15.0", features = ["full"] }
-tokio-stream = { version = "0.1.6", features = ["net", "sync", "time"] }
-clap = { version = "4.3.19", default-features = false, features = [
+anyhow = "1.0.72"
+tokio = { version = "1.29.1", features = ["full"] }
+tokio-stream = { version = "0.1.14", features = ["net", "sync", "time"] }
+clap = { version = "4.3.21", default-features = false, features = [
     "std",
     "color",
     "derive",
     "env",
 ] }
-tracing = "0.1.26"
-tracing-subscriber = { version = "0.3.7", features = [
+tracing = "0.1.37"
+tracing-subscriber = { version = "0.3.17", features = [
     "registry",
     "env-filter",
     "json",
 ] }
 rabbit-digger = { version = "0.1", path = "./rabbit-digger" }
 notify-stream = "0.1.1"
-futures = "0.3"
-pin-project-lite = "0.2.6"
+futures = "0.3.28"
+pin-project-lite = "0.2.11"
 serde_yaml = "0.9.25"
 yaml-merge-keys = { version = "0.6.0", features = ["serde_yaml"] }
-serde_json = "1.0"
-serde = { version = "1.0.119", features = ["derive"] }
+serde_json = "1.0.104"
+serde = { version = "1.0.183", features = ["derive"] }
 rd-interface = { path = "./rd-interface/", version = "0.4" }
 rd-std = { path = "./rd-std/", version = "0.1" }
-cfg-if = "1.0"
-reqwest = { version = "0.11.4", features = ["native-tls-vendored", "socks"] }
-parking_lot = "0.12.0"
-uuid = { version = "1.3.0", features = ["v4"] }
+cfg-if = "1.0.0"
+reqwest = { version = "0.11.18", features = ["native-tls-vendored", "socks"] }
+parking_lot = "0.12.1"
+uuid = { version = "1.4.1", features = ["v4"] }
 fs2 = "0.4.3"
-async-stream = "0.3.0"
-once_cell = "1.7.2"
+async-stream = "0.3.5"
+once_cell = "1.18.0"
 
-axum = { version = "0.6.19", features = ["ws"], optional = true }
+axum = { version = "0.6.20", features = ["ws"], optional = true }
 serde_urlencoded = { version = "0.7.1", optional = true }
 tower-http = { version = "0.4.3", features = [
     "fs",
@@ -49,29 +49,29 @@ tower-http = { version = "0.4.3", features = [
 ], optional = true }
 dirs = { version = "5.0.1" }
 json-patch = { version = "1.0.0", optional = true }
-url = { version = "2.2.2", optional = true, features = ["serde"] }
-hyper = { version = "0.14.12", optional = true, features = ["http1", "client"] }
-percent-encoding = { version = "2.1.0", optional = true }
-bytes = { version = "1.0", optional = true }
+url = { version = "2.4.0", optional = true, features = ["serde"] }
+hyper = { version = "0.14.27", optional = true, features = ["http1", "client"] }
+percent-encoding = { version = "2.3.0", optional = true }
+bytes = { version = "1.4.0", optional = true }
 
 ss = { path = "./protocol/ss", optional = true }
 trojan = { path = "./protocol/trojan", optional = true }
 rpc = { path = "./protocol/rpc", optional = true }
 raw = { path = "./protocol/raw", optional = true }
 obfs = { path = "./protocol/obfs", optional = true }
 
-console-subscriber = { version = "0.1.3", optional = true }
+console-subscriber = { version = "0.1.10", optional = true }
 
-chrono = { version = "0.4.19", optional = true }
+chrono = { version = "0.4.26", optional = true }
 tracing-serde = { version = "0.1.3", optional = true }
-tracing-opentelemetry = { version = "0.19.0", optional = true }
-opentelemetry = { version = "0.19.0", features = ["rt-tokio"], optional = true }
-opentelemetry-jaeger = { version = "0.18.0", features = [
+tracing-opentelemetry = { version = "0.20.0", optional = true }
+opentelemetry = { version = "0.20.0", features = ["rt-tokio"], optional = true }
+opentelemetry-jaeger = { version = "0.19.0", features = [
     "rt-tokio",
     "reqwest_collector_client",
 ], optional = true }
 
-rhai = { version = "1.7.0", optional = true, features = [
+rhai = { version = "1.15.1", optional = true, features = [
     "no_float",
     "no_module",
     "no_optimize",
@@ -81,7 +81,7 @@ rhai = { version = "1.7.0", optional = true, features = [
 ] }
 
 jemallocator = { version = "0.5.4", optional = true }
-mimalloc = { version = "0.1", optional = true }
+mimalloc = { version = "0.1.37", optional = true }
 
 [dev-dependencies]
 rusty-hook = "0.11.0"

protocol/obfs/Cargo.toml

@@ -7,9 +7,9 @@ edition = "2021"
 [dependencies]
 rd-interface = { path = "../../rd-interface/", version = "0.4" }
 rd-std = { path = "../../rd-std/", version = "0.1" }
-serde = "1.0.177"
+serde = "1.0.183"
 tokio = "1.29.1"
-pin-project-lite = "0.2.10"
+pin-project-lite = "0.2.11"
 futures = "0.3.28"
 rand = "0.8.5"
 base64 = "0.21.2"

protocol/raw/Cargo.toml

@@ -12,7 +12,7 @@ serde = "1.0"
 tracing = "0.1.26"
 tokio-smoltcp = "0.2.4"
 tokio = { version = "1.5.0", features = ["rt", "macros", "net"] }
-pcap = { version = "0.9.1", optional = true }
+pcap = { version = "1.1.0", optional = true }
 futures = "0.3"
 lru_time_cache = "0.11"
 parking_lot = "0.12.1"

protocol/raw/src/device/pcap_dev.rs

@@ -64,7 +64,7 @@ pub(super) fn get_by_device(
 
     AsyncCapture::new(
         cap.setnonblock().context("Failed to set nonblock")?,
-        |d| d.next().map_err(map_err).map(|p| p.to_vec()),
+        |d| d.next_packet().map_err(map_err).map(|p| p.to_vec()),
         |d, pkt| d.sendpacket(pkt).map_err(map_err),
         caps,
     )

protocol/ss/Cargo.toml

@@ -12,10 +12,10 @@ shadowsocks = { version = "=1.13.2", default-features = false, features = [
     "stream-cipher",
     "aead-cipher-extra",
 ] }
-serde = "1.0"
-bytes = "1.0"
-tracing = "0.1.26"
-serde_json = "1.0"
-tokio = { version = "1.5.0", features = ["rt"] }
+serde = "1.0.183"
+bytes = "1.4.0"
+tracing = "0.1.37"
+serde_json = "1.0.104"
+tokio = { version = "1.29.1", features = ["rt"] }
 socks5-protocol = "0.3.5"
-futures = "0.3"
+futures = "0.3.28"

protocol/trojan/Cargo.toml

@@ -7,12 +7,12 @@ edition = "2021"
 [dependencies]
 rd-interface = { path = "../../rd-interface/", version = "0.4" }
 rd-std = { path = "../../rd-std/", version = "0.1" }
-serde = "1.0"
-sha2 = "0.10.1"
+serde = "1.0.183"
+sha2 = "0.10.7"
 hex = "0.4.3"
-socks5-protocol = "0.3.4"
-futures = "0.3"
-tokio = "1.0"
+socks5-protocol = "0.3.5"
+futures = "0.3.28"
+tokio = "1.29.1"
 tokio-tungstenite = "0.20.0"
-tokio-util = { version = "0.7.1", features = ["codec", "net"] }
-bytes = "1.1.0"
+tokio-util = { version = "0.7.8", features = ["codec", "net"] }
+bytes = "1.4.0"

rabbit-digger/Cargo.toml

@@ -9,25 +9,25 @@ license = "MIT OR Apache-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.38"
+anyhow = "1.0.72"
 rd-interface = { path = "../rd-interface", version = "0.4" }
 rd-std = { path = "../rd-std", version = "0.1", optional = true }
-futures = "0.3.5"
-serde = { version = "1.0.119", features = ["rc"] }
-tokio = { version = "1.12.0", features = ["full"] }
-tracing = "0.1.26"
-serde_json = "1.0"
-uuid = { version = "1.3.0", features = ["v4", "serde"] }
-topological-sort = "0.1"
-parking_lot = "0.12.0"
+futures = "0.3.28"
+serde = { version = "1.0.183", features = ["rc"] }
+tokio = { version = "1.29.1", features = ["full"] }
+tracing = "0.1.37"
+serde_json = "1.0.104"
+uuid = { version = "1.4.1", features = ["v4", "serde"] }
+topological-sort = "0.2.2"
+parking_lot = "0.12.1"
 atomic-shim = "0.2.0"
-dashmap = { version = "5.2.0", features = ["serde"] }
+dashmap = { version = "5.5.0", features = ["serde"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
-tokio-stream = { version = "0.1.6", features = ["net", "sync", "time"] }
+tokio-stream = { version = "0.1.14", features = ["net", "sync", "time"] }
 
 [dev-dependencies]
-rusty-hook = "0.11.0"
-tokio = { version = "1.5.0", features = ["macros"] }
+rusty-hook = "0.11.2"
+tokio = { version = "1.29.1", features = ["macros"] }
 
 [features]
 default = ["rd-std"]

rd-derive/Cargo.toml

@@ -9,9 +9,9 @@ license = "MIT OR Apache-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-syn = "2.0.27"
+syn = "2.0.28"
 quote = "1.0.32"
-proc-macro2 = "1.0"
+proc-macro2 = "1.0.66"
 darling = "0.20.3"
 
 [lib]

rd-std/Cargo.toml

@@ -10,40 +10,40 @@ license = "MIT OR Apache-2.0"
 # common
 rd-interface = { version = "0.4", path = "../rd-interface" }
 rd-derive = { version = "0.1", path = "../rd-derive" }
-futures = "0.3"
-serde = "1.0"
-tracing = "0.1.26"
-anyhow = "1.0"
+futures = "0.3.28"
+serde = "1.0.183"
+tracing = "0.1.37"
+anyhow = "1.0.72"
 tokio = { version = "1.29.1", features = ["net", "rt", "macros"] }
-parking_lot = "0.12.0"
-tokio-util = { version = "0.7.1", features = ["codec", "net"] }
-pin-project-lite = "0.2.8"
+parking_lot = "0.12.1"
+tokio-util = { version = "0.7.8", features = ["codec", "net"] }
+pin-project-lite = "0.2.11"
 itertools = "0.11.0"
 
 # socks5
-socks5-protocol = "0.3.2"
+socks5-protocol = "0.3.5"
 
 # http
-http = { version = "0.2.4", optional = true }
-hyper = { version = "0.14.12", features = ["http1", "client", "server"] }
+http = { version = "0.2.9", optional = true }
+hyper = { version = "0.14.27", features = ["http1", "client", "server"] }
 
 # transparent
-libc = "0.2.91"
+libc = "0.2.147"
 socket2 = { version = "0.5.3", features = ["all"] }
-cfg-if = "1.0"
+cfg-if = "1.0.0"
 
 # rule
-smoltcp = { version = "0.8.0", default-features = false, features = [
+smoltcp = { version = "0.10.0", default-features = false, features = [
     "std",
     "proto-ipv4",
     "proto-ipv6",
 ] }
-lru_time_cache = "0.11"
-serde_with = "3.1.0"
+lru_time_cache = "0.11.11"
+serde_with = "3.2.0"
 maxminddb = "0.23.0"
-flate2 = "1.0.20"
-tar = "0.4.35"
-once_cell = "1.7.2"
+flate2 = "1.0.26"
+tar = "0.4.40"
+once_cell = "1.18.0"
 
 # dns
 trust-dns-proto = "0.21.1"
@@ -55,13 +55,13 @@ tokio-rustls = { version = "0.24.1", features = [
 ], optional = true }
 webpki-roots = { version = "0.25.1", optional = true }
 
-openssl-crate = { package = "openssl", version = "0.10", features = [
+openssl-crate = { package = "openssl", version = "0.10.56", features = [
     "vendored",
 ], optional = true }
-tokio-openssl = { version = "0.6.1", optional = true }
+tokio-openssl = { version = "0.6.3", optional = true }
 
-tokio-native-tls = { version = "0.3.0", optional = true }
-native-tls-crate = { package = "native-tls", version = "0.2", features = [
+tokio-native-tls = { version = "0.3.1", optional = true }
+native-tls-crate = { package = "native-tls", version = "0.2.11", features = [
     "vendored",
 ], optional = true }
 

src/lib.rs

@@ -1,4 +1,4 @@
-use anyhow::{Context, Result};
+use anyhow::Result;
 use config::ConfigManager;
 pub use rabbit_digger;
 use rabbit_digger::{RabbitDigger, Registry};
@@ -57,14 +57,16 @@ impl App {
 
         Ok(Self { rd, cfg_mgr })
     }
-    pub async fn run_api_server(&self, api_server: ApiServer) -> Result<()> {
+    pub async fn run_api_server(&self, _api_server: ApiServer) -> Result<()> {
         #[cfg(feature = "api_server")]
-        if let Some(bind) = api_server.bind {
+        if let Some(bind) = _api_server.bind {
+            use anyhow::Context;
+
             api_server::ApiServer {
                 rabbit_digger: self.rd.clone(),
                 config_manager: self.cfg_mgr.clone(),
-                access_token: api_server.access_token,
-                web_ui: api_server.web_ui,
+                access_token: _api_server.access_token,
+                web_ui: _api_server.web_ui,
             }
             .run(&bind)
             .await

src/main.rs

@@ -133,7 +133,7 @@ async fn main() -> Result<()> {
 
     cfg_if! {
         if #[cfg(feature = "telemetry")] {
-            let tracer = opentelemetry_jaeger::new_pipeline()
+            let tracer = opentelemetry_jaeger::new_agent_pipeline()
                 .with_service_name("rabbit_digger_pro")
                 .install_batch(opentelemetry::runtime::Tokio)?;
             // only for debug