fix: rename and update deps

.gitignore

@@ -17,4 +17,4 @@ settings.yaml
 lcov.info
 
 # Ignore cargo lock for library
-Cargo.lockg
+Cargo.lock

CHANGELOG.md

@@ -38,8 +38,8 @@ None.
 
 # 0.4.2 (5. August 2022)
 
-- **added:** Added `Server::from_tcp`, `axum_server::from_tcp` and
-  `axum_server::from_tcp_rustls` methods to create `Server` from
+- **added:** Added `Server::from_tcp`, `hyper_server::from_tcp` and
+  `hyper_server::from_tcp_rustls` methods to create `Server` from
   `std::net::TcpListener`.
 
 # 0.4.1 (29. July 2022)

Cargo.toml

@@ -1,14 +1,14 @@
 [package]
-authors = ["Programatik <programatik29@gmail.com>"]
+authors = ["Programatik <programatik29@gmail.com>", "Megsdevs <megsdevs@outlook.com", "0xAlcibiades <alcibiades.eth@protonmail.com>"]
 categories = ["asynchronous", "network-programming", "web-programming"]
-description = "High level server designed to be used with axum framework."
-edition = "2018"
-homepage = "https://github.com/programatik29/axum-server"
+description = "High level server for hyper and tower."
+edition = "2021"
+homepage = "https://github.com/valorem-labs-inc/hyper-server"
 keywords = ["http", "https", "web", "server"]
 license = "MIT"
-name = "axum-server"
+name = "hyper-server"
 readme = "README.md"
-repository = "https://github.com/programatik29/axum-server"
+repository = "https://github.com/valorem-labs-inc/hyper-server"
 version = "0.5.1"
 
 [features]
@@ -42,7 +42,7 @@ axum = "0.6"
 hyper = { version = "0.14", features = ["full"] }
 tokio = { version = "1", features = ["full"] }
 tower = { version = "0.4", features = ["util"] }
-tower-http = { version = "0.3", features = ["add-extension"] }
+tower-http = { version = "0.4.4", features = ["add-extension"] }
 
 [package.metadata.docs.rs]
 all-features = true

README.md

@@ -30,7 +30,7 @@ async fn main() {
 
     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
     println!("listening on {}", addr);
-    axum_server::bind(addr)
+    hyper_server::bind(addr)
         .serve(app.into_make_service())
         .await
         .unwrap();

examples/configure_addr_incoming.rs

@@ -3,7 +3,7 @@
 //! To connect through browser, navigate to "http://localhost:3000" url.
 
 use axum::{routing::get, Router};
-use axum_server::AddrIncomingConfig;
+use hyper_server::AddrIncomingConfig;
 use std::net::SocketAddr;
 use std::time::Duration;
 
@@ -21,7 +21,7 @@ async fn main() {
 
     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
     println!("listening on {}", addr);
-    axum_server::bind(addr)
+    hyper_server::bind(addr)
         .addr_incoming_config(config)
         .serve(app.into_make_service())
         .await

examples/configure_http.rs

@@ -3,7 +3,7 @@
 //! To connect through browser, navigate to "http://localhost:3000" url.
 
 use axum::{routing::get, Router};
-use axum_server::HttpConfig;
+use hyper_server::HttpConfig;
 use std::net::SocketAddr;
 
 #[tokio::main]
@@ -18,7 +18,7 @@ async fn main() {
 
     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
     println!("listening on {}", addr);
-    axum_server::bind(addr)
+    hyper_server::bind(addr)
         .http_config(config)
         .serve(app.into_make_service())
         .await

examples/from_std_listener.rs

@@ -12,7 +12,7 @@ async fn main() {
     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
     let listener = TcpListener::bind(addr).unwrap();
     println!("listening on {}", addr);
-    axum_server::from_tcp(listener)
+    hyper_server::from_tcp(listener)
         .serve(app.into_make_service())
         .await
         .unwrap();

examples/from_std_listener_rustls.rs

@@ -4,7 +4,7 @@
 //! To connect through browser, navigate to "https://localhost:3000" url.
 
 use axum::{routing::get, Router};
-use axum_server::tls_rustls::RustlsConfig;
+use hyper_server::tls_rustls::RustlsConfig;
 use std::net::{SocketAddr, TcpListener};
 
 #[tokio::main]
@@ -21,7 +21,7 @@ async fn main() {
     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
     let listener = TcpListener::bind(addr).unwrap();
     println!("listening on {}", addr);
-    axum_server::from_tcp_rustls(listener, config)
+    hyper_server::from_tcp_rustls(listener, config)
         .serve(app.into_make_service())
         .await
         .unwrap();

examples/graceful_shutdown.rs

@@ -8,7 +8,7 @@
 //!  - Deadline is 30 seconds. Server will shutdown anyways when deadline is elapsed.
 
 use axum::{routing::get, Router};
-use axum_server::Handle;
+use hyper_server::Handle;
 use std::{net::SocketAddr, time::Duration};
 use tokio::time::sleep;
 
@@ -23,7 +23,7 @@ async fn main() {
 
     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
     println!("listening on {}", addr);
-    axum_server::bind(addr)
+    hyper_server::bind(addr)
         .handle(handle)
         .serve(app.into_make_service())
         .await

examples/hello_world.rs

@@ -11,7 +11,7 @@ async fn main() {
 
     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
     println!("listening on {}", addr);
-    axum_server::bind(addr)
+    hyper_server::bind(addr)
         .serve(app.into_make_service())
         .await
         .unwrap();

examples/http_and_https.rs

@@ -4,7 +4,7 @@
 //! "https://localhost:3443".
 
 use axum::{http::uri::Uri, response::Redirect, routing::get, Router};
-use axum_server::tls_rustls::RustlsConfig;
+use hyper_server::tls_rustls::RustlsConfig;
 use std::net::SocketAddr;
 
 #[tokio::main]
@@ -21,7 +21,7 @@ async fn http_server() {
 
     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
     println!("http listening on {}", addr);
-    axum_server::bind(addr)
+    hyper_server::bind(addr)
         .serve(app.into_make_service())
         .await
         .unwrap();
@@ -45,7 +45,7 @@ async fn https_server() {
 
     let addr = SocketAddr::from(([127, 0, 0, 1], 3443));
     println!("https listening on {}", addr);
-    axum_server::bind_rustls(addr, config)
+    hyper_server::bind_rustls(addr, config)
         .serve(app.into_make_service())
         .await
         .unwrap();

examples/multiple_addresses.rs

@@ -18,7 +18,7 @@ async fn main() {
 async fn start_server(addr: SocketAddr) {
     let app = Router::new().route("/", get(|| async { "Hello, world!" }));
 
-    axum_server::bind(addr)
+    hyper_server::bind(addr)
         .serve(app.into_make_service())
         .await
         .unwrap();

examples/remote_address.rs

@@ -13,7 +13,7 @@ async fn main() {
 
     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
 
-    axum_server::bind(addr).serve(app).await.unwrap();
+    hyper_server::bind(addr).serve(app).await.unwrap();
 }
 
 async fn handler(ConnectInfo(addr): ConnectInfo<SocketAddr>) -> String {

examples/remote_address_using_tower.rs

@@ -16,7 +16,7 @@ async fn main() {
         Ok::<_, Infallible>(Response::new(body))
     });
 
-    axum_server::bind(SocketAddr::from(([127, 0, 0, 1], 3000)))
+    hyper_server::bind(SocketAddr::from(([127, 0, 0, 1], 3000)))
         .serve(service_fn(|addr: &AddrStream| {
             let addr = addr.remote_addr();
 

examples/rustls_reload.rs

@@ -7,7 +7,7 @@
 //! After 20 seconds, certificate common name will be "reloaded".
 
 use axum::{routing::get, Router};
-use axum_server::tls_rustls::RustlsConfig;
+use hyper_server::tls_rustls::RustlsConfig;
 use std::{net::SocketAddr, time::Duration};
 use tokio::time::sleep;
 
@@ -27,7 +27,7 @@ async fn main() {
 
     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
     println!("listening on {}", addr);
-    axum_server::bind_rustls(addr, config)
+    hyper_server::bind_rustls(addr, config)
         .serve(app.into_make_service())
         .await
         .unwrap();

examples/rustls_server.rs

@@ -3,7 +3,7 @@
 //! To connect through browser, navigate to "https://localhost:3000" url.
 
 use axum::{routing::get, Router};
-use axum_server::tls_rustls::RustlsConfig;
+use hyper_server::tls_rustls::RustlsConfig;
 use std::net::SocketAddr;
 
 #[tokio::main]
@@ -19,7 +19,7 @@ async fn main() {
 
     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
     println!("listening on {}", addr);
-    axum_server::bind_rustls(addr, config)
+    hyper_server::bind_rustls(addr, config)
         .serve(app.into_make_service())
         .await
         .unwrap();

examples/rustls_session.rs

@@ -3,11 +3,11 @@
 //! To connect through browser, navigate to "https://localhost:3000" url.
 
 use axum::{middleware::AddExtension, routing::get, Extension, Router};
-use axum_server::{
+use futures_util::future::BoxFuture;
+use hyper_server::{
     accept::Accept,
     tls_rustls::{RustlsAcceptor, RustlsConfig},
 };
-use futures_util::future::BoxFuture;
 use std::{io, net::SocketAddr, sync::Arc};
 use tokio::io::{AsyncRead, AsyncWrite};
 use tokio_rustls::server::TlsStream;
@@ -29,7 +29,7 @@ async fn main() {
     println!("listening on {}", addr);
 
     let acceptor = CustomAcceptor::new(RustlsAcceptor::new(config));
-    let server = axum_server::bind(addr).acceptor(acceptor);
+    let server = hyper_server::bind(addr).acceptor(acceptor);
 
     server.serve(app.into_make_service()).await.unwrap();
 }

examples/shutdown.rs

@@ -5,7 +5,7 @@
 //! Server will shutdown in 20 seconds.
 
 use axum::{routing::get, Router};
-use axum_server::Handle;
+use hyper_server::Handle;
 use std::{net::SocketAddr, time::Duration};
 use tokio::time::sleep;
 
@@ -20,7 +20,7 @@ async fn main() {
 
     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
     println!("listening on {}", addr);
-    axum_server::bind(addr)
+    hyper_server::bind(addr)
         .handle(handle)
         .serve(app.into_make_service())
         .await

src/lib.rs

@@ -47,7 +47,7 @@
 //!
 //!     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
 //!     println!("listening on {}", addr);
-//!     axum_server::bind(addr)
+//!     hyper_server::bind(addr)
 //!         .serve(app.into_make_service())
 //!         .await
 //!         .unwrap();

src/tls_openssl/mod.rs

@@ -4,7 +4,7 @@
 //!
 //! ```rust,no_run
 //! use axum::{routing::get, Router};
-//! use axum_server::tls_openssl::OpenSSLConfig;
+//! use hyper_server::tls_openssl::OpenSSLConfig;
 //! use std::net::SocketAddr;
 //!
 //! #[tokio::main]
@@ -19,7 +19,7 @@
 //!
 //!     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
 //!     println!("listening on {}", addr);
-//!     axum_server::bind_openssl(addr, config)
+//!     hyper_server::bind_openssl(addr, config)
 //!         .serve(app.into_make_service())
 //!         .await
 //!         .unwrap();
@@ -161,7 +161,7 @@ impl TryFrom<SslAcceptorBuilder> for OpenSSLConfig {
     ///
     /// # Example
     /// ```
-    /// use axum_server::tls_openssl::OpenSSLConfig;
+    /// use hyper_server::tls_openssl::OpenSSLConfig;
     /// use openssl::ssl::{SslAcceptor, SslMethod};
     /// use std::convert::TryFrom;
     ///

src/tls_rustls/mod.rs

@@ -4,7 +4,7 @@
 //!
 //! ```rust,no_run
 //! use axum::{routing::get, Router};
-//! use axum_server::tls_rustls::RustlsConfig;
+//! use hyper_server::tls_rustls::RustlsConfig;
 //! use std::net::SocketAddr;
 //!
 //! #[tokio::main]
@@ -20,7 +20,7 @@
 //!
 //!     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
 //!     println!("listening on {}", addr);
-//!     axum_server::bind_rustls(addr, config)
+//!     hyper_server::bind_rustls(addr, config)
 //!         .serve(app.into_make_service())
 //!         .await
 //!         .unwrap();