live metadata display in UI

src-tauri/src/cursor/mod.rs

@@ -1,27 +1,38 @@
 use device_query::{DeviceEvents, DeviceEventsHandler};
 use lazy_static::lazy_static;
 use serde::{Deserialize, Serialize};
+use specta::Type;
 use std::sync::Mutex;
 use std::sync::RwLock;
 use std::time::Duration;
-use tauri::AppHandle;
+use tauri::{AppHandle, Manager};
+use tauri_specta::Event;
 use tokio::sync::mpsc;
 use tokio::sync::watch;
 
-#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default, Type)]
 #[serde(rename_all = "camelCase")]
 pub struct CursorPosition {
     pub x: f64,
     pub y: f64,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default, Type)]
 #[serde(rename_all = "camelCase")]
 pub struct CursorPositions {
     pub raw: CursorPosition,
     pub mapped: CursorPosition,
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize, Type, Event)]
+#[serde(rename_all = "camelCase")]
+pub struct CursorPositionChanged {
+    pub positions: CursorPositions,
+}
+
+#[derive(Default)]
+pub struct CursorState(RwLock<CursorPositions>);
+
 // Was private, but for some reason LSP
 // complains even when there's no external references.
 // Possibly because of `lazy_static!`.
@@ -33,8 +44,6 @@ pub struct CursorTask {
 
 lazy_static! {
     pub static ref CURSOR_TASK: Mutex<Option<CursorTask>> = Mutex::new(None);
-    pub static ref CURSOR_POSITION: RwLock<CursorPositions> =
-        RwLock::new(CursorPositions::default());
 }
 
 /// Initialize cursor tracking.
@@ -63,8 +72,9 @@ pub fn init(app: &AppHandle) {
         .expect("Failed to resolve primary monitor")
         .expect("Failed to resolve primary monitor");
 
+    let handle = app.clone();
     let task = tauri::async_runtime::spawn(async move {
-        if let Err(e) = init_cursor_tracking_i(stop_rx, primary_monitor).await {
+        if let Err(e) = init_cursor_tracking_i(stop_rx, primary_monitor, handle).await {
             println!("Failed to initialize cursor tracking: {}", e);
         }
     });
@@ -74,15 +84,16 @@ pub fn init(app: &AppHandle) {
 }
 
 #[inline]
-fn update_cursor_position(state: CursorPositions) {
-    let mut guard = CURSOR_POSITION
-        .write()
-        .expect("Cursor Position lock failed");
+fn update_cursor_position(handle: &AppHandle, positions: CursorPositions) {
+    let state = handle.state::<CursorState>();
+    let mut guard = state.0.write().expect("Cursor Position lock failed");
 
-    *guard = state.clone();
+    *guard = positions.clone();
+    drop(guard);
 
-    // TODO: Emit metadata to the app
-    println!("EVENT: CURSOR POSITION CHANGED\n({:?})", state);
+    if let Err(error) = (CursorPositionChanged { positions }).emit(handle) {
+        eprintln!("Failed to emit cursor position change: {error}");
+    }
 }
 
 /// Convert absolute to normalized coordinates (0.12, 0.78), or normalized to absolute (1234, 567)
@@ -147,6 +158,7 @@ pub async fn stop_cursor_tracking() {
 async fn init_cursor_tracking_i(
     mut stop_rx: watch::Receiver<bool>,
     monitor: tauri::Monitor,
+    handle: AppHandle,
 ) -> Result<(), String> {
     println!("Initializing cursor tracking...");
 
@@ -161,7 +173,7 @@ async fn init_cursor_tracking_i(
         println!("Cursor event consumer started");
 
         while let Some(positions) = rx.recv().await {
-            update_cursor_position(positions);
+            update_cursor_position(&handle, positions);
         }
         println!("Cursor event consumer stopped (channel closed)");
     });

src-tauri/src/lib.rs

@@ -9,12 +9,16 @@ mod ufa;
 mod user;
 mod windowing;
 
+use tauri::Manager;
+
 async fn launch_app(app: &tauri::App) -> Result<(), Box<dyn std::error::Error>> {
     let handle = app.handle();
     db::init(handle).await?;
     keypair::init(handle).await?;
     network::init(handle).await?;
-    ufa::init();
+    app.manage(ufa::ForegroundAppState::default());
+    app.manage(cursor::CursorState::default());
+    ufa::init(handle);
     cursor::init(handle);
     windowing::init(handle);
     Ok(())
@@ -68,6 +72,8 @@ fn specta_builder() -> tauri_specta::Builder<tauri::Wry> {
             remotes::RemotesChanged,
             profile::ProfileChanged,
             network::NetworkStatusChanged,
+            cursor::CursorPositionChanged,
+            ufa::ForegroundAppChanged,
         ])
 }
 

src-tauri/src/ufa/mod.rs

@@ -2,6 +2,9 @@
 UFA: User Focused App
 */
 
+use std::sync::RwLock;
+use tauri::{AppHandle, Manager};
+use tauri_specta::Event;
 pub use types::*;
 mod icon_cache;
 #[cfg(target_os = "macos")]
@@ -10,6 +13,15 @@ mod types;
 #[cfg(target_os = "windows")]
 mod windows;
 
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, specta::Type, Event)]
+#[serde(rename_all = "camelCase")]
+pub struct ForegroundAppChanged {
+    pub meta: AppMeta,
+}
+
+#[derive(Default)]
+pub struct ForegroundAppState(RwLock<AppMeta>);
+
 /// Listens for changes in the active (foreground) application and calls the provided callback with metadata.
 /// The implementation varies by platform: macOS uses NSWorkspace notifications, Windows uses WinEventHook.
 pub fn init_listener<F>(callback: F)
@@ -46,9 +58,17 @@ where
 /// Initializes the foreground app change listener
 /// and emits events to the Tauri app on changes.
 /// Used for app to emit user foreground app to peers.
-pub fn init() {
-    init_listener(|meta: AppMeta| {
-        // TODO: Emit metadata to the app
-        println!("EVENT: FOREGROUND APP CHANGED\n({:?})", meta);
+pub fn init(handle: &AppHandle) {
+    let handle = handle.clone();
+
+    init_listener(move |meta: AppMeta| {
+        let state = handle.state::<ForegroundAppState>();
+        let mut current = state.0.write().expect("Foreground App lock failed");
+        *current = meta.clone();
+        drop(current);
+
+        if let Err(error) = (ForegroundAppChanged { meta }).emit(&handle) {
+            eprintln!("Failed to emit foreground app change: {error}");
+        }
     });
 }

src-tauri/src/ufa/types.rs

@@ -1,4 +1,5 @@
 use serde::{Deserialize, Serialize};
+use specta::Type;
 
 pub const ICON_SIZE: u32 = 64;
 pub const ICON_CACHE_LIMIT: usize = 50;
@@ -10,7 +11,7 @@ pub const ICON_CACHE_LIMIT: usize = 50;
 pub const MAX_ICON_B64_SIZE: usize = 50_000;
 
 /// Metadata for the currently active application, including localized and unlocalized names, and an optional base64-encoded icon.
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default, Type)]
 #[serde(rename_all = "camelCase")]
 pub struct AppMeta {
     pub local: Option<String>,