herdr-remote 0.2.3 → 0.2.5

package/src/i18n/zh.js

@@ -4,7 +4,7 @@
 
 module.exports = {
   'app.name': 'Herdr Remote',
-  'app.tagline': '在浏览器里远程使用你的 Herdr 工作区',
+  'app.tagline': '在浏览器中使用 Herdr 工作区',
 
   'common.yes': '是',
   'common.no': '否',
@@ -23,11 +23,11 @@ module.exports = {
   'common.disabled': '已停用',
   'common.loading': '处理中…',
   'common.save': '保存设置',
-  'common.saved': '配置已保存到 {path}',
+  'common.saved': '配置已保存至 {path}',
   'common.back': '返回',
   'common.cancel': '取消',
   'common.confirm': '确认',
-  'common.pid': '进程 {pid}',
+  'common.pid': 'PID {pid}',
   'common.notApplicable': '不适用',
 
   'nav.overview': '概览',
@@ -40,12 +40,12 @@ module.exports = {
 
   'mode.local': '仅本机',
   'mode.lan': '局域网 / Tailscale',
-  'mode.official': '官方 relay（无需自建服务器）',
-  'mode.remote': '自建 relay',
-  'mode.local.description': 'relay 监听 127.0.0.1，只有本机浏览器能访问。',
-  'mode.lan.description': 'relay 监听 0.0.0.0（所有网卡），局域网或 tailnet 里的手机都能访问。',
-  'mode.official.description': '通过 Herdr Remote 官方 relay 从任意网络访问本机，无需部署任何服务器。终端流量会经过一台你无法控制的服务器，但只有你配对过的设备才能打开终端。',
-  'mode.remote.description': '不启动本地 relay。本机连接你自建的 relay，这是从外网访问的唯一方式。',
+  'mode.official': '官方 Relay',
+  'mode.remote': '自建 Relay',
+  'mode.local.description': '监听 127.0.0.1，仅本机可访问。',
+  'mode.lan.description': '监听 0.0.0.0，局域网与 Tailscale 设备可访问。',
+  'mode.official.description': '使用官方 Relay 跨网访问，无需自建服务器。',
+  'mode.remote.description': '连接自建 Relay 跨网访问。',
 
   'overview.title': '状态',
   'overview.mode': '访问方式',
@@ -56,26 +56,26 @@ module.exports = {
   'overview.keepalive': '保活服务',
   'overview.devices': '浏览器',
   'overview.hosts': '工作站',
-  'overview.uptime': 'Relay 运行时长',
+  'overview.uptime': 'Relay 运行时间',
   'overview.relayLocal': '本地，{bind}:{port}',
   'overview.relayRemote': '远程，{url}',
-  'overview.socketMissing': '未找到 — Herdr 在运行吗？',
+  'overview.socketMissing': '未找到，请确认 Herdr 是否运行',
   'overview.unreachable': '无法访问：{message}',
-  'overview.notStarted': '服务未运行，请到「服务」页面启动。',
+  'overview.notStarted': '服务未运行，可前往「服务」启动。',
 
   'pair.title': '配对设备',
-  'pair.generate': '生成一次性配对码',
-  'pair.regenerate': '重新生成配对码',
-  'pair.working': '正在启动服务并申请配对码…',
+  'pair.generate': '生成配对码',
+  'pair.regenerate': '重新生成',
+  'pair.working': '生成配对码中…',
   'pair.code': '配对码',
-  'pair.url': '在手机上打开',
+  'pair.url': '访问地址',
   'pair.expires': '剩余 {minutes}（至 {time}）',
-  'pair.expired': '配对码已过期，请重新生成。',
-  'pair.instructions': '打开链接、输入配对码，之后这台浏览器就长期可用了。',
-  'pair.qrHint': '用手机相机扫码即可打开链接。',
-  'pair.qrUnavailable': '终端宽度不足以显示二维码，请使用上面的链接。',
+  'pair.expired': '配对码已过期，需重新生成。',
+  'pair.instructions': '打开链接并输入配对码。',
+  'pair.qrHint': '扫描二维码打开链接。',
+  'pair.qrUnavailable': '终端宽度不足，无法显示二维码。',
   'pair.failed': '生成配对码失败：{message}',
-  'pair.hostOffline': 'relay 上还没有工作站连接，请先启动服务。',
+  'pair.hostOffline': 'Relay 未连接工作站，需先启动服务。',
 
   'services.title': '服务',
   'services.start': '启动服务',
@@ -86,39 +86,42 @@ module.exports = {
   'services.restarted': '服务已重启。',
   'services.startFailed': '启动服务失败：{message}',
   'services.stopFailed': '停止服务失败：{message}',
-  'services.unsavedBlocked': '有未保存的修改。请先保存，否则服务会用磁盘上的旧配置重启。',
-  'services.managedNotice': '服务由 {manager} 托管，已通过保活服务执行此操作。',
+  'services.unsavedBlocked': '配置未保存，请先保存再重启。',
+  'services.managedNotice': '由 {manager} 托管，已通过保活服务执行。',
   'services.logs': '最近日志',
-  'services.logEmpty': '暂无日志输出。',
+  'services.logEmpty': '暂无日志。',
   'services.logRelay': 'Relay',
   'services.logHost': '主机连接器',
 
   'relay.title': 'Relay 设置',
   'relay.settings': '设置',
+  'relay.locked': '固定',
+  'relay.officialFixed': '官方 relay 地址固定，不可修改。',
+  'relay.officialHint': '官方 relay：地址固定，无需密码。',
   'relay.password': 'Relay 密码',
-  'relay.passwordHint': '需与 relay 上的 RELAY_PASSWORD 一致。留空表示公用 relay。',
+  'relay.passwordHint': '须与 Relay 端的 RELAY_PASSWORD 一致。留空为公用 Relay。',
   'relay.passwordSet': '已设置',
-  'relay.passwordEmpty': '未设置（公用 relay）',
-  'relay.passwordSaved': 'Relay 密码已保存，重启服务后生效。',
+  'relay.passwordEmpty': '未设置（公用）',
+  'relay.passwordSaved': 'Relay 密码已保存，重启服务生效。',
   'relay.showPassword': '显示密码',
   'relay.hidePassword': '隐藏密码',
   'relay.identity': '工作站标识',
-  'relay.regenerate': '重新生成工作站标识',
-  'relay.regenerated': '已生成新的工作站标识，重启服务后会重新注册。',
-  'relay.envSnippet': 'relay 服务器启动命令',
-  'relay.envHint': '在 relay 主机上执行这条命令。',
-  'relay.test': '测试 relay 连接',
-  'relay.testOk': 'relay 可访问：版本 {version}，已连接 {hosts} 台工作站。',
-  'relay.testFailed': 'relay 无法访问：{message}',
-  'relay.selectAddress': '选择对外公布的地址',
+  'relay.regenerate': '重新生成标识',
+  'relay.regenerated': '已生成新标识，重启后重新注册。',
+  'relay.envSnippet': 'Relay 启动命令',
+  'relay.envHint': '在 Relay 主机执行此命令。',
+  'relay.test': '测试 Relay 连接',
+  'relay.testOk': 'Relay 可访问：版本 {version}，已连接 {hosts} 台工作站。',
+  'relay.testFailed': 'Relay 无法访问：{message}',
+  'relay.selectAddress': '选择公布地址',
   'relay.listenAddress': '监听地址',
-  'relay.listenAddressHint': '这是服务器绑定地址；下面的对外公布地址才是浏览器要打开的地址。',
+  'relay.listenAddressHint': '服务器绑定地址；浏览器访问下方公布地址。',
   'relay.addressTailscale': 'Tailscale',
   'relay.addressLan': '局域网',
   'relay.addressVirtual': '虚拟网卡',
   'relay.addressLoopback': '回环',
-  'relay.noAddresses': '没有找到非回环地址，请先连接网络或启动 Tailscale。',
-  'relay.docsHint': '自建 relay 请参阅 docs/self-hosted-relay.zh-CN.md',
+  'relay.noAddresses': '未找到非回环地址。',
+  'relay.docsHint': '自建指南：docs/self-hosted-relay.zh-CN.md',
 
   'keepalive.title': '后台保活服务',
   'keepalive.manager': '管理方式',
@@ -132,12 +135,12 @@ module.exports = {
   'keepalive.failed': '保活操作失败：{message}',
   'keepalive.unitPath': '单元文件',
   'keepalive.logsHint': '查看日志：{command}',
-  'keepalive.linger': '未登录也开机自启',
-  'keepalive.lingerEnabled': '已开启 linger：开机即启动。',
-  'keepalive.lingerDisabled': '未开启 linger，服务只在你登录期间运行。',
+  'keepalive.linger': '开机自启',
+  'keepalive.lingerEnabled': '已开启开机自启。',
+  'keepalive.lingerDisabled': '未开启开机自启（仅登录期间运行）。',
   'keepalive.enableLinger': '开启开机自启',
-  'keepalive.lingerDone': '已为 {username} 开启 linger。',
-  'keepalive.fallbackNote': '系统没有可用的服务管理器，改用内置的后台守护进程，重启电脑后不会自动恢复。',
+  'keepalive.lingerDone': '已为 {username} 开启开机自启。',
+  'keepalive.fallbackNote': '无系统服务管理器，使用后台守护进程，重启后不自动恢复。',
 
   'herdr.title': 'Herdr 集成',
   'herdr.socketPath': '套接字路径',
@@ -145,12 +148,12 @@ module.exports = {
   'herdr.plugin': '插件注册',
   'herdr.pluginRegistered': '已注册到 Herdr。',
   'herdr.pluginMissing': '尚未注册到 Herdr。',
-  'herdr.register': '把本包注册为 Herdr 插件',
-  'herdr.unregister': '取消注册 Herdr 插件',
+  'herdr.register': '注册为 Herdr 插件',
+  'herdr.unregister': '取消注册',
   'herdr.registerDone': '已注册：{path}',
-  'herdr.unregisterDone': '插件已取消注册。',
+  'herdr.unregisterDone': '已取消注册。',
   'herdr.registerFailed': '注册失败：{message}',
-  'herdr.cliMissing': 'PATH 中找不到 herdr 命令。',
+  'herdr.cliMissing': 'PATH 中未找到 herdr 命令。',
 
   'about.title': '语言与关于',
   'about.language': '界面语言',
@@ -161,24 +164,24 @@ module.exports = {
   'about.configPath': '配置文件',
   'about.statePath': '状态目录',
   'about.relayPackage': 'Relay 包',
-  'about.docs': '自建 relay 指南：docs/self-hosted-relay.zh-CN.md',
+  'about.docs': '自建指南：docs/self-hosted-relay.zh-CN.md',
 
   'wizard.title': '首次设置',
   'wizard.step': '第 {current} / {total} 步',
   'wizard.languageTitle': '选择语言',
-  'wizard.accessTitle': '你打算怎么访问这台机器？',
-  'wizard.accessHint': '之后可以在 Relay 页面随时修改。',
-  'wizard.addressTitle': '手机应该使用哪个地址？',
-  'wizard.relayTitle': '你的 relay 服务器',
+  'wizard.accessTitle': '选择访问方式',
+  'wizard.accessHint': '后续可在 Relay 页面修改。',
+  'wizard.addressTitle': '选择访问地址',
+  'wizard.relayTitle': 'Relay 服务器',
   'wizard.relayUrlLabel': 'Relay 地址（wss://…）',
-  'wizard.relayHint': 'relay 需要已经在运行。搭建方法见 docs/self-hosted-relay.zh-CN.md。',
-  'wizard.passwordTitle': 'Relay 密码',
-  'wizard.passwordHint': 'relay 启动时设置的 RELAY_PASSWORD。relay 没设密码就留空。',
+  'wizard.relayHint': 'Relay 需先运行。搭建指南见 docs/self-hosted-relay.zh-CN.md。',
+  'wizard.passwordTitle' : 'Relay 密码',
+  'wizard.passwordHint': 'Relay 的 RELAY_PASSWORD。未设留空。',
   'wizard.finishTitle': '完成',
-  'wizard.finishHint': '配置将保存到 {path}。',
+  'wizard.finishHint': '配置将保存至 {path}。',
   'wizard.startNow': '立即启动服务',
-  'wizard.installKeepalive': '让服务在后台保持运行',
-  'wizard.finish': '保存并继续',
+  'wizard.installKeepalive': '后台保活',
+  'wizard.finish': '保存并完成',
 
   'field.mode': '访问方式',
   'field.port': 'Relay 端口',
@@ -194,14 +197,14 @@ module.exports = {
   'placeholder.none': '无',
 
   'error.invalidMode': '未知的访问方式。',
-  'error.invalidPort': '端口必须是 1 到 65535 之间的数字。',
-  'error.invalidLanHost': '浏览器地址必须是可访问的局域网或 Tailscale 地址，不能填写回环地址或 0.0.0.0。',
-  'error.invalidRelayUrl': 'Relay 地址需以 wss://、ws://、https:// 或 http:// 开头。',
-  'error.invalidPublicUrl': '浏览器地址需以 https:// 或 http:// 开头，不能使用 0.0.0.0 或 ::。',
+  'error.invalidPort': '端口须为 1 到 65535 之间的数字。',
+  'error.invalidLanHost': '浏览器地址须为可访问局域网或 Tailscale 地址，不能为回环或 0.0.0.0。',
+  'error.invalidRelayUrl': 'Relay 地址须以 wss://、ws://、https:// 或 http:// 开头。',
+  'error.invalidPublicUrl': '浏览器地址须以 https:// 或 http:// 开头，不能为 0.0.0.0 或 ::。',
   'error.invalidLanguage': '未知的语言。',
   'error.invalidKeepalive': '未知的保活管理方式。',
   'error.unknownField': '未知的设置项。',
-  'error.remoteUrlRequired': '自建 relay 模式必须填写 Relay 地址。',
+  'error.remoteUrlRequired': '自建 Relay 模式须填写 Relay 地址。',
   'error.saveFailed': '保存配置失败：{message}',
 
   'hint.navigate': '↑↓ 移动',
@@ -213,20 +216,21 @@ module.exports = {
   'hint.mouseOn': 'm 关闭鼠标',
   'hint.mouseOff': 'm 开启鼠标',
   'hint.mouseUnsupported': '不支持鼠标',
-  'hint.restartRequired': '需要重启服务才能生效。',
-  'hint.unsavedChanges': '有未保存的修改 — 按 s 保存。',
+  'hint.restartRequired': '重启服务生效。',
+  'hint.unsavedChanges': '有未保存修改（按 s 保存）。',
   'hint.save': 's 保存',
   'hint.editing': '↵ 确认 · esc 取消',
   'update.title': '更新',
   'update.check': '检查更新',
-  'update.checking': '正在查询 npm…',
+  'update.checking': '查询 npm 中…',
   'update.upToDate': '已是最新（{version}）',
-  'update.available': '有新版本 {version} —— 按 Enter 安装',
-  'update.updating': '正在安装 {version}…',
-  'update.done': '已更新到 {version}',
-  'update.restartHint': '更新已安装，重启 herdr-remote 后生效。',
-  'update.errorNetwork': '无法连接 npm registry',
+  'update.available': '新版本 {version} 可用（按 Enter 安装）',
+  'update.updating': '安装 {version} 中…',
+  'update.done': '已更新至 {version}',
+  'update.restartHint': '更新已安装，重启 herdr-remote 生效。',
+  'update.errorNetwork': '所有 npm registry 均无法连接',
+  'update.errorNetworkDetail': '无 registry 应答：{message}',
   'update.errorFailed': '更新失败，可手动执行：npm install -g herdr-remote@latest',
-  'update.cannot.source': '当前从源码目录运行 —— 请用 git 更新，而不是 npm',
-  'update.cannot.linked': '当前是 npm link 的工作副本 —— 由 npm link 管理',
+  'update.cannot.source': '源码目录运行，请使用 git 更新',
+  'update.cannot.linked': 'npm link 工作副本，由 npm link 管理',
 };

package/src/service.js

@@ -166,6 +166,10 @@ function serviceSpecs(config = loadConfig(), state = ensureRuntime()) {
         RELAY_AUTH_STATE_FILE: relayAuthStatePath(),
         RELAY_ALLOWED_ORIGINS: (config.relay.allowedOrigins || []).join(','),
         RELAY_MAX_CLIENTS_PER_HOST: String(config.relay.maxClientsPerHost),
+        RELAY_MAX_HOSTS: String(config.relay.maxHosts),
+        RELAY_MAX_PENDING_HANDSHAKES: String(config.relay.maxPendingHandshakes),
+        RELAY_MAX_BUFFERED_BYTES_PER_CLIENT: String(config.relay.maxBufferedBytesPerClient),
+        RELAY_HOST_RECONNECT_GRACE_MS: String(config.relay.hostReconnectGraceMs),
       },
     });
   }
@@ -377,18 +381,26 @@ async function waitForRelay(config, { attempts = 20, delayMs = 100 } = {}) {
 }
 
 async function waitForHost(config, { attempts = 30, delayMs = 100 } = {}) {
-  let lastHealth = null;
+  const state = ensureRuntime();
+  const statusEndpoint = `${resolveAdminOrigin(config)}/api/status`;
+  let lastStatus = null;
   for (let attempt = 0; attempt < attempts; attempt += 1) {
     try {
-      lastHealth = await requestJson(healthUrl(config), { timeout: 800 });
-      if (lastHealth.hosts > 0) return lastHealth;
+      lastStatus = await requestJson(statusEndpoint, {
+        timeout: 800,
+        headers: {
+          'X-Herdr-Host-Id': state.hostId,
+          'X-Herdr-Host-Token': state.hostToken,
+        },
+      });
+      if (lastStatus.hosts?.some((host) => host.id === state.hostId)) return lastStatus;
     } catch (error) {
-      lastHealth = { ok: false, message: error.message };
+      lastStatus = { ok: false, message: error.message };
     }
     await new Promise((resolve) => setTimeout(resolve, delayMs));
   }
-  const error = new Error(lastHealth?.message || 'the Herdr host connector did not register with the relay');
-  error.health = lastHealth;
+  const error = new Error(lastStatus?.message || 'the Herdr host connector did not register with the relay');
+  error.health = lastStatus;
   throw error;
 }
 

package/src/settings-model.js

@@ -11,6 +11,7 @@ const {
   ACCESS_MODES,
   KEEPALIVE_MANAGERS,
   LANGUAGES,
+  OFFICIAL_RELAY_URL,
   configDir,
   configPath,
   isLoopbackHost,
@@ -40,6 +41,30 @@ const FIELDS = [
 
 const EMPTY = '';
 
+/**
+ * The access modes a *person* chooses between.
+ *
+ * The official relay is stored as `remote` with a known URL, because that is
+ * exactly what it is and nothing downstream should have to learn a fourth mode.
+ * It is still a separate answer to "how do I reach this workstation", though:
+ * one option needs no server and no credentials, the other needs both. Keeping
+ * that distinction here — rather than in whichever screen happens to draw it —
+ * is what stops the official relay from being displayed as "self-hosted relay"
+ * that merely happens to hold our address.
+ */
+const SELECTABLE_MODES = ['local', 'lan', 'official', 'remote'];
+
+/** Which of `SELECTABLE_MODES` this draft represents. */
+function selectedMode(draft) {
+  if (draft.relay.mode === 'remote' && draft.relay.remoteUrl === OFFICIAL_RELAY_URL) return 'official';
+  return draft.relay.mode;
+}
+
+/** True when the relay is the one we run, so its address and password are ours. */
+function isOfficialRelay(draft) {
+  return selectedMode(draft) === 'official';
+}
+
 function clone(value) {
   return JSON.parse(JSON.stringify(value));
 }
@@ -121,7 +146,22 @@ function setField(draft, id, rawValue) {
 
   switch (id) {
     case 'mode': {
-      if (!ACCESS_MODES.includes(value)) return { draft, errorKey: 'error.invalidMode' };
+      if (!SELECTABLE_MODES.includes(value)) return { draft, errorKey: 'error.invalidMode' };
+      // Picking the official relay fills in its address in the same edit: a
+      // remote mode with no URL is not a valid state, and asking for the
+      // address we already know would be asking the user to do our filing.
+      if (value === 'official') {
+        next.relay.mode = 'remote';
+        next.relay.remoteUrl = OFFICIAL_RELAY_URL;
+        next.relay.publicUrl = EMPTY;
+        break;
+      }
+      // Leaving the official relay clears its address, so the self-hosted URL
+      // field is empty and asking to be filled in rather than pre-loaded with
+      // an address that belongs to somebody else's server.
+      if (value === 'remote' && next.relay.remoteUrl === OFFICIAL_RELAY_URL) {
+        next.relay.remoteUrl = EMPTY;
+      }
       next.relay.mode = value;
       if (value === 'lan'
         && (isLoopbackHost(next.relay.lanHost) || isUnspecifiedAddress(next.relay.lanHost))) {
@@ -254,8 +294,11 @@ function requiresRestart(before, after) {
 
 module.exports = {
   FIELDS,
+  SELECTABLE_MODES,
   createDraft,
   fieldsForMode,
+  isOfficialRelay,
+  selectedMode,
   getField,
   getFieldPlaceholder,
   setField,

package/src/supervisor.js

@@ -5,7 +5,7 @@ const { spawn } = require('node:child_process');
 const { PACKAGE_ROOT, loadConfig, runtimeStatePath, stateDir } = require('./config');
 const { ensureDir, readJson, writeJsonAtomic } = require('./state');
 const { baseEnvironment, ensureRuntime, logPath, managedPids, pidAlive, recordManagedPid, serviceSpecs } = require('./service');
-const { EXIT_REPLACED } = require('./exit-codes');
+const { EXIT_REPLACED, EXIT_AUTH_FAILED } = require('./exit-codes');
 
 const MIN_BACKOFF_MS = 500;
 const MAX_BACKOFF_MS = 30_000;
@@ -132,6 +132,14 @@ class Supervisor {
         });
         return;
       }
+      if (code === EXIT_AUTH_FAILED) {
+        this.emit({
+          type: 'fatal',
+          name,
+          message: `${name} stopped: relay authentication failed. Update credentials before restarting it.`,
+        });
+        return;
+      }
       if (uptimeMs >= HEALTHY_UPTIME_MS) entry.backoffMs = MIN_BACKOFF_MS;
       this.emit({
         type: 'exited',

package/src/updater.js

@@ -8,12 +8,23 @@
 // checkout would replace the tree someone is working in.
 
 const fs = require('node:fs');
+const os = require('node:os');
 const path = require('node:path');
 const { spawn } = require('node:child_process');
 const { PACKAGE_ROOT } = require('./config');
 
 const PACKAGE_NAME = 'herdr-remote';
-const REGISTRY_URL = `https://registry.npmjs.org/${PACKAGE_NAME}/latest`;
+const DEFAULT_REGISTRY = 'https://registry.npmjs.org';
+
+/**
+ * A public mirror, tried last.
+ *
+ * `registry.npmjs.org` is not reachable from every network this runs on — in
+ * mainland China it usually is not — and "could not reach npm registry" on a
+ * machine that installs packages perfectly well is a bug report, not a
+ * diagnosis. The mirror is read-only and only ever asked for a version number.
+ */
+const MIRROR_REGISTRY = 'https://registry.npmmirror.com';
 
 function currentVersion() {
   try {
@@ -50,6 +61,59 @@ function canSelfUpdate() {
   return installKind() === 'npm';
 }
 
+function normalizeRegistry(value) {
+  if (typeof value !== 'string') return null;
+  const trimmed = value.trim().replace(/\/+$/, '');
+  if (!/^https?:\/\//i.test(trimmed)) return null;
+  return trimmed;
+}
+
+/** The `registry=` line from an npmrc file, if it has one. */
+function registryFromNpmrc(filePath) {
+  let contents;
+  try {
+    contents = fs.readFileSync(filePath, 'utf8');
+  } catch {
+    return null;
+  }
+  let found = null;
+  for (const rawLine of contents.split(/\r?\n/)) {
+    const line = rawLine.trim();
+    if (!line || line.startsWith('#') || line.startsWith(';')) continue;
+    const match = /^registry\s*=\s*(.+)$/i.exec(line);
+    // The last assignment wins, as it does for npm itself.
+    if (match) found = normalizeRegistry(match[1].replace(/^["']|["']$/g, ''));
+  }
+  return found;
+}
+
+/**
+ * Where to ask, in the order to ask.
+ *
+ * Whatever npm itself is configured to use comes first: a machine behind a
+ * corporate proxy or on a mirror has already answered this question, and
+ * ignoring that answer is what made the check fail on a machine where
+ * `npm install` works. The public registry and then a public mirror follow, so
+ * a private registry that does not carry this package is not the end of it.
+ */
+function registryCandidates({ env = process.env, home = os.homedir(), cwd = process.cwd() } = {}) {
+  const candidates = [];
+  const add = (value) => {
+    const normalized = normalizeRegistry(value);
+    if (normalized && !candidates.includes(normalized)) candidates.push(normalized);
+  };
+
+  // npm exports its whole config into the environment of anything it runs.
+  add(env.npm_config_registry);
+  add(env.NPM_CONFIG_REGISTRY);
+  add(env.HERDR_REMOTE_REGISTRY);
+  add(registryFromNpmrc(path.join(cwd, '.npmrc')));
+  add(registryFromNpmrc(path.join(home, '.npmrc')));
+  add(DEFAULT_REGISTRY);
+  add(MIRROR_REGISTRY);
+  return candidates;
+}
+
 /** Compare two `MAJOR.MINOR.PATCH` strings. Returns 1, -1 or 0. */
 function compareVersions(a, b) {
   const parse = (value) => String(value)
@@ -66,40 +130,69 @@ function compareVersions(a, b) {
   return 0;
 }
 
-/**
- * Ask the registry what the current release is.
- *
- * Never throws: an update check is a convenience, and a machine that is offline
- * or behind a proxy should still get a working settings screen.
- */
-async function checkForUpdate({ timeoutMs = 8000, fetchImpl = globalThis.fetch } = {}) {
-  const current = currentVersion();
+/** One registry, one question: what is the latest published version? */
+async function askRegistry(registry, { timeoutMs, fetchImpl }) {
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), timeoutMs);
   try {
-    const response = await fetchImpl(REGISTRY_URL, {
+    const response = await fetchImpl(`${registry}/${PACKAGE_NAME}/latest`, {
       signal: controller.signal,
       headers: { Accept: 'application/vnd.npm.install-v1+json' },
     });
-    if (!response.ok) {
-      return { ok: false, current, errorKey: 'update.errorNetwork' };
-    }
+    if (!response.ok) return { ok: false, message: `HTTP ${response.status ?? '?'}` };
     const body = await response.json();
     const latest = typeof body?.version === 'string' ? body.version : null;
-    if (!latest) return { ok: false, current, errorKey: 'update.errorNetwork' };
-    return {
-      ok: true,
-      current,
-      latest,
-      updateAvailable: compareVersions(latest, current) > 0,
-    };
-  } catch {
-    return { ok: false, current, errorKey: 'update.errorNetwork' };
+    if (!latest) return { ok: false, message: 'registry answered without a version' };
+    return { ok: true, latest };
+  } catch (error) {
+    return { ok: false, message: error?.name === 'AbortError' ? 'timed out' : String(error?.message || error) };
   } finally {
     clearTimeout(timer);
   }
 }
 
+/**
+ * Ask what the current release is.
+ *
+ * Never throws: an update check is a convenience, and a machine that is offline
+ * or behind a proxy should still get a working settings screen. Each configured
+ * registry is tried in turn, because the first one is only a guess at which
+ * mirror this machine can actually reach.
+ */
+async function checkForUpdate({
+  timeoutMs = 6000,
+  fetchImpl = globalThis.fetch,
+  registries = registryCandidates(),
+} = {}) {
+  const current = currentVersion();
+  const failures = [];
+
+  for (const registry of registries) {
+    const attempt = await askRegistry(registry, { timeoutMs, fetchImpl });
+    if (attempt.ok) {
+      return {
+        ok: true,
+        current,
+        latest: attempt.latest,
+        registry,
+        updateAvailable: compareVersions(attempt.latest, current) > 0,
+      };
+    }
+    failures.push(`${registry}: ${attempt.message}`);
+  }
+
+  // The reason is carried out with the failure. "Could not reach npm registry"
+  // with nothing after it leaves the user guessing between DNS, a proxy, a
+  // firewall and a mirror that does not carry the package.
+  return {
+    ok: false,
+    current,
+    errorKey: 'update.errorNetwork',
+    message: failures.join('; '),
+    triedRegistries: registries,
+  };
+}
+
 /**
  * Install the newest release over this one.
  *
@@ -113,6 +206,11 @@ function performUpdate({
   // Seam for tests: the suite runs from a checkout, where the guard below is
   // correctly the only reachable outcome.
   installKindImpl = installKind,
+  // The registry that just answered the version check. Installing from
+  // somewhere the machine has been shown to reach beats installing from a
+  // default it may have no route to. Empty means "whatever npm is configured
+  // with", which is the right answer when no check has run.
+  registry = '',
 } = {}) {
   return new Promise((resolve) => {
     const kind = installKindImpl();
@@ -120,7 +218,10 @@ function performUpdate({
       resolve({ ok: false, errorKey: `update.cannot.${kind}` });
       return;
     }
-    const child = spawnImpl('npm', ['install', '-g', `${PACKAGE_NAME}@latest`], {
+    const args = ['install', '-g', `${PACKAGE_NAME}@latest`];
+    const normalizedRegistry = normalizeRegistry(registry);
+    if (normalizedRegistry) args.push('--registry', normalizedRegistry);
+    const child = spawnImpl('npm', args, {
       encoding: 'utf8',
       timeout: timeoutMs,
     });
@@ -139,10 +240,13 @@ function performUpdate({
 
 module.exports = {
   PACKAGE_NAME,
+  DEFAULT_REGISTRY,
+  MIRROR_REGISTRY,
   canSelfUpdate,
   checkForUpdate,
   compareVersions,
   currentVersion,
   installKind,
   performUpdate,
+  registryCandidates,
 };