Move ntex::server to ntex-server (#313)

Cargo.toml

@@ -9,6 +9,7 @@ members = [
   "ntex-http",
   "ntex-router",
   "ntex-rt",
+  "ntex-net",
   "ntex-server",
   "ntex-service",
   "ntex-tls",
@@ -25,6 +26,7 @@ ntex-bytes = { path = "ntex-bytes" }
 ntex-codec = { path = "ntex-codec" }
 ntex-connect = { path = "ntex-connect" }
 ntex-io = { path = "ntex-io" }
+ntex-net = { path = "ntex-net" }
 ntex-http = { path = "ntex-http" }
 ntex-router = { path = "ntex-router" }
 ntex-rt = { path = "ntex-rt" }

ntex-async-std/Cargo.toml

@@ -20,6 +20,5 @@ ntex-bytes = "0.1.21"
 ntex-io = "1.0.0"
 ntex-util = "1.0.0"
 log = "0.4"
-pin-project-lite = "0.2"
 async-std = { version = "1", features = ["unstable"] }
 oneshot = { version = "0.1", default-features = false, features = ["async"] }

ntex-connect/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-connect"
-version = "1.0.0"
+version = "1.1.0"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "ntexwork connect utils for ntex framework"
 keywords = ["network", "framework", "async", "futures"]
@@ -25,13 +25,13 @@ openssl = ["tls-openssl", "ntex-tls/openssl"]
 rustls = ["tls-rustls", "webpki-roots", "ntex-tls/rustls"]
 
 # tokio runtime
-tokio = ["ntex-rt/tokio", "ntex-tokio"]
+tokio = ["ntex-net/tokio"]
 
 # glommio runtime
-glommio = ["ntex-rt/glommio", "ntex-glommio"]
+glommio = ["ntex-net/glommio"]
 
 # async-std runtime
-async-std = ["ntex-rt/async-std", "ntex-async-std"]
+async-std = ["ntex-net/async-std"]
 
 [dependencies]
 ntex-service = "2.0.0"
@@ -41,14 +41,11 @@ ntex-util = "1.0.0"
 ntex-bytes = "0.1.21"
 ntex-http = "0.1"
 ntex-rt = "0.4.7"
+ntex-net = "1.0.0"
 
 log = "0.4"
 thiserror = "1.0"
 
-ntex-tokio = { version = "0.4.0", optional = true }
-ntex-glommio = { version = "0.4.0", optional = true }
-ntex-async-std = { version = "0.4.0", optional = true }
-
 # openssl
 tls-openssl = { version="0.10", package = "openssl", optional = true }
 

ntex-connect/src/lib.rs

@@ -32,112 +32,5 @@ where
 #[allow(unused_imports)]
 #[doc(hidden)]
 pub mod net {
-    use super::*;
+    pub use ntex_net::*;
-
-    #[cfg(feature = "tokio")]
-    pub use ntex_tokio::*;
-
-    #[cfg(all(
-        feature = "async-std",
-        not(feature = "tokio"),
-        not(feature = "glommio")
-    ))]
-    pub use ntex_async_std::*;
-
-    #[cfg(all(
-        feature = "glommio",
-        not(feature = "tokio"),
-        not(feature = "async-std")
-    ))]
-    pub use ntex_glommio::*;
-
-    #[cfg(all(
-        not(feature = "tokio"),
-        not(feature = "async-std"),
-        not(feature = "glommio")
-    ))]
-    /// Opens a TCP connection to a remote host.
-    pub async fn tcp_connect(_: std::net::SocketAddr) -> std::io::Result<Io> {
-        Err(std::io::Error::new(
-            std::io::ErrorKind::Other,
-            "runtime is not configure",
-        ))
-    }
-
-    #[cfg(all(
-        not(feature = "tokio"),
-        not(feature = "async-std"),
-        not(feature = "glommio")
-    ))]
-    /// Opens a TCP connection to a remote host and use specified memory pool.
-    pub async fn tcp_connect_in(
-        _: std::net::SocketAddr,
-        _: ntex_bytes::PoolRef,
-    ) -> std::io::Result<Io> {
-        Err(std::io::Error::new(
-            std::io::ErrorKind::Other,
-            "runtime is not configure",
-        ))
-    }
-
-    #[cfg(unix)]
-    #[cfg(all(
-        not(feature = "tokio"),
-        not(feature = "async-std"),
-        not(feature = "glommio")
-    ))]
-    /// Opens a unix stream connection.
-    pub async fn unix_connect<'a, P>(_: P) -> std::io::Result<Io>
-    where
-        P: AsRef<std::path::Path> + 'a,
-    {
-        Err(std::io::Error::new(
-            std::io::ErrorKind::Other,
-            "runtime is not configure",
-        ))
-    }
-
-    #[cfg(unix)]
-    #[cfg(all(
-        not(feature = "tokio"),
-        not(feature = "async-std"),
-        not(feature = "glommio")
-    ))]
-    /// Opens a unix stream connection and specified memory pool.
-    pub async fn unix_connect_in<'a, P>(_: P, _: ntex_bytes::PoolRef) -> std::io::Result<Io>
-    where
-        P: AsRef<std::path::Path> + 'a,
-    {
-        Err(std::io::Error::new(
-            std::io::ErrorKind::Other,
-            "runtime is not configure",
-        ))
-    }
-
-    #[cfg(all(
-        not(feature = "tokio"),
-        not(feature = "async-std"),
-        not(feature = "glommio")
-    ))]
-    /// Convert std TcpStream to tokio's TcpStream
-    pub fn from_tcp_stream(_: std::net::TcpStream) -> std::io::Result<Io> {
-        Err(std::io::Error::new(
-            std::io::ErrorKind::Other,
-            "runtime is not configure",
-        ))
-    }
-
-    #[cfg(unix)]
-    #[cfg(all(
-        not(feature = "tokio"),
-        not(feature = "async-std"),
-        not(feature = "glommio")
-    ))]
-    /// Convert std UnixStream to tokio's UnixStream
-    pub fn from_unix_stream(_: std::os::unix::net::UnixStream) -> std::io::Result<Io> {
-        Err(std::io::Error::new(
-            std::io::ErrorKind::Other,
-            "runtime is not configure",
-        ))
-    }
 }

ntex-net/CHANGES.md

@@ -0,0 +1,5 @@
+# Changes
+
+## [1.0.0] - 2024-03-23
+
+* Move to separate crate

ntex-net/Cargo.toml

@@ -0,0 +1,37 @@
+[package]
+name = "ntex-net"
+version = "1.0.0"
+authors = ["ntex contributors <team@ntex.rs>"]
+description = "ntexwork utils for ntex framework"
+keywords = ["network", "framework", "async", "futures"]
+homepage = "https://ntex.rs"
+repository = "https://github.com/ntex-rs/ntex.git"
+documentation = "https://docs.rs/ntex-connect/"
+categories = ["network-programming", "asynchronous"]
+license = "MIT OR Apache-2.0"
+edition = "2021"
+
+[lib]
+name = "ntex_net"
+path = "src/lib.rs"
+
+[features]
+default = []
+
+# tokio runtime
+tokio = ["ntex-rt/tokio", "ntex-tokio"]
+
+# glommio runtime
+glommio = ["ntex-rt/glommio", "ntex-glommio"]
+
+# async-std runtime
+async-std = ["ntex-rt/async-std", "ntex-async-std"]
+
+[dependencies]
+ntex-bytes = "0.1.24"
+ntex-io = "1.0.0"
+ntex-rt = "0.4.7"
+
+ntex-tokio = { version = "0.4.0", optional = true }
+ntex-glommio = { version = "0.4.0", optional = true }
+ntex-async-std = { version = "0.4.0", optional = true }

ntex-net/LICENSE-APACHE

@@ -0,0 +1 @@
+../LICENSE-APACHE

ntex-net/LICENSE-MIT

@@ -0,0 +1 @@
+../LICENSE-MIT

ntex-net/src/lib.rs

@@ -0,0 +1,117 @@
+//! Utility for async runtime abstraction
+#![deny(rust_2018_idioms, unreachable_pub, missing_debug_implementations)]
+
+pub use ntex_io::Io;
+pub use ntex_rt::spawn;
+
+#[cfg(feature = "tokio")]
+pub use ntex_tokio::{from_tcp_stream, tcp_connect, tcp_connect_in};
+
+#[cfg(all(unix, feature = "tokio"))]
+pub use ntex_tokio::{from_unix_stream, unix_connect, unix_connect_in};
+
+#[cfg(all(
+    feature = "async-std",
+    not(feature = "tokio"),
+    not(feature = "glommio")
+))]
+pub use ntex_async_std::{from_tcp_stream, tcp_connect, tcp_connect_in};
+
+#[cfg(all(
+    unix,
+    feature = "async-std",
+    not(feature = "tokio"),
+    not(feature = "glommio")
+))]
+pub use ntex_async_std::{from_unix_stream, unix_connect, unix_connect_in};
+
+#[cfg(all(
+    feature = "glommio",
+    not(feature = "tokio"),
+    not(feature = "async-std")
+))]
+pub use ntex_glommio::{from_tcp_stream, tcp_connect, tcp_connect_in};
+
+#[cfg(all(
+    unix,
+    feature = "glommio",
+    not(feature = "tokio"),
+    not(feature = "async-std")
+))]
+pub use ntex_async_std::{from_unix_stream, unix_connect, unix_connect_in};
+
+#[cfg(all(
+    not(feature = "tokio"),
+    not(feature = "async-std"),
+    not(feature = "glommio")
+))]
+mod no_rt {
+    use ntex_io::Io;
+
+    /// Opens a TCP connection to a remote host.
+    pub async fn tcp_connect(_: std::net::SocketAddr) -> std::io::Result<Io> {
+        Err(std::io::Error::new(
+            std::io::ErrorKind::Other,
+            "runtime is not configure",
+        ))
+    }
+
+    /// Opens a TCP connection to a remote host and use specified memory pool.
+    pub async fn tcp_connect_in(
+        _: std::net::SocketAddr,
+        _: ntex_bytes::PoolRef,
+    ) -> std::io::Result<Io> {
+        Err(std::io::Error::new(
+            std::io::ErrorKind::Other,
+            "runtime is not configure",
+        ))
+    }
+
+    #[cfg(unix)]
+    /// Opens a unix stream connection.
+    pub async fn unix_connect<'a, P>(_: P) -> std::io::Result<Io>
+    where
+        P: AsRef<std::path::Path> + 'a,
+    {
+        Err(std::io::Error::new(
+            std::io::ErrorKind::Other,
+            "runtime is not configure",
+        ))
+    }
+
+    #[cfg(unix)]
+    /// Opens a unix stream connection and specified memory pool.
+    pub async fn unix_connect_in<'a, P>(_: P, _: ntex_bytes::PoolRef) -> std::io::Result<Io>
+    where
+        P: AsRef<std::path::Path> + 'a,
+    {
+        Err(std::io::Error::new(
+            std::io::ErrorKind::Other,
+            "runtime is not configure",
+        ))
+    }
+
+    /// Convert std TcpStream to tokio's TcpStream
+    pub fn from_tcp_stream(_: std::net::TcpStream) -> std::io::Result<Io> {
+        Err(std::io::Error::new(
+            std::io::ErrorKind::Other,
+            "runtime is not configure",
+        ))
+    }
+
+    #[cfg(unix)]
+    /// Convert std UnixStream to tokio's UnixStream
+    pub fn from_unix_stream(_: std::os::unix::net::UnixStream) -> std::io::Result<Io> {
+        Err(std::io::Error::new(
+            std::io::ErrorKind::Other,
+            "runtime is not configure",
+        ))
+    }
+}
+
+#[cfg(all(
+    not(feature = "tokio"),
+    not(feature = "async-std"),
+    not(feature = "glommio")
+))]
+pub use no_rt::*;

ntex-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-server"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Server for ntex framework"
 keywords = ["network", "framework", "async", "futures"]
@@ -16,14 +16,17 @@ name = "ntex_server"
 path = "src/lib.rs"
 
 [dependencies]
-ntex-bytes = "0.1"
+ntex-bytes = "0.1.24"
+ntex-net = "1.0"
 ntex-service = "2.0"
 ntex-rt = "0.4"
 ntex-util = "1.0"
 
 async-channel = "2.2"
 async-broadcast = "0.7"
+polling = "3.3"
 log = "0.4"
+socket2 = "0.5"
 oneshot = { version = "0.1", default-features = false, features = ["async"] }
 
 [dev-dependencies]

ntex-server/src/lib.rs

@@ -1,10 +1,11 @@
-#![deny(rust_2018_idioms, unreachable_pub, missing_debug_implementations)]
+#![deny(rust_2018_idioms, unreachable_pub)]
 #![allow(clippy::let_underscore_future)]
 
 use ntex_service::ServiceFactory;
 use ntex_util::time::Millis;
 
 mod manager;
+pub mod net;
 mod pool;
 mod server;
 mod signals;

ntex-server/src/net/accept.rs

@@ -2,10 +2,10 @@ use std::time::{Duration, Instant};
 use std::{cell::Cell, fmt, io, sync::mpsc, sync::Arc, thread};
 use std::{collections::VecDeque, num::NonZeroUsize};
 
+use ntex_rt::System;
+use ntex_util::{future::Either, time::sleep, time::Millis};
 use polling::{Event, Events, Poller};
 
-use crate::{rt::System, time::sleep, time::Millis, util::Either};
-
 use super::socket::{Connection, Listener, SocketAddr};
 use super::{Server, ServerStatus, Token};
 
@@ -52,6 +52,12 @@ pub struct AcceptLoop {
     status_handler: Option<Box<dyn FnMut(ServerStatus) + Send>>,
 }
 
+impl Default for AcceptLoop {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl AcceptLoop {
     /// Create accept loop
     pub fn new() -> AcceptLoop {

ntex-server/src/net/builder.rs

@@ -1,10 +1,12 @@
 use std::{fmt, future::Future, io, net};
 
-use ntex_server::{Server, WorkerPool};
 use socket2::{Domain, SockAddr, Socket, Type};
 
-use crate::service::ServiceFactory;
+use ntex_net::Io;
-use crate::{io::Io, time::Millis};
+use ntex_service::ServiceFactory;
+use ntex_util::time::Millis;
+
+use crate::{Server, WorkerPool};
 
 use super::accept::AcceptLoop;
 use super::config::{Config, ServiceConfig};
@@ -36,7 +38,7 @@ impl ServerBuilder {
             services: Vec::new(),
             sockets: Vec::new(),
             on_worker_start: Vec::new(),
-            accept: AcceptLoop::new(),
+            accept: AcceptLoop::default(),
             backlog: 2048,
             pool: WorkerPool::new(),
         }
@@ -321,7 +323,7 @@ impl ServerBuilder {
     }
 }
 
-pub(super) fn bind_addr<S: net::ToSocketAddrs>(
+pub fn bind_addr<S: net::ToSocketAddrs>(
     addr: S,
     backlog: i32,
 ) -> io::Result<Vec<net::TcpListener>> {
@@ -352,7 +354,7 @@ pub(super) fn bind_addr<S: net::ToSocketAddrs>(
     }
 }
 
-pub(crate) fn create_tcp_listener(
+pub fn create_tcp_listener(
     addr: net::SocketAddr,
     backlog: i32,
 ) -> io::Result<net::TcpListener> {

ntex-server/src/net/config.rs

@@ -1,8 +1,9 @@
 use std::{cell::Cell, cell::RefCell, fmt, future::Future, io, marker, mem, net, rc::Rc};
 
-use crate::io::Io;
+use ntex_bytes::PoolId;
-use crate::service::{IntoServiceFactory, ServiceFactory};
+use ntex_net::Io;
-use crate::util::{BoxFuture, HashMap, PoolId, Ready};
+use ntex_service::{IntoServiceFactory, ServiceFactory};
+use ntex_util::{future::BoxFuture, future::Ready, HashMap};
 
 use super::factory::{
     self, BoxServerService, FactoryService, FactoryServiceType, NetService,

ntex-server/src/net/counter.rs

@@ -1,6 +1,6 @@
 use std::{cell::Cell, rc::Rc, task};
 
-use crate::task::LocalWaker;
+use ntex_util::task::LocalWaker;
 
 /// Simple counter with ability to notify task on reaching specific number
 ///

ntex-server/src/net/factory.rs

@@ -1,9 +1,10 @@
 use std::task::{Context, Poll};
 use std::{fmt, future::Future, marker::PhantomData};
 
-use crate::io::Io;
+use ntex_bytes::PoolId;
-use crate::service::{boxed, Service, ServiceCtx, ServiceFactory};
+use ntex_net::Io;
-use crate::util::{BoxFuture, PoolId, Ready};
+use ntex_service::{boxed, Service, ServiceCtx, ServiceFactory};
+use ntex_util::future::{BoxFuture, Ready};
 
 use super::{Config, Token};
 
@@ -143,7 +144,7 @@ where
     type Response = ();
     type Error = ();
 
-    crate::forward_poll_shutdown!(inner);
+    ntex_service::forward_poll_shutdown!(inner);
 
     fn poll_ready(&self, cx: &mut Context<'_>) -> Poll<Result<(), ()>> {
         self.inner.poll_ready(cx).map_err(|_| ())

ntex-server/src/net/mod.rs

@@ -10,24 +10,14 @@ mod service;
 mod socket;
 mod test;
 
-#[cfg(feature = "openssl")]
-pub use ntex_tls::openssl;
-
-#[cfg(feature = "rustls")]
-pub use ntex_tls::rustls;
-
-pub use ntex_tls::max_concurrent_ssl_accept;
-
-pub(crate) use self::builder::create_tcp_listener;
-
 pub use self::accept::{AcceptLoop, AcceptNotify, AcceptorCommand};
-pub use self::builder::ServerBuilder;
+pub use self::builder::{bind_addr, create_tcp_listener, ServerBuilder};
 pub use self::config::{Config, ServiceConfig, ServiceRuntime};
 pub use self::service::{ServerMessage, StreamServer};
 pub use self::socket::{Connection, Stream};
 pub use self::test::{build_test_server, test_server, TestServer};
 
-pub type Server = ntex_server::Server<Connection>;
+pub type Server = crate::Server<Connection>;
 
 #[non_exhaustive]
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]

ntex-server/src/net/service.rs

@@ -1,10 +1,11 @@
 use std::{task::Context, task::Poll};
 
-use ntex_server::{ServerConfiguration, WorkerMessage};
+use ntex_bytes::{Pool, PoolRef};
+use ntex_net::Io;
+use ntex_service::{boxed, Service, ServiceCtx, ServiceFactory};
+use ntex_util::HashMap;
 
-use crate::io::Io;
+use crate::{ServerConfiguration, WorkerMessage};
-use crate::service::{boxed, Service, ServiceCtx, ServiceFactory};
-use crate::util::{HashMap, Pool, PoolRef};
 
 use super::accept::{AcceptNotify, AcceptorCommand};
 use super::counter::Counter;

ntex-server/src/net/socket.rs

@@ -1,6 +1,8 @@
 use std::{fmt, io, net};
 
-use crate::{io::Io, rt, server::Token};
+use ntex_net::{self as rt, Io};
+
+use super::Token;
 
 #[derive(Debug)]
 pub struct Connection {

ntex-server/src/net/test.rs

@@ -1,11 +1,12 @@
 //! Test server
 use std::{io, net, sync::mpsc, thread};
 
+use ntex_net::{tcp_connect, Io};
+use ntex_rt::System;
+use ntex_service::ServiceFactory;
 use socket2::{Domain, SockAddr, Socket, Type};
 
-use crate::rt::{tcp_connect, System};
+use super::ServerBuilder;
-use crate::server::ServerBuilder;
-use crate::{io::Io, service::ServiceFactory};
 
 /// Start test server
 ///

ntex-tls/Cargo.toml

@@ -30,7 +30,6 @@ ntex-io = "1.0.0"
 ntex-util = "1.0.0"
 ntex-service = "2.0.0"
 log = "0.4"
-pin-project-lite = "0.2"
 
 # openssl
 tls_openssl = { version = "0.10", package = "openssl", optional = true }

ntex-tokio/Cargo.toml

@@ -20,5 +20,4 @@ ntex-bytes = "0.1.21"
 ntex-io = "1.0.0"
 ntex-util = "1.0.0"
 log = "0.4"
-pin-project-lite = "0.2"
 tokio = { version = "1", default-features = false, features = ["rt", "net", "sync", "signal"] }

ntex/Cargo.toml

@@ -39,44 +39,38 @@ cookie = ["coo-kie", "coo-kie/percent-encode"]
 url = ["url-pkg"]
 
 # tokio runtime
-tokio = ["ntex-rt/tokio", "ntex-tokio", "ntex-connect/tokio"]
+tokio = ["ntex-net/tokio"]
 
 # glommio runtime
-glommio = ["ntex-rt/glommio", "ntex-glommio", "ntex-connect/glommio"]
+glommio = ["ntex-net/glommio"]
 
 # async-std runtime
-async-std = ["ntex-rt/async-std", "ntex-async-std", "ntex-connect/async-std"]
+async-std = ["ntex-net/async-std"]
 
 [dependencies]
 ntex-codec = "0.6.2"
-ntex-connect = "1.0.0"
+ntex-connect = "1.1.0"
 ntex-http = "0.1.12"
 ntex-router = "0.5.3"
 ntex-service = "2.0.1"
 ntex-macros = "0.1.3"
 ntex-util = "1.0.1"
 ntex-bytes = "0.1.24"
-ntex-server = "0.1.0"
+ntex-server = "1.0.0"
 ntex-h2 = "0.5.1"
 ntex-rt = "0.4.11"
 ntex-io = "1.0.1"
+ntex-net = "1.0.0"
 ntex-tls = "1.0.0"
-ntex-tokio = { version = "0.4.0", optional = true }
-ntex-glommio = { version = "0.4.0", optional = true }
-ntex-async-std = { version = "0.4.0", optional = true }
 
-async-channel = "2.2"
 base64 = "0.22"
-bitflags = "2.4"
+bitflags = "2"
 log = "0.4"
-oneshot = { version = "0.1", default-features = false, features = ["async"] }
 nanorand = { version = "0.7", default-features = false, features = ["std", "wyrand"] }
-polling = "3.3"
 pin-project-lite = "0.2"
 regex = { version = "1.10", default-features = false, features = ["std"] }
-sha-1 = "0.10"
 serde = { version = "1.0", features=["derive"] }
-socket2 = "0.5"
+sha-1 = "0.10"
 thiserror = "1.0"
 
 # http/web framework

ntex/src/lib.rs

@@ -30,7 +30,6 @@ pub(crate) use ntex_macros::rt_test2 as rt_test;
 pub use ntex_service::{forward_poll_ready, forward_poll_shutdown};
 
 pub mod http;
-pub mod server;
 pub mod web;
 pub mod ws;
 
@@ -60,28 +59,24 @@ pub mod rt {
     //! A runtime implementation that runs everything on the current thread.
     pub use ntex_rt::*;
 
-    #[cfg(feature = "tokio")]
+    pub use ntex_net::*;
-    pub use ntex_tokio::*;
-
-    #[cfg(all(
-        feature = "async-std",
-        not(feature = "tokio"),
-        not(feature = "glommio")
-    ))]
-    pub use ntex_async_std::*;
-
-    #[cfg(all(
-        feature = "glommio",
-        not(feature = "tokio"),
-        not(feature = "async-std")
-    ))]
-    pub use ntex_glommio::*;
 }
 
 pub mod service {
     pub use ntex_service::*;
 }
 
+pub mod server {
+    //! General purpose tcp server
+    pub use ntex_server::net::*;
+
+    #[cfg(feature = "openssl")]
+    pub use ntex_tls::openssl;
+
+    #[cfg(feature = "rustls")]
+    pub use ntex_tls::rustls;
+}
+
 pub mod time {
     //! Utilities for tracking time.
     pub use ntex_util::time::*;