diff --git a/Cargo.toml b/Cargo.toml index 3a3ac08..dabc27e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,4 @@ [workspace] members = ["cli", "lib", "desktop/src-tauri"] default-members = ["cli", "lib", "desktop/src-tauri"] +resolver = "2" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index c05080d..204114f 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -7,7 +7,7 @@ description = "Controlled TCP-over-WebSocket forwarding tunnel." [dependencies] wsrx = { version = "*", path = "../lib" } -tokio = { version = "1.32", features = ["full"] } +tokio = { version = "1.33", features = ["full"] } clap = {version = "4.4", features = ["cargo"]} serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/desktop/src-tauri/Cargo.toml b/desktop/src-tauri/Cargo.toml index fa338a7..1a19902 100644 --- a/desktop/src-tauri/Cargo.toml +++ b/desktop/src-tauri/Cargo.toml @@ -15,7 +15,7 @@ tauri = { version = "1.5", features = ["dialog-all", "fs-all", "protocol-all", " serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wsrx = { version = "0.1", path = "../../lib" } -tokio = { version = "1.32", features = ["full"] } +tokio = { version = "1.33", features = ["full"] } tokio-util = "0.7" tokio-stream = "0.1" tokio-tungstenite = { version = "0.20", features = ["rustls-tls-native-roots"] } diff --git a/desktop/src-tauri/src/connection.rs b/desktop/src-tauri/src/connection.rs index be80803..716a383 100644 --- a/desktop/src-tauri/src/connection.rs +++ b/desktop/src-tauri/src/connection.rs @@ -91,7 +91,7 @@ pub async fn add_ws_connection( level: "info".to_owned(), message: format!( "New connection established: {}", - tcp.peer_addr().unwrap().to_string() + tcp.peer_addr().unwrap() ), addr: addr.clone(), }); diff --git a/lib/Cargo.toml b/lib/Cargo.toml index ff39488..ac1b606 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -11,7 +11,7 @@ readme = "README.md" license = "MPL-2.0" [dependencies] -tokio = { version = "1.32", features = ["full"] } +tokio = { version = "1.33", features = ["full"] } axum = { version = "0.6", features = [ "headers", "ws",