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

fix(gui-client): remove timeout from opening deep-link (#9475)

Browse Source 
This timeout seems to be problematic as deep-links don't open with it at
all. This is a regression from #9445.
This commit is contained in:
Thomas Eizinger
2025-06-07 22:00:24 +02:00
committed by GitHub
parent 113f8fd0d7
commit e15dde6648
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rust/gui-client/src-tauri/src/bin/firezone-gui-client.rs
View File

@@ -4,7 +4,7 @@
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
#![cfg_attr(test, allow(clippy::unwrap_used))]
use std::{process::ExitCode, time::Duration};
use std::process::ExitCode;
use anyhow::{Context as _, Result, bail};
use clap::{Args, Parser};
@@ -109,12 +109,10 @@ fn try_main(
return Ok(());
}
Some(Cmd::OpenDeepLink(deep_link)) => {
rt.block_on(tokio::time::timeout(
Duration::from_secs(10),
deep_link::open(deep_link.url),
))
.context("Timed out while opening deep-link")?
.context("Failed to open deep-link")?;
tracing::info!("Opening deep-link");
rt.block_on(deep_link::open(deep_link.url))
.context("Failed to open deep-link")?;
return Ok(());
}

4
rust/gui-client/src-tauri/src/deep_link.rs
View File

@@ -44,6 +44,8 @@ pub async fn open(url: url::Url) -> Result<()> {
.await
.context("Failed to send deep-link")?;
tracing::debug!("Sent deep-link, waiting for response");
let response = read
.next()
.await
@@ -52,6 +54,8 @@ pub async fn open(url: url::Url) -> Result<()> {
anyhow::ensure!(response == ServerMsg::Ack);
tracing::info!("Primary instance acknowledged deep-link, goodbye!");
Ok(())
}