moves code into the api layer
This commit is contained in:
31
api/src/client/error.rs
Normal file
31
api/src/client/error.rs
Normal file
@@ -0,0 +1,31 @@
|
||||
use thiserror::Error;
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
pub enum ConnectError {
|
||||
#[error(transparent)]
|
||||
TungsteniteError(#[from] tokio_tungstenite::tungstenite::Error),
|
||||
#[error(transparent)]
|
||||
IoError(#[from] std::io::Error),
|
||||
}
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
pub enum MessageError {
|
||||
#[error(transparent)]
|
||||
TokioSendError(#[from] tokio::sync::mpsc::error::SendError<()>),
|
||||
#[error(transparent)]
|
||||
TokioTrySendError(#[from] tokio::sync::mpsc::error::TrySendError<()>),
|
||||
#[error(transparent)]
|
||||
TokioLockError(#[from] tokio::sync::TryLockError),
|
||||
}
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
pub enum RequestError<E> {
|
||||
#[error(transparent)]
|
||||
TokioSendError(#[from] tokio::sync::mpsc::error::SendError<()>),
|
||||
#[error(transparent)]
|
||||
TokioLockError(#[from] tokio::sync::TryLockError),
|
||||
#[error(transparent)]
|
||||
RecvError(#[from] tokio::sync::oneshot::error::RecvError),
|
||||
#[error(transparent)]
|
||||
Inner(E),
|
||||
}
|
||||
283
api/src/client/mod.rs
Normal file
283
api/src/client/mod.rs
Normal file
@@ -0,0 +1,283 @@
|
||||
pub mod error;
|
||||
|
||||
use crate::client::error::{MessageError, RequestError};
|
||||
use crate::messages::payload::ResponseMessagePayload;
|
||||
use crate::messages::{ClientMessage, RequestMessage, RequestResponse, ResponseMessage};
|
||||
use error::ConnectError;
|
||||
use futures_util::stream::StreamExt;
|
||||
use futures_util::SinkExt;
|
||||
use log::{debug, error};
|
||||
use std::collections::HashMap;
|
||||
use std::sync::mpsc::sync_channel;
|
||||
use std::sync::Arc;
|
||||
use std::thread;
|
||||
use tokio::net::TcpStream;
|
||||
use tokio::select;
|
||||
use tokio::sync::mpsc::{Receiver, Sender};
|
||||
use tokio::sync::{mpsc, oneshot, RwLock, RwLockWriteGuard};
|
||||
use tokio_tungstenite::tungstenite::client::IntoClientRequest;
|
||||
use tokio_tungstenite::tungstenite::handshake::client::Request;
|
||||
use tokio_tungstenite::tungstenite::Message;
|
||||
use tokio_tungstenite::{connect_async, MaybeTlsStream, WebSocketStream};
|
||||
use tokio_util::sync::CancellationToken;
|
||||
use uuid::Uuid;
|
||||
|
||||
enum Callback {
|
||||
None,
|
||||
Once(oneshot::Sender<ResponseMessage>),
|
||||
}
|
||||
|
||||
struct OutgoingMessage {
|
||||
msg: RequestMessage,
|
||||
callback: Callback,
|
||||
}
|
||||
|
||||
pub struct Client {
|
||||
cancel: CancellationToken,
|
||||
channel: Arc<RwLock<Sender<OutgoingMessage>>>,
|
||||
}
|
||||
|
||||
struct ClientContext {
|
||||
cancel: CancellationToken,
|
||||
request: Request,
|
||||
}
|
||||
|
||||
impl Client {
|
||||
pub fn connect<R>(request: R) -> Result<Self, ConnectError>
|
||||
where
|
||||
R: IntoClientRequest,
|
||||
{
|
||||
let (tx, _rx) = mpsc::channel(1);
|
||||
let cancel = CancellationToken::new();
|
||||
let channel = Arc::new(RwLock::new(tx));
|
||||
let context = ClientContext {
|
||||
cancel: cancel.clone(),
|
||||
request: request.into_client_request()?,
|
||||
};
|
||||
|
||||
context.start(channel.clone())?;
|
||||
|
||||
Ok(Self { cancel, channel })
|
||||
}
|
||||
|
||||
pub async fn send_message<M: ClientMessage>(&self, msg: M) -> Result<(), MessageError> {
|
||||
let sender = self.channel.read().await;
|
||||
let data = sender.reserve().await?;
|
||||
data.send(OutgoingMessage {
|
||||
msg: RequestMessage {
|
||||
uuid: Uuid::new_v4(),
|
||||
response: None,
|
||||
payload: msg.into(),
|
||||
},
|
||||
callback: Callback::None,
|
||||
});
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn send_message_if_connected<M: ClientMessage>(
|
||||
&self,
|
||||
msg: M,
|
||||
) -> Result<(), MessageError> {
|
||||
let sender = self.channel.try_read()?;
|
||||
let data = sender.reserve().await?;
|
||||
data.send(OutgoingMessage {
|
||||
msg: RequestMessage {
|
||||
uuid: Uuid::new_v4(),
|
||||
response: None,
|
||||
payload: msg.into(),
|
||||
},
|
||||
callback: Callback::None,
|
||||
});
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn try_send_message<M: ClientMessage>(&self, msg: M) -> Result<(), MessageError> {
|
||||
let sender = self.channel.try_read()?;
|
||||
let data = sender.try_reserve()?;
|
||||
data.send(OutgoingMessage {
|
||||
msg: RequestMessage {
|
||||
uuid: Uuid::new_v4(),
|
||||
response: None,
|
||||
payload: msg.into(),
|
||||
},
|
||||
callback: Callback::None,
|
||||
});
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn send_request<M: RequestResponse>(
|
||||
&self,
|
||||
msg: M,
|
||||
) -> Result<M::Response, RequestError<<M::Response as TryFrom<ResponseMessagePayload>>::Error>>
|
||||
{
|
||||
let sender = self.channel.read().await;
|
||||
let data = sender.reserve().await?;
|
||||
|
||||
let (tx, rx) = oneshot::channel();
|
||||
data.send(OutgoingMessage {
|
||||
msg: RequestMessage {
|
||||
uuid: Uuid::new_v4(),
|
||||
response: None,
|
||||
payload: msg.into(),
|
||||
},
|
||||
callback: Callback::Once(tx),
|
||||
});
|
||||
|
||||
let response = rx.await?;
|
||||
let response = M::Response::try_from(response.payload).map_err(RequestError::Inner)?;
|
||||
|
||||
Ok(response)
|
||||
}
|
||||
}
|
||||
|
||||
impl ClientContext {
|
||||
fn start(mut self, channel: Arc<RwLock<Sender<OutgoingMessage>>>) -> Result<(), ConnectError> {
|
||||
let runtime = tokio::runtime::Builder::new_current_thread()
|
||||
.enable_all()
|
||||
.build()?;
|
||||
|
||||
let (tx, rx) = sync_channel::<()>(1);
|
||||
|
||||
let _detached = thread::Builder::new()
|
||||
.name("tlm-client".to_string())
|
||||
.spawn(move || {
|
||||
runtime.block_on(async {
|
||||
let mut write_lock = channel.write().await;
|
||||
|
||||
// This cannot fail
|
||||
let _ = tx.send(());
|
||||
|
||||
while !self.cancel.is_cancelled() {
|
||||
write_lock = self.run_connection(write_lock, &channel).await;
|
||||
}
|
||||
drop(write_lock);
|
||||
});
|
||||
})?;
|
||||
|
||||
// This cannot fail
|
||||
let _ = rx.recv();
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn run_connection<'a>(
|
||||
&mut self,
|
||||
mut write_lock: RwLockWriteGuard<'a, Sender<OutgoingMessage>>,
|
||||
channel: &'a Arc<RwLock<Sender<OutgoingMessage>>>,
|
||||
) -> RwLockWriteGuard<'a, Sender<OutgoingMessage>> {
|
||||
let mut ws = match connect_async(self.request.clone()).await {
|
||||
Ok((ws, _)) => ws,
|
||||
Err(e) => {
|
||||
error!("Connect Error: {e}");
|
||||
return write_lock;
|
||||
}
|
||||
};
|
||||
|
||||
let (tx, rx) = mpsc::channel(128);
|
||||
*write_lock = tx;
|
||||
drop(write_lock);
|
||||
|
||||
let close_connection = self.handle_connection(&mut ws, rx).await;
|
||||
|
||||
let write_lock = channel.write().await;
|
||||
if close_connection {
|
||||
if let Err(e) = ws.close(None).await {
|
||||
println!("Close Error {e}");
|
||||
}
|
||||
}
|
||||
write_lock
|
||||
}
|
||||
|
||||
async fn handle_connection(
|
||||
&mut self,
|
||||
ws: &mut WebSocketStream<MaybeTlsStream<TcpStream>>,
|
||||
mut rx: Receiver<OutgoingMessage>,
|
||||
) -> bool {
|
||||
let mut callbacks = HashMap::<Uuid, Callback>::new();
|
||||
loop {
|
||||
select! {
|
||||
_ = self.cancel.cancelled() => { break; },
|
||||
Some(msg) = ws.next() => {
|
||||
match msg {
|
||||
Ok(msg) => {
|
||||
match msg {
|
||||
Message::Text(msg) => {
|
||||
let msg: ResponseMessage = match serde_json::from_str(&msg) {
|
||||
Ok(m) => m,
|
||||
Err(e) => {
|
||||
error!("Failed to deserialize {e}");
|
||||
break;
|
||||
}
|
||||
};
|
||||
self.handle_incoming(msg, &mut callbacks).await;
|
||||
}
|
||||
Message::Binary(_) => unimplemented!("Binary Data Not Implemented"),
|
||||
Message::Ping(data) => {
|
||||
if let Err(e) = ws.send(Message::Pong(data)).await {
|
||||
error!("Failed to send Pong {e}");
|
||||
break;
|
||||
}
|
||||
}
|
||||
Message::Pong(_) => {
|
||||
// Intentionally Left Empty
|
||||
}
|
||||
Message::Close(_) => {
|
||||
debug!("Websocket Closed");
|
||||
return false;
|
||||
}
|
||||
Message::Frame(_) => unreachable!("Not Possible"),
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
error!("Receive Error {e}");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
Some(msg) = rx.recv() => {
|
||||
callbacks.insert(msg.msg.uuid, msg.callback);
|
||||
let msg = match serde_json::to_string(&msg.msg) {
|
||||
Ok(m) => m,
|
||||
Err(e) => {
|
||||
error!("Encode Error {e}");
|
||||
break;
|
||||
}
|
||||
};
|
||||
if let Err(e) = ws.send(Message::Text(msg.into())).await {
|
||||
error!("Send Error {e}");
|
||||
break;
|
||||
}
|
||||
}
|
||||
else => { break; },
|
||||
}
|
||||
}
|
||||
true
|
||||
}
|
||||
|
||||
async fn handle_incoming(
|
||||
&mut self,
|
||||
msg: ResponseMessage,
|
||||
callbacks: &mut HashMap<Uuid, Callback>,
|
||||
) {
|
||||
if let Some(response_uuid) = msg.response {
|
||||
match callbacks.get(&response_uuid) {
|
||||
Some(Callback::Once(_)) => {
|
||||
let Some(Callback::Once(callback)) = callbacks.remove(&response_uuid) else {
|
||||
return;
|
||||
};
|
||||
let _ = callback.send(msg);
|
||||
}
|
||||
Some(Callback::None) => {
|
||||
callbacks.remove(&response_uuid);
|
||||
}
|
||||
None => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for Client {
|
||||
fn drop(&mut self) {
|
||||
self.cancel.cancel();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user