hehe end

Implodent · Oct 8, 2023 · b0ad104 · b0ad104
1 parent e15b617
commit b0ad104
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 26 deletions.
diff --git a/protocol/src/lib.rs b/protocol/src/lib.rs
@@ -34,6 +34,7 @@ pub use indexmap;
 pub use miette;
 pub use nu_ansi_term as ansi;
 pub use tracing;
+
 /// A macro similar to `vec![$elem; $size]` which returns a boxed array.
 ///
 /// ```rust
@@ -55,10 +56,6 @@ macro_rules! box_array {
     }};
 }
 
-pub async fn rwlock_set<T: 'static>(rwlock: &RwLock<T>, value: T) {
-    rwlock.set(value).await
-}
-
 pub trait AsyncGet<T: ?Sized + 'static> {
     type Ptr<'a, D: ?Sized + 'static>: Deref<Target = D> + 'a;
 
@@ -133,10 +130,7 @@ use std::{
     fmt::Debug,
     net::SocketAddr,
     ops::{Deref, DerefMut},
-    sync::{
-        atomic::{AtomicBool, Ordering},
-        Arc,
-    },
+    sync::Arc,
     time::Duration,
 };
 
@@ -218,14 +212,17 @@ impl PlayerNet {
                 let mut buf = box_array![0u8; model::MAX_PACKET_DATA];
 
                 loop {
-                    let read_bytes = read.read_buf(&mut buf.as_mut().as_mut()).await?;
+                    debug!("three two one explode");
+                    let read_bytes = read.read(&mut buf.as_mut().as_mut()).await?;
+                    debug!(%read_bytes, "didn't explode");
                     if read_bytes == 0 {
                         return Ok::<(), crate::error::Error>(());
                     }
                     let compres = compressing__.get_copy().await;
                     let spack = if let Some(cmp) = compression.filter(|_| compres) {
                         trace!("[recv]compressing");
                         let sp: SerializedPacket = SerializedPacketCompressed::deserialize
+                            .then_ignore(aott::prelude::end)
                             .parse(buf.as_ref())?
                             .into();
                         if sp.length < cmp {
@@ -236,7 +233,7 @@ impl PlayerNet {
                         trace!("[recv]not compressing");
                         SerializedPacket::deserialize.parse(buf.as_ref())?
                     };
-                    trace!(buf=?buf[..spack.length], ?spack, "recving packet");
+                    trace!(buf=%format!("{:#x?}", &buf[..read_bytes]), ?spack, "recving packet");
                     s_recv.send_async(spack).await?;
                     unsafe { std::ptr::write_bytes(buf.as_mut().as_mut_ptr(), 0u8, buf.len()) };
                 }

diff --git a/protocol/src/logging.rs b/protocol/src/logging.rs
@@ -4,16 +4,12 @@ use std::collections::HashMap;
 use itertools::Itertools;
 use nu_ansi_term::{Color, Style};
 use tracing::{field::Field, Level};
-use tracing_subscriber::Layer;
+use tracing_subscriber::{registry::LookupSpan, Layer};
 
 pub struct CraftLayer;
 
-impl<S: tracing::Subscriber> Layer<S> for CraftLayer {
-    fn on_event(
-        &self,
-        event: &tracing::Event<'_>,
-        _context: tracing_subscriber::layer::Context<'_, S>,
-    ) {
+impl<S: tracing::Subscriber + for<'lo> LookupSpan<'lo>> Layer<S> for CraftLayer {
+    fn on_event(&self, event: &tracing::Event<'_>, cx: tracing_subscriber::layer::Context<'_, S>) {
         // inspiration taken from pnpm
         let level = Color::Black
             .on(match *event.metadata().level() {
@@ -24,7 +20,7 @@ impl<S: tracing::Subscriber> Layer<S> for CraftLayer {
                 Level::TRACE => Color::Purple,
             })
             .bold()
-            .paint(format!(" {:<5} ", event.metadata().level().as_str()));
+            .paint(format!(" {} ", event.metadata().level().as_str()));
 
         let mut visitor = CraftVisitor {
             message: None,
@@ -45,8 +41,8 @@ impl<S: tracing::Subscriber> Layer<S> for CraftLayer {
             String::new()
         } else {
             let padding = " ".repeat(
-                // max length of level
-                7
+                // length of level
+                event.metadata().level().as_str().len()
                     // space after level before target
                     + 1,
             );

diff --git a/server/src/main.rs b/server/src/main.rs
@@ -29,15 +29,11 @@ use oxcr_protocol::{
     },
     nbt::{nbt_serde, Nbt, NbtList, NbtTagType},
     nsfr::when_the_miette,
-    rwlock_set,
     ser::{Array, Identifier, Json, Namespace, Position},
     uuid::Uuid,
     AsyncSet, PlayerN, PlayerNet, ProtocolPlugin,
 };
-use std::{
-    net::SocketAddr,
-    sync::{atomic::Ordering, Arc},
-};
+use std::{net::SocketAddr, sync::Arc};
 use tokio::net::TcpListener;
 use tokio_util::sync::CancellationToken;
 use tracing::instrument;
@@ -85,9 +81,11 @@ async fn login(net: Arc<PlayerNet>, cx: Arc<TaskContext>, ent_id: Entity) -> Res
 
     if let Some(threshold) = net.compression {
         debug!(%threshold, ?net, "compressing");
+
         net.send_packet(SetCompression {
             threshold: VarInt::<i32>(threshold.try_into().unwrap()),
         })?;
+
         net.compressing.set(true).await;
     }
 
@@ -206,7 +204,7 @@ async fn login(net: Arc<PlayerNet>, cx: Arc<TaskContext>, ent_id: Entity) -> Res
 }
 
 async fn status(net: Arc<PlayerNet>) -> Result<()> {
-    rwlock_set(&net.state, State::Status).await;
+    net.state.set(State::Status).await;
 
     let _: StatusRequest = net.recv_packet().await?;
     net.send_packet(StatusResponse {