refactor(replay/recorder): use SmallVec for save_raw_packet

.cargo/config.toml

@@ -1,3 +1,7 @@
 [target.x86_64-unknown-linux-gnu]
 linker = "clang"
 rustflags = ["-Clink-arg=-fuse-ld=mold", "-Zshare-generics=y"]
+
+[target.aarch64-unknown-linux-gnu]
+linker = "clang"
+rustflags = ["-Clink-arg=-fuse-ld=mold", "-Zshare-generics=y"]

.github/workflows/build.yaml

@@ -3,6 +3,7 @@ on:
     push:
         paths:
             - "**.rs"
+            - "**.toml"
             - "Cargo.*"
     pull_request:
     workflow_dispatch:
@@ -32,10 +33,16 @@ jobs:
                       ~/.cargo/registry/cache/
                       ~/.cargo/git/db/
                       target/
-                  key: build-${{ matrix.os }}-${{ hashFiles('Cargo.*') }}
+                  key: build-${{ matrix.os }}-${{ hashFiles('**.toml', 'Cargo.*') }}
 
             - name: Switch to nightly toolchain
               run: rustup default nightly
 
             - name: Build in release mode
               run: cargo build --release
+
+            - name: Upload build artifacts
+              uses: actions/upload-artifact@v4
+              with:
+                  name: errornowatcher_${{ matrix.os }}
+                  path: target/release/errornowatcher

.github/workflows/lint.yaml

@@ -3,6 +3,7 @@ on:
     push:
         paths:
             - "**.rs"
+            - "**.toml"
             - "Cargo.*"
     pull_request:
     workflow_dispatch:
@@ -46,7 +47,7 @@ jobs:
                       ~/.cargo/registry/cache/
                       ~/.cargo/git/db/
                       target/
-                  key: build-${{ runner.os }}-${{ hashFiles('Cargo.*') }}
+                  key: build-${{ matrix.os }}-${{ hashFiles('**.toml', 'Cargo.*') }}
 
             - name: Switch to nightly toolchain
               run: rustup default nightly

src/events.rs

@@ -175,11 +175,10 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result<
             _ => (),
         },
         Event::Init => {
-            debug!("received initialize event");
+            debug!("received init event");
 
             let ecs = client.ecs.clone();
             ctrlc::set_handler(move || {
-                debug!("finishing replay recording");
                 ecs.lock()
                     .remove_resource::<Recorder>()
                     .map(Recorder::finish);
@@ -241,12 +240,7 @@ async fn lua_init(client: Client, state: &State, globals: &Table) -> Result<()>
                 .map_err(Error::external)
         })?,
     )?;
-    globals.set(
+    globals.set("client", client::Client(Some(client)))?;
-        "client",
-        client::Client {
-            inner: Some(client),
-        },
-    )?;
     call_listeners(state, "init", ()).await;
     Ok(())
 }

src/http.rs

@@ -3,44 +3,45 @@ use crate::{
     lua::{eval, exec, reload},
 };
 use http_body_util::{BodyExt, Empty, Full, combinators::BoxBody};
-use hyper::{Method, Request, Response, StatusCode, body::Bytes};
+use hyper::{
+    Error, Method, Request, Response, StatusCode,
+    body::{Bytes, Incoming},
+};
 
 pub async fn serve(
-    request: Request<hyper::body::Incoming>,
+    request: Request<Incoming>,
     state: State,
-) -> Result<Response<BoxBody<Bytes, hyper::Error>>, hyper::Error> {
+) -> Result<Response<BoxBody<Bytes, Error>>, Error> {
-    let path = request.uri().path().to_owned();
+    macro_rules! handle_code {
-
+        ($handler:ident) => {
-    Ok(match (request.method(), path.as_str()) {
+            match std::str::from_utf8(&request.into_body().collect().await?.to_bytes()) {
-        (&Method::POST, "/reload") => {
+                Ok(code) => Response::new(full(format!(
-            Response::new(full(format!("{:#?}", reload(&state.lua, None))))
+                    "{:#?}",
-        }
+                    $handler(&state.lua, code, None).await
-
+                ))),
-        (&Method::POST, "/eval" | "/exec") => {
-            let bytes = request.into_body().collect().await?.to_bytes();
-            match std::str::from_utf8(&bytes) {
-                Ok(code) => Response::new(full(match path.as_str() {
-                    "/eval" => format!("{:#?}", eval(&state.lua, code, None).await),
-                    "/exec" => format!("{:#?}", exec(&state.lua, code, None).await),
-                    _ => unreachable!(),
-                })),
                 Err(error) => status_code_response(
                     StatusCode::BAD_REQUEST,
                     full(format!("invalid utf-8 data received: {error:?}")),
                 ),
             }
+        };
     }
 
+    Ok(match (request.method(), request.uri().path()) {
+        (&Method::POST, "/reload") => {
+            Response::new(full(format!("{:#?}", reload(&state.lua, None))))
+        }
+        (&Method::POST, "/eval") => handle_code!(eval),
+        (&Method::POST, "/exec") => handle_code!(exec),
         (&Method::GET, "/ping") => Response::new(full("pong!")),
-
         _ => status_code_response(StatusCode::NOT_FOUND, empty()),
     })
 }
 
 fn status_code_response(
     status_code: StatusCode,
-    bytes: BoxBody<Bytes, hyper::Error>,
+    bytes: BoxBody<Bytes, Error>,
-) -> Response<BoxBody<Bytes, hyper::Error>> {
+) -> Response<BoxBody<Bytes, Error>> {
     let mut response = Response::new(bytes);
     *response.status_mut() = status_code;
     response

src/lua/client/container.rs

@@ -9,13 +9,11 @@ use log::error;
 use mlua::{Lua, Result, Table, UserDataRef};
 
 pub fn container(_lua: &Lua, client: &Client) -> Result<Option<ContainerRef>> {
-    Ok(client
+    Ok(client.get_open_container().map(ContainerRef))
-        .get_open_container()
-        .map(|c| ContainerRef { inner: c }))
 }
 
 pub fn held_item(_lua: &Lua, client: &Client) -> Result<ItemStack> {
-    Ok(ItemStack::from(client.component::<Inventory>().held_item()))
+    Ok(ItemStack(client.component::<Inventory>().held_item()))
 }
 
 pub fn held_slot(_lua: &Lua, client: &Client) -> Result<u8> {
@@ -26,7 +24,7 @@ pub fn held_slot(_lua: &Lua, client: &Client) -> Result<u8> {
 pub fn menu(lua: &Lua, client: &Client) -> Result<Table> {
     fn from_slot_list<const N: usize>(s: SlotList<N>) -> Vec<ItemStack> {
         s.iter()
-            .map(|i| ItemStack::from(i.to_owned()))
+            .map(|i| ItemStack(i.to_owned()))
             .collect::<Vec<_>>()
     }
 
@@ -40,11 +38,11 @@ pub fn menu(lua: &Lua, client: &Client) -> Result<Table> {
             offhand,
         }) => {
             table.set("type", 0)?;
-            table.set("craft_result", ItemStack::from(craft_result))?;
+            table.set("craft_result", ItemStack(craft_result))?;
             table.set("craft", from_slot_list(craft))?;
             table.set("armor", from_slot_list(armor))?;
             table.set("inventory", from_slot_list(inventory))?;
-            table.set("offhand", ItemStack::from(offhand))?;
+            table.set("offhand", ItemStack(offhand))?;
         }
         Menu::Generic9x3 { contents, player } => {
             table.set("type", 3)?;
@@ -62,7 +60,7 @@ pub fn menu(lua: &Lua, client: &Client) -> Result<Table> {
             player,
         } => {
             table.set("type", 13)?;
-            table.set("result", ItemStack::from(result))?;
+            table.set("result", ItemStack(result))?;
             table.set("grid", from_slot_list(grid))?;
             table.set("player", from_slot_list(player))?;
         }
@@ -78,7 +76,7 @@ pub fn menu(lua: &Lua, client: &Client) -> Result<Table> {
         } => {
             table.set("type", 20)?;
             table.set("payments", from_slot_list(payments))?;
-            table.set("result", ItemStack::from(result))?;
+            table.set("result", ItemStack(result))?;
             table.set("player", from_slot_list(player))?;
         }
         Menu::ShulkerBox { contents, player } => {
@@ -105,11 +103,11 @@ pub async fn open_container_at(
             position.z as i32,
         ))
         .await
-        .map(|c| Container { inner: c }))
+        .map(Container))
 }
 
 pub fn open_inventory(_lua: &Lua, client: &mut Client, _: ()) -> Result<Option<Container>> {
-    Ok(client.open_inventory().map(|c| Container { inner: c }))
+    Ok(client.open_inventory().map(Container))
 }
 
 pub fn set_held_slot(_lua: &Lua, client: &Client, slot: u8) -> Result<()> {

src/lua/client/mod.rs

@@ -14,25 +14,19 @@ use azalea::{Client as AzaleaClient, world::MinecraftEntityId};
 use mlua::{Lua, Result, UserData, UserDataFields, UserDataMethods};
 use std::ops::{Deref, DerefMut};
 
-pub struct Client {
+pub struct Client(pub Option<AzaleaClient>);
-    pub inner: Option<AzaleaClient>,
-}
 
 impl Deref for Client {
     type Target = AzaleaClient;
 
     fn deref(&self) -> &Self::Target {
-        self.inner
+        self.0.as_ref().expect("should have received init event")
-            .as_ref()
-            .expect("should have received init event")
     }
 }
 
 impl DerefMut for Client {
     fn deref_mut(&mut self) -> &mut Self::Target {
-        self.inner
+        self.0.as_mut().expect("should have received init event")
-            .as_mut()
-            .expect("should have received init event")
     }
 }
 

src/lua/container/item_stack.rs

@@ -1,24 +1,19 @@
-use azalea::inventory::components::{CustomName, Damage, Food, MaxDamage};
+use azalea::inventory::{
+    self,
+    components::{CustomName, Damage, Food, MaxDamage},
+};
 use mlua::{UserData, UserDataFields, UserDataMethods};
 
-pub struct ItemStack {
+pub struct ItemStack(pub inventory::ItemStack);
-    pub inner: azalea::inventory::ItemStack,
-}
-
-impl From<azalea::inventory::ItemStack> for ItemStack {
-    fn from(inner: azalea::inventory::ItemStack) -> Self {
-        Self { inner }
-    }
-}
 
 impl UserData for ItemStack {
     fn add_fields<F: UserDataFields<Self>>(f: &mut F) {
-        f.add_field_method_get("is_empty", |_, this| Ok(this.inner.is_empty()));
+        f.add_field_method_get("is_empty", |_, this| Ok(this.0.is_empty()));
-        f.add_field_method_get("is_present", |_, this| Ok(this.inner.is_present()));
+        f.add_field_method_get("is_present", |_, this| Ok(this.0.is_present()));
-        f.add_field_method_get("count", |_, this| Ok(this.inner.count()));
+        f.add_field_method_get("count", |_, this| Ok(this.0.count()));
-        f.add_field_method_get("kind", |_, this| Ok(this.inner.kind().to_string()));
+        f.add_field_method_get("kind", |_, this| Ok(this.0.kind().to_string()));
         f.add_field_method_get("custom_name", |_, this| {
-            Ok(this.inner.as_present().map(|data| {
+            Ok(this.0.as_present().map(|data| {
                 data.components
                     .get::<CustomName>()
                     .map(|c| c.name.to_string())
@@ -26,13 +21,13 @@ impl UserData for ItemStack {
         });
         f.add_field_method_get("damage", |_, this| {
             Ok(this
-                .inner
+                .0
                 .as_present()
                 .map(|data| data.components.get::<Damage>().map(|d| d.amount)))
         });
         f.add_field_method_get("max_damage", |_, this| {
             Ok(this
-                .inner
+                .0
                 .as_present()
                 .map(|data| data.components.get::<MaxDamage>().map(|d| d.amount)))
         });
@@ -40,7 +35,7 @@ impl UserData for ItemStack {
         f.add_field_method_get("food", |lua, this| {
             Ok(
                 if let Some(food) = this
-                    .inner
+                    .0
                     .as_present()
                     .and_then(|data| data.components.get::<Food>())
                 {
@@ -59,10 +54,10 @@ impl UserData for ItemStack {
 
     fn add_methods<M: UserDataMethods<Self>>(m: &mut M) {
         m.add_method_mut("split", |_, this, count: u32| {
-            Ok(ItemStack::from(this.inner.split(count)))
+            Ok(ItemStack(this.0.split(count)))
         });
         m.add_method_mut("update_empty", |_, this, (): ()| {
-            this.inner.update_empty();
+            this.0.update_empty();
             Ok(())
         });
     }

src/lua/container/mod.rs

@@ -6,22 +6,20 @@ use click::operation_from_table;
 use item_stack::ItemStack;
 use mlua::{Table, UserData, UserDataFields, UserDataMethods};
 
-pub struct Container {
+pub struct Container(pub ContainerHandle);
-    pub inner: ContainerHandle,
-}
 
 impl UserData for Container {
     fn add_fields<F: UserDataFields<Self>>(f: &mut F) {
-        f.add_field_method_get("id", |_, this| Ok(this.inner.id()));
+        f.add_field_method_get("id", |_, this| Ok(this.0.id()));
 
         f.add_field_method_get("menu", |_, this| {
-            Ok(this.inner.menu().map(|m| format!("{m:?}")))
+            Ok(this.0.menu().map(|m| format!("{m:?}")))
         });
 
         f.add_field_method_get("contents", |_, this| {
-            Ok(this.inner.contents().map(|v| {
+            Ok(this.0.contents().map(|v| {
                 v.iter()
-                    .map(|i| ItemStack::from(i.to_owned()))
+                    .map(|i| ItemStack(i.to_owned()))
                     .collect::<Vec<_>>()
             }))
         });
@@ -31,7 +29,7 @@ impl UserData for Container {
         m.add_method(
             "click",
             |_, this, (operation, operation_type): (Table, Option<u8>)| {
-                this.inner
+                this.0
                     .click(operation_from_table(operation, operation_type)?);
                 Ok(())
             },
@@ -39,22 +37,20 @@ impl UserData for Container {
     }
 }
 
-pub struct ContainerRef {
+pub struct ContainerRef(pub ContainerHandleRef);
-    pub inner: ContainerHandleRef,
-}
 
 impl UserData for ContainerRef {
     fn add_fields<F: UserDataFields<Self>>(f: &mut F) {
-        f.add_field_method_get("id", |_, this| Ok(this.inner.id()));
+        f.add_field_method_get("id", |_, this| Ok(this.0.id()));
 
         f.add_field_method_get("menu", |_, this| {
-            Ok(this.inner.menu().map(|m| format!("{m:?}")))
+            Ok(this.0.menu().map(|m| format!("{m:?}")))
         });
 
         f.add_field_method_get("contents", |_, this| {
-            Ok(this.inner.contents().map(|v| {
+            Ok(this.0.contents().map(|v| {
                 v.iter()
-                    .map(|i| ItemStack::from(i.to_owned()))
+                    .map(|i| ItemStack(i.to_owned()))
                     .collect::<Vec<_>>()
             }))
         });
@@ -62,14 +58,14 @@ impl UserData for ContainerRef {
 
     fn add_methods<M: UserDataMethods<Self>>(m: &mut M) {
         m.add_method("close", |_, this, (): ()| {
-            this.inner.close();
+            this.0.close();
             Ok(())
         });
 
         m.add_method(
             "click",
             |_, this, (operation, operation_type): (Table, Option<u8>)| {
-                this.inner
+                this.0
                     .click(operation_from_table(operation, operation_type)?);
                 Ok(())
             },

src/lua/nochatreports/crypt.rs

@@ -4,7 +4,7 @@ macro_rules! crypt {
         macro_rules! crypt_with {
             ($algo:ident) => {{
                 let encoding = $options.get("encoding").unwrap_or_default();
-                let key = &$options.get::<UserDataRef<AesKey>>("key")?.inner;
+                let key = &$options.get::<UserDataRef<AesKey>>("key")?.0;
                 match encoding {
                     1 => $algo::<Base64Encoding>::$op($text, &key),
                     2 => $algo::<Base64rEncoding>::$op($text, &key),

src/lua/nochatreports/key.rs

@@ -1,12 +1,10 @@
 use mlua::UserData;
 
-pub struct AesKey {
+pub struct AesKey(pub ncr::AesKey);
-    pub inner: ncr::AesKey,
-}
 
 impl UserData for AesKey {
     fn add_fields<F: mlua::UserDataFields<Self>>(f: &mut F) {
-        f.add_field_method_get("base64", |_, this| Ok(this.inner.encode_base64()));
+        f.add_field_method_get("base64", |_, this| Ok(this.0.encode_base64()));
-        f.add_field_method_get("bytes", |_, this| Ok(this.inner.as_ref().to_vec()));
+        f.add_field_method_get("bytes", |_, this| Ok(this.0.as_ref().to_vec()));
     }
 }

src/lua/nochatreports/mod.rs

@@ -14,29 +14,23 @@ pub fn register_globals(lua: &Lua, globals: &Table) -> Result<()> {
     globals.set(
         "ncr_aes_key_from_passphrase",
         lua.create_function(|_, passphrase: Vec<u8>| {
-            Ok(AesKey {
+            Ok(AesKey(ncr::AesKey::gen_from_passphrase(&passphrase)))
-                inner: ncr::AesKey::gen_from_passphrase(&passphrase),
-            })
         })?,
     )?;
 
     globals.set(
         "ncr_aes_key_from_base64",
         lua.create_function(|_, base64: String| {
-            Ok(AesKey {
+            Ok(AesKey(
-                inner: ncr::AesKey::decode_base64(&base64)
+                ncr::AesKey::decode_base64(&base64)
                     .map_err(|error| Error::external(error.to_string()))?,
-            })
+            ))
         })?,
     )?;
 
     globals.set(
         "ncr_generate_random_aes_key",
-        lua.create_function(|_, (): ()| {
+        lua.create_function(|_, (): ()| Ok(AesKey(ncr::AesKey::gen_random_key())))?,
-            Ok(AesKey {
-                inner: ncr::AesKey::gen_random_key(),
-            })
-        })?,
     )?;
 
     globals.set(

src/replay/recorder.rs

@@ -5,6 +5,7 @@ use azalea::{
     prelude::Resource,
     protocol::packets::{PROTOCOL_VERSION, ProtocolPacket, VERSION_NAME},
 };
+use log::debug;
 use serde_json::json;
 use smallvec::SmallVec;
 use std::{
@@ -41,8 +42,9 @@ impl Recorder {
     }
 
     pub fn finish(mut self) -> Result<()> {
-        let elapsed = self.start.elapsed().as_millis();
+        debug!("finishing replay recording");
 
+        let elapsed = self.start.elapsed().as_millis();
         self.zip_writer
             .start_file("metaData.json", SimpleFileOptions::default())?;
         self.zip_writer.write_all(
@@ -62,20 +64,21 @@ impl Recorder {
         )?;
         self.zip_writer.finish()?;
 
+        debug!("finished replay recording");
         Ok(())
     }
 
     pub fn save_raw_packet(&mut self, raw_packet: &[u8]) -> Result<()> {
-        let mut data = Vec::with_capacity(raw_packet.len() + 8);
+        let mut data = SmallVec::<[u8; 128]>::with_capacity(raw_packet.len() + 8);
-        data.extend(&TryInto::<u32>::try_into(self.start.elapsed().as_millis())?.to_be_bytes());
+        data.write_all(&TryInto::<u32>::try_into(self.start.elapsed().as_millis())?.to_be_bytes())?;
-        data.extend(&TryInto::<u32>::try_into(raw_packet.len())?.to_be_bytes());
+        data.write_all(&TryInto::<u32>::try_into(raw_packet.len())?.to_be_bytes())?;
-        data.extend(raw_packet);
+        data.write_all(raw_packet)?;
         self.zip_writer.write_all(&data)?;
         Ok(())
     }
 
     pub fn save_packet<T: ProtocolPacket>(&mut self, packet: &T) -> Result<()> {
-        let mut raw_packet = SmallVec::<[u8; 64]>::new();
+        let mut raw_packet = SmallVec::<[u8; 128]>::new();
         packet.id().azalea_write_var(&mut raw_packet)?;
         packet.write(&mut raw_packet)?;
         self.save_raw_packet(&raw_packet)