@pnpm/fetching.tarball-fetcher 1102.1.4 → 1102.1.6

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @pnpm/tarball-fetcher
 
+## 1102.1.6
+
+### Patch Changes
+
+- Updated dependencies:
+  - @pnpm/exec.prepare-package@1100.0.40
+  - @pnpm/network.fetch@1100.1.20
+  - @pnpm/store.index@1101.0.0
+
+## 1102.1.5
+
+### Patch Changes
+
+- A tarball whose integrity pnpm computed during download is now found in the store on the next install. Before, that install downloaded the tarball again once the lockfile recorded the integrity [#12562](https://github.com/pnpm/pnpm/issues/12562).
+
+- Local tarball dependencies using the file protocol are no longer counted as downloaded in the progress banner [pnpm/pnpm#1103](https://github.com/pnpm/pnpm/issues/1103).
+
+- `pnpm install` now works in StackBlitz WebContainers on projects without a lockfile. It used to fail there with `ENOENT ... pnpm-lock.yaml`, because pnpm did not recognize the errors that WebContainers return from asynchronous file system calls [#15649](https://github.com/pnpm/pnpm/issues/15649).
+
+- Updated dependencies:
+  - @pnpm/error@1100.2.1
+  - @pnpm/exec.prepare-package@1100.0.39
+  - @pnpm/fetching.fetcher-base@1100.2.12
+  - @pnpm/fs.graceful-fs@1100.2.4
+  - @pnpm/fs.packlist@1100.0.6
+  - @pnpm/network.fetch@1100.1.19
+  - @pnpm/store.index@1100.3.3
+
 ## 1102.1.4
 
 ### Patch Changes

package/lib/gitHostedTarballFetcher.js

@@ -1,5 +1,5 @@
 import assert from 'node:assert';
-import util from 'node:util';
+import { isError } from '@pnpm/error';
 import { preparePackage } from '@pnpm/exec.prepare-package';
 import { packlist } from '@pnpm/fs.packlist';
 import { globalWarn } from '@pnpm/logger';
@@ -11,6 +11,8 @@ export function createGitHostedTarballFetcher(fetchRemoteTarball, fetcherOpts) {
         const { filesMap, manifest, requiresBuild, integrity } = await fetchRemoteTarball(cafs, resolution, {
             ...opts,
             filesIndexFile: rawFilesIndexFile,
+            // The raw archive is not the prepared package, so it must not be indexed under the package's integrity key.
+            pkgResolutionId: undefined,
         });
         // Flush any queued store index writes so that the raw files index entry
         // written during tarball extraction is visible to subsequent reads.
@@ -33,7 +35,7 @@ export function createGitHostedTarballFetcher(fetchRemoteTarball, fetcherOpts) {
             };
         }
         catch (err) {
-            assert(util.types.isNativeError(err));
+            assert(isError(err));
             err.message = `Failed to prepare git-hosted package fetched from "${resolution.tarball}": ${err.message}`;
             throw err;
         }

package/lib/index.js

@@ -46,6 +46,7 @@ async function fetchFromTarball(ctx, cafs, resolution, opts) {
         registry: resolution.registry,
         filesIndexFile: opts.filesIndexFile,
         pkg: opts.pkg,
+        pkgId: opts.pkgResolutionId,
         redirect: resolution.revision == null ? undefined : 'manual',
         retry: resolution.revision == null ? undefined : { retries: 0 },
         appendManifest: opts.appendManifest,

package/lib/localTarballFetcher.js

@@ -3,10 +3,10 @@ import gfs from '@pnpm/fs.graceful-fs';
 import { addFilesFromTarball } from '@pnpm/worker';
 const isAbsolutePath = /^\/|^[A-Z]:/i;
 export function createLocalTarballFetcher(storeIndex) {
-    const fetch = (cafs, resolution, opts) => {
+    const fetch = async (cafs, resolution, opts) => {
         const tarball = resolvePath(opts.lockfileDir, resolution.tarball.slice(5));
         const buffer = gfs.readFileSync(tarball);
-        return addFilesFromTarball({
+        const result = await addFilesFromTarball({
             storeDir: cafs.storeDir,
             storeIndex,
             buffer,
@@ -18,6 +18,7 @@ export function createLocalTarballFetcher(storeIndex) {
             appendManifest: opts.appendManifest,
             ignoreFilePattern: opts.ignoreFilePattern,
         });
+        return { ...result, local: true };
     };
     return fetch;
 }

package/lib/remoteTarballFetcher.d.ts

@@ -17,6 +17,7 @@ export type DownloadOptions = {
     retry?: Pick<RetryTimeoutOptions, 'retries'>;
     storeIndex: StoreIndex;
     pkg?: FetchOptions['pkg'];
+    pkgId?: string;
 } & Pick<FetchOptions, 'appendManifest' | 'readManifest' | 'filesIndexFile' | 'ignoreFilePattern'>;
 export type DownloadFunction = (url: string, opts: DownloadOptions) => Promise<FetchResult>;
 export interface NpmRegistryClient {

package/lib/remoteTarballFetcher.js

@@ -1,7 +1,6 @@
 import { isIP } from 'node:net';
-import util from 'node:util';
 import { requestRetryLogger } from '@pnpm/core-loggers';
-import { FetchError, FetchTimeoutError, isFetchTimeoutError, redactUrlForDisplay } from '@pnpm/error';
+import { FetchError, FetchTimeoutError, isError, isFetchTimeoutError, redactUrlForDisplay } from '@pnpm/error';
 import { globalWarn } from '@pnpm/logger';
 import { isNonRetryableError } from '@pnpm/network.fetch';
 import { addFilesFromTarball } from '@pnpm/worker';
@@ -28,10 +27,12 @@ export function createDownloader(fetchFromRegistry, gotOpts) {
                     resolve(await fetch(attempt));
                 }
                 catch (error) { // eslint-disable-line
-                    if ((opts.redirect === 'manual' && error.response?.status >= 300 && error.response.status < 400) ||
-                        error.response?.status === 401 ||
-                        error.response?.status === 403 ||
-                        error.response?.status === 404 ||
+                    const status = error.response?.status;
+                    const isManualRedirect = opts.redirect === 'manual' && status >= 300 && status < 400;
+                    if (isManualRedirect ||
+                        status === 401 ||
+                        status === 403 ||
+                        status === 404 ||
                         error.code === 'ERR_PNPM_PREPARE_PKG_FAILURE' ||
                         isNonRetryableError(error)) {
                         reject(error);
@@ -110,8 +111,8 @@ export function createDownloader(fetchFromRegistry, gotOpts) {
                     // Known size: pre-allocate and copy directly (avoids intermediate array + second copy pass)
                     data = Buffer.from(new SharedArrayBuffer(size));
                     for await (const chunk of res.body) {
-                        const c = chunk;
-                        const nextDownloaded = downloaded + c.byteLength;
+                        const bytes = chunk;
+                        const nextDownloaded = downloaded + bytes.byteLength;
                         if (nextDownloaded > size) {
                             throw new BadTarballError({
                                 expectedSize: size,
@@ -119,7 +120,7 @@ export function createDownloader(fetchFromRegistry, gotOpts) {
                                 tarballUrl: url,
                             });
                         }
-                        data.set(c, downloaded);
+                        data.set(bytes, downloaded);
                         downloaded = nextDownloaded;
                         onProgress?.(downloaded);
                     }
@@ -134,9 +135,9 @@ export function createDownloader(fetchFromRegistry, gotOpts) {
                 else {
                     const chunks = [];
                     for await (const chunk of res.body) {
-                        const c = chunk;
-                        chunks.push(c);
-                        downloaded += c.byteLength;
+                        const bytes = chunk;
+                        chunks.push(bytes);
+                        downloaded += bytes.byteLength;
                         onProgress?.(downloaded);
                     }
                     data = Buffer.from(new SharedArrayBuffer(downloaded));
@@ -156,7 +157,7 @@ export function createDownloader(fetchFromRegistry, gotOpts) {
             catch (err) {
                 const error = isFetchTimeoutError(err)
                     ? new FetchTimeoutError('FETCH_TIMEOUT', url, gotOpts.timeout, { cause: err })
-                    : util.types.isNativeError(err) ? err : new Error(String(err), { cause: err });
+                    : isError(err) ? err : new Error(String(err), { cause: err });
                 Object.assign(error, {
                     attempts: currentAttempt,
                     resource: url,
@@ -170,6 +171,7 @@ export function createDownloader(fetchFromRegistry, gotOpts) {
                 readManifest: opts.readManifest,
                 integrity: opts.integrity,
                 filesIndexFile: opts.filesIndexFile,
+                pkgId: opts.pkgId,
                 url,
                 pkg: opts.pkg,
                 appendManifest: opts.appendManifest,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/fetching.tarball-fetcher",
-  "version": "1102.1.4",
+  "version": "1102.1.6",
   "description": "Fetcher for packages hosted as tarballs",
   "keywords": [
     "pnpm",
@@ -30,14 +30,14 @@
   ],
   "dependencies": {
     "@pnpm/core-loggers": "1101.0.1",
-    "@pnpm/error": "1100.2.0",
-    "@pnpm/exec.prepare-package": "1100.0.38",
-    "@pnpm/fetching.fetcher-base": "1100.2.11",
+    "@pnpm/error": "1100.2.1",
+    "@pnpm/exec.prepare-package": "1100.0.40",
+    "@pnpm/fetching.fetcher-base": "1100.2.12",
     "@pnpm/fetching.types": "1100.0.3",
-    "@pnpm/fs.graceful-fs": "1100.2.3",
-    "@pnpm/fs.packlist": "1100.0.5",
-    "@pnpm/network.fetch": "1100.1.18",
-    "@pnpm/store.index": "1100.3.2",
+    "@pnpm/fs.graceful-fs": "1100.2.4",
+    "@pnpm/fs.packlist": "1100.0.6",
+    "@pnpm/network.fetch": "1100.1.20",
+    "@pnpm/store.index": "1101.0.0",
     "@pnpm/types": "1102.1.1",
     "@zkochan/retry": "^0.2.0",
     "lodash.throttle": "4.1.1",
@@ -45,14 +45,14 @@
   },
   "peerDependencies": {
     "@pnpm/logger": "^1100.0.0",
-    "@pnpm/worker": "^1100.4.4"
+    "@pnpm/worker": "^1100.4.6"
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
-    "@pnpm/fetching.tarball-fetcher": "1102.1.4",
+    "@pnpm/fetching.tarball-fetcher": "1102.1.6",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/store.cafs-types": "1100.1.0",
-    "@pnpm/store.create-cafs-store": "1100.0.31",
+    "@pnpm/store.cafs-types": "1100.1.1",
+    "@pnpm/store.create-cafs-store": "1100.0.32",
     "@pnpm/test-fixtures": "1100.0.1",
     "@pnpm/text.ordinal-comparator": "1100.0.0",
     "@pnpm/types": "1102.1.1",
@@ -62,7 +62,7 @@
     "@types/ssri": "^7.1.5",
     "ssri": "13.0.1",
     "tempy": "3.0.0",
-    "undici": "^7.29.0"
+    "undici": "^7.29.1"
   },
   "engines": {
     "node": ">=22.13"