Skip to content

fix(unstable): update deno_tunnel for better reconnect errors #30381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 12, 2025
+63 −64
Merged

fix(unstable): update deno_tunnel for better reconnect errors #30381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ napi_sym = { version = "0.142.0", path = "./ext/napi/sym" }
node_resolver = { version = "0.50.0", path = "./libs/node_resolver" }
test_util = { package = "test_server", path = "./tests/util/server" }

deno_tunnel = "0.7.0"
deno_tunnel = "0.8.0"

# widely used libraries
anyhow = "1.0.57"
Expand Down
121 changes: 60 additions & 61 deletions cli/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,72 +928,71 @@ async fn initialize_tunnel(
metadata.insert("entrypoint".into(), entrypoint);
}

let (tunnel, mut events) =
match deno_runtime::deno_net::tunnel::TunnelConnection::connect(
addr,
hostname.to_owned(),
tls_config.clone(),
deno_runtime::deno_net::tunnel::Authentication::App {
token,
org: org.clone(),
app: app.clone(),
},
metadata.clone(),
)
.await
{
Ok(res) => res,
Err(deno_runtime::deno_net::tunnel::Error::Unauthorized) => {
tools::deploy::get_token_entry()?.delete_credential()?;
let on_event = |event| {
use deno_runtime::deno_net::tunnel::Event;
match event {
Event::Routed(addr) => {
let endpoint = if addr.port() == 443 {
format!("https://{}", addr.hostname())
} else {
format!("https://{}:{}", addr.hostname(), addr.port())
};

let token = auth_tunnel().await?;
deno_runtime::deno_net::tunnel::TunnelConnection::connect(
addr,
hostname.to_owned(),
tls_config,
deno_runtime::deno_net::tunnel::Authentication::App {
token,
org,
app,
},
metadata.clone(),
)
.await?
log::info!(
"{}",
colors::green(format!("You are connected to {endpoint}!"))
);
}
Err(e) => return Err(e.into()),
};

let addr = tunnel.local_addr()?;

let endpoint = if addr.port() == 443 {
format!("https://{}", addr.hostname())
} else {
format!("https://{}:{}", addr.hostname(), addr.port())
Event::Reconnect(duration, reason) => {
let reason = if let Some(reason) = reason {
format!(" ({reason})")
} else {
"".into()
};
log::info!(
"{}",
colors::green(format!(
"Reconnecting tunnel in {}s...{}",
duration.as_secs(),
reason
))
);
}
_ => {}
}
};

tokio::spawn(async move {
while let Some(event) = events.next().await {
use deno_runtime::deno_net::tunnel::Event;
match event {
Event::Routed => {
log::info!(
"{}",
colors::green(format!("You are connected to {endpoint}!"))
);
}
Event::Reconnect(d) => {
log::info!(
"{}",
colors::green(format!(
"Reconnecting tunnel in {}s...",
d.as_secs()
))
);
}
_ => {}
}
let tunnel = match deno_runtime::deno_net::tunnel::TunnelConnection::connect(
addr,
hostname.to_owned(),
tls_config.clone(),
deno_runtime::deno_net::tunnel::Authentication::App {
token,
org: org.clone(),
app: app.clone(),
},
metadata.clone(),
on_event,
)
.await
{
Ok(res) => res,
Err(deno_runtime::deno_net::tunnel::Error::Unauthorized) => {
tools::deploy::get_token_entry()?.delete_credential()?;

let token = auth_tunnel().await?;
deno_runtime::deno_net::tunnel::TunnelConnection::connect(
addr,
hostname.to_owned(),
tls_config,
deno_runtime::deno_net::tunnel::Authentication::App { token, org, app },
metadata.clone(),
on_event,
)
.await?
}
});
Err(e) => return Err(e.into()),
};

if let Some(metadata) = tunnel.metadata() {
for (k, v) in metadata.env {
Expand Down
Loading