@pnpm/installing.package-requester 1102.0.0 → 1102.1.0

package/lib/packageRequester.js

@@ -7,7 +7,7 @@ import { PnpmError } from '@pnpm/error';
 import { pickFetcher } from '@pnpm/fetching.pick-fetcher';
 import gfs from '@pnpm/fs.graceful-fs';
 import { logger } from '@pnpm/logger';
-import { resolvePlatformSelector, selectPlatformVariant, } from '@pnpm/resolving.resolver-base';
+import { classifyResolution, resolvePlatformSelector, selectPlatformVariant, } from '@pnpm/resolving.resolver-base';
 import { normalizeBundledManifest, } from '@pnpm/store.cafs';
 import { pickStoreIndexKey } from '@pnpm/store.index';
 import { calcMaxWorkers, readPkgFromCafs as _readPkgFromCafs, } from '@pnpm/worker';
@@ -65,6 +65,8 @@ export function createPackageRequester(opts) {
         requestsQueue,
         resolve: opts.resolve,
         storeDir: opts.storeDir,
+        fetchers: opts.fetchers,
+        customFetchers: opts.customFetchers,
     });
     return Object.assign(requestPackage, {
         fetchPackageToStore,
@@ -157,9 +159,19 @@ async function resolveAndFetch(ctx, wantedDependency, options) {
                 optional: wantedDependency.optional === true,
                 supportedArchitectures: options.supportedArchitectures,
             })));
-    // We can skip fetching the package only if the manifest
-    // is present after resolution AND the content of the package has not changed
-    if ((options.skipFetch === true || isInstallable === false) && !integrityChanged && (manifest != null)) {
+    const fetcherForResolution = resolution.type === 'variations'
+        ? undefined
+        : await pickFetcher(ctx.fetchers, resolution, {
+            customFetchers: ctx.customFetchers,
+            packageId: id,
+        });
+    const resolutionNeedsFetchHook = fetcherForResolution?.resolutionNeedsFetch;
+    const resolutionNeedsFetch = typeof resolutionNeedsFetchHook === 'function'
+        ? resolutionNeedsFetchHook(resolution)
+        : false;
+    // Fetching can be skipped only when the manifest is available, the package content
+    // did not change, and the resolution does not need fetch-derived data.
+    if ((options.skipFetch === true || isInstallable === false) && !resolutionNeedsFetch && !integrityChanged && (manifest != null)) {
         return {
             body: {
                 id,
@@ -182,6 +194,8 @@ async function resolveAndFetch(ctx, wantedDependency, options) {
         allowBuild: options.allowBuild,
         fetchRawManifest: true,
         force: integrityChanged,
+        populateMissingIntegrity: resolutionNeedsFetch,
+        pickedFetcher: fetcherForResolution,
         ignoreScripts: options.ignoreScripts,
         lockfileDir: options.lockfileDir,
         pkg: {
@@ -207,11 +221,29 @@ async function resolveAndFetch(ctx, wantedDependency, options) {
                 manifest = loadedManifest;
             }
         }
-        // Add integrity to resolution if it was computed during fetching (only for TarballResolution)
-        if (fetchedResult.integrity && !resolution.type && !resolution.integrity) {
+        // Add computed integrity to tarball resolutions. `variations` spans multiple
+        // platform variants, so do not write one machine's integrity into the shared resolution.
+        if (resolution.type !== 'variations' && fetchedResult.integrity != null && getExpectedIntegrity(resolution) == null) {
             resolution.integrity = fetchedResult.integrity;
         }
     }
+    let fetching = fetchResult.fetching;
+    if (resolutionNeedsFetch) {
+        let populating;
+        fetching = () => {
+            populating ??= fetchResult.fetching().then((fetchedResult) => {
+                if (fetchedResult.integrity != null && getExpectedIntegrity(resolution) == null) {
+                    resolution.integrity = fetchedResult.integrity;
+                }
+                return fetchedResult;
+            }).catch((err) => {
+                // Cache only fulfilled fetches; rejected fetches may be retried.
+                populating = undefined;
+                throw err;
+            });
+            return populating;
+        };
+    }
     // Check installability now that we have the manifest (for git/tarball packages without registry metadata)
     if (isInstallable === undefined && manifest != null) {
         isInstallable = ctx.force === true || packageIsInstallable(id, manifest, {
@@ -237,8 +269,9 @@ async function resolveAndFetch(ctx, wantedDependency, options) {
             alias,
             policyViolation,
         },
-        fetching: fetchResult.fetching,
+        fetching,
         filesIndexFile: fetchResult.filesIndexFile,
+        resolutionNeedsFetch,
     };
 }
 function getFilesIndexFilePath(ctx, opts) {
@@ -357,7 +390,13 @@ function fetchToStore(ctx, opts) {
         try {
             const isLocalTarballDep = opts.pkg.id.startsWith('file:');
             const isLocalPkg = resolution.type === 'directory';
+            const populateMissingIntegrity = opts.populateMissingIntegrity === true;
+            if (!populateMissingIntegrity) {
+                assertFetchableResolution(opts.pkg.id, resolution);
+            }
+            let refetchingStoredPackage = false;
             if (!opts.force &&
+                !populateMissingIntegrity &&
                 (!isLocalTarballDep ||
                     await tarballIsUpToDate(opts.pkg.resolution, target, opts.lockfileDir) // eslint-disable-line
                 ) &&
@@ -373,12 +412,13 @@ function fetchToStore(ctx, opts) {
                     });
                     return;
                 }
-                if ((files?.filesMap) != null) {
-                    packageRequestLogger.warn({
-                        message: `Refetching ${target} to store. It was either modified or had no integrity checksums`,
-                        prefix: opts.lockfileDir,
-                    });
-                }
+                refetchingStoredPackage = (files?.filesMap) != null;
+            }
+            if (refetchingStoredPackage) {
+                packageRequestLogger.warn({
+                    message: `Refetching ${target} to store. It was either modified or had no integrity checksums`,
+                    prefix: opts.lockfileDir,
+                });
             }
             // We fetch into targetStage directory first and then fs.rename() it to the
             // target directory.
@@ -411,8 +451,8 @@ function fetchToStore(ctx, opts) {
                     name: opts.pkg.name,
                     version: opts.pkg.version,
                 },
-            }), { priority });
-            const integrity = opts.pkg.resolution.integrity ?? fetchedPackage.integrity;
+            }, opts.pickedFetcher), { priority });
+            const integrity = getExpectedIntegrity(opts.pkg.resolution) ?? fetchedPackage.integrity;
             if (isLocalTarballDep && integrity) {
                 await fs.mkdir(target, { recursive: true });
                 await gfs.writeFile(path.join(target, TARBALL_INTEGRITY_FILENAME), integrity, 'utf8');
@@ -436,6 +476,19 @@ function fetchToStore(ctx, opts) {
 async function readBundledManifest(pkgJsonPath) {
     return normalizeBundledManifest(await loadJsonFile(pkgJsonPath));
 }
+function getExpectedIntegrity(resolution) {
+    const integrity = resolution.integrity;
+    return typeof integrity === 'string' && integrity.length > 0
+        ? integrity
+        : undefined;
+}
+function assertFetchableResolution(depPath, resolution) {
+    if (classifyResolution(resolution) !== 'remoteTarball')
+        return;
+    if (getExpectedIntegrity(resolution) != null)
+        return;
+    throw new PnpmError('MISSING_TARBALL_INTEGRITY', `Cannot fetch package "${depPath}" from the lockfile: it has no "integrity" field, so the downloaded tarball cannot be verified. Run a fresh install to repair the lockfile.`);
+}
 async function tarballIsUpToDate(resolution, pkgInStoreLocation, lockfileDir) {
     let currentIntegrity;
     try {
@@ -455,10 +508,9 @@ async function tarballIsUpToDate(resolution, pkgInStoreLocation, lockfileDir) {
         return false;
     }
 }
-async function fetcher(fetcherByHostingType, cafs, customFetchers, packageId, resolution, opts) {
+async function fetcher(fetcherByHostingType, cafs, customFetchers, packageId, resolution, opts, pickedFetcher) {
     try {
-        // pickFetcher now handles custom fetcher hooks internally
-        const fetch = await pickFetcher(fetcherByHostingType, resolution, {
+        const fetch = pickedFetcher ?? await pickFetcher(fetcherByHostingType, resolution, {
             customFetchers,
             packageId,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/installing.package-requester",
-  "version": "1102.0.0",
+  "version": "1102.1.0",
   "description": "Concurrent downloader of npm-compatible packages",
   "keywords": [
     "pnpm",
@@ -12,9 +12,9 @@
   "funding": "https://opencollective.com/pnpm",
   "repository": {
     "type": "git",
-    "url": "https://github.com/pnpm/pnpm/tree/main/installing/package-requester"
+    "url": "https://github.com/pnpm/pnpm/tree/main/pnpm11/installing/package-requester"
   },
-  "homepage": "https://github.com/pnpm/pnpm/tree/main/installing/package-requester#readme",
+  "homepage": "https://github.com/pnpm/pnpm/tree/main/pnpm11/installing/package-requester#readme",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
@@ -38,23 +38,23 @@
     "ramda": "npm:@pnpm/ramda@0.28.1",
     "semver": "^7.8.4",
     "ssri": "13.0.1",
-    "@pnpm/config.package-is-installable": "1100.0.11",
+    "@pnpm/config.package-is-installable": "1100.0.12",
+    "@pnpm/core-loggers": "1100.2.1",
     "@pnpm/deps.path": "1100.0.8",
-    "@pnpm/error": "1100.0.0",
-    "@pnpm/fetching.pick-fetcher": "1100.0.12",
+    "@pnpm/error": "1100.0.1",
+    "@pnpm/fetching.fetcher-base": "1100.2.0",
+    "@pnpm/fetching.pick-fetcher": "1100.0.13",
     "@pnpm/fs.graceful-fs": "1100.1.0",
-    "@pnpm/fetching.fetcher-base": "1100.1.9",
-    "@pnpm/hooks.types": "1100.0.12",
-    "@pnpm/store.cafs": "1100.1.10",
-    "@pnpm/core-loggers": "1100.2.1",
-    "@pnpm/store.controller-types": "1100.1.5",
-    "@pnpm/store.index": "1100.2.0",
-    "@pnpm/types": "1101.3.2",
-    "@pnpm/resolving.resolver-base": "1100.4.2"
+    "@pnpm/hooks.types": "1100.1.0",
+    "@pnpm/resolving.resolver-base": "1100.5.0",
+    "@pnpm/store.cafs": "1100.1.11",
+    "@pnpm/store.controller-types": "1100.1.6",
+    "@pnpm/store.index": "1100.2.1",
+    "@pnpm/types": "1101.3.2"
   },
   "peerDependencies": {
     "@pnpm/logger": "^1100.0.0",
-    "@pnpm/worker": "^1100.2.0"
+    "@pnpm/worker": "^1100.2.2"
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
@@ -65,14 +65,14 @@
     "delay": "^7.0.0",
     "normalize-path": "^3.0.0",
     "tempy": "3.0.0",
-    "@pnpm/installing.client": "1100.2.8",
-    "@pnpm/logger": "1100.0.0",
+    "@pnpm/installing.client": "1100.2.10",
+    "@pnpm/installing.package-requester": "1102.1.0",
     "@pnpm/store.cafs-types": "1100.0.1",
-    "@pnpm/store.create-cafs-store": "1100.0.14",
+    "@pnpm/logger": "1100.0.0",
+    "@pnpm/store.create-cafs-store": "1100.0.16",
+    "@pnpm/testing.mock-agent": "1101.0.4",
     "@pnpm/test-fixtures": "1100.0.0",
-    "@pnpm/testing.mock-agent": "1101.0.3",
-    "@pnpm/testing.registry-mock": "1100.0.6",
-    "@pnpm/installing.package-requester": "1102.0.0"
+    "@pnpm/testing.registry-mock": "1100.0.7"
   },
   "engines": {
     "node": ">=22.13"