Add display worker message

src-tauri/Cargo.toml

@@ -27,6 +27,7 @@ base64 = "0.21.5"
 
 saturn_backend = { path = "../src-backend" }
 titan = { git = "https://github.com/1whatleytay/titan.git", branch = "main" }
+async-trait = "0.1.82"
 
 [features]
 default = [ "custom-protocol" ]

src-tauri/src/build.rs

@@ -42,7 +42,7 @@ pub fn swap<Listen: ListenResponder + Send + 'static, Track: Tracker<SectionMemo
     keyboard: Arc<Mutex<KeyboardState>>,
     console: Box<dyn ConsoleHandler + Send + Sync>,
     midi: Box<dyn MidiHandler + Send + Sync>,
-    time: Box<dyn TimeHandler + Send + Sync>,
+    time: Arc<dyn TimeHandler + Send + Sync>,
 ) {
     if let Some(state) = pointer.as_ref() {
         state.pause();
@@ -67,7 +67,7 @@ pub fn swap_watched<Mem: Memory + Send + 'static>(
     keyboard: Arc<Mutex<KeyboardState>>,
     console: Box<dyn ConsoleHandler + Send + Sync>,
     midi: Box<dyn MidiHandler + Send + Sync>,
-    time: Box<dyn TimeHandler + Send + Sync>,
+    time: Arc<dyn TimeHandler + Send + Sync>,
 ) {
     if let Some(state) = pointer.as_ref() {
         state.pause();
@@ -98,7 +98,7 @@ pub fn configure_elf(
 
     let console = forward_print(app_handle.clone());
     let midi = Box::new(ForwardMidi::new(app_handle));
-    let time = Box::new(TokioTimeHandler::new());
+    let time = Arc::new(TokioTimeHandler::new());
     let history = HistoryTracker::new(TIME_TRAVEL_HISTORY_SIZE);
 
     let mut memory = SectionMemory::new();
@@ -155,7 +155,7 @@ pub fn configure_asm(
 
     let console = forward_print(app_handle.clone());
     let midi = Box::new(ForwardMidi::new(app_handle));
-    let time = Box::new(TokioTimeHandler::new());
+    let time = Arc::new(TokioTimeHandler::new());
     let history = HistoryTracker::new(TIME_TRAVEL_HISTORY_SIZE);
 
     let mut memory = SectionMemory::new();

src-tauri/src/time.rs

@@ -1,29 +1,21 @@
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
-use futures::channel::oneshot::Receiver;
 use saturn_backend::syscall::TimeHandler;
-use futures::channel::oneshot;
 use tokio::time::sleep;
+use async_trait::async_trait;
 
 pub struct TokioTimeHandler { }
 
 impl TokioTimeHandler {
     pub fn new() -> Self { Self { } }
 }
 
+#[async_trait]
 impl TimeHandler for TokioTimeHandler {
     fn time(&self) -> Option<Duration> {
         SystemTime::now().duration_since(UNIX_EPOCH).ok()
     }
 
-    fn sleep(&self, duration: Duration) -> Receiver<()> {
-        let (sender, receiver) = oneshot::channel();
-
-        tokio::spawn(async move {
-            sleep(duration).await;
-
-            sender.send(())
-        });
-
-        receiver
+    async fn sleep(&self, duration: Duration) {
+        sleep(duration).await;
     }
 }