Merge branch 'master' into feat/new-presence

Author: headassbtw

.github/workflows/build-ci.yml

@@ -1,6 +1,6 @@
 name: Maxima Build
 
-on: [push, pull_request]
+on: [push]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

Cargo.toml

@@ -16,4 +16,3 @@ strip = true
 [patch.crates-io]
 flate2 = { git = 'https://github.com/ArmchairDevelopers/flate2-rs.git' }
 async-compression = { git = 'https://github.com/ArmchairDevelopers/async-compression.git' }
-dll-syringe = { git = "https://github.com/fry/dll-syringe", rev = "0a8b18e" }

README.md

@@ -3,11 +3,11 @@
 ![Logo](images/1500x500.jpg)
 
 > [!WARNING]
-> Maxima is in beta. Parts of it may not be fully stable, and we're actively fixing bugs and adding features. Please create an [issue](https://github.com/ArmchairDevelopers/Maxima/issues) if you notice strange behavior.
+> Maxima is pre-pre-pre-alpha-quality software, and is being made open source **prematurely** for [KYBER](https://github.com/ArmchairDevelopers/Kyber), which depends on it. We cannot yet provide any support for attempting to use it standalone, although bug-fixes and [contributions](CONTRIBUTING.md) are welcome.
 
-Maxima is an open-source replacement for the EA Desktop/Origin game launcher, running natively on Linux and Windows, with MacOS support in progress.
+Maxima is an open-source replacement for the EA Desktop/Origin game launcher, running natively on Linux and Windows, with macOS support in progress.
 
-Maxima itself is a library (`maxima-lib`), with povided CLI (`maxima-cli`), TUI (`maxima-tui`), and GUI (`maxima-ui`) frontends. Other launchers compatible with Maxima's license may implement it as a backend. It's used by our sister project, [KYBER](https://uplink.kyber.gg/news/features-overview).
+Maxima itself is a library (`maxima-lib`), with provided CLI (`maxima-cli`), TUI (`maxima-tui`), and GUI (`maxima-ui`) frontends. Other launchers compatible with Maxima's license may implement it as a backend. It's used by our sister project, [KYBER](https://uplink.kyber.gg/news/features-overview).
 
 ![UI](images/UI.png)
 
@@ -26,13 +26,13 @@ Maxima itself is a library (`maxima-lib`), with povided CLI (`maxima-cli`), TUI
    - `proton-ge` is automatically installed together with [umu](https://github.com/Open-Wine-Components/umu-launcher).
 
 **In-Dev:**
- - MacOS support
+ - macOS support
  - Support for launching Maxima through Epic/Steam
 
 **Planned:**
  - Library documentation/examples
  - Support for installing DLCs
- - Full EA Desktop interopability. Games installed with EA Desktop already appear on Maxima, but to take it a step further we'd like the ability to, for example, start a download on EA Desktop and continue it on Maxima.
+ - Full EA Desktop interoperability. Games installed with EA Desktop already appear on Maxima, but to take it a step further we'd like the ability to, for example, start a download on EA Desktop and continue it on Maxima.
  - Cleaner/Stabler downloader implementation
  - Progressive/Selective installs
    - Some games are able to start without being fully installed, and some games contain language-specific files.
@@ -57,7 +57,12 @@ It's the farthest you can get from the Origin.
 ## Contributing
 See [CONTRIBUTING.md](./CONTRIBUTING.md)
 
+## Honorable mentions
+ - [Sean Kahler](https://github.com/battledash)
+   - Former Core maintainer
+   - Creator of Maxima
+
 ## Maintainers:
- - [Sean Kahler](https://github.com/battledash) (Core)
  - [Nick Whelan](https://github.com/headassbtw) (UI)
  - [Paweł Lidwin](https://github.com/imLinguin) (Core)
+

maxima-cli/src/main.rs

@@ -31,7 +31,7 @@ use maxima::{
         },
         clients::JUNO_PC_CLIENT_ID,
         cloudsync::CloudSyncLockMode,
-        launch::{self, LaunchMode},
+        launch::{self, LaunchMode, LaunchOptions},
         library::OwnedTitle,
         manifest::{self, MANIFEST_RELATIVE_PATH},
         service_layer::{
@@ -829,12 +829,17 @@ async fn start_game(
         }
     }
 
+    let launch_options = LaunchOptions {
+        path_override: game_path_override,
+        arguments: game_args,
+        cloud_saves: true,
+    };
+
     if login.is_none() {
         launch::start_game(
             maxima_arc.clone(),
             LaunchMode::Online(offer_id.to_owned()),
-            game_path_override,
-            game_args,
+            launch_options,
         )
         .await?;
     } else if let Some(captures) = MANUAL_LOGIN_PATTERN.captures(&login.unwrap()) {
@@ -844,8 +849,7 @@ async fn start_game(
         launch::start_game(
             maxima_arc.clone(),
             LaunchMode::OnlineOffline(offer_id.to_owned(), persona.to_owned(), password.to_owned()),
-            game_path_override,
-            game_args,
+            launch_options,
         )
         .await?;
     }

maxima-lib/Cargo.toml

@@ -29,6 +29,7 @@ hex = "0.4.3"
 lazy_static = "1.4.0"
 reqwest = { version = "0.11.18", features = ["stream", "rustls-tls", "gzip", "json"], default-features = false }
 base64 = "0.21.2"
+base62 = "2.2.0"
 log = "0.4.19"
 enable-ansi-support = "0.2.1"
 chrono = "0.4.26"
@@ -41,7 +42,7 @@ sysinfo = "0.29.7"
 strum_macros = "0.25.2"
 sha2-const = "0.1.2"
 tar = "0.4"
-flate2 = { version = "1.0.28", default-features = false, features = ["zlib-default"] }
+flate2 = { version = "=1.0.28", default-features = false, features = ["zlib-default"] }
 xz2 = "0.1.7"
 zstd = "0.13.0"
 toml = "0.8.8"
@@ -98,7 +99,6 @@ winreg = "0.51.0"
 windows-service = "0.6.0"
 is_elevated = "0.1.2"
 widestring = "1.0.2"
-dll-syringe = "0.15.2"
 wmi = "0.13.1"
 
 [target.'cfg(target_os = "macos")'.dependencies]

maxima-lib/src/core/auth/context.rs

@@ -1,3 +1,5 @@
+use std::borrow::Cow;
+
 use crate::core::{
     auth::{hardware::HardwareHashError, pc_sign::PCSign, storage::AuthError},
     clients::JUNO_PC_CLIENT_ID,
@@ -15,6 +17,8 @@ pub struct AuthContext<'a> {
     code: Option<String>,
     scopes: Vec<String>,
     access_token: Option<String>,
+    token_format: Option<String>,
+    expires_in: Option<i64>,
     pc_sign: PCSign<'a>,
 }
 
@@ -30,20 +34,19 @@ impl AuthContext<'_> {
             code: None,
             scopes: Vec::new(),
             access_token: None,
+            token_format: None,
+            expires_in: None,
             pc_sign: signature,
         })
     }
 
-    /// Generates 32 byte long buffer used for code_verifier
     fn generate_code_verifier() -> String {
         let rand_bytes: [u8; 32] = random();
-
         URL_SAFE_NO_PAD.encode(&rand_bytes)
     }
 
     fn generate_challenge(code_verifier: &String) -> String {
         let hash = Sha256::new().update(code_verifier.as_bytes()).finalize();
-
         URL_SAFE_NO_PAD.encode(hash)
     }
 
@@ -57,16 +60,12 @@ impl AuthContext<'_> {
         Ok(payload.to_string() + "." + URL_SAFE_NO_PAD.encode(value).as_ref())
     }
 
-    /// Returns String representation of code_verifier
     pub fn code_verifier(&self) -> &str {
         &self.code_verifier
     }
 
     pub fn code(&self) -> Option<&str> {
-        match &self.code {
-            Some(code) => Some(&code),
-            None => None,
-        }
+        self.code.as_deref()
     }
 
     pub fn add_scope(&mut self, scope: &str) {
@@ -78,16 +77,29 @@ impl AuthContext<'_> {
     }
 
     pub fn access_token(&self) -> Option<&str> {
-        match &self.access_token {
-            Some(access_token) => Some(&access_token),
-            None => None,
-        }
+        self.access_token.as_deref()
     }
 
     pub fn set_access_token(&mut self, token: &str) {
         self.access_token = Some(token.to_owned())
     }
 
+    pub fn token_format(&self) -> Option<&str> {
+        self.token_format.as_deref()
+    }
+
+    pub fn set_token_format(&mut self, token_format: &str) {
+        self.token_format = Some(token_format.to_owned());
+    }
+
+    pub fn expires_in(&self) -> Option<i64> {
+        self.expires_in
+    }
+
+    pub fn set_expires_in(&mut self, expires_in: i64) {
+        self.expires_in = Some(expires_in);
+    }
+
     pub fn nucleus_auth_url(
         &self,
         client_id: &str,
@@ -97,26 +109,34 @@ impl AuthContext<'_> {
         let nonce = random::<i32>().to_string();
 
         let mut query = vec![
-            ("client_id", client_id),
-            ("sbiod_enabled", "false"),
-            ("response_type", response_type),
-            ("locale", "en_US"),
-            ("pc_sign", &signature),
-            ("nonce", &nonce),
+            ("client_id", Cow::Borrowed(client_id)),
+            ("sbiod_enabled", Cow::Borrowed("false")),
+            ("response_type", Cow::Borrowed(response_type)),
+            ("locale", Cow::Borrowed("en_US")),
+            ("pc_sign", Cow::Borrowed(&signature)),
+            ("nonce", Cow::Borrowed(&nonce)),
         ];
 
         let scopes = self.scopes.join(" ");
         if !scopes.is_empty() {
-            query.push(("scope", &scopes));
+            query.push(("scope", Cow::Owned(scopes)));
         }
 
         if client_id == JUNO_PC_CLIENT_ID {
-            query.push(("code_challenge_method", "S256"));
-            query.push(("code_challenge", &self.code_challenge));
+            query.push(("code_challenge_method", Cow::Borrowed("S256")));
+            query.push(("code_challenge", Cow::Borrowed(&self.code_challenge)));
         }
 
         if let Some(access_token) = &self.access_token {
-            query.push(("access_token", access_token));
+            query.push(("access_token", Cow::Borrowed(access_token)));
+        }
+
+        if let Some(token_format) = &self.token_format {
+            query.push(("token_format", Cow::Borrowed(token_format)));
+        }
+
+        if let Some(expires_in) = self.expires_in {
+            query.push(("expires_in", Cow::Owned(expires_in.to_string())));
         }
 
         let url = reqwest::Url::parse_with_params(API_NUCLEUS_AUTH, query)?;

maxima-lib/src/core/auth/hardware.rs

@@ -255,7 +255,7 @@ impl HardwareInfo {
 
         use crate::util::system_profiler_utils::SPDisplaysDataType;
 
-        let smbios_data = table_load_from_device()?;
+        let smbios_data = table_load_from_device().unwrap();
         let bios_data = smbios_data.first::<SMBiosSystemInformation>();
         let board_data = smbios_data.first::<SMBiosBaseboardInformation>();
 
@@ -282,7 +282,7 @@ impl HardwareInfo {
         let mut gpu_pnp_id: Option<String> = None;
         let output = Command::new("system_profiler")
             .args(["SPDisplaysDataType", "-json"])
-            .output()?;
+            .output().unwrap();
         if output.status.success() {
             let json = String::from_utf8_lossy(&output.stdout);
             let result: SPDisplaysDataType = serde_json::from_str(&json).unwrap();
@@ -298,7 +298,7 @@ impl HardwareInfo {
         }
 
         let mut disk_sn = String::from("None");
-        let output = Command::new("diskutil").args(["info", "/"]).output()?;
+        let output = Command::new("diskutil").args(["info", "/"]).output().unwrap();
         // Check if the command was successful
         if output.status.success() {
             // Convert the output bytes to a UTF-8 string
@@ -327,6 +327,7 @@ impl HardwareInfo {
             volume_sn: String::from("43000000"),
             mac,
             cpu_details,
+            hostname,
         }
     }
 

maxima-lib/src/core/background_service_win.rs

@@ -1,9 +1,9 @@
-use dll_syringe::{process::OwnedProcess, Syringe};
 use log::debug;
 use reqwest::StatusCode;
 use serde::{Deserialize, Serialize};
 
 use crate::core::error::BackgroundServiceClientError;
+use crate::util::dll_injector::DllInjector;
 use crate::util::native::NativeError;
 use crate::util::registry::{set_up_registry, RegistryError};
 use is_elevated::is_elevated;
@@ -23,9 +23,8 @@ pub async fn request_library_injection(
     debug!("Injecting {}", path);
 
     if is_elevated() {
-        let process = OwnedProcess::from_pid(pid)?;
-        let syringe = Syringe::for_process(process);
-        syringe.inject(path)?;
+        let injector = DllInjector::new(pid);
+        injector.inject(path)?;
         return Ok(());
     }