voxel/kubi
1
1
Fork 0
mirror of https://github.com/griffi-gh/kubi.git synced 2024-12-24 04:48:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

client wip

Browse source
This commit is contained in:
griffi-gh 2023-02-02 02:13:32 +01:00
parent 9a29366322
commit d7b4951ac9
1 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
kubi-udp/src/client.rs
View file

@ -1,6 +1,6 @@
use std::{ use std::{
net::{UdpSocket, SocketAddr}, net::{UdpSocket, SocketAddr},
marker::PhantomData, time::Instant marker::PhantomData, time::{Instant, Duration}
}; };
use bincode::{Encode, Decode}; use bincode::{Encode, Decode};
use crate::{BINCODE_CONFIG, packet::ClientPacket}; use crate::{BINCODE_CONFIG, packet::ClientPacket};
@ -14,7 +14,8 @@ pub enum ClientStatus {
#[derive(Clone, Copy, Debug)] #[derive(Clone, Copy, Debug)]
pub struct ClientConfig { pub struct ClientConfig {
pub timeout: Duration,
pub heartbeat_interval: Duration,
} }
pub struct Client<S, R> where S: Encode + Decode, R: Encode + Decode { pub struct Client<S, R> where S: Encode + Decode, R: Encode + Decode {
@ -22,6 +23,7 @@ pub struct Client<S, R> where S: Encode + Decode, R: Encode + Decode {
config: ClientConfig, config: ClientConfig,
socket: UdpSocket, socket: UdpSocket,
status: ClientStatus, status: ClientStatus,
timeout: Instant,
last_heartbeat: Instant, last_heartbeat: Instant,
_s: PhantomData<*const S>, _s: PhantomData<*const S>,
_r: PhantomData<*const R>, _r: PhantomData<*const R>,
@ -36,6 +38,7 @@ impl<S, R> Client<S, R> where S: Encode + Decode, R: Encode + Decode {
config, config,
socket, socket,
status: ClientStatus::Disconnected, status: ClientStatus::Disconnected,
timeout: Instant::now(),
last_heartbeat: Instant::now(), last_heartbeat: Instant::now(),
_s: PhantomData, _s: PhantomData,
_r: PhantomData, _r: PhantomData,
@ -43,9 +46,11 @@ impl<S, R> Client<S, R> where S: Encode + Decode, R: Encode + Decode {
} }
pub fn connect(&mut self) -> anyhow::Result<()> { pub fn connect(&mut self) -> anyhow::Result<()> {
if self.status != ClientStatus::Disconnected { if self.status != ClientStatus::Disconnected {
anyhow::bail!("Already {:?}", self.status); anyhow::bail!("Not Disconnected");
} }
self.status = ClientStatus::Connecting; self.status = ClientStatus::Connecting;
self.timeout = Instant::now();
self.last_heartbeat = Instant::now();
self.socket.connect(self.addr)?; self.socket.connect(self.addr)?;
self.send_raw_packet(&ClientPacket::Connect)?; self.send_raw_packet(&ClientPacket::Connect)?;
Ok(()) Ok(())
@ -59,11 +64,28 @@ impl<S, R> Client<S, R> where S: Encode + Decode, R: Encode + Decode {
self.send_raw_packet(&ClientPacket::Data(message))?; self.send_raw_packet(&ClientPacket::Data(message))?;
Ok(()) Ok(())
} }
pub fn disconnect(&self) -> anyhow::Result<()> { pub fn disconnect(&mut self) -> anyhow::Result<()> {
if self.status != ClientStatus::Connected {
anyhow::bail!("Not Connected");
}
self.send_raw_packet(&ClientPacket::Disconnect)?; self.send_raw_packet(&ClientPacket::Disconnect)?;
self.status = ClientStatus::Disconnected;
Ok(()) Ok(())
} }
pub fn update(&mut self) { pub fn update(&mut self) -> anyhow::Result<()> {
if self.status == ClientStatus::Disconnected {
return Ok(())
}
if self.timeout.elapsed() > self.config.timeout {
//We don't care if this packet actually gets sent becauseserver is likely dead
let _ = self.send_raw_packet(&ClientPacket::Disconnect);
self.status = ClientStatus::Disconnected;
return Ok(())
}
if self.last_heartbeat.elapsed() > self.config.heartbeat_interval {
self.send_raw_packet(&ClientPacket::Heartbeat)?;
self.last_heartbeat = Instant::now();
}
Ok(())
} }
} }