diff --git a/apps/sigchat/src/manager/signal_ws.rs b/apps/sigchat/src/manager/signal_ws.rs index 3e1f06098..f22ecab81 100644 --- a/apps/sigchat/src/manager/signal_ws.rs +++ b/apps/sigchat/src/manager/signal_ws.rs @@ -1,6 +1,7 @@ use rustls::{ClientConnection, StreamOwned}; use std::io::{Error, ErrorKind}; use std::net::TcpStream; +use std::sync::{Arc, Mutex}; use tls::Tls; use tungstenite::{Message, WebSocket}; @@ -9,7 +10,7 @@ const REGISTRATION_PATH: &str = "/v1/registration"; #[allow(dead_code)] pub struct SignalWS { - ws: WebSocket>, + ws: Arc>>>, } impl SignalWS { @@ -18,41 +19,50 @@ impl SignalWS { todo!(); } - pub fn new_provision(host: &str) -> Result { - let server = format!("wss://{host}{}", PROVISIONING_PATH); + fn new(server: &str) -> Result { match SignalWS::connect(server) { - Ok(ws) => Ok(Self { ws }), + Ok(ws) => Ok(Self { + ws: Arc::new(Mutex::new(ws)), + }), Err(e) => Err(e), } } + pub fn new_provision(host: &str) -> Result { + Ok(Self::new(&format!("wss://{host}{}", PROVISIONING_PATH))?) + } + #[allow(dead_code)] pub fn new_register(host: &str) -> Result { - let server = format!("wss://{host}{}", REGISTRATION_PATH); - match SignalWS::connect(server) { - Ok(ws) => Ok(Self { ws }), - Err(e) => Err(e), - } + Ok(Self::new(&format!("wss://{host}{}", REGISTRATION_PATH))?) } pub fn close(&mut self) { - self.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 - self.ws - .flush() - .unwrap_or_else(|e| log::warn!("failed to flush websocket: {e}")); + 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}")); + }; } pub fn read(&mut self) -> Result { - match self.ws.read() { - Ok(msg) => Ok(msg), - Err(e) => { - log::warn!("{e}"); - Err(Error::new(ErrorKind::Other, "error on reading ws")) + let msg = if let Ok(mut ws) =self. ws.lock() { + match ws.read() { + Ok(msg) => Ok(msg), + Err(e) => { + log::warn!("{e}"); + Err(Error::new(ErrorKind::Other, "error on reading ws")) + } } - } + } else { + Err(Error::new( + ErrorKind::Other, + "failed to get lock on websocket", + )) + }; + msg } /// Make a websocket connection to host server @@ -62,11 +72,9 @@ impl SignalWS { /// /// # Returns /// - fn connect( - server: String, - ) -> Result>, Error> { + fn connect(server: &str) -> Result>, Error> { log::info!("connecting websocket"); - match url::Url::parse(&server) { + match url::Url::parse(server) { Ok(url) => { log::info!("attempting websocket connection to {}", url.as_str()); let host = url.host_str().expect("failed to extract host from url"); @@ -107,4 +115,4 @@ impl SignalWS { } } } -} \ No newline at end of file +}