feat: improved vetis customization

Author: ararog

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "easyhttpmock"
-version = "0.1.3-beta.2"
+version = "0.1.3-beta.6"
 edition = "2021"
 authors = ["Rogerio Araújo <rogerio.araujo@gmail.com>"]
 repository = "https://github.com/ararog/easyhttpmock"
@@ -34,4 +34,4 @@ hyper-util = "0.1.9"
 rand = "0.9.2"
 thiserror = "2.0.17"
 tokio = { version = "1.0", features = ["full"] }
-vetis = { version = "0.1.4-beta.3", optional = true, default-features = false }
+vetis = { version = "0.1.4-beta.4", optional = true, default-features = false }

Cargo.toml

@@ -8,6 +8,8 @@ pub enum EasyHttpMockError {
 
 #[derive(Debug, Clone, Error, PartialEq)]
 pub enum ServerError {
+    #[error("Server config error: {0}")]
+    Config(String),
     #[error("Server start error: {0}")]
     Start(String),
     #[error("Server stop error: {0}")]

src/errors.rs

@@ -1,7 +1,7 @@
 use std::future::Future;
 
 use vetis::{
-    config::{ListenerConfig, SecurityConfig, ServerConfig, VirtualHostConfig},
+    config::{ListenerConfig, Protocol, SecurityConfig, ServerConfig, VirtualHostConfig},
     errors::VetisError,
     server::{
         path::HandlerPath,
@@ -21,6 +21,7 @@ use crate::{
 pub struct VetisAdapterConfigBuilder {
     hostname: Option<String>,
     interface: String,
+    protocol: Protocol,
     port: u16,
     cert: Option<Vec<u8>>,
     key: Option<Vec<u8>>,
@@ -52,6 +53,18 @@ impl VetisAdapterConfigBuilder {
         self
     }
 
+    /// Sets the protocol for the server.
+    ///
+    /// # Arguments
+    /// * `protocol` - The protocol to set.
+    ///
+    /// # Returns
+    /// A new `VetisAdapterConfigBuilder` instance with the protocol set.
+    pub fn protocol(mut self, protocol: Protocol) -> Self {
+        self.protocol = protocol;
+        self
+    }
+
     /// Sets the port for the server.
     ///
     /// # Arguments
@@ -108,6 +121,7 @@ impl VetisAdapterConfigBuilder {
         VetisAdapterConfig {
             hostname: self.hostname,
             interface: self.interface,
+            protocol: self.protocol,
             port: self.port,
             cert: self.cert,
             key: self.key,
@@ -121,6 +135,7 @@ impl VetisAdapterConfigBuilder {
 pub struct VetisAdapterConfig {
     hostname: Option<String>,
     interface: String,
+    protocol: Protocol,
     port: u16,
     cert: Option<Vec<u8>>,
     key: Option<Vec<u8>>,
@@ -141,6 +156,7 @@ impl Default for VetisAdapterConfig {
         Self {
             hostname: None,
             interface: "0.0.0.0".into(),
+            protocol: Protocol::Http1,
             port: 80,
             cert: None,
             key: None,
@@ -163,6 +179,7 @@ impl VetisAdapterConfig {
         VetisAdapterConfigBuilder {
             hostname: None,
             interface: "0.0.0.0".into(),
+            protocol: Protocol::Http1,
             port: 80,
             cert: None,
             key: None,
@@ -223,11 +240,14 @@ impl From<VetisAdapterConfig> for ServerConfig {
     fn from(config: VetisAdapterConfig) -> Self {
         let listener_config = ListenerConfig::builder()
             .interface(&config.interface)
+            .protocol(config.protocol)
             .port(config.port)
-            .build();
+            .build()
+            .expect("Failed to build listener config");
         ServerConfig::builder()
             .add_listener(listener_config)
             .build()
+            .expect("Failed to build server config")
     }
 }
 
@@ -353,6 +373,7 @@ impl ServerAdapter for VetisAdapter {
 
         let host_config = VirtualHostConfig::builder()
             .hostname(&hostname)
+            .root_directory("src/tests")
             .port(self.config.port());
 
         let host_config = if let Some(((cert, key), ca)) = self
@@ -374,7 +395,8 @@ impl ServerAdapter for VetisAdapter {
                     .cert_from_bytes(cert.clone())
                     .key_from_bytes(key.clone())
                     .ca_cert_from_bytes(ca.clone())
-                    .build(),
+                    .build()
+                    .map_err(|e| EasyHttpMockError::Server(ServerError::Config(e.to_string())))?,
             )
         } else {
             host_config

src/server/adapters/vetis_adapter.rs

@@ -3,6 +3,7 @@ mod easy_http_mock_config_tests {
     use crate::{
         config::EasyHttpMockConfig,
         server::adapters::vetis_adapter::{VetisAdapter, VetisAdapterConfig},
+        tests::default_protocol,
     };
 
     #[test]
@@ -97,6 +98,7 @@ mod easy_http_mock_config_tests {
     fn test_easy_http_mock_config_builder_with_server_config() {
         let server_config = VetisAdapterConfig::builder()
             .interface("127.0.0.1")
+            .protocol(default_protocol())
             .port(3000)
             .build();
 
@@ -126,6 +128,7 @@ mod easy_http_mock_config_tests {
         let base_url = "https://test.mock".to_string();
         let server_config = VetisAdapterConfig::builder()
             .interface("0.0.0.0")
+            .protocol(default_protocol())
             .port(8443)
             .build();
 
@@ -153,6 +156,7 @@ mod easy_http_mock_config_tests {
     fn test_easy_http_mock_config_builder_chaining() {
         let server_config = VetisAdapterConfig::builder()
             .interface("192.168.1.100")
+            .protocol(default_protocol())
             .port(9090)
             .build();
 
@@ -207,12 +211,14 @@ mod integration_tests {
     use crate::{
         config::EasyHttpMockConfig,
         server::adapters::vetis_adapter::{VetisAdapter, VetisAdapterConfig},
+        tests::default_protocol,
     };
 
     #[test]
     fn test_config_with_vetis_server_adapter_integration() {
         let server_config = VetisAdapterConfig::builder()
             .interface("0.0.0.0")
+            .protocol(default_protocol())
             .port(443)
             .build();
 
@@ -236,6 +242,7 @@ mod integration_tests {
             .server_config(
                 VetisAdapterConfig::builder()
                     .interface("0.0.0.0")
+                    .protocol(default_protocol())
                     .port(8080)
                     .build(),
             )
@@ -246,6 +253,7 @@ mod integration_tests {
             .server_config(
                 VetisAdapterConfig::builder()
                     .interface("0.0.0.0")
+                    .protocol(default_protocol())
                     .port(9090)
                     .build(),
             )
@@ -268,6 +276,7 @@ mod integration_tests {
             .base_url(Some("https://immutable.mock".to_string()))
             .server_config(
                 VetisAdapterConfig::builder()
+                    .protocol(default_protocol())
                     .port(3000)
                     .build(),
             )
@@ -285,6 +294,7 @@ mod integration_tests {
             .base_url(Some("https://new.mock".to_string()))
             .server_config(
                 VetisAdapterConfig::builder()
+                    .protocol(default_protocol())
                     .port(3000)
                     .build(),
             )
@@ -303,11 +313,13 @@ mod integration_tests {
     fn test_config_with_different_server_configs() {
         let http_config = VetisAdapterConfig::builder()
             .interface("0.0.0.0")
+            .protocol(default_protocol())
             .port(80)
             .build();
 
         let https_config = VetisAdapterConfig::builder()
             .interface("0.0.0.0")
+            .protocol(default_protocol())
             .port(443)
             .build();
 

src/tests/config.rs

@@ -1,2 +1,19 @@
+use vetis::config::Protocol;
+
 mod config;
 mod server;
+
+pub(crate) const fn default_protocol() -> Protocol {
+    #[cfg(feature = "http1")]
+    {
+        Protocol::Http1
+    }
+    #[cfg(feature = "http2")]
+    {
+        Protocol::Http2
+    }
+    #[cfg(feature = "http3")]
+    {
+        Protocol::Http3
+    }
+}