mirror of
https://github.com/lune-org/lune.git
synced 2024-12-13 13:30:38 +00:00
More websocket generics
This commit is contained in:
parent
cdf7db51f6
commit
a7fab69838
1 changed files with 25 additions and 39 deletions
|
@ -1,6 +1,5 @@
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use hyper::upgrade::Upgraded;
|
|
||||||
use mlua::prelude::*;
|
use mlua::prelude::*;
|
||||||
|
|
||||||
use hyper_tungstenite::{tungstenite::Message as WsMessage, WebSocketStream};
|
use hyper_tungstenite::{tungstenite::Message as WsMessage, WebSocketStream};
|
||||||
|
@ -8,10 +7,8 @@ use hyper_tungstenite::{tungstenite::Message as WsMessage, WebSocketStream};
|
||||||
use futures_util::{SinkExt, StreamExt};
|
use futures_util::{SinkExt, StreamExt};
|
||||||
use tokio::{
|
use tokio::{
|
||||||
io::{AsyncRead, AsyncWrite},
|
io::{AsyncRead, AsyncWrite},
|
||||||
net::TcpStream,
|
|
||||||
sync::Mutex,
|
sync::Mutex,
|
||||||
};
|
};
|
||||||
use tokio_tungstenite::MaybeTlsStream;
|
|
||||||
|
|
||||||
use crate::utils::table::TableBuilder;
|
use crate::utils::table::TableBuilder;
|
||||||
|
|
||||||
|
@ -31,56 +28,45 @@ where
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn close(&self) -> LuaResult<()> {
|
pub async fn close(&self) -> LuaResult<()> {
|
||||||
let mut inner = self.stream.lock().await;
|
let mut ws = self.stream.lock().await;
|
||||||
inner.close(None).await.map_err(LuaError::external)?;
|
ws.close(None).await.map_err(LuaError::external)?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn send(&self, msg: WsMessage) -> LuaResult<()> {
|
pub async fn send(&self, msg: WsMessage) -> LuaResult<()> {
|
||||||
let mut inner = self.stream.lock().await;
|
let mut ws = self.stream.lock().await;
|
||||||
inner.send(msg).await.map_err(LuaError::external)?;
|
ws.send(msg).await.map_err(LuaError::external)?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn next(&self) -> LuaResult<Option<WsMessage>> {
|
pub async fn next(&self) -> LuaResult<Option<WsMessage>> {
|
||||||
let mut inner = self.stream.lock().await;
|
let mut ws = self.stream.lock().await;
|
||||||
let item = inner.next().await.transpose();
|
let item = ws.next().await.transpose();
|
||||||
item.map_err(LuaError::external)
|
item.map_err(LuaError::external)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn send_string(&self, msg: String) -> LuaResult<()> {
|
|
||||||
self.send(WsMessage::Text(msg)).await
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn next_lua_value(&self, lua: &'static Lua) -> LuaResult<LuaValue> {
|
|
||||||
Ok(match self.next().await? {
|
|
||||||
Some(WsMessage::Binary(bin)) => LuaValue::String(lua.create_string(&bin)?),
|
|
||||||
Some(WsMessage::Text(txt)) => LuaValue::String(lua.create_string(&txt)?),
|
|
||||||
_ => LuaValue::Nil,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl NetWebSocket<MaybeTlsStream<TcpStream>> {
|
impl<T> NetWebSocket<T>
|
||||||
|
where
|
||||||
|
T: AsyncRead + AsyncWrite + Unpin + 'static,
|
||||||
|
{
|
||||||
pub fn into_lua_table(self, lua: &'static Lua) -> LuaResult<LuaTable> {
|
pub fn into_lua_table(self, lua: &'static Lua) -> LuaResult<LuaTable> {
|
||||||
// FIXME: Deallocate when closed
|
let ws = Box::leak(Box::new(self));
|
||||||
let sock = Box::leak(Box::new(self));
|
|
||||||
TableBuilder::new(lua)?
|
TableBuilder::new(lua)?
|
||||||
.with_async_function("close", |_, ()| sock.close())?
|
.with_async_function("close", |_, _: ()| async { ws.close().await })?
|
||||||
.with_async_function("send", |_, msg: String| sock.send_string(msg))?
|
.with_async_function("send", |_, msg: String| async {
|
||||||
.with_async_function("next", |lua, ()| sock.next_lua_value(lua))?
|
ws.send(WsMessage::Text(msg)).await
|
||||||
.build_readonly()
|
})?
|
||||||
}
|
.with_async_function("next", |_, _: ()| async {
|
||||||
}
|
match ws.next().await? {
|
||||||
|
Some(msg) => Ok(match msg {
|
||||||
impl NetWebSocket<Upgraded> {
|
WsMessage::Binary(bin) => LuaValue::String(lua.create_string(&bin)?),
|
||||||
pub fn into_lua_table(self, lua: &'static Lua) -> LuaResult<LuaTable> {
|
WsMessage::Text(txt) => LuaValue::String(lua.create_string(&txt)?),
|
||||||
// FIXME: Deallocate when closed
|
_ => LuaValue::Nil,
|
||||||
let sock = Box::leak(Box::new(self));
|
}),
|
||||||
TableBuilder::new(lua)?
|
None => Ok(LuaValue::Nil),
|
||||||
.with_async_function("close", |_, ()| sock.close())?
|
}
|
||||||
.with_async_function("send", |_, msg: String| sock.send_string(msg))?
|
})?
|
||||||
.with_async_function("next", |lua, ()| sock.next_lua_value(lua))?
|
|
||||||
.build_readonly()
|
.build_readonly()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue