feat: v2.2.6

Author: eastspire

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tcp-request"
-version = "2.2.5"
+version = "2.2.6"
 edition = "2024"
 authors = ["root@ltpp.vip"] 
 license = "MIT"
@@ -15,9 +15,6 @@ exclude = [
     ".github"
 ]
 
-[dependencies]
-lombok-macros = "1.11.4"
-
 [profile.dev]
 incremental = false
 opt-level = 3

src/lib.rs

@@ -9,7 +9,6 @@ pub use response::*;
 
 pub(crate) use common::*;
 
-pub(crate) use lombok_macros::*;
 pub(crate) use std::{
     error::Error as StdError,
     fmt::Debug,

src/request/config/struct.rs

@@ -1,6 +1,6 @@
 use crate::*;
 
-#[derive(Debug, Clone, PartialEq, Eq, Data)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Config {
     pub host: String,
     pub port: usize,

src/request/request/impl.rs

@@ -17,7 +17,7 @@ impl TcpRequest {
 
     fn read_response(&mut self, stream: &mut TcpStream) -> Result<BoxResponseTrait, RequestError> {
         let cfg_buffer_size: usize = self
-            .get_config()
+            .config
             .read()
             .map_or(DEFAULT_BUFFER_SIZE, |data| data.buffer_size);
         let mut tmp_buf: Vec<u8> = vec![0u8; cfg_buffer_size];
@@ -39,7 +39,7 @@ impl TcpRequest {
     fn get_connection_stream(&self, host: String, port: usize) -> Result<TcpStream, RequestError> {
         let host_port: (String, u16) = (host.clone(), port as u16);
         let cfg_timeout: u64 = self
-            .get_config()
+            .config
             .read()
             .map_or(DEFAULT_TIMEOUT, |data| data.timeout);
         let timeout: Duration = Duration::from_millis(cfg_timeout);
@@ -61,11 +61,11 @@ impl RequestTrait for TcpRequest {
 
     fn send(&mut self, data: &[u8]) -> Self::RequestResult {
         let cfg_timeout: Config = self
-            .get_config()
+            .config
             .read()
             .map_or(Config::default(), |data| data.clone());
-        let host: String = cfg_timeout.get_host().clone();
-        let port: usize = cfg_timeout.get_port().clone();
+        let host: String = cfg_timeout.host.clone();
+        let port: usize = cfg_timeout.port.clone();
         let mut stream: TcpStream = self
             .get_connection_stream(host, port)
             .map_err(|_| RequestError::TcpStreamConnectError)?;

src/request/request/struct.rs

@@ -1,6 +1,6 @@
 use crate::*;
 
-#[derive(Debug, Clone, Data)]
+#[derive(Debug, Clone)]
 pub struct TcpRequest {
     pub(crate) config: ArcRwLock<Config>,
     pub(crate) response: ArcRwLock<TcpResponseBinary>,

src/request/request_builder/impl.rs

@@ -18,50 +18,34 @@ impl RequestBuilder {
     where
         T: Into<String>,
     {
-        let _ = self
-            .tcp_request
-            .get_mut_config()
-            .write()
-            .and_then(|mut data| {
-                data.host = host.into();
-                Ok(())
-            });
+        let _ = self.tcp_request.config.write().and_then(|mut data| {
+            data.host = host.into();
+            Ok(())
+        });
         self
     }
 
     pub fn port(&mut self, port: usize) -> &mut Self {
-        let _ = self
-            .tcp_request
-            .get_mut_config()
-            .write()
-            .and_then(|mut data| {
-                data.port = port;
-                Ok(())
-            });
+        let _ = self.tcp_request.config.write().and_then(|mut data| {
+            data.port = port;
+            Ok(())
+        });
         self
     }
 
     pub fn buffer(&mut self, buffer_size: usize) -> &mut Self {
-        let _ = self
-            .tcp_request
-            .get_mut_config()
-            .write()
-            .and_then(|mut data| {
-                data.buffer_size = buffer_size;
-                Ok(())
-            });
+        let _ = self.tcp_request.config.write().and_then(|mut data| {
+            data.buffer_size = buffer_size;
+            Ok(())
+        });
         self
     }
 
     pub fn timeout(&mut self, timeout: u64) -> &mut Self {
-        let _ = self
-            .tcp_request
-            .get_mut_config()
-            .write()
-            .and_then(|mut data| {
-                data.timeout = timeout;
-                Ok(())
-            });
+        let _ = self.tcp_request.config.write().and_then(|mut data| {
+            data.timeout = timeout;
+            Ok(())
+        });
         self
     }