dsh-ensp 0.3.3 → 0.4.0

package/src/core/compat.mjs

@@ -1,227 +1,236 @@
-/**
- * Device availability checks.
- *
- * Some eNSP models are only stubs in the device catalogue: the entry exists, you
- * can drop it on the canvas and save the topology, but the vendor image behind it
- * is not installed. Placing one is not a soft failure — **the client opens the
- * topology, paints it, and then exits by itself**, so the launch looks successful
- * for a few seconds and everything downstream fails with a confusing
- * "console never answered".
- *
- * That is exactly what happens here with `USG6000V`: `res/items.xml` declares it
- * as `<executable isplugin="1" path="ngfw\ngfw_Plugin.dll"/>`, the plugin DLL is
- * present, and `plugin/ngfw/DataBase/` is empty — the `.vdi` the plugin's VirtualBox
- * template points at was never installed. `USG5500` is retired outright
- * ("eNSP don't maintained this device any more, just keep it.") and has no image
- * either.
- *
- * Rather than guess, this module reads the catalogue and checks the files each
- * plugin model actually needs, so a topology can be rejected *before* the client is
- * started.
- *
- * @module dsh-ensp/compat
- */
-
-import { existsSync, readFileSync } from 'node:fs'
-import path from 'node:path'
-
-/** Default install root; override with `DSH_ENSP_EXE`'s directory or the `root` option. */
-export const DEFAULT_ENSP_ROOT = 'E:\\Huawei\\eNSP'
-
-/**
- * Files a plugin device needs beyond its catalogue entry.
- *
- * `USG6000V`'s VirtualBox template (`plugin/ngfw/tools/ngfw/vfw_usg_for_vbox5.0.vbox`)
- * carries `<HardDisk ... location="../../DataBase/vfw_usg.vdi"/>`, which resolves to
- * `plugin/ngfw/DataBase/vfw_usg.vdi` relative to that template.
- */
-const PLUGIN_ASSETS = {
-  USG6000V: [
-    {
-      rel: 'plugin/ngfw/DataBase/vfw_usg.vdi',
-      why: 'NGFW 镜像未安装（eNSP 安装时需勾选 USG6000V 组件）',
-    },
-  ],
-}
-
-/** Models the vendor has withdrawn; usable only if an image happens to exist. */
-const RETIRED = {
-  USG5500: 'eNSP 已停止维护 USG5500，安装包不再附带镜像，请改用 USG6000V',
-}
-
-/**
- * Static notes about devices that need an extra image, for documentation.
- *
- * Kept independent of the local installation so generated docs say the same thing
- * on every machine; `probeDevice` is the machine-specific check.
- */
-export const IMAGE_NOTES = {
-  USG6000V:
-    '需要 eNSP 安装时勾选 USG6000V 组件（NGFW 镜像，约 1 GB）。缺镜像时 eNSP 会打开拓扑后自行退出，' +
-    '`ensp up` 会在启动前直接报错说明缺什么。',
-  USG5500: 'eNSP 已停止维护该机型，安装包不再附带镜像，建议改用 USG6000V。',
-}
-
-/**
- * Device notes for a list of models, as `[model, note]` pairs.
- *
- * @param {string[]} models
- * @returns {Array<[string, string]>}
- */
-export function imageNotesFor(models) {
-  return [...new Set(models)].filter((m) => IMAGE_NOTES[m]).map((m) => [m, IMAGE_NOTES[m]])
-}
-
-const cache = new Map()
-
-/**
- * Parse `res/items.xml` into `{ model: { plugin, pluginPath, needRegister } }`.
- *
- * @param {string} root eNSP install directory
- * @returns {Map<string, {plugin: boolean, pluginPath: string, needRegister: boolean}>}
- */
-function readCatalogue(root) {
-  const file = path.join(root, 'res', 'items.xml')
-  if (cache.has(file)) return cache.get(file)
-
-  const table = new Map()
-  let xml = ''
-  try {
-    xml = readFileSync(file, 'utf8')
-  } catch {
-    cache.set(file, table)
-    return table
-  }
-
-  for (const m of xml.matchAll(/<model name="([^"]+)">([\s\S]*?)<\/model>/g)) {
-    const body = m[2]
-    const exe = /<executable isplugin="(\d)" path="([^"]*)"/.exec(body)
-    const reg = /<needRegister>(\d+)<\/needRegister>/.exec(body)
-    table.set(m[1], {
-      plugin: exe ? exe[1] === '1' : false,
-      pluginPath: exe ? exe[2] : '',
-      needRegister: reg ? reg[1] === '1' : false,
-    })
-  }
-  cache.set(file, table)
-  return table
-}
-
-/** Derive the install root from an explicit executable path. */
-export function rootFromExe(exe) {
-  return exe ? path.dirname(exe) : DEFAULT_ENSP_ROOT
-}
-
-/**
- * Can this model actually be started on this machine?
- *
- * @param {string} model
- * @param {{root?: string}} [options]
- * @returns {{model: string, available: boolean, reason?: string}}
- */
-export function probeDevice(model, options = {}) {
-  const root = options.root ?? DEFAULT_ENSP_ROOT
-  const entry = readCatalogue(root).get(model)
-
-  if (entry?.plugin && entry.pluginPath) {
-    const dll = path.join(root, 'plugin', entry.pluginPath.split('\\').join('/'))
-    if (!existsSync(dll)) {
-      return { model, available: false, reason: `插件缺失：${path.relative(root, dll)}` }
-    }
-  }
-
-  // Checked before the catalogue entry on purpose: the assets a model needs are a
-  // property of the model, not of the catalogue file. A machine with no eNSP
-  // installed at all still cannot start a USG6000V, and answering "available"
-  // because items.xml was unreadable would be the exact false negative this module
-  // exists to prevent.
-  for (const asset of PLUGIN_ASSETS[model] ?? []) {
-    if (!existsSync(path.join(root, asset.rel))) {
-      return { model, available: false, reason: asset.why }
-    }
-  }
-
-  if (RETIRED[model] && !hasAnyImage(root, model)) {
-    return { model, available: false, reason: RETIRED[model] }
-  }
-
-  // Unknown models are the caller's problem (a topology naming them is a different
-  // error), so stay permissive rather than blocking every lab on a stale catalogue.
-  return { model, available: true }
-}
-
-/**
- * Does any VirtualBox image under the eNSP tree look like it belongs to `model`?
- *
- * Used only for retired models, where the catalogue says nothing about the image.
- *
- * @param {string} root
- * @param {string} model
- */
-function hasAnyImage(root, model) {
-  const stem = model.toLowerCase()
-  const candidates = [
-    path.join(root, 'vboxserver'),
-    path.join(root, 'plugin'),
-  ]
-  for (const dir of candidates) {
-    if (!existsSync(dir)) continue
-    if (existsSync(path.join(dir, stem))) return true
-  }
-  return false
-}
-
-/**
- * Check every device in a parsed topology.
- *
- * @param {{devices: Array<{name: string, model: string}>}} topo
- * @param {{root?: string}} [options]
- * @returns {{ok: boolean, blocked: Array<{name: string, model: string, reason: string}>, checked: string[]}}
- */
-export function checkTopologySupport(topo, options = {}) {
-  const blocked = []
-  for (const device of topo.devices ?? []) {
-    const result = probeDevice(device.model, options)
-    if (!result.available) {
-      blocked.push({ name: device.name, model: device.model, reason: result.reason })
-    }
-  }
-  return {
-    ok: blocked.length === 0,
-    blocked,
-    checked: [...new Set((topo.devices ?? []).map((d) => d.model))].sort(),
-  }
-}
-
-/**
- * Build the error text for a blocked topology.
- *
- * Names the device, the model and what is missing, then says what to do. Repeated
- * models are grouped so a five-firewall lab prints one explanation, not five.
- *
- * @param {{blocked: Array<{name: string, model: string, reason: string}>}} report
- * @returns {string}
- */
-export function describeBlocked(report) {
-  const byModel = new Map()
-  for (const item of report.blocked) {
-    const group = byModel.get(item.model) ?? { reason: item.reason, names: [] }
-    group.names.push(item.name)
-    byModel.set(item.model, group)
-  }
-  const lines = [...byModel].map(
-    ([model, { reason, names }]) => `  ${model} (${names.join(', ')}): ${reason}`,
-  )
-  return (
-    'topology uses devices this eNSP installation cannot start:\n' +
-    lines.join('\n') +
-    '\n\nThis is not a bug in the topology: eNSP opens it, renders it, then quits. ' +
-    'Install the missing device image in eNSP (工具 → 注册设备, or reinstall eNSP with ' +
-    'the device component selected), or remove those devices from the topology.'
-  )
-}
-
-/** Forget cached catalogue reads (tests, and after installing a device image). */
-export function clearCatalogueCache() {
-  cache.clear()
-}
+/**
+ * Device availability checks.
+ *
+ * Some eNSP models are only stubs in the device catalogue: the entry exists, you
+ * can drop it on the canvas and save the topology, but the vendor image behind it
+ * is not installed. Placing one is not a soft failure — **the client opens the
+ * topology, paints it, and then exits by itself**, so the launch looks successful
+ * for a few seconds and everything downstream fails with a confusing
+ * "console never answered".
+ *
+ * That is exactly what happens here with `USG6000V`: `res/items.xml` declares it
+ * as `<executable isplugin="1" path="ngfw\ngfw_Plugin.dll"/>`, the plugin DLL is
+ * present, and `plugin/ngfw/DataBase/` is empty — the `.vdi` the plugin's VirtualBox
+ * template points at was never installed. `USG5500` is retired outright
+ * ("eNSP don't maintained this device any more, just keep it.") and has no image
+ * either.
+ *
+ * Rather than guess, this module reads the catalogue and checks the files each
+ * plugin model actually needs, so a topology can be rejected *before* the client is
+ * started.
+ *
+ * @module dsh-ensp/compat
+ */
+
+import { existsSync, readFileSync } from 'node:fs'
+import path from 'node:path'
+
+import { resolveEnspRoot } from './paths.mjs'
+
+/** Default install root; override with `DSH_ENSP_EXE`'s directory or the `root` option. */
+export const DEFAULT_ENSP_ROOT = 'E:\\Huawei\\eNSP'
+
+/**
+ * Files a plugin device needs beyond its catalogue entry.
+ *
+ * `USG6000V`'s VirtualBox template (`plugin/ngfw/tools/ngfw/vfw_usg_for_vbox5.0.vbox`)
+ * carries `<HardDisk ... location="../../DataBase/vfw_usg.vdi"/>`, which resolves to
+ * `plugin/ngfw/DataBase/vfw_usg.vdi` relative to that template.
+ */
+const PLUGIN_ASSETS = {
+  USG6000V: [
+    {
+      rel: 'plugin/ngfw/DataBase/vfw_usg.vdi',
+      why: 'NGFW 镜像未安装（eNSP 安装时需勾选 USG6000V 组件）',
+    },
+  ],
+}
+
+/** Models the vendor has withdrawn; usable only if an image happens to exist. */
+const RETIRED = {
+  USG5500: 'eNSP 已停止维护 USG5500，安装包不再附带镜像，请改用 USG6000V',
+}
+
+/**
+ * Static notes about devices that need an extra image, for documentation.
+ *
+ * Kept independent of the local installation so generated docs say the same thing
+ * on every machine; `probeDevice` is the machine-specific check.
+ */
+export const IMAGE_NOTES = {
+  USG6000V:
+    '需要 eNSP 安装时勾选 USG6000V 组件（NGFW 镜像，约 1 GB）。缺镜像时 eNSP 会打开拓扑后自行退出，' +
+    '`ensp up` 会在启动前直接报错说明缺什么。',
+  USG5500: 'eNSP 已停止维护该机型，安装包不再附带镜像，建议改用 USG6000V。',
+}
+
+/**
+ * Device notes for a list of models, as `[model, note]` pairs.
+ *
+ * @param {string[]} models
+ * @returns {Array<[string, string]>}
+ */
+export function imageNotesFor(models) {
+  return [...new Set(models)].filter((m) => IMAGE_NOTES[m]).map((m) => [m, IMAGE_NOTES[m]])
+}
+
+const cache = new Map()
+
+/**
+ * Parse `res/items.xml` into `{ model: { plugin, pluginPath, needRegister } }`.
+ *
+ * @param {string} root eNSP install directory
+ * @returns {Map<string, {plugin: boolean, pluginPath: string, needRegister: boolean}>}
+ */
+function readCatalogue(root) {
+  const file = path.join(root, 'res', 'items.xml')
+  if (cache.has(file)) return cache.get(file)
+
+  const table = new Map()
+  let xml = ''
+  try {
+    xml = readFileSync(file, 'utf8')
+  } catch {
+    cache.set(file, table)
+    return table
+  }
+
+  for (const m of xml.matchAll(/<model name="([^"]+)">([\s\S]*?)<\/model>/g)) {
+    const body = m[2]
+    const exe = /<executable isplugin="(\d)" path="([^"]*)"/.exec(body)
+    const reg = /<needRegister>(\d+)<\/needRegister>/.exec(body)
+    table.set(m[1], {
+      plugin: exe ? exe[1] === '1' : false,
+      pluginPath: exe ? exe[2] : '',
+      needRegister: reg ? reg[1] === '1' : false,
+    })
+  }
+  cache.set(file, table)
+  return table
+}
+
+/**
+ * Derive the install root from an explicit executable path.
+ *
+ * Falls back to the resolved install root, then to the historical default, so a
+ * caller that has no path at hand still gets a usable directory rather than
+ * silently reading the wrong catalogue.
+ */
+export function rootFromExe(exe) {
+  if (exe) return path.dirname(exe)
+  return resolveEnspRoot() ?? DEFAULT_ENSP_ROOT
+}
+
+/**
+ * Can this model actually be started on this machine?
+ *
+ * @param {string} model
+ * @param {{root?: string}} [options]
+ * @returns {{model: string, available: boolean, reason?: string}}
+ */
+export function probeDevice(model, options = {}) {
+  const root = options.root ?? DEFAULT_ENSP_ROOT
+  const entry = readCatalogue(root).get(model)
+
+  if (entry?.plugin && entry.pluginPath) {
+    const dll = path.join(root, 'plugin', entry.pluginPath.split('\\').join('/'))
+    if (!existsSync(dll)) {
+      return { model, available: false, reason: `插件缺失：${path.relative(root, dll)}` }
+    }
+  }
+
+  // Checked before the catalogue entry on purpose: the assets a model needs are a
+  // property of the model, not of the catalogue file. A machine with no eNSP
+  // installed at all still cannot start a USG6000V, and answering "available"
+  // because items.xml was unreadable would be the exact false negative this module
+  // exists to prevent.
+  for (const asset of PLUGIN_ASSETS[model] ?? []) {
+    if (!existsSync(path.join(root, asset.rel))) {
+      return { model, available: false, reason: asset.why }
+    }
+  }
+
+  if (RETIRED[model] && !hasAnyImage(root, model)) {
+    return { model, available: false, reason: RETIRED[model] }
+  }
+
+  // Unknown models are the caller's problem (a topology naming them is a different
+  // error), so stay permissive rather than blocking every lab on a stale catalogue.
+  return { model, available: true }
+}
+
+/**
+ * Does any VirtualBox image under the eNSP tree look like it belongs to `model`?
+ *
+ * Used only for retired models, where the catalogue says nothing about the image.
+ *
+ * @param {string} root
+ * @param {string} model
+ */
+function hasAnyImage(root, model) {
+  const stem = model.toLowerCase()
+  const candidates = [
+    path.join(root, 'vboxserver'),
+    path.join(root, 'plugin'),
+  ]
+  for (const dir of candidates) {
+    if (!existsSync(dir)) continue
+    if (existsSync(path.join(dir, stem))) return true
+  }
+  return false
+}
+
+/**
+ * Check every device in a parsed topology.
+ *
+ * @param {{devices: Array<{name: string, model: string}>}} topo
+ * @param {{root?: string}} [options]
+ * @returns {{ok: boolean, blocked: Array<{name: string, model: string, reason: string}>, checked: string[]}}
+ */
+export function checkTopologySupport(topo, options = {}) {
+  const blocked = []
+  for (const device of topo.devices ?? []) {
+    const result = probeDevice(device.model, options)
+    if (!result.available) {
+      blocked.push({ name: device.name, model: device.model, reason: result.reason })
+    }
+  }
+  return {
+    ok: blocked.length === 0,
+    blocked,
+    checked: [...new Set((topo.devices ?? []).map((d) => d.model))].sort(),
+  }
+}
+
+/**
+ * Build the error text for a blocked topology.
+ *
+ * Names the device, the model and what is missing, then says what to do. Repeated
+ * models are grouped so a five-firewall lab prints one explanation, not five.
+ *
+ * @param {{blocked: Array<{name: string, model: string, reason: string}>}} report
+ * @returns {string}
+ */
+export function describeBlocked(report) {
+  const byModel = new Map()
+  for (const item of report.blocked) {
+    const group = byModel.get(item.model) ?? { reason: item.reason, names: [] }
+    group.names.push(item.name)
+    byModel.set(item.model, group)
+  }
+  const lines = [...byModel].map(
+    ([model, { reason, names }]) => `  ${model} (${names.join(', ')}): ${reason}`,
+  )
+  return (
+    'topology uses devices this eNSP installation cannot start:\n' +
+    lines.join('\n') +
+    '\n\nThis is not a bug in the topology: eNSP opens it, renders it, then quits. ' +
+    'Install the missing device image in eNSP (工具 → 注册设备, or reinstall eNSP with ' +
+    'the device component selected), or remove those devices from the topology.'
+  )
+}
+
+/** Forget cached catalogue reads (tests, and after installing a device image). */
+export function clearCatalogueCache() {
+  cache.clear()
+}

package/src/core/console.mjs

@@ -195,6 +195,19 @@ export class ConsoleSession {
     return this.#prompt
   }
 
+  /**
+   * The hostname learned from the user-view prompt.
+   *
+   * Internal callers must pass it to `viewOf`. Without it a hostname containing a
+   * dash (`SW2-ACCESS`) makes every system-view prompt look like a sub-view, and
+   * the config engine ends up retrying quit/system-view instead of working.
+   *
+   * @returns {string|null}
+   */
+  get hostname() {
+    return this.#hostname
+  }
+
   /** @returns {'user'|'system'|'sub'|null} */
   get view() {
     return viewOf(this.#prompt, this.#hostname)
@@ -240,16 +253,17 @@ export class ConsoleSession {
    * @param {number} settleMs
    * @returns {Promise<string>} the transcript produced since the buffer was last cleared
    */
-  async #readToPrompt(timeoutMs, settleMs = 60) {
+  async #readToPrompt(timeoutMs, settleMs = 60, echo = null) {
     const started = Date.now()
     while (Date.now() - started < timeoutMs) {
       if (this.#closed) break
       const text = clean(this.#buf)
       // A confirmation question wins over a stale prompt: answer it explicitly.
       if (CONFIRM_RE.test(text.split('\n').slice(-3).join('\n'))) break
+      const sawEcho = !echo || text.includes(echo)
       // A pager stop is a terminal state too: nothing more will arrive until we
       // send a key, so waiting for a prompt here would burn the whole timeout.
-      if (PROMPT_RE.test(text) || PAGER_RE.test(text.trimEnd())) {
+      if (sawEcho && (PROMPT_RE.test(text) || PAGER_RE.test(text.trimEnd()))) {
         const before = this.#buf.length
         await this.#waitUntil(() => this.#buf.length !== before || this.#closed, settleMs)
         if (this.#buf.length === before) break
@@ -257,14 +271,23 @@ export class ConsoleSession {
         // Poll the buffer rather than sleeping a fixed slice: most commands reply
         // in a few milliseconds, and waiting 200 ms per line dominates the runtime
         // of a 300-line config.
-        await this.#waitUntil(() => PROMPT_RE.test(clean(this.#buf)) || PAGER_RE.test(clean(this.#buf).trimEnd()) || this.#closed, 25)
+        await this.#waitUntil(() => {
+          if (this.#closed) return true
+          const now = clean(this.#buf)
+          if (echo && !now.includes(echo)) return false
+          return PROMPT_RE.test(now) || PAGER_RE.test(now.trimEnd())
+        }, 25)
       }
     }
     const text = clean(this.#buf)
     this.#buf = ''
-    const found = text.match(/[<\[][\w~\-./:]*[>\]]\s*$/m) || text.trimEnd().match(/[<\[][\w~\-./:]*[>\]]$/)
-    if (found) {
-      this.#prompt = found[0].trim()
+    // The *last* prompt in the transcript is the current one. Matching with an
+    // `m` anchor and taking the first hit returns a prompt from the middle of the
+    // output, which is how a reply that still carried the previous prompt made the
+    // session believe it stood one view higher than it did.
+    const promptAt = [...text.matchAll(/[<\[][\w~\-./:]*[>\]]/g)].pop()
+    if (promptAt) {
+      this.#prompt = promptAt[0].trim()
       // Learn the hostname the first time we see the user-view prompt; it is the
       // only reliable anchor for telling `[R1-TEST]` (system) from `[R1-TEST-GE0/0/0]`.
       this.#hostname ??= hostnameOf(this.#prompt)
@@ -301,16 +324,11 @@ export class ConsoleSession {
 
     this.#buf = ''
     this.#line(command)
-    let output = await this.#readToPrompt(timeoutMs, entersView ? 200 : 60)
-
-    if (entersView) {
-      // If the echo is missing the device had not finished switching views yet;
-      // give it one more read window rather than moving on.
-      const echoed = output.includes(command.split(/\s+/)[0])
-      if (!echoed) {
-        output += await this.#readToPrompt(timeoutMs, 100)
-      }
-    }
+    // VRP echoes the command before it answers. Requiring that echo makes the
+    // prompt trustworthy: otherwise a prompt left over from the previous command
+    // can satisfy the match and the caller then acts on the wrong view.
+    const echo = command.split(/\s+/)[0]
+    let output = await this.#readToPrompt(timeoutMs, entersView ? 200 : 60, echo)
 
     // Answer at most one confirmation round; `save` and `reset` both use one.
     if (CONFIRM_RE.test(output) && !PROMPT_RE.test(output.trimEnd())) {

package/src/core/doctor.mjs

@@ -21,11 +21,9 @@ import path from 'node:path'
 import { checkTopologySupport, probeDevice } from './compat.mjs'
 import { DEFAULT_ANCHORS, calibrateAnchors } from './calibrate.mjs'
 import { enspPid, locateWindow } from './launcher.mjs'
+import { probePaths, resolveEnspRoot } from './paths.mjs'
 
-export const DEFAULT_ENSP_EXE = 'E:\\Huawei\\eNSP\\eNSP_Client.exe'
-export const DEFAULT_VBOX = 'E:\\VirtualBox\\VBoxManage.exe'
-
-const MIN_FREE_MEMORY_MB = 1024
+export const MIN_FREE_MEMORY_MB = 1024
 
 /** PowerShell helper that answers "does synthetic input reach this session?". */
 const INPUT_PROBE = String.raw`
@@ -172,33 +170,39 @@ function check(id, status, detail, fix) {
  * @param {boolean} [options.deep]   also run the input probe (slow: ~2 s)
  */
 export function doctor(options = {}) {
-  const exe = options.exe || DEFAULT_ENSP_EXE
-  const vbox = options.vbox || DEFAULT_VBOX
-  const root = options.root || path.dirname(exe)
+  const found = probePaths({ exe: options.exe, vbox: options.vbox })
+  const exe = found.ensp.path
+  const vbox = found.vbox.path
+  const root = options.root || resolveEnspRoot({ exe })
   const deep = options.deep !== false
   const checks = []
 
   // 1. eNSP client present
-  const exeOk = fs.existsSync(exe)
+  const exeOk = Boolean(exe) && fs.existsSync(exe)
   checks.push(
     check(
       'ensp-installed',
       exeOk ? 'pass' : 'fail',
-      exeOk ? exe : `not found: ${exe}`,
+      exeOk ? exe : 'not found in any configured or default location',
       exeOk
         ? undefined
-        : 'Install eNSP, or pass --exe with the real path to eNSP_Client.exe.',
+        : 'Install eNSP, or pass --exe with the full path to eNSP_Client.exe, '
+          + 'or set DSH_ENSP_EXE. Both the default install root and the Windows '
+          + 'install registry were checked.',
     ),
   )
 
   // 2. VirtualBox present (eNSP cannot boot a single device without it)
-  const vboxOk = fs.existsSync(vbox)
+  const vboxOk = Boolean(vbox) && fs.existsSync(vbox)
   checks.push(
     check(
       'virtualbox',
       vboxOk ? 'pass' : 'fail',
-      vboxOk ? vbox : `not found: ${vbox}`,
-      vboxOk ? undefined : 'Install VirtualBox 5.2.x, which ships with eNSP.',
+      vboxOk ? vbox : 'not found in PATH or any default location',
+      vboxOk
+        ? undefined
+        : 'Install VirtualBox 5.2.x, which ships with eNSP, or pass --vbox with '
+          + 'the full path to VBoxManage.exe, or set DSH_VBOX.',
     ),
   )
 
@@ -366,4 +370,3 @@ export function modelsOf(topology) {
 }
 
 /** Free-memory constant, exported so tests can assert against it. */
-export { MIN_FREE_MEMORY_MB }

package/src/core/index.mjs

@@ -69,8 +69,6 @@ export {
   freeMemoryMb,
   busyConsolePorts,
   modelsOf,
-  DEFAULT_ENSP_EXE,
-  DEFAULT_VBOX,
   MIN_FREE_MEMORY_MB,
 } from './doctor.mjs'
 
@@ -124,3 +122,12 @@ export {
   renderScenario,
   searchScenarios,
 } from './presets.mjs'
+
+export {
+  resolveEnspExe,
+  resolveVBoxManage,
+  resolveEnspRoot,
+  probePaths,
+  enspCandidates,
+  vboxCandidates,
+} from './paths.mjs'