move ntex::connect to separate crate

Cargo.toml

@@ -3,6 +3,7 @@ members = [
   "ntex",
   "ntex-bytes",
   "ntex-codec",
+  "ntex-connect",
   "ntex-io",
   "ntex-http",
   "ntex-router",
@@ -20,6 +21,7 @@ members = [
 ntex = { path = "ntex" }
 ntex-bytes = { path = "ntex-bytes" }
 ntex-codec = { path = "ntex-codec" }
+ntex-connect = { path = "ntex-connect" }
 ntex-io = { path = "ntex-io" }
 ntex-http = { path = "ntex-http" }
 ntex-router = { path = "ntex-router" }

ntex-connect/CHANGES.md

@@ -0,0 +1,5 @@
+# Changes
+
+## [0.1.0] - 2022-06-20
+
+* Move to separate crate

ntex-connect/Cargo.toml

@@ -0,0 +1,60 @@
+[package]
+name = "ntex-connect"
+version = "0.1.0"
+authors = ["ntex contributors <team@ntex.rs>"]
+description = "ntexwork connect 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"
+edition = "2018"
+
+[lib]
+name = "ntex_connect"
+path = "src/lib.rs"
+
+[features]
+default = []
+
+# openssl
+openssl = ["tls-openssl", "ntex-tls/openssl"]
+
+# rustls support
+rustls = ["tls-rustls", "webpki-roots", "ntex-tls/rustls"]
+
+# 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-service = "0.3.1"
+ntex-bytes = "0.1.15"
+ntex-http = "0.1.0"
+ntex-io = "0.1.8"
+ntex-rt = "0.4.4"
+ntex-tls = "0.1.5"
+ntex-util = "0.1.17"
+log = "0.4"
+thiserror = "1.0"
+
+ntex-tokio = { version = "0.1.3", optional = true }
+ntex-glommio = { version = "0.1.2", optional = true }
+ntex-async-std = { version = "0.1.1", optional = true }
+
+# openssl
+tls-openssl = { version="0.10", package = "openssl", optional = true }
+
+# rustls
+tls-rustls = { version = "0.20", package = "rustls", optional = true }
+webpki-roots = { version = "0.22", optional = true }
+
+[dev-dependencies]
+rand = "0.8"
+env_logger = "0.9"

ntex-connect/LICENSE

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

ntex-connect/src/lib.rs

@@ -0,0 +1,146 @@
+//! Tcp connector service
+#[macro_use]
+extern crate log;
+
+use std::future::Future;
+
+mod error;
+mod message;
+mod resolve;
+mod service;
+mod uri;
+
+#[cfg(feature = "openssl")]
+pub mod openssl;
+
+#[cfg(feature = "rustls")]
+pub mod rustls;
+
+pub use self::error::ConnectError;
+pub use self::message::{Address, Connect};
+pub use self::resolve::Resolver;
+pub use self::service::Connector;
+
+use ntex_io::Io;
+
+/// Resolve and connect to remote host
+pub fn connect<T, U>(message: U) -> impl Future<Output = Result<Io, ConnectError>>
+where
+    T: Address + 'static,
+    Connect<T>: From<U>,
+{
+    service::ConnectServiceResponse::new(Box::pin(Resolver::new().lookup(message.into())))
+}
+
+#[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<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-connect/src/message.rs

@@ -1,9 +1,7 @@
 use std::collections::{vec_deque, VecDeque};
-use std::fmt;
+use std::{fmt, iter::FromIterator, iter::FusedIterator, net::SocketAddr};
-use std::iter::{FromIterator, FusedIterator};
-use std::net::SocketAddr;
 
-use crate::util::Either;
+use ntex_util::future::Either;
 
 /// Connect request
 pub trait Address: Unpin + 'static {

ntex-connect/src/openssl.rs

@@ -3,11 +3,11 @@ use std::{future::Future, io, pin::Pin, task::Context, task::Poll};
 pub use ntex_tls::openssl::SslFilter;
 pub use tls_openssl::ssl::{Error as SslError, HandshakeError, SslConnector, SslMethod};
 
+use ntex_bytes::PoolId;
+use ntex_io::{Base, Io};
+use ntex_service::{Service, ServiceFactory};
 use ntex_tls::openssl::SslConnector as IoSslConnector;
-
+use ntex_util::future::Ready;
-use crate::io::{Base, Io};
-use crate::service::{Service, ServiceFactory};
-use crate::util::{PoolId, Ready};
 
 use super::{Address, Connect, ConnectError, Connector as BaseConnector};
 

ntex-connect/src/resolve.rs

@@ -1,8 +1,10 @@
 use std::{fmt, future::Future, io, marker, net, pin::Pin, task::Context, task::Poll};
 
-use super::{Address, Connect, ConnectError};
+use ntex_rt::spawn_blocking;
-use crate::service::{Service, ServiceFactory};
+use ntex_service::{Service, ServiceFactory};
-use crate::util::{Either, Ready};
+use ntex_util::future::{Either, Ready};
+
+use crate::{Address, Connect, ConnectError};
 
 /// DNS Resolver Service
 pub struct Resolver<T>(marker::PhantomData<T>);
@@ -41,9 +43,8 @@ impl<T: Address> Resolver<T> {
                     format!("{}:{}", req.host(), req.port())
                 };
 
-                let fut = crate::rt::spawn_blocking(move || {
+                let fut =
-                    net::ToSocketAddrs::to_socket_addrs(&host)
+                    spawn_blocking(move || net::ToSocketAddrs::to_socket_addrs(&host));
-                });
 
                 match fut.await {
                     Ok(Ok(ips)) => {

ntex-connect/src/rustls.rs

@@ -3,11 +3,11 @@ use std::{convert::TryFrom, future::Future, io, pin::Pin, task::Context, task::P
 pub use ntex_tls::rustls::TlsFilter;
 pub use tls_rustls::{ClientConfig, ServerName};
 
+use ntex_bytes::PoolId;
+use ntex_io::{Base, Io};
+use ntex_service::{Service, ServiceFactory};
 use ntex_tls::rustls::TlsConnector;
-
+use ntex_util::future::Ready;
-use crate::io::{Base, Io};
-use crate::service::{Service, ServiceFactory};
-use crate::util::{PoolId, Ready};
 
 use super::{Address, Connect, ConnectError, Connector as BaseConnector};
 

ntex-connect/src/service.rs

@@ -1,12 +1,12 @@
 use std::task::{Context, Poll};
 use std::{collections::VecDeque, future::Future, io, net::SocketAddr, pin::Pin};
 
-use crate::io::{types, Io};
+use ntex_bytes::{PoolId, PoolRef};
-use crate::rt::tcp_connect_in;
+use ntex_io::{types, Io};
-use crate::service::{Service, ServiceFactory};
+use ntex_service::{Service, ServiceFactory};
-use crate::util::{Either, PoolId, PoolRef, Ready};
+use ntex_util::future::{Either, Ready};
 
-use super::{Address, Connect, ConnectError, Resolver};
+use crate::{net::tcp_connect_in, Address, Connect, ConnectError, Resolver};
 
 pub struct Connector<T> {
     resolver: Resolver<T>,

ntex-connect/src/uri.rs

@@ -1,4 +1,4 @@
-use crate::http::Uri;
+use ntex_http::Uri;
 
 use super::Address;
 

ntex-rt/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.4.6] - 2022-06-20
+
+* Add spawn_blocking stub
+
 ## [0.4.4] - 2022-02-20
 
 * Upgrade to glommio 0.7

ntex-rt/src/lib.rs

@@ -275,3 +275,39 @@ where
 {
     unimplemented!()
 }
+
+#[cfg(all(
+    not(feature = "tokio"),
+    not(feature = "async-std"),
+    not(feature = "glommio")
+))]
+mod spawn_blocking_stub {
+    use std::fmt;
+
+    #[derive(Debug, Copy, Clone)]
+    pub struct JoinError;
+
+    impl fmt::Display for JoinError {
+        fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+            write!(f, "JoinError")
+        }
+    }
+
+    impl std::error::Error for JoinError {}
+
+    pub fn spawn_blocking<F, T>(
+        _: F,
+    ) -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<T, JoinError>>>>
+    where
+        F: FnOnce() -> T + Send + 'static,
+        T: Send + 'static,
+    {
+        unimplemented!()
+    }
+}
+#[cfg(all(
+    not(feature = "tokio"),
+    not(feature = "async-std"),
+    not(feature = "glommio")
+))]
+pub use self::spawn_blocking_stub::*;

ntex/Cargo.toml

@@ -24,10 +24,10 @@ path = "src/lib.rs"
 default = []
 
 # openssl
-openssl = ["tls-openssl", "ntex-tls/openssl"]
+openssl = ["tls-openssl", "ntex-tls/openssl", "ntex-connect/openssl"]
 
 # rustls support
-rustls = ["tls-rustls", "webpki-roots", "ntex-tls/rustls"]
+rustls = ["tls-rustls", "webpki-roots", "ntex-tls/rustls", "ntex-connect/rustls"]
 
 # enable compressison support
 compress = ["flate2", "brotli2"]
@@ -39,16 +39,17 @@ cookie = ["coo-kie", "coo-kie/percent-encode"]
 url = ["url-pkg"]
 
 # tokio runtime
-tokio = ["ntex-rt/tokio"]
+tokio = ["ntex-rt/tokio", "ntex-connect/tokio"]
 
 # glommio runtime
-glommio = ["ntex-rt/glommio", "ntex-glommio"]
+glommio = ["ntex-rt/glommio", "ntex-glommio", "ntex-connect/glommio"]
 
 # async-std runtime
-async-std = ["ntex-rt/async-std", "ntex-async-std"]
+async-std = ["ntex-rt/async-std", "ntex-async-std", "ntex-connect/async-std"]
 
 [dependencies]
 ntex-codec = "0.6.2"
+ntex-connect = "0.1.0"
 ntex-http = "0.1.0"
 ntex-router = "0.5.1"
 ntex-service = "0.3.1"

ntex/src/connect/mod.rs

@@ -1,30 +0,0 @@
-//! Tcp connector service
-use std::future::Future;
-
-mod error;
-mod message;
-mod resolve;
-mod service;
-mod uri;
-
-#[cfg(feature = "openssl")]
-pub mod openssl;
-
-#[cfg(feature = "rustls")]
-pub mod rustls;
-
-pub use self::error::ConnectError;
-pub use self::message::{Address, Connect};
-pub use self::resolve::Resolver;
-pub use self::service::Connector;
-
-use crate::io::Io;
-
-/// Resolve and connect to remote host
-pub fn connect<T, U>(message: U) -> impl Future<Output = Result<Io, ConnectError>>
-where
-    T: Address + 'static,
-    Connect<T>: From<U>,
-{
-    service::ConnectServiceResponse::new(Box::pin(Resolver::new().lookup(message.into())))
-}

ntex/src/lib.rs

@@ -30,7 +30,6 @@ pub use ntex_macros::{rt_main as main, rt_test as test};
 #[cfg(test)]
 pub(crate) use ntex_macros::rt_test2 as rt_test;
 
-pub mod connect;
 pub mod http;
 pub mod server;
 pub mod web;
@@ -49,6 +48,11 @@ pub mod codec {
     pub use ntex_codec::*;
 }
 
+pub mod connect {
+    //! Tcp connector service
+    pub use ntex_connect::*;
+}
+
 pub mod router {
     //! Resource path matching library.
     pub use ntex_router::*;