Naming for ServiceConfig and ClientBuilder (#72)

Author: fafhrd91

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changes
 
+## [3.1.0] - 2025-12-04
+
+* Refactor stream ID validation and error handling #71
+
+* Naming for ServiceConfig and ClientBuilder
+
 ## [3.0.0-pre.1] - 2025-11-30
 
 * Set default max concurrent streams

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-h2"
-version = "3.0.0"
+version = "3.1.0"
 license = "MIT OR Apache-2.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "An HTTP/2 client and server"
@@ -28,7 +28,7 @@ ntex-io = "3"
 ntex-http = "1"
 ntex-bytes = "1"
 ntex-codec = "1"
-ntex-service = "3.6.2"
+ntex-service = "3.7"
 ntex-util = "3"
 
 ahash = "0.8.12"
@@ -49,7 +49,7 @@ walkdir = "2.3.2"
 serde = "1"
 serde_json = "1"
 
-ntex = { version = "3.0.0-pre.2", features = ["openssl"] }
+ntex = { version = "3.0.0-pre.3", features = ["openssl"] }
 ntex-tls = { version = "3", features = ["openssl"] }
 openssl = "0.10"
 

src/client/pool.rs

@@ -44,7 +44,7 @@ fn notify(waiters: &mut VecDeque<pool::Sender<()>>) {
 impl Client {
     #[inline]
     /// Configure and build client
-    pub fn build<A, U, T, F>(addr: U, connector: F) -> ClientBuilder<A, T>
+    pub fn builder<A, U, T, F>(addr: U, connector: F) -> ClientBuilder<A, T>
     where
         A: Address + Clone,
         F: IntoServiceFactory<T, Connect<A>, SharedCfg>,
@@ -55,16 +55,6 @@ impl Client {
         ClientBuilder::new(addr, connector)
     }
 
-    #[inline]
-    /// Configure and build client
-    pub fn with_default<A, U>(addr: U) -> ClientBuilder<A, DefaultConnector<A>>
-    where
-        A: Address + Clone,
-        Connect<A>: From<U>,
-    {
-        ClientBuilder::with_default(addr)
-    }
-
     /// Send request to the peer
     pub async fn send(
         &self,
@@ -437,7 +427,7 @@ where
     IoBoxed: From<T::Response>,
 {
     /// Finish configuration process and create connections pool.
-    pub async fn finish(self, cfg: SharedCfg) -> Result<Client, T::InitError> {
+    pub async fn build(self, cfg: SharedCfg) -> Result<Client, T::InitError> {
         let connect = self.connect;
         let svc = Pipeline::new(self.connector.create(cfg).await?);
 

src/config.rs

@@ -90,7 +90,7 @@ impl ServiceConfig {
     /// details, see [`FlowControl`].
     ///
     /// The default value is 65,535.
-    pub fn initial_window_size(mut self, size: u32) -> Self {
+    pub fn set_initial_window_size(mut self, size: u32) -> Self {
         self.window_sz = size;
         self.window_sz_threshold = ((size as f32) / 3.0) as u32;
         self.settings.set_initial_window_size(Some(size));
@@ -106,7 +106,7 @@ impl ServiceConfig {
     /// The default value is 1Mb.
     ///
     /// [`FlowControl`]: ../struct.FlowControl.html
-    pub fn initial_connection_window_size(mut self, size: u32) -> Self {
+    pub fn set_initial_connection_window_size(mut self, size: u32) -> Self {
         assert!(size <= consts::MAX_WINDOW_SIZE);
         self.connection_window_sz = size;
         self.connection_window_sz_threshold = ((size as f32) / 4.0) as u32;
@@ -126,7 +126,7 @@ impl ServiceConfig {
     ///
     /// This function panics if `max` is not within the legal range specified
     /// above.
-    pub fn max_frame_size(mut self, max: u32) -> Self {
+    pub fn set_max_frame_size(mut self, max: u32) -> Self {
         self.settings.set_max_frame_size(max);
         self
     }
@@ -142,15 +142,15 @@ impl ServiceConfig {
     /// buffered to decode HEADERS frames.
     ///
     /// By default value is set to 48Kb.
-    pub fn max_header_list_size(mut self, max: u32) -> Self {
+    pub fn set_max_header_list_size(mut self, max: u32) -> Self {
         self.settings.set_max_header_list_size(Some(max));
         self
     }
 
     /// Sets the max number of continuation frames for HEADERS
     ///
     /// By default value is set to 5
-    pub fn max_header_continuation_frames(mut self, max: usize) -> Self {
+    pub fn set_max_header_continuation_frames(mut self, max: usize) -> Self {
         self.max_header_continuations = max;
         self
     }
@@ -178,7 +178,7 @@ impl ServiceConfig {
     /// See [Section 5.1.2] in the HTTP/2 spec for more details.
     ///
     /// [Section 5.1.2]: https://http2.github.io/http2-spec/#rfc.section.5.1.2
-    pub fn max_concurrent_streams(mut self, max: u32) -> Self {
+    pub fn set_max_concurrent_streams(mut self, max: u32) -> Self {
         self.remote_max_concurrent_streams = Some(max);
         self.settings.set_max_concurrent_streams(Some(max));
         self
@@ -205,7 +205,7 @@ impl ServiceConfig {
     /// error, forcing the connection to terminate.
     ///
     /// The default value is 32.
-    pub fn max_concurrent_reset_streams(mut self, val: usize) -> Self {
+    pub fn set_max_concurrent_reset_streams(mut self, val: usize) -> Self {
         self.reset_max = val;
         self
     }
@@ -231,7 +231,7 @@ impl ServiceConfig {
     /// error, forcing the connection to terminate.
     ///
     /// The default value is 30 seconds.
-    pub fn reset_stream_duration(mut self, dur: Seconds) -> Self {
+    pub fn set_reset_stream_duration(mut self, dur: Seconds) -> Self {
         self.reset_duration = dur.into();
         self
     }
@@ -251,15 +251,15 @@ impl ServiceConfig {
     /// Hadnshake includes receiving preface and completing connection preparation.
     ///
     /// By default handshake timeuot is 5 seconds.
-    pub fn handshake_timeout(mut self, timeout: Seconds) -> Self {
+    pub fn set_handshake_timeout(mut self, timeout: Seconds) -> Self {
         self.handshake_timeout = timeout;
         self
     }
 
     /// Set ping timeout.
     ///
     /// By default ping time-out is set to 60 seconds.
-    pub fn ping_timeout(mut self, timeout: Seconds) -> Self {
+    pub fn set_ping_timeout(mut self, timeout: Seconds) -> Self {
         self.ping_timeout = timeout;
         self
     }