Generate unique id for simple client (#58)

Author: fafhrd91

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [1.10.0] - 2025-06-29
+
+* Generate unique id for simple client
+
 ## [1.9.0] - 2025-06-13
 
 * Update nanorand 0.8

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-h2"
-version = "1.9.0"
+version = "1.10.0"
 license = "MIT OR Apache-2.0"
 authors = ["Nikolay Kim <[email protected]>"]
 description = "An HTTP/2 client and server"
@@ -36,7 +36,7 @@ fxhash = "0.2"
 log = "0.4"
 pin-project-lite = "0.2"
 thiserror = "2"
-nanorand = { version = "0.8", default-features = false, features = ["std", "wyrand", "entropy"] }
+nanorand = { version = "0.8", default-features = false, features = ["std", "wyrand", "entropy", "tls"] }
 
 [dev-dependencies]
 # Fuzzing

src/client/mod.rs

@@ -43,7 +43,7 @@ impl From<ConnectionError> for ClientError {
 
 impl From<ntex_util::channel::Canceled> for ClientError {
     fn from(err: ntex_util::channel::Canceled) -> Self {
-        Self::Disconnected(std::io::Error::new(std::io::ErrorKind::Other, err))
+        Self::Disconnected(std::io::Error::other(err))
     }
 }
 

src/client/simple.rs

@@ -1,5 +1,6 @@
 use std::{fmt, future::Future, pin::Pin, rc::Rc, task::Context, task::Poll};
 
+use nanorand::Rng;
 use ntex_bytes::ByteString;
 use ntex_http::{uri::Scheme, HeaderMap, Method};
 use ntex_io::{Dispatcher as IoDispatcher, IoBoxed, IoRef, OnDisconnect};
@@ -18,6 +19,7 @@ pub struct SimpleClient(Rc<ClientRef>);
 
 /// Http2 client
 struct ClientRef {
+    id: ByteString,
     con: Connection,
     authority: ByteString,
     storage: InflightStorage,
@@ -69,9 +71,16 @@ impl SimpleClient {
             con,
             authority,
             storage,
+            id: gen_id(),
         }))
     }
 
+    #[inline]
+    /// Get client id
+    pub fn id(&self) -> &ByteString {
+        &self.0.id
+    }
+
     #[inline]
     /// Get io tag
     pub fn tag(&self) -> &'static str {
@@ -256,3 +265,15 @@ impl Future for ClientDisconnect {
         Poll::Pending
     }
 }
+
+fn gen_id() -> ByteString {
+    const BASE: &str = "abcdefghijklmnopqrstuvwxyz234567";
+
+    let mut rng = nanorand::tls_rng();
+    let mut id = String::with_capacity(16);
+    for _ in 0..16 {
+        let idx = rng.generate_range::<usize, _>(..BASE.len());
+        id.push_str(&BASE[idx..idx + 1]);
+    }
+    ByteString::from(id)
+}

src/hpack/table.rs

@@ -303,13 +303,10 @@ impl Table {
 
         let pos_idx = 0usize.wrapping_sub(self.inserted);
 
-        let prev = mem::replace(
-            &mut self.indices[probe],
-            Some(Pos {
-                index: pos_idx,
-                hash,
-            }),
-        );
+        let prev = self.indices[probe].replace(Pos {
+            index: pos_idx,
+            hash,
+        });
 
         if let Some(mut prev) = prev {
             // Shift forward