ospab
/
ostp
mirror of https://github.com/ospab/ostp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

§F: GUI start_tunnel tears down existing tunnel first (stop+start) 

Previously start_tunnel returned early if a tunnel was already running, so
changing the server while connected silently kept the OLD connection. Per
the plan ("server change = full stop+start, not hot-reload"), tear down any
existing InProcess/Helper tunnel before starting a fresh one. For the
elevated helper, wait ~1.2s after sending stop so it releases the ostp_tun
adapter before a new helper recreates it (avoids name clashes). start_tunnel
is only invoked on an explicit connect, so restarting here is safe.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
ospab 2026-06-27 21:40:09 +03:00
parent 4f7f1ca838
commit 5c9ec89821
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ostp-gui/src-tauri/src/lib.rs
View File

@ -501,14 +501,25 @@ fn generate_qr(text: String) -> Result<String, String> {
async fn start_tunnel(state: tauri::State<'_, AppState>, app: tauri::AppHandle) -> Result<bool, String> { async fn start_tunnel(state: tauri::State<'_, AppState>, app: tauri::AppHandle) -> Result<bool, String> {
let mut guard = state.0.lock().await; let mut guard = state.0.lock().await;
if let Some(ref t) = guard.tunnel { // Tear down any existing tunnel before starting a fresh one — otherwise a
match t { // server change would silently keep the old connection/server. start_tunnel
TunnelHandle::InProcess(s) if !s.handle.is_finished() => return Ok(true), // is only ever invoked on an explicit connect, so restarting here is safe.
TunnelHandle::Helper(_) => return Ok(true), // This implements the plan's "server change = full stop+start, not hot-reload".
_ => {} match guard.tunnel.take() {
None => {}
Some(TunnelHandle::InProcess(mut s)) => {
if let Some(tx) = s.shutdown_tx.take() { let _ = tx.send(true); }
s.handle.abort();
let _ = tokio::time::timeout(std::time::Duration::from_secs(2), s.handle).await;
}
Some(TunnelHandle::Helper(h)) => {
let stop_cmd = serde_json::json!({ "cmd": "stop", "token": h.token }).to_string();
let _ = h.cmd_tx.send(format!("{}\n", stop_cmd)).await;
// Let the elevated helper stop the tunnel and release the ostp_tun
// adapter before a new helper tries to create it (avoids name clashes).
tokio::time::sleep(std::time::Duration::from_millis(1200)).await;
} }
} }
guard.tunnel = None;
let path = get_config_path(); let path = get_config_path();
let content = std::fs::read_to_string(&path).map_err(|e| e.to_string())?; let content = std::fs::read_to_string(&path).map_err(|e| e.to_string())?;