prefetch-npm-deps: use exponential backoff (fb9252fa) · Commits · nix / nixpkgs

pkgs/build-support/node/fetch-npm-deps/Cargo.lock

+136 −104

Original line number	Diff line number	Diff line
		@@ -34,6 +34,17 @@ version = "1.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

		[[package]]
		name = "backoff"
		version = "0.4.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
		dependencies = [
		"getrandom",
		"instant",
		"rand",
		]

		[[package]]
		name = "base64"
		version = "0.21.2"
		@@ -46,6 +57,12 @@ version = "1.3.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

		[[package]]
		name = "bitflags"
		version = "2.3.3"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"

		[[package]]
		name = "block-buffer"
		version = "0.10.4"
		@@ -217,7 +234,7 @@ checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
		dependencies = [
		"errno-dragonfly",
		"libc",
		"windows-sys 0.48.0",
		"windows-sys",
		]

		[[package]]
		@@ -297,11 +314,22 @@ dependencies = [
		"version_check",
		]

		[[package]]
		name = "getrandom"
		version = "0.2.10"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
		dependencies = [
		"cfg-if",
		"libc",
		"wasi",
		]

		[[package]]
		name = "hermit-abi"
		version = "0.3.1"
		version = "0.3.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
		checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"

		[[package]]
		name = "http"
		@@ -347,19 +375,18 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
		dependencies = [
		"hermit-abi",
		"libc",
		"windows-sys 0.48.0",
		"windows-sys",
		]

		[[package]]
		name = "is-terminal"
		version = "0.4.7"
		version = "0.4.8"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
		checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb"
		dependencies = [
		"hermit-abi",
		"io-lifetimes",
		"rustix",
		"windows-sys 0.48.0",
		"rustix 0.38.2",
		"windows-sys",
		]

		[[package]]
		@@ -389,9 +416,9 @@ dependencies = [

		[[package]]
		name = "itoa"
		version = "1.0.6"
		version = "1.0.8"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
		checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a"

		[[package]]
		name = "libc"
		@@ -417,6 +444,12 @@ version = "0.3.8"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"

		[[package]]
		name = "linux-raw-sys"
		version = "0.4.3"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"

		[[package]]
		name = "log"
		version = "0.4.19"
		@@ -486,18 +519,18 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"

		[[package]]
		name = "pin-project"
		version = "1.1.0"
		version = "1.1.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead"
		checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842"
		dependencies = [
		"pin-project-internal",
		]

		[[package]]
		name = "pin-project-internal"
		version = "1.1.0"
		version = "1.1.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
		checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
		dependencies = [
		"proc-macro2",
		"quote",
		@@ -506,9 +539,9 @@ dependencies = [

		[[package]]
		name = "pin-project-lite"
		version = "0.2.9"
		version = "0.2.10"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
		checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"

		[[package]]
		name = "pkg-config"
		@@ -523,20 +556,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
		dependencies = [
		"autocfg",
		"bitflags",
		"bitflags 1.3.2",
		"cfg-if",
		"concurrent-queue",
		"libc",
		"log",
		"pin-project-lite",
		"windows-sys 0.48.0",
		"windows-sys",
		]

		[[package]]
		name = "ppv-lite86"
		version = "0.2.17"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"

		[[package]]
		name = "prefetch-npm-deps"
		version = "0.1.0"
		dependencies = [
		"anyhow",
		"backoff",
		"base64",
		"digest",
		"env_logger",
		@@ -569,6 +609,36 @@ dependencies = [
		"proc-macro2",
		]

		[[package]]
		name = "rand"
		version = "0.8.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
		dependencies = [
		"libc",
		"rand_chacha",
		"rand_core",
		]

		[[package]]
		name = "rand_chacha"
		version = "0.3.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
		dependencies = [
		"ppv-lite86",
		"rand_core",
		]

		[[package]]
		name = "rand_core"
		version = "0.6.4"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
		dependencies = [
		"getrandom",
		]

		[[package]]
		name = "rayon"
		version = "1.7.0"
		@@ -597,7 +667,7 @@ version = "0.3.5"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
		dependencies = [
		"bitflags",
		"bitflags 1.3.2",
		]

		[[package]]
		@@ -619,23 +689,36 @@ checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"

		[[package]]
		name = "rustix"
		version = "0.37.20"
		version = "0.37.22"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0"
		checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c"
		dependencies = [
		"bitflags",
		"bitflags 1.3.2",
		"errno",
		"io-lifetimes",
		"libc",
		"linux-raw-sys",
		"windows-sys 0.48.0",
		"linux-raw-sys 0.3.8",
		"windows-sys",
		]

		[[package]]
		name = "rustix"
		version = "0.38.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4"
		dependencies = [
		"bitflags 2.3.3",
		"errno",
		"libc",
		"linux-raw-sys 0.4.3",
		"windows-sys",
		]

		[[package]]
		name = "ryu"
		version = "1.0.13"
		version = "1.0.14"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
		checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9"

		[[package]]
		name = "same-file"
		@@ -648,11 +731,11 @@ dependencies = [

		[[package]]
		name = "schannel"
		version = "0.1.21"
		version = "0.1.22"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
		checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
		dependencies = [
		"windows-sys 0.42.0",
		"windows-sys",
		]

		[[package]]
		@@ -663,18 +746,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"

		[[package]]
		name = "serde"
		version = "1.0.164"
		version = "1.0.166"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
		checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8"
		dependencies = [
		"serde_derive",
		]

		[[package]]
		name = "serde_derive"
		version = "1.0.164"
		version = "1.0.166"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
		checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6"
		dependencies = [
		"proc-macro2",
		"quote",
		@@ -746,9 +829,9 @@ dependencies = [

		[[package]]
		name = "syn"
		version = "2.0.22"
		version = "2.0.23"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616"
		checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"
		dependencies = [
		"proc-macro2",
		"quote",
		@@ -765,8 +848,8 @@ dependencies = [
		"cfg-if",
		"fastrand",
		"redox_syscall",
		"rustix",
		"windows-sys 0.48.0",
		"rustix 0.37.22",
		"windows-sys",
		]

		[[package]]
		@@ -850,9 +933,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"

		[[package]]
		name = "unicode-ident"
		version = "1.0.9"
		version = "1.0.10"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
		checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73"

		[[package]]
		name = "unicode-normalization"
		@@ -903,6 +986,12 @@ dependencies = [
		"winapi-util",
		]

		[[package]]
		name = "wasi"
		version = "0.11.0+wasi-snapshot-preview1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

		[[package]]
		name = "winapi"
		version = "0.3.9"
		@@ -934,21 +1023,6 @@ version = "0.4.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

		[[package]]
		name = "windows-sys"
		version = "0.42.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
		dependencies = [
		"windows_aarch64_gnullvm 0.42.2",
		"windows_aarch64_msvc 0.42.2",
		"windows_i686_gnu 0.42.2",
		"windows_i686_msvc 0.42.2",
		"windows_x86_64_gnu 0.42.2",
		"windows_x86_64_gnullvm 0.42.2",
		"windows_x86_64_msvc 0.42.2",
		]

		[[package]]
		name = "windows-sys"
		version = "0.48.0"
		@@ -964,93 +1038,51 @@ version = "0.48.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
		dependencies = [
		"windows_aarch64_gnullvm 0.48.0",
		"windows_aarch64_msvc 0.48.0",
		"windows_i686_gnu 0.48.0",
		"windows_i686_msvc 0.48.0",
		"windows_x86_64_gnu 0.48.0",
		"windows_x86_64_gnullvm 0.48.0",
		"windows_x86_64_msvc 0.48.0",
		"windows_aarch64_gnullvm",
		"windows_aarch64_msvc",
		"windows_i686_gnu",
		"windows_i686_msvc",
		"windows_x86_64_gnu",
		"windows_x86_64_gnullvm",
		"windows_x86_64_msvc",
		]

		[[package]]
		name = "windows_aarch64_gnullvm"
		version = "0.42.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"

		[[package]]
		name = "windows_aarch64_gnullvm"
		version = "0.48.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"

		[[package]]
		name = "windows_aarch64_msvc"
		version = "0.42.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"

		[[package]]
		name = "windows_aarch64_msvc"
		version = "0.48.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"

		[[package]]
		name = "windows_i686_gnu"
		version = "0.42.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"

		[[package]]
		name = "windows_i686_gnu"
		version = "0.48.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"

		[[package]]
		name = "windows_i686_msvc"
		version = "0.42.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"

		[[package]]
		name = "windows_i686_msvc"
		version = "0.48.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"

		[[package]]
		name = "windows_x86_64_gnu"
		version = "0.42.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"

		[[package]]
		name = "windows_x86_64_gnu"
		version = "0.48.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"

		[[package]]
		name = "windows_x86_64_gnullvm"
		version = "0.42.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"

		[[package]]
		name = "windows_x86_64_gnullvm"
		version = "0.48.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"

		[[package]]
		name = "windows_x86_64_msvc"
		version = "0.42.2"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"

		[[package]]
		name = "windows_x86_64_msvc"
		version = "0.48.0"

pkgs/build-support/node/fetch-npm-deps/Cargo.toml

+1 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@ edition = "2021"

		[dependencies]
		anyhow = "1.0.71"
		backoff = "0.4.0"
		base64 = "0.21.2"
		digest = "0.10.7"
		env_logger = "0.10.0"

pkgs/build-support/node/fetch-npm-deps/src/util.rs

+18 −22

Original line number	Diff line number	Diff line
		use backoff::{retry, ExponentialBackoff};
		use isahc::{
		config::{CaCertificate, Configurable, RedirectPolicy, SslOption},
		Body, Request, RequestExt,
		};
		use std::{env, path::Path, thread, time::Duration};
		use std::{env, path::Path};
		use url::Url;

		pub fn get_url(url: &Url) -> Result<Body, isahc::Error> {
		@@ -24,26 +25,21 @@ pub fn get_url(url: &Url) -> Result<Body, isahc::Error> {
		Ok(request.body(())?.send()?.into_body())
		}

		pub fn get_url_with_retry(url: &Url) -> anyhow::Result<Body> {
		// Retry up to 4 times, returning any valid result
		for _ in 0..4 {
		match get_url(url) {
		Err(err) => {
		pub fn get_url_with_retry(url: &Url) -> Result<Body, isahc::Error> {
		retry(ExponentialBackoff::default(), \|\| {
		get_url(url).map_err(\|err\| {
		if err.is_network() \|\| err.is_timeout() {
		// Retry transient errors after a few seconds
		thread::sleep(Duration::from_secs(5));
		backoff::Error::transient(err)
		} else {
		// Propagate all other errors immediately
		return Err(err.into());
		}
		}
		Ok(response) => {
		// Return valid response immediately
		return Ok(response);
		}
		}
		}

		// Retry one last time and return whatever happens
		Ok(get_url(url)?)
		backoff::Error::permanent(err)
		}
		})
		})
		.map_err(\|backoff_err\| match backoff_err {
		backoff::Error::Permanent(err)
		\| backoff::Error::Transient {
		err,
		retry_after: _,
		} => err,
		})
		}

Admin message