tokentracker-cli 1.1.2 → 1.1.4

package/src/lib/wsl-probe.js

@@ -4,11 +4,15 @@ const path = require("node:path");
 const DEFAULT_EXEC_OPTS = { timeout: 15000, windowsHide: true, maxBuffer: 1024 * 1024, stdio: ["ignore", "pipe", "ignore"] };
 
 let _cachedDistros = null;
+let _cachedDistrosError = null;
 const _cachedWslUsers = new Map();
+const _cachedWslUserErrors = new Map();
 
 function resetWslProbeCache() {
   _cachedDistros = null;
+  _cachedDistrosError = null;
   _cachedWslUsers.clear();
+  _cachedWslUserErrors.clear();
 }
 
 const WSL_MODES = new Set([
@@ -25,11 +29,15 @@ function defaultRunWsl(args, { utf16 = false } = {}) {
   return utf16 ? buf.toString("utf16le") : buf.toString("utf8");
 }
 
+function cleanWslOutput(raw) {
+  return raw.replace(/\0/g, "").replace(/\uFEFF/g, "").trim();
+}
+
 function parseWslListVerbose(raw) {
   if (typeof raw !== "string") return [];
   const distros = [];
   for (const line of raw.split(/\r?\n/)) {
-    const clean = line.replace(/\0/g, "").replace(/\uFEFF/g, "").trim();
+    const clean = cleanWslOutput(line);
     if (!clean) continue;
     const cells = clean.split(/\s+/);
     let isDefault = false;
@@ -47,19 +55,44 @@ function parseWslListVerbose(raw) {
 }
 
 function probeWslDistros(deps = {}) {
-  const hasDeps = Object.keys(deps).length > 0;
-  if (!hasDeps && _cachedDistros) return _cachedDistros;
+  const strict = deps.strict === true;
+  const hasDeps = Object.keys(deps).some((key) => key !== "strict");
+  // Legacy callers retain their fail-safe cache. Strict observers may reuse
+  // successful empty results, but must retry a failure cached by any caller.
+  if (!hasDeps && _cachedDistros && (!strict || !_cachedDistrosError)) return _cachedDistros;
   const runWsl = deps.runWsl || defaultRunWsl;
   let raw;
   try {
     raw = runWsl(["-l", "-v"], { utf16: true });
-  } catch (_e) {
-    if (!hasDeps) _cachedDistros = [];
+  } catch (error) {
+    let confirmedEmpty = false;
+    if (
+      strict && Number.isInteger(error?.status) && error.status !== 0 &&
+      error.signal == null && (error.code == null || error.code === error.status)
+    ) {
+      // Some WSL builds exit nonzero for an empty verbose list. Confirm that
+      // case with a successful empty quiet list, not localized diagnostic text.
+      // Transport/permission/signal failures must never reach this fallback.
+      try {
+        const quiet = runWsl(["-l", "-q"], { utf16: true });
+        confirmedEmpty = typeof quiet === "string" && cleanWslOutput(quiet) === "";
+      } catch (_quietError) { }
+    }
+    if (!hasDeps) {
+      _cachedDistros = [];
+      _cachedDistrosError = confirmedEmpty ? null : error;
+    }
+    // ENOENT confirms wsl.exe is not installed. A failed invocation of an
+    // existing executable is not evidence of an empty distro list.
+    if (strict && error?.code !== "ENOENT" && !confirmedEmpty) throw error;
     return [];
   }
   const distros = parseWslListVerbose(raw);
   const sorted = distros.sort((a, b) => (b.isDefault ? 1 : 0) - (a.isDefault ? 1 : 0));
-  if (!hasDeps) _cachedDistros = sorted;
+  if (!hasDeps) {
+    _cachedDistros = sorted;
+    _cachedDistrosError = null;
+  }
   return sorted;
 }
 
@@ -125,15 +158,22 @@ function resolveAllWin32Paths({
   return { native: single, wsl: null };
 }
 
-function lookupWslUser(distroName, runWsl, useCache) {
-  if (useCache && _cachedWslUsers.has(distroName)) {
+function lookupWslUser(distroName, runWsl, useCache, strict = false) {
+  if (useCache && _cachedWslUsers.has(distroName) && (!strict || !_cachedWslUserErrors.has(distroName))) {
     return _cachedWslUsers.get(distroName);
   }
   let user = "";
+  let error = null;
   try {
     user = String(runWsl(["-d", distroName, "-e", "whoami"], { utf16: false }) || "").trim();
-  } catch (_e) { }
-  if (useCache) _cachedWslUsers.set(distroName, user);
+    if (!user) error = Object.assign(new Error("WSL identity probe returned no user"), { code: "EWSLIDENTITY" });
+  } catch (cause) { error = cause; }
+  if (useCache) {
+    _cachedWslUsers.set(distroName, user);
+    if (error) _cachedWslUserErrors.set(distroName, error);
+    else _cachedWslUserErrors.delete(distroName);
+  }
+  if (strict && error) throw error;
   return user;
 }
 
@@ -142,10 +182,13 @@ function discoverWslHome(providerDir, deps = {}) {
 
   const runWsl = deps.runWsl || defaultRunWsl;
   const existsSync = deps.existsSync || fssync.existsSync;
-  const distros = deps.runWsl ? probeWslDistros({ runWsl: deps.runWsl }) : probeWslDistros();
+  const strict = deps.strict === true;
+  const distros = deps.runWsl
+    ? probeWslDistros({ runWsl: deps.runWsl, strict })
+    : probeWslDistros(strict ? { strict } : undefined);
   const useCache = !deps.runWsl;
   for (const distro of distros) {
-    const user = lookupWslUser(distro.name, runWsl, useCache);
+    const user = lookupWslUser(distro.name, runWsl, useCache, strict);
     if (!user) continue;
     const roots = distro.version === 1
       ? ["\\\\wsl.localhost\\", "\\\\wsl$\\"]