From 01de3317424cc870913dbe85ff3b80eadaf8cc87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Sat, 9 Nov 2024 15:19:46 +0000
Subject: perf(upgrade): cache downloaded binaries in DENO_DIR (#26108)

Co-authored-by: Divy Srivastava <dj.srivastava23@gmail.com>
---
 cli/tools/upgrade.rs | 69 +++++++++++-----------------------------------------
 1 file changed, 14 insertions(+), 55 deletions(-)

(limited to 'cli/tools')

diff --git a/cli/tools/upgrade.rs b/cli/tools/upgrade.rs
index 77a9f72b8..ed1bc06cf 100644
--- a/cli/tools/upgrade.rs
+++ b/cli/tools/upgrade.rs
@@ -6,13 +6,14 @@ use crate::args::Flags;
 use crate::args::UpgradeFlags;
 use crate::args::UPGRADE_USAGE;
 use crate::colors;
+use crate::download_deno_binary::archive_name;
+use crate::download_deno_binary::download_deno_binary;
+use crate::download_deno_binary::BinaryKind;
 use crate::factory::CliFactory;
 use crate::http_util::HttpClient;
 use crate::http_util::HttpClientProvider;
 use crate::shared::ReleaseChannel;
 use crate::util::archive;
-use crate::util::progress_bar::ProgressBar;
-use crate::util::progress_bar::ProgressBarStyle;
 use crate::version;
 
 use async_trait::async_trait;
@@ -34,12 +35,8 @@ use std::process::Command;
 use std::sync::Arc;
 use std::time::Duration;
 
-const RELEASE_URL: &str = "https://github.com/denoland/deno/releases";
-const CANARY_URL: &str = "https://dl.deno.land/canary";
-const DL_RELEASE_URL: &str = "https://dl.deno.land/release";
-
-pub static ARCHIVE_NAME: Lazy<String> =
-  Lazy::new(|| format!("deno-{}.zip", env!("TARGET")));
+static ARCHIVE_NAME: Lazy<String> =
+  Lazy::new(|| archive_name(BinaryKind::Deno, env!("TARGET")));
 
 // How often query server for new version. In hours.
 const UPGRADE_CHECK_INTERVAL: i64 = 24;
@@ -532,13 +529,17 @@ pub async fn upgrade(
     return Ok(());
   };
 
-  let download_url = get_download_url(
+  let binary_path = download_deno_binary(
+    http_client_provider,
+    factory.deno_dir()?,
+    BinaryKind::Deno,
+    env!("TARGET"),
     &selected_version_to_upgrade.version_or_hash,
     requested_version.release_channel(),
-  )?;
-  log::info!("{}", colors::gray(format!("Downloading {}", &download_url)));
-  let Some(archive_data) = download_package(&client, download_url).await?
-  else {
+  )
+  .await?;
+
+  let Ok(archive_data) = tokio::fs::read(&binary_path).await else {
     log::error!("Download could not be found, aborting");
     std::process::exit(1)
   };
@@ -881,48 +882,6 @@ fn base_upgrade_url() -> Cow<'static, str> {
   }
 }
 
-fn get_download_url(
-  version: &str,
-  release_channel: ReleaseChannel,
-) -> Result<Url, AnyError> {
-  let download_url = match release_channel {
-    ReleaseChannel::Stable => {
-      format!("{}/download/v{}/{}", RELEASE_URL, version, *ARCHIVE_NAME)
-    }
-    ReleaseChannel::Rc => {
-      format!("{}/v{}/{}", DL_RELEASE_URL, version, *ARCHIVE_NAME)
-    }
-    ReleaseChannel::Canary => {
-      format!("{}/{}/{}", CANARY_URL, version, *ARCHIVE_NAME)
-    }
-    ReleaseChannel::Lts => {
-      format!("{}/v{}/{}", DL_RELEASE_URL, version, *ARCHIVE_NAME)
-    }
-  };
-
-  Url::parse(&download_url).with_context(|| {
-    format!(
-      "Failed to parse URL to download new release: {}",
-      download_url
-    )
-  })
-}
-
-async fn download_package(
-  client: &HttpClient,
-  download_url: Url,
-) -> Result<Option<Vec<u8>>, AnyError> {
-  let progress_bar = ProgressBar::new(ProgressBarStyle::DownloadBars);
-  // provide an empty string here in order to prefer the downloading
-  // text above which will stay alive after the progress bars are complete
-  let progress = progress_bar.update("");
-  let maybe_bytes = client
-    .download_with_progress_and_retries(download_url.clone(), None, &progress)
-    .await
-    .with_context(|| format!("Failed downloading {download_url}. The version you requested may not have been built for the current architecture."))?;
-  Ok(maybe_bytes)
-}
-
 fn replace_exe(from: &Path, to: &Path) -> Result<(), std::io::Error> {
   if cfg!(windows) {
     // On windows you cannot replace the currently running executable.
-- 
cgit v1.2.3