Upgrade to ntex-service v4 (#698)

Author: fafhrd91

Cargo.toml

@@ -45,6 +45,8 @@ ntex-util = { path = "ntex-util" }
 ntex-compio = { path = "ntex-compio" }
 ntex-tokio = { path = "ntex-tokio" }
 
+ntex-h2 = { git = "https://github.com/ntex-rs/ntex-h2.git" }
+
 [workspace.dependencies]
 async-channel = "2"
 async-task = "4.5.0"

ntex-compio/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [3.4.0] - 2025-12-17
+
+* Upgrade to ntex-service v4
+
 ## [3.3.0] - 2025-12-16
 
 * Stop io context after disconnect

ntex-compio/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-compio"
-version = "3.3.0"
+version = "3.4.0"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "compio runtime intergration for ntex framework"
 keywords = ["network", "framework", "async", "futures"]
@@ -27,7 +27,7 @@ ntex-bytes = "1"
 ntex-io = "3"
 ntex-util = "3"
 ntex-rt = "3.3"
-ntex-service = "3.8"
+ntex-service = "4"
 log = { workspace = true }
 
 compio-buf = "0.7"

ntex-io/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [3.3.0] - 2025-12-17
+
+* Upgrade to ntex-service v4
+
 ## [3.2.0] - 2025-12-16
 
 * Shutdown service if readiness fails

ntex-io/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-io"
-version = "3.2.0"
+version = "3.3.0"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Utilities for abstracting io streams"
 keywords = ["network", "framework", "async", "futures"]
@@ -19,13 +19,13 @@ path = "src/lib.rs"
 [dependencies]
 ntex-codec = "1"
 ntex-bytes = "1"
-ntex-util = "3.3"
-ntex-service = "3.7.3"
+ntex-util = "3"
+ntex-service = "4"
 
 bitflags = { workspace = true }
 log = { workspace = true }
 pin-project-lite = { workspace = true }
 
 [dev-dependencies]
-ntex = "3.0.0-pre.7"
+ntex = "3.0.0-pre.8"
 rand = { workspace = true }

ntex-net/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [3.4.0] - 2025-12-17
+
+* Upgrade to ntex-service v4
+
 ## [3.3.1] - 2025-12-16
 
 * Refactor neon and neon-uring drivers

ntex-net/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-net"
-version = "3.3.1"
+version = "3.4.0"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "ntexwork utils for ntex framework"
 keywords = ["network", "framework", "async", "futures"]
@@ -32,15 +32,15 @@ io-uring = ["ntex-neon/io-uring", "socket2"]
 io-uring-compat = []
 
 [dependencies]
-ntex-service = "3.8"
+ntex-service = "4"
 ntex-bytes = "1"
 ntex-http = "1"
 ntex-io = "3"
 ntex-rt = "3.3"
 ntex-util = "3"
 
-ntex-tokio = { version = "3.0.0", optional = true }
-ntex-compio = { version = "3.3.0", optional = true }
+ntex-tokio = { version = "3.1.0", optional = true }
+ntex-compio = { version = "3.4.0", optional = true }
 ntex-neon = { version = "0.2.2", optional = true }
 
 bitflags = { workspace = true }
@@ -52,5 +52,5 @@ socket2 = { workspace = true, optional = true, features = ["all"] }
 thiserror = { workspace = true }
 
 [dev-dependencies]
-ntex = "3.0.0-pre.7"
+ntex = "3.0.0-pre.8"
 oneshot = "0.1"

ntex-net/src/rt_uring/driver.rs

@@ -92,8 +92,6 @@ struct StreamOpsInner {
 struct StreamOpsStorage {
     ops: Slab<Option<Operation>>,
     streams: Slab<StreamItem>,
-    lw: usize,
-    hw: usize,
 }
 
 impl StreamOps {
@@ -125,8 +123,6 @@ impl StreamOps {
                     storage: Cell::new(Some(Box::new(StreamOpsStorage {
                         ops,
                         streams: Slab::new(),
-                        lw: 1024,
-                        hw: 1024 * 16,
                     }))),
                 });
                 inner = Some(ops.clone());
@@ -145,10 +141,10 @@ impl StreamOps {
     ) -> (StreamCtl, WeakStreamCtl) {
         let item = StreamItem {
             io,
+            ctx,
             rd_op: None,
             wr_op: None,
             flags: if zc { self.0.default_flags } else { Flags::NO_ZC },
-            ctx: ctx.clone(),
         };
 
         let id = self.0.with(move |st| {
@@ -232,6 +228,7 @@ impl Handler for StreamOpsHandler {
                         } else {
                             let mut total = 0;
                             let res = Poll::Ready(res.map(|size| {
+                                // SAFETY: kernel tells us how many bytes it read
                                 unsafe { buf.advance_mut(size) };
                                 total = size;
                             }).map_err(Some));
@@ -355,9 +352,8 @@ impl StreamOpsStorage {
 
     fn recv_more(&mut self, id: usize, mut buf: BytesVec, api: &DriverApi) {
         if let Some(item) = self.streams.get_mut(id) {
-            if buf.remaining_mut() < self.lw {
-                buf.reserve(self.hw);
-            }
+            item.ctx.resize_read_buf(&mut buf);
+
             let slice = buf.chunk_mut();
             let buf_ptr = slice.as_mut_ptr();
             let buf_len = slice.len() as u32;
@@ -528,7 +524,6 @@ impl StreamCtl {
 
 impl Drop for StreamCtl {
     fn drop(&mut self) {
-        println!("DROP CTL {:?}", self.id);
         self.inner.drop_stream(self.id);
     }
 }

ntex-server/CHANGES.md

@@ -1,5 +1,11 @@
 # Changes
 
+## [3.4.0] - 2025-12-17
+
+* Upgrade to ntex-service v4
+
+* Improve test servers shutdown process
+
 ## [3.3.0] - 2025-12-05
 
 * Use AsyncFn for on-accept callback

ntex-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-server"
-version = "3.3.0"
+version = "3.4.0"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Server for ntex framework"
 keywords = ["network", "framework", "async", "futures"]
@@ -19,7 +19,7 @@ path = "src/lib.rs"
 [dependencies]
 ntex-io = "3"
 ntex-net = "3.2"
-ntex-service = "3.7"
+ntex-service = "4"
 ntex-rt = "3"
 ntex-util = "3"