update deps

Bump regex from 1.5.4 to 1.5.5

.github/workflows/release.yml

@@ -22,6 +22,8 @@ jobs:
             os: ubuntu-latest
           - target: x86_64-unknown-linux-musl
             os: ubuntu-latest
+          - target: aarch64-apple-darwin
+            os: macos-latest
           - target: x86_64-apple-darwin
             os: macos-latest
           - target: x86_64-pc-windows-msvc
@@ -32,6 +34,7 @@ jobs:
       - uses: taiki-e/upload-rust-binary-action@v1
         with:
           bin: srv
+          archive: $bin-$tag-$target
           target: ${{ matrix.target }}
           tar: unix
           zip: windows

Cargo.toml

@@ -3,28 +3,27 @@ authors = ["Tim_Paik <timpaikc@outlook.com>"]
 description = "simple http server written in rust"
 edition = "2018"
 name = "srv"
-version = "1.0.0-rc"
+version = "1.0.1"
 
 [dependencies]
 actix-files = "0.6"
-actix-http = "3.0"
-actix-web = {version = "4.0", features = ["rustls"]}
+actix-web = {version = "4.1", features = ["rustls"]}
 actix-web-httpauth = "0.6"
 chrono = "0.4"
-clap = {version = "3.1", features = ["wrap_help", "color", "cargo"]}
+clap = {version = "3.2", features = ["wrap_help", "color", "cargo"]}
 env_logger = "0.9"
 lazy_static = "1.4"
 log = "0.4"
 mime_guess = "2.0"
-regex = "1.5"
 rustls = "0.20"
 rustls-pemfile = "1.0"
 serde = {version = "1.0", features = ["derive"]}
 sha2 = "0.10"
-tera = "1.15"
+tera = "1.16"
 toml = "0.5"
 urlencoding = "2.1"
 
 [profile.release]
 lto = true
 opt-level = "z"
+strip = true

README.md

@@ -7,7 +7,6 @@ This is a simple HTTP Server for use in a development environment, inspired by [
 
 ### Built With
 
-- ~~[rocket](https://github.com/SergioBenitez/Rocket)~~ Framework used in previous versions
 - [clap](https://github.com/clap-rs/clap) Provide command line parameter analysis
 - [tera](https://github.com/Keats/tera) Provide template support
 - [actix-web](https://github.com/actix/actix-web) Main frame
@@ -51,10 +50,10 @@ yay -S srv-bin
 Download the pre-compiled `srv-x86_64-unknown-linux-musl.tar.gz` on the [releases](https://github.com/Tim-Paik/srv/releases/latest), and copy the srv file in the compressed package to `/usr/bin` as a ROOT user with 755 permissions.
 
 ```shell
-wget https://github.com/Tim-Paik/srv/releases/download/v1.0.0-rc.6/srv-x86_64-unknown-linux-musl.tar.gz
-tar -xzvf srv-x86_64-unknown-linux-musl.tar.gz
+wget https://github.com/Tim-Paik/srv/releases/download/v1.0.1/srv-v1.0.1-x86_64-unknown-linux-musl.tar.gz
+tar -xzvf srv-v1.0.1-x86_64-unknown-linux-musl.tar.gz
 install -Dm0755 -t /usr/bin/ srv
-rm srv srv-x86_64-unknown-linux-musl.tar.gz
+rm srv srv-v1.0.1-x86_64-unknown-linux-musl.tar.gz
 ```
 for reference only
 
@@ -78,7 +77,6 @@ You Need:
 git clone git@github.com:Tim-Paik/srv.git
 cd srv
 cargo build --release
-strip target/release/srv
 ```
 
 Then you can find the compiled executable file named `srv` in the `target/release/` folder.
@@ -89,6 +87,10 @@ Execute `srv --help` to get all the usage methods
 
 Waiting to be added...
 
+## Contributing
+
+All contributions are welcome and I will reply as soon as I see it :)
+
 ## License
 
 ```text

src/main.rs

@@ -197,11 +197,11 @@ fn render_index(
         let res = actix_files::NamedFile::open(index)?
             .set_content_type(mime_guess::mime::TEXT_HTML_UTF_8)
             .into_response(req);
-        return Ok(ServiceResponse::new(req.clone(), res));
+        return Ok(ServiceResponse::new(req.to_owned(), res));
     }
     if var("NOINDEX").unwrap_or_else(|_| "false".to_string()) == "true" {
         return Ok(ServiceResponse::new(
-            req.clone(),
+            req.to_owned(),
             HttpResponse::NotFound().body(""),
         ));
     }
@@ -292,7 +292,7 @@ fn render_index(
     let res = HttpResponse::Ok()
         .content_type("text/html; charset=utf-8")
         .body(index);
-    Ok(ServiceResponse::new(req.clone(), res))
+    Ok(ServiceResponse::new(req.to_owned(), res))
 }
 
 #[inline]
@@ -412,7 +412,6 @@ async fn main() -> std::io::Result<()> {
     set_var("SPA", matches.is_present("spa").to_string());
     set_var("DOTFILES", matches.is_present("dotfiles").to_string());
     set_var("NOCACHE", matches.is_present("nocache").to_string());
-    set_var("COMPRESS", matches.is_present("compress").to_string());
 
     if matches.is_present("quiet") {
         set_var("RUST_LOG", "info,actix_web::middleware::logger=off");
@@ -448,11 +447,7 @@ async fn main() -> std::io::Result<()> {
         .value_of("address")
         .unwrap_or("127.0.0.1")
         .to_string();
-    let addr = format!(
-        "{}:{}",
-        ip,
-        matches.value_of("port").unwrap_or("8000")
-    );
+    let addr = format!("{}:{}", ip, matches.value_of("port").unwrap_or("8000"));
     let url = format!(
         "{}{}:{}",
         if enable_tls {
@@ -484,76 +479,8 @@ async fn main() -> std::io::Result<()> {
         open_in_browser(&url);
     }
 
-    let addr = if let Some(matches) = matches.subcommand_matches("doc") {
-        let mut cargo_toml = match std::fs::File::open("./Cargo.toml") {
-            Ok(file) => file,
-            Err(e) => {
-                error!("[ERROR] {}", e.to_string());
-                return Ok(());
-            }
-        };
-        let mut contents = String::new();
-        match cargo_toml.read_to_string(&mut contents) {
-            Ok(_) => {}
-            Err(e) => {
-                error!("[ERROR] {}", e.to_string());
-                return Ok(());
-            }
-        }
-        let contents: CargoToml = match toml::from_str(&contents) {
-            Ok(t) => t,
-            Err(e) => {
-                error!("[ERROR] {}", e.to_string());
-                return Ok(());
-            }
-        };
-        let crate_name = contents.package.name;
-        info!("[INFO] Generating document (may take a while)");
-        match std::process::Command::new("cargo").arg("doc").output() {
-            Ok(output) => {
-                let output = std::str::from_utf8(&output.stderr).unwrap_or("");
-                if output.starts_with("error: could not find `Cargo.toml` in") {
-                    error!("[ERROR] Cargo.toml Not Found");
-                    return Ok(());
-                } else if output.starts_with("error: ") {
-                    error!(
-                        "[ERROR] {}",
-                        output.strip_prefix("error: ").unwrap_or(output)
-                    );
-                    return Ok(());
-                }
-            }
-            Err(e) => {
-                error!("[ERROR] Cargo Error: {}", e.to_string());
-                return Ok(());
-            }
-        }
-        let path = Path::new("./target/doc/");
-        let mut index_path = path.to_path_buf();
-        index_path.push(crate_name.to_string() + "/index.html");
-        if !index_path.exists() || !index_path.is_file() {
-            error!("[ERROR] Cargo Error: doc path not found");
-            return Ok(());
-        }
-        set_var("ROOT", display_path(path));
-        let ip = matches
-            .value_of("address")
-            .unwrap_or("127.0.0.1")
-            .to_string();
-        let addr = format!(
-            "{}:{}",
-            ip,
-            matches.value_of("port").unwrap_or("8000")
-        );
-        let url = format!(
-            "http://{}:{}/{}/index.html",
-            if ip == "0.0.0.0" { "127.0.0.1" } else { &ip },
-            matches.value_of("port").unwrap_or("8000"),
-            crate_name,
-        );
-        if !matches.is_present("noopen") {
-            open_in_browser(&url);
-        }
+
+    if let Some(matches) = matches.subcommand_matches("doc") {
         if !matches.is_present("log") {
             set_var("RUST_LOG", "info,actix_web::middleware::logger=off");
         }
@@ -563,13 +490,10 @@ async fn main() -> std::io::Result<()> {
         if matches.is_present("nocolor") {
             set_var("RUST_LOG_STYLE", "never");
         }
-        addr
-    } else {
-        addr
-    };
+    }
 
     env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info"))
-        .format(|buf, record| {
+        .format(move |buf, record| {
             let data = record.args().to_string();
             let mut style = buf.style();
             let blue = style.set_color(Color::Cyan);
@@ -580,7 +504,8 @@ async fn main() -> std::io::Result<()> {
             if record.target() == "actix_web::middleware::logger" {
                 let data: Vec<&str> = data.splitn(5, '^').collect();
                 let time = blue.value(
-                    chrono::NaiveDateTime::from_str(data[0])
+                    data[0]
+                        .parse::<chrono::DateTime<chrono::Utc>>()
                         .unwrap()
                         .format("%Y/%m/%d %H:%M:%S")
                         .to_string(),
@@ -612,30 +537,27 @@ async fn main() -> std::io::Result<()> {
                     time, ipaddr, status_code, process_time, content
                 );
             } else if record.target() == "actix_server::builder" {
-                if data.starts_with("SIGINT received, exiting") {
-                    return writeln!(buf, "\r{}", green.value("[INFO] SIGINT received, exiting"));
-                    // Add '\r' to remove the input ^C
-                } else {
-                    let data = data.replace("actix-web-service-", "");
-                    let re1 = regex::Regex::new("Starting (.*) workers").unwrap();
-                    if re1.is_match(&data) {
-                        return Ok(());
-                    }
-                    let re2 = regex::Regex::new("Starting \"(.*)\" service on (.*)").unwrap();
-                    if re2.is_match(&data) {
-                        let addr = re2
-                            .captures(&data)
-                            .unwrap()
-                            .get(1)
-                            .map_or("", |m| m.as_str());
-                        let data = format!(
-                            "[INFO] Serving {} on {}",
-                            var("ROOT").unwrap_or_else(|_| ".".to_string()),
-                            addr
-                        );
-                        return writeln!(buf, "\r{}", green.value(data));
-                    }
+                if data.starts_with("Starting ") && data.ends_with(" workers") {
+                    return Ok(());
                 }
+            } else if record.target() == "actix_server::server" {
+                if data == "Actix runtime found; starting in Actix runtime" {
+                    let data = format!(
+                        "[INFO] Serving {} on {}",
+                        var("ROOT").unwrap_or_else(|_| ".".to_string()),
+                        var("LISTEN_ADDRESS").unwrap_or_else(|_| "0.0.0.0:8000".to_string())
+                    );
+                    return writeln!(buf, "\r{}", green.value(data));
+                }
+                if data == "SIGINT received; starting forced shutdown" {
+                    return writeln!(buf, "\r{}", green.value("[INFO] SIGINT received; starting forced shutdown"));
+                    // Add '\r' to remove the input ^C
+                }
+                return Ok(());
+            } else if record.target() == "actix_server::worker"
+                || record.target() == "actix_server::accept"
+            {
+                return Ok(());
             }
             if data.starts_with("[ERROR]")
                 || data.starts_with("TLS alert")
@@ -648,6 +570,78 @@ async fn main() -> std::io::Result<()> {
         })
         .init();
 
+        let addr = if let Some(matches) = matches.subcommand_matches("doc") {
+            let mut cargo_toml = match std::fs::File::open("./Cargo.toml") {
+                Ok(file) => file,
+                Err(e) => {
+                    error!("[ERROR] {}", e.to_string());
+                    return Ok(());
+                }
+            };
+            let mut contents = String::new();
+            match cargo_toml.read_to_string(&mut contents) {
+                Ok(_) => {}
+                Err(e) => {
+                    error!("[ERROR] {}", e.to_string());
+                    return Ok(());
+                }
+            }
+            let contents: CargoToml = match toml::from_str(&contents) {
+                Ok(t) => t,
+                Err(e) => {
+                    error!("[ERROR] {}", e.to_string());
+                    return Ok(());
+                }
+            };
+            let crate_name = contents.package.name;
+            info!("[INFO] Generating document (may take a while)");
+            match std::process::Command::new("cargo").arg("doc").output() {
+                Ok(output) => {
+                    let output = std::str::from_utf8(&output.stderr).unwrap_or("");
+                    if output.starts_with("error: could not find `Cargo.toml` in") {
+                        error!("[ERROR] Cargo.toml Not Found");
+                        return Ok(());
+                    } else if output.starts_with("error: ") {
+                        error!(
+                            "[ERROR] {}",
+                            output.strip_prefix("error: ").unwrap_or(output)
+                        );
+                        return Ok(());
+                    }
+                }
+                Err(e) => {
+                    error!("[ERROR] Cargo Error: {}", e.to_string());
+                    return Ok(());
+                }
+            }
+            let path = Path::new("./target/doc/");
+            let mut index_path = path.to_path_buf();
+            index_path.push(crate_name.to_string() + "/index.html");
+            if !index_path.exists() || !index_path.is_file() {
+                error!("[ERROR] Cargo Error: doc path not found");
+                return Ok(());
+            }
+            set_var("ROOT", display_path(path));
+            let ip = matches
+                .value_of("address")
+                .unwrap_or("127.0.0.1")
+                .to_string();
+            let addr = format!("{}:{}", ip, matches.value_of("port").unwrap_or("8000"));
+            let url = format!(
+                "http://{}:{}/{}/index.html",
+                if ip == "0.0.0.0" { "127.0.0.1" } else { &ip },
+                matches.value_of("port").unwrap_or("8000"),
+                crate_name,
+            );
+            if !matches.is_present("noopen") {
+                open_in_browser(&url);
+            }
+            addr
+        } else {
+            addr
+        };
+        set_var("LISTEN_ADDRESS", addr);
+    
     let server = HttpServer::new(move || {
         let app = App::new()
             .wrap_fn(|req, srv| {
@@ -722,16 +716,26 @@ async fn main() -> std::io::Result<()> {
         let key = &mut BufReader::new(
             std::fs::File::open(Path::new(matches.value_of("key").unwrap())).unwrap(),
         );
-        let cert = rustls_pemfile::certs(cert).unwrap().iter().map(|x| rustls::Certificate(x.to_vec())).collect::<Vec<_>>();
-        let key = rustls::PrivateKey(rustls_pemfile::pkcs8_private_keys(key).unwrap().first().expect("no private key found").to_owned());
+        let cert = rustls_pemfile::certs(cert)
+            .unwrap()
+            .iter()
+            .map(|x| rustls::Certificate(x.to_vec()))
+            .collect::<Vec<_>>();
+        let key = rustls::PrivateKey(
+            rustls_pemfile::pkcs8_private_keys(key)
+                .unwrap()
+                .first()
+                .expect("no private key found")
+                .to_owned(),
+        );
         let config = rustls::ServerConfig::builder()
             .with_safe_defaults()
             .with_no_client_auth()
             .with_single_cert(cert, key)
             .expect("bad certificate/key");
-        server.bind_rustls(addr, config)
+        server.bind_rustls(var("LISTEN_ADDRESS").unwrap_or_else(|_| "0.0.0.0:8000".to_string()), config)
     } else {
-        server.bind(addr)
+        server.bind(var("LISTEN_ADDRESS").unwrap_or_else(|_| "0.0.0.0:8000".to_string()))
     };
     server?.run().await
 }