Skip to content

fix(desktop): own native WebSocket lifecycle #2076

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

Merged
tlongwell-block merged 4 commits into from
Jul 18, 2026
Merged

fix(desktop): own native WebSocket lifecycle #2076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d86a990
fix(desktop): own native websocket lifecycle
Jul 18, 2026
3633663
test(desktop): prove websocket teardown completes
Jul 18, 2026
fd25588
fix(desktop): select rustls crypto provider
Jul 18, 2026
3cab1ab
test(desktop): expect native websocket disconnect
Jul 18, 2026
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
57 changes: 1 addition & 56 deletions desktop/src-tauri/Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions desktop/src-tauri/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,13 @@ tauri-plugin-deep-link = "2"
tauri-plugin-opener = "2"
tauri-plugin-single-instance = { version = "2", features = ["deep-link"] }
tauri-plugin-window-state = "2"
tauri-plugin-websocket = "2"
tauri-plugin-dialog = "2"
tauri-plugin-updater = "2"
tauri-plugin-process = "2"
infer = "0.19"
hex = "0.4"
ed25519-dalek = "=3.0.0-rc.0"
tokio = { version = "1", features = ["fs", "sync", "rt", "macros", "time"] }
tokio = { version = "1", features = ["fs", "sync", "rt", "macros", "time", "net", "io-util"] }
tokio-tungstenite = { version = "0.29", features = ["rustls-tls-webpki-roots"] }
tokio-util = { version = "0.7", features = ["rt"] }
bytes = "1"
Expand All @@ -84,6 +83,7 @@ toml = "0.8"
nostr = { version = "0.44", features = ["nip44"] }
zeroize = "1"
reqwest = { version = "0.13", features = ["json", "query", "stream", "blocking"] }
rustls = { version = "0.23", default-features = false, features = ["aws_lc_rs", "std"] }
url = "2"
buzz_core_pkg = { package = "buzz-core", path = "../../crates/buzz-core" }
buzz_persona_pkg = { package = "buzz-persona", path = "../../crates/buzz-persona" }
Expand Down
10 changes: 9 additions & 1 deletion desktop/src-tauri/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,5 +117,13 @@ fn main() {
);
}

tauri_build::build()
tauri_build::try_build(
tauri_build::Attributes::new().plugin(
"websocket",
tauri_build::InlinedPlugin::new()
.commands(&["connect", "send", "disconnect", "disconnect_all"])
.default_permission(tauri_build::DefaultPermissionRule::AllowAllCommands),
),
)
.expect("failed to build Tauri application");
}
4 changes: 2 additions & 2 deletions desktop/src-tauri/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ mod migration;
#[cfg(test)]
mod model_tests;
mod models;
mod native_websocket;
mod nostr_bind;
pub mod nostr_convert;
mod prevent_sleep;
Expand Down Expand Up @@ -62,7 +63,6 @@ use tauri_plugin_window_state::StateFlags;

#[cfg(target_os = "macos")]
const INITIAL_RENDER_READY_EVENT: &str = "initial-render-ready";

#[tauri::command]
fn perform_sidebar_default_haptic() {
#[cfg(target_os = "macos")]
Expand Down Expand Up @@ -331,7 +331,7 @@ pub fn run() {
})
.build(),
)
.plugin(tauri_plugin_websocket::init())
.plugin(native_websocket::init())
.plugin(tauri_plugin_dialog::init())
.plugin(tauri_plugin_process::init());

Expand Down
Loading
Loading