CalvinBackup/tauri-plugins-workspace
1
0
Fork 0
mirror of https://github.com/tauri-apps/plugins-workspace.git synced 2026-06-06 13:53:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v1' into v2

Browse Source
This commit is contained in:
Lucas Nogueira
2023-05-24 10:36:41 -03:00
parent a2d68e04a1 07406f1c9d
commit 43be6c7585
15 changed files with 111 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/websocket/Cargo.toml
+1 -1
View File
@@ -16,7 +16,7 @@ thiserror = { workspace = true }
rand = "0.8"
futures-util = "0.3"
tokio = { version = "1", features = [ "net", "sync" ] }
tokio-tungstenite = { version = "0.18" }
tokio-tungstenite = { version = "0.19" }
[features]
native-tls = [ "tokio-tungstenite/native-tls" ]
plugins/websocket/examples/svelte-app/src-tauri/Cargo.toml
+1 -1
View File
@@ -13,7 +13,7 @@ tauri = { version = "2.0.0-alpha.8", features = [] }
tokio = { version = "1", features = ["net"] }
futures-util = "0.3"
tauri-plugin-websocket = { path = "../../../" }
tokio-tungstenite = "0.18"
tokio-tungstenite = "0.19"
[build-dependencies]
tauri-build = { version = "2.0.0-alpha.4", features = [] }
plugins/websocket/src/lib.rs
+1 -1
View File
@@ -90,7 +90,7 @@ async fn connect<R: Runtime>(
config: Option<ConnectionConfig>,
) -> Result<Id> {
let id = rand::random();
let (ws_stream, _) = connect_async_with_config(url, config.map(Into::into)).await?;
let (ws_stream, _) = connect_async_with_config(url, config.map(Into::into), false).await?;
tauri::async_runtime::spawn(async move {
let (write, read) = ws_stream.split();