Skip to content

refactoring to avoid deadlocks/crashing #467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cjpais wants to merge 1 commit into from
Closed

refactoring to avoid deadlocks/crashing #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 94 additions & 11 deletions src-tauri/src/actions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use crate::apple_intelligence;
use crate::audio_feedback::{play_feedback_sound, play_feedback_sound_blocking, SoundType};
use crate::managers::audio::AudioRecordingManager;
use crate::managers::history::HistoryManager;
use crate::managers::operation::OperationCoordinator;
use crate::managers::transcription::TranscriptionManager;
use crate::settings::{get_settings, AppSettings, APPLE_INTELLIGENCE_PROVIDER_ID};
use crate::shortcut;
Expand All @@ -13,7 +14,7 @@ use async_openai::types::{
CreateChatCompletionRequestArgs,
};
use ferrous_opencc::{config::BuiltinConfig, OpenCC};
use log::{debug, error};
use log::{debug, error, info, warn};
use once_cell::sync::Lazy;
use std::collections::HashMap;
use std::sync::Arc;
Expand Down Expand Up @@ -248,6 +249,16 @@ impl ShortcutAction for TranscribeAction {
let start_time = Instant::now();
debug!("TranscribeAction::start called for binding: {}", binding_id);

// Start a new operation via the coordinator. This will automatically
// mark any in-progress operation as stale, preventing race conditions
// when rapidly toggling push-to-talk.
let coordinator = app.state::<Arc<OperationCoordinator>>();
let operation_id = coordinator.start_recording(binding_id);
debug!(
"Started operation {} for binding: {}",
operation_id, binding_id
);

// Load model in the background
let tm = app.state::<Arc<TranscriptionManager>>();
tm.initiate_model_load();
Expand Down Expand Up @@ -299,6 +310,8 @@ impl ShortcutAction for TranscribeAction {
});
} else {
debug!("Failed to start recording");
// If recording failed to start, complete the operation
coordinator.complete(operation_id);
}
}

Expand All @@ -320,10 +333,34 @@ impl ShortcutAction for TranscribeAction {
let stop_time = Instant::now();
debug!("TranscribeAction::stop called for binding: {}", binding_id);

// Get the current operation ID from the coordinator
let coordinator = app.state::<Arc<OperationCoordinator>>();
let operation_id = match coordinator.active_operation_id() {
Some(id) => id,
None => {
warn!("TranscribeAction::stop called but no active operation found");
utils::hide_recording_overlay(app);
change_tray_icon(app, TrayIconState::Idle);
return;
}
};

// Transition to processing phase
if !coordinator.transition_to_processing(operation_id) {
info!(
"Operation {} was superseded, aborting stop",
operation_id
);
utils::hide_recording_overlay(app);
change_tray_icon(app, TrayIconState::Idle);
return;
}

let ah = app.clone();
let rm = Arc::clone(&app.state::<Arc<AudioRecordingManager>>());
let tm = Arc::clone(&app.state::<Arc<TranscriptionManager>>());
let hm = Arc::clone(&app.state::<Arc<HistoryManager>>());
let coordinator = Arc::clone(&coordinator);

change_tray_icon(app, TrayIconState::Transcribing);
show_transcribing_overlay(app);
Expand All @@ -339,10 +376,27 @@ impl ShortcutAction for TranscribeAction {
tauri::async_runtime::spawn(async move {
let binding_id = binding_id.clone(); // Clone for the inner async task
debug!(
"Starting async transcription task for binding: {}",
binding_id
"Starting async transcription task for binding: {} (operation {})",
binding_id, operation_id
);

// Helper to clean up UI and complete operation
let cleanup = |ah: &AppHandle, coordinator: &OperationCoordinator, op_id: u64| {
utils::hide_recording_overlay(ah);
change_tray_icon(ah, TrayIconState::Idle);
coordinator.complete(op_id);
};

// Check if operation is still active before proceeding
if !coordinator.is_active(operation_id) {
info!(
"Operation {} is no longer active, aborting transcription",
operation_id
);
cleanup(&ah, &coordinator, operation_id);
return;
}

let stop_recording_time = Instant::now();
if let Some(samples) = rm.stop_recording(&binding_id) {
debug!(
Expand All @@ -351,6 +405,16 @@ impl ShortcutAction for TranscribeAction {
samples.len()
);

// Check again before transcription (this is the expensive part)
if !coordinator.is_active(operation_id) {
info!(
"Operation {} superseded before transcription, aborting",
operation_id
);
cleanup(&ah, &coordinator, operation_id);
return;
}

let transcription_time = Instant::now();
let samples_clone = samples.clone(); // Clone for history saving
match tm.transcribe(samples) {
Expand All @@ -360,6 +424,17 @@ impl ShortcutAction for TranscribeAction {
transcription_time.elapsed(),
transcription
);

// Check again after transcription before pasting
if !coordinator.is_active(operation_id) {
info!(
"Operation {} superseded after transcription, not pasting",
operation_id
);
cleanup(&ah, &coordinator, operation_id);
return;
}

if !transcription.is_empty() {
let settings = get_settings(&ah);
let mut final_text = transcription.clone();
Expand Down Expand Up @@ -392,6 +467,16 @@ impl ShortcutAction for TranscribeAction {
}
}

// Final check before pasting (after potentially slow post-processing)
if !coordinator.is_active(operation_id) {
info!(
"Operation {} superseded after post-processing, not pasting",
operation_id
);
cleanup(&ah, &coordinator, operation_id);
return;
}

// Save to history with post-processed text and prompt
let hm_clone = Arc::clone(&hm);
let transcription_for_history = transcription.clone();
Expand All @@ -411,6 +496,7 @@ impl ShortcutAction for TranscribeAction {

// Paste the final text (either processed or original)
let ah_clone = ah.clone();
let coordinator_clone = Arc::clone(&coordinator);
let paste_time = Instant::now();
ah.run_on_main_thread(move || {
match utils::paste(final_text, ah_clone.clone()) {
Expand All @@ -423,27 +509,24 @@ impl ShortcutAction for TranscribeAction {
// Hide the overlay after transcription is complete
utils::hide_recording_overlay(&ah_clone);
change_tray_icon(&ah_clone, TrayIconState::Idle);
coordinator_clone.complete(operation_id);
})
.unwrap_or_else(|e| {
error!("Failed to run paste on main thread: {:?}", e);
utils::hide_recording_overlay(&ah);
change_tray_icon(&ah, TrayIconState::Idle);
cleanup(&ah, &coordinator, operation_id);
});
} else {
utils::hide_recording_overlay(&ah);
change_tray_icon(&ah, TrayIconState::Idle);
cleanup(&ah, &coordinator, operation_id);
}
}
Err(err) => {
debug!("Global Shortcut Transcription error: {}", err);
utils::hide_recording_overlay(&ah);
change_tray_icon(&ah, TrayIconState::Idle);
cleanup(&ah, &coordinator, operation_id);
}
}
} else {
debug!("No samples retrieved from recording stop");
utils::hide_recording_overlay(&ah);
change_tray_icon(&ah, TrayIconState::Idle);
cleanup(&ah, &coordinator, operation_id);
}
});

Expand Down
3 changes: 3 additions & 0 deletions src-tauri/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ use env_filter::Builder as EnvFilterBuilder;
use managers::audio::AudioRecordingManager;
use managers::history::HistoryManager;
use managers::model::ModelManager;
use managers::operation::OperationCoordinator;
use managers::transcription::TranscriptionManager;
#[cfg(unix)]
use signal_hook::consts::SIGUSR2;
Expand Down Expand Up @@ -125,12 +126,14 @@ fn initialize_core_logic(app_handle: &AppHandle) {
);
let history_manager =
Arc::new(HistoryManager::new(app_handle).expect("Failed to initialize history manager"));
let operation_coordinator = Arc::new(OperationCoordinator::new(app_handle));

// Add managers to Tauri's managed state
app_handle.manage(recording_manager.clone());
app_handle.manage(model_manager.clone());
app_handle.manage(transcription_manager.clone());
app_handle.manage(history_manager.clone());
app_handle.manage(operation_coordinator.clone());

// Initialize the shortcuts
shortcut::init_shortcuts(app_handle);
Expand Down
1 change: 1 addition & 0 deletions src-tauri/src/managers/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
pub mod audio;
pub mod history;
pub mod model;
pub mod operation;
pub mod transcription;
Loading
Loading