mirror of
https://github.com/zhom/donutbrowser.git
synced 2026-07-11 15:16:34 +02:00
refactor: cleanup
This commit is contained in:
@@ -1,10 +1,7 @@
|
||||
use serde::Serialize;
|
||||
use std::sync::Arc;
|
||||
use tokio::sync::broadcast;
|
||||
|
||||
/// Trait for emitting events to the frontend or connected clients.
|
||||
/// This abstraction allows the same code to work in both GUI (Tauri) mode
|
||||
/// and daemon mode (WebSocket broadcast).
|
||||
/// Trait for emitting events to the frontend.
|
||||
///
|
||||
/// Note: This trait uses `serde_json::Value` to be dyn-compatible.
|
||||
/// Use the convenience functions `emit()` and `emit_empty()` which accept
|
||||
@@ -37,49 +34,6 @@ impl EventEmitter for TauriEmitter {
|
||||
}
|
||||
}
|
||||
|
||||
/// Event message sent through the daemon's broadcast channel.
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct DaemonEvent {
|
||||
pub event_type: String,
|
||||
pub payload: serde_json::Value,
|
||||
}
|
||||
|
||||
/// Daemon-based event emitter for background daemon mode.
|
||||
/// Broadcasts events to all connected WebSocket clients.
|
||||
#[derive(Clone)]
|
||||
pub struct DaemonEmitter {
|
||||
tx: broadcast::Sender<DaemonEvent>,
|
||||
}
|
||||
|
||||
impl DaemonEmitter {
|
||||
pub fn new(tx: broadcast::Sender<DaemonEvent>) -> Self {
|
||||
Self { tx }
|
||||
}
|
||||
|
||||
/// Create a new DaemonEmitter with a default channel capacity.
|
||||
pub fn with_capacity(capacity: usize) -> (Self, broadcast::Receiver<DaemonEvent>) {
|
||||
let (tx, rx) = broadcast::channel(capacity);
|
||||
(Self { tx }, rx)
|
||||
}
|
||||
|
||||
/// Subscribe to events from this emitter.
|
||||
pub fn subscribe(&self) -> broadcast::Receiver<DaemonEvent> {
|
||||
self.tx.subscribe()
|
||||
}
|
||||
}
|
||||
|
||||
impl EventEmitter for DaemonEmitter {
|
||||
fn emit_value(&self, event: &str, payload: serde_json::Value) -> Result<(), String> {
|
||||
let daemon_event = DaemonEvent {
|
||||
event_type: event.to_string(),
|
||||
payload,
|
||||
};
|
||||
// Ignore send errors (no receivers connected)
|
||||
let _ = self.tx.send(daemon_event);
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
/// No-op emitter for testing or when events are not needed.
|
||||
#[derive(Clone, Default)]
|
||||
pub struct NoopEmitter;
|
||||
@@ -91,8 +45,7 @@ impl EventEmitter for NoopEmitter {
|
||||
}
|
||||
|
||||
/// Global event emitter that can be set at runtime.
|
||||
/// This allows managers to emit events without knowing whether they're
|
||||
/// running in GUI or daemon mode.
|
||||
/// This allows managers to emit events without holding an AppHandle directly.
|
||||
static GLOBAL_EMITTER: std::sync::OnceLock<Arc<dyn EventEmitter>> = std::sync::OnceLock::new();
|
||||
|
||||
/// Set the global event emitter. This should be called once during app startup.
|
||||
@@ -136,30 +89,6 @@ mod tests {
|
||||
.is_ok());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_daemon_emitter() {
|
||||
let (emitter, mut rx) = DaemonEmitter::with_capacity(16);
|
||||
|
||||
// Emit an event
|
||||
let _ = emitter.emit_value("test-event", serde_json::json!("hello"));
|
||||
|
||||
// Check we received it
|
||||
let event = rx.try_recv().unwrap();
|
||||
assert_eq!(event.event_type, "test-event");
|
||||
assert_eq!(event.payload, serde_json::json!("hello"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_daemon_emitter_no_receivers() {
|
||||
let (tx, _) = broadcast::channel::<DaemonEvent>(16);
|
||||
let emitter = DaemonEmitter::new(tx);
|
||||
|
||||
// Should not error even with no receivers
|
||||
assert!(emitter
|
||||
.emit_value("test-event", serde_json::json!("hello"))
|
||||
.is_ok());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_emit_convenience_function() {
|
||||
// Test that emit() works with various types
|
||||
|
||||
Reference in New Issue
Block a user