From 7346f03c1a8f6bb689997baff63e335666effdaf Mon Sep 17 00:00:00 2001 From: nworbnhoj Date: Thu, 28 Dec 2023 15:27:58 +1100 Subject: [PATCH] close sigchat websocket properly --- apps/sigchat/src/manager.rs | 7 +++--- apps/sigchat/src/manager/signal_ws.rs | 34 ++++++++++++++++++++------- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/apps/sigchat/src/manager.rs b/apps/sigchat/src/manager.rs index f34e3ba6b..8a70721ef 100644 --- a/apps/sigchat/src/manager.rs +++ b/apps/sigchat/src/manager.rs @@ -161,7 +161,7 @@ impl Manager { match SignalWS::new_provision(&host) { Ok(mut ws) => { log::info!("provisioning websocket established to {host}"); - match ws.read(Some(Duration::from_millis(5000))) { + let result = match ws.read(Some(Duration::from_millis(5000))) { Ok(Message::Binary(uuid)) => { log::info!("received Provisioning UUID message from host"); let uuid = libsignal::ProvisioningUuid::decode(uuid).id.clone(); @@ -185,7 +185,6 @@ impl Manager { match ws.read(Some(Duration::from_millis(5000))) { Ok(Message::Binary(registration)) => { log::info!("Registration message received from host"); - ws.close(); match self.account.link( name, service_environment, @@ -225,7 +224,9 @@ impl Manager { log::warn!("{e}"); Err(link_err) } - } + }; + ws.close(); + result } Err(e) => { log::info!("failed to connect to server: {}", e); diff --git a/apps/sigchat/src/manager/signal_ws.rs b/apps/sigchat/src/manager/signal_ws.rs index b8e7a667e..beb0da0c7 100644 --- a/apps/sigchat/src/manager/signal_ws.rs +++ b/apps/sigchat/src/manager/signal_ws.rs @@ -40,13 +40,30 @@ impl SignalWS { } pub fn close(&mut self) { - if let Ok(mut ws) = self.ws.lock() { - ws.close(None) - .unwrap_or_else(|e| log::warn!("failed to close websocket: {e}")); - // TODO close properly https://docs.rs/tungstenite/0.20.1/tungstenite/protocol/struct.WebSocket.html - ws.flush() - .unwrap_or_else(|e| log::warn!("failed to flush websocket: {e}")); - }; + log::info!("attempting to close websocket connection"); + let ws = self.ws.clone(); + thread::spawn(move || loop { + if let Ok(mut ws) = ws.lock() { + ws.close(None) + .unwrap_or_else(|e| log::warn!("failed to close websocket: {e}")); + loop { + match ws.flush() { + Ok(()) => (), + Err( + tungstenite::Error::ConnectionClosed + | tungstenite::Error::AlreadyClosed, + ) => { + log::info!("websocket connection closed"); + break; + } + Err(e) => { + log::warn!("{e}"); + break; + } + } + } + }; + }); } /// Reads a msg from the websocket with optional timeout @@ -67,7 +84,8 @@ impl SignalWS { let ws = self.ws.clone(); thread::spawn(move || { if let Ok(mut ws) = ws.lock() { - tx.send(ws.read()).unwrap(); + tx.send(ws.read()) + .unwrap_or_else(|e| log::warn!("failed to forward ws msg: {e}")); } }); match rx.recv_timeout(duration) {