v0.6.3

reduces binary size by using os ssl/openssl for http_req and reqwest until #43 gets done

Cargo.lock

@@ -28,7 +28,7 @@ dependencies = [
 
 [[package]]
 name = "alterware-launcher"
-version = "0.5.4"
+version = "0.6.2"
 dependencies = [
  "colored",
  "futures-util",
@@ -438,15 +438,12 @@ dependencies = [
 
 [[package]]
 name = "http_req"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "158d4edacc70c9bdb0464314063b8d9d60fa776442dc13b00a13581b88b0a0a0"
+checksum = "a536d8715c89f5647abd1563c490b75a76221de4b57833a1f243cf5c5fe7860c"
 dependencies = [
- "rustls",
- "rustls-pemfile",
+ "native-tls",
  "unicase",
- "webpki",
- "webpki-roots",
 ]
 
 [[package]]
@@ -989,35 +986,6 @@ dependencies = [
  "winreg 0.50.0",
 ]
 
-[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin 0.5.2",
- "untrusted 0.7.1",
- "web-sys",
- "winapi",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "911b295d2d302948838c8ac142da1ee09fa7863163b44e6715bc9357905878b8"
-dependencies = [
- "cc",
- "getrandom",
- "libc",
- "spin 0.9.8",
- "untrusted 0.9.0",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "rustc-demangle"
 version = "0.1.23"
@@ -1037,37 +1005,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
-dependencies = [
- "log",
- "ring 0.16.20",
- "rustls-webpki",
- "sct",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
-dependencies = [
- "base64",
-]
-
-[[package]]
-name = "rustls-webpki"
-version = "0.101.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe"
-dependencies = [
- "ring 0.16.20",
- "untrusted 0.7.1",
-]
-
 [[package]]
 name = "ryu"
 version = "1.0.13"
@@ -1083,16 +1020,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "sct"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
-dependencies = [
- "ring 0.16.20",
- "untrusted 0.7.1",
-]
-
 [[package]]
 name = "security-framework"
 version = "2.9.2"
@@ -1135,18 +1062,18 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
 
 [[package]]
 name = "serde"
-version = "1.0.189"
+version = "1.0.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
+checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.189"
+version = "1.0.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
+checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1222,18 +1149,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
 [[package]]
 name = "steamlocate"
 version = "2.0.0-alpha.0"
@@ -1467,18 +1382,6 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
-[[package]]
-name = "untrusted"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-
 [[package]]
 name = "url"
 version = "2.4.1"
@@ -1606,22 +1509,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "webpki"
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
-dependencies = [
- "ring 0.17.2",
- "untrusted 0.9.0",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.25.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
-
 [[package]]
 name = "winapi"
 version = "0.3.9"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "alterware-launcher"
-version = "0.5.4"
+version = "0.6.3"
 edition = "2021"
 build = "res/build.rs"
 
@@ -15,11 +15,9 @@ panic = "abort"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-http_req = { version = "0.10.0", default-features = false, features = [
-    "rust-tls",
-] }
+http_req = "0.10.1"
 sha1_smol = "1.0.0"
-serde = { version = "1.0.189", features = ["derive"] }
+serde = { version = "1.0.190", features = ["derive"] }
 serde_json = "1.0.107"
 rand = "0.8.5"
 semver = "1.0.20"
@@ -29,6 +27,9 @@ futures-util = "0.3.29"
 indicatif = "0.17.7"
 tokio = {version="1.33.0", features = ["rt-multi-thread", "macros"]}
 
+[target.'cfg(unix)'.dependencies]
+openssl = { version = "0.10.58", default-features = false, features = ["vendored"] }
+
 [target.'cfg(windows)'.dependencies]
 steamlocate = "2.0.0-alpha.0"
 mslnk = "0.1.8"

src/config.rs

@@ -40,3 +40,13 @@ pub fn save_value(config_path: PathBuf, key: &str, value: bool) {
     }
     save(config_path, config);
 }
+
+pub fn save_value_s(config_path: PathBuf, key: &str, value: String) {
+    let mut config = load(config_path.clone());
+    match key {
+        "args" => config.args = value.to_string(),
+        "engine" => config.engine = value.to_string(),
+        _ => (),
+    }
+    save(config_path, config);
+}

src/http_async.rs

@@ -19,6 +19,14 @@ pub async fn download_file(
 ) -> Result<(), String> {
     let res = client
         .get(url)
+        .header(
+            "User-Agent",
+            &format!(
+                "AlterWare Launcher | github.com/{}/{}",
+                crate::global::GH_OWNER,
+                crate::global::GH_REPO
+            ),
+        )
         .send()
         .await
         .or(Err(format!("Failed to GET from '{}'", &url)))?;
@@ -31,7 +39,7 @@ pub async fn download_file(
         misc::cute_path(path),
         misc::human_readable_bytes(total_size)
     ));
-    pb.set_message(misc::cute_path(path));
+    pb.set_message(path.file_name().unwrap().to_str().unwrap().to_string());
 
     let mut file =
         File::create(path).or(Err(format!("Failed to create file '{}'", path.display())))?;
@@ -47,6 +55,6 @@ pub async fn download_file(
         pb.set_position(new);
     }
 
-    pb.set_message("");
+    pb.set_message(String::default());
     Ok(())
 }

src/iw4x.rs

@@ -23,13 +23,21 @@ pub fn update(dir: &Path) {
     let local = local_revision(dir);
 
     if remote <= local && dir.join("iw4x.dll").exists() {
+        println!(
+            "[{}]        No files to download for IW4x",
+            "Info".bright_magenta(),
+        );
         return;
     }
 
+    println!(
+        "[{}]        Downloading outdated or missing files for IW4x",
+        "Info".bright_magenta()
+    );
     println!(
         "[{}] {}",
         "Downloading".bright_yellow(),
-        dir.join("iw4x.dll").display()
+        misc::cute_path(&dir.join("iw4x.dll"))
     );
     http::download_file(
         &format!(

src/main.rs

@@ -12,11 +12,10 @@ use global::*;
 use structs::*;
 
 use colored::*;
+use indicatif::ProgressBar;
 #[cfg(windows)]
 use mslnk::ShellLink;
-
-use indicatif::ProgressBar;
-use std::{borrow::Cow, collections::HashMap, fs, path::Path, path::PathBuf};
+use std::{borrow::Cow, collections::HashMap, env, fs, path::Path, path::PathBuf};
 #[cfg(windows)]
 use steamlocate::SteamDir;
 
@@ -78,10 +77,7 @@ fn setup_desktop_links(path: &Path, game: &Game) {
     let input = misc::stdin().to_ascii_lowercase();
 
     if input == "y" || input.is_empty() {
-        let desktop = PathBuf::from(&format!(
-            "{}\\Desktop",
-            std::env::var("USERPROFILE").unwrap()
-        ));
+        let desktop = PathBuf::from(&format!("{}\\Desktop", env::var("USERPROFILE").unwrap()));
 
         for c in game.client.iter() {
             create_shortcut(
@@ -112,7 +108,7 @@ async fn windows_launcher_install(games: &Vec<Game<'_>>) {
     let installed_games = get_installed_games(games);
 
     if !installed_games.is_empty() {
-        let current_dir = std::env::current_dir().unwrap();
+        let current_dir = env::current_dir().unwrap();
         for (id, path) in installed_games.iter() {
             if current_dir.starts_with(path) {
                 println!("Found game in current directory.");
@@ -142,7 +138,7 @@ async fn windows_launcher_install(games: &Vec<Game<'_>>) {
             if *id == input {
                 let game = games.iter().find(|&g| g.app_id == input).unwrap();
 
-                let launcher_path = std::env::current_exe().unwrap();
+                let launcher_path = env::current_exe().unwrap();
                 let target_path = path.join("alterware-launcher.exe");
 
                 if launcher_path != target_path {
@@ -177,7 +173,7 @@ fn prompt_client_selection(games: &[Game]) -> String {
 async fn manual_install(games: &[Game<'_>]) {
     let selection = prompt_client_selection(games);
     let game = games.iter().find(|&g| g.client[0] == selection).unwrap();
-    update(game, &std::env::current_dir().unwrap(), false, false).await;
+    update(game, &env::current_dir().unwrap(), false, false).await;
     println!("Installation complete. Please run the launcher again or use a shortcut to launch the game.");
     std::io::stdin().read_line(&mut String::new()).unwrap();
     std::process::exit(0);
@@ -231,6 +227,7 @@ async fn update_dir(
                     "Checked".bright_blue(),
                     misc::cute_path(&file_path)
                 ));
+                hashes.insert(file_name.to_owned(), file.hash.to_lowercase());
             }
         } else {
             files_to_download.push(file.clone());
@@ -294,13 +291,13 @@ async fn update(game: &Game<'_>, dir: &Path, bonus_content: bool, force: bool) {
         }
     }
 
-    let pb = ProgressBar::new(0);
-    update_dir(&cdn_info, game.engine, dir, &mut hashes, &pb).await;
-
     if game.engine == "iw4" {
         iw4x::update(dir);
     }
 
+    let pb = ProgressBar::new(0);
+    update_dir(&cdn_info, game.engine, dir, &mut hashes, &pb).await;
+
     if bonus_content && !game.bonus.is_empty() {
         for bonus in game.bonus.iter() {
             update_dir(&cdn_info, bonus, dir, &mut hashes, &pb).await;
@@ -334,6 +331,22 @@ fn setup_env() {
         println!("{:#?}", error);
         colored::control::SHOULD_COLORIZE.set_override(false);
     });
+
+    if let Ok(system_root) = env::var("SystemRoot") {
+        if let Ok(current_dir) = env::current_dir() {
+            if current_dir.starts_with(system_root) {
+                if let Ok(current_exe) = env::current_exe() {
+                    if let Some(parent) = current_exe.parent() {
+                        if let Err(error) = env::set_current_dir(parent) {
+                            eprintln!("{:#?}", error);
+                        } else {
+                            println!("Running from the system directory. Changed working directory to the executable location.");
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
 
 fn arg_value(args: &[String], arg: &str) -> Option<String> {
@@ -361,8 +374,7 @@ fn arg_remove_value(args: &mut Vec<String>, arg: &str) {
 async fn main() {
     #[cfg(windows)]
     setup_env();
-
-    let mut args: Vec<String> = std::env::args().collect();
+    let mut args: Vec<String> = env::args().collect();
 
     if arg_bool(&args, "--help") {
         println!("CLI Args:");
@@ -409,7 +421,7 @@ async fn main() {
         install_path = PathBuf::from(path);
         arg_remove_value(&mut args, "-p");
     } else {
-        install_path = std::env::current_dir().unwrap();
+        install_path = env::current_dir().unwrap();
     }
 
     let mut cfg = config::load(install_path.join("alterware-launcher.json"));
@@ -442,7 +454,7 @@ async fn main() {
         cfg.args = pass;
         arg_remove_value(&mut args, "--pass");
     } else if cfg.args.is_empty() {
-        cfg.args = String::from("");
+        cfg.args = String::default();
     }
 
     let games_json = http::get_body_string(format!("{}/games.json", MASTER).as_str());
@@ -462,7 +474,7 @@ async fn main() {
                         }
 
                         #[cfg(windows)]
-                        setup_client_links(g, &std::env::current_dir().unwrap());
+                        setup_client_links(g, &env::current_dir().unwrap());
 
                         #[cfg(not(windows))]
                         println!("Multiple clients installed, set the client as the first argument to launch a specific client.");
@@ -483,6 +495,23 @@ async fn main() {
     for g in games.iter() {
         for c in g.client.iter() {
             if c == &game {
+                if cfg.engine.is_empty() {
+                    cfg.engine = String::from(g.engine);
+                    config::save_value_s(
+                        install_path.join("alterware-launcher.json"),
+                        "engine",
+                        cfg.engine.clone(),
+                    );
+                    if cfg.engine == "iw4" && cfg.args.is_empty() {
+                        cfg.args = String::from("-stdout");
+                        config::save_value_s(
+                            install_path.join("alterware-launcher.json"),
+                            "args",
+                            cfg.args.clone(),
+                        );
+                    }
+                }
+
                 if cfg.ask_bonus_content && !g.bonus.is_empty() {
                     println!("Download bonus content? (Y/n)");
                     let input = misc::stdin().to_ascii_lowercase();

src/self_update.rs

@@ -25,6 +25,19 @@ pub fn run(_update_only: bool) {
     }
 }
 
+#[cfg(windows)]
+pub fn restart() -> std::io::Error {
+    use std::os::windows::process::CommandExt;
+    match std::process::Command::new(std::env::current_exe().unwrap())
+        .args(std::env::args().skip(1))
+        .creation_flags(0x00000010) // CREATE_NEW_CONSOLE
+        .spawn()
+    {
+        Ok(_) => std::process::exit(0),
+        Err(err) => err,
+    }
+}
+
 #[cfg(windows)]
 pub fn run(update_only: bool) {
     use std::{fs, path::PathBuf};
@@ -43,7 +56,9 @@ pub fn run(update_only: bool) {
             && (file_name.contains(".__relocated__.exe")
                 || file_name.contains(".__selfdelete__.exe"))
         {
-            fs::remove_file(file.path()).unwrap();
+            fs::remove_file(file.path()).unwrap_or_else(|_| {
+                println!("Failed to remove old launcher file.");
+            });
         }
     }
 
@@ -66,7 +81,7 @@ pub fn run(update_only: bool) {
         } else {
             "alterware-launcher.exe"
         };
-        println!("{}", launcher_name);
+
         http::download_file(
             &format!(
                 "{}/download/{}",
@@ -83,12 +98,12 @@ pub fn run(update_only: bool) {
 
         self_replace::self_replace("alterware-launcher-update.exe").unwrap();
         fs::remove_file(&file_path).unwrap();
-        println!(
-            "Launcher updated. View the changelog at https://github.com/{}/{}/releases/latest",
-            GH_OWNER, GH_REPO,
-        );
-        println!("Please restart the launcher.");
+
+        // restarting spawns a new console, automation should manually restart on exit code 201
         if !update_only {
+            let restart_error = restart().to_string();
+            println!("Failed to restart launcher: {}", restart_error);
+            println!("Please restart the launcher manually.");
             misc::stdin();
         }
         std::process::exit(201);

src/structs.rs

@@ -22,6 +22,8 @@ pub struct Config {
     pub ask_bonus_content: bool,
     pub force_update: bool,
     pub args: String,
+    #[serde(default)]
+    pub engine: String,
 }
 
 impl Default for Config {
@@ -32,7 +34,8 @@ impl Default for Config {
             download_bonus_content: false,
             ask_bonus_content: true,
             force_update: false,
-            args: String::from(""),
+            args: String::default(),
+            engine: String::default(),
         }
     }
 }