lock middleware behind a feature

mateocabanal · Aug 12, 2023 · 10d6995 · 10d6995
2 parents 1fc163f + 2da3f1d
commit 10d6995
Show file tree

Hide file tree

Showing 7 changed files with 468 additions and 63 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tinyhttp-internal/Cargo.toml b/tinyhttp-internal/Cargo.toml
@@ -17,10 +17,6 @@ num_cpus = "1.16.0"
 rusty_pool = "0.7.0"
 thiserror = "1"
 
-
-#async-std = { version = "1.12.0", features = ["attributes"], optional = true }
-#futures = { version = "0.3.21", features = ["thread-pool"], optional = true }
-
 [dependencies.flate2]
 features = ["miniz-sys"]
 version = "1"
@@ -31,10 +27,16 @@ features = ["std"]
 version = "0.4"
 optional = true
 
+[dependencies.tokio]
+features = ["rt-multi-thread", "io-util", "net", "macros", "fs"]
+version = "1.3"
+optional = true
+
 [features]
-default = ["sys", "log"]
+default = ["sys", "log", "async"]
 openssl_vendor = ["ssl", "openssl?/vendored"]
-#async = ["dep:async-std", "dep:futures"]
+middleware = []
+async = ["dep:tokio"]
 ssl = ["dep:openssl"]
 sys = ["ssl", "dep:flate2"]
 log = ["dep:log"]
diff --git a/tinyhttp-internal/src/config.rs b/tinyhttp-internal/src/config.rs
@@ -7,16 +7,7 @@ use std::fmt::Debug;
 #[cfg(feature = "ssl")]
 use openssl::ssl::{SslAcceptor, SslFiletype, SslMethod};
 
-#[cfg(feature = "async")]
-use crate::async_http::start_http;
-
-#[cfg(feature = "async")]
-use async_std::net::{Incoming, TcpListener};
-
-#[cfg(feature = "async")]
-use futures::executor::{ThreadPool, ThreadPoolBuilder};
 
-#[cfg(not(feature = "async"))]
 use crate::http::start_http;
 
 use crate::response::Response;
@@ -26,6 +17,9 @@ use rusty_pool::{Builder, ThreadPool};
 #[cfg(not(feature = "async"))]
 use std::net::{Incoming, TcpListener};
 
+#[cfg(feature = "async")]
+use tokio::{net::TcpListener};
+
 use std::sync::Mutex;
 
 #[cfg(test)]
@@ -60,7 +54,7 @@ impl Clone for Box<dyn Route> {
 }
 
 pub struct HttpListener {
-    socket: TcpListener,
+    pub(crate) socket: TcpListener,
     pub config: Config,
     pub pool: ThreadPool,
     pub use_pool: bool,
@@ -82,13 +76,7 @@ impl HttpListener {
             HttpListener {
                 socket: socket.into(),
                 config,
-                #[cfg(not(feature = "async"))]
                 pool: ThreadPool::default(),
-                #[cfg(feature = "async")]
-                pool: ThreadPoolBuilder::new()
-                    .pool_size(num_cpus::get())
-                    .create()
-                    .unwrap(),
                 #[cfg(feature = "ssl")]
                 ssl_acpt,
                 use_pool: true,
@@ -97,13 +85,7 @@ impl HttpListener {
             HttpListener {
                 socket: socket.into(),
                 config,
-                #[cfg(not(feature = "async"))]
                 pool: ThreadPool::default(),
-                #[cfg(feature = "async")]
-                pool: ThreadPoolBuilder::new()
-                    .pool_size(num_cpus::get())
-                    .create()
-                    .unwrap(),
                 #[cfg(feature = "ssl")]
                 ssl_acpt: None,
                 use_pool: true,
@@ -112,14 +94,8 @@ impl HttpListener {
     }
 
     pub fn threads(mut self, threads: usize) -> Self {
-        #[cfg(not(feature = "async"))]
         let pool = Builder::new().core_size(threads).build();
 
-        #[cfg(feature = "async")]
-        let pool = ThreadPoolBuilder::new()
-            .pool_size(threads)
-            .create()
-            .unwrap();
 
         self.pool = pool;
         self
@@ -136,13 +112,15 @@ impl HttpListener {
     }
 
     #[cfg(feature = "async")]
-    pub async fn start_async(self) {
+    pub async fn start(self) {
         start_http(self).await;
     }
 
+    #[cfg(not(feature = "async"))]
     pub fn get_stream(&self) -> Incoming<'_> {
         self.socket.incoming()
     }
+
 }
 
 #[derive(Clone)]