Bugs again (#703)

* initial * more fixes * logs * more fixes * working rescuer * minor log display fix * mac fixes * minor fix * libsselinux1 * linux error * actions test * more bugs. Modpack page! BIG changes * changed minimum 64 -> 8 * removed modpack page moved to modal * removed unnecessary css * mac compile * many revs * Merge colorful logs (#725) * make implementation not dumb * run prettier * null -> true * Add line numbers & make errors more robust. * improvments * changes; virtual scroll --------- Co-authored-by: qtchaos <[email protected]> * omorphia colors, comments fix * fixes; _JAVA_OPTIONS * revs * mac specific * more mac * some fixes * quick fix * add java reinstall option --------- Co-authored-by: qtchaos <[email protected]> Co-authored-by: Jai A <[email protected]>
modrinth · Sep 12, 2023 · 1e8852b · 1e8852b
1 parent bc02192
commit 1e8852b
Show file tree

Hide file tree

Showing 63 changed files with 2,666 additions and 708 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -25,9 +25,12 @@ body:
  description: A clear and concise description of what you expected to happen.
  validations:
  required: false
+ - type: textarea
+ attributes: System information
+ description: Add any information about what OS you are on (like Windows or Mac), and what version of the app you are using.
  - type: textarea
  attributes:
  label: Additional context
- description: Add any other context about the problem here.
+ description: Add any other context about the problem here. This might include logs, screenshots, etc. The more the merrier!
  validations:
  required: false
diff --git a/.github/workflows/tauri-build.yml b/.github/workflows/tauri-build.yml
@@ -8,7 +8,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- platform: [macos-latest, windows-latest, ubuntu-20.04]
+ platform: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04]
 
  runs-on: ${{ matrix.platform }}
  defaults:
@@ -62,7 +62,7 @@ jobs:
  if: startsWith(matrix.platform, 'ubuntu')
  run: |
  sudo apt-get update
- sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
+ sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf libselinux1
 
  - name: Install frontend dependencies
  run: pnpm install

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/theseus/Cargo.toml b/theseus/Cargo.toml
@@ -20,15 +20,18 @@ url = "2.2"
 uuid = { version = "1.1", features = ["serde", "v4"] }
 zip = "0.6.5"
 async_zip = { version = "0.0.13", features = ["full"] }
+flate2 = "1.0.27"
 tempfile = "3.5.0"
 urlencoding = "2.1.3"
 
+
 chrono = { version = "0.4.19", features = ["serde"] }
 daedalus = { version = "0.1.25" }
 dirs = "5.0.1"
 
 regex = "1.5"
 sys-info = "0.9.0"
+sysinfo = "0.29.9"
 thiserror = "1.0"
 
 tracing = "0.1.37"

diff --git a/theseus/src/api/auth.rs b/theseus/src/api/auth.rs
@@ -1,5 +1,9 @@
 //! Authentication flow interface
-use crate::{hydra::init::DeviceLoginSuccess, launcher::auth as inner, State};
+use crate::{
+ hydra::{self, init::DeviceLoginSuccess},
+ launcher::auth as inner,
+ State,
+};
 use chrono::Utc;
 
 use crate::state::AuthTask;
@@ -44,20 +48,34 @@ pub async fn refresh(user: uuid::Uuid) -> crate::Result<Credentials> {
  .as_error()
  })?;
 
- let fetch_semaphore = &state.fetch_semaphore;
- if Utc::now() > credentials.expires
- && inner::refresh_credentials(&mut credentials, fetch_semaphore)
- .await
- .is_err()
- {
- users.remove(credentials.id).await?;
-
- return Err(crate::ErrorKind::OtherError(
- "Please re-authenticate with your Minecraft account!".to_string(),
- )
- .as_error());
+ let offline = *state.offline.read().await;
+
+ if !offline {
+ let fetch_semaphore: &crate::util::fetch::FetchSemaphore =
+ &state.fetch_semaphore;
+ if Utc::now() > credentials.expires
+ && inner::refresh_credentials(&mut credentials, fetch_semaphore)
+ .await
+ .is_err()
+ {
+ users.remove(credentials.id).await?;
+
+ return Err(crate::ErrorKind::OtherError(
+ "Please re-authenticate with your Minecraft account!"
+ .to_string(),
+ )
+ .as_error());
+ }
+
+ // Update player info from bearer token
+ let player_info = hydra::stages::player_info::fetch_info(&credentials.access_token).await.map_err(|_err| {
+ crate::ErrorKind::HydraError("No Minecraft account for your profile. Make sure you own the game and have set a username through the official Minecraft launcher."
+ .to_string())
+ })?;
+
+ credentials.username = player_info.name;
+ users.insert(&credentials).await?;
  }
- users.insert(&credentials).await?;
 
  Ok(credentials)
 }

diff --git a/theseus/src/api/jre.rs b/theseus/src/api/jre.rs
@@ -7,6 +7,7 @@ use crate::event::emit::{emit_loading, init_loading};
 use crate::state::CredentialsStore;
 use crate::util::fetch::{fetch_advanced, fetch_json};
 
+use crate::util::io;
 use crate::util::jre::extract_java_majorminor_version;
 use crate::{
  state::JavaGlobals,
@@ -92,7 +93,7 @@ pub async fn auto_install_java(java_version: u32) -> crate::Result<PathBuf> {
  let packages = fetch_json::<Vec<Package>>(
  Method::GET,
  &format!(
- "https://api.azul.com/metadata/v1/zulu/packages?arch={}&java_version={}&os={}&archive_type=zip&javafx_bundled=false&java_package_type=jdk&page_size=1",
+ "https://api.azul.com/metadata/v1/zulu/packages?arch={}&java_version={}&os={}&archive_type=zip&javafx_bundled=false&java_package_type=jre&page_size=1",
  std::env::consts::ARCH, java_version, std::env::consts::OS
  ),
  None,
@@ -124,6 +125,17 @@ pub async fn auto_install_java(java_version: u32) -> crate::Result<PathBuf> {
  ))
  })?;
 
+ // removes the old installation of java
+ if let Some(file) = archive.file_names().next() {
+ if let Some(dir) = file.split("/").next() {
+ let path = path.join(dir);
+
+ if path.exists() {
+ io::remove_dir_all(path).await?;
+ }
+ }
+ }
+
  emit_loading(&loading_bar, 0.0, Some("Extracting java")).await?;
  archive.extract(&path).map_err(|_| {
  crate::Error::from(crate::ErrorKind::InputError(
@@ -180,6 +192,20 @@ pub async fn check_jre(path: PathBuf) -> crate::Result<Option<JavaVersion>> {
  Ok(jre::check_java_at_filepath(&path).await)
 }
 
+// Test JRE at a given path
+pub async fn test_jre(
+ path: PathBuf,
+ major_version: u32,
+ minor_version: u32,
+) -> crate::Result<bool> {
+ let jre = match jre::check_java_at_filepath(&path).await {
+ Some(jre) => jre,
+ None => return Ok(false),
+ };
+ let (major, minor) = extract_java_majorminor_version(&jre.version)?;
+ Ok(major == major_version && minor == minor_version)
+}
+
 // Gets maximum memory in KiB.
 pub async fn get_max_memory() -> crate::Result<u64> {
  Ok(sys_info::mem_info()