@vltpkg/graph 1.6.1 → 1.6.2

package/dist/ideal/append-nodes.js

@@ -1,5 +1,6 @@
 import { baseDepID, getTuple, hydrate, joinDepIDTuple, joinExtra, splitDepID, } from '@vltpkg/dep-id';
 import { error } from '@vltpkg/error-cause';
+import { trace } from '@vltpkg/output/trace';
 import { Spec } from '@vltpkg/spec';
 import { satisfies } from '@vltpkg/satisfies';
 import { parse as parseVersion } from '@vltpkg/semver';
@@ -700,6 +701,13 @@ export const appendNodes = async (packageInfo, graph, fromNode, deps, scurry, op
     // BFS MAIN LOOP: Process level by level until no more deps
     while (currentLevelDeps.length > 0) {
         const nextLevelDeps = [];
+        /* c8 ignore next */
+        const depth = currentLevelDeps[0]?.depth ?? 0;
+        trace('build:level', {
+            from: fromNode.id,
+            depth,
+            entries: currentLevelDeps.length,
+        });
         // ============================================================
         // PHASE A: PARALLEL FETCH (READ-ONLY)
         // ============================================================
@@ -721,6 +729,7 @@ export const appendNodes = async (packageInfo, graph, fromNode, deps, scurry, op
                 result,
             };
         }));
+        trace('build:level:fetched', { from: fromNode.id, depth });
         // ============================================================
         // PHASE B: SERIAL MUTATIONS (DETERMINISTIC ORDER)
         // ============================================================
@@ -776,6 +785,11 @@ export const appendNodes = async (packageInfo, graph, fromNode, deps, scurry, op
                 nextLevelDeps.push({ ...childDep, depth: nextDepth });
             }
         }
+        trace('build:level:placed', {
+            from: fromNode.id,
+            depth,
+            next: nextLevelDeps.length,
+        });
         // Advance to next BFS level
         currentLevelDeps = nextLevelDeps;
     }

package/dist/ideal/refresh-ideal-graph.js

@@ -1,4 +1,5 @@
 import { appendNodes } from "./append-nodes.js";
+import { mark } from '@vltpkg/output/trace';
 import { compareByHasPeerDeps, getNodeOrderedDependencies, } from "./sorting.js";
 import { baseDepID } from '@vltpkg/dep-id';
 /**
@@ -122,6 +123,7 @@ export const refreshIdealGraph = async ({ add, graph, modifiers, packageInfo, sc
     }
     // Wait for all extraction promises to complete
     if (extractPromises?.length) {
+        mark('build:extract-wait', { jobs: extractPromises.length });
         await Promise.all(extractPromises);
     }
 };

package/dist/reify/index.js

@@ -1,4 +1,5 @@
 import { graphStep } from '@vltpkg/output';
+import { mark } from '@vltpkg/output/trace';
 import { availableParallelism } from 'node:os';
 import { callLimit } from 'promise-call-limit';
 import { load as loadActual } from "../actual/load.js";
@@ -18,6 +19,12 @@ import { updatePackageJson } from "./update-importers-package-json.js";
 import { copyFileSync } from 'node:fs';
 import { binChmodAll } from "./bin-chmod.js";
 import { filterNodesByQuery } from "../filter-nodes-by-query.js";
+// How many extractions reify has in flight at once. An extraction is a
+// download followed by an unpack, so this also bounds the downloaded
+// tarballs held in memory. Raising it to 64 to match the registry
+// client's connection floor was measured slower on 4 vCPUs (svelte -9%,
+// next -4% from a lockfile with the cap at 24): more downloads in flight
+// only lengthen the queue in front of the unpack workers.
 const limit = Math.max(availableParallelism() - 1, 1) * 8;
 /**
  * Make the current project match the supplied graph.
@@ -101,6 +108,10 @@ export const reify = async (options) => {
         res.buildQueue = buildQueue;
     }
     finally {
+        // Free the placement worker threads now that placement is done. A
+        // failure here must not hide the install's own error or skip the
+        // rollback below.
+        await options.packageInfo.closeTarPool().catch(() => { });
         /* c8 ignore start */
         if (!success) {
             await rollback(remover, diff, scurry).catch(() => { });
@@ -121,18 +132,27 @@ const reify_ = async (options, diff, remover, saveImportersPackageJson) => {
     // unsupported optional deps are dropped only after that, so the
     // lockfile keeps them for other platforms
     pruneUnsupportedOptional(diff);
+    // start the unpack workers now that the set of packages to place is
+    // final (the pruned optionals would otherwise inflate it past the
+    // pool's minimum), so they boot while the first packages are fetched
+    // rather than on the critical path of the first unpack. It never
+    // rejects, so there is nothing to await.
+    void packageInfo.warmTarPool(diff.nodes.add);
     const actions = addNodes(diff, scurry, remover, options, packageInfo).concat(deleteEdges(diff, scurry, remover));
     // need to wait, so that the nodes exist to link to
+    mark('reify:extract', { jobs: actions.length, limit });
     if (actions.length)
         await callLimit(actions, { limit });
     // create all node_modules symlinks, and link bins to nm/.bin
     const edgeActions = addEdges(diff, scurry, remover);
+    mark('reify:edges', { jobs: edgeActions.length });
     if (edgeActions.length)
         await callLimit(edgeActions, { limit });
     // link bins that deleted edges removed but other deps still declare
     const binActions = relinkBins(diff, scurry, remover);
     if (binActions.length)
         await callLimit(binActions, { limit });
+    mark('reify:hoist');
     await internalHoist(diff.to, options, remover);
     // looks up all nodes setting buildState = 'needed'
     // on nodes that require building
@@ -140,8 +160,10 @@ const reify_ = async (options, diff, remover, saveImportersPackageJson) => {
     // Filter nodes allowed to run scripts if allowScripts query is provided
     const allowScriptsNodes = await filterNodesByQuery(diff.to, allowScripts);
     // ensure that all added bins are chmod +x
+    mark('reify:chmod');
     await binChmodAll(diff.nodes.add, scurry);
     // run install lifecycle scripts and link any binary files
+    mark('reify:scripts');
     await build(diff, packageJson, scurry, allowScriptsNodes);
     // set the buildQueue on the result object containing
     // an array with all the ids of nodes that need building
@@ -159,9 +181,11 @@ const reify_ = async (options, diff, remover, saveImportersPackageJson) => {
         }
     }
     /* c8 ignore stop */
+    mark('reify:lockfile');
     saveHidden(options);
     // delete garbage from the store.
     const rmActions = deleteNodes(diff, remover, scurry, options.keepNodes);
+    mark('reify:delete', { jobs: rmActions.length });
     if (rmActions.length)
         await Promise.all(rmActions);
     // updates package.json files if anything was added / removed

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vltpkg/graph",
   "description": "A library that helps understanding & expressing what happens on an install",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vltpkg/vltpkg.git",
@@ -13,26 +13,26 @@
     "url": "http://vlt.sh"
   },
   "dependencies": {
-    "@vltpkg/cmd-shim": "1.6.1",
-    "@vltpkg/dep-id": "1.6.1",
-    "@vltpkg/dss-breadcrumb": "1.6.1",
-    "@vltpkg/error-cause": "1.6.1",
-    "@vltpkg/fast-split": "1.6.1",
-    "@vltpkg/graph-run": "1.6.1",
-    "@vltpkg/init": "1.6.1",
-    "@vltpkg/output": "1.6.1",
-    "@vltpkg/package-info": "1.6.1",
-    "@vltpkg/package-json": "1.6.1",
-    "@vltpkg/pick-manifest": "1.6.1",
-    "@vltpkg/query": "1.6.1",
-    "@vltpkg/rollback-remove": "1.6.1",
-    "@vltpkg/run": "1.6.1",
-    "@vltpkg/satisfies": "1.6.1",
-    "@vltpkg/security-archive": "1.6.1",
-    "@vltpkg/spec": "1.6.1",
-    "@vltpkg/types": "1.6.1",
-    "@vltpkg/vlt-json": "1.6.1",
-    "@vltpkg/workspaces": "1.6.1",
+    "@vltpkg/cmd-shim": "1.6.2",
+    "@vltpkg/dep-id": "1.6.2",
+    "@vltpkg/dss-breadcrumb": "1.6.2",
+    "@vltpkg/error-cause": "1.6.2",
+    "@vltpkg/fast-split": "1.6.2",
+    "@vltpkg/graph-run": "1.6.2",
+    "@vltpkg/init": "1.6.2",
+    "@vltpkg/output": "1.6.2",
+    "@vltpkg/package-info": "1.6.2",
+    "@vltpkg/package-json": "1.6.2",
+    "@vltpkg/pick-manifest": "1.6.2",
+    "@vltpkg/query": "1.6.2",
+    "@vltpkg/rollback-remove": "1.6.2",
+    "@vltpkg/run": "1.6.2",
+    "@vltpkg/satisfies": "1.6.2",
+    "@vltpkg/security-archive": "1.6.2",
+    "@vltpkg/spec": "1.6.2",
+    "@vltpkg/types": "1.6.2",
+    "@vltpkg/vlt-json": "1.6.2",
+    "@vltpkg/workspaces": "1.6.2",
     "path-scurry": "^2.0.1",
     "promise-call-limit": "^3.0.2"
   },