@vltpkg/cli-js 1.2.0 → 1.3.1

package/registry-client-src-revalidate.js

@@ -2319,14 +2319,14 @@ var require_request = __commonJS({
       onResponseStarted() {
         return this[kHandler].onResponseStarted?.();
       }
-      onHeaders(statusCode, headers, resume, statusText) {
+      onHeaders(statusCode, headers, resume, statusText2) {
         assert(!this.aborted);
         assert(!this.completed);
         if (channels.headers.hasSubscribers) {
-          channels.headers.publish({ request: this, response: { statusCode, headers, statusText } });
+          channels.headers.publish({ request: this, response: { statusCode, headers, statusText: statusText2 } });
         }
         try {
-          return this[kHandler].onHeaders(statusCode, headers, resume, statusText);
+          return this[kHandler].onHeaders(statusCode, headers, resume, statusText2);
         } catch (err) {
           this.abort(err);
         }
@@ -5079,9 +5079,9 @@ var require_util2 = __commonJS({
     function isErrorLike(object) {
       return object instanceof Error || (object?.constructor?.name === "Error" || object?.constructor?.name === "DOMException");
     }
-    function isValidReasonPhrase(statusText) {
-      for (let i2 = 0; i2 < statusText.length; ++i2) {
-        const c = statusText.charCodeAt(i2);
+    function isValidReasonPhrase(statusText2) {
+      for (let i2 = 0; i2 < statusText2.length; ++i2) {
+        const c = statusText2.charCodeAt(i2);
         if (!(c === 9 || // HTAB
         c >= 32 && c <= 126 || // SP / VCHAR
         c >= 128 && c <= 255)) {
@@ -7036,7 +7036,7 @@ var require_client_h1 = __commonJS({
        * @returns {number}
        */
       onHeadersComplete(statusCode, upgrade, shouldKeepAlive) {
-        const { client, socket, headers, statusText } = this;
+        const { client, socket, headers, statusText: statusText2 } = this;
         if (socket.destroyed) {
           return -1;
         }
@@ -7101,7 +7101,7 @@ var require_client_h1 = __commonJS({
         } else {
           socket[kReset] = true;
         }
-        const pause = request2.onHeaders(statusCode, headers, this.resume, statusText) === false;
+        const pause = request2.onHeaders(statusCode, headers, this.resume, statusText2) === false;
         if (request2.aborted) {
           return -1;
         }
@@ -12599,7 +12599,7 @@ var require_mock_utils = __commonJS({
       kTotalDispatchCount
     } = require_mock_symbols();
     var { serializePathWithQuery } = require_util();
-    var { STATUS_CODES: STATUS_CODES3 } = __require("node:http");
+    var { STATUS_CODES } = __require("node:http");
     var {
       types: {
         isPromise
@@ -12807,7 +12807,7 @@ var require_mock_utils = __commonJS({
       return result;
     }
     function getStatusText(statusCode) {
-      return STATUS_CODES3[statusCode] || "unknown";
+      return STATUS_CODES[statusCode] || "unknown";
     }
     async function getResponse(body) {
       const buffers = [];
@@ -20413,7 +20413,7 @@ var require_fetch = __commonJS({
     var { dataURLProcessor, serializeAMimeType, minimizeSupportedMimeType } = require_data_url();
     var { getGlobalDispatcher } = require_global2();
     var { webidl } = require_webidl();
-    var { STATUS_CODES: STATUS_CODES3 } = __require("node:http");
+    var { STATUS_CODES } = __require("node:http");
     var { bytesMatch } = require_subresource_integrity();
     var { createDeferredPromise } = require_promise();
     var { isomorphicEncode } = require_infra();
@@ -21206,13 +21206,13 @@ var require_fetch = __commonJS({
         })();
       }
       try {
-        const { body, status, statusText, headersList, socket } = await dispatch({ body: requestBody });
+        const { body, status, statusText: statusText2, headersList, socket } = await dispatch({ body: requestBody });
         if (socket) {
-          response = makeResponse({ status, statusText, headersList, socket });
+          response = makeResponse({ status, statusText: statusText2, headersList, socket });
         } else {
           const iterator = body[Symbol.asyncIterator]();
           fetchParams.controller.next = () => iterator.next();
-          response = makeResponse({ status, statusText, headersList });
+          response = makeResponse({ status, statusText: statusText2, headersList });
         }
       } catch (err) {
         if (err.name === "AbortError") {
@@ -21334,7 +21334,7 @@ var require_fetch = __commonJS({
             onResponseStarted() {
               timingInfo.finalNetworkResponseStartTime = coarsenedSharedCurrentTime(fetchParams.crossOriginIsolatedCapability);
             },
-            onHeaders(status, rawHeaders, resume, statusText) {
+            onHeaders(status, rawHeaders, resume, statusText2) {
               if (status < 200) {
                 return false;
               }
@@ -21397,7 +21397,7 @@ var require_fetch = __commonJS({
               const onError = this.onError.bind(this);
               resolve11({
                 status,
-                statusText,
+                statusText: statusText2,
                 headersList,
                 body: decoders.length ? pipeline(this.body, ...decoders, (err) => {
                   if (err) {
@@ -21450,7 +21450,7 @@ var require_fetch = __commonJS({
               }
               resolve11({
                 status,
-                statusText: STATUS_CODES3[status],
+                statusText: STATUS_CODES[status],
                 headersList,
                 socket
               });
@@ -21474,7 +21474,7 @@ var require_fetch = __commonJS({
               }
               resolve11({
                 status,
-                statusText: STATUS_CODES3[status],
+                statusText: STATUS_CODES[status],
                 headersList,
                 socket
               });
@@ -32457,8 +32457,7 @@ var XDG = class {
 // ../../src/registry-client/src/index.ts
 var import_undici3 = __toESM(require_undici(), 1);
 import { randomUUID } from "node:crypto";
-import { readFileSync as readFileSync2 } from "node:fs";
-import { STATUS_CODES as STATUS_CODES2 } from "node:http";
+import { closeSync, openSync, readFileSync as readFileSync2, readSync } from "node:fs";
 import { availableParallelism } from "node:os";
 import { dirname as dirname3, resolve as resolve10 } from "node:path";
 import { setTimeout as setTimeout3 } from "node:timers/promises";
@@ -32467,7 +32466,7 @@ import { setTimeout as setTimeout3 } from "node:timers/promises";
 var package_default = {
   name: "@vltpkg/user-agent",
   description: "The User-Agent string that vlt sends with every outbound request",
-  version: "1.2.0",
+  version: "1.3.1",
   repository: {
     type: "git",
     url: "git+https://github.com/vltpkg/vltpkg.git",
@@ -33311,10 +33310,19 @@ var CacheEntry = class _CacheEntry {
    * i.e. a tarball the global store can be built from.
    */
   static isTarballEntry(buffer) {
+    return !!_CacheEntry.tarballIntegrity(buffer);
+  }
+  /**
+   * The hash recorded on such an entry, or undefined if this is not one.
+   * {@link isTarballEntry} is built on this, and both only need the head.
+   */
+  static tarballIntegrity(buffer) {
     const parsed = _CacheEntry.#parseHead(buffer);
-    if (parsed?.statusCode !== 200 || !parsed.integrity) return false;
+    if (parsed?.statusCode !== 200 || !parsed.integrity) {
+      return void 0;
+    }
     const ct2 = getRawHeader(parsed.headers, "content-type");
-    return !ct2 || !/\bjson\b/.test(getDecodedValue(ct2));
+    return !ct2 || !/\bjson\b/.test(getDecodedValue(ct2)) ? parsed.integrity : void 0;
   }
   /**
    * Encode status + headers (no body) as they appear at the start of
@@ -33477,7 +33485,7 @@ var handleCacheHitResponse = (resp, entry) => {
 };
 
 // ../../src/registry-client/src/registry-error.ts
-import { STATUS_CODES } from "node:http";
+var statusText = (code) => process.getBuiltinModule("node:http").STATUS_CODES[code];
 var MAX_DETAIL_LENGTH = 512;
 var truncate = (s) => s.length <= MAX_DETAIL_LENGTH ? s : `${s.slice(0, MAX_DETAIL_LENGTH - 1)}\u2026`;
 var isHTML = (s) => /^\s*(<!doctype\s+html|<html\b)/i.test(s);
@@ -33501,7 +33509,7 @@ var detailFromJSON = (text) => {
   return void 0;
 };
 var registryErrorMessage = (response) => {
-  const statusMessage = STATUS_CODES[response.statusCode];
+  const statusMessage = statusText(response.statusCode);
   const status = `${response.statusCode}${statusMessage ? ` ${statusMessage}` : ""}`;
   let text;
   try {
@@ -33803,13 +33811,13 @@ var import_undici2 = __toESM(require_undici(), 1);
 // ../../src/registry-client/src/index.ts
 var log3 = (msg) => console.error(msg);
 var isCacheableMethod = (m2) => m2 === "GET" || m2 === "HEAD";
+var maxHeadSize = 1024 * 1024;
 var cacheKey = (method, url) => `${method !== "GET" ? method + " " : ""}${url}`;
 var agentOptions = {
   bodyTimeout: 6e5,
   headersTimeout: 6e5,
   keepAliveMaxTimeout: 12e5,
   keepAliveTimeout: 6e5,
-  keepAliveTimeoutThreshold: 3e4,
   connect: {
     timeout: 6e5,
     keepAlive: true,
@@ -33894,7 +33902,7 @@ var RegistryClient = class {
         }
       } catch {
       }
-      const status = STATUS_CODES2[statusCode];
+      const status = statusText(statusCode);
       throw error(
         `Failed to fetch paginated results: ${statusCode}${status ? ` ${status}` : ""}${typeof detail === "string" && detail ? `: ${detail}` : ""}`,
         { code: "EREQUEST", status: statusCode, url: String(url) }
@@ -34011,7 +34019,7 @@ var RegistryClient = class {
       }
     }
     const { statusCode } = response;
-    const status = STATUS_CODES2[statusCode];
+    const status = statusText(statusCode);
     throw error(
       `Failed to perform web login: ${statusCode}${status ? ` ${status}` : ""}`,
       {
@@ -34090,6 +34098,44 @@ var RegistryClient = class {
       response
     });
   }
+  /**
+   * The hash the cache recorded for `url`. This reads only the entry's
+   * head, which is about a kilobyte, rather than the body, which can be a
+   * megabyte. A caller that is about to look the package up in the global
+   * store needs nothing else, and if the store misses it can still read
+   * the body afterwards.
+   *
+   * Returns undefined if there is no entry, or if the entry is not a
+   * tarball. This never reads the body, so if `cache-unzip` rewrote the
+   * entry underneath us the worst case is a stale hash. That misses in the
+   * store; it cannot return the wrong bytes.
+   */
+  cachedIntegrity(url, options = {}) {
+    const { method = "GET" } = options;
+    try {
+      const key = cacheKey(
+        method,
+        typeof url === "string" ? new URL(url) : url
+      );
+      if (this.cache.peek(key)) return void 0;
+      const fd = openSync(this.cache.path(key), "r");
+      try {
+        const size = Buffer.allocUnsafe(4);
+        if (readSync(fd, size, 0, 4, 0) < 4) return void 0;
+        const headSize = size.readUInt32BE(0);
+        if (headSize < 7 || headSize > maxHeadSize) return void 0;
+        const head = Buffer.allocUnsafe(headSize);
+        if (readSync(fd, head, 0, headSize, 0) < headSize) {
+          return void 0;
+        }
+        return CacheEntry.tarballIntegrity(head);
+      } finally {
+        closeSync(fd);
+      }
+    } catch {
+    }
+    return void 0;
+  }
   /**
    * Read a valid cached non-JSON body straight off disk, bypassing the
    * in-memory cache LRU so that a tarball is never held in it.
@@ -34118,7 +34164,7 @@ var RegistryClient = class {
         if (i2) paths.add(i2);
       } catch {
       }
-      paths.add(this.cache.path(key));
+      if (!integrity) paths.add(this.cache.path(key));
       for (const path2 of paths) {
         let buf;
         try {
@@ -34261,7 +34307,7 @@ var RegistryClient = class {
     );
     if (!trustIntegrity && !result.fromCache) {
       result.deleteHeader("integrity");
-      if (result.isGzip) result.checkIntegrity({ url });
+      if (result.statusCode === 200) result.checkIntegrity({ url });
     }
     if (verifyDigest && !integrity && !result.fromCache && result.statusCode === 200) {
       result.checkDigest(verifyDigest === "required", { url });

package/{repo-BQDWUCX5.js → repo-XKG2HZ46.js}

@@ -14,46 +14,46 @@ import {
 } from "./chunk-CLVRCGOZ.js";
 import {
   openUrl
-} from "./chunk-3CUFJPBK.js";
+} from "./chunk-MC6CESRA.js";
 import {
   createHostContextsMap
-} from "./chunk-YFNQ6HZ3.js";
-import "./chunk-UNWQVOLY.js";
-import "./chunk-GUATFMMU.js";
+} from "./chunk-YL5D7SKZ.js";
+import "./chunk-CSZTT7QN.js";
+import "./chunk-CU752KW7.js";
 import "./chunk-G2YT2GWF.js";
-import "./chunk-YTT3UHUB.js";
+import "./chunk-CRGWLUGC.js";
 import {
   PackageInfoClient
-} from "./chunk-5YB6UIC3.js";
+} from "./chunk-QXKWSPKX.js";
 import "./chunk-ZWKI5OSF.js";
 import "./chunk-WGDTG44V.js";
-import "./chunk-O44Z6MAV.js";
+import "./chunk-J4NHRZX6.js";
 import {
   Query,
   actual
-} from "./chunk-B2FK2HHL.js";
+} from "./chunk-3WBHQEWL.js";
 import {
   SecurityArchive
-} from "./chunk-FOJCK57G.js";
+} from "./chunk-U3WCCLFD.js";
 import {
   commandUsage
-} from "./chunk-55DYW2MP.js";
-import "./chunk-6G7MTZGS.js";
+} from "./chunk-I6QGYSB4.js";
+import "./chunk-BUKZHMMK.js";
 import "./chunk-4KCU2KZL.js";
-import "./chunk-SYGF27W7.js";
+import "./chunk-JIQBZ2UT.js";
 import {
   Spec
-} from "./chunk-G5NJ7CYI.js";
-import "./chunk-6A3XS52F.js";
+} from "./chunk-64VFL4WI.js";
+import "./chunk-ENSGPOLR.js";
 import "./chunk-HTOTG4TS.js";
 import "./chunk-APMYKJI2.js";
-import "./chunk-UQUIO7LW.js";
-import "./chunk-JTUZP2OD.js";
+import "./chunk-PBBULTAG.js";
+import "./chunk-LCAH3OGR.js";
 import "./chunk-U7TEQCBN.js";
 import "./chunk-XNLSTHDK.js";
-import "./chunk-BHJT53TP.js";
-import "./chunk-VE6CCH33.js";
-import "./chunk-G5BSQ6DP.js";
+import "./chunk-PDWPFR5T.js";
+import "./chunk-Y5PA7DVK.js";
+import "./chunk-BP3PQ67D.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";