Compare commits
66 Commits
b376737dba
...
3.0.4
Author | SHA1 | Date | |
---|---|---|---|
f7c2dc689a | |||
b778a5a369 | |||
084e006f06 | |||
9b3cb0bd26 | |||
c5649c3f8a | |||
fac54f3e59 | |||
b6f7f84955 | |||
aa52ff3b8c | |||
d72d2731d9 | |||
f3ac7cc684 | |||
b1b3de295c | |||
e76affaea1 | |||
700274d7d8 | |||
53b6c2e174 | |||
93ecea9083 | |||
2549b18e8c | |||
fd4d911075 | |||
5edd53eead | |||
ea6db9afd1 | |||
d56b375953 | |||
ec25d5d2bb | |||
13b90092b7 | |||
f214aa454e | |||
9d2599dd2f | |||
eddaaaaa2f | |||
a21abe86bb | |||
d685114bd7 | |||
4e4998671a | |||
5cae8bc63a | |||
409c8b0b04 | |||
c395662134 | |||
89d1bcbd86 | |||
c3c13b0e07 | |||
4e1f76a713 | |||
4fb2ab7bed | |||
bb90e28d92 | |||
a554c53f89 | |||
307e0c9747 | |||
86033e2d6a | |||
1a563e64d5 | |||
5aec2d8245 | |||
87742b66b7 | |||
df3bd69141 | |||
12feed96e9 | |||
b530dbf72f | |||
174616f07b | |||
d2a0e09e75 | |||
a91fff1f59 | |||
376ee1e648 | |||
d6623891bb | |||
9f62332334 | |||
f051253abb | |||
57a95b4759 | |||
f5831b377c | |||
33bd75eeee | |||
3b3447c42c | |||
2162ba15fe | |||
1ab19957ba | |||
2082beb387 | |||
4fbce4cd0a | |||
2ef108da2b | |||
7d32e663d0 | |||
4845eaeed2 | |||
3e63d7527e | |||
3dc62a060e | |||
6d2d5de6d2 |
@@ -7,3 +7,6 @@ bun.lockb
|
|||||||
|
|
||||||
# Miscellaneous
|
# Miscellaneous
|
||||||
/static/
|
/static/
|
||||||
|
|
||||||
|
# Tauri
|
||||||
|
/src-tauri/
|
||||||
|
@@ -9,7 +9,7 @@
|
|||||||
"tabWidth": 2,
|
"tabWidth": 2,
|
||||||
"useTabs": false,
|
"useTabs": false,
|
||||||
"bracketSpacing": true,
|
"bracketSpacing": true,
|
||||||
"plugins": ["prettier-plugin-svelte", "prettier-plugin-rust"],
|
"plugins": ["prettier-plugin-svelte"],
|
||||||
"overrides": [
|
"overrides": [
|
||||||
{
|
{
|
||||||
"files": "*.svelte",
|
"files": "*.svelte",
|
||||||
|
3
.vscode/extensions.json
vendored
3
.vscode/extensions.json
vendored
@@ -7,6 +7,7 @@
|
|||||||
"fill-labs.dependi",
|
"fill-labs.dependi",
|
||||||
"mylesmurphy.prettify-ts",
|
"mylesmurphy.prettify-ts",
|
||||||
"edwinhuish.better-comments-next",
|
"edwinhuish.better-comments-next",
|
||||||
"dbaeumer.vscode-eslint"
|
"dbaeumer.vscode-eslint",
|
||||||
|
"bradlc.vscode-tailwindcss"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"svelte.enable-ts-plugin": true,
|
"svelte.enable-ts-plugin": true,
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode",
|
"editor.defaultFormatter": "esbenp.prettier-vscode",
|
||||||
"[rust]":{
|
"[rust]": {
|
||||||
"editor.defaultFormatter": "rust-lang.rust-analyzer"
|
"editor.defaultFormatter": "rust-lang.rust-analyzer"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -631,8 +631,7 @@ to attach them to the start of each source file to most effectively
|
|||||||
state the exclusion of warranty; and each file should have at least
|
state the exclusion of warranty; and each file should have at least
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
Copyright (C) 2025 HorizonCode
|
||||||
Copyright (C) <year> <name of author>
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
This program is free software: you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
75
README.md
75
README.md
@@ -1,3 +1,74 @@
|
|||||||
# EZPPLauncher Tauri
|
# EZPPLauncher
|
||||||
|
|
||||||
Trying to recode this shit with tauri, kms
|
**EZPPLauncher** is a custom launcher for the private osu! server [EZPPFarm](https://ez-pp.farm), built with **Rust** and **Svelte** using the [Tauri](https://tauri.app) framework.
|
||||||
|
It enhances the osu! experience with quality-of-life features and integration specifically designed for the EZPPFarm community.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🖼️ Preview
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🚀 Features
|
||||||
|
|
||||||
|
- [x] Automatically updates osu! before launching
|
||||||
|
- [x] Automatic ingame login
|
||||||
|
- [x] Patches the osu! client to show misses in Relax and Autopilot
|
||||||
|
- [x] Displays your EZPPFarm stats in the launcher
|
||||||
|
- [x] Shows the number of imported beatmapsets
|
||||||
|
- [x] Shows the number of imported skins
|
||||||
|
- [x] Displays ping to the EZPPFarm server
|
||||||
|
- [x] Discord Rich Presence
|
||||||
|
- [x] Performance Display Overlay (currently in experimental patcher release stream)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 💻 Supported Platforms
|
||||||
|
|
||||||
|
| 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.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🛠 Build From Source
|
||||||
|
|
||||||
|
### Requirements
|
||||||
|
|
||||||
|
- **Rust** (installed via [rustup](https://rustup.rs/) – recommended for Windows)
|
||||||
|
- **Cargo** (comes with rustup)
|
||||||
|
- **[Bun](https://bun.sh/)** (JavaScript runtime)
|
||||||
|
|
||||||
|
### Steps
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Install all dependencies
|
||||||
|
bun i
|
||||||
|
|
||||||
|
# Build the project
|
||||||
|
bun run build
|
||||||
|
```
|
||||||
|
|
||||||
|
After building, the launcher executable will be located at:
|
||||||
|
|
||||||
|
```
|
||||||
|
src-tauri/target/release/ezpplauncher.exe
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 📁 Project Structure (Simplified)
|
||||||
|
|
||||||
|
```
|
||||||
|
├── src/ # Frontend (Svelte)
|
||||||
|
├── src-tauri/ # Backend (Rust)
|
||||||
|
│ ├── tauri.conf.json # Tauri configuration
|
||||||
|
├── package.json # Bun project config
|
||||||
|
└── README.md
|
||||||
|
```
|
||||||
|
BIN
assets/EZPPLauncher-preview.png
Normal file
BIN
assets/EZPPLauncher-preview.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 81 KiB |
42
bun.lock
42
bun.lock
@@ -7,21 +7,18 @@
|
|||||||
"@better-fetch/fetch": "^1.1.18",
|
"@better-fetch/fetch": "^1.1.18",
|
||||||
"@fontsource/sora": "^5.2.6",
|
"@fontsource/sora": "^5.2.6",
|
||||||
"@fontsource/space-mono": "^5.2.8",
|
"@fontsource/space-mono": "^5.2.8",
|
||||||
"@iarna/toml": "^3.0.0",
|
"@iarna/toml": "2.2.5",
|
||||||
"@number-flow/svelte": "^0.3.9",
|
"@number-flow/svelte": "^0.3.9",
|
||||||
"@tailwindcss/typography": "0.5.16",
|
"@tailwindcss/typography": "0.5.16",
|
||||||
"@tailwindcss/vite": "^4.1.11",
|
"@tailwindcss/vite": "^4.1.11",
|
||||||
"@tauri-apps/api": "2.6.0",
|
"@tauri-apps/api": "2.6.0",
|
||||||
"@tauri-apps/plugin-dialog": "2.3.0",
|
"@tauri-apps/plugin-dialog": "2.3.1",
|
||||||
"@tauri-apps/plugin-fs": "2.4.0",
|
"@tauri-apps/plugin-fs": "2.4.1",
|
||||||
"@tauri-apps/plugin-shell": "2.3.0",
|
"@tauri-apps/plugin-shell": "2.3.0",
|
||||||
"@tauri-apps/plugin-sql": "2.3.0",
|
|
||||||
"animejs": "^4.0.2",
|
"animejs": "^4.0.2",
|
||||||
"buffer": "^6.0.3",
|
"buffer": "^6.0.3",
|
||||||
"crypto-js": "^4.2.0",
|
"crypto-js": "^4.2.0",
|
||||||
"lucide-svelte": "0.525.0",
|
"lucide-svelte": "0.525.0",
|
||||||
"osu-classes": "3.1.0",
|
|
||||||
"osu-parsers": "4.1.7",
|
|
||||||
"semver": "^7.7.2",
|
"semver": "^7.7.2",
|
||||||
"svelte-confetti": "^2.0.0",
|
"svelte-confetti": "^2.0.0",
|
||||||
"tw-animate-css": "^1.3.0",
|
"tw-animate-css": "^1.3.0",
|
||||||
@@ -32,8 +29,9 @@
|
|||||||
"@lucide/svelte": "^0.525.0",
|
"@lucide/svelte": "^0.525.0",
|
||||||
"@sveltejs/adapter-static": "3.0.8",
|
"@sveltejs/adapter-static": "3.0.8",
|
||||||
"@sveltejs/kit": "2.22.2",
|
"@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",
|
"@tauri-apps/cli": "2.6.1",
|
||||||
|
"@types/bun": "^1.2.18",
|
||||||
"@types/crypto-js": "^4.2.2",
|
"@types/crypto-js": "^4.2.2",
|
||||||
"@types/semver": "^7.7.0",
|
"@types/semver": "^7.7.0",
|
||||||
"autoprefixer": "10.4.21",
|
"autoprefixer": "10.4.21",
|
||||||
@@ -58,7 +56,7 @@
|
|||||||
"typescript": "5.8.3",
|
"typescript": "5.8.3",
|
||||||
"typescript-eslint": "^8.20.0",
|
"typescript-eslint": "^8.20.0",
|
||||||
"vite": "7.0.0",
|
"vite": "7.0.0",
|
||||||
"vite-plugin-devtools-json": "^0.2.0",
|
"vite-plugin-devtools-json": "^0.3.0",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -157,7 +155,7 @@
|
|||||||
|
|
||||||
"@humanwhocodes/retry": ["@humanwhocodes/retry@0.4.3", "", {}, "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ=="],
|
"@humanwhocodes/retry": ["@humanwhocodes/retry@0.4.3", "", {}, "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ=="],
|
||||||
|
|
||||||
"@iarna/toml": ["@iarna/toml@3.0.0", "", {}, "sha512-td6ZUkz2oS3VeleBcN+m//Q6HlCFCPrnI0FZhrt/h4XqLEdOyYp2u21nd8MdsR+WJy5r9PTDaHTDDfhf4H4l6Q=="],
|
"@iarna/toml": ["@iarna/toml@2.2.5", "", {}, "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="],
|
||||||
|
|
||||||
"@internationalized/date": ["@internationalized/date@3.8.2", "", { "dependencies": { "@swc/helpers": "^0.5.0" } }, "sha512-/wENk7CbvLbkUvX1tu0mwq49CVkkWpkXubGel6birjRPyo6uQ4nQpnq5xZu823zRCwwn82zgHrvgF1vZyvmVgA=="],
|
"@internationalized/date": ["@internationalized/date@3.8.2", "", { "dependencies": { "@swc/helpers": "^0.5.0" } }, "sha512-/wENk7CbvLbkUvX1tu0mwq49CVkkWpkXubGel6birjRPyo6uQ4nQpnq5xZu823zRCwwn82zgHrvgF1vZyvmVgA=="],
|
||||||
|
|
||||||
@@ -231,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/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=="],
|
"@swc/helpers": ["@swc/helpers@0.5.17", "", { "dependencies": { "tslib": "^2.8.0" } }, "sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A=="],
|
||||||
|
|
||||||
@@ -295,13 +293,13 @@
|
|||||||
|
|
||||||
"@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/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-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=="],
|
"@types/cookie": ["@types/cookie@0.6.0", "", {}, "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA=="],
|
||||||
|
|
||||||
@@ -313,6 +311,8 @@
|
|||||||
|
|
||||||
"@types/node": ["@types/node@20.19.1", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-jJD50LtlD2dodAEO653i3YF04NWak6jN3ky+Ri3Em3mGR39/glWiboM/IePaRbgwSfqM1TpGXfAg8ohn/4dTgA=="],
|
"@types/node": ["@types/node@20.19.1", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-jJD50LtlD2dodAEO653i3YF04NWak6jN3ky+Ri3Em3mGR39/glWiboM/IePaRbgwSfqM1TpGXfAg8ohn/4dTgA=="],
|
||||||
|
|
||||||
|
"@types/react": ["@types/react@19.1.8", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-AwAfQ2Wa5bCx9WP8nZL2uMZWod7J7/JSplxbTmBQ5ms6QpqNYm672H0Vu9ZVKVngQ+ii4R/byguVEUZQyeg44g=="],
|
||||||
|
|
||||||
"@types/semver": ["@types/semver@7.7.0", "", {}, "sha512-k107IF4+Xr7UHjwDc7Cfd6PRQfbdkiRabXGRjo07b4WyPahFBZCZ1sE+BNxYIJPPg73UkfOsVOLwqVc/6ETrIA=="],
|
"@types/semver": ["@types/semver@7.7.0", "", {}, "sha512-k107IF4+Xr7UHjwDc7Cfd6PRQfbdkiRabXGRjo07b4WyPahFBZCZ1sE+BNxYIJPPg73UkfOsVOLwqVc/6ETrIA=="],
|
||||||
|
|
||||||
"@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@8.35.1", "", { "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "8.35.1", "@typescript-eslint/type-utils": "8.35.1", "@typescript-eslint/utils": "8.35.1", "@typescript-eslint/visitor-keys": "8.35.1", "graphemer": "^1.4.0", "ignore": "^7.0.0", "natural-compare": "^1.4.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "@typescript-eslint/parser": "^8.35.1", "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-9XNTlo7P7RJxbVeICaIIIEipqxLKguyh+3UbXuT2XQuFp6d8VOeDEGuz5IiX0dgZo8CiI6aOFLg4e8cF71SFVg=="],
|
"@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@8.35.1", "", { "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "8.35.1", "@typescript-eslint/type-utils": "8.35.1", "@typescript-eslint/utils": "8.35.1", "@typescript-eslint/visitor-keys": "8.35.1", "graphemer": "^1.4.0", "ignore": "^7.0.0", "natural-compare": "^1.4.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "@typescript-eslint/parser": "^8.35.1", "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-9XNTlo7P7RJxbVeICaIIIEipqxLKguyh+3UbXuT2XQuFp6d8VOeDEGuz5IiX0dgZo8CiI6aOFLg4e8cF71SFVg=="],
|
||||||
@@ -369,6 +369,8 @@
|
|||||||
|
|
||||||
"buffer-builder": ["buffer-builder@0.2.0", "", {}, "sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg=="],
|
"buffer-builder": ["buffer-builder@0.2.0", "", {}, "sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg=="],
|
||||||
|
|
||||||
|
"bun-types": ["bun-types@1.2.18", "", { "dependencies": { "@types/node": "*" }, "peerDependencies": { "@types/react": "^19" } }, "sha512-04+Eha5NP7Z0A9YgDAzMk5PHR16ZuLVa83b26kH5+cp1qZW4F6FmAURngE7INf4tKOvCE69vYvDEwoNl1tGiWw=="],
|
||||||
|
|
||||||
"callsites": ["callsites@3.1.0", "", {}, "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="],
|
"callsites": ["callsites@3.1.0", "", {}, "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="],
|
||||||
|
|
||||||
"caniuse-lite": ["caniuse-lite@1.0.30001726", "", {}, "sha512-VQAUIUzBiZ/UnlM28fSp2CRF3ivUn1BWEvxMcVTNwpw91Py1pGbPIyIKtd+tzct9C3ouceCVdGAXxZOpZAsgdw=="],
|
"caniuse-lite": ["caniuse-lite@1.0.30001726", "", {}, "sha512-VQAUIUzBiZ/UnlM28fSp2CRF3ivUn1BWEvxMcVTNwpw91Py1pGbPIyIKtd+tzct9C3ouceCVdGAXxZOpZAsgdw=="],
|
||||||
@@ -397,6 +399,8 @@
|
|||||||
|
|
||||||
"cssesc": ["cssesc@3.0.0", "", { "bin": { "cssesc": "bin/cssesc" } }, "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="],
|
"cssesc": ["cssesc@3.0.0", "", { "bin": { "cssesc": "bin/cssesc" } }, "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="],
|
||||||
|
|
||||||
|
"csstype": ["csstype@3.1.3", "", {}, "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="],
|
||||||
|
|
||||||
"debug": ["debug@4.4.1", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="],
|
"debug": ["debug@4.4.1", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="],
|
||||||
|
|
||||||
"deep-is": ["deep-is@0.1.4", "", {}, "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="],
|
"deep-is": ["deep-is@0.1.4", "", {}, "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="],
|
||||||
@@ -553,8 +557,6 @@
|
|||||||
|
|
||||||
"lucide-svelte": ["lucide-svelte@0.525.0", "", { "peerDependencies": { "svelte": "^3 || ^4 || ^5.0.0-next.42" } }, "sha512-kfuN6JcCqTfCz2B76aXnyGLAzEBRSYw5GaUspM5RNHQZS5aI5yaKu06fbaofOk8cDvUtY0AUm/zAix7aUX6Q3A=="],
|
"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=="],
|
"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=="],
|
"merge2": ["merge2@1.4.1", "", {}, "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="],
|
||||||
@@ -589,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=="],
|
"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-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=="],
|
"p-locate": ["p-locate@5.0.0", "", { "dependencies": { "p-limit": "^3.0.2" } }, "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="],
|
||||||
@@ -759,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": ["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=="],
|
"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=="],
|
||||||
|
|
||||||
@@ -783,6 +781,8 @@
|
|||||||
|
|
||||||
"@humanfs/node/@humanwhocodes/retry": ["@humanwhocodes/retry@0.3.1", "", {}, "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA=="],
|
"@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/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=="],
|
"@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=="],
|
||||||
|
14
package.json
14
package.json
@@ -21,21 +21,17 @@
|
|||||||
"@better-fetch/fetch": "^1.1.18",
|
"@better-fetch/fetch": "^1.1.18",
|
||||||
"@fontsource/sora": "^5.2.6",
|
"@fontsource/sora": "^5.2.6",
|
||||||
"@fontsource/space-mono": "^5.2.8",
|
"@fontsource/space-mono": "^5.2.8",
|
||||||
"@iarna/toml": "^3.0.0",
|
|
||||||
"@number-flow/svelte": "^0.3.9",
|
"@number-flow/svelte": "^0.3.9",
|
||||||
"@tailwindcss/typography": "0.5.16",
|
"@tailwindcss/typography": "0.5.16",
|
||||||
"@tailwindcss/vite": "^4.1.11",
|
"@tailwindcss/vite": "^4.1.11",
|
||||||
"@tauri-apps/api": "2.6.0",
|
"@tauri-apps/api": "2.6.0",
|
||||||
"@tauri-apps/plugin-dialog": "2.3.0",
|
"@tauri-apps/plugin-dialog": "2.3.1",
|
||||||
"@tauri-apps/plugin-fs": "2.4.0",
|
"@tauri-apps/plugin-fs": "2.4.1",
|
||||||
"@tauri-apps/plugin-shell": "2.3.0",
|
"@tauri-apps/plugin-shell": "2.3.0",
|
||||||
"@tauri-apps/plugin-sql": "2.3.0",
|
|
||||||
"animejs": "^4.0.2",
|
"animejs": "^4.0.2",
|
||||||
"buffer": "^6.0.3",
|
"buffer": "^6.0.3",
|
||||||
"crypto-js": "^4.2.0",
|
"crypto-js": "^4.2.0",
|
||||||
"lucide-svelte": "0.525.0",
|
"lucide-svelte": "0.525.0",
|
||||||
"osu-classes": "3.1.0",
|
|
||||||
"osu-parsers": "4.1.7",
|
|
||||||
"semver": "^7.7.2",
|
"semver": "^7.7.2",
|
||||||
"tw-animate-css": "^1.3.0",
|
"tw-animate-css": "^1.3.0",
|
||||||
"svelte-confetti": "^2.0.0"
|
"svelte-confetti": "^2.0.0"
|
||||||
@@ -43,11 +39,13 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/compat": "^1.2.5",
|
"@eslint/compat": "^1.2.5",
|
||||||
"@eslint/js": "^9.18.0",
|
"@eslint/js": "^9.18.0",
|
||||||
|
"@iarna/toml": "2.2.5",
|
||||||
"@lucide/svelte": "^0.525.0",
|
"@lucide/svelte": "^0.525.0",
|
||||||
"@sveltejs/adapter-static": "3.0.8",
|
"@sveltejs/adapter-static": "3.0.8",
|
||||||
"@sveltejs/kit": "2.22.2",
|
"@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",
|
"@tauri-apps/cli": "2.6.1",
|
||||||
|
"@types/bun": "^1.2.18",
|
||||||
"@types/crypto-js": "^4.2.2",
|
"@types/crypto-js": "^4.2.2",
|
||||||
"@types/semver": "^7.7.0",
|
"@types/semver": "^7.7.0",
|
||||||
"autoprefixer": "10.4.21",
|
"autoprefixer": "10.4.21",
|
||||||
@@ -72,6 +70,6 @@
|
|||||||
"typescript": "5.8.3",
|
"typescript": "5.8.3",
|
||||||
"typescript-eslint": "^8.20.0",
|
"typescript-eslint": "^8.20.0",
|
||||||
"vite": "7.0.0",
|
"vite": "7.0.0",
|
||||||
"vite-plugin-devtools-json": "^0.2.0"
|
"vite-plugin-devtools-json": "^0.3.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
1117
src-tauri/Cargo.lock
generated
1117
src-tauri/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "ezpplauncher"
|
name = "ezpplauncher"
|
||||||
version = "3.0.0-beta.1"
|
version = "3.0.4"
|
||||||
description = "EZPPLauncher redefined."
|
description = "EZPPLauncher redefined."
|
||||||
authors = ["HorizonCode"]
|
authors = ["HorizonCode"]
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
@@ -15,30 +15,33 @@ name = "ezpplauncher_lib"
|
|||||||
crate-type = ["staticlib", "cdylib", "rlib"]
|
crate-type = ["staticlib", "cdylib", "rlib"]
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
tauri-build = { version = "2.3.0", features = [] }
|
tauri-build = { version = "2.3.1", features = [] }
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
tauri = { version = "2.6.2", features = [] }
|
tauri = { version = "2.7.0", features = [] }
|
||||||
tauri-plugin-shell = "2.3.0"
|
tauri-plugin-shell = "2.3.0"
|
||||||
serde = { version = "1.0.219", features = ["derive"] }
|
serde = { version = "1.0.219", features = ["derive"] }
|
||||||
serde_json = "1.0.140"
|
serde_json = "1.0.141"
|
||||||
serde_repr = "0.1.20"
|
serde_repr = "0.1.20"
|
||||||
tauri-plugin-sql = "2.3.0"
|
tauri-plugin-dialog = "2.3.1"
|
||||||
tauri-plugin-dialog = "2.3.0"
|
tauri-plugin-fs = "2.4.1"
|
||||||
tauri-plugin-fs = "2.4.0"
|
|
||||||
hardware-id = "0.3.0"
|
hardware-id = "0.3.0"
|
||||||
tauri-plugin-cors-fetch = "4.1.0"
|
tauri-plugin-cors-fetch = "4.1.0"
|
||||||
sysinfo = "0.35.2"
|
sysinfo = "0.36.1"
|
||||||
reqwest = { version = "0.12.22", features = ["json", "stream"] }
|
reqwest = { version = "0.12.22", features = ["json", "stream"] }
|
||||||
md5 = "0.8.0"
|
md5 = "0.8.0"
|
||||||
tokio = { version = "1.46.1", features = ["full"] }
|
tokio = { version = "1.46.1", features = ["full"] }
|
||||||
open = "5.3.2"
|
open = "5.3.2"
|
||||||
windows-sys = "0.60.2"
|
windows-sys = "0.60.2"
|
||||||
|
discord-rich-presence = "0.2.5"
|
||||||
|
once_cell = "1.21.3"
|
||||||
|
|
||||||
[target.'cfg(windows)'.dependencies]
|
[target.'cfg(windows)'.dependencies]
|
||||||
winreg = "0.55.0"
|
winreg = "0.55.0"
|
||||||
winapi = { version = "0.3", features = ["winuser"] }
|
winapi = { version = "0.3", features = ["winuser", "wincrypt", "memoryapi", "winbase", "dpapi"] }
|
||||||
|
base64 = "0.22.1"
|
||||||
|
widestring = "1.0"
|
||||||
|
|
||||||
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
|
[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"
|
||||||
|
|
||||||
|
6
src-tauri/nsis-hooks.nsh
Normal file
6
src-tauri/nsis-hooks.nsh
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
!macro NSIS_HOOK_POSTINSTALL
|
||||||
|
${If} $PassiveMode = 1
|
||||||
|
${OrIf} ${Silent}
|
||||||
|
Exec '"$INSTDIR\${MAINBINARYNAME}.exe"'
|
||||||
|
${EndIf}
|
||||||
|
!macroend
|
@@ -6,13 +6,16 @@ use std::path::PathBuf;
|
|||||||
use sysinfo::System;
|
use sysinfo::System;
|
||||||
use tauri::AppHandle;
|
use tauri::AppHandle;
|
||||||
use tauri::Emitter;
|
use tauri::Emitter;
|
||||||
|
use tauri::Manager;
|
||||||
use tokio::fs;
|
use tokio::fs;
|
||||||
use tokio::io::AsyncWriteExt;
|
use tokio::io::AsyncWriteExt;
|
||||||
use tokio::process::Command;
|
use tokio::process::Command;
|
||||||
use tokio::time::{Duration, sleep};
|
use tokio::time::{Duration, sleep};
|
||||||
|
|
||||||
|
use crate::presence;
|
||||||
use crate::utils::{
|
use crate::utils::{
|
||||||
check_folder_completeness, get_osu_config, get_osu_user_config, get_window_title_by_pid,
|
check_folder_completeness, encrypt_password, get_osu_config, get_osu_user_config,
|
||||||
|
get_window_title_by_pid, is_net8_installed, is_osuwinello_available, is_wmctrl_available,
|
||||||
set_osu_config_vals, set_osu_user_config_vals,
|
set_osu_config_vals, set_osu_user_config_vals,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -281,8 +284,6 @@ pub fn set_osu_config_values(
|
|||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn run_osu_updater(folder: String) -> Result<(), String> {
|
pub async fn run_osu_updater(folder: String) -> Result<(), String> {
|
||||||
let osu_exe_path = PathBuf::from(&folder).join("osu!.exe");
|
|
||||||
|
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
const DETACHED_PROCESS: u32 = 0x00000008;
|
const DETACHED_PROCESS: u32 = 0x00000008;
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
@@ -291,6 +292,7 @@ pub async fn run_osu_updater(folder: String) -> Result<(), String> {
|
|||||||
let mut updater_process = {
|
let mut updater_process = {
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
{
|
{
|
||||||
|
let osu_exe_path = PathBuf::from(&folder).join("osu!.exe");
|
||||||
Command::new(&osu_exe_path)
|
Command::new(&osu_exe_path)
|
||||||
.arg("-repair")
|
.arg("-repair")
|
||||||
.creation_flags(DETACHED_PROCESS | CREATE_NEW_PROCESS_GROUP)
|
.creation_flags(DETACHED_PROCESS | CREATE_NEW_PROCESS_GROUP)
|
||||||
@@ -300,7 +302,7 @@ pub async fn run_osu_updater(folder: String) -> Result<(), String> {
|
|||||||
|
|
||||||
#[cfg(not(windows))]
|
#[cfg(not(windows))]
|
||||||
{
|
{
|
||||||
Command::new(&osu_exe_path)
|
Command::new("osu-wine")
|
||||||
.arg("-repair")
|
.arg("-repair")
|
||||||
.spawn()
|
.spawn()
|
||||||
.map_err(|e| format!("Failed to spawn updater: {}", e))?
|
.map_err(|e| format!("Failed to spawn updater: {}", e))?
|
||||||
@@ -336,10 +338,8 @@ pub async fn run_osu_updater(folder: String) -> Result<(), String> {
|
|||||||
sleep(Duration::from_millis(500)).await;
|
sleep(Duration::from_millis(500)).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wait for updater process to fully exit
|
|
||||||
let _ = updater_process.wait().await;
|
let _ = updater_process.wait().await;
|
||||||
|
|
||||||
// Clean up update-related files
|
|
||||||
let force_update_files = [".require_update", "help.txt", "_pending"];
|
let force_update_files = [".require_update", "help.txt", "_pending"];
|
||||||
for update_file_name in &force_update_files {
|
for update_file_name in &force_update_files {
|
||||||
let path = PathBuf::from(&folder).join(update_file_name);
|
let path = PathBuf::from(&folder).join(update_file_name);
|
||||||
@@ -371,8 +371,6 @@ pub async fn run_osu(folder: String, patch: bool) -> Result<(), String> {
|
|||||||
/* #[cfg(windows)]
|
/* #[cfg(windows)]
|
||||||
use std::os::windows::process::CommandExt; */
|
use std::os::windows::process::CommandExt; */
|
||||||
|
|
||||||
let osu_exe_path = PathBuf::from(&folder).join("osu!.exe");
|
|
||||||
|
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
const DETACHED_PROCESS: u32 = 0x00000008;
|
const DETACHED_PROCESS: u32 = 0x00000008;
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
@@ -381,6 +379,7 @@ pub async fn run_osu(folder: String, patch: bool) -> Result<(), String> {
|
|||||||
let mut game_process = {
|
let mut game_process = {
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
{
|
{
|
||||||
|
let osu_exe_path = PathBuf::from(&folder).join("osu!.exe");
|
||||||
Command::new(&osu_exe_path)
|
Command::new(&osu_exe_path)
|
||||||
.arg("-devserver")
|
.arg("-devserver")
|
||||||
.arg("ez-pp.farm")
|
.arg("ez-pp.farm")
|
||||||
@@ -391,8 +390,8 @@ pub async fn run_osu(folder: String, patch: bool) -> Result<(), String> {
|
|||||||
|
|
||||||
#[cfg(not(windows))]
|
#[cfg(not(windows))]
|
||||||
{
|
{
|
||||||
Command::new(&osu_exe_path)
|
Command::new("osu-wine")
|
||||||
.arg("-devserver")
|
.arg("--devserver")
|
||||||
.arg("ez-pp.farm")
|
.arg("ez-pp.farm")
|
||||||
.spawn()
|
.spawn()
|
||||||
.map_err(|e| format!("Failed to spawn updater: {}", e))?
|
.map_err(|e| format!("Failed to spawn updater: {}", e))?
|
||||||
@@ -415,13 +414,6 @@ pub async fn run_osu(folder: String, patch: bool) -> Result<(), String> {
|
|||||||
.spawn()
|
.spawn()
|
||||||
.map_err(|e| format!("Failed to run patcher: {e}"))?;
|
.map_err(|e| format!("Failed to run patcher: {e}"))?;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(not(windows))]
|
|
||||||
{
|
|
||||||
let _ = Command::new(&patcher_exe_path)
|
|
||||||
.spawn()
|
|
||||||
.map_err(|e| format!("Failed to run patcher: {e}"))?;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -443,6 +435,7 @@ pub struct UpdateFile {
|
|||||||
pub async fn get_ezpp_launcher_update_files(
|
pub async fn get_ezpp_launcher_update_files(
|
||||||
folder: String,
|
folder: String,
|
||||||
update_url: String,
|
update_url: String,
|
||||||
|
update_stream: String,
|
||||||
) -> Result<(Vec<UpdateFile>, Vec<UpdateFile>), String> {
|
) -> Result<(Vec<UpdateFile>, Vec<UpdateFile>), String> {
|
||||||
let osu_path = PathBuf::from(folder);
|
let osu_path = PathBuf::from(folder);
|
||||||
let client = Client::new();
|
let client = Client::new();
|
||||||
@@ -450,6 +443,7 @@ pub async fn get_ezpp_launcher_update_files(
|
|||||||
let update_files = client
|
let update_files = client
|
||||||
.patch(update_url)
|
.patch(update_url)
|
||||||
.header("User-Agent", "EZPPLauncher")
|
.header("User-Agent", "EZPPLauncher")
|
||||||
|
.query(&[("stream", update_stream)])
|
||||||
.send()
|
.send()
|
||||||
.await
|
.await
|
||||||
.map_err(|e| e.to_string())?
|
.map_err(|e| e.to_string())?
|
||||||
@@ -542,7 +536,6 @@ pub async fn download_ezpp_launcher_update_files(
|
|||||||
.await
|
.await
|
||||||
.map_err(|e| e.to_string())?;
|
.map_err(|e| e.to_string())?;
|
||||||
|
|
||||||
// Emit progress to frontend
|
|
||||||
app.emit(
|
app.emit(
|
||||||
"download-progress",
|
"download-progress",
|
||||||
UpdateStatus {
|
UpdateStatus {
|
||||||
@@ -634,3 +627,182 @@ pub fn open_url_in_browser(url: String) -> Result<(), String> {
|
|||||||
pub fn exit(app: AppHandle) {
|
pub fn exit(app: AppHandle) {
|
||||||
app.exit(0x0100);
|
app.exit(0x0100);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn get_platform() -> String {
|
||||||
|
std::env::consts::OS.to_string()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn check_for_corruption(folder: String) -> Result<bool, String> {
|
||||||
|
let osu_path = PathBuf::from(folder);
|
||||||
|
let osu_ui = osu_path.join("osu!ui.dll");
|
||||||
|
let osu_gameplay = osu_path.join("osu!gameplay.dll");
|
||||||
|
|
||||||
|
let osu_ui_bak = osu_path.join("osu!ui.dll.bak");
|
||||||
|
let osu_gameplay_bak = osu_path.join("osu!gameplay.dll.bak");
|
||||||
|
|
||||||
|
let required_files = [&osu_ui, &osu_gameplay];
|
||||||
|
|
||||||
|
for file in &required_files {
|
||||||
|
if !file.exists() {
|
||||||
|
return Ok(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let bak_files = [&osu_ui_bak, &osu_gameplay_bak];
|
||||||
|
for bak in &bak_files {
|
||||||
|
if bak.exists() {
|
||||||
|
if let Err(e) = fs::remove_file(bak).await {
|
||||||
|
return Err(format!("Failed to delete {}: {}", bak.display(), e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn presence_connect() -> bool {
|
||||||
|
presence::connect().await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn presence_disconnect() {
|
||||||
|
presence::disconnect().await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct PresenceStatus {
|
||||||
|
state: Option<String>,
|
||||||
|
details: Option<String>,
|
||||||
|
large_image_key: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn presence_update_status(status: PresenceStatus) {
|
||||||
|
presence::update_status(
|
||||||
|
status.state.as_deref(),
|
||||||
|
status.details.as_deref(),
|
||||||
|
status.large_image_key.as_deref(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct PresenceUser {
|
||||||
|
username: Option<String>,
|
||||||
|
id: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn presence_update_user(user: PresenceUser) {
|
||||||
|
presence::update_user(user.username.as_deref(), user.id.as_deref());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn presence_is_connected() -> bool {
|
||||||
|
presence::has_presence().await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn has_wmctrl() -> bool {
|
||||||
|
is_wmctrl_available()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn has_osuwinello() -> bool {
|
||||||
|
is_osuwinello_available()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn has_net8() -> bool {
|
||||||
|
is_net8_installed().await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn encrypt_string(string: String, entropy: String) -> String {
|
||||||
|
let encrypted = encrypt_password(&string, &entropy);
|
||||||
|
|
||||||
|
match encrypted {
|
||||||
|
Ok(encrypted_vec) => encrypted_vec,
|
||||||
|
Err(_) => string,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn download_ezpp_launcher_update(app: AppHandle, url: String) -> Result<(), String> {
|
||||||
|
let client = Client::new();
|
||||||
|
|
||||||
|
let mut response = client.get(&url).send().await.map_err(|e| e.to_string())?;
|
||||||
|
|
||||||
|
if !response.status().is_success() {
|
||||||
|
return Err(format!("Failed to download update: {}", response.status()));
|
||||||
|
}
|
||||||
|
|
||||||
|
let temp_dir = app.path().temp_dir().expect("Failed to get temp directory");
|
||||||
|
let file_path = temp_dir.join("ezpplauncher_update.exe");
|
||||||
|
|
||||||
|
let mut file_out = fs::File::create(&file_path)
|
||||||
|
.await
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
let mut downloaded = 0u64;
|
||||||
|
let size = response
|
||||||
|
.content_length()
|
||||||
|
.ok_or("Failed to get content length")? as usize;
|
||||||
|
|
||||||
|
while let Some(chunk) = response.chunk().await.map_err(|e| e.to_string())? {
|
||||||
|
downloaded += chunk.len() as u64;
|
||||||
|
file_out
|
||||||
|
.write_all(&chunk)
|
||||||
|
.await
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
|
||||||
|
app.emit(
|
||||||
|
"download-progress",
|
||||||
|
UpdateStatus {
|
||||||
|
file_name: "Update".to_string(),
|
||||||
|
downloaded,
|
||||||
|
size: size,
|
||||||
|
progress: ((downloaded as f64 / size as f64 * 100.0) * 100.0).trunc() / 100.0,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
.unwrap_or_default();
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn install_ezpp_launcher_update(app: AppHandle) -> Result<(), String> {
|
||||||
|
let temp_dir = app.path().temp_dir().expect("Failed to get temp directory");
|
||||||
|
let file_path = temp_dir.join("ezpplauncher_update.exe");
|
||||||
|
if !file_path.exists() {
|
||||||
|
return Err("Update file does not exist".to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
// run this app detached and exit
|
||||||
|
|
||||||
|
const DETACHED_PROCESS: u32 = 0x00000008;
|
||||||
|
const CREATE_NEW_PROCESS_GROUP: u32 = 0x00000200;
|
||||||
|
|
||||||
|
Command::new(&file_path)
|
||||||
|
.arg("/S")
|
||||||
|
.creation_flags(DETACHED_PROCESS | CREATE_NEW_PROCESS_GROUP)
|
||||||
|
.spawn()
|
||||||
|
.map_err(|e| format!("Failed to spawn updater: {}", e))?;
|
||||||
|
|
||||||
|
sleep(Duration::from_millis(250)).await;
|
||||||
|
|
||||||
|
app.exit(0x0100);
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn install_ezpp_launcher_update(_app: AppHandle) -> Result<(), String> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
@@ -2,30 +2,36 @@
|
|||||||
use tauri::Manager;
|
use tauri::Manager;
|
||||||
|
|
||||||
pub mod commands;
|
pub mod commands;
|
||||||
|
pub mod presence;
|
||||||
pub mod utils;
|
pub mod utils;
|
||||||
use crate::commands::{
|
use crate::commands::{
|
||||||
download_ezpp_launcher_update_files, exit, find_osu_installation, get_beatmapsets_count,
|
check_for_corruption, download_ezpp_launcher_update, download_ezpp_launcher_update_files,
|
||||||
|
encrypt_string, exit, find_osu_installation, get_beatmapsets_count,
|
||||||
get_ezpp_launcher_update_files, get_hwid, get_launcher_version, get_osu_release_stream,
|
get_ezpp_launcher_update_files, get_hwid, get_launcher_version, get_osu_release_stream,
|
||||||
get_osu_skin, get_osu_version, get_skins_count, is_osu_running, open_url_in_browser,
|
get_osu_skin, get_osu_version, get_platform, get_skins_count, has_net8, has_osuwinello,
|
||||||
replace_ui_files, run_osu, run_osu_updater, set_osu_config_values, set_osu_user_config_values,
|
has_wmctrl, install_ezpp_launcher_update, is_osu_running, open_url_in_browser,
|
||||||
valid_osu_folder,
|
presence_connect, presence_disconnect, presence_is_connected, presence_update_status,
|
||||||
|
presence_update_user, replace_ui_files, run_osu, run_osu_updater, set_osu_config_values,
|
||||||
|
set_osu_user_config_values, valid_osu_folder,
|
||||||
};
|
};
|
||||||
|
|
||||||
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
||||||
pub fn run() {
|
pub fn run() {
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
unsafe {
|
||||||
|
std::env::set_var("WEBKIT_DISABLE_DMABUF_RENDERER", "1");
|
||||||
|
}
|
||||||
|
|
||||||
let mut builder = tauri::Builder::default();
|
let mut builder = tauri::Builder::default();
|
||||||
#[cfg(desktop)]
|
#[cfg(desktop)]
|
||||||
{
|
{
|
||||||
builder = builder.plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| {
|
builder = builder.plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| {
|
||||||
let app_window = app.get_webview_window("main").expect("no main window");
|
let app_window = app.get_webview_window("main").expect("no main window");
|
||||||
app_window
|
|
||||||
.set_always_on_top(true)
|
|
||||||
.expect("failed to set always on top");
|
|
||||||
app_window.set_focus().expect("failed to focus");
|
app_window.set_focus().expect("failed to focus");
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
builder
|
let app = builder
|
||||||
.invoke_handler(tauri::generate_handler![
|
.invoke_handler(tauri::generate_handler![
|
||||||
get_hwid,
|
get_hwid,
|
||||||
find_osu_installation,
|
find_osu_installation,
|
||||||
@@ -45,13 +51,34 @@ pub fn run() {
|
|||||||
is_osu_running,
|
is_osu_running,
|
||||||
open_url_in_browser,
|
open_url_in_browser,
|
||||||
get_launcher_version,
|
get_launcher_version,
|
||||||
exit
|
exit,
|
||||||
|
get_platform,
|
||||||
|
check_for_corruption,
|
||||||
|
presence_connect,
|
||||||
|
presence_disconnect,
|
||||||
|
presence_update_status,
|
||||||
|
presence_update_user,
|
||||||
|
presence_is_connected,
|
||||||
|
has_osuwinello,
|
||||||
|
has_wmctrl,
|
||||||
|
has_net8,
|
||||||
|
encrypt_string,
|
||||||
|
download_ezpp_launcher_update,
|
||||||
|
install_ezpp_launcher_update
|
||||||
])
|
])
|
||||||
.plugin(tauri_plugin_fs::init())
|
.plugin(tauri_plugin_fs::init())
|
||||||
.plugin(tauri_plugin_dialog::init())
|
.plugin(tauri_plugin_dialog::init())
|
||||||
.plugin(tauri_plugin_shell::init())
|
.plugin(tauri_plugin_shell::init())
|
||||||
.plugin(tauri_plugin_cors_fetch::init())
|
.plugin(tauri_plugin_cors_fetch::init())
|
||||||
.plugin(tauri_plugin_sql::Builder::default().build())
|
.build(tauri::generate_context!())
|
||||||
.run(tauri::generate_context!())
|
.expect("error while building tauri application");
|
||||||
.expect("error while running tauri application");
|
|
||||||
|
app.run(|_app_handle, event| {
|
||||||
|
if let tauri::RunEvent::ExitRequested { api, .. } = event {
|
||||||
|
api.prevent_exit();
|
||||||
|
|
||||||
|
tauri::async_runtime::block_on(presence::disconnect());
|
||||||
|
std::process::exit(0);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
231
src-tauri/src/presence.rs
Normal file
231
src-tauri/src/presence.rs
Normal file
@@ -0,0 +1,231 @@
|
|||||||
|
use discord_rich_presence::{
|
||||||
|
activity::{Activity, Assets, Button, Timestamps},
|
||||||
|
DiscordIpc, DiscordIpcClient,
|
||||||
|
};
|
||||||
|
use once_cell::sync::Lazy;
|
||||||
|
use std::sync::Mutex as StdMutex;
|
||||||
|
use std::time::{SystemTime, UNIX_EPOCH};
|
||||||
|
use tokio::sync::{mpsc, oneshot};
|
||||||
|
use tokio::time::{interval, Duration};
|
||||||
|
|
||||||
|
#[derive(Clone, Debug)]
|
||||||
|
pub struct PresenceData {
|
||||||
|
pub state: String,
|
||||||
|
pub details: String,
|
||||||
|
pub large_image_key: String,
|
||||||
|
pub large_image_text: String,
|
||||||
|
pub small_image_key: Option<String>,
|
||||||
|
pub small_image_text: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
enum PresenceCommand {
|
||||||
|
Connect(oneshot::Sender<bool>),
|
||||||
|
Disconnect(oneshot::Sender<()>),
|
||||||
|
UpdateData(PresenceData),
|
||||||
|
IsConnected(oneshot::Sender<bool>),
|
||||||
|
}
|
||||||
|
|
||||||
|
struct PresenceActor {
|
||||||
|
receiver: mpsc::Receiver<PresenceCommand>,
|
||||||
|
client: Option<DiscordIpcClient>,
|
||||||
|
data: PresenceData,
|
||||||
|
start_timestamp: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PresenceActor {
|
||||||
|
fn new(receiver: mpsc::Receiver<PresenceCommand>) -> Self {
|
||||||
|
let start = SystemTime::now()
|
||||||
|
.duration_since(UNIX_EPOCH)
|
||||||
|
.unwrap()
|
||||||
|
.as_secs() as i64;
|
||||||
|
|
||||||
|
let data = PresenceData {
|
||||||
|
state: "Idle in Launcher...".to_string(),
|
||||||
|
details: " ".to_string(),
|
||||||
|
large_image_key: "ezppfarm".to_string(),
|
||||||
|
large_image_text: "EZPPFarm".to_string(),
|
||||||
|
small_image_key: None,
|
||||||
|
small_image_text: None,
|
||||||
|
};
|
||||||
|
|
||||||
|
PresenceActor {
|
||||||
|
receiver,
|
||||||
|
client: None,
|
||||||
|
data,
|
||||||
|
start_timestamp: start,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn run(&mut self) {
|
||||||
|
let mut update_interval = interval(Duration::from_millis(2500));
|
||||||
|
|
||||||
|
loop {
|
||||||
|
tokio::select! {
|
||||||
|
Some(cmd) = self.receiver.recv() => {
|
||||||
|
match cmd {
|
||||||
|
PresenceCommand::Connect(responder) => self.handle_connect(responder).await,
|
||||||
|
PresenceCommand::Disconnect(responder) => {
|
||||||
|
self.handle_disconnect(responder).await;
|
||||||
|
},
|
||||||
|
PresenceCommand::UpdateData(new_data) => {
|
||||||
|
self.data = new_data;
|
||||||
|
},
|
||||||
|
PresenceCommand::IsConnected(responder) => {
|
||||||
|
let _ = responder.send(self.client.is_some());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ = update_interval.tick() => {
|
||||||
|
if self.client.is_some() {
|
||||||
|
self.handle_update().await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn handle_connect(&mut self, responder: oneshot::Sender<bool>) {
|
||||||
|
if self.client.is_some() {
|
||||||
|
let _ = responder.send(true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
println!("Actor: Connecting to Discord...");
|
||||||
|
match DiscordIpcClient::new("1032772293220384808").map_err(|e| e.to_string()) {
|
||||||
|
Ok(mut new_client) => {
|
||||||
|
if let Err(e) = new_client.connect().map_err(|e| e.to_string()) {
|
||||||
|
eprintln!("Failed to connect to Discord: {:?}", e);
|
||||||
|
let _ = responder.send(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
self.client = Some(new_client);
|
||||||
|
println!("Actor: Connected successfully.");
|
||||||
|
self.handle_update().await;
|
||||||
|
let _ = responder.send(true);
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
eprintln!("Failed to create Discord client: {:?}", e);
|
||||||
|
let _ = responder.send(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn handle_disconnect(&mut self, responder: oneshot::Sender<()>) {
|
||||||
|
if let Some(mut client) = self.client.take() {
|
||||||
|
println!("Actor: Disconnecting...");
|
||||||
|
let _ = client.clear_activity().map_err(|e| e.to_string());
|
||||||
|
let _ = client.close().map_err(|e| e.to_string());
|
||||||
|
println!("Actor: Disconnected successfully.");
|
||||||
|
}
|
||||||
|
let _ = responder.send(());
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn handle_update(&mut self) {
|
||||||
|
if let Some(client) = self.client.as_mut() {
|
||||||
|
let mut assets = Assets::new()
|
||||||
|
.large_image(&self.data.large_image_key)
|
||||||
|
.large_text(&self.data.large_image_text);
|
||||||
|
|
||||||
|
if let Some(key) = &self.data.small_image_key {
|
||||||
|
assets = assets.small_image(key);
|
||||||
|
}
|
||||||
|
if let Some(text) = &self.data.small_image_text {
|
||||||
|
assets = assets.small_text(text);
|
||||||
|
}
|
||||||
|
|
||||||
|
let activity = Activity::new()
|
||||||
|
.state(&self.data.state)
|
||||||
|
.details(&self.data.details)
|
||||||
|
.timestamps(Timestamps::new().start(self.start_timestamp))
|
||||||
|
.assets(assets)
|
||||||
|
.buttons(vec![
|
||||||
|
Button::new(
|
||||||
|
"Download the Launcher",
|
||||||
|
"https://git.ez-pp.farm/EZPPFarm/EZPPLauncher/releases/latest",
|
||||||
|
),
|
||||||
|
Button::new("Join EZPPFarm", "https://ez-pp.farm/discord"),
|
||||||
|
]);
|
||||||
|
|
||||||
|
if let Err(e) = client.set_activity(activity).map_err(|e| e.to_string()) {
|
||||||
|
eprintln!("Failed to set activity, disconnecting: {:?}", e);
|
||||||
|
if let Some(mut client) = self.client.take() {
|
||||||
|
let _ = client.clear_activity();
|
||||||
|
let _ = client.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static PRESENCE_TX: Lazy<mpsc::Sender<PresenceCommand>> = Lazy::new(|| {
|
||||||
|
let (tx, rx) = mpsc::channel(10);
|
||||||
|
let mut actor = PresenceActor::new(rx);
|
||||||
|
tokio::spawn(async move { actor.run().await });
|
||||||
|
tx
|
||||||
|
});
|
||||||
|
|
||||||
|
pub static PRESENCE_DATA: Lazy<StdMutex<PresenceData>> = Lazy::new(|| {
|
||||||
|
StdMutex::new(PresenceData {
|
||||||
|
state: "Idle in Launcher...".to_string(),
|
||||||
|
details: " ".to_string(),
|
||||||
|
large_image_key: "ezppfarm".to_string(),
|
||||||
|
large_image_text: "EZPPFarm".to_string(),
|
||||||
|
small_image_key: None,
|
||||||
|
small_image_text: None,
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
pub async fn connect() -> bool {
|
||||||
|
let (tx, rx) = oneshot::channel();
|
||||||
|
if PRESENCE_TX.send(PresenceCommand::Connect(tx)).await.is_ok() {
|
||||||
|
return rx.await.unwrap_or(false);
|
||||||
|
}
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn disconnect() {
|
||||||
|
let (tx, rx) = oneshot::channel();
|
||||||
|
if PRESENCE_TX.send(PresenceCommand::Disconnect(tx)).await.is_ok() {
|
||||||
|
let _ = rx.await;
|
||||||
|
} else {
|
||||||
|
println!("Could not send disconnect command; actor may not be running.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn has_presence() -> bool {
|
||||||
|
let (tx, rx) = oneshot::channel();
|
||||||
|
if PRESENCE_TX.send(PresenceCommand::IsConnected(tx)).await.is_ok() {
|
||||||
|
return rx.await.unwrap_or(false);
|
||||||
|
}
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn update_status(state: Option<&str>, details: Option<&str>, large_image_key: Option<&str>) {
|
||||||
|
let mut data = PRESENCE_DATA.lock().unwrap();
|
||||||
|
if let Some(s) = state {
|
||||||
|
data.state = s.to_string();
|
||||||
|
}
|
||||||
|
if let Some(d) = details {
|
||||||
|
data.details = d.to_string();
|
||||||
|
}
|
||||||
|
if let Some(img) = large_image_key {
|
||||||
|
data.large_image_key = img.to_string();
|
||||||
|
}
|
||||||
|
let data_clone = data.clone();
|
||||||
|
let tx = PRESENCE_TX.clone();
|
||||||
|
tokio::spawn(async move {
|
||||||
|
let _ = tx.send(PresenceCommand::UpdateData(data_clone)).await;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn update_user(username: Option<&str>, id: Option<&str>) {
|
||||||
|
let mut data = PRESENCE_DATA.lock().unwrap();
|
||||||
|
data.small_image_key = id.map(|id_str| format!("https://a.ez-pp.farm/{}", id_str));
|
||||||
|
data.small_image_text = username.map(|s| s.to_string());
|
||||||
|
let data_clone = data.clone();
|
||||||
|
let tx = PRESENCE_TX.clone();
|
||||||
|
tokio::spawn(async move {
|
||||||
|
let _ = tx.send(PresenceCommand::UpdateData(data_clone)).await;
|
||||||
|
});
|
||||||
|
}
|
@@ -71,7 +71,6 @@ pub fn set_osu_user_config_vals(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Collect indices and keys to update to avoid borrow checker issues
|
|
||||||
let mut updates = Vec::new();
|
let mut updates = Vec::new();
|
||||||
for (i, line) in lines.iter().enumerate() {
|
for (i, line) in lines.iter().enumerate() {
|
||||||
if let Some((existing_key, _)) = line.split_once(" = ") {
|
if let Some((existing_key, _)) = line.split_once(" = ") {
|
||||||
@@ -86,7 +85,6 @@ pub fn set_osu_user_config_vals(
|
|||||||
keys_to_add.remove(trimmed_key.as_str());
|
keys_to_add.remove(trimmed_key.as_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add new keys that were not found
|
|
||||||
for key in keys_to_add {
|
for key in keys_to_add {
|
||||||
if let Some(value) = keys_to_set.get(key) {
|
if let Some(value) = keys_to_set.get(key) {
|
||||||
lines.push(format!("{} = {}", key, value));
|
lines.push(format!("{} = {}", key, value));
|
||||||
@@ -139,7 +137,6 @@ pub fn set_osu_config_vals(
|
|||||||
keys_to_add.remove(trimmed_key.as_str());
|
keys_to_add.remove(trimmed_key.as_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add new keys that were not found
|
|
||||||
for key in keys_to_add {
|
for key in keys_to_add {
|
||||||
if let Some(value) = keys_to_set.get(key) {
|
if let Some(value) = keys_to_set.get(key) {
|
||||||
lines.push(format!("{} = {}", key, value));
|
lines.push(format!("{} = {}", key, value));
|
||||||
@@ -177,19 +174,78 @@ pub fn get_osu_config<P: AsRef<Path>>(
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(not(windows))]
|
#[cfg(not(windows))]
|
||||||
pub fn get_window_title_by_pid(_pid: Pid) -> String {
|
pub fn is_osuwinello_available() -> bool {
|
||||||
"".to_string()
|
use std::process::Command;
|
||||||
|
Command::new("osu-wine")
|
||||||
|
.arg("--info")
|
||||||
|
.stdout(std::process::Stdio::null())
|
||||||
|
.stderr(std::process::Stdio::null())
|
||||||
|
.status()
|
||||||
|
.is_ok()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub fn is_osuwinello_available() -> bool {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
pub fn is_wmctrl_available() -> bool {
|
||||||
|
use std::process::Command;
|
||||||
|
Command::new("wmctrl")
|
||||||
|
.arg("-V")
|
||||||
|
.stdout(std::process::Stdio::null())
|
||||||
|
.stderr(std::process::Stdio::null())
|
||||||
|
.status()
|
||||||
|
.is_ok()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
|
pub fn is_wmctrl_available() -> bool {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
pub fn get_window_title_by_pid(target_pid: Pid) -> String {
|
||||||
|
use std::process::Command;
|
||||||
|
let find_title = || -> Option<String> {
|
||||||
|
let output = Command::new("wmctrl").arg("-lp").output().ok()?;
|
||||||
|
|
||||||
|
if !output.status.success() {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
let output_str = String::from_utf8(output.stdout).ok()?;
|
||||||
|
|
||||||
|
for line in output_str.lines() {
|
||||||
|
let parts: Vec<&str> = line.split_whitespace().collect();
|
||||||
|
if parts.len() < 4 {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Ok(pid) = parts[2].parse::<u32>() {
|
||||||
|
if pid == target_pid.as_u32() {
|
||||||
|
let title = parts[4..].join(" ");
|
||||||
|
return Some(title);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
None
|
||||||
|
};
|
||||||
|
|
||||||
|
find_title().unwrap_or_default()
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
pub fn get_window_title_by_pid(pid: Pid) -> String {
|
pub fn get_window_title_by_pid(pid: Pid) -> String {
|
||||||
|
use std::ffi::OsString;
|
||||||
|
use std::os::windows::ffi::OsStringExt;
|
||||||
use std::sync::{Arc, Mutex};
|
use std::sync::{Arc, Mutex};
|
||||||
use winapi::shared::windef::HWND;
|
use winapi::shared::windef::HWND;
|
||||||
use winapi::um::winuser::{
|
use winapi::um::winuser::{
|
||||||
EnumWindows, GetWindowTextW, GetWindowThreadProcessId, IsWindowVisible,
|
EnumWindows, GetWindowTextW, GetWindowThreadProcessId, IsWindowVisible,
|
||||||
};
|
};
|
||||||
use std::ffi::OsString;
|
|
||||||
use std::os::windows::ffi::OsStringExt;
|
|
||||||
|
|
||||||
extern "system" fn enum_windows_proc(
|
extern "system" fn enum_windows_proc(
|
||||||
hwnd: HWND,
|
hwnd: HWND,
|
||||||
@@ -210,11 +266,11 @@ pub fn get_window_title_by_pid(pid: Pid) -> String {
|
|||||||
let title_str = title.to_string_lossy().into_owned();
|
let title_str = title.to_string_lossy().into_owned();
|
||||||
if !title_str.is_empty() {
|
if !title_str.is_empty() {
|
||||||
*result.lock().unwrap() = Some(title_str);
|
*result.lock().unwrap() = Some(title_str);
|
||||||
return 0; // Stop enumeration
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
1 // Continue enumeration
|
1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -228,3 +284,97 @@ pub fn get_window_title_by_pid(pid: Pid) -> String {
|
|||||||
}
|
}
|
||||||
result.lock().unwrap().clone().unwrap_or_default()
|
result.lock().unwrap().clone().unwrap_or_default()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn is_net8_installed() -> bool {
|
||||||
|
use std::process::Command;
|
||||||
|
let output_result = Command::new("dotnet").arg("--list-runtimes").output();
|
||||||
|
match output_result {
|
||||||
|
Ok(output) => {
|
||||||
|
if !output.status.success() {
|
||||||
|
eprintln!(
|
||||||
|
"Error: `dotnet --list-runtimes` failed with status: {}",
|
||||||
|
output.status
|
||||||
|
);
|
||||||
|
eprintln!("stderr: {}", String::from_utf8_lossy(&output.stderr));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
let stdout_str = String::from_utf8_lossy(&output.stdout);
|
||||||
|
stdout_str
|
||||||
|
.lines()
|
||||||
|
.any(|line| line.starts_with("Microsoft.WindowsDesktop.App 8."))
|
||||||
|
}
|
||||||
|
Err(_) => false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[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};
|
||||||
|
use std::ffi::OsStr;
|
||||||
|
use std::os::windows::ffi::OsStrExt;
|
||||||
|
use std::ptr;
|
||||||
|
use std::slice;
|
||||||
|
use winapi::shared::minwindef::{BYTE, DWORD, LPVOID};
|
||||||
|
use winapi::shared::ntdef::LPCWSTR;
|
||||||
|
use winapi::um::dpapi::{CRYPTPROTECT_UI_FORBIDDEN, CryptProtectData};
|
||||||
|
use winapi::um::winbase::LocalFree;
|
||||||
|
use winapi::um::wincrypt::DATA_BLOB;
|
||||||
|
|
||||||
|
let description = "Encrypted";
|
||||||
|
|
||||||
|
let password_bytes = password.as_bytes();
|
||||||
|
let mut input_blob = DATA_BLOB {
|
||||||
|
cbData: password_bytes.len() as DWORD,
|
||||||
|
pbData: password_bytes.as_ptr() as *mut BYTE,
|
||||||
|
};
|
||||||
|
|
||||||
|
let entropy_bytes = entropy.as_bytes();
|
||||||
|
let mut entropy_blob = DATA_BLOB {
|
||||||
|
cbData: entropy_bytes.len() as DWORD,
|
||||||
|
pbData: entropy_bytes.as_ptr() as *mut BYTE,
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut output_blob = DATA_BLOB {
|
||||||
|
cbData: 0,
|
||||||
|
pbData: ptr::null_mut(),
|
||||||
|
};
|
||||||
|
|
||||||
|
let wide_description: Vec<u16> = OsStrExt::encode_wide(OsStr::new(description))
|
||||||
|
.chain(Some(0))
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
let p_description: LPCWSTR = wide_description.as_ptr();
|
||||||
|
|
||||||
|
let result = unsafe {
|
||||||
|
CryptProtectData(
|
||||||
|
&mut input_blob,
|
||||||
|
p_description,
|
||||||
|
&mut entropy_blob,
|
||||||
|
ptr::null_mut(),
|
||||||
|
ptr::null_mut(),
|
||||||
|
CRYPTPROTECT_UI_FORBIDDEN,
|
||||||
|
&mut output_blob,
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
||||||
|
if result == 0 {
|
||||||
|
return Err("CryptProtectData failed".to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
let encrypted_data =
|
||||||
|
unsafe { slice::from_raw_parts(output_blob.pbData, output_blob.cbData as usize).to_vec() };
|
||||||
|
|
||||||
|
unsafe {
|
||||||
|
LocalFree(output_blob.pbData as LPVOID);
|
||||||
|
}
|
||||||
|
|
||||||
|
let base64_string = general_purpose::STANDARD.encode(&encrypted_data);
|
||||||
|
|
||||||
|
Ok(base64_string)
|
||||||
|
}
|
@@ -1,8 +1,9 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
"productName": "ezpplauncher",
|
"productName": "EZPPLauncher",
|
||||||
"version": "3.0.0-beta.1",
|
"version": "3.0.4",
|
||||||
"identifier": "farm.ezpp.launcher",
|
"identifier": "farm.EZPPFarm.Launcher",
|
||||||
|
"mainBinaryName": "ezpplauncher",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "bun run vite:dev",
|
"beforeDevCommand": "bun run vite:dev",
|
||||||
"devUrl": "http://localhost:1420",
|
"devUrl": "http://localhost:1420",
|
||||||
@@ -12,7 +13,7 @@
|
|||||||
"app": {
|
"app": {
|
||||||
"windows": [
|
"windows": [
|
||||||
{
|
{
|
||||||
"title": "ezpplauncher",
|
"title": "EZPPLauncher",
|
||||||
"width": 1000,
|
"width": 1000,
|
||||||
"height": 700,
|
"height": 700,
|
||||||
"decorations": false,
|
"decorations": false,
|
||||||
@@ -26,10 +27,26 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"bundle": {
|
"bundle": {
|
||||||
|
"publisher": "EZPPFarm",
|
||||||
|
"copyright": "EZPPFarm",
|
||||||
|
"homepage": "https://ez-pp.farm",
|
||||||
|
"license": "GPL-3.0",
|
||||||
"active": true,
|
"active": true,
|
||||||
"targets": [
|
"targets": [
|
||||||
"app"
|
"nsis",
|
||||||
|
"appimage"
|
||||||
],
|
],
|
||||||
|
"windows": {
|
||||||
|
"webviewInstallMode": {
|
||||||
|
"silent": true,
|
||||||
|
"type": "downloadBootstrapper"
|
||||||
|
},
|
||||||
|
"nsis": {
|
||||||
|
"installMode": "currentUser",
|
||||||
|
"compression": "lzma",
|
||||||
|
"installerHooks": "./nsis-hooks.nsh"
|
||||||
|
}
|
||||||
|
},
|
||||||
"icon": [
|
"icon": [
|
||||||
"icons/32x32.png",
|
"icons/32x32.png",
|
||||||
"icons/128x128.png",
|
"icons/128x128.png",
|
||||||
|
10
src/app.css
10
src/app.css
@@ -150,8 +150,18 @@
|
|||||||
@layer base {
|
@layer base {
|
||||||
* {
|
* {
|
||||||
@apply border-border outline-ring/50;
|
@apply border-border outline-ring/50;
|
||||||
|
-webkit-touch-callout: none;
|
||||||
|
-webkit-user-select: none;
|
||||||
|
-khtml-user-select: none;
|
||||||
|
-moz-user-select: none;
|
||||||
|
-ms-user-select: none;
|
||||||
|
user-select: none;
|
||||||
}
|
}
|
||||||
body {
|
body {
|
||||||
@apply bg-background text-foreground;
|
@apply bg-background text-foreground;
|
||||||
}
|
}
|
||||||
|
button:not([disabled]),
|
||||||
|
[role="button"]:not([disabled]) {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,4 +1,9 @@
|
|||||||
import type { EZPPUser, EZPPUserInfoResponse, EZPPUserResponse } from '@/types';
|
import type {
|
||||||
|
EZPPUser,
|
||||||
|
EZPPUserInfoResponse,
|
||||||
|
EZPPUserResponse,
|
||||||
|
EZPPUSerStatusResponse,
|
||||||
|
} from '@/types';
|
||||||
import { betterFetch } from '@better-fetch/fetch';
|
import { betterFetch } from '@better-fetch/fetch';
|
||||||
|
|
||||||
const BANCHO_ENDPOINT = 'https://c.ez-pp.farm/';
|
const BANCHO_ENDPOINT = 'https://c.ez-pp.farm/';
|
||||||
@@ -54,12 +59,12 @@ export const ezppfarm = {
|
|||||||
}
|
}
|
||||||
return request.data;
|
return request.data;
|
||||||
},
|
},
|
||||||
getUserInfo: async (userId: number) => {
|
getUserInfo: async (userId: number, scope: 'all' | 'info' | 'stats' = 'all') => {
|
||||||
const request = await betterFetch<EZPPUserInfoResponse>(`${API_ENDPOINT}v1/get_player_info`, {
|
const request = await betterFetch<EZPPUserInfoResponse>(`${API_ENDPOINT}v1/get_player_info`, {
|
||||||
timeout,
|
timeout,
|
||||||
query: {
|
query: {
|
||||||
id: userId,
|
id: userId,
|
||||||
scope: 'all',
|
scope,
|
||||||
},
|
},
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
@@ -68,4 +73,20 @@ export const ezppfarm = {
|
|||||||
});
|
});
|
||||||
return request.error ? undefined : request.data;
|
return request.error ? undefined : request.data;
|
||||||
},
|
},
|
||||||
|
getUserStatus: async (userId: number) => {
|
||||||
|
const request = await betterFetch<EZPPUSerStatusResponse>(
|
||||||
|
`${API_ENDPOINT}v1/get_player_status`,
|
||||||
|
{
|
||||||
|
timeout,
|
||||||
|
query: {
|
||||||
|
id: userId,
|
||||||
|
},
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
'User-Agent': 'EZPPLauncher',
|
||||||
|
},
|
||||||
|
}
|
||||||
|
);
|
||||||
|
return request.error ? undefined : request.data;
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
@@ -18,11 +18,13 @@ export const osuapi = {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
if (request.error) {
|
if (request.error) {
|
||||||
if (request.error.status >= 500 && request.error.status < 600)
|
|
||||||
throw new Error('Server not reachable');
|
|
||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
const releaseData = request.data;
|
const releaseData = request.data;
|
||||||
|
if (!releaseData || !releaseData.streams) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
if (releaseData.streams.length === 0) return undefined;
|
||||||
const selectedRelease = releaseData.streams.find(
|
const selectedRelease = releaseData.streams.find(
|
||||||
(releaseBuild) =>
|
(releaseBuild) =>
|
||||||
releaseBuild.name.toLowerCase() === releaseStream.replaceAll(' ', '').toLowerCase()
|
releaseBuild.name.toLowerCase() === releaseStream.replaceAll(' ', '').toLowerCase()
|
||||||
|
@@ -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>
|
|
@@ -20,10 +20,14 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div data-tauri-drag-region class="titlebar z-[60] border-b border-theme-800/90">
|
<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" />
|
<img src={Logo} alt="EZPP Launcher Logo" class="h-11 w-11 inline-block" />
|
||||||
<span>EZPPLauncher</span>
|
<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>
|
||||||
<div class="titlebar-button rounded-lg transition-colors duration-75" id="titlebar-minimize">
|
<div class="titlebar-button rounded-lg transition-colors duration-75" id="titlebar-minimize">
|
||||||
<Minimize size={18} />
|
<Minimize size={18} />
|
||||||
|
@@ -1,14 +1,22 @@
|
|||||||
import { writable } from 'svelte/store';
|
import { writable } from 'svelte/store';
|
||||||
import { ezppfarm } from './api/ezpp';
|
import { ezppfarm } from './api/ezpp';
|
||||||
import type { Component } from 'svelte';
|
import type { Component } from 'svelte';
|
||||||
import Loading from '../pages/Loading.svelte';
|
import Loading from '../screens/Loading.svelte';
|
||||||
import type { Release } from './types';
|
import type { Release } from './types';
|
||||||
|
|
||||||
export const currentView = writable<Component>(Loading);
|
export const currentView = writable<Component>(Loading);
|
||||||
|
|
||||||
|
export const platform = writable<string>('');
|
||||||
|
|
||||||
export const launcherVersion = writable<string>('');
|
export const launcherVersion = writable<string>('');
|
||||||
export const newVersion = writable<Release | undefined>(undefined);
|
export const newVersion = writable<Release | undefined>(undefined);
|
||||||
|
|
||||||
|
export const launcherStreams = writable<string[]>(['stable']);
|
||||||
|
export const launcherStream = writable<string>('stable');
|
||||||
|
|
||||||
|
export const discordPresence = writable<boolean>(false);
|
||||||
|
export const presenceLoading = writable<boolean>(false);
|
||||||
|
|
||||||
export const currentLoadingInfo = writable<string>('Initializing...');
|
export const currentLoadingInfo = writable<string>('Initializing...');
|
||||||
|
|
||||||
export const firstStartup = writable<boolean>(false);
|
export const firstStartup = writable<boolean>(false);
|
||||||
|
@@ -1,8 +1,9 @@
|
|||||||
import { invoke } from '@tauri-apps/api/core';
|
import { invoke } from '@tauri-apps/api/core';
|
||||||
import type { UpdateFile, UpdateStatus } from './types';
|
import type { UpdateFile, UpdateStatus } from './types';
|
||||||
import { listen } from '@tauri-apps/api/event';
|
import { listen } from '@tauri-apps/api/event';
|
||||||
|
import { betterFetch } from '@better-fetch/fetch';
|
||||||
|
|
||||||
const updateUrl = 'https://ez-pp.farm/ezpplauncher';
|
const updateUrl = 'https://next.ez-pp.farm/api/ezpplauncher';
|
||||||
|
|
||||||
export const getHWID = async () => {
|
export const getHWID = async () => {
|
||||||
const hwid = await invoke('get_hwid');
|
const hwid = await invoke('get_hwid');
|
||||||
@@ -73,8 +74,24 @@ export const runUpdater = async (folder: string) => await invoke('run_osu_update
|
|||||||
export const runOsu = async (folder: string, patch: boolean) =>
|
export const runOsu = async (folder: string, patch: boolean) =>
|
||||||
await invoke('run_osu', { folder, patch });
|
await invoke('run_osu', { folder, patch });
|
||||||
|
|
||||||
export const getEZPPLauncherUpdateFiles = async (folder: string) => {
|
export const getEZPPLauncherStreams = async () => {
|
||||||
const result = await invoke('get_ezpp_launcher_update_files', { folder, updateUrl });
|
const resp = await betterFetch<{ streams: string[] }>(updateUrl, {
|
||||||
|
method: 'POST',
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!resp.error) {
|
||||||
|
return resp.data.streams;
|
||||||
|
}
|
||||||
|
|
||||||
|
return undefined;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getEZPPLauncherUpdateFiles = async (folder: string, updateStream: string) => {
|
||||||
|
const result = await invoke('get_ezpp_launcher_update_files', {
|
||||||
|
folder,
|
||||||
|
updateUrl,
|
||||||
|
updateStream,
|
||||||
|
});
|
||||||
if (typeof result === 'object') {
|
if (typeof result === 'object') {
|
||||||
const [filesToDownload, updateFiles] = result as [UpdateFile[], UpdateFile[]];
|
const [filesToDownload, updateFiles] = result as [UpdateFile[], UpdateFile[]];
|
||||||
return {
|
return {
|
||||||
@@ -113,3 +130,25 @@ export const isOsuRunning = async () => {
|
|||||||
|
|
||||||
export const getLauncherVersion = async () => await invoke<string>('get_launcher_version');
|
export const getLauncherVersion = async () => await invoke<string>('get_launcher_version');
|
||||||
export const exit = async () => await invoke('exit');
|
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 encryptString = async (str: string, entropy: string) =>
|
||||||
|
await invoke<string>('encrypt_string', { string: str, entropy });
|
||||||
|
export const downloadUpdate = async (
|
||||||
|
url: string,
|
||||||
|
progressCallback: (file: UpdateStatus) => void
|
||||||
|
) => {
|
||||||
|
const downloadStatusListen = await listen('download-progress', (event) =>
|
||||||
|
progressCallback(event.payload as UpdateStatus)
|
||||||
|
);
|
||||||
|
try {
|
||||||
|
await invoke<string>('download_ezpp_launcher_update', { url });
|
||||||
|
} finally {
|
||||||
|
downloadStatusListen();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
export const installUpdate = async () => await invoke('install_ezpp_launcher_update');
|
||||||
|
19
src/lib/presence.ts
Normal file
19
src/lib/presence.ts
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
import { invoke } from '@tauri-apps/api/core';
|
||||||
|
|
||||||
|
export const connect = async () => await invoke('presence_connect');
|
||||||
|
export const disconnect = async () => await invoke('presence_disconnect');
|
||||||
|
export const updateStatus = async (status: {
|
||||||
|
state: string;
|
||||||
|
details: string;
|
||||||
|
largeImageKey?: string;
|
||||||
|
}) =>
|
||||||
|
await invoke('presence_update_status', {
|
||||||
|
status: {
|
||||||
|
state: status.state,
|
||||||
|
details: status.details,
|
||||||
|
largeImageKey: status.largeImageKey,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
export const updateUser = async (user: { username: string; id?: string | null }) =>
|
||||||
|
await invoke('presence_update_user', { user: { username: user.username, id: user.id } });
|
||||||
|
export const isConnected = async () => await invoke<boolean>('presence_is_connected');
|
@@ -185,3 +185,65 @@ export type Release = {
|
|||||||
browser_download_url: string;
|
browser_download_url: string;
|
||||||
}[];
|
}[];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type EZPPUSerStatusResponse = EZPPUserOfflineStatus | EZPPUserOnlineStatus;
|
||||||
|
|
||||||
|
type EZPPUserOfflineStatus = {
|
||||||
|
status: string;
|
||||||
|
player_status: {
|
||||||
|
online: false;
|
||||||
|
last_seen: number;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
type EZPPUserOnlineStatus = {
|
||||||
|
status: string;
|
||||||
|
player_status: {
|
||||||
|
online: true;
|
||||||
|
login_time: number;
|
||||||
|
status: {
|
||||||
|
action: EZPPActionStatus;
|
||||||
|
info_text: string;
|
||||||
|
mode: number;
|
||||||
|
mods: number;
|
||||||
|
beatmap: EZPPUserBeatmapStatus | null;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
type EZPPUserBeatmapStatus = {
|
||||||
|
md5: string;
|
||||||
|
id: number;
|
||||||
|
set_id: number;
|
||||||
|
artist: string;
|
||||||
|
title: string;
|
||||||
|
version: string;
|
||||||
|
creator: string;
|
||||||
|
last_update: string;
|
||||||
|
total_length: number;
|
||||||
|
max_combo: number;
|
||||||
|
status: number;
|
||||||
|
plays: number;
|
||||||
|
passes: number;
|
||||||
|
mode: number;
|
||||||
|
bpm: number;
|
||||||
|
cs: number;
|
||||||
|
od: number;
|
||||||
|
ar: number;
|
||||||
|
hp: number;
|
||||||
|
diff: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
export enum EZPPActionStatus {
|
||||||
|
AFK = 1,
|
||||||
|
PLAYING = 2,
|
||||||
|
EDITING = 3,
|
||||||
|
MODDING = 4,
|
||||||
|
MULTIPLAYER_SELECT = 5,
|
||||||
|
WATCHING = 6,
|
||||||
|
TESTING = 8,
|
||||||
|
SUBMITTING = 9,
|
||||||
|
MULTIPLAYER_IDLE = 11,
|
||||||
|
MULTIPLAYER_PLAYING = 12,
|
||||||
|
DIRECT = 13,
|
||||||
|
}
|
||||||
|
@@ -89,3 +89,14 @@ export const formatBytes = (bytes: number, decimals = 2) => {
|
|||||||
export const openURL = async (url: string) => {
|
export const openURL = async (url: string) => {
|
||||||
await invoke('open_url_in_browser', { url });
|
await invoke('open_url_in_browser', { url });
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const urlIsValidImage = async (url: string) => {
|
||||||
|
try {
|
||||||
|
const request = await fetch(url);
|
||||||
|
if (!request.ok) return false;
|
||||||
|
const contentType = request.headers.get('content-type');
|
||||||
|
return contentType?.startsWith('image/');
|
||||||
|
} catch {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
@@ -1,8 +1,18 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
|
import Logo from '$assets/logo.png';
|
||||||
import '../app.css';
|
import '../app.css';
|
||||||
|
|
||||||
import Titlebar from '@/components/ui/titlebar/titlebar.svelte';
|
import Titlebar from '@/components/ui/titlebar/titlebar.svelte';
|
||||||
import { currentLoadingInfo, firstStartup, launcherVersion, setupValues } from '@/global';
|
import * as AlertDialog from '@/components/ui/alert-dialog';
|
||||||
|
import {
|
||||||
|
currentLoadingInfo,
|
||||||
|
discordPresence,
|
||||||
|
firstStartup,
|
||||||
|
launcherVersion,
|
||||||
|
platform,
|
||||||
|
presenceLoading,
|
||||||
|
setupValues,
|
||||||
|
} from '@/global';
|
||||||
import { onMount } from 'svelte';
|
import { onMount } from 'svelte';
|
||||||
import OsuCursor from '@/components/ui/osu-cursor/OsuCursor.svelte';
|
import OsuCursor from '@/components/ui/osu-cursor/OsuCursor.svelte';
|
||||||
import {
|
import {
|
||||||
@@ -16,13 +26,17 @@
|
|||||||
import { Buffer } from 'buffer';
|
import { Buffer } from 'buffer';
|
||||||
import { Toaster } from '@/components/ui/sonner';
|
import { Toaster } from '@/components/ui/sonner';
|
||||||
import { userAuth } from '@/userAuthentication';
|
import { userAuth } from '@/userAuthentication';
|
||||||
import { getLauncherVersion } from '@/osuUtil';
|
import { encryptString, exit, getLauncherVersion, getPlatform } from '@/osuUtil';
|
||||||
|
import Button from '@/components/ui/button/button.svelte';
|
||||||
|
import * as presence from '@/presence';
|
||||||
|
|
||||||
import '@fontsource/sora';
|
import '@fontsource/sora';
|
||||||
import '@fontsource/space-mono';
|
import '@fontsource/space-mono';
|
||||||
|
|
||||||
let { children } = $props();
|
let { children } = $props();
|
||||||
|
|
||||||
|
let unsupported_platform = $state<boolean>(false);
|
||||||
|
|
||||||
function disableReload() {
|
function disableReload() {
|
||||||
if (window.location.hostname !== 'tauri.localhost') {
|
if (window.location.hostname !== 'tauri.localhost') {
|
||||||
return;
|
return;
|
||||||
@@ -77,6 +91,8 @@
|
|||||||
disableReload();
|
disableReload();
|
||||||
setupValues();
|
setupValues();
|
||||||
launcherVersion.set(await getLauncherVersion());
|
launcherVersion.set(await getLauncherVersion());
|
||||||
|
platform.set(await getPlatform());
|
||||||
|
if ($platform !== 'windows' && $platform !== 'linux') unsupported_platform = true;
|
||||||
const isFirstStartup = await $userSettings.init();
|
const isFirstStartup = await $userSettings.init();
|
||||||
$userAuth.init();
|
$userAuth.init();
|
||||||
|
|
||||||
@@ -86,17 +102,40 @@
|
|||||||
const config_cursor_smoothening = $userSettings.value('cursor_smoothening');
|
const config_cursor_smoothening = $userSettings.value('cursor_smoothening');
|
||||||
const config_reduce_animations = $userSettings.value('reduce_animations');
|
const config_reduce_animations = $userSettings.value('reduce_animations');
|
||||||
const config_osu_installation_path = $userSettings.value('osu_installation_path');
|
const config_osu_installation_path = $userSettings.value('osu_installation_path');
|
||||||
|
const config_discord_presence = $userSettings.value('discord_presence');
|
||||||
|
|
||||||
patch.set(config_patching.get(true));
|
patch.set(config_patching.get(true));
|
||||||
customCursor.set(config_custom_cursor.get(true));
|
customCursor.set(config_custom_cursor.get(true));
|
||||||
cursorSmoothening.set(config_cursor_smoothening.get(true));
|
cursorSmoothening.set(config_cursor_smoothening.get(true));
|
||||||
reduceAnimations.set(config_reduce_animations.get(false));
|
reduceAnimations.set(config_reduce_animations.get(false));
|
||||||
osuInstallationPath.set(config_osu_installation_path.get(''));
|
osuInstallationPath.set(config_osu_installation_path.get(''));
|
||||||
|
discordPresence.set(config_discord_presence.get(true));
|
||||||
|
|
||||||
patch.subscribe((val) => config_patching.set(val));
|
patch.subscribe((val) => config_patching.set(val));
|
||||||
customCursor.subscribe((val) => config_custom_cursor.set(val));
|
customCursor.subscribe((val) => config_custom_cursor.set(val));
|
||||||
cursorSmoothening.subscribe((val) => config_cursor_smoothening.set(val));
|
cursorSmoothening.subscribe((val) => config_cursor_smoothening.set(val));
|
||||||
reduceAnimations.subscribe((val) => config_reduce_animations.set(val));
|
reduceAnimations.subscribe((val) => config_reduce_animations.set(val));
|
||||||
|
discordPresence.subscribe(async (val) => {
|
||||||
|
config_discord_presence.set(val);
|
||||||
|
try {
|
||||||
|
presenceLoading.set(true);
|
||||||
|
if (val) {
|
||||||
|
await presence.connect();
|
||||||
|
} else {
|
||||||
|
await presence.disconnect();
|
||||||
|
}
|
||||||
|
presenceLoading.set(false);
|
||||||
|
} catch {}
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
if ($discordPresence) {
|
||||||
|
currentLoadingInfo.set('Connecting to Discord RPC...');
|
||||||
|
presenceLoading.set(true);
|
||||||
|
await presence.connect();
|
||||||
|
presenceLoading.set(false);
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
|
|
||||||
firstStartup.set(isFirstStartup);
|
firstStartup.set(isFirstStartup);
|
||||||
});
|
});
|
||||||
@@ -110,6 +149,29 @@
|
|||||||
|
|
||||||
<Titlebar />
|
<Titlebar />
|
||||||
|
|
||||||
|
<AlertDialog.Root open={unsupported_platform}>
|
||||||
|
<AlertDialog.Content class="bg-theme-950 border-theme-800 p-0">
|
||||||
|
<div
|
||||||
|
class="flex flex-col items-center justify-center border-b border-theme-800 bg-black/40 rounded-t-lg p-3"
|
||||||
|
>
|
||||||
|
<img class="h-20 w-20" src={Logo} alt="logo" />
|
||||||
|
<span class="font-semibold text-xl">Unsupported Platform!</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"
|
||||||
|
>
|
||||||
|
This Platform is not supported by EZPPLauncher.
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center justify-center mb-3">
|
||||||
|
<Button
|
||||||
|
onclick={async () => {
|
||||||
|
await exit();
|
||||||
|
}}>Close</Button
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
</AlertDialog.Content>
|
||||||
|
</AlertDialog.Root>
|
||||||
|
|
||||||
<main>
|
<main>
|
||||||
{@render children()}
|
{@render children()}
|
||||||
</main>
|
</main>
|
||||||
|
@@ -8,11 +8,16 @@
|
|||||||
beatmapSets,
|
beatmapSets,
|
||||||
currentSkin,
|
currentSkin,
|
||||||
currentView,
|
currentView,
|
||||||
|
discordPresence,
|
||||||
|
launcherStream,
|
||||||
|
launcherStreams,
|
||||||
launcherVersion,
|
launcherVersion,
|
||||||
launching,
|
launching,
|
||||||
newVersion,
|
newVersion,
|
||||||
osuBuild,
|
osuBuild,
|
||||||
osuStream,
|
osuStream,
|
||||||
|
platform,
|
||||||
|
presenceLoading,
|
||||||
serverConnectionFails,
|
serverConnectionFails,
|
||||||
serverPing,
|
serverPing,
|
||||||
skins,
|
skins,
|
||||||
@@ -46,6 +51,7 @@
|
|||||||
numberHumanReadable,
|
numberHumanReadable,
|
||||||
openURL,
|
openURL,
|
||||||
releaseStreamToReadable,
|
releaseStreamToReadable,
|
||||||
|
urlIsValidImage,
|
||||||
} from '@/utils';
|
} from '@/utils';
|
||||||
import { fade, scale } from 'svelte/transition';
|
import { fade, scale } from 'svelte/transition';
|
||||||
import { Checkbox } from '@/components/ui/checkbox';
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
@@ -77,6 +83,8 @@
|
|||||||
import { osuapi } from '@/api/osuapi';
|
import { osuapi } from '@/api/osuapi';
|
||||||
import {
|
import {
|
||||||
downloadEZPPLauncherUpdateFiles,
|
downloadEZPPLauncherUpdateFiles,
|
||||||
|
downloadUpdate,
|
||||||
|
encryptString,
|
||||||
exit,
|
exit,
|
||||||
getBeatmapSetsCount,
|
getBeatmapSetsCount,
|
||||||
getEZPPLauncherUpdateFiles,
|
getEZPPLauncherUpdateFiles,
|
||||||
@@ -84,6 +92,11 @@
|
|||||||
getSkin,
|
getSkin,
|
||||||
getSkinsCount,
|
getSkinsCount,
|
||||||
getVersion,
|
getVersion,
|
||||||
|
hasNet8,
|
||||||
|
hasOsuWinello,
|
||||||
|
hasWMCTRL,
|
||||||
|
installUpdate,
|
||||||
|
isOsuCorrupted,
|
||||||
isOsuRunning,
|
isOsuRunning,
|
||||||
isValidOsuFolder,
|
isValidOsuFolder,
|
||||||
replaceUIFiles,
|
replaceUIFiles,
|
||||||
@@ -95,10 +108,15 @@
|
|||||||
import { getCurrentWindow } from '@tauri-apps/api/window';
|
import { getCurrentWindow } from '@tauri-apps/api/window';
|
||||||
import { ezppfarm } from '@/api/ezpp';
|
import { ezppfarm } from '@/api/ezpp';
|
||||||
import Hearts from '@/components/ui/effects/Hearts.svelte';
|
import Hearts from '@/components/ui/effects/Hearts.svelte';
|
||||||
|
import { EZPPActionStatus } from '@/types';
|
||||||
|
import * as presence from '@/presence';
|
||||||
|
|
||||||
let selectedTab = $state('home');
|
let selectedTab = $state('home');
|
||||||
let progress = $state(-1);
|
let progress = $state(-1);
|
||||||
let launchInfo = $state('');
|
let launchInfo = $state('');
|
||||||
|
let launchError = $state<Error | undefined>(undefined);
|
||||||
|
|
||||||
|
let downloadingUpdate = $state(false);
|
||||||
|
|
||||||
let selectedGamemode = $derived(
|
let selectedGamemode = $derived(
|
||||||
getGamemodeInt(modeIntToStr($preferredMode), typeIntToStr($preferredType))
|
getGamemodeInt(modeIntToStr($preferredMode), typeIntToStr($preferredType))
|
||||||
@@ -135,14 +153,11 @@
|
|||||||
toast.success('osu! installation path set successfully.');
|
toast.success('osu! installation path set successfully.');
|
||||||
|
|
||||||
const beatmapSetCount: number | null = await getBeatmapSetsCount(selectedPath);
|
const beatmapSetCount: number | null = await getBeatmapSetsCount(selectedPath);
|
||||||
if (beatmapSetCount) {
|
if (beatmapSetCount) beatmapSets.set(beatmapSetCount);
|
||||||
beatmapSets.set(beatmapSetCount);
|
|
||||||
}
|
|
||||||
|
|
||||||
const skinsCount: number | null = await getSkinsCount(selectedPath);
|
const skinsCount: number | null = await getSkinsCount(selectedPath);
|
||||||
if (skinsCount) {
|
if (skinsCount !== null) skins.set(skinsCount);
|
||||||
skins.set(skinsCount);
|
|
||||||
}
|
|
||||||
const skin: string = await getSkin(selectedPath);
|
const skin: string = await getSkin(selectedPath);
|
||||||
currentSkin.set(skin);
|
currentSkin.set(skin);
|
||||||
}
|
}
|
||||||
@@ -177,9 +192,27 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($platform === 'linux') {
|
||||||
|
if (!(await hasWMCTRL())) {
|
||||||
|
toast.error('Hmmm...', {
|
||||||
|
description: 'wmctrl seems to be missing, please install via AUR.',
|
||||||
|
});
|
||||||
|
launching.set(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!(await hasOsuWinello())) {
|
||||||
|
toast.error('Hmmm...', {
|
||||||
|
description: 'osu-winello seems to be missing, please install it.',
|
||||||
|
});
|
||||||
|
launching.set(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
launchInfo = 'Looking for EZPPLauncher File updates...';
|
launchInfo = 'Looking for EZPPLauncher File updates...';
|
||||||
const updateResult = await getEZPPLauncherUpdateFiles(osuPath);
|
const updateResult = await getEZPPLauncherUpdateFiles(osuPath, $launcherStream);
|
||||||
|
|
||||||
if (updateResult) {
|
if (updateResult) {
|
||||||
if (updateResult.filesToDownload.length > 0) {
|
if (updateResult.filesToDownload.length > 0) {
|
||||||
launchInfo = 'Found EZPPLauncher File updates!';
|
launchInfo = 'Found EZPPLauncher File updates!';
|
||||||
@@ -203,20 +236,43 @@
|
|||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.log(err);
|
console.log(err);
|
||||||
|
launchError = err as Error;
|
||||||
|
launching.set(false);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const streamInfo = await osuapi.latestBuildVersion('stable40');
|
const streamInfo = await osuapi.latestBuildVersion('stable40');
|
||||||
if (!streamInfo) {
|
if (!streamInfo) {
|
||||||
toast.error('Hmmm...', {
|
toast.error('Hmmm...', {
|
||||||
description: 'Failed to check for updates.',
|
description: 'Failed to check for updates, maybe osu! is down?',
|
||||||
});
|
});
|
||||||
launching.set(false);
|
launching.set(false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const releaseStream = await getReleaseStream(osuPath);
|
const releaseStream = await getReleaseStream(osuPath);
|
||||||
let forceUpdate = releaseStream && releaseStream.toLowerCase() !== 'stable40';
|
|
||||||
|
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;
|
||||||
|
|
||||||
const versions = compareBuildNumbers($osuBuild, streamInfo);
|
const versions = compareBuildNumbers($osuBuild, streamInfo);
|
||||||
if (versions > 0 || forceUpdate) {
|
if (versions > 0 || forceUpdate) {
|
||||||
@@ -260,7 +316,10 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: 'Password',
|
key: 'Password',
|
||||||
value: password,
|
value:
|
||||||
|
$platform === 'windows'
|
||||||
|
? await encryptString(password, 'cu24180ncjeiu0ci1nwui')
|
||||||
|
: password,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: 'SaveUsername',
|
key: 'SaveUsername',
|
||||||
@@ -305,9 +364,130 @@
|
|||||||
await replaceUIFiles(osuPath, false);
|
await replaceUIFiles(osuPath, false);
|
||||||
await new Promise((res) => setTimeout(res, 1000));
|
await new Promise((res) => setTimeout(res, 1000));
|
||||||
await getCurrentWindow().hide();
|
await getCurrentWindow().hide();
|
||||||
|
|
||||||
|
let presenceUpdater: number | undefined = undefined;
|
||||||
|
|
||||||
|
const isPresenceConnected = await presence.isConnected();
|
||||||
|
|
||||||
|
if ($discordPresence && isPresenceConnected) {
|
||||||
|
let osuDetected = false;
|
||||||
|
presenceUpdater = window.setInterval(async () => {
|
||||||
|
if (!osuDetected) {
|
||||||
|
const osuRunning = await isOsuRunning();
|
||||||
|
if (osuRunning) osuDetected = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if ($currentUser) {
|
||||||
|
const userStats = await ezppfarm.getUserInfo($currentUser.id, 'stats');
|
||||||
|
const userStatus = await ezppfarm.getUserStatus($currentUser.id);
|
||||||
|
if (userStatus?.player_status.online) {
|
||||||
|
let largeImageKey = 'ezppfarm';
|
||||||
|
let details = 'Idle...';
|
||||||
|
let state =
|
||||||
|
userStatus.player_status.status.info_text.length > 0
|
||||||
|
? userStatus.player_status.status.info_text
|
||||||
|
: ' ';
|
||||||
|
|
||||||
|
const gamemode = getModeAndTypeFromGamemode(userStatus.player_status.status.mode);
|
||||||
|
const gamemodeName = getGamemodeName(
|
||||||
|
modeIntToStr(gamemode.mode),
|
||||||
|
typeIntToStr(gamemode.type)
|
||||||
|
);
|
||||||
|
|
||||||
|
switch (userStatus.player_status.status.action) {
|
||||||
|
case EZPPActionStatus.AFK:
|
||||||
|
details = 'AFK...';
|
||||||
|
state = ' ';
|
||||||
|
break;
|
||||||
|
case EZPPActionStatus.PLAYING:
|
||||||
|
details = 'Playing...';
|
||||||
|
break;
|
||||||
|
case EZPPActionStatus.EDITING:
|
||||||
|
details = 'Editing...';
|
||||||
|
break;
|
||||||
|
case EZPPActionStatus.MODDING:
|
||||||
|
details = 'Modding...';
|
||||||
|
break;
|
||||||
|
case EZPPActionStatus.MULTIPLAYER_SELECT:
|
||||||
|
details = 'Multiplayer: Selecting a Beatmap...';
|
||||||
|
state = ' ';
|
||||||
|
break;
|
||||||
|
case EZPPActionStatus.WATCHING:
|
||||||
|
details = 'Watching...';
|
||||||
|
break;
|
||||||
|
case EZPPActionStatus.TESTING:
|
||||||
|
details = 'Testing...';
|
||||||
|
break;
|
||||||
|
case EZPPActionStatus.SUBMITTING:
|
||||||
|
details = 'Submitting...';
|
||||||
|
break;
|
||||||
|
case EZPPActionStatus.MULTIPLAYER_IDLE:
|
||||||
|
details = 'Multiplayer: Idle...';
|
||||||
|
state = ' ';
|
||||||
|
break;
|
||||||
|
case EZPPActionStatus.MULTIPLAYER_PLAYING:
|
||||||
|
details = 'Multiplayer: Playing...';
|
||||||
|
break;
|
||||||
|
case EZPPActionStatus.DIRECT:
|
||||||
|
details = 'Browsing osu!direct...';
|
||||||
|
state = ' ';
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (userStatus.player_status.status.beatmap !== null) {
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
details = `[${gamemodeName}] ${details}`;
|
||||||
|
try {
|
||||||
|
const currentModeStats =
|
||||||
|
userStats?.player.stats[userStatus.player_status.status.mode];
|
||||||
|
let username = $currentUser.name;
|
||||||
|
|
||||||
|
if (currentModeStats && currentModeStats.rank > 0)
|
||||||
|
username += ` (#${currentModeStats.rank})`;
|
||||||
|
|
||||||
|
await Promise.all([
|
||||||
|
presence.updateUser({
|
||||||
|
username,
|
||||||
|
id: $currentUser.id.toFixed(),
|
||||||
|
}),
|
||||||
|
presence.updateStatus({
|
||||||
|
details,
|
||||||
|
state,
|
||||||
|
largeImageKey,
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, 1000 * 2);
|
||||||
|
}
|
||||||
|
|
||||||
await runOsu(osuPath, true);
|
await runOsu(osuPath, true);
|
||||||
|
|
||||||
launchInfo = 'Cleaning up...';
|
launchInfo = 'Cleaning up...';
|
||||||
await getCurrentWindow().show();
|
await getCurrentWindow().show();
|
||||||
|
if (presenceUpdater) {
|
||||||
|
window.clearInterval(presenceUpdater);
|
||||||
|
console.log('clearing discord presence...');
|
||||||
|
try {
|
||||||
|
await Promise.all([
|
||||||
|
presence.updateUser({
|
||||||
|
username: ' ',
|
||||||
|
id: null,
|
||||||
|
}),
|
||||||
|
presence.updateStatus({
|
||||||
|
details: ' ',
|
||||||
|
state: 'Idle in Launcher...',
|
||||||
|
largeImageKey: 'ezppfarm',
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
} catch {}
|
||||||
|
console.log('discord presence cleared...');
|
||||||
|
}
|
||||||
await new Promise((res) => setTimeout(res, 1000));
|
await new Promise((res) => setTimeout(res, 1000));
|
||||||
await replaceUIFiles(osuPath, true);
|
await replaceUIFiles(osuPath, true);
|
||||||
|
|
||||||
@@ -320,29 +500,65 @@
|
|||||||
if (beatmapSetCount) beatmapSets.set(beatmapSetCount);
|
if (beatmapSetCount) beatmapSets.set(beatmapSetCount);
|
||||||
|
|
||||||
const skinCount = await getSkinsCount(osuPath);
|
const skinCount = await getSkinsCount(osuPath);
|
||||||
if (skinCount) skins.set(skinCount);
|
if (skinCount !== null) skins.set(skinCount);
|
||||||
|
|
||||||
const skin = await getSkin(osuPath);
|
const skin = await getSkin(osuPath);
|
||||||
currentSkin.set(skin);
|
currentSkin.set(skin);
|
||||||
|
|
||||||
launching.set(false);
|
|
||||||
} catch (err) {
|
|
||||||
console.log(err);
|
|
||||||
toast.error('Hmmm...', {
|
|
||||||
description: 'Failed to launch.',
|
|
||||||
});
|
|
||||||
launching.set(false);
|
|
||||||
|
|
||||||
if ($currentUser) {
|
if ($currentUser) {
|
||||||
const userInfo = await ezppfarm.getUserInfo($currentUser.id);
|
const userInfo = await ezppfarm.getUserInfo($currentUser.id);
|
||||||
if (userInfo) currentUserInfo.set(userInfo.player);
|
if (userInfo) currentUserInfo.set(userInfo.player);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
launching.set(false);
|
||||||
|
} catch (err) {
|
||||||
|
launchError = err as Error;
|
||||||
|
console.log(err);
|
||||||
|
toast.error('Hmmm...', {
|
||||||
|
description: 'Failed to launch.',
|
||||||
|
});
|
||||||
|
launching.set(false);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
<AlertDialog.Root open={launchError !== undefined}>
|
||||||
|
<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"
|
||||||
|
>
|
||||||
|
<img class="h-20 w-20" src={Logo} alt="logo" />
|
||||||
|
<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 overflow-hidden"
|
||||||
|
>
|
||||||
|
{#if launchError}
|
||||||
|
<pre class="text-wrap text-start overflow-auto w-full">{JSON.stringify(
|
||||||
|
launchError,
|
||||||
|
Object.getOwnPropertyNames(launchError),
|
||||||
|
2
|
||||||
|
)}</pre>
|
||||||
|
{:else}
|
||||||
|
Unexpected error
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center justify-center mb-3">
|
||||||
|
<Button
|
||||||
|
onclick={async () => {
|
||||||
|
launchError = undefined;
|
||||||
|
}}>Close</Button
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
</AlertDialog.Content>
|
||||||
|
</AlertDialog.Root>
|
||||||
|
|
||||||
<AlertDialog.Root open={$newVersion !== undefined}>
|
<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
|
<div
|
||||||
class="flex flex-col items-center justify-center border-b border-theme-800 bg-black/40 rounded-t-lg p-3"
|
class="flex flex-col items-center justify-center border-b border-theme-800 bg-black/40 rounded-t-lg p-3"
|
||||||
>
|
>
|
||||||
@@ -365,20 +581,55 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-center justify-center mb-3">
|
<div class="flex items-center justify-center mb-3">
|
||||||
<Button
|
{#if $platform === 'windows'}
|
||||||
onclick={async () => {
|
{#if downloadingUpdate}
|
||||||
if ($newVersion) {
|
<div class="flex flex-col items-center justify-center gap-2 p-3 rounded-lg w-full">
|
||||||
await openURL($newVersion.html_url);
|
<Progress indeterminate={progress === -1} value={progress} />
|
||||||
await exit();
|
<span class="text-muted-foreground text-sm mt-4">{launchInfo}</span>
|
||||||
}
|
</div>
|
||||||
}}>Update now</Button
|
{:else}
|
||||||
>
|
<Button
|
||||||
|
onclick={async () => {
|
||||||
|
const updateFile = $newVersion?.assets.find((asset) => asset.name.endsWith('.exe'));
|
||||||
|
if (!updateFile) {
|
||||||
|
toast.error('Hmmm...', {
|
||||||
|
description: 'No update file found.',
|
||||||
|
});
|
||||||
|
$newVersion = undefined;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
downloadingUpdate = true;
|
||||||
|
launchInfo = 'Downloading Update...';
|
||||||
|
await downloadUpdate(updateFile.browser_download_url, (file) => {
|
||||||
|
progress = file.progress;
|
||||||
|
launchInfo = `Downloading Update (${formatBytes(file.downloaded)}/${formatBytes(file.size)})...`;
|
||||||
|
});
|
||||||
|
progress = -1;
|
||||||
|
launchInfo = 'Update downloaded, installing...';
|
||||||
|
await installUpdate();
|
||||||
|
}}>Install Update now</Button
|
||||||
|
>
|
||||||
|
{/if}
|
||||||
|
{:else}
|
||||||
|
<Button
|
||||||
|
onclick={async () => {
|
||||||
|
if ($newVersion) {
|
||||||
|
await openURL($newVersion.html_url);
|
||||||
|
await exit();
|
||||||
|
}
|
||||||
|
}}>Update now</Button
|
||||||
|
>
|
||||||
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
</AlertDialog.Content>
|
</AlertDialog.Content>
|
||||||
</AlertDialog.Root>
|
</AlertDialog.Root>
|
||||||
|
|
||||||
<AlertDialog.Root bind:open={$launching}>
|
<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
|
<div
|
||||||
class="flex flex-col items-center justify-center border-b border-theme-800 bg-black/40 rounded-t-lg p-3"
|
class="flex flex-col items-center justify-center border-b border-theme-800 bg-black/40 rounded-t-lg p-3"
|
||||||
>
|
>
|
||||||
@@ -636,7 +887,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="flex flex-col gap-6 w-full h-full bg-theme-900/40 p-6">
|
<div class="flex flex-col gap-6 w-full h-full bg-theme-900/40 p-6">
|
||||||
<div
|
<div
|
||||||
class="flex flex-row flex-nowrap h-11 w-full bg-theme-800/50 border border-theme-800/90 rounded-lg p-[4px]"
|
class="flex flex-row flex-nowrap h-11 gap-1 w-full bg-theme-800/50 border border-theme-800/90 rounded-lg p-[4px]"
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
class="w-full flex justify-center items-center font-semibold text-sm rounded-lg {selectedTab ===
|
class="w-full flex justify-center items-center font-semibold text-sm rounded-lg {selectedTab ===
|
||||||
@@ -699,13 +950,17 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="relative font-bold text-xl text-yellow-400">
|
<div class="relative font-bold text-xl text-yellow-400">
|
||||||
<div
|
<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-100'
|
||||||
: 'opacity-0'} transition-opacity duration-1000"
|
: 'opacity-0'} transition-opacity duration-1000"
|
||||||
>
|
>
|
||||||
<LoaderCircle class="animate-spin" />
|
<LoaderCircle class="animate-spin" />
|
||||||
</div>
|
</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}
|
{#if $reduceAnimations}
|
||||||
<span>{numberHumanReadable($skins ?? 0)}</span>
|
<span>{numberHumanReadable($skins ?? 0)}</span>
|
||||||
{:else}
|
{:else}
|
||||||
@@ -862,11 +1117,18 @@
|
|||||||
>
|
>
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<Label class="text-sm" for="setting-custom-cursor">Patching</Label>
|
<Label class="text-sm" for="setting-custom-cursor">Patching</Label>
|
||||||
<div class="text-muted-foreground text-xs">Shows misses in Relax and Autopilot</div>
|
<div class="text-muted-foreground text-xs">
|
||||||
|
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"
|
||||||
|
>currently only on windows!</span
|
||||||
|
>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<Checkbox
|
<Checkbox
|
||||||
id="setting-custom-cursor"
|
id="setting-custom-cursor"
|
||||||
checked={$patch}
|
checked={$platform === 'windows' ? $patch : false}
|
||||||
|
disabled={$platform !== 'windows'}
|
||||||
onCheckedChange={async (e) => {
|
onCheckedChange={async (e) => {
|
||||||
patch.set(e);
|
patch.set(e);
|
||||||
$userSettings.save();
|
$userSettings.save();
|
||||||
@@ -913,13 +1175,13 @@
|
|||||||
></Checkbox>
|
></Checkbox>
|
||||||
|
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<Label class="text-sm" for="setting-cursor-smoothening">Reduce Animations</Label>
|
<Label class="text-sm" for="setting-reduce-animations">Reduce Animations</Label>
|
||||||
<div class="text-muted-foreground text-xs">
|
<div class="text-muted-foreground text-xs">
|
||||||
Disables some animations in the Launcher to improve performance on low-end devices.
|
Disables some animations in the Launcher to improve performance on low-end devices.
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<Checkbox
|
<Checkbox
|
||||||
id="setting-cursor-smoothening"
|
id="setting-reduce-animations"
|
||||||
checked={$reduceAnimations}
|
checked={$reduceAnimations}
|
||||||
onCheckedChange={async (e) => {
|
onCheckedChange={async (e) => {
|
||||||
reduceAnimations.set(e);
|
reduceAnimations.set(e);
|
||||||
@@ -927,9 +1189,29 @@
|
|||||||
}}
|
}}
|
||||||
class="flex items-center justify-center w-5 h-5"
|
class="flex items-center justify-center w-5 h-5"
|
||||||
></Checkbox>
|
></Checkbox>
|
||||||
|
|
||||||
|
<div class="flex flex-col">
|
||||||
|
<Label class="text-sm" for="setting-rich-presence">Discord Rich Presence</Label>
|
||||||
|
<div class="text-muted-foreground text-xs">
|
||||||
|
Let other discord users show what you are doing right now 👀
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="relative">
|
||||||
|
{#if $presenceLoading}
|
||||||
|
<div class="-left-8 absolute" transition:fade>
|
||||||
|
<LoaderCircle class="animate-spin" />
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
<Checkbox
|
||||||
|
id="setting-rich-presence"
|
||||||
|
bind:checked={$discordPresence}
|
||||||
|
disabled={$presenceLoading}
|
||||||
|
class="flex items-center justify-center w-5 h-5"
|
||||||
|
></Checkbox>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="grid grid-cols-[0.7fr_auto] gap-y-5 items-center border-theme-800 pl-6 pr-5 pb-4"
|
class="grid grid-cols-[0.7fr_auto] gap-y-1 items-center border-theme-800 pl-6 pr-5 pb-4"
|
||||||
>
|
>
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<Label class="text-sm" for="setting-custom-cursor">osu! installation path</Label>
|
<Label class="text-sm" for="setting-custom-cursor">osu! installation path</Label>
|
||||||
@@ -949,6 +1231,54 @@
|
|||||||
onclick={browse_osu_installation}>Browse</Button
|
onclick={browse_osu_installation}>Browse</Button
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="flex flex-col">
|
||||||
|
<Label class="text-sm" for="setting-custom-cursor">patcher release stream</Label>
|
||||||
|
<div class="text-muted-foreground text-xs">
|
||||||
|
test different versions of the patcher
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="flex flex-row w-full">
|
||||||
|
<Select.Root
|
||||||
|
type="single"
|
||||||
|
bind:value={$launcherStream}
|
||||||
|
onValueChange={async (newStream) => {
|
||||||
|
if (newStream === 'experimental' && !(await hasNet8())) {
|
||||||
|
launcherStream.set('stable');
|
||||||
|
toast.error('.NET 8.0 Desktop Runtime not found!', {
|
||||||
|
action: {
|
||||||
|
label: 'Download .NET 8.0',
|
||||||
|
onClick: async () =>
|
||||||
|
await openURL(
|
||||||
|
'https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-desktop-8.0.18-windows-x64-installer'
|
||||||
|
),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
$userSettings.value('patcherStream').set(newStream);
|
||||||
|
launcherStream.set(newStream);
|
||||||
|
await $userSettings.save();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Select.Trigger
|
||||||
|
class="border-theme-800 bg-theme-950 !text-muted-foreground font-semibold"
|
||||||
|
>
|
||||||
|
<div class="flex flex-row items-center gap-2 font-normal text-foreground">
|
||||||
|
{$launcherStream}
|
||||||
|
</div>
|
||||||
|
</Select.Trigger>
|
||||||
|
<Select.Content class="bg-theme-950 border border-theme-950 rounded-lg">
|
||||||
|
{#each $launcherStreams as stream (stream)}
|
||||||
|
<Select.Item value={stream}>
|
||||||
|
<div class="flex flex-row gap-2 items-center">
|
||||||
|
{stream}
|
||||||
|
</div>
|
||||||
|
</Select.Item>
|
||||||
|
{/each}
|
||||||
|
</Select.Content>
|
||||||
|
</Select.Root>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
@@ -7,6 +7,8 @@
|
|||||||
currentSkin,
|
currentSkin,
|
||||||
currentView,
|
currentView,
|
||||||
firstStartup,
|
firstStartup,
|
||||||
|
launcherStream,
|
||||||
|
launcherStreams,
|
||||||
launcherVersion,
|
launcherVersion,
|
||||||
newVersion,
|
newVersion,
|
||||||
osuBuild,
|
osuBuild,
|
||||||
@@ -30,6 +32,7 @@
|
|||||||
import { currentUserInfo } from '@/data';
|
import { currentUserInfo } from '@/data';
|
||||||
import {
|
import {
|
||||||
getBeatmapSetsCount,
|
getBeatmapSetsCount,
|
||||||
|
getEZPPLauncherStreams,
|
||||||
getReleaseStream,
|
getReleaseStream,
|
||||||
getSkin,
|
getSkin,
|
||||||
getSkinsCount,
|
getSkinsCount,
|
||||||
@@ -132,11 +135,11 @@
|
|||||||
|
|
||||||
currentLoadingInfo.set('Counting beatmapsets...');
|
currentLoadingInfo.set('Counting beatmapsets...');
|
||||||
const beatmapSetCount = await getBeatmapSetsCount($osuInstallationPath);
|
const beatmapSetCount = await getBeatmapSetsCount($osuInstallationPath);
|
||||||
if (beatmapSetCount) beatmapSets.set(beatmapSetCount);
|
if (beatmapSetCount !== null) beatmapSets.set(beatmapSetCount);
|
||||||
|
|
||||||
currentLoadingInfo.set('Counting skins...');
|
currentLoadingInfo.set('Counting skins...');
|
||||||
const skinCount = await getSkinsCount($osuInstallationPath);
|
const skinCount = await getSkinsCount($osuInstallationPath);
|
||||||
if (skinCount) skins.set(skinCount);
|
if (skinCount !== null) skins.set(skinCount);
|
||||||
const skin: string = await getSkin($osuInstallationPath);
|
const skin: string = await getSkin($osuInstallationPath);
|
||||||
currentSkin.set(skin);
|
currentSkin.set(skin);
|
||||||
}
|
}
|
||||||
@@ -148,6 +151,14 @@
|
|||||||
newVersion.set(launcherUpdate);
|
newVersion.set(launcherUpdate);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const ezpplauncherStreams = await getEZPPLauncherStreams();
|
||||||
|
if (ezpplauncherStreams) launcherStreams.set(ezpplauncherStreams);
|
||||||
|
|
||||||
|
const selectedLauncherStream = $userSettings.value('patcherStream').get('stable');
|
||||||
|
if ($launcherStreams.includes(selectedLauncherStream)) {
|
||||||
|
launcherStream.set(selectedLauncherStream);
|
||||||
|
}
|
||||||
|
|
||||||
animate(ezppLogo, {
|
animate(ezppLogo, {
|
||||||
opacity: [1, 0],
|
opacity: [1, 0],
|
||||||
scale: [1, 1.05],
|
scale: [1, 1.05],
|
24
tests/imageCheck.test.ts
Normal file
24
tests/imageCheck.test.ts
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
import { expect, test } from 'bun:test';
|
||||||
|
|
||||||
|
const urlIsValidImage = async (url: string) => {
|
||||||
|
try {
|
||||||
|
const request = await fetch(url);
|
||||||
|
if (!request.ok) return false;
|
||||||
|
const contentType = request.headers.get('content-type');
|
||||||
|
return contentType?.startsWith('image/');
|
||||||
|
} catch {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
test('image check', async () => {
|
||||||
|
const imageUrl = 'https://assets.ppy.sh/beatmaps/1/covers/list@2x.jpg';
|
||||||
|
const imageCheckResult = await urlIsValidImage(imageUrl);
|
||||||
|
expect(imageCheckResult).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('image check fail', async () => {
|
||||||
|
const imageUrl = 'https://assets.ppy.sh/beatmaps/0/covers/list@2x.jpg';
|
||||||
|
const imageCheckResult = await urlIsValidImage(imageUrl);
|
||||||
|
expect(imageCheckResult).toBe(false);
|
||||||
|
});
|
Reference in New Issue
Block a user