@pnpm/fetching.tarball-fetcher 1101.0.2 → 1101.0.4

package/lib/remoteTarballFetcher.js

@@ -69,6 +69,10 @@ export function createDownloader(fetchFromRegistry, gotOpts) {
             try {
                 const res = await fetchFromRegistry(url, {
                     authHeaderValue,
+                    // Tarballs are already compressed; ask the server not to apply an additional
+                    // Content-Encoding so Content-Length matches the body we receive and we don't
+                    // waste CPU on round-trip re-compression. See https://github.com/pnpm/pnpm/issues/11506
+                    headers: { 'accept-encoding': 'identity' },
                     // The fetch library can retry requests on bad HTTP responses.
                     // However, it is not enough to retry on bad HTTP responses only.
                     // Requests should also be retried when the tarball's integrity check fails.
@@ -80,7 +84,11 @@ export function createDownloader(fetchFromRegistry, gotOpts) {
                 if (res.status !== 200) {
                     throw new FetchError({ url, authHeaderValue }, res);
                 }
-                const contentLength = res.headers.has('content-length') && res.headers.get('content-length');
+                // When Content-Encoding is present, Content-Length refers to the encoded form
+                // of the data, not the decoded bytes that the fetch implementation yields.
+                // See: https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/Content-Encoding
+                const isEncoded = isContentEncoded(res.headers.get('content-encoding'));
+                const contentLength = !isEncoded && res.headers.has('content-length') && res.headers.get('content-length');
                 const parsedLength = typeof contentLength === 'string' ? parseInt(contentLength, 10) : NaN;
                 const size = Number.isFinite(parsedLength) && parsedLength >= 0 ? parsedLength : null;
                 if (opts.onStart != null) {
@@ -162,4 +170,15 @@ export function createDownloader(fetchFromRegistry, gotOpts) {
         }
     };
 }
+// Per RFC 9110 §8.4, Content-Encoding is a comma-separated list of codings.
+// The response is encoded unless every coding is `identity` (case-insensitive,
+// surrounding whitespace ignored).
+function isContentEncoded(header) {
+    if (header == null)
+        return false;
+    return header
+        .split(',')
+        .map(coding => coding.trim().toLowerCase())
+        .some(coding => coding !== '' && coding !== 'identity');
+}
 //# sourceMappingURL=remoteTarballFetcher.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/fetching.tarball-fetcher",
-  "version": "1101.0.2",
+  "version": "1101.0.4",
   "description": "Fetcher for packages hosted as tarballs",
   "keywords": [
     "pnpm",
@@ -30,19 +30,19 @@
     "lodash.throttle": "4.1.1",
     "p-map-values": "^0.1.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
-    "@pnpm/error": "1100.0.0",
     "@pnpm/core-loggers": "1100.0.1",
-    "@pnpm/fs.graceful-fs": "1100.1.0",
+    "@pnpm/exec.prepare-package": "1100.0.7",
+    "@pnpm/error": "1100.0.0",
     "@pnpm/fetching.types": "1100.0.1",
-    "@pnpm/fs.packlist": "1100.0.0",
-    "@pnpm/store.index": "1100.0.0",
+    "@pnpm/fs.packlist": "1100.0.1",
+    "@pnpm/store.index": "1100.1.0",
+    "@pnpm/fs.graceful-fs": "1100.1.0",
     "@pnpm/types": "1101.0.0",
-    "@pnpm/exec.prepare-package": "1100.0.6",
     "@pnpm/fetching.fetcher-base": "1100.1.2"
   },
   "peerDependencies": {
     "@pnpm/logger": "^1001.0.1",
-    "@pnpm/worker": "^1100.1.2"
+    "@pnpm/worker": "^1100.1.3"
   },
   "devDependencies": {
     "@jest/globals": "30.3.0",
@@ -54,13 +54,13 @@
     "ssri": "13.0.1",
     "tempy": "3.0.0",
     "undici": "^7.25.0",
-    "@pnpm/logger": "1100.0.0",
+    "@pnpm/fetching.tarball-fetcher": "1101.0.4",
     "@pnpm/network.fetch": "1100.0.2",
+    "@pnpm/logger": "1100.0.0",
     "@pnpm/store.cafs-types": "1100.0.1",
-    "@pnpm/store.create-cafs-store": "1100.0.5",
-    "@pnpm/test-fixtures": "1100.0.0",
     "@pnpm/types": "1101.0.0",
-    "@pnpm/fetching.tarball-fetcher": "1101.0.2"
+    "@pnpm/test-fixtures": "1100.0.0",
+    "@pnpm/store.create-cafs-store": "1100.0.5"
   },
   "engines": {
     "node": ">=22.13"