Expose client internal connection object (#44)

Author: fafhrd91

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [1.6.1] - 2025-01-14
+
+* Expose client internal connection object
+
 ## [1.6.0] - 2025-01-13
 
 * Expose client internal information

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-h2"
-version = "1.6.0"
+version = "1.6.1"
 license = "MIT OR Apache-2.0"
 authors = ["Nikolay Kim <[email protected]>"]
 description = "An HTTP/2 client and server"
@@ -30,7 +30,6 @@ ntex-bytes = "0.1"
 ntex-codec = "0.6"
 ntex-service = "3.4"
 ntex-util = "2.8"
-ntex-rt = "0.4"
 
 bitflags = "2"
 fxhash = "0.2"

src/client/connector.rs

@@ -1,6 +1,6 @@
 use std::{marker::PhantomData, ops};
 
-use ntex_bytes::{ByteString, PoolId};
+use ntex_bytes::ByteString;
 use ntex_http::uri::Scheme;
 use ntex_io::IoBoxed;
 use ntex_net::connect::{self as connect, Address, Connect, Connector as DefaultConnector};
@@ -79,16 +79,6 @@ where
         self
     }
 
-    #[doc(hidden)]
-    #[deprecated]
-    /// Set memory pool.
-    ///
-    /// Use specified memory pool for memory allocations. By default P5
-    /// memory pool is used.
-    pub fn memory_pool(&mut self, _: PoolId) -> &mut Self {
-        self
-    }
-
     /// Use custom connector
     pub fn connector<U, F>(&self, connector: F) -> Connector<A, U>
     where
@@ -125,9 +115,9 @@ where
             ))
         };
 
-        match timeout_checked(self.config.0.handshake_timeout.get(), fut).await {
-            Ok(res) => res.map_err(From::from),
-            Err(_) => Err(ClientError::HandshakeTimeout),
-        }
+        timeout_checked(self.config.0.handshake_timeout.get(), fut)
+            .await
+            .map_err(|_| ClientError::HandshakeTimeout)
+            .and_then(|item| item)
     }
 }

src/client/pool.rs

@@ -236,7 +236,7 @@ impl Client {
     where
         F: FnOnce(&[SimpleClient]) -> R,
     {
-        f(&*self.inner.connections.borrow())
+        f(&self.inner.connections.borrow())
     }
 }
 

src/client/simple.rs

@@ -157,6 +157,12 @@ impl SimpleClient {
     pub fn io_ref(&self) -> &IoRef {
         self.0.con.io()
     }
+
+    #[doc(hidden)]
+    /// Get access to underlining http/2 connection object
+    pub fn connection(&self) -> &Connection {
+        &self.0.con
+    }
 }
 
 impl Drop for SimpleClient {

src/connection.rs

@@ -798,6 +798,8 @@ impl fmt::Debug for Connection {
             )
             .field("remote_window_sz", &self.0.remote_window_sz.get())
             .field("remote_frame_size", &self.0.remote_frame_size.get())
+            .field("flags", &self.0.flags.get())
+            .field("error", &self.check_error())
             .finish()
     }
 }

src/dispatcher.rs

@@ -136,7 +136,7 @@ where
         if let Err(e) = self.inner.publish.poll(cx) {
             let inner = self.inner.clone();
             let con = self.connection.connection();
-            ntex_rt::spawn(async move {
+            ntex_util::spawn(async move {
                 if inner.control.call_nowait(Control::error(e)).await.is_ok() {
                     con.close();
                 }

src/frame/headers.rs

@@ -309,7 +309,7 @@ impl PseudoHeaders {
 
 // ===== impl Iter =====
 
-impl<'a> Iterator for Iter<'a> {
+impl Iterator for Iter<'_> {
     type Item = hpack::Header<Option<HeaderName>>;
 
     fn next(&mut self) -> Option<Self::Item> {

src/hpack/header.rs

@@ -221,7 +221,7 @@ impl From<Header> for Header<Option<HeaderName>> {
     }
 }
 
-impl<'a> Name<'a> {
+impl Name<'_> {
     pub fn into_entry(self, value: Bytes) -> Result<Header, DecoderError> {
         match self {
             Name::Field(name) => Ok(Header::Field {

src/hpack/huffman/table.rs

@@ -262,7 +262,7 @@ pub const ENCODE_TABLE: [(usize, u64); 257] = [
 ];
 
 // (next-state, byte, flags)
-pub const DECODE_TABLE: [[(usize, u8, u8); 16]; 256] = [
+pub static DECODE_TABLE: [[(usize, u8, u8); 16]; 256] = [
     // 0
     [
         (4, 0, 0x00),