package-registry-manager 0.22.0 → 0.22.3

package/CHANGELOG.md

@@ -35,6 +35,7 @@ currently shares its release version with the Rust implementation.
   outside any repository (`~/Library/Application Support` on macOS,
   `$XDG_STATE_HOME` or `~/.local/state` on Linux, `%LOCALAPPDATA%` on Windows,
   each followed by `package-registry-manager/browser-profile`) (#8).
+- `browser-commander` is required at `^0.22.0`, its latest release (#28).
 
 ### Fixed
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "package-registry-manager",
-  "version": "0.22.0",
+  "version": "0.22.3",
   "description": "Inspect repositories and guide secure package-registry setup",
   "type": "module",
   "bin": {
@@ -9,7 +9,7 @@
   },
   "exports": "./src/index.mjs",
   "engines": {
-    "node": ">=22"
+    "node": ">=22.12.0"
   },
   "repository": {
     "type": "git",
@@ -28,7 +28,7 @@
     "provenance": true
   },
   "scripts": {
-    "syntax": "node --check src/cli.mjs && node --check src/index.mjs && node --check src/browser.mjs && node --check src/browser-options.mjs && node --check src/automation.mjs && node --check src/profile.mjs && node --check src/setup.mjs && node --check src/auth-urls.mjs && node --check src/containers.mjs && node --check src/flows.mjs && node --check src/prerequisites.mjs && node --check src/registry-state.mjs && node --check src/workflows.mjs && node --check src/publishers.mjs && node --check src/skips.mjs && node --check src/tokens.mjs && node --check src/approvals.mjs && node --check src/default-browser.mjs && node --check src/pages.mjs && node --check src/crates-api.mjs && node --check src/sign-in-import.mjs && node --check scripts/publish-to-npm.mjs && node --check scripts/setup-npm.mjs && node --check scripts/sanitize-npm-userconfig.mjs",
+    "syntax": "node --check src/cli.mjs && node --check src/direct-execution.mjs && node --check src/index.mjs && node --check src/browser.mjs && node --check src/browser-options.mjs && node --check src/browser-catalogue.mjs && node --check src/automation.mjs && node --check src/profile.mjs && node --check src/setup.mjs && node --check src/auth-urls.mjs && node --check src/containers.mjs && node --check src/flows.mjs && node --check src/prerequisites.mjs && node --check src/registry-state.mjs && node --check src/workflows.mjs && node --check src/publishers.mjs && node --check src/skips.mjs && node --check src/tokens.mjs && node --check src/approvals.mjs && node --check src/default-browser.mjs && node --check src/pages.mjs && node --check src/crates-api.mjs && node --check src/sign-in-import.mjs && node --check scripts/publish-to-npm.mjs && node --check scripts/setup-npm.mjs && node --check scripts/sanitize-npm-userconfig.mjs",
     "lint": "eslint src test scripts --max-warnings 0",
     "lint:fix": "eslint src test scripts --fix --max-warnings 0",
     "format": "prettier --write .",
@@ -39,13 +39,13 @@
     "pack:check": "npm pack --dry-run"
   },
   "dependencies": {
-    "browser-commander": "^0.21.2",
-    "command-stream": "^1.3.0",
+    "browser-commander": "^0.25.0",
+    "command-stream": "^1.5.0",
     "playwright": "^1.63.0"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "eslint": "^10.11.0",
+    "eslint": "^10.12.0",
     "eslint-config-prettier": "^10.1.8",
     "jscpd": "^5.4.0",
     "prettier": "^3.9.9"

package/src/browser-catalogue.mjs

@@ -0,0 +1,133 @@
+import { existsSync } from "node:fs";
+import os from "node:os";
+import path from "node:path";
+
+import { BROWSER_IDS, findBrowserSource } from "browser-commander";
+
+/** Catalogue entries reached through Browser Commander's public exports. */
+export const browserSources = () => BROWSER_IDS.map(findBrowserSource);
+
+/** The installed channels supported by Browser Commander's real launcher. */
+export function launchChannels() {
+  return browserSources()
+    .filter((source) => source.controlProtocol === "cdp")
+    .flatMap((source) => [source.id, ...(source.aliases ?? [])]);
+}
+
+/** A readable name from the catalogue's application path or canonical alias. */
+export function catalogueName(id) {
+  const source = findBrowserSource(id);
+  if (!source) {
+    return id;
+  }
+  const app = source.executables?.darwin?.[0]?.match(/\/([^/]+)\.app\//)?.[1];
+  // Preserve the established short name of Brave.
+  if (app) {
+    return app === "Brave Browser" ? "Brave" : app;
+  }
+  const label = [source.id, ...(source.aliases ?? [])]
+    .map((name) => name.replace(/^apple-/, ""))
+    .reduce((longest, name) => (name.length > longest.length ? name : longest));
+  return label
+    .replace(/^apple-/, "")
+    .split("-")
+    .map((word) =>
+      word.length <= 2
+        ? word.toUpperCase()
+        : word[0].toUpperCase() + word.slice(1),
+    )
+    .join(" ")
+    .replace("Duckduckgo", "DuckDuckGo");
+}
+
+/** Installed executables or existing profile roots; never reads cookie data. */
+export function installedBrowsers(options = {}) {
+  const exists = options.exists ?? existsSync;
+  const platform = options.platform ?? process.platform;
+  const environment = options.environment ?? process.env;
+  const discovery = {
+    ...options,
+    platform,
+    environment:
+      platform === "win32"
+        ? Object.fromEntries(
+            Object.entries(environment).map(([key, value]) => [
+              key.toUpperCase(),
+              value,
+            ]),
+          )
+        : environment,
+  };
+  return browserSources()
+    .filter((source) =>
+      installedCandidates(source, discovery).some((candidate) =>
+        exists(candidate),
+      ),
+    )
+    .map((source) => source.id);
+}
+
+function installedCandidates(
+  source,
+  {
+    platform = process.platform,
+    homeDir = os.homedir(),
+    environment = process.env,
+  },
+) {
+  const pathApi = platform === "win32" ? path.win32 : path.posix;
+  const variables = {
+    home: homeDir,
+    config: environment.XDG_CONFIG_HOME ?? pathApi.join(homeDir, ".config"),
+    appSupport: pathApi.join(homeDir, "Library", "Application Support"),
+    appData: environment.APPDATA ?? pathApi.join(homeDir, "AppData", "Roaming"),
+    localAppData:
+      environment.LOCALAPPDATA ?? pathApi.join(homeDir, "AppData", "Local"),
+    programFiles: environment.PROGRAMFILES,
+    programFilesX86: environment["PROGRAMFILES(X86)"],
+  };
+  const templates = [
+    ...(source.executables?.[platform] ?? []),
+    ...(source.roots?.[platform] ?? []),
+  ];
+  const candidates = templates.flatMap((template) => {
+    const match = /^\{(\w+)\}\/?(.*)$/.exec(template);
+    if (!match) {
+      return [template];
+    }
+    const base = variables[match[1]];
+    return base === undefined
+      ? []
+      : [pathApi.join(base, ...match[2].split("/"))];
+  });
+  for (const directory of (environment.PATH ?? "")
+    .split(platform === "win32" ? ";" : ":")
+    .filter(Boolean)) {
+    for (const name of source.executableNames ?? []) {
+      candidates.push(
+        pathApi.join(directory, platform === "win32" ? `${name}.exe` : name),
+      );
+    }
+  }
+  return candidates;
+}
+
+/** Discovery information included when an import or channel is invalid. */
+export function installedDescription(options = {}) {
+  const found = installedBrowsers(options);
+  return `Installed browsers found: ${found.join(", ") || "none"}.`;
+}
+
+/** Reject unavailable engines before creating an automated profile. */
+export function validateChannel(channel) {
+  const known = findBrowserSource(channel);
+  if (known?.controlProtocol === "cdp") {
+    return channel;
+  }
+  const reason = known
+    ? `${channel} requires ${known.controlProtocol ?? known.family} control, which browser-commander's real launcher does not support yet (https://github.com/link-foundation/browser-commander/issues/114)`
+    : `unknown --browser-channel '${channel}'`;
+  throw new Error(
+    `${reason}; choose from ${launchChannels().join(", ")}. ${installedDescription()}`,
+  );
+}

package/src/browser-options.mjs

@@ -1,10 +1,12 @@
 import path from "node:path";
 
 import {
+  findBrowserSource,
   LAUNCH_RESTRICTION_PRESETS,
   LAUNCH_RESTRICTIONS,
 } from "browser-commander";
 
+import { installedDescription, validateChannel } from "./browser-catalogue.mjs";
 import {
   IMPORT_CHOICES,
   IMPORT_SCOPES,
@@ -50,7 +52,7 @@ export function parseBrowserOptions({
   profileGiven = false,
 } = {}) {
   const options = {
-    channel,
+    channel: attach === "extension" ? channel : validateChannel(channel),
     executable: executable ? path.resolve(executable) : null,
     import: importFrom ? parseImport(importFrom) : null,
     importScope: parseImportScope(importScope, importFrom),
@@ -82,21 +84,18 @@ export function parseBrowserOptions({
 }
 
 /** Parses `<browser>[:profile]`, `default`, or `auto`. */
-export function parseImport(spec) {
+export function parseImport(spec, discovery = {}) {
   const separator = spec.indexOf(":");
   const browser = separator === -1 ? spec : spec.slice(0, separator);
   const profile = separator === -1 ? null : spec.slice(separator + 1);
   const choice = IMPORT_CHOICES.includes(browser);
-  if (
-    !importBrowsers().includes(browser) ||
-    profile === "" ||
-    (choice && profile !== null)
-  ) {
+  const source = findBrowserSource(browser);
+  if ((!source && !choice) || profile === "" || (choice && profile !== null)) {
     throw new Error(
-      `--browser-import must be <${importSources().join("|")}>[:profile], default, or auto`,
+      `--browser-import must be <${importSources().join("|")}>[:profile], default, or auto. ${installedDescription(discovery)}`,
     );
   }
-  return { browser, profile };
+  return { browser: source?.id ?? browser, profile };
 }
 
 /**
@@ -184,10 +183,7 @@ export function validateRestrictions(names) {
 
 /** The installed browser a snapshot copies for a launch channel. */
 export function snapshotBrowser(channel) {
-  if (channel.startsWith("msedge")) {
-    return "edge";
-  }
-  return ["brave", "chromium"].includes(channel) ? channel : "chrome";
+  return findBrowserSource(channel)?.id ?? channel;
 }
 
 /** Describes where forms are filled, for the browser prerequisite. */

package/src/cli.mjs

@@ -1,19 +1,23 @@
 #!/usr/bin/env node
 
-import { readFileSync, realpathSync } from "node:fs";
+import { readFileSync } from "node:fs";
 import { stat } from "node:fs/promises";
 import path from "node:path";
 import process from "node:process";
-import { fileURLToPath } from "node:url";
 import { parseArgs } from "node:util";
 
+import { launchChannels } from "./browser-catalogue.mjs";
 import { parseBrowserOptions } from "./browser-options.mjs";
+import { isDirectExecution } from "./direct-execution.mjs";
 import { inspectRepository } from "./discovery.mjs";
 import { parseRegistry } from "./model.mjs";
 import { buildPlans } from "./plan.mjs";
 import { probeEnvironment, renderPrerequisites } from "./prerequisites.mjs";
 import { probeRegistryState } from "./registry-state.mjs";
 import { BROWSER_MODES, defaultBrowserProfile, executePlan } from "./setup.mjs";
+import { importSources } from "./sign-in-import.mjs";
+
+export { isDirectExecution };
 
 const HELP = `Usage: package-registry-manager-js [global options] <command>
 
@@ -60,17 +64,16 @@ Setup options:
   --browser <default|automated>   Open sign-in and approval pages in your
                                   default browser, or in the automated
                                   profile too (default: default)
-  --browser-channel <channel>     Installed browser channel: chrome, chromium,
-                                  brave, msedge, msedge-beta, msedge-dev, or
-                                  msedge-canary (default: chrome)
+  --browser-channel <channel>     Installed browser channel (default: chrome):
+                                  ${launchChannels().join(", ")}
   --browser-executable <path>     Installed browser executable to launch
                                   instead of the channel's
   --browser-profile <path>        Dedicated automation profile, used to fill
                                   forms (default: per-user state directory)
   --browser-import <browser>[:<profile>]|default|auto
-                                  Copy data from your chrome, edge, brave,
-                                  chromium, or firefox profile into the
-                                  automated profile first; default takes the
+                                  Copy data from your installed browser profile:
+                                  ${importSources().join(", ")}
+                                  into the automated profile; default takes the
                                   system default browser, auto the first
                                   browser signed in to the registry
   --browser-import-scope <full|domains>
@@ -421,22 +424,6 @@ function packageVersion() {
   return JSON.parse(readFileSync(manifest, "utf8")).version;
 }
 
-/**
- * Whether this module is the program node started. npm, npx, and global
- * installs start bins through a symlink in node_modules/.bin, while
- * import.meta.url names the real file, so both sides are resolved first.
- */
-export function isDirectExecution(moduleUrl, entryPath) {
-  if (!entryPath) {
-    return false;
-  }
-  try {
-    return realpathSync(fileURLToPath(moduleUrl)) === realpathSync(entryPath);
-  } catch {
-    return false;
-  }
-}
-
 if (isDirectExecution(import.meta.url, process.argv[1])) {
   main().catch((error) => {
     process.stderr.write(`error: ${error.message}\n`);

package/src/default-browser.mjs

@@ -1,22 +1,6 @@
 import { exec } from "command-stream";
 
-/**
- * Names of common browsers by macOS bundle id, Linux desktop entry, and
- * Windows URL ProgId, so the tool can say which browser it opened.
- */
-const KNOWN_BROWSERS = [
-  [/^com\.apple\.safari$|^SafariURL/i, "Safari"],
-  [/^com\.google\.chrome\.canary$/i, "Google Chrome Canary"],
-  [/^com\.google\.chrome$|google-chrome|^ChromeHTML$/i, "Google Chrome"],
-  [/^org\.chromium\.chromium$|chromium|^ChromiumHTM/i, "Chromium"],
-  [/^org\.mozilla\.firefox$|firefox|^FirefoxURL/i, "Firefox"],
-  [/^com\.microsoft\.edgemac$|microsoft-edge|^MSEdgeHTM$/i, "Microsoft Edge"],
-  [/^com\.brave\.browser$|brave-browser|^BraveHTML$/i, "Brave"],
-  [/^company\.thebrowser\.browser$/i, "Arc"],
-  [/^com\.operasoftware\.opera$|opera|^OperaStable$/i, "Opera"],
-  [/^com\.vivaldi\.vivaldi$|vivaldi|^VivaldiHTM/i, "Vivaldi"],
-  [/^IE\.HTTP/i, "Internet Explorer"],
-];
+import { browserSources, catalogueName } from "./browser-catalogue.mjs";
 
 /** The command that reports the default browser, as an exact argument vector. */
 export function defaultBrowserQuery(platform = process.platform) {
@@ -100,8 +84,40 @@ export function browserName(id) {
   if (!id) {
     return undefined;
   }
-  const known = KNOWN_BROWSERS.find(([pattern]) => pattern.test(id));
-  return known?.[1];
+  const needle = id.trim().toLowerCase();
+  const sources = browserSources();
+  const known =
+    sources.find((source) =>
+      Object.values(source.default ?? {})
+        .flat()
+        .some((candidate) => needle === candidate.toLowerCase()),
+    ) ??
+    sources.find(
+      (source) =>
+        (source.default?.win32 ?? []).some((candidate) =>
+          needle.startsWith(candidate.toLowerCase()),
+        ) ||
+        (needle.endsWith(".desktop") &&
+          (source.executableNames ?? []).some((name) =>
+            ["-", "_", "."].some((separator) =>
+              needle.startsWith(`${name.toLowerCase()}${separator}`),
+            ),
+          )),
+    );
+  if (known) {
+    return catalogueName(known.id);
+  }
+  // Legacy ProgIds absent from the upstream catalogue remain recognizable.
+  if (/^safariurl/i.test(id)) {
+    return catalogueName("safari");
+  }
+  if (/^chromiumhtm/i.test(id)) {
+    return catalogueName("chromium");
+  }
+  if (/^ie\.http/i.test(id)) {
+    return "Internet Explorer";
+  }
+  return undefined;
 }
 
 /**

package/src/direct-execution.mjs

@@ -0,0 +1,18 @@
+import { realpathSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+
+/**
+ * Whether this module is the program node started. npm, npx, and global
+ * installs start bins through a symlink in node_modules/.bin, while
+ * import.meta.url names the real file, so both sides are resolved first.
+ */
+export function isDirectExecution(moduleUrl, entryPath) {
+  if (!entryPath) {
+    return false;
+  }
+  try {
+    return realpathSync(fileURLToPath(moduleUrl)) === realpathSync(entryPath);
+  } catch {
+    return false;
+  }
+}

package/src/sign-in-import.mjs

@@ -5,10 +5,9 @@
 // printed, logged, or cached: they are only counted.
 import * as commander from "browser-commander";
 
+import { catalogueName } from "./browser-catalogue.mjs";
 import { detectDefaultBrowser } from "./default-browser.mjs";
 
-/** Browser Commander's cookie sources, should a release stop exporting them. */
-const FALLBACK_SOURCES = ["chrome", "edge", "brave", "chromium", "firefox"];
 /** `--browser-import` values that pick the source browser for the user. */
 export const IMPORT_CHOICES = ["default", "auto"];
 /** `--browser-import-scope` values. */
@@ -21,22 +20,9 @@ export const SIGN_IN_DOMAINS = {
   pypi: ["pypi.org", "github.com"],
 };
 
-/** Display names of the source browsers, as the default-browser query names them. */
-const SOURCE_NAMES = {
-  chrome: "Google Chrome",
-  edge: "Microsoft Edge",
-  brave: "Brave",
-  chromium: "Chromium",
-  firefox: "Firefox",
-};
-
-/**
- * Every browser `--browser-import` can read, from Browser Commander. Safari,
- * Opera, Vivaldi, and Arc follow once Browser Commander reads them
- * (link-foundation/browser-commander#114).
- */
+/** Every import id from Browser Commander's public catalogue. */
 export function importSources() {
-  return [...(commander.SUPPORTED_COOKIE_BROWSERS ?? FALLBACK_SOURCES)];
+  return [...commander.BROWSER_IDS];
 }
 
 /** The sign-in domains of a registry, or none. */
@@ -46,15 +32,12 @@ export function signInDomains(registry) {
 
 /** The display name of a source browser. */
 export function sourceName(browser) {
-  return SOURCE_NAMES[browser] ?? browser;
+  return catalogueName(browser);
 }
 
 /** The source id of a default-browser display name, when it can be imported. */
 export function sourceId(displayName) {
-  const entry = Object.entries(SOURCE_NAMES).find(
-    ([, name]) => name === displayName,
-  );
-  return entry && importSources().includes(entry[0]) ? entry[0] : undefined;
+  return importSources().find((id) => sourceName(id) === displayName);
 }
 
 /**
@@ -87,7 +70,12 @@ export async function findSignInSources(domains, options = {}) {
   );
   const found = [];
   for (const browser of browsers) {
-    const profiles = await list({ browser }).catch(() => []);
+    const profiles = await list({ browser }).catch((error) => {
+      if (options.verbose) {
+        console.error(`could not list ${browser} profiles: ${error.message}`);
+      }
+      return [];
+    });
     for (const profile of profiles) {
       const matched = [];
       for (const domain of domains) {
@@ -171,15 +159,15 @@ export async function chooseSignInSource(sources, domains, ask, auto) {
  * Resolves `--browser-import default|auto` to an installed source browser:
  * the system default browser, or for `auto` the first browser with a
  * sign-in for `domains`. Throws when `default` names a browser Browser
- * Commander cannot read yet, such as Safari.
+ * Commander cannot identify.
  */
 export async function resolveImportChoice(choice, domains, options = {}) {
   const preferred = await defaultSource(options);
   if (choice === "default") {
     if (!preferred) {
       throw new Error(
-        "--browser-import default: the default browser cannot be imported yet (Browser Commander reads " +
-          `${importSources().join(", ")}; see link-foundation/browser-commander#114)`,
+        "--browser-import default: the default browser is unknown or cannot be imported (Browser Commander sources: " +
+          `${importSources().join(", ")})`,
       );
     }
     return { browser: preferred, profile: null };