github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 10:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(gui-client): reduce duplication for sending requests (#9476)

Browse Source
This commit is contained in:
Thomas Eizinger
2025-06-09 12:37:23 +02:00
committed by GitHub
parent 9210ed2a97
commit ae4816d2a6
3 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rust/gui-client/src-tauri/src/controller.rs
View File

@@ -93,6 +93,7 @@ pub trait GuiIntegration {
fn show_about_page(&self) -> Result<()>;
}
#[derive(strum::Display)]
pub enum ControllerRequest {
ApplyAdvancedSettings(Box<AdvancedSettings>),
ApplyGeneralSettings(Box<GeneralSettingsForm>),

22
rust/gui-client/src-tauri/src/gui.rs
View File

@@ -44,11 +44,31 @@ pub use os::set_autostart;
///
/// Note that this never gets Dropped because of
/// <https://github.com/tauri-apps/tauri/issues/8631>
#[derive(Clone)]
pub(crate) struct Managed {
pub req_tx: mpsc::Sender<ControllerRequest>,
req_tx: mpsc::Sender<ControllerRequest>,
pub inject_faults: bool,
}
impl Managed {
pub async fn send_request(&self, msg: ControllerRequest) -> Result<()> {
let msg_name = msg.to_string();
self.req_tx
.send(msg)
.await
.with_context(|| format!("Failed to send `{msg_name}`"))
}
pub fn blocking_send_request(&self, msg: ControllerRequest) -> Result<()> {
let msg_name = msg.to_string();
self.req_tx
.blocking_send(msg)
.with_context(|| format!("Failed to send `{msg_name}`"))
}
}
struct TauriIntegration {
app: tauri::AppHandle,
tray: system_tray::Tray,

58
rust/gui-client/src-tauri/src/view.rs
View File

@@ -6,11 +6,7 @@ use serde::Serialize;
use tauri::{Wry, ipc::Invoke};
use tauri_plugin_dialog::DialogExt as _;
use crate::{
controller::{ControllerRequest, CtlrTx},
gui::Managed,
settings::AdvancedSettings,
};
use crate::{controller::ControllerRequest, gui::Managed, settings::AdvancedSettings};
#[derive(Clone, serde::Deserialize)]
pub struct GeneralSettingsForm {
@@ -50,10 +46,8 @@ async fn clear_logs(managed: tauri::State<'_, Managed>) -> Result<()> {
let (tx, rx) = tokio::sync::oneshot::channel();
managed
.req_tx
.send(ControllerRequest::ClearLogs(tx))
.await
.context("Failed to send `ClearLogs` command")?;
.send_request(ControllerRequest::ClearLogs(tx))
.await?;
rx.await
.context("Failed to await `ClearLogs` result")?
@@ -64,7 +58,7 @@ async fn clear_logs(managed: tauri::State<'_, Managed>) -> Result<()> {
#[tauri::command]
async fn export_logs(app: tauri::AppHandle, managed: tauri::State<'_, Managed>) -> Result<()> {
show_export_dialog(&app, managed.req_tx.clone())?;
show_export_dialog(&app, managed.inner().clone())?;
Ok(())
}
@@ -79,10 +73,8 @@ async fn apply_general_settings(
}
managed
.req_tx
.send(ControllerRequest::ApplyGeneralSettings(Box::new(settings)))
.await
.context("Failed to send `ApplyGeneralSettings` command")?;
.send_request(ControllerRequest::ApplyGeneralSettings(Box::new(settings)))
.await?;
Ok(())
}
@@ -97,10 +89,8 @@ async fn apply_advanced_settings(
}
managed
.req_tx
.send(ControllerRequest::ApplyAdvancedSettings(Box::new(settings)))
.await
.context("Failed to send `ApplySettings` command")?;
.send_request(ControllerRequest::ApplyAdvancedSettings(Box::new(settings)))
.await?;
Ok(())
}
@@ -115,16 +105,14 @@ async fn reset_advanced_settings(managed: tauri::State<'_, Managed>) -> Result<(
#[tauri::command]
async fn reset_general_settings(managed: tauri::State<'_, Managed>) -> Result<()> {
managed
.req_tx
.send(ControllerRequest::ResetGeneralSettings)
.await
.context("Failed to send `ResetGeneralSettings` command")?;
.send_request(ControllerRequest::ResetGeneralSettings)
.await?;
Ok(())
}
/// Pops up the "Save File" dialog
fn show_export_dialog(app: &tauri::AppHandle, ctlr_tx: CtlrTx) -> Result<()> {
fn show_export_dialog(app: &tauri::AppHandle, managed: Managed) -> Result<()> {
let now = chrono::Local::now();
let datetime_string = now.format("%Y_%m_%d-%H-%M");
let stem = PathBuf::from(format!("firezone_logs_{datetime_string}"));
@@ -150,8 +138,10 @@ fn show_export_dialog(app: &tauri::AppHandle, ctlr_tx: CtlrTx) -> Result<()> {
};
// blocking_send here because we're in a sync callback within Tauri somewhere
if let Err(e) = ctlr_tx.blocking_send(ControllerRequest::ExportLogs { path, stem }) {
tracing::warn!("Failed to send `ExportLogs` command: {e}");
if let Err(e) =
managed.blocking_send_request(ControllerRequest::ExportLogs { path, stem })
{
tracing::warn!("{e:#}");
}
});
Ok(())
@@ -159,33 +149,21 @@ fn show_export_dialog(app: &tauri::AppHandle, ctlr_tx: CtlrTx) -> Result<()> {
#[tauri::command]
async fn sign_in(managed: tauri::State<'_, Managed>) -> Result<()> {
managed
.req_tx
.send(ControllerRequest::SignIn)
.await
.context("Failed to send `SignIn` command")?;
managed.send_request(ControllerRequest::SignIn).await?;
Ok(())
}
#[tauri::command]
async fn sign_out(managed: tauri::State<'_, Managed>) -> Result<()> {
managed
.req_tx
.send(ControllerRequest::SignOut)
.await
.context("Failed to send `SignOut` command")?;
managed.send_request(ControllerRequest::SignOut).await?;
Ok(())
}
#[tauri::command]
async fn update_state(managed: tauri::State<'_, Managed>) -> Result<()> {
managed
.req_tx
.send(ControllerRequest::UpdateState)
.await
.context("Failed to send `UpdateState` command")?;
managed.send_request(ControllerRequest::UpdateState).await?;
Ok(())
}