fix(npm): respect etag for npm packument caching #29130
Merged
Conversation
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
dsherret
changed the title
There was a problem hiding this comment.
Pull Request Overview
This PR fixes npm packument caching by respecting ETag headers. It computes an ETag for registry JSON files using a SHA256 hash (encoded in Base64) and returns a 304 Not Modified response when the “If-None-Match” header matches the computed ETag.
- Introduced ETag computation and checking in the npm registry server.
- Updated cache structures and HTTP client interfaces in the npm_cache resolvers.
- Renamed and adjusted authentication header helper functions for consistency.
Reviewed Changes
Copilot reviewed 16 out of 19 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| tests/util/server/src/servers/npm_registry.rs | Added ETag computation and response handling based on the “If-None-Match” header. |
| resolvers/npm_cache/tarball.rs | Updated FTP traits and HTTP client call to handle the new ETag logic. |
| resolvers/npm_cache/remote.rs | Renamed and simplified the auth header helper to return a raw string value. |
| resolvers/npm_cache/registry_info.rs | Introduced a new SerializedCachedPackageInfo struct with a _deno.etag property. |
| resolvers/npm_cache/lib.rs | Adjusted HTTP client response types and updated download logic to accommodate ETag. |
| cli/* | Minor adaptations to propagate the updated HTTP client and caching API changes. |
Files not reviewed (3)
- tests/specs/npm/packument_etag/test.jsonc: Language not supported
- tests/specs/npm/packument_etag/install_reload.out: Language not supported
- tests/specs/npm/packument_etag/package.json: Language not supported
bartlomieju
reviewed
May 2, 2025
Comment on lines
+323
to
+324
| // todo(dsherret): deserialize in a blocking task | ||
| serde_json::from_slice(&file_bytes) |
There was a problem hiding this comment.
Is there a reason you want to do it in a blocking task? If so, should it be done in this PR?
There was a problem hiding this comment.
Because we can parallelize it like we do elsewhere. I want to see and measure its affects in a followup pr.
bartlomieju
approved these changes
May 2, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Stores the etag in a
_deno.etagproperty on the json object of the packument.#[serde(flatten)]deno_npm#104Closes #24566