Skip to content

fix(tunnel): misc fixes #30968

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix(tunnel): misc fixes #30968

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9aec13
fix(tunnel): misc fixes
devsnek Oct 10, 2025
2914242
Update main.rs
devsnek Oct 10, 2025
d77f033
Update main.rs
devsnek Oct 10, 2025
c2916b7
Update main.rs
devsnek Oct 10, 2025
dd17a44
Update main.rs
devsnek Oct 10, 2025
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
20 changes: 9 additions & 11 deletions cli/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,19 +672,13 @@ async fn resolve_flags_and_init(
.map(|files| files.iter().map(PathBuf::from).collect());
load_env_variables_from_env_files(env_file_paths.as_ref(), flags.log_level);

if deno_lib::args::has_flag_env_var("DENO_CONNECTED")
&& matches!(
flags.subcommand,
DenoSubcommand::Run { .. }
| DenoSubcommand::Serve { .. }
| DenoSubcommand::Task { .. }
)
{
if deno_lib::args::has_flag_env_var("DENO_CONNECTED") {
flags.tunnel = true;
}

// Tunnel sets up env vars and OTEL, so connect before everything else.
if flags.tunnel {
if flags.tunnel && !matches!(flags.subcommand, DenoSubcommand::Deploy { .. })
{
if let Err(err) = initialize_tunnel(&flags).await {
exit_for_error(err.context("Failed to start with tunnel"));
}
Expand Down Expand Up @@ -1056,7 +1050,9 @@ async fn initialize_tunnel(
format!("https://{}:{}", addr.hostname(), addr.port())
};

log::info!(
// We explicitly use eprintln instead of log here since
// there is a circular dep between tunnel and telemetry
eprintln!(
"{}",
colors::green(format!("You are connected to {endpoint}"))
);
Expand All @@ -1067,7 +1063,9 @@ async fn initialize_tunnel(
} else {
"".into()
};
log::info!(
// We explicitly use eprintln instead of log here since
// there is a circular dep between tunnel and telemetry
eprintln!(
"{}",
colors::green(format!(
"Reconnecting tunnel in {}s...{}",
Expand Down
Loading