Dreaded_X/siranga
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added option to retry creating tunnels

Browse Source
This commit is contained in:
Dreaded_X 2025-04-13 00:13:59 +02:00
parent 15f382b654
commit d944efc24a
Signed by: Dreaded_X
GPG Key ID: FA5F485356B0D2D4
3 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/handler.rs
View File

@ -116,6 +116,18 @@ impl Handler {
warn!("User not set");
}
}
Input::Char('r') => {
let Some(selected) = self.selected else {
return Ok(false);
};
let Some(tunnel) = self.tunnels.get_mut(selected) else {
warn!("Trying to retry invalid tunnel");
return Ok(false);
};
*tunnel = self.all_tunnels.retry_tunnel(tunnel.clone()).await;
}
Input::Delete => {
let Some(selected) = self.selected else {
return Ok(false);
@ -285,7 +297,7 @@ impl russh::server::Handler for Handler {
let tunnel = self
.all_tunnels
.add_tunnel(session.handle(), address, *port, user)
.create_tunnel(session.handle(), address, *port, user)
.await;
self.tunnels.push(tunnel);

3
src/tui.rs
View File

@ -42,11 +42,12 @@ impl Renderer {
command("esc", "deselect"),
command("↓/j", "move down"),
command("↑/k", "move up"),
command("del", "close tunnel"),
vec![],
command("p", "make private"),
command("ctrl-p", "make protected"),
command("shift-p", "make public"),
command("del", "remove"),
command("r", "retry"),
]
} else {
vec![

19
src/tunnel.rs
View File

@ -85,7 +85,7 @@ impl Tunnels {
}
}
pub async fn add_tunnel(
pub async fn create_tunnel(
&mut self,
handle: Handle,
name: impl Into<String>,
@ -117,8 +117,12 @@ impl Tunnels {
trace!(tunnel = tunnel.name, "Already in use, picking new name");
}
};
let address = tunnel.get_address().expect("domain is set");
self.add_tunnel(tunnel).await
}
async fn add_tunnel(&mut self, mut tunnel: Tunnel) -> Tunnel {
let address = tunnel.get_address().expect("domain is set");
if let Entry::Vacant(e) = self.tunnels.write().await.entry(address) {
trace!(tunnel = tunnel.name, "Adding tunnel");
e.insert(tunnel.clone());
@ -130,12 +134,21 @@ impl Tunnels {
tunnel
}
pub async fn remove_tunnel(&mut self, tunnel: Tunnel) {
pub async fn remove_tunnel(&mut self, mut tunnel: Tunnel) -> Tunnel {
let mut all_tunnels = self.tunnels.write().await;
if let Some(address) = tunnel.get_address() {
trace!(tunnel.name, "Removing tunnel");
all_tunnels.remove(&address);
}
tunnel.domain = None;
tunnel
}
pub async fn retry_tunnel(&mut self, tunnel: Tunnel) -> Tunnel {
let mut tunnel = self.remove_tunnel(tunnel).await;
tunnel.domain = Some(self.domain.clone());
self.add_tunnel(tunnel).await
}
}