Add WebSocket::connect

Signed-off-by: Yuki Kishimoto <yukikishimoto@protonmail.com>

Author: yukibtc

examples/client.rs

@@ -13,7 +13,7 @@ async fn main() {
     let url =
         Url::parse("ws://oxtrdevav64z64yb7x6rjg4ntzqjhedm5b5zjqulugknhzr46ny2qbad.onion").unwrap();
     let mut socket: WebSocket =
-        async_wsocket::connect(&url, &ConnectionMode::tor(), Duration::from_secs(120))
+        WebSocket::connect(&url, &ConnectionMode::tor(), Duration::from_secs(120))
             .await
             .unwrap();
 

src/lib.rs

@@ -89,16 +89,11 @@ impl ConnectionMode {
 }
 
 /// Connect
+#[inline]
 pub async fn connect(
     url: &Url,
-    _mode: &ConnectionMode,
+    mode: &ConnectionMode,
     timeout: Duration,
 ) -> Result<WebSocket, Error> {
-    #[cfg(not(target_arch = "wasm32"))]
-    let socket: WebSocket = self::native::connect(url, _mode, timeout).await?;
-
-    #[cfg(target_arch = "wasm32")]
-    let socket: WebSocket = self::wasm::connect(url, timeout).await?;
-
-    Ok(socket)
+    WebSocket::connect(url, mode, timeout).await
 }

src/socket.rs

@@ -4,6 +4,7 @@
 use std::ops::DerefMut;
 use std::pin::Pin;
 use std::task::{Context, Poll};
+use std::time::Duration;
 
 #[cfg(all(feature = "tor", not(target_arch = "wasm32")))]
 use arti_client::DataStream;
@@ -12,10 +13,11 @@ use futures_util::{Sink, Stream};
 use tokio::net::TcpStream;
 #[cfg(not(target_arch = "wasm32"))]
 use tokio_tungstenite::{MaybeTlsStream, WebSocketStream};
+use url::Url;
 
 #[cfg(target_arch = "wasm32")]
 use crate::wasm::WsStream;
-use crate::{Error, Message};
+use crate::{ConnectionMode, Error, Message};
 
 #[cfg(not(target_arch = "wasm32"))]
 type WsStream<T> = WebSocketStream<MaybeTlsStream<T>>;
@@ -29,6 +31,22 @@ pub enum WebSocket {
     Wasm(WsStream),
 }
 
+impl WebSocket {
+    pub async fn connect(
+        url: &Url,
+        _mode: &ConnectionMode,
+        timeout: Duration,
+    ) -> Result<Self, Error> {
+        #[cfg(not(target_arch = "wasm32"))]
+        let socket: WebSocket = crate::native::connect(url, _mode, timeout).await?;
+
+        #[cfg(target_arch = "wasm32")]
+        let socket: WebSocket = crate::wasm::connect(url, timeout).await?;
+
+        Ok(socket)
+    }
+}
+
 impl Sink<Message> for WebSocket {
     type Error = Error;