vlt 1.6.0 → 1.6.2

package/{chunk-LCLRP64K.js → chunk-3UDBYFAH.js}

@@ -17,11 +17,11 @@ import {
   pickManifest,
   resolve,
   revs
-} from "./chunk-EMTGRCSE.js";
+} from "./chunk-GJMDZJPJ.js";
 import {
   Monorepo,
   PackageJson
-} from "./chunk-TQQO2F56.js";
+} from "./chunk-6ISFYONV.js";
 import {
   Spec
 } from "./chunk-6D3QAFNZ.js";
@@ -32,10 +32,16 @@ import {
 } from "./chunk-4GMNWW4C.js";
 import {
   logRequest
-} from "./chunk-B6RIGNEO.js";
+} from "./chunk-ZESNN24A.js";
 import {
   XDG
 } from "./chunk-XNLSTHDK.js";
+import {
+  storeIndexPath
+} from "./chunk-24DWRCPS.js";
+import {
+  span
+} from "./chunk-6ETYWCJN.js";
 import {
   asPackument,
   brotliTarballUrl,
@@ -107,6 +113,7 @@ var parseRecord = (l) => {
 
 // ../../src/package-info/src/index.ts
 import { createHash, randomBytes } from "node:crypto";
+import { lstatSync } from "node:fs";
 import {
   mkdir,
   readFile,
@@ -338,7 +345,7 @@ var PackageInfoClient = class {
   }
   async getRegistryClient() {
     if (this.#registryClient) return this.#registryClient;
-    this.#registryClientPromise ??= import("./src-QO5G2S4O.js").then(({ RegistryClient }) => {
+    this.#registryClientPromise ??= import("./src-REZNPR2X.js").then(({ RegistryClient }) => {
       this.#registryClient = new RegistryClient(this.options);
       return this.#registryClient;
     });
@@ -377,7 +384,7 @@ var PackageInfoClient = class {
   }
   async getTarPool() {
     if (this.#tarPool) return this.#tarPool;
-    this.#tarPoolPromise ??= import("./src-W2VQULRG.js").then(
+    this.#tarPoolPromise ??= import("./src-GY57R4DK.js").then(
       ({ Pool }) => {
         this.#tarPool = new Pool();
         return this.#tarPool;
@@ -385,6 +392,44 @@ var PackageInfoClient = class {
     );
     return this.#tarPoolPromise;
   }
+  /**
+   * Terminate the tar pool's placement worker threads, if any were
+   * started. Reify calls this once placement is done; it is a no-op when
+   * the pool was never created or ran inline.
+   */
+  async closeTarPool() {
+    await this.#tarPoolPromise;
+    await this.#tarPool?.close();
+  }
+  /**
+   * Start the tar pool's unpack workers for an install about to place
+   * `nodes`, so they boot while the first packages are fetched instead
+   * of on the critical path of the first unpack. Only the nodes the
+   * global store does not already hold count: a store hit is linked on
+   * the main thread, so a warm install of all hits starts no worker.
+   * Best effort and never rejects: if the pool cannot start, unpacking
+   * just runs inline, and a real failure resurfaces at the first
+   * extract.
+   */
+  async warmTarPool(nodes) {
+    try {
+      const storeOn = this.#storeLinker !== "unpack";
+      let jobs = 0;
+      for (const { integrity } of nodes) {
+        const hex = storeOn ? integrityHex(integrity) : void 0;
+        if (hex && lstatSync(
+          storeIndexPath(pathResolve(this.#storeRoot, hex)),
+          { throwIfNoEntry: false }
+        )) {
+          continue;
+        }
+        jobs++;
+      }
+      if (!jobs) return;
+      await (await this.getTarPool()).warm(jobs);
+    } catch {
+    }
+  }
   /**
    * A version's Brotli (`.tar.br`) alternate: its absolute URL, plus its
    * hash if the registry sent one. Returns undefined if the version has no
@@ -417,6 +462,15 @@ var PackageInfoClient = class {
     this.#storeLinker = linker && storeLinkers.has(linker) ? linker : "unpack";
   }
   async extract(spec, target, options = {}) {
+    const extractSpan = {};
+    try {
+      return await this.#extract(spec, target, options, extractSpan);
+    } catch (er) {
+      extractSpan.end?.({ how: "error" });
+      throw er;
+    }
+  }
+  async #extract(spec, target, options, extractSpan) {
     if (typeof spec === "string")
       spec = Spec.parse(spec, this.options);
     const {
@@ -426,13 +480,19 @@ var PackageInfoClient = class {
       fromLockfile = false
     } = options;
     const f = spec.final;
-    const brotli = !!resolved && tarballFormat(resolved) === "brotli";
-    const r = resolved && (integrity || brotli) ? {
-      resolved,
+    const url = f.type === "git" && f.remoteURL && resolved && !/^https?:\/\//.test(resolved) ? f.remoteURL : resolved;
+    const brotli = !!url && tarballFormat(url) === "brotli";
+    const r = url && (integrity || brotli) ? {
+      resolved: url,
       integrity,
       spec,
       ...brotli && !integrity ? { digestRequired: true } : {}
     } : await this.resolve(spec, options);
+    const end = span("extract", {
+      spec: String(spec),
+      url: r.resolved
+    });
+    extractSpan.end = end;
     switch (f.type) {
       case "git": {
         const {
@@ -462,6 +522,7 @@ var PackageInfoClient = class {
             await clone(gitRemote, gitCommittish, target, { spec });
             void rm2(target + "/.git", { recursive: true });
           }
+          end({ how: "git" });
           return r;
         }
       }
@@ -471,11 +532,10 @@ var PackageInfoClient = class {
         const storeOn = f.type === "registry" && this.#storeLinker !== "unpack";
         const copy = this.#storeLinker === "copy";
         const clone2 = this.#storeLinker === "clone";
-        const hex = !storeOn ? void 0 : r.integrity ? integrityHex(r.integrity) : integrityHex(
-          (await this.getRegistryClient()).cachedIntegrity(
-            r.resolved
-          )
-        );
+        const cachedIntegrity = storeOn && !r.integrity ? (await this.getRegistryClient()).cachedIntegrity(
+          r.resolved
+        ) : void 0;
+        const hex = !storeOn ? void 0 : r.integrity ? integrityHex(r.integrity) : integrityHex(cachedIntegrity);
         if (hex) {
           if (debug.enabled && !this.#storeHitRateLogged) {
             this.#storeHitRateLogged = true;
@@ -490,6 +550,8 @@ var PackageInfoClient = class {
             const { how, index } = linked;
             this.#storeHits[how]++;
             logRequest(r.resolved, how === "copy" ? "cache" : "store");
+            r.integrity ??= cachedIntegrity;
+            end({ how });
             return {
               ...r,
               manifest: index.manifest,
@@ -500,17 +562,23 @@ var PackageInfoClient = class {
           this.#storeMisses++;
         }
         const rc = await this.getRegistryClient();
-        const cached = rc.cachedBody(r.resolved, {
+        const cached = rc.cachedTarball(r.resolved, {
           integrity: r.integrity
         });
         if (cached) {
           try {
-            await pool.unpack(cached.body, target, format);
+            const unpacked = span("tarball:unpack", {
+              url: r.resolved,
+              bytes: cached.bytes
+            });
+            await pool.unpackCacheEntry(cached.path, target, format);
+            unpacked();
             logRequest(r.resolved, "cache");
             r.integrity ??= cached.integrity;
             if (storeOn || cached.gzip) {
               rc.queueForStore(cached.key, r.integrity);
             }
+            end({ how: "cache" });
             return r;
           } catch (er) {
             debug(
@@ -522,12 +590,17 @@ var PackageInfoClient = class {
         }
         const fetchTarball = async (useCache) => {
           const trustIntegrity = this.#trustedIntegrities.get(r.resolved) === r.integrity;
+          const fetched = span("tarball:fetch", { url: r.resolved });
           const response = await (await this.getRegistryClient()).request(r.resolved, {
             integrity: r.integrity,
             trustIntegrity,
             verifyDigest: r.digestRequired ? "required" : true,
             ...useCache === false ? { useCache } : {}
           });
+          fetched({
+            status: response.statusCode,
+            fromCache: response.fromCache
+          });
           if (response.statusCode !== 200) {
             throw this.#resolveError(
               spec,
@@ -580,7 +653,12 @@ var PackageInfoClient = class {
           }
         }
         try {
+          const unpacked = span("tarball:unpack", {
+            url: r.resolved,
+            bytes: buf.length
+          });
           await pool.unpack(buf, target, format);
+          unpacked();
         } catch (er) {
           throw this.#resolveError(
             spec,
@@ -589,11 +667,12 @@ var PackageInfoClient = class {
             { cause: er }
           );
         }
+        end({ how: "fetch", bytes: buf.length });
         return r;
       }
       case "remote": {
         const rc = await this.getRegistryClient();
-        const { CacheEntry: Entry, cacheKey } = await import("./src-QO5G2S4O.js");
+        const { CacheEntry: Entry, cacheKey } = await import("./src-REZNPR2X.js");
         const key = cacheKey("GET", new URL(r.resolved));
         const unzipped = (entry) => {
           try {
@@ -667,6 +746,7 @@ var PackageInfoClient = class {
             { cause: er }
           );
         }
+        end({ how: "remote", bytes: buf.length });
         return r;
       }
       case "file": {
@@ -696,12 +776,14 @@ var PackageInfoClient = class {
             "file: specifier does not resolve to directory or tarball"
           );
         }
+        end({ how: "file" });
         return r;
       }
       case "workspace": {
         const ws = this.#getWS(spec, options);
         const rel = relative(dirname(target), ws.fullpath);
         await symlink(rel, target, "dir");
+        end({ how: "workspace" });
         return r;
       }
     }
@@ -1091,6 +1173,12 @@ var PackageInfoClient = class {
     return this.#resolvedManifests.size;
   }
   async manifest(spec, options = {}) {
+    const end = span("manifest", { spec: String(spec) });
+    const mani = await this.#manifest(spec, options);
+    end();
+    return mani;
+  }
+  async #manifest(spec, options) {
     const { from = this.#projectRoot } = options;
     if (typeof spec === "string")
       spec = Spec.parse(spec, this.options);

package/{chunk-36UIE654.js → chunk-6BD4RCTR.js}

@@ -51,25 +51,25 @@ import {
   shouldInstallDepType,
   symlinkSyncMkdirp,
   unshare
-} from "./chunk-F5LZMLAQ.js";
+} from "./chunk-TQBSL35R.js";
 import {
   SecurityArchive,
   usesNpmRegistry
-} from "./chunk-YTDABXPD.js";
+} from "./chunk-JASG7RHB.js";
 import {
   RollbackRemove,
   cmdShimIfExists,
   readCmdShimIfExists
-} from "./chunk-JV5XR5JQ.js";
+} from "./chunk-MCQTGFJY.js";
 import {
   detectLibc,
   getUser,
   platformCheck
-} from "./chunk-EMTGRCSE.js";
+} from "./chunk-GJMDZJPJ.js";
 import {
   Monorepo,
   PackageJson
-} from "./chunk-TQQO2F56.js";
+} from "./chunk-6ISFYONV.js";
 import {
   baseDepID,
   getTuple,
@@ -88,16 +88,20 @@ import {
 } from "./chunk-HTOTG4TS.js";
 import {
   userAgent
-} from "./chunk-GEQFMH5M.js";
+} from "./chunk-HHSPE2DS.js";
 import {
   promiseSpawn
 } from "./chunk-SUU2WETN.js";
 import {
   graphStep
-} from "./chunk-B6RIGNEO.js";
+} from "./chunk-ZESNN24A.js";
 import {
   XDG
 } from "./chunk-XNLSTHDK.js";
+import {
+  mark,
+  trace
+} from "./chunk-6ETYWCJN.js";
 import {
   Spec,
   Version,
@@ -2750,9 +2754,9 @@ var ensureNpmignore = (cwd) => {
 var init = async ({
   cwd = process.cwd(),
   author,
-  logger = stderr
+  logger = stderr,
+  packageJson = new PackageJson()
 } = {}) => {
-  const packageJson = new PackageJson();
   const path = resolve2(cwd, "package.json");
   let existingData;
   try {
@@ -4670,6 +4674,12 @@ var appendNodes = async (packageInfo, graph, fromNode, deps, scurry, options, se
   ];
   while (currentLevelDeps.length > 0) {
     const nextLevelDeps = [];
+    const depth = currentLevelDeps[0]?.depth ?? 0;
+    trace("build:level", {
+      from: fromNode.id,
+      depth,
+      entries: currentLevelDeps.length
+    });
     const fetchResults = await Promise.all(
       currentLevelDeps.map(
         async ({
@@ -4677,7 +4687,7 @@ var appendNodes = async (packageInfo, graph, fromNode, deps, scurry, options, se
           deps: nodeDeps,
           modifierRefs: nodeModifierRefs,
           peerContext,
-          depth
+          depth: depth2
         }) => {
           const result = await fetchManifestsForDeps(
             packageInfo,
@@ -4692,7 +4702,7 @@ var appendNodes = async (packageInfo, graph, fromNode, deps, scurry, options, se
             hydrations,
             peerContext,
             nodeModifierRefs,
-            depth,
+            depth2,
             explicit
           );
           return {
@@ -4701,13 +4711,14 @@ var appendNodes = async (packageInfo, graph, fromNode, deps, scurry, options, se
               deps: nodeDeps,
               modifierRefs: nodeModifierRefs,
               peerContext,
-              depth
+              depth: depth2
             },
             result
           };
         }
       )
     );
+    trace("build:level:fetched", { from: fromNode.id, depth });
     const sortedResults = fetchResults.sort((a, b) => {
       const keyA = `${a.entry.node.id}::${a.entry.depth}`;
       const keyB = `${b.entry.node.id}::${b.entry.depth}`;
@@ -4764,6 +4775,11 @@ var appendNodes = async (packageInfo, graph, fromNode, deps, scurry, options, se
         nextLevelDeps.push({ ...childDep, depth: nextDepth });
       }
     }
+    trace("build:level:placed", {
+      from: fromNode.id,
+      depth,
+      next: nextLevelDeps.length
+    });
     currentLevelDeps = nextLevelDeps;
   }
 };
@@ -4877,6 +4893,7 @@ var refreshIdealGraph = async ({
     node.setDefaultLocation();
   }
   if (extractPromises?.length) {
+    mark("build:extract-wait", { jobs: extractPromises.length });
     await Promise.all(extractPromises);
   }
 };
@@ -5604,6 +5621,8 @@ var reify = async (options) => {
     success = true;
     res.buildQueue = buildQueue;
   } finally {
+    await options.packageInfo.closeTarPool().catch(() => {
+    });
     if (!success) {
       await rollback(remover, diff, scurry).catch(() => {
       });
@@ -5617,6 +5636,7 @@ var reify_ = async (options, diff, remover, saveImportersPackageJson) => {
   const { packageInfo, packageJson, scurry, allowScripts } = options;
   const lfData = lockfileData(options);
   pruneUnsupportedOptional(diff);
+  void packageInfo.warmTarPool(diff.nodes.add);
   const actions = addNodes(
     diff,
     scurry,
@@ -5624,18 +5644,23 @@ var reify_ = async (options, diff, remover, saveImportersPackageJson) => {
     options,
     packageInfo
   ).concat(deleteEdges(diff, scurry, remover));
+  mark("reify:extract", { jobs: actions.length, limit });
   if (actions.length) await callLimit(actions, { limit });
   const edgeActions = addEdges(diff, scurry, remover);
+  mark("reify:edges", { jobs: edgeActions.length });
   if (edgeActions.length) await callLimit(edgeActions, { limit });
   const binActions = relinkBins(diff, scurry, remover);
   if (binActions.length) await callLimit(binActions, { limit });
+  mark("reify:hoist");
   await internalHoist(diff.to, options, remover);
   checkNeededBuild({ diff, scurry, packageJson });
   const allowScriptsNodes = await filterNodesByQuery(
     diff.to,
     allowScripts
   );
+  mark("reify:chmod");
   await binChmodAll(diff.nodes.add, scurry);
+  mark("reify:scripts");
   await build(diff, packageJson, scurry, allowScriptsNodes);
   res.buildQueue = [...diff.to.nodes.values()].filter((node) => node.buildState === "needed").map((node) => node.id);
   if (diff.hadOptionalFailures) {
@@ -5644,6 +5669,7 @@ var reify_ = async (options, diff, remover, saveImportersPackageJson) => {
       diff.nodes.delete.add(node);
     }
   }
+  mark("reify:lockfile");
   saveHidden(options);
   const rmActions = deleteNodes(
     diff,
@@ -5651,6 +5677,7 @@ var reify_ = async (options, diff, remover, saveImportersPackageJson) => {
     scurry,
     options.keepNodes
   );
+  mark("reify:delete", { jobs: rmActions.length });
   if (rmActions.length) await Promise.all(rmActions);
   saveImportersPackageJson?.();
   for (const node of diff.nodes.add) {
@@ -5765,7 +5792,7 @@ var uninstall = async (options, remove) => {
     throw err;
   }
   if (!allowSkills) return result;
-  const { linkSkills: linkSkills2 } = await import("./skills-KA2VR5Q5.js");
+  const { linkSkills: linkSkills2 } = await import("./skills-QOFA6XMM.js");
   result.skills = await linkSkills2({
     ...options,
     graph: result.graph,
@@ -5875,7 +5902,7 @@ var update = async (options) => {
     throw err;
   }
   if (!allowSkills) return result;
-  const { linkSkills: linkSkills2 } = await import("./skills-KA2VR5Q5.js");
+  const { linkSkills: linkSkills2 } = await import("./skills-QOFA6XMM.js");
   result.skills = await linkSkills2({
     ...options,
     graph: result.graph,
@@ -5990,7 +6017,10 @@ var install = async (options, add) => {
     mainManifest = options.packageJson.read(options.projectRoot);
   } catch (err) {
     if (asError(err).message === "Could not read package.json file") {
-      await init({ cwd: options.projectRoot });
+      await init({
+        cwd: options.projectRoot,
+        packageJson: options.packageJson
+      });
       mainManifest = options.packageJson.read(options.projectRoot, {
         reload: true
       });
@@ -6216,7 +6246,7 @@ var install = async (options, add) => {
     throw err;
   }
   if (!allowSkills) return result;
-  const { linkSkills: linkSkills2 } = await import("./skills-KA2VR5Q5.js");
+  const { linkSkills: linkSkills2 } = await import("./skills-QOFA6XMM.js");
   result.skills = await linkSkills2({
     ...options,
     graph: result.graph,