mirror of
https://github.com/griffi-gh/kubi.git
synced 2024-11-10 01:28:41 -06:00
client is almost finished...
This commit is contained in:
parent
1ca847b4fc
commit
4ac6250c04
|
@ -1,12 +1,13 @@
|
||||||
use anyhow::{Result, bail};
|
use anyhow::{Result, bail};
|
||||||
use std::{
|
use std::{
|
||||||
net::{UdpSocket, SocketAddr},
|
net::{UdpSocket, SocketAddr},
|
||||||
marker::PhantomData, time::{Instant, Duration}
|
time::{Instant, Duration},
|
||||||
|
marker::PhantomData,
|
||||||
};
|
};
|
||||||
use bincode::{Encode, Decode};
|
use bincode::{Encode, Decode};
|
||||||
use crate::{
|
use crate::{
|
||||||
BINCODE_CONFIG,
|
BINCODE_CONFIG,
|
||||||
packet::{ClientPacket, IdClientPacket},
|
packet::{ClientPacket, IdClientPacket, IdServerPacket, ServerPacket},
|
||||||
common::{ClientId, DisconnectReason}
|
common::{ClientId, DisconnectReason}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -24,8 +25,8 @@ pub struct ClientConfig {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct Client<S, R> where S: Encode + Decode, R: Encode + Decode {
|
pub struct Client<S, R> where S: Encode + Decode, R: Encode + Decode {
|
||||||
|
pub config: ClientConfig,
|
||||||
addr: SocketAddr,
|
addr: SocketAddr,
|
||||||
config: ClientConfig,
|
|
||||||
socket: UdpSocket,
|
socket: UdpSocket,
|
||||||
status: ClientStatus,
|
status: ClientStatus,
|
||||||
timeout: Instant,
|
timeout: Instant,
|
||||||
|
@ -53,48 +54,65 @@ impl<S, R> Client<S, R> where S: Encode + Decode, R: Encode + Decode {
|
||||||
_r: PhantomData,
|
_r: PhantomData,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
pub fn connect(&mut self) -> Result<()> {
|
|
||||||
if self.status != ClientStatus::Disconnected {
|
|
||||||
bail!("Not Disconnected");
|
|
||||||
}
|
|
||||||
self.status = ClientStatus::Connecting;
|
|
||||||
self.timeout = Instant::now();
|
|
||||||
self.last_heartbeat = Instant::now();
|
|
||||||
self.socket.connect(self.addr)?;
|
|
||||||
self.send_raw_packet(ClientPacket::Connect)?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
fn send_raw_packet(&self, packet: ClientPacket<S>) -> Result<()> {
|
fn send_raw_packet(&self, packet: ClientPacket<S>) -> Result<()> {
|
||||||
let id_packet = IdClientPacket(self.client_id, packet);
|
let id_packet = IdClientPacket(self.client_id, packet);
|
||||||
let bytes = bincode::encode_to_vec(id_packet, BINCODE_CONFIG)?;
|
let bytes = bincode::encode_to_vec(id_packet, BINCODE_CONFIG)?;
|
||||||
self.socket.send(&bytes)?;
|
self.socket.send(&bytes)?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
pub fn send_message(&self, message: S) -> Result<()> {
|
|
||||||
self.send_raw_packet(ClientPacket::Data(message))?;
|
fn disconnect_inner(&mut self, reason: DisconnectReason, silent: bool) -> Result<()> {
|
||||||
Ok(())
|
if !silent {
|
||||||
}
|
|
||||||
fn disconnect_inner(&mut self, reason: DisconnectReason) -> Result<()> {
|
|
||||||
self.send_raw_packet(ClientPacket::Disconnect)?;
|
self.send_raw_packet(ClientPacket::Disconnect)?;
|
||||||
|
}
|
||||||
|
self.client_id = None;
|
||||||
self.status = ClientStatus::Disconnected;
|
self.status = ClientStatus::Disconnected;
|
||||||
self.disconnect_reason = reason;
|
self.disconnect_reason = reason;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn reset_timeout(&mut self) {
|
||||||
|
self.timeout = Instant::now();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
pub fn connect(&mut self) -> Result<()> {
|
||||||
|
if self.status != ClientStatus::Disconnected {
|
||||||
|
bail!("Not Disconnected");
|
||||||
|
}
|
||||||
|
self.status = ClientStatus::Connecting;
|
||||||
|
self.last_heartbeat = Instant::now();
|
||||||
|
self.reset_timeout();
|
||||||
|
self.socket.connect(self.addr)?;
|
||||||
|
self.send_raw_packet(ClientPacket::Connect)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
pub fn disconnect(&mut self) -> Result<()> {
|
pub fn disconnect(&mut self) -> Result<()> {
|
||||||
if self.status != ClientStatus::Connected {
|
if self.status != ClientStatus::Connected {
|
||||||
bail!("Not Connected");
|
bail!("Not Connected");
|
||||||
}
|
}
|
||||||
self.disconnect_inner(DisconnectReason::ClientDisconnected)?;
|
self.disconnect_inner(DisconnectReason::ClientDisconnected, false)?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
pub fn update(&mut self) -> Result<()> {
|
|
||||||
|
pub fn send_message(&self, message: S) -> Result<()> {
|
||||||
|
if self.status != ClientStatus::Connected {
|
||||||
|
bail!("Not Connected");
|
||||||
|
}
|
||||||
|
self.send_raw_packet(ClientPacket::Data(message))?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn update(&mut self, callback: fn(R) -> Result<()>) -> Result<()> {
|
||||||
if self.status == ClientStatus::Disconnected {
|
if self.status == ClientStatus::Disconnected {
|
||||||
return Ok(())
|
return Ok(())
|
||||||
}
|
}
|
||||||
if self.timeout.elapsed() > self.config.timeout {
|
if self.timeout.elapsed() > self.config.timeout {
|
||||||
log::warn!("Client timed out");
|
log::warn!("Client timed out");
|
||||||
//We don't care if this packet actually gets sent because the server is likely dead
|
//We don't care if this packet actually gets sent because the server is likely dead
|
||||||
let _ = self.disconnect_inner(DisconnectReason::ClientDisconnected).map_err(|_| {
|
let _ = self.disconnect_inner(DisconnectReason::ClientDisconnected, false).map_err(|_| {
|
||||||
log::warn!("Failed to send disconnect packet");
|
log::warn!("Failed to send disconnect packet");
|
||||||
});
|
});
|
||||||
return Ok(())
|
return Ok(())
|
||||||
|
@ -104,6 +122,37 @@ impl<S, R> Client<S, R> where S: Encode + Decode, R: Encode + Decode {
|
||||||
self.send_raw_packet(ClientPacket::Heartbeat)?;
|
self.send_raw_packet(ClientPacket::Heartbeat)?;
|
||||||
self.last_heartbeat = Instant::now();
|
self.last_heartbeat = Instant::now();
|
||||||
}
|
}
|
||||||
|
//receive
|
||||||
|
let mut buf = Vec::new();
|
||||||
|
loop {
|
||||||
|
if self.socket.recv(&mut buf).is_ok() {
|
||||||
|
//TODO check the first byte of the raw data instead of decoding?
|
||||||
|
let (packet, _): (IdServerPacket<R>, _) = bincode::decode_from_slice(&buf, BINCODE_CONFIG)?;
|
||||||
|
let IdServerPacket(user_id, packet) = packet;
|
||||||
|
if self.client_id.map(|x| Some(x) != user_id).unwrap_or_default() {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
self.reset_timeout();
|
||||||
|
match packet {
|
||||||
|
ServerPacket::Connected(client_id) => {
|
||||||
|
self.client_id = Some(client_id);
|
||||||
|
self.status = ClientStatus::Connected;
|
||||||
|
return Ok(())
|
||||||
|
},
|
||||||
|
ServerPacket::Disconnected => {
|
||||||
|
//this should never fail but we're handling the error anyway
|
||||||
|
self.disconnect_inner(DisconnectReason::KickedByServer, true)?;
|
||||||
|
return Ok(())
|
||||||
|
},
|
||||||
|
ServerPacket::Data(message) => {
|
||||||
|
callback(message)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
buf.clear();
|
||||||
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue