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

.prettierignore

@@ -7,3 +7,6 @@ bun.lockb
 
 # Miscellaneous
 /static/
+
+# Tauri
+/src-tauri/

.prettierrc

@@ -9,7 +9,7 @@
   "tabWidth": 2,
   "useTabs": false,
   "bracketSpacing": true,
-  "plugins": ["prettier-plugin-svelte", "prettier-plugin-rust"],
+  "plugins": ["prettier-plugin-svelte"],
   "overrides": [
     {
       "files": "*.svelte",

.vscode/settings.json

@@ -1,7 +1,7 @@
 {
   "svelte.enable-ts-plugin": true,
   "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "[rust]":{
+  "[rust]": {
     "editor.defaultFormatter": "rust-lang.rust-analyzer"
   }
 }

README.md

@@ -27,10 +27,10 @@ It enhances the osu! experience with quality-of-life features and integration sp
 
 ## 💻 Supported Platforms
 
-| Platform | Status           |
-| -------- | ---------------- |
-| Windows  | ✅ Supported     |
-| macOS    | ❌ Not supported |
+| Platform | Status                                   |
+| -------- | ---------------------------------------- |
+| Windows  | ✅ Supported                             |
+| macOS    | ❌ Not supported                         |
 | Linux    | 🕧 Partially supported (via osu-winello) |
 
 > Currently, only **Windows** is fully supported. Support for other platforms may be considered in the future.

bun.lock

@@ -12,16 +12,13 @@
         "@tailwindcss/typography": "0.5.16",
         "@tailwindcss/vite": "^4.1.11",
         "@tauri-apps/api": "2.6.0",
-        "@tauri-apps/plugin-dialog": "2.3.0",
-        "@tauri-apps/plugin-fs": "2.4.0",
+        "@tauri-apps/plugin-dialog": "2.3.1",
+        "@tauri-apps/plugin-fs": "2.4.1",
         "@tauri-apps/plugin-shell": "2.3.0",
-        "@tauri-apps/plugin-sql": "2.3.0",
         "animejs": "^4.0.2",
         "buffer": "^6.0.3",
         "crypto-js": "^4.2.0",
         "lucide-svelte": "0.525.0",
-        "osu-classes": "3.1.0",
-        "osu-parsers": "4.1.7",
         "semver": "^7.7.2",
         "svelte-confetti": "^2.0.0",
         "tw-animate-css": "^1.3.0",
@@ -32,7 +29,7 @@
         "@lucide/svelte": "^0.525.0",
         "@sveltejs/adapter-static": "3.0.8",
         "@sveltejs/kit": "2.22.2",
-        "@sveltejs/vite-plugin-svelte": "5.1.0",
+        "@sveltejs/vite-plugin-svelte": "^6.1.0",
         "@tauri-apps/cli": "2.6.1",
         "@types/bun": "^1.2.18",
         "@types/crypto-js": "^4.2.2",
@@ -59,7 +56,7 @@
         "typescript": "5.8.3",
         "typescript-eslint": "^8.20.0",
         "vite": "7.0.0",
-        "vite-plugin-devtools-json": "^0.2.0",
+        "vite-plugin-devtools-json": "^0.3.0",
       },
     },
   },
@@ -232,9 +229,9 @@
 
     "@sveltejs/kit": ["@sveltejs/kit@2.22.2", "", { "dependencies": { "@sveltejs/acorn-typescript": "^1.0.5", "@types/cookie": "^0.6.0", "acorn": "^8.14.1", "cookie": "^0.6.0", "devalue": "^5.1.0", "esm-env": "^1.2.2", "kleur": "^4.1.5", "magic-string": "^0.30.5", "mrmime": "^2.0.0", "sade": "^1.8.1", "set-cookie-parser": "^2.6.0", "sirv": "^3.0.0", "vitefu": "^1.0.6" }, "peerDependencies": { "@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0 || ^6.0.0-next.0", "svelte": "^4.0.0 || ^5.0.0-next.0", "vite": "^5.0.3 || ^6.0.0 || ^7.0.0-beta.0" }, "bin": { "svelte-kit": "svelte-kit.js" } }, "sha512-2MvEpSYabUrsJAoq5qCOBGAlkICjfjunrnLcx3YAk2XV7TvAIhomlKsAgR4H/4uns5rAfYmj7Wet5KRtc8dPIg=="],
 
-    "@sveltejs/vite-plugin-svelte": ["@sveltejs/vite-plugin-svelte@5.1.0", "", { "dependencies": { "@sveltejs/vite-plugin-svelte-inspector": "^4.0.1", "debug": "^4.4.1", "deepmerge": "^4.3.1", "kleur": "^4.1.5", "magic-string": "^0.30.17", "vitefu": "^1.0.6" }, "peerDependencies": { "svelte": "^5.0.0", "vite": "^6.0.0" } }, "sha512-wojIS/7GYnJDYIg1higWj2ROA6sSRWvcR1PO/bqEyFr/5UZah26c8Cz4u0NaqjPeVltzsVpt2Tm8d2io0V+4Tw=="],
+    "@sveltejs/vite-plugin-svelte": ["@sveltejs/vite-plugin-svelte@6.1.0", "", { "dependencies": { "@sveltejs/vite-plugin-svelte-inspector": "^5.0.0-next.1", "debug": "^4.4.1", "deepmerge": "^4.3.1", "kleur": "^4.1.5", "magic-string": "^0.30.17", "vitefu": "^1.1.1" }, "peerDependencies": { "svelte": "^5.0.0", "vite": "^6.3.0 || ^7.0.0" } }, "sha512-+U6lz1wvGEG/BvQyL4z/flyNdQ9xDNv5vrh+vWBWTHaebqT0c9RNggpZTo/XSPoHsSCWBlYaTlRX8pZ9GATXCw=="],
 
-    "@sveltejs/vite-plugin-svelte-inspector": ["@sveltejs/vite-plugin-svelte-inspector@4.0.1", "", { "dependencies": { "debug": "^4.3.7" }, "peerDependencies": { "@sveltejs/vite-plugin-svelte": "^5.0.0", "svelte": "^5.0.0", "vite": "^6.0.0" } }, "sha512-J/Nmb2Q2y7mck2hyCX4ckVHcR5tu2J+MtBEQqpDrrgELZ2uvraQcK/ioCV61AqkdXFgriksOKIceDcQmqnGhVw=="],
+    "@sveltejs/vite-plugin-svelte-inspector": ["@sveltejs/vite-plugin-svelte-inspector@5.0.0", "", { "dependencies": { "debug": "^4.4.1" }, "peerDependencies": { "@sveltejs/vite-plugin-svelte": "^6.0.0-next.0", "svelte": "^5.0.0", "vite": "^6.3.0 || ^7.0.0" } }, "sha512-iwQ8Z4ET6ZFSt/gC+tVfcsSBHwsqc6RumSaiLUkAurW3BCpJam65cmHw0oOlDMTO0u+PZi9hilBRYN+LZNHTUQ=="],
 
     "@swc/helpers": ["@swc/helpers@0.5.17", "", { "dependencies": { "tslib": "^2.8.0" } }, "sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A=="],
 
@@ -296,14 +293,12 @@
 
     "@tauri-apps/cli-win32-x64-msvc": ["@tauri-apps/cli-win32-x64-msvc@2.6.1", "", { "os": "win32", "cpu": "x64" }, "sha512-fBsjPqIIHaaQt7tnjIGmPHu5p/BNBVD4JfOhO3QqIVBzAb+W2bDyIQPdoDMI943soLr/+N10xeTiPu+3L74+dQ=="],
 
-    "@tauri-apps/plugin-dialog": ["@tauri-apps/plugin-dialog@2.3.0", "", { "dependencies": { "@tauri-apps/api": "^2.6.0" } }, "sha512-ylSBvYYShpGlKKh732ZuaHyJ5Ie1JR71QCXewCtsRLqGdc8Is4xWdz6t43rzXyvkItM9syNPMvFVcvjgEy+/GA=="],
+    "@tauri-apps/plugin-dialog": ["@tauri-apps/plugin-dialog@2.3.1", "", { "dependencies": { "@tauri-apps/api": "^2.6.0" } }, "sha512-B7jvyhycV8SI/WHzPjciwtYfdFM6/9EXuMjRgYWZwn8GPDmHxpT80aJdb/eDVN+NgoAFDh9bu4QPonYahoYnZQ=="],
 
-    "@tauri-apps/plugin-fs": ["@tauri-apps/plugin-fs@2.4.0", "", { "dependencies": { "@tauri-apps/api": "^2.6.0" } }, "sha512-Sp8AdDcbyXyk6LD6Pmdx44SH3LPeNAvxR2TFfq/8CwqzfO1yOyV+RzT8fov0NNN7d9nvW7O7MtMAptJ42YXA5g=="],
+    "@tauri-apps/plugin-fs": ["@tauri-apps/plugin-fs@2.4.1", "", { "dependencies": { "@tauri-apps/api": "^2.6.0" } }, "sha512-vJlKZVGF3UAFGoIEVT6Oq5L4HGDCD78WmA4uhzitToqYiBKWAvZR61M6zAyQzHqLs0ADemkE4RSy/5sCmZm6ZQ=="],
 
     "@tauri-apps/plugin-shell": ["@tauri-apps/plugin-shell@2.3.0", "", { "dependencies": { "@tauri-apps/api": "^2.6.0" } }, "sha512-6GIRxO2z64uxPX4CCTuhQzefvCC0ew7HjdBhMALiGw74vFBDY95VWueAHOHgNOMV4UOUAFupyidN9YulTe5xlA=="],
 
-    "@tauri-apps/plugin-sql": ["@tauri-apps/plugin-sql@2.3.0", "", { "dependencies": { "@tauri-apps/api": "^2.6.0" } }, "sha512-JYwIocfsLaDWa41LMiZWuzts7yCJR+EpZPRmgpO7Gd7XiAS9S67dKz306j/k/d9XntB0YopMRBol2OIWMschuA=="],
-
     "@types/bun": ["@types/bun@1.2.18", "", { "dependencies": { "bun-types": "1.2.18" } }, "sha512-Xf6RaWVheyemaThV0kUfaAUvCNokFr+bH8Jxp+tTZfx7dAPA8z9ePnP9S9+Vspzuxxx9JRAXhnyccRj3GyCMdQ=="],
 
     "@types/cookie": ["@types/cookie@0.6.0", "", {}, "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA=="],
@@ -562,8 +557,6 @@
 
     "lucide-svelte": ["lucide-svelte@0.525.0", "", { "peerDependencies": { "svelte": "^3 || ^4 || ^5.0.0-next.42" } }, "sha512-kfuN6JcCqTfCz2B76aXnyGLAzEBRSYw5GaUspM5RNHQZS5aI5yaKu06fbaofOk8cDvUtY0AUm/zAix7aUX6Q3A=="],
 
-    "lzma-js-simple-v2": ["lzma-js-simple-v2@1.2.3", "", { "dependencies": { "@types/node": "^20.12.7" } }, "sha512-6kgy86Q3YLolV6dOwCqdQXg3V07e3XJJ6wqfrN8/s65mvCfqkr+jMJkfiSZNvk+u2ig+G8rLdtaoW/g1oJiwow=="],
-
     "magic-string": ["magic-string@0.30.17", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0" } }, "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA=="],
 
     "merge2": ["merge2@1.4.1", "", {}, "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="],
@@ -598,10 +591,6 @@
 
     "optionator": ["optionator@0.9.4", "", { "dependencies": { "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", "type-check": "^0.4.0", "word-wrap": "^1.2.5" } }, "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g=="],
 
-    "osu-classes": ["osu-classes@3.1.0", "", {}, "sha512-kz38FWMGnz5lr6ofovUrNaDAcs1gNpwlDc1qHjW86ILQZXG44w/+NflV7EyFomkI05XCADGfltE4FVoPwrkrmg=="],
-
-    "osu-parsers": ["osu-parsers@4.1.7", "", { "dependencies": { "lzma-js-simple-v2": "^1.2.3" }, "peerDependencies": { "osu-classes": "^3.1.0" } }, "sha512-b8aYJy9vK0Yk8zVbxVN+HSChGnXufSxePb3gABG8s5YGCY+31CKJTUHDAVRST0kX4lyeI4Z3iRxsCRftHFHEug=="],
-
     "p-limit": ["p-limit@3.1.0", "", { "dependencies": { "yocto-queue": "^0.1.0" } }, "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="],
 
     "p-locate": ["p-locate@5.0.0", "", { "dependencies": { "p-limit": "^3.0.2" } }, "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="],
@@ -768,7 +757,7 @@
 
     "vite": ["vite@7.0.0", "", { "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.6", "picomatch": "^4.0.2", "postcss": "^8.5.6", "rollup": "^4.40.0", "tinyglobby": "^0.2.14" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", "jiti": ">=1.21.0", "less": "^4.0.0", "lightningcss": "^1.21.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", "sugarss": "^5.0.0", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-ixXJB1YRgDIw2OszKQS9WxGHKwLdCsbQNkpJN171udl6szi/rIySHL6/Os3s2+oE4P/FLD4dxg4mD7Wust+u5g=="],
 
-    "vite-plugin-devtools-json": ["vite-plugin-devtools-json@0.2.0", "", { "dependencies": { "uuid": "^11.1.0" }, "peerDependencies": { "vite": "^2.7.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0" } }, "sha512-K7PoaWOEJECZ1n3VbhJXsUAX2PsO0xY7KFMM/Leh7tUev0M5zi+lz+vnVVdCK17IOK9Jp9rdzHXc08cnQirGbg=="],
+    "vite-plugin-devtools-json": ["vite-plugin-devtools-json@0.3.0", "", { "dependencies": { "uuid": "^11.1.0" }, "peerDependencies": { "vite": "^2.7.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0" } }, "sha512-y8QdN/uZNV0Jj96H9R3s7G9jtcSuyssk8EwSfWaY+NUAdy7976d7rjtXJzqmeCcgp4CZywcTyUc+k6zpPFHdeg=="],
 
     "vitefu": ["vitefu@1.0.7", "", { "peerDependencies": { "vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0-beta.0" }, "optionalPeers": ["vite"] }, "sha512-eRWXLBbJjW3X5z5P5IHcSm2yYbYRPb2kQuc+oqsbAl99WB5kVsPbiiox+cymo8twTzifA6itvhr2CmjnaZZp0Q=="],
 
@@ -792,6 +781,8 @@
 
     "@humanfs/node/@humanwhocodes/retry": ["@humanwhocodes/retry@0.3.1", "", {}, "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA=="],
 
+    "@sveltejs/vite-plugin-svelte/vitefu": ["vitefu@1.1.1", "", { "peerDependencies": { "vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0-beta.0" }, "optionalPeers": ["vite"] }, "sha512-B/Fegf3i8zh0yFbpzZ21amWzHmuNlLlmJT6n7bu5e+pCHUKQIfXSYokrqOBGEMMe9UG2sostKQF9mml/vYaWJQ=="],
+
     "@tailwindcss/node/jiti": ["jiti@2.4.2", "", { "bin": { "jiti": "lib/jiti-cli.mjs" } }, "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A=="],
 
     "@tailwindcss/oxide-wasm32-wasi/@emnapi/core": ["@emnapi/core@1.4.3", "", { "dependencies": { "@emnapi/wasi-threads": "1.0.2", "tslib": "^2.4.0" }, "bundled": true }, "sha512-4m62DuCE07lw01soJwPiBGC0nAww0Q+RY70VZ+n49yDIO13yyinhbWCeNnaob0lakDtWQzSdtNWzJeOJt2ma+g=="],

package.json

@@ -21,21 +21,17 @@
     "@better-fetch/fetch": "^1.1.18",
     "@fontsource/sora": "^5.2.6",
     "@fontsource/space-mono": "^5.2.8",
-    "@iarna/toml": "2.2.5",
     "@number-flow/svelte": "^0.3.9",
     "@tailwindcss/typography": "0.5.16",
     "@tailwindcss/vite": "^4.1.11",
     "@tauri-apps/api": "2.6.0",
-    "@tauri-apps/plugin-dialog": "2.3.0",
-    "@tauri-apps/plugin-fs": "2.4.0",
+    "@tauri-apps/plugin-dialog": "2.3.1",
+    "@tauri-apps/plugin-fs": "2.4.1",
     "@tauri-apps/plugin-shell": "2.3.0",
-    "@tauri-apps/plugin-sql": "2.3.0",
     "animejs": "^4.0.2",
     "buffer": "^6.0.3",
     "crypto-js": "^4.2.0",
     "lucide-svelte": "0.525.0",
-    "osu-classes": "3.1.0",
-    "osu-parsers": "4.1.7",
     "semver": "^7.7.2",
     "tw-animate-css": "^1.3.0",
     "svelte-confetti": "^2.0.0"
@@ -43,10 +39,11 @@
   "devDependencies": {
     "@eslint/compat": "^1.2.5",
     "@eslint/js": "^9.18.0",
+    "@iarna/toml": "2.2.5",
     "@lucide/svelte": "^0.525.0",
     "@sveltejs/adapter-static": "3.0.8",
     "@sveltejs/kit": "2.22.2",
-    "@sveltejs/vite-plugin-svelte": "5.1.0",
+    "@sveltejs/vite-plugin-svelte": "^6.1.0",
     "@tauri-apps/cli": "2.6.1",
     "@types/bun": "^1.2.18",
     "@types/crypto-js": "^4.2.2",
@@ -73,6 +70,6 @@
     "typescript": "5.8.3",
     "typescript-eslint": "^8.20.0",
     "vite": "7.0.0",
-    "vite-plugin-devtools-json": "^0.2.0"
+    "vite-plugin-devtools-json": "^0.3.0"
   }
 }

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ezpplauncher"
-version = "3.0.1"
+version = "3.0.3"
 description = "EZPPLauncher redefined."
 authors = ["HorizonCode"]
 edition = "2024"
@@ -15,20 +15,19 @@ name = "ezpplauncher_lib"
 crate-type = ["staticlib", "cdylib", "rlib"]
 
 [build-dependencies]
-tauri-build = { version = "2.3.0", features = [] }
+tauri-build = { version = "2.3.1", features = [] }
 
 [dependencies]
-tauri = { version = "2.6.2", features = [] }
+tauri = { version = "2.7.0", features = [] }
 tauri-plugin-shell = "2.3.0"
 serde = { version = "1.0.219", features = ["derive"] }
-serde_json = "1.0.140"
+serde_json = "1.0.141"
 serde_repr = "0.1.20"
-tauri-plugin-sql = "2.3.0"
-tauri-plugin-dialog = "2.3.0"
-tauri-plugin-fs = "2.4.0"
+tauri-plugin-dialog = "2.3.1"
+tauri-plugin-fs = "2.4.1"
 hardware-id = "0.3.0"
 tauri-plugin-cors-fetch = "4.1.0"
-sysinfo = "0.35.2"
+sysinfo = "0.36.1"
 reqwest = { version = "0.12.22", features = ["json", "stream"] }
 md5 = "0.8.0"
 tokio = { version = "1.46.1", features = ["full"] }
@@ -40,9 +39,9 @@ once_cell = "1.21.3"
 [target.'cfg(windows)'.dependencies]
 winreg = "0.55.0"
 winapi = { version = "0.3", features = ["winuser", "wincrypt", "memoryapi", "winbase", "dpapi"] }
-base64 = "0.21"
+base64 = "0.22.1"
 widestring = "1.0"
 
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
-tauri-plugin-single-instance = "2.3.0"
+tauri-plugin-single-instance = "2.3.2"
 

src-tauri/src/commands.rs

@@ -720,7 +720,6 @@ pub async fn has_net8() -> bool {
     is_net8_installed().await
 }
 
-#[cfg(windows)]
 #[tauri::command]
 pub fn encrypt_string(string: String, entropy: String) -> String {
     let encrypted = encrypt_password(&string, &entropy);
@@ -730,10 +729,3 @@ pub fn encrypt_string(string: String, entropy: String) -> String {
         Err(_) => string,
     }
 }
-
-// NOTE: should not be called by tauri on non windows systems, return the string nonthenless
-#[cfg(not(windows))]
-#[tauri::command]
-pub fn encrypt_string(string: String, _entropy: String) -> String {
-    string
-}

src-tauri/src/lib.rs

@@ -67,7 +67,6 @@ pub fn run() {
         .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_shell::init())
         .plugin(tauri_plugin_cors_fetch::init())
-        .plugin(tauri_plugin_sql::Builder::default().build())
         .build(tauri::generate_context!())
         .expect("error while building tauri application");
 

src-tauri/src/presence.rs

@@ -144,7 +144,7 @@ impl PresenceActor {
                         "Download the Launcher",
                         "https://git.ez-pp.farm/EZPPFarm/EZPPLauncher/releases/latest",
                     ),
-                    Button::new("Join EZPZFarm", "https://ez-pp.farm/discord"),
+                    Button::new("Join EZPPFarm", "https://ez-pp.farm/discord"),
                 ]);
 
             if let Err(e) = client.set_activity(activity).map_err(|e| e.to_string()) {

src-tauri/src/utils.rs

@@ -308,6 +308,11 @@ pub async fn is_net8_installed() -> bool {
     }
 }
 
+#[cfg(not(windows))]
+pub fn encrypt_password(password: &str, _entropy: &str) -> Result<String, String> {
+    Ok(password.to_string())
+}
+
 #[cfg(windows)]
 pub fn encrypt_password(password: &str, entropy: &str) -> Result<String, String> {
     use base64::{Engine as _, engine::general_purpose};
@@ -369,7 +374,7 @@ pub fn encrypt_password(password: &str, entropy: &str) -> Result<String, String>
         LocalFree(output_blob.pbData as LPVOID);
     }
 
-    let base64_string = general_purpose::STANDARD_NO_PAD.encode(&encrypted_data);
+    let base64_string = general_purpose::STANDARD.encode(&encrypted_data);
 
     Ok(base64_string)
 }

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
-  "productName": "ezpplauncher",
-  "version": "3.0.1",
+  "productName": "EZPPLauncher",
+  "version": "3.0.3",
   "identifier": "farm.ezpp.launcher",
   "build": {
     "beforeDevCommand": "bun run vite:dev",
@@ -12,7 +12,7 @@
   "app": {
     "windows": [
       {
-        "title": "ezpplauncher",
+        "title": "EZPPLauncher",
         "width": 1000,
         "height": 700,
         "decorations": false,
@@ -26,16 +26,36 @@
     }
   },
   "bundle": {
+    "publisher": "EZPPFarm",
+    "copyright": "EZPPFarm",
+    "homepage": "https://ez-pp.farm",
+    "license": "GPL-3.0",
     "active": true,
     "targets": [
-      "app"
+      "nsis"
     ],
+    "windows": {
+      "webviewInstallMode": {
+        "silent": true,
+        "type": "downloadBootstrapper"
+      },
+      "nsis": {
+        "installMode": "currentUser",
+        "compression": "lzma"
+      }
+    },
     "icon": [
       "icons/32x32.png",
       "icons/128x128.png",
       "icons/128x128@2x.png",
       "icons/icon.icns",
       "icons/icon.ico"
-    ]
+    ],
+    "windows": {
+      "webviewInstallMode": {
+        "silent": true,
+        "type": "downloadBootstrapper"
+      }
+    }
   }
 }

src/lib/api/osuapi.ts

@@ -18,11 +18,13 @@ export const osuapi = {
       },
     });
     if (request.error) {
-      if (request.error.status >= 500 && request.error.status < 600)
-        throw new Error('Server not reachable');
       return undefined;
     }
     const releaseData = request.data;
+    if (!releaseData || !releaseData.streams) {
+      return undefined;
+    }
+    if (releaseData.streams.length === 0) return undefined;
     const selectedRelease = releaseData.streams.find(
       (releaseBuild) =>
         releaseBuild.name.toLowerCase() === releaseStream.replaceAll(' ', '').toLowerCase()

src/lib/components/ui/logo/logo.svelte

@@ -1,150 +0,0 @@
-<script lang="ts">
-  import ezppLogo from '../../../../assets/logo.png';
-  import { osudirect } from '@/api/osudirect';
-  import { gameSounds } from '@/utils';
-  import { BeatmapDecoder } from 'osu-parsers';
-  import { onMount } from 'svelte';
-
-  type logoProps = {
-    beatmapId: number;
-    extended: boolean;
-    onclick: () => void;
-  };
-
-  let { beatmapId, extended, onclick }: logoProps = $props();
-
-  let hovered = $state(false);
-  let bpm = $state(150); // 1000 * 60 / bpm
-  let lastTimeout: number | undefined = undefined;
-
-  onMount(async () => {
-    gameSounds.preload();
-
-    const beatmapData = await osudirect.osu(beatmapId);
-    if (beatmapData) {
-      const decoder = new BeatmapDecoder();
-      const beatmap = decoder.decodeFromString(beatmapData);
-      console.log(beatmap);
-
-      const audio = new Audio(`https://osu.direct/api/media/audio/${beatmapId}`);
-      audio.volume = 0.3;
-
-      // Function to play the heartbeat sound
-      const playHeartbeat = () => {
-        gameSounds.play('menuHeartbeat', {
-          volume: hovered ? 1 : 0.3,
-        });
-      };
-
-      // Function to synchronize the heartbeat with the song
-      const syncHeartbeat = () => {
-        const currentTime = audio.currentTime * 1000 - 25; // Convert to milliseconds
-        const timingPoint = beatmap.controlPoints.timingPointAt(currentTime);
-        const timingPointTime = timingPoint.startTime;
-        console.log(currentTime, timingPointTime);
-        if (timingPoint && bpm !== timingPoint.bpm) {
-          bpm = timingPoint.bpm;
-
-          if (lastTimeout) window.clearTimeout(lastTimeout);
-
-          const interval = (1000 * 60) / bpm; // Interval in milliseconds
-          const nextBeat = currentTime % interval; // Invert: time since last beat
-
-          // Schedule the next heartbeat at the correct time
-          lastTimeout = window.setTimeout(() => {
-            playHeartbeat();
-            // Clear any previous interval
-            if (lastTimeout) {
-              window.clearInterval(lastTimeout);
-              lastTimeout = undefined;
-            }
-            if (!lastTimeout) lastTimeout = window.setInterval(playHeartbeat, interval);
-          }, nextBeat);
-        }
-        // Continue syncing
-        requestAnimationFrame(syncHeartbeat);
-      };
-
-      // Wait for audio to be ready before starting playback and syncing
-      audio.addEventListener('canplay', async () => {
-        audio.addEventListener('play', syncHeartbeat);
-        audio.addEventListener('ended', async () => await audio.play());
-        await audio.play();
-        syncHeartbeat();
-      });
-    }
-  });
-</script>
-
-<div
-  class="w-screen {extended
-    ? hovered
-      ? '-translate-y-1 scale-100'
-      : '-translate-y-1 scale-90'
-    : hovered
-      ? 'translate-y-5 scale-150'
-      : 'translate-y-5 scale-125'} transition-transform select-none"
->
-  <!-- svelte-ignore a11y_click_events_have_key_events -->
-  <!-- svelte-ignore a11y_no_static_element_interactions -->
-  <div
-    class="logo-animation relative w-44 h-44 mx-auto cursor-pointer"
-    onmouseenter={() => (hovered = true)}
-    onmouseleave={() => (hovered = false)}
-    onclick={() => {
-      if (extended) {
-        gameSounds.play('menuBack');
-      } else {
-        gameSounds.play('menuHit');
-      }
-      onclick();
-    }}
-  >
-    <img
-      class="absolute pulse-logo"
-      style="animation-duration: {(1000 * 60) / bpm}ms;"
-      src={ezppLogo}
-      alt="logo-pulse"
-    />
-    <img
-      class="absolute main-logo"
-      style="animation-duration: {(1000 * 60) / bpm}ms;"
-      src={ezppLogo}
-      alt="logo"
-    />
-  </div>
-</div>
-
-<style lang="scss">
-  .logo-animation {
-    .pulse-logo {
-      animation: 0.5s 0.2s infinite forwards beat-pulse;
-    }
-    .main-logo {
-      animation: 0.5s infinite forwards beat;
-    }
-  }
-
-  @keyframes beat {
-    0%,
-    100% {
-      scale: 1;
-    }
-    90% {
-      scale: 1.08;
-    }
-  }
-  @keyframes beat-pulse {
-    0%,
-    10% {
-      scale: 0.5;
-      opacity: 0.5;
-      filter: blur(0px);
-    }
-    100% {
-      scale: 1.4;
-      opacity: 0;
-      filter: blur(2px);
-    }
-  }
-</style>

src/lib/components/ui/titlebar/titlebar.svelte

@@ -20,10 +20,14 @@
 </script>
 
 <div data-tauri-drag-region class="titlebar z-[60] border-b border-theme-800/90">
-  <div class="mr-auto ms-2 flex flex-row gap-2 items-center text-[1.05rem] font-semibold pointer-events-none">
+  <div
+    class="mr-auto ms-2 flex flex-row gap-2 items-center text-[1.05rem] font-semibold pointer-events-none"
+  >
     <img src={Logo} alt="EZPP Launcher Logo" class="h-11 w-11 inline-block" />
     <span>EZPPLauncher</span>
-    <Badge class="!text-[0.6rem] py-[0.5px] bg-primary-500 hover:bg-primary-500">{$launcherVersion}</Badge>
+    <Badge class="!text-[0.6rem] py-[0.5px] bg-primary-500 hover:bg-primary-500"
+      >{$launcherVersion}</Badge
+    >
   </div>
   <div class="titlebar-button rounded-lg transition-colors duration-75" id="titlebar-minimize">
     <Minimize size={18} />

src/lib/global.ts

@@ -1,12 +1,12 @@
 import { writable } from 'svelte/store';
 import { ezppfarm } from './api/ezpp';
 import type { Component } from 'svelte';
-import Loading from '../pages/Loading.svelte';
+import Loading from '../screens/Loading.svelte';
 import type { Release } from './types';
 
 export const currentView = writable<Component>(Loading);
 
-export const platform = writable<string>("");
+export const platform = writable<string>('');
 
 export const launcherVersion = writable<string>('');
 export const newVersion = writable<Release | undefined>(undefined);

src/lib/osuUtil.ts

@@ -133,11 +133,8 @@ export const exit = async () => await invoke('exit');
 export const getPlatform = async () => await invoke<string>('get_platform');
 export const isOsuCorrupted = async (folder: string) =>
   await invoke<boolean>('check_for_corruption', { folder });
-export const hasWMCTRL = async () =>
-  await invoke<boolean>('has_wmctrl');
-export const hasOsuWinello = async () =>
-  await invoke<boolean>('has_osuwinello');
-export const hasNet8 = async () =>
-  await invoke<boolean>('has_net8');
+export const hasWMCTRL = async () => await invoke<boolean>('has_wmctrl');
+export const hasOsuWinello = async () => await invoke<boolean>('has_osuwinello');
+export const hasNet8 = async () => await invoke<boolean>('has_net8');
 export const encryptString = async (str: string, entropy: string) =>
-  await invoke<string>('encrypt_string', {string: str, entropy});
+  await invoke<string>('encrypt_string', { string: str, entropy });

src/routes/+layout.svelte

@@ -88,18 +88,11 @@
   onMount(async () => {
     window.Buffer = Buffer;
 
-    /* const decryptTest = "AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAs463WdMtG0mr/mVLQCZ6dQAAAAAIAAAAUgBhAHcAAAAQZgAAAAEAACAAAABnyhFo8QK2iL5aTehKmsZSUpihGWBwlKfYj7cL2/lDagAAAAAOgAAAAAIAACAAAABMxyG6EdkLORSMB8isbltZhPQV2iVQ2r+yJLJ2Tw9yWiAAAABE1EzBPD9PRFQ3evk0vneNpfQTNTvMpjDVUTl3kAaKWUAAAADBshJzPDx6qcYfYh2zh6cKJWClZpIp6H50IKriW936XGhLFQboK/m18O77TBnpSrs0YosFjzsYVJTkrWjetFAf";
-    const decrypted = await decryptString(decryptTest);
-    console.log(decrypted); */
-
-    const encrypted = await encryptString("Todesengel007008009!", "cu24180ncjeiu0ci1nwui");
-    console.log(encrypted);
-
     disableReload();
     setupValues();
     launcherVersion.set(await getLauncherVersion());
     platform.set(await getPlatform());
-    if ($platform !== "windows" && $platform !== "linux") unsupported_platform = true;
+    if ($platform !== 'windows' && $platform !== 'linux') unsupported_platform = true;
     const isFirstStartup = await $userSettings.init();
     $userAuth.init();
 

src/screens/Launch.svelte

@@ -149,14 +149,11 @@
       toast.success('osu! installation path set successfully.');
 
       const beatmapSetCount: number | null = await getBeatmapSetsCount(selectedPath);
-      if (beatmapSetCount) {
-        beatmapSets.set(beatmapSetCount);
-      }
+      if (beatmapSetCount) beatmapSets.set(beatmapSetCount);
 
       const skinsCount: number | null = await getSkinsCount(selectedPath);
-      if (skinsCount) {
-        skins.set(skinsCount);
-      }
+      if (skinsCount !== null) skins.set(skinsCount);
+
       const skin: string = await getSkin(selectedPath);
       currentSkin.set(skin);
     }
@@ -244,13 +241,31 @@
       const streamInfo = await osuapi.latestBuildVersion('stable40');
       if (!streamInfo) {
         toast.error('Hmmm...', {
-          description: 'Failed to check for updates.',
+          description: 'Failed to check for updates, maybe osu! is down?',
         });
         launching.set(false);
         return;
       }
 
       const releaseStream = await getReleaseStream(osuPath);
+
+      if (releaseStream === undefined) {
+        toast.error('Hmmm...', {
+          description: 'Failed to get osu! release stream.',
+        });
+        launching.set(false);
+        return;
+      }
+
+      // only stable osu! release streams are supported for now
+      if (!releaseStream.toLowerCase().includes('stable')) {
+        toast.error('Hmmm...', {
+          description: 'You are not on the stable release stream, please switch to it.',
+        });
+        launching.set(false);
+        return;
+      }
+
       const osuCorrupted = await isOsuCorrupted(osuPath);
       let forceUpdate =
         (releaseStream && releaseStream.toLowerCase() !== 'stable40') || osuCorrupted;
@@ -297,7 +312,10 @@
             },
             {
               key: 'Password',
-              value: $platform === "windows" ? await encryptString(password, "cu24180ncjeiu0ci1nwui") : password,
+              value:
+                $platform === 'windows'
+                  ? await encryptString(password, 'cu24180ncjeiu0ci1nwui')
+                  : password,
             },
             {
               key: 'SaveUsername',
@@ -478,7 +496,7 @@
       if (beatmapSetCount) beatmapSets.set(beatmapSetCount);
 
       const skinCount = await getSkinsCount(osuPath);
-      if (skinCount) skins.set(skinCount);
+      if (skinCount !== null) skins.set(skinCount);
 
       const skin = await getSkin(osuPath);
       currentSkin.set(skin);
@@ -501,7 +519,7 @@
 </script>
 
 <AlertDialog.Root open={launchError !== undefined}>
-  <AlertDialog.Content class="bg-theme-950 border-theme-800 p-0">
+  <AlertDialog.Content class="bg-theme-950 border-theme-800 p-0 max-w-[90vw]">
     <div
       class="flex flex-col items-center justify-center border-b border-theme-800 bg-black/40 rounded-t-lg p-3"
     >
@@ -509,10 +527,10 @@
       <span class="font-semibold text-xl">Error on Launch!</span>
     </div>
     <div
-      class="flex flex-col items-center text-sm text-center bg-theme-900 border border-theme-800 rounded-lg mx-3 p-3"
+      class="flex flex-col items-center text-sm text-center bg-theme-900 border border-theme-800 rounded-lg mx-3 p-3 overflow-hidden"
     >
       {#if launchError}
-        <pre class="text-wrap text-start">{JSON.stringify(
+        <pre class="text-wrap text-start overflow-auto w-full">{JSON.stringify(
             launchError,
             Object.getOwnPropertyNames(launchError),
             2
@@ -532,7 +550,11 @@
 </AlertDialog.Root>
 
 <AlertDialog.Root open={$newVersion !== undefined}>
-  <AlertDialog.Content class="bg-theme-950 border-theme-800 p-0">
+  <AlertDialog.Content
+    class="bg-theme-950 border-theme-800 p-0"
+    escapeKeydownBehavior="ignore"
+    interactOutsideBehavior="ignore"
+  >
     <div
       class="flex flex-col items-center justify-center border-b border-theme-800 bg-black/40 rounded-t-lg p-3"
     >
@@ -568,7 +590,11 @@
 </AlertDialog.Root>
 
 <AlertDialog.Root bind:open={$launching}>
-  <AlertDialog.Content class="bg-theme-950 border-theme-800 p-0">
+  <AlertDialog.Content
+    class="bg-theme-950 border-theme-800 p-0"
+    escapeKeydownBehavior="ignore"
+    interactOutsideBehavior="ignore"
+  >
     <div
       class="flex flex-col items-center justify-center border-b border-theme-800 bg-black/40 rounded-t-lg p-3"
     >
@@ -889,13 +915,17 @@
             </div>
             <div class="relative font-bold text-xl text-yellow-400">
               <div
-                class="absolute top-1 left-1/2 -translate-x-1/2 {!$skins
+                class="absolute top-1 left-1/2 -translate-x-1/2 {$skins === null
                   ? 'opacity-100'
                   : 'opacity-0'} transition-opacity duration-1000"
               >
                 <LoaderCircle class="animate-spin" />
               </div>
-              <div class="{!$skins ? 'opacity-0' : 'opacity-100'} transition-opacity duration-1000">
+              <div
+                class="{$skins === null
+                  ? 'opacity-0'
+                  : 'opacity-100'} transition-opacity duration-1000"
+              >
                 {#if $reduceAnimations}
                   <span>{numberHumanReadable($skins ?? 0)}</span>
                 {:else}

src/screens/Loading.svelte

@@ -135,11 +135,11 @@
 
         currentLoadingInfo.set('Counting beatmapsets...');
         const beatmapSetCount = await getBeatmapSetsCount($osuInstallationPath);
-        if (beatmapSetCount) beatmapSets.set(beatmapSetCount);
+        if (beatmapSetCount !== null) beatmapSets.set(beatmapSetCount);
 
         currentLoadingInfo.set('Counting skins...');
         const skinCount = await getSkinsCount($osuInstallationPath);
-        if (skinCount) skins.set(skinCount);
+        if (skinCount !== null) skins.set(skinCount);
         const skin: string = await getSkin($osuInstallationPath);
         currentSkin.set(skin);
       }