From fb485d25a0df417c7b3e64dfbe2fa40c656b74a7 Mon Sep 17 00:00:00 2001 From: KurikoMoe Date: Fri, 12 May 2023 20:01:24 +0800 Subject: [PATCH] fix(cli): fix cli connection timeout to dev server (fix #6045) (#6046) Fix tauri-cli connection to dev server stucks and waits for TCP timeout. --- tooling/cli/src/dev.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tooling/cli/src/dev.rs b/tooling/cli/src/dev.rs index b3adb3c4e..7aa007a5c 100644 --- a/tooling/cli/src/dev.rs +++ b/tooling/cli/src/dev.rs @@ -278,11 +278,15 @@ fn command_internal(mut options: Options) -> Result<()> { }; let mut i = 0; let sleep_interval = std::time::Duration::from_secs(2); + let timeout_duration = std::time::Duration::from_secs(1); let max_attempts = 90; - loop { - if std::net::TcpStream::connect(addrs).is_ok() { - break; + 'waiting: loop { + for addr in addrs.iter() { + if std::net::TcpStream::connect_timeout(addr, timeout_duration).is_ok() { + break 'waiting; + } } + if i % 3 == 1 { warn!( "Waiting for your frontend dev server to start on {}...",