Merge branch 'master' of https://git.ez-pp.farm/EZPPFarm/EZPPLauncher

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ezpplauncher",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "description": "",
   "type": "module",
   "scripts": {

scripts/build.ts

@@ -34,4 +34,7 @@ function run(cmd: string, args: string[]): Promise<void> {
 
 await run('bun', ['./scripts/sync-version.ts']);
 await runVite();
+
+//set NO_STRIP=1 in env for linux to prevent stripping of debug symbols in tauri builds, which causes issues with source maps
+if (process.platform === 'linux') process.env.NO_STRIP = '1';
 await run('bunx', ['tauri', 'build']);

src-tauri/Cargo.lock

@@ -1239,7 +1239,7 @@ dependencies = [
 
 [[package]]
 name = "ezpplauncher"
-version = "3.2.2"
+version = "3.2.3"
 dependencies = [
  "aes-gcm",
  "anyhow",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ezpplauncher"
-version = "3.2.2"
+version = "3.2.3"
 description = "EZPPLauncher redefined."
 authors = ["HorizonCode"]
 edition = "2024"

src-tauri/src/commands.rs

@@ -36,14 +36,15 @@ pub fn opened_urls(app: tauri::AppHandle) -> Vec<PathBuf> {
 }
 
 #[tauri::command]
-pub fn get_launcher_version() -> String {
+pub fn get_launcher_version(app: tauri::AppHandle) -> String {
-    env!("CARGO_PKG_VERSION").to_string()
+    app.package_info().version.to_string()
 }
 
 #[tauri::command]
 pub fn get_hwid() -> String {
-    let hwid = get_id().unwrap();
+    get_id()
-    hwid.into()
+        .unwrap_or("recorderinsandybridge".to_string())
+        .into()
 }
 
 #[tauri::command(rename_all = "snake_case")]
@@ -79,7 +80,6 @@ pub fn valid_osu_folder(folder: String) -> bool {
     check_folder_completeness(path, &osu_folder_files) >= 70.0
 }
 
-#[cfg(windows)]
 #[tauri::command]
 pub fn find_osu_installation() -> Option<String> {
     #[cfg(windows)]
@@ -450,8 +450,6 @@ pub async fn run_osu(folder: String, patch: bool) -> Result<(), String> {
         }
     };
 
-    #[cfg(windows)]
-    {
     if patch {
         let patcher_exe_path = PathBuf::from(&folder)
             .join("EZPPLauncher")
@@ -459,8 +457,6 @@ pub async fn run_osu(folder: String, patch: bool) -> Result<(), String> {
             .join("osu!.patcher.exe");
 
         if patcher_exe_path.exists() {
-                #[cfg(windows)]
-                {
             let mut sys = System::new_all();
 
             loop {
@@ -486,12 +482,20 @@ pub async fn run_osu(folder: String, patch: bool) -> Result<(), String> {
 
                 sleep(Duration::from_millis(500)).await;
             }
-
+            #[cfg(windows)]
+            {
                 let _ = Command::new(&patcher_exe_path)
                     .creation_flags(DETACHED_PROCESS | CREATE_NEW_PROCESS_GROUP)
                     .spawn()
                     .map_err(|e| format!("Failed to run patcher: {e}"))?;
             }
+            #[cfg(not(windows))]
+            {
+                let _ = Command::new("osu-wine")
+                    .arg("--wine")
+                    .arg(&patcher_exe_path)
+                    .spawn()
+                    .map_err(|e| format!("Failed to run patcher: {}", e))?;
             }
         }
     }
@@ -958,7 +962,6 @@ pub async fn download_ezpp_launcher_update(app: AppHandle, url: String) -> Resul
     Ok(())
 }
 
-#[cfg(windows)]
 #[tauri::command]
 pub async fn install_ezpp_launcher_update(app: AppHandle) -> Result<(), String> {
     #[cfg(windows)]

src-tauri/src/utils.rs

@@ -24,10 +24,13 @@ pub fn get_osu_user_config<P: AsRef<Path>>(
         return None;
     }
 
-    let current_user = std::env::var("USERNAME").unwrap_or_else(|_| "Admin".to_string());
+    let current_user = std::env::var("USERNAME")
+        .or_else(|_| std::env::var("USER"))
+        .unwrap_or_else(|_| "Admin".to_string());
     let osu_config_path = osu_folder_path
         .as_ref()
         .join(format!("osu!.{}.cfg", current_user));
+    println!("Looking for user config at: {:?}", osu_config_path);
     if !osu_config_path.exists() {
         return None;
     }
@@ -48,7 +51,9 @@ pub fn set_osu_user_config_vals(
     osu_folder_path: &str,
     key_values: &[(&str, Option<&str>)],
 ) -> Result<bool, String> {
-    let current_user = std::env::var("USERNAME").unwrap_or_else(|_| "Admin".to_string());
+    let current_user = std::env::var("USERNAME")
+        .or_else(|_| std::env::var("USER"))
+        .unwrap_or_else(|_| "Admin".to_string());
     let osu_config_path = Path::new(osu_folder_path).join(format!("osu!.{}.cfg", current_user));
 
     if !osu_config_path.exists() {
@@ -310,7 +315,9 @@ pub async fn is_net8_installed() -> bool {
             }
 
             let stdout_str = String::from_utf8_lossy(&output.stdout);
-            stdout_str.lines().any(|line| line.starts_with("Microsoft.WindowsDesktop.App 8."))
+            stdout_str
+                .lines()
+                .any(|line| line.starts_with("Microsoft.WindowsDesktop.App 8."))
         }
         Err(_) => false,
     }

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "EZPPLauncher",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "identifier": "farm.EZPPFarm.Launcher",
   "mainBinaryName": "ezpplauncher",
   "build": {

src/lib/themes.ts

@@ -1,5 +1,5 @@
 import { active_custom_theme, custom_themes } from './global';
-import { setGlobalVolume } from './utils';
+import { disableMediaControls, setGlobalVolume } from './utils';
 import { betterFetch } from '@better-fetch/fetch';
 import { convertFileSrc } from '@tauri-apps/api/core';
 import { invoke } from '@tauri-apps/api/core';
@@ -268,6 +268,7 @@ export const loadTheme = async (theme: Theme, themeContainer: HTMLElement, volum
     themeScript.mountTheme(themeContainer, { assets: theme.assets });
   }
   setGlobalVolume(volume);
+  disableMediaControls();
 };
 
 export const deleteTheme = async (themeToUninstall: Theme) => {

src/lib/types.ts

@@ -1,3 +1,5 @@
+export type LaunchView = 'HOME' | 'LOGIN' | 'SETTINGS' | 'THEMES';
+
 export type EZPPUserResponse = {
   code: number;
   message: string;

src/lib/utils.ts

@@ -203,6 +203,43 @@ export function trackMediaContainer(node: HTMLElement) {
   };
 }
 
+const MEDIA_ACTIONS: MediaSessionAction[] = [
+  'play',
+  'pause',
+  'stop',
+  'previoustrack',
+  'nexttrack',
+  'seekbackward',
+  'seekforward',
+];
+
+export function disableMediaControls() {
+  const mediaElements: NodeListOf<HTMLMediaElement> = document.querySelectorAll('audio, video');
+
+  if ('mediaSession' in navigator) {
+    MEDIA_ACTIONS.forEach((action) => {
+      try {
+        navigator.mediaSession.setActionHandler(action, () => {});
+      } catch {}
+    });
+  }
+
+  document.addEventListener(
+    'keydown',
+    (e: KeyboardEvent) => {
+      if (e.key.startsWith('Media')) {
+        e.preventDefault();
+        e.stopPropagation();
+      }
+    },
+    true
+  );
+
+  mediaElements.forEach((el) => {
+    el.disableRemotePlayback = true;
+  });
+}
+
 export function calculateGitBlobSha(fileBuffer: Buffer): string {
   const header = Buffer.from(`blob ${fileBuffer.length}\0`);
   const store = Buffer.concat([header, fileBuffer]);

src/routes/+layout.svelte

@@ -135,7 +135,7 @@
     const localThemes = await getThemes();
     const lastThemeName = await config_theme.get('Default');
     const last_theme = localThemes.find((t) => t.name === lastThemeName);
-    if (!last_theme) {
+    if (!last_theme || $platform === 'linux') {
       await config.value<string>('theme').set('Default');
       loadTheme(localThemes[0], $custom_theme_container!, await config_theme_volume.get(0.15));
     } else {

src/screens/Launch.svelte

@@ -88,7 +88,7 @@
     loadTheme,
     type ThemeInfo,
   } from '$lib/themes';
-  import { EZPPActionStatus } from '$lib/types';
+  import { EZPPActionStatus, type LaunchView } from '$lib/types';
   import { currentUser } from '$lib/userAuthentication';
   import {
     cursorSmoothening,
@@ -141,7 +141,7 @@
   import { onMount } from 'svelte';
   import { fade, fly, scale } from 'svelte/transition';
 
-  let selectedView = $state('home');
+  let selectedView = $state<LaunchView>('HOME');
   let progress = $state(-1);
   let launchInfo = $state('');
   let launchError = $state<Error | undefined>(undefined);
@@ -304,7 +304,9 @@
 
     try {
       launchInfo = 'Looking for file updates...';
-      const updateResult = await getEZPPLauncherUpdateFiles(osuPath, $launcherStream);
+      let launchStream = $launcherStream;
+      if ($platform !== 'windows') launchStream = 'stable'; //fallback to stable for non windows systems
+      const updateResult = await getEZPPLauncherUpdateFiles(osuPath, launchStream);
 
       if (updateResult) {
         if (updateResult.filesToDownload.length > 0) {
@@ -573,6 +575,7 @@
                 const beatmapCoverImage = `https://assets.ppy.sh/beatmaps/${userStatus.player_status.status.beatmap.set_id}/covers/list@2x.jpg`;
                 const isValidImage = await urlIsValidImage(beatmapCoverImage);
                 if (isValidImage) largeImageKey = beatmapCoverImage;
+                if (userStatus.player_status.status.action !== EZPPActionStatus.DIRECT)
                   customButton = {
                     text: 'View Beatmap',
                     url: `https://ez-pp.farm/beatmapsets/${userStatus.player_status.status.beatmap.set_id}/${userStatus.player_status.status.beatmap.id}`,
@@ -710,7 +713,7 @@
         ]);
 
         currentUser.set(loginResult.user);
-        selectedView = 'home';
+        selectedView = 'HOME';
       } else {
         sileo.error({
           title: 'Login failed!',
@@ -1149,36 +1152,36 @@
     <Badge class="text-[0.5rem] py-0 px-2">{$launcherVersion || 'dev'}</Badge>
     <Button
       class="flex size-12 items-center gap-2 ring-1 ring-inset ring-white/15 {selectedView ===
-      'home'
+      'HOME'
         ? 'bg-primary/50'
         : 'bg-black/20 border-black/20'} hover:bg-primary/50 rounded-[0.85rem] p-3 mt-3"
       disabled={$launching}
       onclick={() => {
-        if (!$launching) selectedView = 'home';
+        if (!$launching) selectedView = 'HOME';
       }}
     >
       <House class="text-theme-200 size-5!" />
     </Button>
     <Button
       class="flex size-12 items-center gap-2 ring-1 ring-inset ring-white/15  {selectedView ===
-      'themes'
+      'THEMES'
         ? 'bg-primary/50'
         : 'bg-black/20 border-black/20'} hover:bg-primary/50 rounded-[0.85rem] p-3 mt-3"
       disabled={$launching}
       onclick={() => {
-        if (!$launching) selectedView = 'themes';
+        if (!$launching) selectedView = 'THEMES';
       }}
     >
       <Paintbrush class="text-theme-200 size-5!" />
     </Button>
     <Button
       class="flex size-12 items-center gap-2 ring-1 ring-inset ring-white/15  {selectedView ===
-      'settings'
+      'SETTINGS'
         ? 'bg-primary/50'
         : 'bg-black/20 border-black/20'} hover:bg-primary/50 rounded-[0.85rem] p-3 mt-3"
       disabled={$launching}
       onclick={() => {
-        if (!$launching) selectedView = 'settings';
+        if (!$launching) selectedView = 'SETTINGS';
       }}
     >
       <Settings class="text-theme-200 size-5!" />
@@ -1209,14 +1212,14 @@
                 });
                 currentUser.set(undefined);
                 currentUserInfo.set(undefined);
-                selectedView = 'home';
+                selectedView = 'HOME';
               }}
             >
               <LogOut class="size-3.5 mr-2" />
               Logout
             </DropdownMenu.Item>
           {:else}
-            <DropdownMenu.Item class="text-xs" onclick={() => (selectedView = 'login')}>
+            <DropdownMenu.Item class="text-xs" onclick={() => (selectedView = 'LOGIN')}>
               <LogIn class="size-3.5 mr-2" />
               Login
             </DropdownMenu.Item>
@@ -1226,7 +1229,7 @@
     </div>
   </div>
   <div class="z-10 h-full overflow-hidden">
-    {#if selectedView === 'home'}
+    {#if selectedView === 'HOME'}
       <div
         class="flex flex-col-reverse h-full"
         in:fly={{
@@ -1522,7 +1525,7 @@
                 <Button
                   class="flex-1 h-7 text-xs"
                   onclick={() => {
-                    selectedView = 'login';
+                    selectedView = 'LOGIN';
                   }}>Log In</Button
                 >
                 <Button
@@ -1543,7 +1546,7 @@
           >
         </div>
       </div>
-    {:else if selectedView === 'settings'}
+    {:else if selectedView === 'SETTINGS'}
       <div
         class="h-screen w-full flex flex-col items-center justify-center bg-black/20 backdrop-blur-sm"
         in:fly={{
@@ -1558,17 +1561,16 @@
           <div class="flex flex-col">
             <Label class="text-sm" for="setting-patch">Patching</Label>
             <div class="text-muted-foreground text-xs">
-              Shows misses in Relax and Autopilot {#if $platform !== 'windows'}<span
+              Shows misses in Relax and Autopilot {#if $platform !== 'windows'}<!-- <span
                   class="text-red-500 bg-red-800/20 border border-red-600/20 p-0.5 mx-1 px-2 rounded-lg text-[0.55rem]!"
                   >currently only on windows!</span
-                >
+                > -->
               {/if}
             </div>
           </div>
           <Checkbox
             id="setting-patch"
-            checked={$platform === 'windows' ? $patch : false}
+            checked={$patch}
-            disabled={$platform !== 'windows'}
             onCheckedChange={async (e) => {
               patch.set(e);
             }}
@@ -1717,6 +1719,7 @@
               </div>
             </div>
             <div class="flex flex-row w-full">
+              <!-- only stable release stream for linux -->
               <Select.Root
                 type="single"
                 bind:value={$launcherStream}
@@ -1762,7 +1765,7 @@
           {/if}
         </div>
       </div>
-    {:else if selectedView === 'login'}
+    {:else if selectedView === 'LOGIN'}
       <div
         class="h-screen w-full flex flex-col items-center justify-center bg-black/20 backdrop-blur-sm"
         in:fly={{
@@ -1813,7 +1816,7 @@
           </Button>
         </form>
       </div>
-    {:else if selectedView === 'themes'}
+    {:else if selectedView === 'THEMES'}
       <div
         class="h-screen w-full flex flex-col items-center bg-black/20 backdrop-blur-sm"
         in:fly={{
@@ -1824,6 +1827,23 @@
         }}
         out:fly={{ duration: $reduceAnimations ? 0 : 400, y: -5, opacity: 0 }}
       >
+        {#if $platform === 'linux'}
+          <div
+            class="flex flex-col items-center gap-4 mt-12 px-6 text-center h-full justify-center"
+          >
+            <!-- currently there is a bug when applying themes on Linux, the Launcher freezes, also when trying to load assets via the assetProtocol it fails because it says the asset was loaded insecurely -->
+            <span class="text-2xl font-bold drop-shadow-lg"
+              >Custom themes are not supported on Linux yet(we are working on it!)</span
+            >
+            <span class="text-muted-foreground font-semibold drop-shadow-lg"
+              >Due to technical limitations on Linux, custom themes are currently not supported.
+            </span>
+            <span class="text-muted-foreground font-semibold drop-shadow-lg"
+              >We are working on a solution to bring custom themes to Linux in a future update, but
+              we don't have an ETA yet. Stay tuned!</span
+            >
+          </div>
+        {:else}
           <ScrollContainer class="pt-8" topOffset={45}>
             <div class="grid w-full gap-1 grid-cols-3 p-3 pr-5">
               {#each $custom_themes as theme (theme.folder_name)}
@@ -1868,7 +1888,10 @@
                           } else {
                             const downloadThemeResult = await downloadTheme(theme);
                             if (!downloadThemeResult.success) {
-                            if (downloadThemeResult.error && downloadThemeResult.error.length > 0) {
+                              if (
+                                downloadThemeResult.error &&
+                                downloadThemeResult.error.length > 0
+                              ) {
                                 sileo.error({
                                   title: 'Uhhm..',
                                   description: downloadThemeResult.error,
@@ -1909,7 +1932,11 @@
                           onclick={async () => {
                             const defaultTheme = $custom_themes.find((t) => t.name === 'Default');
                             if (defaultTheme) {
-                            loadTheme(defaultTheme, $custom_theme_container!, $custom_theme_volume);
+                              loadTheme(
+                                defaultTheme,
+                                $custom_theme_container!,
+                                $custom_theme_volume
+                              );
                               await config.value<string>('theme').set(defaultTheme.name);
 
                               if (!(await downloadTheme(theme, true))) {
@@ -1966,6 +1993,7 @@
               {/each}
             </div>
           </ScrollContainer>
+        {/if}
       </div>
     {/if}
   </div>

src/screens/SetupWizard.svelte

@@ -13,7 +13,6 @@
     discordPresence,
     osuBuild,
     osuStream,
-    platform,
     presenceLoading,
     skins,
     skinsCount,
@@ -266,17 +265,16 @@
               <div class="flex flex-col">
                 <Label class="text-sm" for="setting-patch">Patching</Label>
                 <div class="text-muted-foreground text-xs">
-                  Shows misses in Relax and Autopilot {#if $platform !== 'windows'}<span
+                  Shows misses in Relax and Autopilot <!-- {#if $platform !== 'windows'}<span
                       class="text-red-500 bg-red-800/20 border border-red-600/20 p-0.5 mx-1 px-2 rounded-lg text-[0.55rem]!"
                       >currently only on windows!</span
                     >
-                  {/if}
+                  {/if} -->
                 </div>
               </div>
               <Checkbox
                 id="setting-patch"
-                checked={$platform === 'windows' ? $patch : false}
+                checked={$patch}
-                disabled={$platform !== 'windows'}
                 onCheckedChange={async (e) => {
                   patch.set(e);
                 }}