From 375e80f431ad67b0fe8836b1993d5110279dc5c3 Mon Sep 17 00:00:00 2001 From: lukas0008 Date: Sun, 18 Aug 2024 20:54:43 +0200 Subject: [PATCH] Seperate connection from client --- pumpkin/src/client/connection.rs | 31 ++++++++++++++++++ pumpkin/src/client/mod.rs | 50 +++++++++++++---------------- pumpkin/src/client/player_packet.rs | 10 +++--- 3 files changed, 59 insertions(+), 32 deletions(-) create mode 100644 pumpkin/src/client/connection.rs diff --git a/pumpkin/src/client/connection.rs b/pumpkin/src/client/connection.rs new file mode 100644 index 000000000..55c0b7755 --- /dev/null +++ b/pumpkin/src/client/connection.rs @@ -0,0 +1,31 @@ +use pumpkin_protocol::{ + packet_decoder::PacketDecoder, packet_encoder::PacketEncoder, ClientPacket, PacketError, +}; +use tokio::{io::AsyncWriteExt, net::TcpStream}; + +pub struct Connection { + pub client: TcpStream, + pub enc: PacketEncoder, + pub dec: PacketDecoder, +} + +impl Connection { + pub fn new(client: TcpStream) -> Self { + Self { + client, + enc: PacketEncoder::default(), + dec: PacketDecoder::default(), + } + } + pub async fn try_send_packet( + &mut self, + packet: &P, + ) -> Result<(), PacketError> { + self.enc.append_packet(packet)?; + self.client + .write_all(&self.enc.take()) + .await + .map_err(|_| PacketError::ConnectionWrite)?; + Ok(()) + } +} diff --git a/pumpkin/src/client/mod.rs b/pumpkin/src/client/mod.rs index 1389a535c..d23fa5608 100644 --- a/pumpkin/src/client/mod.rs +++ b/pumpkin/src/client/mod.rs @@ -13,6 +13,7 @@ use crate::{ use authentication::GameProfile; use bytes::BytesMut; +use connection::Connection; use num_traits::ToPrimitive; use pumpkin_protocol::{ bytebuf::packet_id::Packet, @@ -49,6 +50,7 @@ use thiserror::Error; pub mod authentication; mod client_packet; +pub mod connection; pub mod player_packet; pub struct PlayerConfig { @@ -75,15 +77,13 @@ pub struct Client { pub encrytion: bool, pub closed: bool, pub token: u32, - pub connection: TcpStream, + pub connection: Connection, pub address: SocketAddr, - enc: PacketEncoder, - dec: PacketDecoder, pub client_packets_queue: VecDeque, } impl Client { - pub fn new(token: u32, connection: TcpStream, address: SocketAddr) -> Self { + pub fn new(token: u32, client: TcpStream, address: SocketAddr) -> Self { Self { protocol_version: 0, gameprofile: None, @@ -93,9 +93,7 @@ impl Client { address, player: None, connection_state: ConnectionState::HandShake, - connection, - enc: PacketEncoder::default(), - dec: PacketDecoder::default(), + connection: Connection::new(client), encrytion: true, closed: false, client_packets_queue: VecDeque::new(), @@ -116,15 +114,17 @@ impl Client { let crypt_key: [u8; 16] = shared_secret .try_into() .map_err(|_| EncryptionError::SharedWrongLength)?; - self.dec.enable_encryption(&crypt_key); - self.enc.enable_encryption(&crypt_key); + self.connection.dec.enable_encryption(&crypt_key); + self.connection.enc.enable_encryption(&crypt_key); Ok(()) } // Compression threshold, Compression level pub fn set_compression(&mut self, compression: Option<(u32, u32)>) { - self.dec.set_compression(compression.map(|v| v.0)); - self.enc.set_compression(compression); + self.connection + .dec + .set_compression(compression.map(|v| v.0)); + self.connection.enc.set_compression(compression); } pub fn is_player(&self) -> bool { @@ -133,7 +133,7 @@ impl Client { /// Send a Clientbound Packet to the Client pub async fn send_packet(&mut self, packet: &P) { - match self.try_send_packet(packet).await { + match self.connection.try_send_packet(packet).await { Ok(_) => {} Err(e) => { self.kick(&e.to_string()).await; @@ -141,18 +141,6 @@ impl Client { }; } - pub async fn try_send_packet( - &mut self, - packet: &P, - ) -> Result<(), PacketError> { - self.enc.append_packet(packet)?; - self.connection - .write_all(&self.enc.take()) - .await - .map_err(|_| PacketError::ConnectionWrite)?; - Ok(()) - } - pub async fn teleport(&mut self, x: f64, y: f64, z: f64, yaw: f32, pitch: f32) { assert!(self.is_player()); // TODO @@ -371,14 +359,14 @@ impl Client { let mut buf = BytesMut::new(); loop { select! { - result = self.connection.read_buf(&mut buf) => { + result = self.connection.client.read_buf(&mut buf) => { match result { Ok(0) => { self.close(); break; } Ok(_) => { - self.dec.queue_bytes(buf.split()); + self.connection.dec.queue_bytes(buf.split()); } Err(e) => { log::error!("{}", e); @@ -387,7 +375,7 @@ impl Client { } }; loop { - match self.dec.decode() { + match self.connection.dec.decode() { Ok(Some(packet)) => { self.add_packet(packet); let mut server = server.write().await; @@ -420,6 +408,7 @@ impl Client { match self.connection_state { ConnectionState::Login => { match self + .connection .try_send_packet(&CLoginDisconnect::new( &serde_json::to_string_pretty(&reason).unwrap(), )) @@ -430,13 +419,18 @@ impl Client { } } ConnectionState::Config => { - match self.try_send_packet(&CConfigDisconnect::new(reason)).await { + match self + .connection + .try_send_packet(&CConfigDisconnect::new(reason)) + .await + { Ok(_) => {} Err(_) => self.close(), } } ConnectionState::Play => { match self + .connection .try_send_packet(&CPlayDisconnect::new(TextComponent::from(reason))) .await { diff --git a/pumpkin/src/client/player_packet.rs b/pumpkin/src/client/player_packet.rs index c4b1b3832..ea1473be4 100644 --- a/pumpkin/src/client/player_packet.rs +++ b/pumpkin/src/client/player_packet.rs @@ -324,10 +324,12 @@ impl Client { let packet = &CHurtAnimation::new(&entity_id, 10.0); self.send_packet(packet).await; client.send_packet(packet).await; - server.broadcast_packet_expect( - &[self.token, token], - &CHurtAnimation::new(&entity_id, 10.0), - ).await + server + .broadcast_packet_expect( + &[self.token, token], + &CHurtAnimation::new(&entity_id, 10.0), + ) + .await } } else { self.kick("Interacted with invalid entitiy id").await