feat: minor performance optimizations and API changes

Author: pk5ls20

mania-core/src/core/crypto/stream_sha1.rs

@@ -6,13 +6,22 @@ use digest::{
 };
 use sha1::block_api::compress;
 
-#[derive(Default)]
 struct StreamSha1Core {
-    h: [u32; 5] = [0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0],
-    block_len: u64 = 0,
+    h: [u32; 5],
+    block_len: u64,
     buffer: BlockBuffer<U64, Eager>,
 }
 
+impl Default for StreamSha1Core {
+    fn default() -> Self {
+        Self {
+            h: [0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0],
+            block_len: 0,
+            buffer: BlockBuffer::default(),
+        }
+    }
+}
+
 impl StreamSha1Core {
     #[inline]
     fn hash(&self) -> [u8; 20] {
@@ -47,14 +56,24 @@ impl StreamSha1Core {
     }
 }
 
-#[derive(Default)]
 pub struct StreamSha1 {
     hasher: StreamSha1Core,
-    block_size: usize = 1024 * 1024,
-    offset: usize = 0,
+    block_size: usize,
+    offset: usize,
     digests_stream: Vec<[u8; 20]>,
 }
 
+impl Default for StreamSha1 {
+    fn default() -> Self {
+        Self {
+            hasher: StreamSha1Core::default(),
+            block_size: 1024 * 1024,
+            offset: 0,
+            digests_stream: Vec::new(),
+        }
+    }
+}
+
 impl StreamSha1 {
     pub fn new() -> Self {
         Self::default()

mania-core/src/core/event.rs

@@ -9,6 +9,7 @@ use crate::core::session::Session;
 use bytes::Bytes;
 use once_cell::sync::Lazy;
 use std::any::Any;
+use std::borrow::Cow;
 use std::collections::HashMap;
 use std::fmt::Debug;
 use thiserror::Error;
@@ -72,9 +73,10 @@ static EVENT_MAP: Lazy<EventMap> = Lazy::new(|| {
 
 pub fn resolve_event(packet: SsoPacket, session: &Session) -> CEParseResult {
     // Lagrange.Core.Internal.Context.ServiceContext.ResolveEventByPacket
-    let payload = PacketReader::new(packet.payload()).section(|p| p.bytes());
-    let Some(parse) = EVENT_MAP.get(packet.command()) else {
-        return Err(EventError::UnsupportedEvent(packet.command().to_string()));
+    let (_, cmd, _, data) = packet.into_parts();
+    let payload = PacketReader::new(data.0).section(|p| p.bytes());
+    let Some(parse) = EVENT_MAP.get(cmd.as_ref()) else {
+        return Err(EventError::UnsupportedEvent(cmd));
     };
     let events = parse(payload, session)?;
     Ok(events)
@@ -101,7 +103,7 @@ pub fn downcast_mut_major_event<T: ServerEvent + 'static>(event: &mut CEParse) -
 #[derive(Debug, Error)]
 pub enum EventError {
     #[error("unsupported event, commend: {0}")]
-    UnsupportedEvent(String),
+    UnsupportedEvent(Cow<'static, str>),
 
     #[error("TLV error occurred: {0}")]
     MissingTlv(#[from] crate::core::tlv::TlvError),

mania-core/src/core/packet.rs

@@ -36,7 +36,7 @@ impl TryFrom<u32> for PacketType {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct BinaryPacket(pub Bytes);
 
 pub struct OidbPacket {
@@ -114,6 +114,7 @@ impl OidbPacket {
     }
 }
 
+#[derive(Clone)]
 pub struct SsoPacket {
     packet_type: PacketType,
     command: Cow<'static, str>,
@@ -187,8 +188,12 @@ impl SsoPacket {
         self.sequence
     }
 
-    pub fn payload(&self) -> Bytes {
-        self.payload.0.clone()
+    pub fn payload(&self) -> &[u8] {
+        self.payload.0.as_ref()
+    }
+
+    pub fn into_parts(self) -> (PacketType, Cow<'static, str>, u32, BinaryPacket) {
+        (self.packet_type, self.command, self.sequence, self.payload)
     }
 
     pub fn build(&self, ctx: &Context) -> Vec<u8> {

mania-core/src/lib.rs

@@ -1,6 +1,4 @@
 #![allow(dead_code)]
-#![feature(default_field_values)]
-
 pub mod core;
 pub mod entity;
 pub mod message;

mania/src/lib.rs

@@ -1,6 +1,4 @@
 #![allow(dead_code)] // TODO: remove this after stable
-#![feature(default_field_values)]
-
 pub mod business;
 pub mod cache;
 pub mod connect;