feat: v2.2.1

Author: eastspire

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tcp-request"
-version = "2.2.0"
+version = "2.2.1"
 edition = "2024"
 authors = ["ltpp-universe <root@ltpp.vip>"] 
 license = "MIT"
@@ -16,7 +16,7 @@ exclude = [
 ]
 
 [dependencies]
-lombok-macros = "1.10.0"
+lombok-macros = "1.10.1"
 
 [profile.dev]
 incremental = false

src/common/mod.rs

@@ -1,2 +1,5 @@
 pub(crate) mod r#const;
 pub(crate) mod r#type;
+
+pub(crate) use r#const::*;
+pub(crate) use r#type::*;

src/lib.rs

@@ -4,20 +4,12 @@ pub(crate) mod common;
 pub(crate) mod request;
 pub(crate) mod response;
 
-pub use request::{
-    error::r#type::Error as RequestError, request_builder::r#type::RequestBuilder,
-    r#trait::RequestTrait, r#type::BoxRequestTrait,
-};
-pub use response::{
-    response_binary::r#type::TcpResponseBinary, response_text::r#type::TcpResponseText,
-    r#trait::ResponseTrait, r#type::BoxResponseTrait,
-};
+pub use request::*;
+pub use response::*;
+
+pub(crate) use common::*;
 
-pub(crate) use common::{r#const::*, r#type::*};
 pub(crate) use lombok_macros::*;
-pub(crate) use request::{
-    config::r#type::*, error::r#type::Error, request::r#type::*, r#type::RequestResult,
-};
 pub(crate) use std::{
     error::Error as StdError,
     fmt::Debug,

src/request/config/mod.rs

@@ -1,2 +1,2 @@
 pub(crate) mod r#impl;
-pub(crate) mod r#type;
+pub(crate) mod r#struct;

src/request/config/type.rs renamed to src/request/config/struct.rs

@@ -1,5 +1,5 @@
 #[derive(Debug)]
-pub enum Error {
+pub enum RequestError {
     InvalidUrl,
     TcpStreamConnectError,
     RequestError,

src/request/error/type.rs renamed to src/request/error/enum.rs

@@ -1,8 +1,8 @@
 use crate::*;
 
-impl StdError for Error {}
+impl StdError for RequestError {}
 
-impl Display for Error {
+impl Display for RequestError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Self::InvalidUrl => write!(f, "Invalid URL"),

src/request/error/impl.rs

@@ -1,2 +1,2 @@
+pub(crate) mod r#enum;
 pub(crate) mod r#impl;
-pub(crate) mod r#type;

src/request/error/mod.rs

@@ -4,3 +4,11 @@ pub(crate) mod request;
 pub(crate) mod request_builder;
 pub(crate) mod r#trait;
 pub(crate) mod r#type;
+
+pub use error::r#enum::*;
+pub use request_builder::r#struct::*;
+pub use r#trait::*;
+pub use r#type::*;
+
+pub(crate) use config::r#struct::*;
+pub(crate) use request::r#struct::*;

src/request/mod.rs

@@ -5,7 +5,7 @@ impl TcpRequest {
         &mut self,
         stream: &mut TcpStream,
         data: &[u8],
-    ) -> Result<BoxResponseTrait, Error> {
+    ) -> Result<BoxResponseTrait, RequestError> {
         let mut data_vec: Vec<u8> = data.into();
         data_vec.extend_from_slice(SPLIT_REQUEST_BYTES);
         stream
@@ -15,7 +15,7 @@ impl TcpRequest {
         self.read_response(stream)
     }
 
-    fn read_response(&mut self, stream: &mut TcpStream) -> Result<BoxResponseTrait, Error> {
+    fn read_response(&mut self, stream: &mut TcpStream) -> Result<BoxResponseTrait, RequestError> {
         let cfg_buffer_size: usize = self
             .get_config()
             .read()
@@ -36,22 +36,22 @@ impl TcpRequest {
         ));
     }
 
-    fn get_connection_stream(&self, host: String, port: usize) -> Result<TcpStream, Error> {
+    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()
             .read()
             .map_or(DEFAULT_TIMEOUT, |data| data.timeout);
         let timeout: Duration = Duration::from_millis(cfg_timeout);
-        let tcp_stream: TcpStream =
-            TcpStream::connect(host_port.clone()).map_err(|_| Error::TcpStreamConnectError)?;
+        let tcp_stream: TcpStream = TcpStream::connect(host_port.clone())
+            .map_err(|_| RequestError::TcpStreamConnectError)?;
         tcp_stream
             .set_read_timeout(Some(timeout))
-            .map_err(|_| Error::SetReadTimeoutError)?;
+            .map_err(|_| RequestError::SetReadTimeoutError)?;
         tcp_stream
             .set_write_timeout(Some(timeout))
-            .map_err(|_| Error::SetWriteTimeoutError)?;
-        let stream: Result<TcpStream, Error> = Ok(tcp_stream);
+            .map_err(|_| RequestError::SetWriteTimeoutError)?;
+        let stream: Result<TcpStream, RequestError> = Ok(tcp_stream);
         stream
     }
 }
@@ -68,8 +68,8 @@ impl RequestTrait for TcpRequest {
         let port: usize = cfg_timeout.get_port().clone();
         let mut stream: TcpStream = self
             .get_connection_stream(host, port)
-            .map_err(|_| Error::TcpStreamConnectError)?;
-        let res: Result<BoxResponseTrait, Error> = self.send_request(&mut stream, data);
+            .map_err(|_| RequestError::TcpStreamConnectError)?;
+        let res: Result<BoxResponseTrait, RequestError> = self.send_request(&mut stream, data);
         res
     }
 }