Rewrite proxy (#511)

Author: Iaiao

Cargo.lock

@@ -44,7 +44,7 @@ members = [
     "feather/server",
 
     # Other
-    "tools/proxy",
+    "proxy",
 ]
 
 # No longer need to use release for "development":

Cargo.toml

@@ -40,6 +40,3 @@ bytemuck = { version = "1", features = ["derive"] }
 rand = "0.8"
 rand_pcg = "0.3"
 serde_test = "1"
-
-[features]
-proxy = []

feather/base/Cargo.toml

@@ -51,7 +51,6 @@ impl BlockStore {
         &self.blocks
     }
 
-    #[cfg(feature = "proxy")]
     pub fn data_mut(&mut self) -> &mut PackedArray {
         &mut self.blocks
     }
@@ -60,7 +59,6 @@ impl BlockStore {
         self.palette.as_ref()
     }
 
-    #[cfg(feature = "proxy")]
     pub fn palette_mut(&mut self) -> Option<&mut Palette> {
         self.palette.as_mut()
     }
@@ -83,7 +81,6 @@ impl BlockStore {
         self.air_block_count
     }
 
-    #[cfg(feature = "proxy")]
     pub fn set_air_blocks(&mut self, new_value: u32) {
         self.air_block_count = new_value;
     }

feather/base/src/chunk/blocks.rs

@@ -142,7 +142,6 @@ where
         self.heights.set(index, height as u64);
     }
 
-    #[cfg(feature = "proxy")]
     pub fn set_height_index(&mut self, index: usize, height: i64) {
         self.heights.as_u64_mut_vec()[index] = height as u64;
     }

feather/base/src/chunk/heightmap.rs

@@ -166,7 +166,6 @@ impl PackedArray {
         self.bits_per_value
     }
 
-    #[cfg(feature = "proxy")]
     pub fn set_bits_per_value(&mut self, new_value: usize) {
         self.bits_per_value = new_value;
     }
@@ -176,7 +175,6 @@ impl PackedArray {
         &self.bits
     }
 
-    #[cfg(feature = "proxy")]
     pub fn as_u64_mut_vec(&mut self) -> &mut Vec<u64> {
         &mut self.bits
     }

feather/base/src/chunk/packed_array.rs

@@ -24,8 +24,3 @@ thiserror = "1"
 uuid = "0.8"
 libcraft-core = { path = "../../libcraft/core" }
 libcraft-items = { path = "../../libcraft/items" }
-
-
-
-[features]
-proxy = ["base/proxy"]

feather/protocol/Cargo.toml

@@ -11,6 +11,7 @@ use libcraft_items::InventorySlot::*;
 use num_traits::{FromPrimitive, ToPrimitive};
 use quill_common::components::PreviousGamemode;
 use serde::{de::DeserializeOwned, Serialize};
+use std::io::ErrorKind;
 use std::{
     borrow::Cow,
     collections::BTreeMap,
@@ -160,31 +161,11 @@ where
 pub struct VarInt(pub i32);
 
 impl Readable for VarInt {
-    fn read(buffer: &mut Cursor<&[u8]>, version: ProtocolVersion) -> anyhow::Result<Self>
+    fn read(buffer: &mut Cursor<&[u8]>, _version: ProtocolVersion) -> anyhow::Result<Self>
     where
         Self: Sized,
     {
-        let mut num_read = 0;
-        let mut result = 0;
-
-        loop {
-            let read = u8::read(buffer, version)?;
-            let value = i32::from(read & 0b0111_1111);
-            result |= value.overflowing_shl(7 * num_read).0;
-
-            num_read += 1;
-
-            if num_read > 5 {
-                bail!(
-                    "VarInt too long (max length: 5, value read so far: {})",
-                    result
-                );
-            }
-            if read & 0b1000_0000 == 0 {
-                break;
-            }
-        }
-        Ok(VarInt(result))
+        Self::read_from(buffer).map_err(Into::into)
     }
 }
 
@@ -214,8 +195,9 @@ impl From<i32> for VarInt {
 }
 
 impl VarInt {
-    pub fn write_to(&self, mut writer: impl Write) -> io::Result<()> {
+    pub fn write_to(&self, mut writer: impl Write) -> io::Result<usize> {
         let mut x = self.0 as u32;
+        let mut i = 0;
         loop {
             let mut temp = (x & 0b0111_1111) as u8;
             x >>= 7;
@@ -225,11 +207,35 @@ impl VarInt {
 
             writer.write_all(&[temp])?;
 
+            i += 1;
             if x == 0 {
                 break;
             }
         }
-        Ok(())
+        Ok(i)
+    }
+    pub fn read_from(mut reader: impl Read) -> io::Result<Self> {
+        let mut num_read = 0;
+        let mut result = 0;
+
+        loop {
+            let read = reader.read_u8()?;
+            let value = i32::from(read & 0b0111_1111);
+            result |= value.overflowing_shl(7 * num_read).0;
+
+            num_read += 1;
+
+            if num_read > 5 {
+                return Err(io::Error::new(
+                    ErrorKind::InvalidData,
+                    "VarInt too long (max length: 5)",
+                ));
+            }
+            if read & 0b1000_0000 == 0 {
+                break;
+            }
+        }
+        Ok(VarInt(result))
     }
 }
 

feather/protocol/src/io.rs

@@ -4,6 +4,7 @@ pub mod codec;
 pub mod io;
 pub mod packets;
 
+use crate::codec::CompressionThreshold;
 #[doc(inline)]
 pub use codec::MinecraftCodec;
 pub use io::Nbt;
@@ -62,6 +63,10 @@ impl ClientPacketCodec {
         self.state = state
     }
 
+    pub fn set_compression(&mut self, threshold: CompressionThreshold) {
+        self.codec.enable_compression(threshold)
+    }
+
     /// Decodes a `ClientPacket` using the provided data.
     pub fn decode(&mut self, data: &[u8]) -> anyhow::Result<Option<ClientPacket>> {
         self.codec.accept(data);
@@ -120,6 +125,10 @@ impl ServerPacketCodec {
         self.state = state
     }
 
+    pub fn set_compression(&mut self, threshold: CompressionThreshold) {
+        self.codec.enable_compression(threshold)
+    }
+
     /// Decodes a `ServerPacket` using the provided data.
     pub fn decode(&mut self, data: &[u8]) -> anyhow::Result<Option<ServerPacket>> {
         self.codec.accept(data);
@@ -159,6 +168,17 @@ pub enum ClientPacket {
     Play(ClientPlayPacket),
 }
 
+impl ClientPacket {
+    pub fn id(&self) -> u32 {
+        match self {
+            ClientPacket::Handshake(packet) => packet.id(),
+            ClientPacket::Status(packet) => packet.id(),
+            ClientPacket::Login(packet) => packet.id(),
+            ClientPacket::Play(packet) => packet.id(),
+        }
+    }
+}
+
 impl From<ClientHandshakePacket> for ClientPacket {
     fn from(packet: ClientHandshakePacket) -> Self {
         ClientPacket::Handshake(packet)
@@ -191,6 +211,16 @@ pub enum ServerPacket {
     Play(ServerPlayPacket),
 }
 
+impl ServerPacket {
+    pub fn id(&self) -> u32 {
+        match self {
+            ServerPacket::Status(packet) => packet.id(),
+            ServerPacket::Login(packet) => packet.id(),
+            ServerPacket::Play(packet) => packet.id(),
+        }
+    }
+}
+
 impl From<ServerStatusPacket> for ServerPacket {
     fn from(packet: ServerStatusPacket) -> Self {
         ServerPacket::Status(packet)

feather/protocol/src/lib.rs

@@ -145,7 +145,6 @@ fn encode_section(
     Ok(())
 }
 
-#[cfg(feature = "proxy")]
 impl Readable for ChunkData {
     fn read(buffer: &mut std::io::Cursor<&[u8]>, version: ProtocolVersion) -> anyhow::Result<Self>
     where