feat: switch to callback timer with system time

Author: G07cha

src-tauri/Cargo.lock

@@ -20,7 +20,7 @@ tauri = { version = "1.4.1", features = [ "shell-open", "test", "global-shortcut
 window-vibrancy = "0.3.2"
 tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" }
 ts-rs = "6.2.1"
-ticking-timer = { git = "https://github.com/G07cha/ticking-timer", version = "0.1.1" }
+ticking-timer = { git = "https://github.com/g07cha/ticking-timer", branch = "main" }
 anyhow = "1.0.71"
 
 [dev-dependencies]

src-tauri/Cargo.toml

@@ -1,14 +1,67 @@
 use tauri::{command, State, Window};
 
-use crate::{PomodoroState, SettingsState, TimerState, TimerStatePayload};
+use crate::{
+  state::{Pomodoro, TimerMode},
+  PomodoroState, SettingsState, TimerState, TimerStatePayload,
+};
+
+fn update_pomodoro_state(state: &Pomodoro) -> Pomodoro {
+  match state.mode {
+    TimerMode::Relax => Pomodoro {
+      mode: TimerMode::Work,
+      cycles: state.cycles + 1,
+    },
+    TimerMode::Work => Pomodoro {
+      mode: TimerMode::Relax,
+      cycles: state.cycles,
+    },
+  }
+}
 
 #[command]
-pub fn toggle_timer(window: Window, timer: State<'_, TimerState>) {
-  timer.toggle();
+pub fn toggle_timer(window: Window, timer: State<'_, TimerState>) -> Result<(), String> {
+  timer
+    .toggle()
+    .map_err(|_| "Failed to toggle timer".to_string())?;
+
+  window
+    .emit("timer-running-change", *timer.is_running())
+    .map_err(|_| "Failed to communicate running state".to_string())
+}
+
+#[command]
+pub fn reset_timer(
+  window: Window,
+  timer: State<'_, TimerState>,
+  pomodoro_state: State<'_, PomodoroState>,
+  settings: State<'_, SettingsState>,
+) -> Result<(), String> {
+  let mut pomodoro_state = pomodoro_state.lock().unwrap();
+
+  *pomodoro_state = update_pomodoro_state(&pomodoro_state);
+  let new_duration = pomodoro_state.duration(&settings.read().unwrap());
+  timer
+    .reset(new_duration)
+    .map_err(|_| "Failed to reset timer".to_string())?;
+  timer
+    .resume()
+    .map_err(|_| "Failed to resume timer".to_string())?;
+
+  window
+    .emit::<TimerStatePayload>(
+      "timer-state",
+      TimerStatePayload {
+        mode: pomodoro_state.mode,
+        cycle: pomodoro_state.cycles,
+        is_ended: false,
+        duration_secs: new_duration.as_secs() as u32,
+      },
+    )
+    .map_err(|_| "Failed to communicate new state".to_string())?;
 
   window
-    .emit("timer-running-change", timer.is_running())
-    .unwrap()
+    .emit("timer-running-change", *timer.is_running())
+    .map_err(|_| "Failed to communicate running state".to_string())
 }
 
 #[command]

src-tauri/src/commands/timer.rs

@@ -29,11 +29,11 @@ pub fn register_toggle_shortcut<R: Runtime>(
       let app_handle = app_handle.clone();
       move || {
         let timer = app_handle.state::<TimerState>();
-        timer.toggle();
+        timer.toggle().expect("Failed to toggle timer");
         app_handle
           .get_window(MAIN_WINDOW_LABEL)
           .expect("Failed to find main window")
-          .emit("timer-running-change", timer.is_running())
+          .emit("timer-running-change", *timer.is_running())
           .unwrap();
       }
     })?

src-tauri/src/helpers/shortcuts.rs

@@ -1,34 +1,14 @@
-use tauri::{AppHandle, Manager};
+use std::time::Duration;
 
-use crate::{
-  state::{Pomodoro, TimerMode},
-  PomodoroState, SettingsState, TimerState, TimerStatePayload, MAIN_WINDOW_LABEL,
-};
+use tauri::{AppHandle, Manager};
 
-fn update_pomodoro_state(state: &Pomodoro) -> Pomodoro {
-  match state.mode {
-    TimerMode::Relax => Pomodoro {
-      mode: TimerMode::Work,
-      cycles: state.cycles + 1,
-    },
-    TimerMode::Work => Pomodoro {
-      mode: TimerMode::Relax,
-      cycles: state.cycles,
-    },
-  }
-}
+use crate::{PomodoroState, TimerStatePayload, MAIN_WINDOW_LABEL};
 
-pub fn setup_timer_listener(app_handle: &AppHandle) -> impl Fn() {
-  let window = app_handle
-    .get_window(MAIN_WINDOW_LABEL)
-    .expect("Unable to retrieve main window");
-  let update_receiver = app_handle.state::<TimerState>().update_receiver.clone();
+pub fn create_timer_listener(app_handle: &AppHandle) -> impl Fn(Duration) {
   let app_handle = app_handle.clone();
+  let main_window = app_handle.get_window(MAIN_WINDOW_LABEL).unwrap();
 
-  move || loop {
-    let remaining = update_receiver
-      .recv()
-      .expect("Failed to receive timer tick");
+  move |remaining: Duration| {
     let remaining_secs = remaining.as_secs();
 
     #[cfg(target_os = "macos")]
@@ -47,25 +27,17 @@ pub fn setup_timer_listener(app_handle: &AppHandle) -> impl Fn() {
     app_handle.emit_all("timer-tick", &remaining_secs).unwrap();
 
     if remaining.is_zero() {
-      let settings = app_handle.state::<SettingsState>();
       let pomodoro_state = app_handle.state::<PomodoroState>();
-      let mut pomodoro_state = pomodoro_state.lock().unwrap();
-
-      *pomodoro_state = update_pomodoro_state(&pomodoro_state);
-      let new_duration = pomodoro_state.duration(&settings.read().unwrap());
-      app_handle
-        .state::<TimerState>()
-        .reset(new_duration)
-        .unwrap();
+      let pomodoro_state = pomodoro_state.lock().unwrap();
 
-      window
+      main_window
         .emit::<TimerStatePayload>(
           "timer-state",
           TimerStatePayload {
             mode: pomodoro_state.mode,
             cycle: pomodoro_state.cycles,
             is_ended: true,
-            duration_secs: new_duration.as_secs() as u32,
+            duration_secs: remaining.as_secs() as u32,
           },
         )
         .unwrap();

src-tauri/src/helpers/timer.rs

@@ -4,14 +4,13 @@
 )]
 
 use std::sync::{Arc, Mutex, RwLock};
-use std::thread;
 use std::time::Duration;
 
 use commands::settings::*;
 use commands::timer::*;
 use helpers::fs::load_settings;
 use helpers::shortcuts::setup_shortcuts;
-use helpers::timer::setup_timer_listener;
+use helpers::timer::create_timer_listener;
 use serde::Serialize;
 use state::{Pomodoro, Settings};
 use tauri::{Manager, RunEvent};
@@ -48,14 +47,25 @@ pub type PomodoroState = Mutex<Pomodoro>;
 fn main() {
   tauri::Builder::default()
     .menu(tauri::Menu::new())
-    .manage::<TimerState>(Arc::new(Timer::new(Duration::from_millis(100))))
     .manage::<SettingsState>(RwLock::new(Settings::default()))
     .manage::<PomodoroState>(Mutex::new(Pomodoro {
       cycles: 0,
       mode: state::TimerMode::Work,
     }))
     .setup(|app| {
       let app_handle = app.handle();
+      let main_window = setup_main_window(&app_handle).unwrap();
+      decorate_window(&main_window);
+
+      #[cfg(debug_assertions)]
+      main_window.open_devtools();
+
+      let timer = Timer::new(
+        Duration::from_millis(100),
+        create_timer_listener(&app_handle),
+      );
+
+      app_handle.manage::<TimerState>(Arc::new(timer));
 
       {
         match load_settings(&app_handle) {
@@ -70,20 +80,8 @@ fn main() {
         }
       }
 
-      {
-        let main_window = setup_main_window(&app_handle).unwrap();
-        decorate_window(&main_window);
-
-        #[cfg(debug_assertions)]
-        main_window.open_devtools();
-      }
-
       setup_tray(app);
 
-      thread::Builder::new()
-        .name("Timer listener".into())
-        .spawn(setup_timer_listener(&app_handle))?;
-
       Ok(())
     })
     .plugin(tauri_plugin_autostart::init(
@@ -92,6 +90,7 @@ fn main() {
     ))
     .invoke_handler(tauri::generate_handler![
       toggle_timer,
+      reset_timer,
       get_timer_state,
       get_settings,
       set_settings

src-tauri/src/main.rs

@@ -1,17 +1,18 @@
 use std::time::Duration;
 
+use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
 use crate::commands::settings::SettingsPayload;
 
-#[derive(Clone, Copy, serde::Serialize, serde::Deserialize, Debug, TS)]
+#[derive(Clone, Copy, Serialize, Deserialize, Debug, TS)]
 #[ts(export)]
 pub enum TimerMode {
   Work,
   Relax,
 }
 
-#[derive(Clone, serde::Serialize, serde::Deserialize, Debug)]
+#[derive(Clone, Serialize, Deserialize, Debug)]
 pub struct Settings {
   pub work_duration: Duration,
   pub relax_duration: Duration,

src-tauri/src/state.rs

@@ -38,7 +38,7 @@ timerService.onEnd(() => {
   timerUI.showIcon(TimerIcon.Play);
   timerUI.setText('');
   timerUI.setCycle(0);
-  message('Timer is done', { type: 'info' }).then(() => timerService.toggle());
+  message('Timer is done', { type: 'info' }).then(() => timerService.reset());
 });
 
 timerService.onPause(() => {

src-ui/pages/main/main.ts

@@ -62,6 +62,8 @@ export class TimerService {
 
   toggle = () => invoke('toggle_timer');
 
+  reset = () => invoke('reset_timer');
+
   get duration() {
     return this._duration;
   }