feat: add support for wss (TLS) connections for clients (#62)

* Add tls support for websocket client transport

* Update websocket client example for headers

Author: hplewis

rsocket-transport-websocket/Cargo.toml

@@ -14,7 +14,10 @@ log = "0.4.14"
 futures = "0.3.15"
 bytes = "1.0.1"
 url = "2.2.2"
-tokio-tungstenite = "0.13.0"
+
+[dependencies.tokio-tungstenite]
+version = "0.18.0"
+features = ["native-tls"]
 
 [dependencies.rsocket_rust]
 path = "../rsocket"

rsocket-transport-websocket/src/client.rs

@@ -2,16 +2,19 @@ use std::net::SocketAddr;
 
 use rsocket_rust::{async_trait, error::RSocketError, transport::Transport, Result};
 use tokio::net::TcpStream;
-use tokio_tungstenite::{accept_async, connect_async, tungstenite::handshake::client::Request};
+use tokio_tungstenite::{accept_async, connect_async, tungstenite::handshake::client::Request, MaybeTlsStream};
 use url::Url;
 
 use super::connection::WebsocketConnection;
 
 pub type WebsocketRequest = Request;
 
+const WS_PROTO: &str = "ws://";
+const WSS_PROTO: &str = "wss://";
+
 #[derive(Debug)]
 pub(crate) enum Connector {
-    Direct(TcpStream),
+    Direct(MaybeTlsStream<TcpStream>),
     Url(Url),
     Request(WebsocketRequest),
 }
@@ -49,26 +52,32 @@ impl Transport for WebsocketClientTransport {
     }
 }
 
+impl From<MaybeTlsStream<TcpStream>> for WebsocketClientTransport {
+    fn from(socket: MaybeTlsStream<TcpStream>) -> WebsocketClientTransport {
+        WebsocketClientTransport::new(Connector::Direct(socket))
+    }
+}
+
 impl From<TcpStream> for WebsocketClientTransport {
     fn from(socket: TcpStream) -> WebsocketClientTransport {
-        WebsocketClientTransport::new(Connector::Direct(socket))
+        WebsocketClientTransport::new(Connector::Direct(MaybeTlsStream::Plain(socket)))
     }
 }
 
 impl From<&str> for WebsocketClientTransport {
     fn from(addr: &str) -> WebsocketClientTransport {
-        let u = if addr.starts_with("ws://") {
+        let u = if addr.starts_with(WS_PROTO) || addr.starts_with(WSS_PROTO) {
             Url::parse(addr).unwrap()
         } else {
-            Url::parse(&format!("ws://{}", addr)).unwrap()
+            Url::parse(&format!("{}{}", WS_PROTO, addr)).unwrap()
         };
         WebsocketClientTransport::new(Connector::Url(u))
     }
 }
 
 impl From<SocketAddr> for WebsocketClientTransport {
     fn from(addr: SocketAddr) -> WebsocketClientTransport {
-        let u = Url::parse(&format!("ws://{}", addr)).unwrap();
+        let u = Url::parse(&format!("{}{}", WS_PROTO, addr)).unwrap();
         WebsocketClientTransport::new(Connector::Url(u))
     }
 }

rsocket-transport-websocket/src/connection.rs

@@ -10,23 +10,24 @@ use rsocket_rust::{
     utils::Writeable,
 };
 use tokio::net::TcpStream;
+use tokio_tungstenite::MaybeTlsStream;
 use tokio_tungstenite::{
     tungstenite::{Error as WsError, Message},
     WebSocketStream,
 };
 
 #[derive(Debug)]
 pub struct WebsocketConnection {
-    stream: WebSocketStream<TcpStream>,
+    stream: WebSocketStream<MaybeTlsStream<TcpStream>>,
 }
 
 impl WebsocketConnection {
-    pub(crate) fn new(stream: WebSocketStream<TcpStream>) -> WebsocketConnection {
+    pub(crate) fn new(stream: WebSocketStream<MaybeTlsStream<TcpStream>>) -> WebsocketConnection {
         WebsocketConnection { stream }
     }
 }
 
-struct InnerSink(SplitSink<WebSocketStream<TcpStream>, Message>);
+struct InnerSink(SplitSink<WebSocketStream<MaybeTlsStream<TcpStream>>, Message>);
 
 impl Sink<Frame> for InnerSink {
     type Error = WsError;

rsocket-transport-websocket/src/lib.rs

@@ -14,16 +14,17 @@ pub use server::WebsocketServerTransport;
 mod test_websocket {
     use super::*;
     use rsocket_rust::prelude::*;
+    use tokio_tungstenite::tungstenite::client::IntoClientRequest;
 
     #[ignore]
     #[tokio::test]
     async fn test_client() {
-        let req: WebsocketRequest = WebsocketRequest::builder()
-            .uri("ws://127.0.0.1:8080/hello")
-            .header("x-foo-bar", "42")
-            .method("GET")
-            .body(())
-            .unwrap();
+        let mut req = "ws://127.0.0.1:8080/hello".into_client_request().unwrap();
+
+        // Optional: custom headers
+        let headers = req.headers_mut();
+        headers.insert("x-foo-bar", "42".parse().unwrap());
+
         let tp = WebsocketClientTransport::from(req);
         let c = RSocketFactory::connect()
             .transport(tp)