-
-
Notifications
You must be signed in to change notification settings - Fork 769
feat(lock): add resolve_lock_info to core backends for checksum fetching #7180
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.
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
+711
−107
Merged
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
b533ed6
feat(lock): add resolve_lock_info to core backends for checksum fetching
jdx 6a4b2f2
feat(lock): add platform_variants for bun compile-time variants
jdx 925f35e
fix(node): only apply flavor setting to Linux platforms
jdx 315e484
[autofix.ci] apply automated fixes
autofix-ci[bot] 852f661
[autofix.ci] apply automated fixes (attempt 2/3)
autofix-ci[bot] 9ed8e4e
fix(lock): parse compound qualifiers and use runtime AVX2 detection
jdx 6054946
fix(node): only apply flavor setting to current platform
jdx 13b50f8
fix(bun): skip variant expansion for platforms with qualifiers
jdx 733c67f
fix(lock): expand platform variants in dry-run output
jdx File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,5 +1,7 @@ | ||||||
| use std::collections::HashMap; | ||||||
| use std::io::Write; | ||||||
| use std::path::Path; | ||||||
| use std::sync::{Arc, Mutex}; | ||||||
| use std::time::Duration; | ||||||
|
|
||||||
| use base64::Engine; | ||||||
|
|
@@ -9,6 +11,7 @@ use regex::Regex; | |||||
| use reqwest::header::{HeaderMap, HeaderValue}; | ||||||
| use reqwest::{ClientBuilder, IntoUrl, Method, Response}; | ||||||
| use std::sync::LazyLock as Lazy; | ||||||
| use tokio::sync::OnceCell; | ||||||
| use tokio_retry::Retry; | ||||||
| use tokio_retry::strategy::{ExponentialBackoff, jitter}; | ||||||
| use url::Url; | ||||||
|
|
@@ -36,6 +39,14 @@ pub static HTTP_FETCH: Lazy<Client> = Lazy::new(|| { | |||||
| .unwrap() | ||||||
| }); | ||||||
|
|
||||||
| /// In-memory cache for HTTP text responses, useful for requests that are repeated | ||||||
| /// during a single operation (e.g., fetching SHASUMS256.txt for multiple platforms). | ||||||
| /// Each URL gets its own OnceCell to ensure concurrent requests for the same URL | ||||||
| /// wait for the first fetch to complete rather than all fetching simultaneously. | ||||||
| type CachedResult = Arc<OnceCell<Result<String, String>>>; | ||||||
| static HTTP_CACHE: Lazy<Mutex<HashMap<String, CachedResult>>> = | ||||||
| Lazy::new(|| Mutex::new(HashMap::new())); | ||||||
|
|
||||||
| #[derive(Debug)] | ||||||
| pub struct Client { | ||||||
| reqwest: reqwest::Client, | ||||||
|
|
@@ -133,6 +144,39 @@ impl Client { | |||||
| Ok(text) | ||||||
| } | ||||||
|
|
||||||
| /// Like get_text but caches results in memory for the duration of the process. | ||||||
| /// Useful when the same URL will be requested multiple times (e.g., SHASUMS256.txt | ||||||
| /// when locking multiple platforms). Concurrent requests for the same URL will | ||||||
| /// wait for the first fetch to complete. | ||||||
| pub async fn get_text_cached<U: IntoUrl>(&self, url: U) -> Result<String> { | ||||||
| let url = url.into_url().unwrap(); | ||||||
| let key = url.to_string(); | ||||||
|
|
||||||
| // Get or create the OnceCell for this URL | ||||||
| let cell = { | ||||||
| let mut cache = HTTP_CACHE.lock().unwrap(); | ||||||
|
||||||
| let mut cache = HTTP_CACHE.lock().unwrap(); | |
| let mut cache = HTTP_CACHE.lock().expect("Failed to lock HTTP_CACHE mutex (possibly poisoned)"); |
Copilot
AI
Dec 4, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The HashMap uses String keys which requires cloning the URL string. Consider using Arc<str> or a reference-counted key to avoid string clones on cache hits.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -50,6 +50,13 @@ pub struct PlatformInfo { | |||||||||||
| pub url_api: Option<String>, | ||||||||||||
| } | ||||||||||||
|
|
||||||||||||
| impl PlatformInfo { | ||||||||||||
| /// Returns true if this PlatformInfo has no meaningful data (for serde skip) | ||||||||||||
| pub fn is_empty(&self) -> bool { | ||||||||||||
| self.checksum.is_none() && self.url.is_none() && self.url_api.is_none() | ||||||||||||
|
||||||||||||
| self.checksum.is_none() && self.url.is_none() && self.url_api.is_none() | |
| self.checksum.is_none() | |
| && self.size.is_none() | |
| && self.url.is_none() | |
| && self.url_api.is_none() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using
unwrap()here will panic on invalid URLs without a helpful error message. Consider using?operator to propagate the error with proper context, or provide a descriptive error message.