implement sigchat provisioning websocket with tungstenite

This commit is contained in:
nworbnhoj 2023-12-19 05:15:43 +11:00
parent de6b6baab9
commit 8fddba4881
3 changed files with 16 additions and 3 deletions

View file

@ -36,6 +36,7 @@ rkyv = {version = "0.4.3", default-features = false, features = ["const_generics
rustls = { version = "0.21.7" }
serde = { version = "1.0", features = [ "derive" ] }
tls = { path = "../../libs/tls" }
tungstenite = "0.20.1"
ureq = { version = "2.7.1", features = ["json"] }
url = "2.2.2"

View file

@ -1,7 +1,7 @@
#[allow(dead_code)]
pub(crate) const SERVER_NAME_SIGCHAT: &str = "_Signal chat_";
pub(crate) const DEFAULT_DEVICE_NAME: &str = "xous";
pub(crate) const DEFAULT_HOST_NAME: &str = "signal.org";
pub(crate) const DEFAULT_HOST_NAME: &str = "chat.signal.org";
#[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)]
pub enum SigchatOp {

View file

@ -2,8 +2,9 @@ use rustls::{ClientConnection, StreamOwned};
use std::io::{Error, ErrorKind};
use std::net::TcpStream;
use tls::Tls;
use tungstenite::WebSocket;
const PROVISIONING_PATH: &str = "/provisioning/";
const PROVISIONING_PATH: &str = "/v1/websocket/provisioning/";
const REGISTRATION_PATH: &str = "/v1/registration";
#[allow(dead_code)]
@ -71,6 +72,7 @@ impl SignalWS {
log::info!("connecting websocket");
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");
match TcpStream::connect((host, 443)) {
Ok(sock) => {
@ -79,7 +81,17 @@ impl SignalWS {
match xtls.stream_owned(host, sock) {
Ok(tls_stream) => {
log::info!("tls configured");
log::info!("WEBSOCKET NOT IMPLEMENTED YET");
match tungstenite::client(url, tls_stream) {
Ok((socket, response)) => {
log::info!("Websocket connected to: {}", server);
log::info!("Response HTTP code: {}", response.status());
Ok(socket)
}
Err(e) => {
log::info!("failed to connect websocket: {}", e);
Err(Error::from(ErrorKind::ConnectionRefused))
}
}
}
Err(e) => {
log::warn!("failed to configure tls: {e}");