From a8547ce51c8055eb149d8cebaf95c40097f194e5 Mon Sep 17 00:00:00 2001 From: nworbnhoj Date: Tue, 19 Dec 2023 17:46:50 +1100 Subject: [PATCH] restructure SignalWS --- apps/sigchat/src/manager.rs | 2 +- apps/sigchat/src/manager/signal_ws.rs | 47 +++++++++++---------------- 2 files changed, 20 insertions(+), 29 deletions(-) diff --git a/apps/sigchat/src/manager.rs b/apps/sigchat/src/manager.rs index 6abeb80b5..3fea464b8 100644 --- a/apps/sigchat/src/manager.rs +++ b/apps/sigchat/src/manager.rs @@ -135,7 +135,7 @@ impl Manager { // insert default values as required let name = name.unwrap_or(DEFAULT_DEVICE_NAME); let host = host.unwrap_or(DEFAULT_HOST_NAME); - match SignalWS::provision(&host) { + match SignalWS::new_provision(&host) { Ok(ws) => { if let Some(prior_ws) = &mut self.websocket { prior_ws.close(); diff --git a/apps/sigchat/src/manager/signal_ws.rs b/apps/sigchat/src/manager/signal_ws.rs index 7e304b14f..625ce1b0c 100644 --- a/apps/sigchat/src/manager/signal_ws.rs +++ b/apps/sigchat/src/manager/signal_ws.rs @@ -2,60 +2,51 @@ use rustls::{ClientConnection, StreamOwned}; use std::io::{Error, ErrorKind}; use std::net::TcpStream; use tls::Tls; -use tungstenite::WebSocket; +use tungstenite::{Message, WebSocket}; const PROVISIONING_PATH: &str = "/v1/websocket/provisioning/"; const REGISTRATION_PATH: &str = "/v1/registration"; #[allow(dead_code)] -pub enum SignalWS { - Message { - ws: WebSocket>, - }, - Provision { - ws: WebSocket>, - }, - Register { - ws: WebSocket>, - }, +pub struct SignalWS { + ws: WebSocket>, } impl SignalWS { #[allow(dead_code)] - pub fn message(_host: &str) -> Result { + pub fn new_message(_host: &str) -> Result { todo!(); } - pub fn provision(host: &str) -> Result { + pub fn new_provision(host: &str) -> Result { let server = format!("wss://{host}{}", PROVISIONING_PATH); - // let mut conn = client_connection(&server); match SignalWS::connect(server) { - Ok(ws) => Ok(Self::Provision { ws }), + Ok(ws) => Ok(Self { ws }), Err(e) => Err(e), } } #[allow(dead_code)] - pub fn register(host: &str) -> Result { + pub fn new_register(host: &str) -> Result { let server = format!("wss://{host}{}", REGISTRATION_PATH); - // let mut conn = client_connection(&server); match SignalWS::connect(server) { - Ok(ws) => Ok(Self::Register { ws }), + Ok(ws) => Ok(Self { ws }), Err(e) => Err(e), } } pub fn close(&mut self) { - match self { - SignalWS::Message { ws, .. } - | SignalWS::Provision { ws, .. } - | SignalWS::Register { ws, .. } => { - 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}")); - } + 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}")); + } + + + } }