@vantaloom/cli 0.2.0 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vantaloom/cli",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "private": false,
   "type": "module",
   "description": "Vantaloom local runtime manager.",

package/src/cli.mjs

@@ -20,6 +20,9 @@ const installedConfigPath = path.join(cliRoot, "config.json")
 const defaultReleaseTag = "runtime-latest"
 const defaultRepo = "Timefiles404/Vantaloom-next"
 const defaultNpmRegistry = "https://registry.npmjs.org"
+const fallbackNpmRegistries = [
+  "https://registry.npmmirror.com",
+]
 
 export async function main(argv) {
   const command = argv[0] ?? "help"
@@ -186,6 +189,10 @@ async function applyPackage(packageRoot, prefix, options) {
     spawnSync(existingCtl, ["stop", "--prefix", prefix], { stdio: "inherit" })
   }
 
+  // Kill lingering tray process that may hold locks on bin/ (older versions
+  // don't write tray.pid, so vantaloomctl stop won't find them).
+  killTrayProcess(prefix)
+
   for (const name of ["bin", "web", "cli"]) {
     removeKnownPath(path.join(prefix, name), prefix)
     await cp(path.join(packageRoot, name), path.join(prefix, name), {
@@ -226,7 +233,8 @@ async function syncFromNpmRegistry(options, action) {
   const installedConfig = readInstalledConfig(prefix)
   const runtimePackage = options.runtimePackage || installedConfig.runtimePackage || runtimePackageName(platformId())
   const runtimeVersion = options.runtimeVersion || installedConfig.runtimeVersion || "latest"
-  const registry = normalizeRegistry(options.npmRegistry || installedConfig.npmRegistry || defaultNpmRegistry)
+  const explicitRegistry = options.npmRegistry || installedConfig.npmRegistry
+  const registry = normalizeRegistry(explicitRegistry || detectNpmRegistry() || defaultNpmRegistry)
   const tempRoot = mkdtempSync(path.join(os.tmpdir(), "vantaloom-npm-"))
 
   try {
@@ -234,7 +242,11 @@ async function syncFromNpmRegistry(options, action) {
     const archive = path.join(tempRoot, `${packageBasename(runtimePackage)}-${runtimeVersion}.tgz`)
     mkdirSync(extractRoot, { recursive: true })
 
-    const resolved = await resolveNpmPackage({ registry, name: runtimePackage, version: runtimeVersion })
+    const resolved = await resolveNpmPackageWithFallback({
+      registries: explicitRegistry ? [registry] : [registry, ...fallbackNpmRegistries.map(normalizeRegistry)],
+      name: runtimePackage,
+      version: runtimeVersion,
+    })
     await downloadNpmTarball({
       tarballUrl: resolved.tarball,
       target: archive,
@@ -248,13 +260,14 @@ async function syncFromNpmRegistry(options, action) {
       noStart: options.noStart,
       runtimePackage,
       runtimeVersion: options.runtimeVersion ? resolved.version : "latest",
-      npmRegistry: registry,
+      npmRegistry: resolved.registry,
       update: action === "update",
     })
 
     console.log(`${action === "update" ? "updated" : "installed"} Vantaloom: ${prefix}`)
     console.log(`version: ${version}`)
     console.log(`source: ${runtimePackage}@${resolved.version}`)
+    console.log(`registry: ${resolved.registry}`)
     console.log(`run: ${displayCommand(prefix)} status`)
   } finally {
     removeKnownPath(tempRoot, os.tmpdir())
@@ -346,14 +359,95 @@ async function downloadReleaseAsset({ repo, releaseTag, assetName, target, token
   await writeFile(target, buffer)
 }
 
+function detectNpmRegistry() {
+  // 1. NPM_CONFIG_REGISTRY env var (highest priority, set by npm/npx when running)
+  if (process.env.NPM_CONFIG_REGISTRY) {
+    return process.env.npm_config_registry || process.env.NPM_CONFIG_REGISTRY
+  }
+  // npm also sets the lowercase variant
+  if (process.env.npm_config_registry) {
+    return process.env.npm_config_registry
+  }
+
+  // 2. Read user .npmrc
+  try {
+    const npmrcPaths = [
+      path.join(os.homedir(), ".npmrc"),
+    ]
+    // Also check project-level .npmrc
+    const localNpmrc = path.resolve(".npmrc")
+    if (localNpmrc !== npmrcPaths[0]) {
+      npmrcPaths.unshift(localNpmrc)
+    }
+    for (const npmrcPath of npmrcPaths) {
+      if (existsSync(npmrcPath)) {
+        const content = readFileSync(npmrcPath, "utf8")
+        const match = content.match(/^\s*registry\s*=\s*(.+)/m)
+        if (match) {
+          return match[1].trim()
+        }
+      }
+    }
+  } catch {
+    // Ignore .npmrc read errors
+  }
+
+  return ""
+}
+
+async function resolveNpmPackageWithFallback({ registries, name, version }) {
+  const errors = []
+  for (const registry of registries) {
+    try {
+      const result = await resolveNpmPackage({ registry, name, version })
+      return { ...result, registry }
+    } catch (error) {
+      const isNetworkError = error?.cause?.code === "ECONNREFUSED"
+        || error?.cause?.code === "ENOTFOUND"
+        || error?.cause?.code === "ETIMEDOUT"
+        || error?.cause?.code === "ECONNRESET"
+        || error?.cause?.code === "UND_ERR_CONNECT_TIMEOUT"
+        || (error instanceof TypeError && error.message === "fetch failed")
+      errors.push({ registry, error, isNetworkError })
+
+      if (isNetworkError && registries.length > 1) {
+        console.error(`vantaloom: ${registry} unreachable, trying next registry...`)
+        continue
+      }
+      // Non-network error (404, parse error, etc.) — don't try fallbacks
+      throw error
+    }
+  }
+
+  // All registries failed with network errors
+  const tried = errors.map((e) => e.registry).join(", ")
+  throw new Error(
+    `all registries unreachable (tried: ${tried}). ` +
+    `Check your network or specify --npm-registry <url>`
+  )
+}
+
 async function resolveNpmPackage({ registry, name, version }) {
   const metadataUrl = `${registry}/${encodeURIComponent(name).replace("%2F", "%2f")}`
-  const response = await fetch(metadataUrl, {
-    headers: {
-      Accept: "application/vnd.npm.install-v1+json",
-      "User-Agent": "vantaloom-cli",
-    },
-  })
+  let response
+  try {
+    response = await fetch(metadataUrl, {
+      headers: {
+        Accept: "application/vnd.npm.install-v1+json",
+        "User-Agent": "vantaloom-cli",
+      },
+      signal: AbortSignal.timeout(15000),
+    })
+  } catch (error) {
+    if (error instanceof TypeError && error.message === "fetch failed") {
+      const cause = error.cause ? ` (${error.cause.code || error.cause.message || error.cause})` : ""
+      throw Object.assign(
+        new Error(`cannot reach registry ${registry}${cause}`),
+        { cause: error.cause }
+      )
+    }
+    throw error
+  }
   if (!response.ok) {
     const detail = await response.text().catch(() => "")
     throw new Error(`failed to inspect npm package ${name}: HTTP ${response.status}${detail ? ` ${detail.slice(0, 200)}` : ""}`)
@@ -470,7 +564,7 @@ function runtimeConfigFromSource(sourceRoot) {
     releaseTag: defaultReleaseTag,
     runtimePackage: runtimePackageName(platformId()),
     runtimeVersion: "latest",
-    npmRegistry: defaultNpmRegistry,
+    npmRegistry: detectNpmRegistry() || defaultNpmRegistry,
   }
 }
 
@@ -897,6 +991,38 @@ async function writeText(filePath, content) {
   await writeFile(filePath, content)
 }
 
+function killTrayProcess(prefix) {
+  if (process.platform === "win32") {
+    // Try PID file first (new tray versions write runtime/tray.pid).
+    const pidFile = path.join(prefix, "runtime", "tray.pid")
+    if (existsSync(pidFile)) {
+      const pid = readFileSync(pidFile, "utf8").trim()
+      if (pid) {
+        spawnSync("taskkill", ["/PID", pid, "/F"], { stdio: "ignore" })
+        try { rmSync(pidFile, { force: true }) } catch {}
+      }
+    }
+    // Fallback: kill by image name if the binary is inside our prefix.
+    const result = spawnSync("tasklist", ["/FI", "IMAGENAME eq vantaloom-tray.exe", "/FO", "CSV", "/NH"], {
+      encoding: "utf8",
+      windowsHide: true,
+    })
+    if (result.stdout) {
+      for (const line of result.stdout.split("\n")) {
+        const match = line.match(/"vantaloom-tray\.exe","(\d+)"/)
+        if (match) {
+          spawnSync("taskkill", ["/PID", match[1], "/F"], { stdio: "ignore" })
+        }
+      }
+    }
+    // Brief pause to let file handles release.
+    spawnSync("timeout", ["/t", "1", "/nobreak"], { stdio: "ignore", windowsHide: true })
+  } else {
+    // Unix: pkill by name (best-effort).
+    spawnSync("pkill", ["-f", "vantaloom-tray"], { stdio: "ignore" })
+  }
+}
+
 function printHelp() {
   console.log(`Vantaloom CLI