From f051253abbe4bfc32684f71b08c8fa5dd2c022f1 Mon Sep 17 00:00:00 2001 From: HorizonCode Date: Tue, 8 Jul 2025 12:01:28 +0200 Subject: [PATCH] wip: discord presence --- src-tauri/Cargo.lock | 32 ++++- src-tauri/Cargo.toml | 2 + src-tauri/src/commands.rs | 45 +++++++ src-tauri/src/lib.rs | 28 ++++- src-tauri/src/presence.rs | 245 ++++++++++++++++++++++++++++++++++++++ src/lib/global.ts | 3 + src/lib/presence.ts | 17 +++ src/pages/Launch.svelte | 26 +++- src/routes/+layout.svelte | 32 ++++- 9 files changed, 417 insertions(+), 13 deletions(-) create mode 100644 src-tauri/src/presence.rs create mode 100644 src/lib/presence.ts diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 9084dc6..1f7e89c 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -489,7 +489,7 @@ checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" dependencies = [ "byteorder", "fnv", - "uuid", + "uuid 1.17.0", ] [[package]] @@ -843,6 +843,19 @@ dependencies = [ "windows-sys 0.60.2", ] +[[package]] +name = "discord-rich-presence" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75db747ecd252c01bfecaf709b07fcb4c634adf0edb5fed47bc9c3052e7076b" +dependencies = [ + "serde", + "serde_derive", + "serde_json", + "serde_repr", + "uuid 0.8.2", +] + [[package]] name = "dispatch" version = "0.2.0" @@ -1083,8 +1096,10 @@ dependencies = [ name = "ezpplauncher" version = "3.0.0-beta.2" dependencies = [ + "discord-rich-presence", "hardware-id", "md5", + "once_cell", "open", "reqwest", "serde", @@ -3802,7 +3817,7 @@ dependencies = [ "serde", "serde_json", "url", - "uuid", + "uuid 1.17.0", ] [[package]] @@ -4737,7 +4752,7 @@ dependencies = [ "thiserror 2.0.12", "time", "url", - "uuid", + "uuid 1.17.0", "walkdir", ] @@ -4968,7 +4983,7 @@ dependencies = [ "toml", "url", "urlpattern", - "uuid", + "uuid 1.17.0", "walkdir", ] @@ -5475,6 +5490,15 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +dependencies = [ + "getrandom 0.2.16", +] + [[package]] name = "uuid" version = "1.17.0" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index e8800da..dcd8e9a 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -34,6 +34,8 @@ md5 = "0.8.0" tokio = { version = "1.46.1", features = ["full"] } open = "5.3.2" windows-sys = "0.60.2" +discord-rich-presence = "0.2.5" +once_cell = "1.21.3" [target.'cfg(windows)'.dependencies] winreg = "0.55.0" diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs index 1df47a7..3ae752c 100644 --- a/src-tauri/src/commands.rs +++ b/src-tauri/src/commands.rs @@ -11,6 +11,7 @@ use tokio::io::AsyncWriteExt; use tokio::process::Command; use tokio::time::{Duration, sleep}; +use crate::presence; use crate::utils::{ check_folder_completeness, get_osu_config, get_osu_user_config, get_window_title_by_pid, set_osu_config_vals, set_osu_user_config_vals, @@ -668,3 +669,47 @@ pub async fn check_for_corruption(folder: String) -> Result { 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, + details: Option, + large_image_key: Option, +} + +#[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, + id: Option, +} + +#[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 +} diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index d79a8ef..36cd8ec 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -2,13 +2,15 @@ use tauri::Manager; pub mod commands; +pub mod presence; pub mod utils; use crate::commands::{ check_for_corruption, download_ezpp_launcher_update_files, exit, find_osu_installation, get_beatmapsets_count, get_ezpp_launcher_update_files, get_hwid, get_launcher_version, get_osu_release_stream, get_osu_skin, get_osu_version, get_platform, get_skins_count, - is_osu_running, open_url_in_browser, replace_ui_files, run_osu, run_osu_updater, - set_osu_config_values, set_osu_user_config_values, valid_osu_folder, + is_osu_running, open_url_in_browser, 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)] @@ -25,7 +27,7 @@ pub fn run() { })); } - builder + let app = builder .invoke_handler(tauri::generate_handler![ get_hwid, find_osu_installation, @@ -47,13 +49,27 @@ pub fn run() { get_launcher_version, exit, get_platform, - check_for_corruption + check_for_corruption, + presence_connect, + presence_disconnect, + presence_update_status, + presence_update_user, + presence_is_connected ]) .plugin(tauri_plugin_fs::init()) .plugin(tauri_plugin_dialog::init()) .plugin(tauri_plugin_shell::init()) .plugin(tauri_plugin_cors_fetch::init()) .plugin(tauri_plugin_sql::Builder::default().build()) - .run(tauri::generate_context!()) - .expect("error while running tauri application"); + .build(tauri::generate_context!()) + .expect("error while building 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); + } + }); } diff --git a/src-tauri/src/presence.rs b/src-tauri/src/presence.rs new file mode 100644 index 0000000..5fe4804 --- /dev/null +++ b/src-tauri/src/presence.rs @@ -0,0 +1,245 @@ +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}; + +// --- Datenstrukturen und Befehle --- + +#[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, + pub small_image_text: Option, +} + +// Befehle, die an den Presence-Actor gesendet werden können +#[derive(Debug)] +enum PresenceCommand { + Connect(oneshot::Sender), + // Geändert: Nimmt einen Sender, um den Abschluss zu signalisieren + Disconnect(oneshot::Sender<()>), + UpdateData(PresenceData), + IsConnected(oneshot::Sender), +} + +// --- Der Actor --- + +struct PresenceActor { + receiver: mpsc::Receiver, + client: Option, + data: PresenceData, + start_timestamp: i64, +} + +impl PresenceActor { + fn new(receiver: mpsc::Receiver) -> 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 v1.0.0".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, + // Geändert: Leitet den Responder weiter + 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) { + 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); + } + } + } + + // Geändert: Nimmt einen Responder als Parameter + 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."); + } + // Signalisiere, dass der Vorgang abgeschlossen ist + 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 EZPZFarm", "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); + // Rufe die interne handle_disconnect auf, ohne auf eine Antwort zu warten + if let Some(mut client) = self.client.take() { + let _ = client.clear_activity(); + let _ = client.close(); + } + } + } + } +} + +// --- Öffentliche API --- + +static PRESENCE_TX: Lazy> = 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> = Lazy::new(|| { + StdMutex::new(PresenceData { + state: "Idle in Launcher...".to_string(), + details: " ".to_string(), + large_image_key: "ezppfarm".to_string(), + large_image_text: "EZPPFarm v1.0.0".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 +} + +// Geändert: Wartet jetzt auf den Abschluss des Disconnects +pub async fn disconnect() { + let (tx, rx) = oneshot::channel(); + if PRESENCE_TX.send(PresenceCommand::Disconnect(tx)).await.is_ok() { + // Warte, bis der Actor den Abschluss signalisiert + 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; + }); +} diff --git a/src/lib/global.ts b/src/lib/global.ts index bdff563..382b02e 100644 --- a/src/lib/global.ts +++ b/src/lib/global.ts @@ -9,6 +9,9 @@ export const currentView = writable(Loading); export const launcherVersion = writable(''); export const newVersion = writable(undefined); +export const discordPresence = writable(false); +export const presenceLoading = writable(false); + export const currentLoadingInfo = writable('Initializing...'); export const firstStartup = writable(false); diff --git a/src/lib/presence.ts b/src/lib/presence.ts new file mode 100644 index 0000000..fb5c969 --- /dev/null +++ b/src/lib/presence.ts @@ -0,0 +1,17 @@ +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; + large_image_key?: string; +}) => + await invoke('presence_update_status', { + state: status.state, + details: status.details, + largeImageKey: status.large_image_key, + }); +export const updateUser = async (user: { username: string; id: string }) => + await invoke('presence_update_user', { username: user.username, id: user.id }); +export const isConnected = async () => await invoke('presence_is_connected'); diff --git a/src/pages/Launch.svelte b/src/pages/Launch.svelte index eed1627..06db761 100644 --- a/src/pages/Launch.svelte +++ b/src/pages/Launch.svelte @@ -8,11 +8,13 @@ beatmapSets, currentSkin, currentView, + discordPresence, launcherVersion, launching, newVersion, osuBuild, osuStream, + presenceLoading, serverConnectionFails, serverPing, skins, @@ -953,13 +955,13 @@ >
- +
Disables some animations in the Launcher to improve performance on low-end devices.
{ reduceAnimations.set(e); @@ -967,6 +969,26 @@ }} class="flex items-center justify-center w-5 h-5" > + +
+ +
+ Let other discord users show what you are doing right now 👀 +
+
+
+ {#if $presenceLoading} +
+ +
+ {/if} + +
config_patching.set(val)); customCursor.subscribe((val) => config_custom_cursor.set(val)); cursorSmoothening.subscribe((val) => config_cursor_smoothening.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 {} + }); firstStartup.set(isFirstStartup); });