aboutsummaryrefslogtreecommitdiff
path: root/net/src/transports
diff options
context:
space:
mode:
authorhozan23 <hozan23@karyontech.net>2024-05-27 00:49:25 +0200
committerhozan23 <hozan23@karyontech.net>2024-05-27 00:49:25 +0200
commit385d53ec53e750e342cce78edb793958edf5133e (patch)
tree897861166ed9f3d6add3c6ea4bd89da48985ea11 /net/src/transports
parent3acb724ba1aafeaf37e24dada7c769bb4066444a (diff)
net: finish TODOs in websocket implemention & clean up
Diffstat (limited to 'net/src/transports')
-rw-r--r--net/src/transports/ws.rs18
1 files changed, 10 insertions, 8 deletions
diff --git a/net/src/transports/ws.rs b/net/src/transports/ws.rs
index 6107999..f2fde90 100644
--- a/net/src/transports/ws.rs
+++ b/net/src/transports/ws.rs
@@ -25,7 +25,7 @@ use crate::{
connection::{Conn, Connection, ToConn},
endpoint::Endpoint,
listener::{ConnListener, Listener, ToListener},
- stream::WsStream,
+ stream::{ReadWsStream, WriteWsStream, WsStream},
Result,
};
@@ -62,20 +62,22 @@ pub struct ClientWsConfig {
/// WS network connection implementation of the [`Connection`] trait.
pub struct WsConn<C> {
- // XXX: remove mutex
- inner: Mutex<WsStream<C>>,
+ read_stream: Mutex<ReadWsStream<C>>,
+ write_stream: Mutex<WriteWsStream<C>>,
peer_endpoint: Endpoint,
local_endpoint: Endpoint,
}
impl<C> WsConn<C>
where
- C: WebSocketCodec,
+ C: WebSocketCodec + Clone,
{
/// Creates a new WsConn
pub fn new(ws: WsStream<C>, peer_endpoint: Endpoint, local_endpoint: Endpoint) -> Self {
+ let (read, write) = ws.split();
Self {
- inner: Mutex::new(ws),
+ read_stream: Mutex::new(read),
+ write_stream: Mutex::new(write),
peer_endpoint,
local_endpoint,
}
@@ -97,11 +99,11 @@ where
}
async fn recv(&self) -> Result<Self::Item> {
- self.inner.lock().await.recv().await
+ self.read_stream.lock().await.recv().await
}
async fn send(&self, msg: Self::Item) -> Result<()> {
- self.inner.lock().await.send(msg).await
+ self.write_stream.lock().await.send(msg).await
}
}
@@ -169,7 +171,7 @@ where
/// Connects to the given WS address and port.
pub async fn dial<C>(endpoint: &Endpoint, config: ClientWsConfig, codec: C) -> Result<WsConn<C>>
where
- C: WebSocketCodec,
+ C: WebSocketCodec + Clone,
{
let addr = SocketAddr::try_from(endpoint.clone())?;
let socket = TcpStream::connect(addr).await?;