From b71cad76bf77ddea34faebe12ec80e146184a3de Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Sat, 23 Mar 2024 22:18:50 +0100 Subject: [PATCH] Move ntex::server to ntex-server (#313) --- Cargo.toml | 2 + ntex-async-std/Cargo.toml | 1 - ntex-connect/Cargo.toml | 13 +- ntex-connect/src/lib.rs | 109 +--------------- ntex-net/CHANGES.md | 5 + ntex-net/Cargo.toml | 37 ++++++ ntex-net/LICENSE-APACHE | 1 + ntex-net/LICENSE-MIT | 1 + ntex-net/src/lib.rs | 117 ++++++++++++++++++ ntex-server/Cargo.toml | 7 +- ntex-server/src/lib.rs | 3 +- .../server => ntex-server/src/net}/accept.rs | 10 +- .../server => ntex-server/src/net}/builder.rs | 14 ++- .../server => ntex-server/src/net}/config.rs | 7 +- .../server => ntex-server/src/net}/counter.rs | 2 +- .../server => ntex-server/src/net}/factory.rs | 9 +- .../src/server => ntex-server/src/net}/mod.rs | 14 +-- .../server => ntex-server/src/net}/service.rs | 9 +- .../server => ntex-server/src/net}/socket.rs | 4 +- .../server => ntex-server/src/net}/test.rs | 7 +- ntex-tls/Cargo.toml | 1 - ntex-tokio/Cargo.toml | 1 - ntex/Cargo.toml | 22 ++-- ntex/src/lib.rs | 29 ++--- 24 files changed, 236 insertions(+), 189 deletions(-) create mode 100644 ntex-net/CHANGES.md create mode 100644 ntex-net/Cargo.toml create mode 120000 ntex-net/LICENSE-APACHE create mode 120000 ntex-net/LICENSE-MIT create mode 100644 ntex-net/src/lib.rs rename {ntex/src/server => ntex-server/src/net}/accept.rs (98%) rename {ntex/src/server => ntex-server/src/net}/builder.rs (97%) rename {ntex/src/server => ntex-server/src/net}/config.rs (98%) rename {ntex/src/server => ntex-server/src/net}/counter.rs (98%) rename {ntex/src/server => ntex-server/src/net}/factory.rs (96%) rename {ntex/src/server => ntex-server/src/net}/mod.rs (85%) rename {ntex/src/server => ntex-server/src/net}/service.rs (97%) rename {ntex/src/server => ntex-server/src/net}/socket.rs (99%) rename {ntex/src/server => ntex-server/src/net}/test.rs (96%) diff --git a/Cargo.toml b/Cargo.toml index 5ff728e7..01b06453 100644 --- a/Cargo.toml +++ b/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" } diff --git a/ntex-async-std/Cargo.toml b/ntex-async-std/Cargo.toml index b4b8b4b8..47126f00 100644 --- a/ntex-async-std/Cargo.toml +++ b/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"] } diff --git a/ntex-connect/Cargo.toml b/ntex-connect/Cargo.toml index 08c8233d..1002367c 100644 --- a/ntex-connect/Cargo.toml +++ b/ntex-connect/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ntex-connect" -version = "1.0.0" +version = "1.1.0" authors = ["ntex contributors "] 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 } diff --git a/ntex-connect/src/lib.rs b/ntex-connect/src/lib.rs index ffae779c..42242e51 100644 --- a/ntex-connect/src/lib.rs +++ b/ntex-connect/src/lib.rs @@ -32,112 +32,5 @@ where #[allow(unused_imports)] #[doc(hidden)] pub mod net { - use super::*; - - #[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 { - 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 { - 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 - where - P: AsRef + '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 - where - P: AsRef + '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 { - 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 { - Err(std::io::Error::new( - std::io::ErrorKind::Other, - "runtime is not configure", - )) - } + pub use ntex_net::*; } diff --git a/ntex-net/CHANGES.md b/ntex-net/CHANGES.md new file mode 100644 index 00000000..d6149b4f --- /dev/null +++ b/ntex-net/CHANGES.md @@ -0,0 +1,5 @@ +# Changes + +## [1.0.0] - 2024-03-23 + +* Move to separate crate diff --git a/ntex-net/Cargo.toml b/ntex-net/Cargo.toml new file mode 100644 index 00000000..0c77cb51 --- /dev/null +++ b/ntex-net/Cargo.toml @@ -0,0 +1,37 @@ +[package] +name = "ntex-net" +version = "1.0.0" +authors = ["ntex contributors "] +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 } diff --git a/ntex-net/LICENSE-APACHE b/ntex-net/LICENSE-APACHE new file mode 120000 index 00000000..965b606f --- /dev/null +++ b/ntex-net/LICENSE-APACHE @@ -0,0 +1 @@ +../LICENSE-APACHE \ No newline at end of file diff --git a/ntex-net/LICENSE-MIT b/ntex-net/LICENSE-MIT new file mode 120000 index 00000000..76219eb7 --- /dev/null +++ b/ntex-net/LICENSE-MIT @@ -0,0 +1 @@ +../LICENSE-MIT \ No newline at end of file diff --git a/ntex-net/src/lib.rs b/ntex-net/src/lib.rs new file mode 100644 index 00000000..36632c15 --- /dev/null +++ b/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 { + 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 { + 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 + where + P: AsRef + '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 + where + P: AsRef + '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 { + 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 { + 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::*; diff --git a/ntex-server/Cargo.toml b/ntex-server/Cargo.toml index 5b4e09ae..66a2d767 100644 --- a/ntex-server/Cargo.toml +++ b/ntex-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ntex-server" -version = "0.1.0" +version = "1.0.0" authors = ["ntex contributors "] 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] diff --git a/ntex-server/src/lib.rs b/ntex-server/src/lib.rs index 3083d788..5802a9bf 100644 --- a/ntex-server/src/lib.rs +++ b/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; diff --git a/ntex/src/server/accept.rs b/ntex-server/src/net/accept.rs similarity index 98% rename from ntex/src/server/accept.rs rename to ntex-server/src/net/accept.rs index 0a2ccd74..4d1d5a85 100644 --- a/ntex/src/server/accept.rs +++ b/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>, } +impl Default for AcceptLoop { + fn default() -> Self { + Self::new() + } +} + impl AcceptLoop { /// Create accept loop pub fn new() -> AcceptLoop { diff --git a/ntex/src/server/builder.rs b/ntex-server/src/net/builder.rs similarity index 97% rename from ntex/src/server/builder.rs rename to ntex-server/src/net/builder.rs index 0f501846..91daae77 100644 --- a/ntex/src/server/builder.rs +++ b/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 crate::{io::Io, time::Millis}; +use ntex_net::Io; +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( +pub fn bind_addr( addr: S, backlog: i32, ) -> io::Result> { @@ -352,7 +354,7 @@ pub(super) fn bind_addr( } } -pub(crate) fn create_tcp_listener( +pub fn create_tcp_listener( addr: net::SocketAddr, backlog: i32, ) -> io::Result { diff --git a/ntex/src/server/config.rs b/ntex-server/src/net/config.rs similarity index 98% rename from ntex/src/server/config.rs rename to ntex-server/src/net/config.rs index 0b040d9f..bf9508c3 100644 --- a/ntex/src/server/config.rs +++ b/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 crate::service::{IntoServiceFactory, ServiceFactory}; -use crate::util::{BoxFuture, HashMap, PoolId, Ready}; +use ntex_bytes::PoolId; +use ntex_net::Io; +use ntex_service::{IntoServiceFactory, ServiceFactory}; +use ntex_util::{future::BoxFuture, future::Ready, HashMap}; use super::factory::{ self, BoxServerService, FactoryService, FactoryServiceType, NetService, diff --git a/ntex/src/server/counter.rs b/ntex-server/src/net/counter.rs similarity index 98% rename from ntex/src/server/counter.rs rename to ntex-server/src/net/counter.rs index 3b3e606c..214045ab 100644 --- a/ntex/src/server/counter.rs +++ b/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 /// diff --git a/ntex/src/server/factory.rs b/ntex-server/src/net/factory.rs similarity index 96% rename from ntex/src/server/factory.rs rename to ntex-server/src/net/factory.rs index 9fa9c277..27c08de0 100644 --- a/ntex/src/server/factory.rs +++ b/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 crate::service::{boxed, Service, ServiceCtx, ServiceFactory}; -use crate::util::{BoxFuture, PoolId, Ready}; +use ntex_bytes::PoolId; +use ntex_net::Io; +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> { self.inner.poll_ready(cx).map_err(|_| ()) diff --git a/ntex/src/server/mod.rs b/ntex-server/src/net/mod.rs similarity index 85% rename from ntex/src/server/mod.rs rename to ntex-server/src/net/mod.rs index f24db036..098effa5 100644 --- a/ntex/src/server/mod.rs +++ b/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; +pub type Server = crate::Server; #[non_exhaustive] #[derive(Copy, Clone, Debug, PartialEq, Eq)] diff --git a/ntex/src/server/service.rs b/ntex-server/src/net/service.rs similarity index 97% rename from ntex/src/server/service.rs rename to ntex-server/src/net/service.rs index 1fa3575b..b015ec4a 100644 --- a/ntex/src/server/service.rs +++ b/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::service::{boxed, Service, ServiceCtx, ServiceFactory}; -use crate::util::{HashMap, Pool, PoolRef}; +use crate::{ServerConfiguration, WorkerMessage}; use super::accept::{AcceptNotify, AcceptorCommand}; use super::counter::Counter; diff --git a/ntex/src/server/socket.rs b/ntex-server/src/net/socket.rs similarity index 99% rename from ntex/src/server/socket.rs rename to ntex-server/src/net/socket.rs index 112fb530..c130dc4b 100644 --- a/ntex/src/server/socket.rs +++ b/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 { diff --git a/ntex/src/server/test.rs b/ntex-server/src/net/test.rs similarity index 96% rename from ntex/src/server/test.rs rename to ntex-server/src/net/test.rs index 2b4eb36c..0e3b0c63 100644 --- a/ntex/src/server/test.rs +++ b/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 crate::server::ServerBuilder; -use crate::{io::Io, service::ServiceFactory}; +use super::ServerBuilder; /// Start test server /// diff --git a/ntex-tls/Cargo.toml b/ntex-tls/Cargo.toml index d1b25058..e5569423 100644 --- a/ntex-tls/Cargo.toml +++ b/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 } diff --git a/ntex-tokio/Cargo.toml b/ntex-tokio/Cargo.toml index b4339668..62dba300 100644 --- a/ntex-tokio/Cargo.toml +++ b/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"] } diff --git a/ntex/Cargo.toml b/ntex/Cargo.toml index 21274864..9f976716 100644 --- a/ntex/Cargo.toml +++ b/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 diff --git a/ntex/src/lib.rs b/ntex/src/lib.rs index e8041d71..564d7f33 100644 --- a/ntex/src/lib.rs +++ b/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_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 use ntex_net::*; } 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::*;