Expose client internal information (#43)

Author: fafhrd91

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [1.6.0] - 2025-01-13
+
+* Expose client internal information
+
 ## [1.5.0] - 2024-12-04
 
 * Use updated Service trait

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-h2"
-version = "1.5.0"
+version = "1.6.0"
 license = "MIT OR Apache-2.0"
 authors = ["Nikolay Kim <[email protected]>"]
 description = "An HTTP/2 client and server"

src/client/pool.rs

@@ -1,7 +1,7 @@
 use std::{cell::Cell, cell::RefCell, collections::VecDeque, fmt, rc::Rc, time::Duration};
 
 use nanorand::{Rng, WyRand};
-use ntex_bytes::{ByteString, PoolId, PoolRef};
+use ntex_bytes::ByteString;
 use ntex_http::{uri::Scheme, HeaderMap, Method};
 use ntex_io::IoBoxed;
 use ntex_net::connect::{self as connect, Address, Connect, Connector as DefaultConnector};
@@ -136,7 +136,6 @@ impl Client {
                                 notify(&mut waiters2.borrow_mut());
                             });
                             // construct client
-                            io.set_memory_pool(inner.pool);
                             let client = SimpleClient::with_params(
                                 io,
                                 inner.config.clone(),
@@ -145,6 +144,9 @@ impl Client {
                                 storage,
                             );
                             inner.connections.borrow_mut().push(client.clone());
+                            inner
+                                .total_connections
+                                .set(inner.total_connections.get() + 1);
                             Ok(client)
                         }
                         Ok(Err(err)) => Err(ClientError::from(err)),
@@ -154,6 +156,10 @@ impl Client {
                     for waiter in waiters.borrow_mut().drain(..) {
                         let _ = waiter.send(());
                     }
+
+                    if res.is_err() {
+                        inner.connect_errors.set(inner.connect_errors.get() + 1);
+                    }
                     let _ = tx.send(res);
                 });
                 return rx
@@ -212,6 +218,28 @@ impl Client {
     }
 }
 
+#[doc(hidden)]
+impl Client {
+    pub fn stat_active_connections(&self) -> usize {
+        self.inner.connections.borrow().len()
+    }
+
+    pub fn stat_total_connections(&self) -> usize {
+        self.inner.total_connections.get()
+    }
+
+    pub fn stat_connect_errors(&self) -> usize {
+        self.inner.connect_errors.get()
+    }
+
+    pub fn stat_connections<F, R>(&self, f: F) -> R
+    where
+        F: FnOnce(&[SimpleClient]) -> R,
+    {
+        f(&*self.inner.connections.borrow())
+    }
+}
+
 /// Manages http client network connectivity.
 ///
 /// The `ClientBuilder` type uses a builder-like combinator pattern for service
@@ -229,9 +257,10 @@ struct Inner {
     config: crate::Config,
     authority: ByteString,
     connector: Connector,
-    pool: PoolRef,
     connecting: Cell<bool>,
     connections: RefCell<Vec<SimpleClient>>,
+    total_connections: Cell<usize>,
+    connect_errors: Cell<usize>,
 }
 
 impl ClientBuilder {
@@ -268,7 +297,8 @@ impl ClientBuilder {
             config: crate::Config::client(),
             connecting: Cell::new(false),
             connections: Default::default(),
-            pool: PoolId::P5.pool_ref(),
+            total_connections: Cell::new(0),
+            connect_errors: Cell::new(0),
         })
     }
 
@@ -289,15 +319,6 @@ impl ClientBuilder {
         self
     }
 
-    /// Set memory pool.
-    ///
-    /// Use specified memory pool for memory allocations. By default P5
-    /// memory pool is used.
-    pub fn memory_pool(mut self, id: PoolId) -> Self {
-        self.0.pool = id.pool_ref();
-        self
-    }
-
     /// Connection timeout.
     ///
     /// i.e. max time to connect to remote host including dns name resolution.
@@ -416,7 +437,6 @@ impl fmt::Debug for Client {
             .field("minconn", &self.inner.minconn)
             .field("maxconn", &self.inner.maxconn)
             .field("max-streams", &self.inner.max_streams)
-            .field("pool", &self.inner.pool)
             .field("config", &self.inner.config)
             .finish()
     }
@@ -433,7 +453,6 @@ impl fmt::Debug for ClientBuilder {
             .field("minconn", &self.0.minconn)
             .field("maxconn", &self.0.maxconn)
             .field("max-streams", &self.0.max_streams)
-            .field("pool", &self.0.pool)
             .field("config", &self.0.config)
             .finish()
     }

src/client/simple.rs

@@ -2,7 +2,7 @@ use std::{fmt, rc::Rc};
 
 use ntex_bytes::ByteString;
 use ntex_http::{uri::Scheme, HeaderMap, Method};
-use ntex_io::{Dispatcher as IoDispatcher, IoBoxed, OnDisconnect};
+use ntex_io::{Dispatcher as IoDispatcher, IoBoxed, IoRef, OnDisconnect};
 
 use crate::connection::Connection;
 use crate::default::DefaultControlService;
@@ -151,6 +151,12 @@ impl SimpleClient {
     pub fn active_streams(&self) -> u32 {
         self.0.con.active_streams()
     }
+
+    #[doc(hidden)]
+    /// Get access to underlining io object
+    pub fn io_ref(&self) -> &IoRef {
+        self.0.con.io()
+    }
 }
 
 impl Drop for SimpleClient {