lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2025-05-04 10:43:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

rename 'stream_in' -> 'read_stream' & 'stream_out' -> 'write_stream'

Browse source
This commit is contained in:
AsynchronousMatrix 2023-07-19 12:44:44 +01:00
parent 05eee2ca4b
commit 4ed7cafc77
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
packages/lib/src/lua/net/websocket.rs
View file

@ -47,16 +47,16 @@ return freeze(setmetatable({
#[derive(Debug)] #[derive(Debug)]
pub struct NetWebSocket<T> { pub struct NetWebSocket<T> {
close_code: Arc<Cell<Option<u16>>>, close_code: Arc<Cell<Option<u16>>>,
stream_in: Arc<AsyncMutex<SplitStream<WebSocketStream<T>>>>, read_stream: Arc<AsyncMutex<SplitStream<WebSocketStream<T>>>>,
stream_out: Arc<AsyncMutex<SplitSink<WebSocketStream<T>, WsMessage>>>, write_stream: Arc<AsyncMutex<SplitSink<WebSocketStream<T>, WsMessage>>>,
} }
impl<T> Clone for NetWebSocket<T> { impl<T> Clone for NetWebSocket<T> {
fn clone(&self) -> Self { fn clone(&self) -> Self {
Self { Self {
close_code: Arc::clone(&self.close_code), close_code: Arc::clone(&self.close_code),
stream_in: Arc::clone(&self.stream_in), read_stream: Arc::clone(&self.read_stream),
stream_out: Arc::clone(&self.stream_out), write_stream: Arc::clone(&self.write_stream),
} }
} }
} }
@ -70,8 +70,8 @@ where
Self { Self {
close_code: Arc::new(Cell::new(None)), close_code: Arc::new(Cell::new(None)),
stream_in: Arc::new(AsyncMutex::new(read)), read_stream: Arc::new(AsyncMutex::new(read)),
stream_out: Arc::new(AsyncMutex::new(write)), write_stream: Arc::new(AsyncMutex::new(write)),
} }
} }
@ -152,7 +152,7 @@ async fn close<'lua, T>(
where where
T: AsyncRead + AsyncWrite + Unpin, T: AsyncRead + AsyncWrite + Unpin,
{ {
let mut ws = socket.stream_out.lock().await; let mut ws = socket.write_stream.lock().await;
let _ = ws let _ = ws
.send(WsMessage::Close(Some(WsCloseFrame { .send(WsMessage::Close(Some(WsCloseFrame {
@ -190,7 +190,7 @@ where
let s = string.to_str().map_err(LuaError::external)?; let s = string.to_str().map_err(LuaError::external)?;
WsMessage::Text(s.to_string()) WsMessage::Text(s.to_string())
}; };
let mut ws = socket.stream_out.lock().await; let mut ws = socket.write_stream.lock().await;
ws.send(msg).await.map_err(LuaError::external) ws.send(msg).await.map_err(LuaError::external)
} }
@ -201,7 +201,7 @@ async fn next<'lua, T>(
where where
T: AsyncRead + AsyncWrite + Unpin, T: AsyncRead + AsyncWrite + Unpin,
{ {
let mut ws = socket.stream_in.lock().await; let mut ws = socket.read_stream.lock().await;
let item = ws.next().await.transpose().map_err(LuaError::external); let item = ws.next().await.transpose().map_err(LuaError::external);
let msg = match item { let msg = match item {
Ok(Some(WsMessage::Close(msg))) => { Ok(Some(WsMessage::Close(msg))) => {