Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(deps): update rust crate tokio-tungstenite to 0.21 #804

Merged
merged 2 commits into from
Dec 7, 2023
Merged

fix(deps): update rust crate tokio-tungstenite to 0.21 #804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ce4691
fix(deps): update rust crate tokio-tungstenite to 0.21
renovate[bot] Dec 7, 2023
ddd049c
http version mismatch
FabianLars Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion plugins/websocket/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ serde_json.workspace = true
tauri.workspace = true
log.workspace = true
thiserror.workspace = true
http = "1"
rand = "0.8"
futures-util = "0.3"
tokio = { version = "1", features = ["net", "sync"] }
tokio-tungstenite = { version = "0.20", features = ["native-tls"] }
tokio-tungstenite = { version = "0.21", features = ["native-tls"] }
2 changes: 1 addition & 1 deletion plugins/websocket/examples/svelte-app/src-tauri/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tauri = { version = "1", features = [] }
tokio = { version = "1", features = ["net"] }
futures-util = "0.3"
tauri-plugin-websocket = { path = "../../../" }
tokio-tungstenite = "0.20"
tokio-tungstenite = "0.21"

[build-dependencies]
tauri-build = { version = "1", features = [] }
Expand Down
4 changes: 2 additions & 2 deletions plugins/websocket/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use futures_util::{stream::SplitSink, SinkExt, StreamExt};
use http::header::{HeaderName, HeaderValue};
use serde::{ser::Serializer, Deserialize, Serialize};
use tauri::{
api::ipc::{format_callback, CallbackFn},
Expand All @@ -9,6 +10,7 @@ use tokio::{net::TcpStream, sync::Mutex};
use tokio_tungstenite::{
connect_async_with_config,
tungstenite::{
client::IntoClientRequest,
protocol::{CloseFrame as ProtocolCloseFrame, WebSocketConfig},
Message,
},
Expand All @@ -17,8 +19,6 @@ use tokio_tungstenite::{

use std::collections::HashMap;
use std::str::FromStr;
use tauri::http::header::{HeaderName, HeaderValue};
use tokio_tungstenite::tungstenite::client::IntoClientRequest;

type Id = u32;
type WebSocket = WebSocketStream<MaybeTlsStream<TcpStream>>;
Expand Down
Loading