diff options
| author | Nathan Whitaker <17734409+nathanwhit@users.noreply.github.com> | 2024-10-15 16:46:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-15 16:46:42 -0700 |
| commit | 7c3c13cecf48219cdcb90dc0b5019686cdd88626 (patch) | |
| tree | ea44361a7b8c061ec84ec29d88aa2c6a1c3ec07a /cli/npm | |
| parent | 40b1c42138c47e89eefa859cd36a9e3d62541e7b (diff) | |
fix(install): retry downloads of registry info / tarballs (#26278)
Fixes #26085.
Adds a basic retry utility with some defaults, starts off with a 100ms
wait, then 250ms, then 500ms
I've applied the retry in the http client, reusing an existing function,
so this also applies to retrying downloads of deno binaries in `upgrade`
and `compile`. I can make a separate function that doesn't retry so this
doesn't affect `upgrade` and `compile`, but it seemed desirable to have
retries there too, so I left it in.
Diffstat (limited to 'cli/npm')
| -rw-r--r-- | cli/npm/managed/cache/registry_info.rs | 11 | ||||
| -rw-r--r-- | cli/npm/managed/cache/tarball.rs | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/cli/npm/managed/cache/registry_info.rs b/cli/npm/managed/cache/registry_info.rs index 28b19373e..597a2283f 100644 --- a/cli/npm/managed/cache/registry_info.rs +++ b/cli/npm/managed/cache/registry_info.rs @@ -202,10 +202,13 @@ impl RegistryInfoDownloader { let guard = self.progress_bar.update(package_url.as_str()); let name = name.to_string(); async move { - let maybe_bytes = downloader - .http_client_provider - .get_or_create()? - .download_with_progress(package_url, maybe_auth_header, &guard) + let client = downloader.http_client_provider.get_or_create()?; + let maybe_bytes = client + .download_with_progress_and_retries( + package_url, + maybe_auth_header, + &guard, + ) .await?; match maybe_bytes { Some(bytes) => { diff --git a/cli/npm/managed/cache/tarball.rs b/cli/npm/managed/cache/tarball.rs index 4bcee38ea..7cf88d6d6 100644 --- a/cli/npm/managed/cache/tarball.rs +++ b/cli/npm/managed/cache/tarball.rs @@ -172,7 +172,7 @@ impl TarballCache { let guard = tarball_cache.progress_bar.update(&dist.tarball); let result = tarball_cache.http_client_provider .get_or_create()? - .download_with_progress(tarball_uri, maybe_auth_header, &guard) + .download_with_progress_and_retries(tarball_uri, maybe_auth_header, &guard) .await; let maybe_bytes = match result { Ok(maybe_bytes) => maybe_bytes, |