herdr-remote 0.2.33 → 0.2.35

package/README.md

@@ -7,11 +7,13 @@ Web terminal client for [Herdr](https://herdr.dev) workspaces. Mobile-friendly U
 ## Installation & Usage
 
 ```bash
-npm install -g herdr-remote
+npm install -g https://github.com/dibin666/herdr-remote/releases/latest/download/herdr-remote.tgz
 herdr-remote
 ```
 
 Running `herdr-remote` without arguments launches the setup wizard and configuration TUI.
+Releases go to [GitHub Releases](https://github.com/dibin666/herdr-remote/releases) first and to
+npm as a fallback (`npm install -g herdr-remote`); `herdr-remote update` follows the same order.
 
 Native Windows 10/11 is supported with Node.js 22+; install Herdr from PowerShell with
 `powershell -ExecutionPolicy Bypass -c "irm https://herdr.dev/install.ps1 | iex"`.

package/README.zh-CN.md

@@ -7,11 +7,12 @@
 ## 安装与运行
 
 ```bash
-npm install -g herdr-remote
+npm install -g https://github.com/dibin666/herdr-remote/releases/latest/download/herdr-remote.tgz
 herdr-remote
 ```
 
 直接运行 `herdr-remote` 即可启动向导并进入配置 TUI。
+新版本先发布到 [GitHub Releases](https://github.com/dibin666/herdr-remote/releases)，npm 作为备用渠道（`npm install -g herdr-remote`）；`herdr-remote update` 按同样的顺序更新。
 
 已支持 Windows 10/11 原生运行（需 Node.js 22+），请在 PowerShell 中执行
 `powershell -ExecutionPolicy Bypass -c "irm https://herdr.dev/install.ps1 | iex"` 安装 Herdr。

package/dist/i18n/en.js

@@ -229,16 +229,16 @@ const en = {
     'update.title': 'Updates',
     'update.banner': 'herdr-remote {latest} is out (running {current}). Press 7 and Enter on the update row to install.',
     'update.check': 'Check for updates',
-    'update.checking': 'Checking npm…',
+    'update.checking': 'Checking GitHub Releases and npm…',
     'update.upToDate': 'Up to date ({version})',
     'update.available': 'Update {version} available (press Enter to install)',
     'update.updating': 'Installing {version}…',
     'update.updatingRetry': 'Installing {version}… (npm has not caught up yet, attempt {attempt})',
     'update.done': 'Updated to {version}',
     'update.restartHint': 'Update installed. Restart herdr-remote to apply.',
-    'update.errorNetwork': 'Could not reach any npm registry',
-    'update.errorNetworkDetail': 'No registry answered: {message}',
-    'update.errorFailed': 'Update failed. Run: npm install -g herdr-remote@{version} --prefer-online',
+    'update.errorNetwork': 'Could not reach GitHub Releases or any npm registry',
+    'update.errorNetworkDetail': 'Nothing answered: {message}',
+    'update.errorFailed': 'Update failed. Run: npm install -g {url}',
     'update.errorFailedDetail': 'npm: {message}',
     'update.errorNotYetPublished': 'npm has not caught up with {version} yet (common in the first minutes after a release). Press Enter to try again shortly.',
     'update.errorNotApplied': 'npm reported success, but {installed} is still installed',
@@ -253,18 +253,5 @@ const en = {
     'update.brokerRestartFailed': 'The admin terminal broker did not start again. Sign out of Windows and back in, or run herdr-remote admin-broker restart.',
     'update.brokerBusy': 'An admin terminal is open, so the broker keeps running the previous release. Close admin terminals, then run herdr-remote admin-broker restart.',
     'update.errorBusy': "A process still holds the herdr-remote folder; an admin terminal broker set up by an older release does. In an administrator PowerShell run: Get-ScheduledTask -TaskName 'HerdrRemoteAdminBroker-*' | Stop-ScheduledTask. Then run herdr-remote update again here, and afterwards herdr-remote admin-broker install as administrator.",
-    'relayUpdate.check': 'Relay {version}: check for updates',
-    'relayUpdate.checking': 'Relay: checking npm…',
-    'relayUpdate.upToDate': 'Relay up to date ({version})',
-    'relayUpdate.available': 'Relay {latest} available, installed {installed} (press Enter to install)',
-    'relayUpdate.needsCli': 'Relay {latest} needs a newer herdr-remote: update herdr-remote first',
-    'relayUpdate.updating': 'Installing relay {version}…',
-    'relayUpdate.updatingRetry': 'Installing relay {version}… (npm has not caught up yet, attempt {attempt})',
-    'relayUpdate.restart': 'Relay {version} installed, {running} still running (press Enter to restart)',
-    'relayUpdate.restarting': 'Restarting herdr-remote…',
-    'relayUpdate.restarted': 'herdr-remote restarted; the relay now runs {version}.',
-    'relayUpdate.done': 'Relay updated to {version}',
-    'relayUpdate.errorNotApplied': 'npm finished, but relay {installed} is still installed',
-    'relayUpdate.banner': 'Relay {latest} is out (installed {current}). Press 7 and Enter on the relay row to install.',
 };
 export default en;

package/dist/i18n/zh.js

@@ -228,16 +228,16 @@ const zh = {
     'update.title': '更新',
     'update.banner': 'herdr-remote {latest} 已发布（当前 {current}），按 7 进入「语言与关于」，在更新一行按 Enter 安装。',
     'update.check': '检查更新',
-    'update.checking': '查询 npm 中…',
+    'update.checking': '查询 GitHub Releases 与 npm 中…',
     'update.upToDate': '已是最新（{version}）',
     'update.available': '新版本 {version} 可用（按 Enter 安装）',
     'update.updating': '安装 {version} 中…',
     'update.updatingRetry': '安装 {version} 中…（npm 尚未同步，第 {attempt} 次尝试）',
     'update.done': '已更新至 {version}',
     'update.restartHint': '更新已安装，重启 herdr-remote 生效。',
-    'update.errorNetwork': '所有 npm registry 均无法连接',
-    'update.errorNetworkDetail': '无 registry 应答：{message}',
-    'update.errorFailed': '更新失败，可手动执行：npm install -g herdr-remote@{version} --prefer-online',
+    'update.errorNetwork': 'GitHub Releases 与所有 npm registry 均无法连接',
+    'update.errorNetworkDetail': '均无应答：{message}',
+    'update.errorFailed': '更新失败，可手动执行：npm install -g {url}',
     'update.errorFailedDetail': 'npm：{message}',
     'update.errorNotYetPublished': 'npm 还没同步到 {version}（刚发布的几分钟内常见），稍后按 Enter 重试。',
     'update.errorNotApplied': 'npm 报告成功，但安装的仍是 {installed}',
@@ -252,18 +252,5 @@ const zh = {
     'update.brokerRestartFailed': '管理员终端 broker 没有重新启动。重新登录 Windows，或运行 herdr-remote admin-broker restart。',
     'update.brokerBusy': '有管理员终端开着，broker 继续运行旧版本。关闭所有管理员终端后运行 herdr-remote admin-broker restart。',
     'update.errorBusy': "仍有进程占用 herdr-remote 的安装目录，旧版本设置的管理员终端 broker 会这样。先在管理员 PowerShell 中执行：Get-ScheduledTask -TaskName 'HerdrRemoteAdminBroker-*' | Stop-ScheduledTask，再回到这里重新运行 herdr-remote update，最后以管理员身份运行 herdr-remote admin-broker install。",
-    'relayUpdate.check': 'Relay {version}：检查更新',
-    'relayUpdate.checking': 'Relay：查询 npm 中…',
-    'relayUpdate.upToDate': 'Relay 已是最新（{version}）',
-    'relayUpdate.available': 'Relay 新版本 {latest} 可用，当前 {installed}（按 Enter 安装）',
-    'relayUpdate.needsCli': 'Relay {latest} 需要更新 herdr-remote，请先更新上一行',
-    'relayUpdate.updating': '安装 relay {version} 中…',
-    'relayUpdate.updatingRetry': '安装 relay {version} 中…（npm 尚未同步，第 {attempt} 次尝试）',
-    'relayUpdate.restart': 'Relay {version} 已安装，运行中的仍是 {running}（按 Enter 重启生效）',
-    'relayUpdate.restarting': '正在重启 herdr-remote…',
-    'relayUpdate.restarted': 'herdr-remote 已重启，relay 现在运行 {version}。',
-    'relayUpdate.done': 'Relay 已更新至 {version}',
-    'relayUpdate.errorNotApplied': 'npm 已完成，但安装的仍是 relay {installed}',
-    'relayUpdate.banner': 'Relay {latest} 已发布（当前 {current}），按 7 进入「语言与关于」，在 Relay 一行按 Enter 安装。',
 };
 export default zh;

package/dist/tui/App.js

@@ -3,7 +3,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Box, Text, useApp, useInput } from 'ink';
 import { useMouse, useMouseTarget } from './mouse/index.js';
 import { theme } from './theme.js';
-import { checkForRelayUpdate, checkForUpdate, createDraft, createTranslator, detectLocale, ensureRuntime, fullStatus, loadConfig, requiresRestart, runsLocalRelay, updateChecksEnabled, } from './api.js';
+import { checkForUpdate, createDraft, createTranslator, detectLocale, ensureRuntime, fullStatus, loadConfig, requiresRestart, updateChecksEnabled, } from './api.js';
 import { Overview } from './screens/Overview.js';
 import { PairScreen } from './screens/Pair.js';
 import { Services } from './screens/Services.js';
@@ -30,7 +30,7 @@ function Tab({ label, active, onSelect, }) {
 function Footer({ hints }) {
     return (_jsx(Box, { marginTop: 1, paddingX: 1, children: _jsx(Text, { color: theme.muted, children: hints.join('  ·  ') }) }));
 }
-export function App({ initialLanguage, needsWizard, updateChecker = updateChecksEnabled() ? checkForUpdate : null, relayUpdateChecker = updateChecksEnabled() ? checkForRelayUpdate : null, }) {
+export function App({ initialLanguage, needsWizard, updateChecker = updateChecksEnabled() ? checkForUpdate : null, }) {
     const { exit } = useApp();
     const mouse = useMouse();
     const [config, setConfig] = useState(() => loadConfig());
@@ -43,8 +43,6 @@ export function App({ initialLanguage, needsWizard, updateChecker = updateChecks
     const [editingId, setEditingId] = useState(null);
     const [wizardDone, setWizardDone] = useState(!needsWizard);
     const [updateCheck, setUpdateCheck] = useState(null);
-    const [relayUpdateCheck, setRelayUpdateCheck] = useState(null);
-    const localRelay = runsLocalRelay(config);
     // Every time the TUI opens: that is when someone is here to act on it.
     // Failure says nothing; the About tab can still be asked by hand.
     useEffect(() => {
@@ -61,21 +59,6 @@ export function App({ initialLanguage, needsWizard, updateChecker = updateChecks
             cancelled = true;
         };
     }, [updateChecker]);
-    // A relay somewhere else is somebody else's to update.
-    useEffect(() => {
-        if (!relayUpdateChecker || !localRelay)
-            return undefined;
-        let cancelled = false;
-        relayUpdateChecker()
-            .then((result) => {
-            if (!cancelled && result?.ok)
-                setRelayUpdateCheck(result);
-        })
-            .catch(() => { });
-        return () => {
-            cancelled = true;
-        };
-    }, [relayUpdateChecker, localRelay]);
     const locale = useMemo(() => detectLocale({ preference: initialLanguage ?? draft.ui.language }), [initialLanguage, draft.ui.language]);
     const t = useMemo(() => createTranslator(locale), [locale]);
     const dirty = useMemo(() => JSON.stringify(config) !== JSON.stringify(draft), [config, draft]);
@@ -153,8 +136,6 @@ export function App({ initialLanguage, needsWizard, updateChecker = updateChecks
         message,
         updateCheck,
         setUpdateCheck,
-        relayUpdateCheck,
-        setRelayUpdateCheck,
     };
     useInput((input, key) => {
         if (key.ctrl && input === 'c') {
@@ -214,8 +195,5 @@ export function App({ initialLanguage, needsWizard, updateChecker = updateChecks
             : t('hint.mouseUnsupported'),
         t('hint.quit'),
     ].filter(Boolean);
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, paddingY: 1, children: [_jsxs(Box, { marginBottom: 1, flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: t('app.name') }), _jsx(Text, { color: theme.muted, children: `  ${t('app.tagline')}` })] }), updateCheck?.updateAvailable ? (_jsx(Text, { color: theme.warn, children: t('update.banner', { latest: updateCheck.latest ?? '', current: updateCheck.current }) })) : null, localRelay && relayUpdateCheck?.updateAvailable ? (_jsx(Text, { color: theme.warn, children: t('relayUpdate.banner', {
-                            latest: relayUpdateCheck.latest ?? '',
-                            current: relayUpdateCheck.current,
-                        }) })) : null] }), _jsx(Box, { marginBottom: 1, children: TABS.map((entry, entryIndex) => (_jsx(Tab, { label: `${entryIndex + 1} ${t(entry.labelKey)}`, active: entry.id === tab, onSelect: () => setTab(entry.id) }, entry.id))) }), tab === 'overview' ? _jsx(Overview, { ctx: context }) : null, tab === 'pair' ? _jsx(PairScreen, { ctx: context }) : null, tab === 'services' ? _jsx(Services, { ctx: context }) : null, tab === 'relay' ? _jsx(RelayScreen, { ctx: context }) : null, tab === 'keepalive' ? _jsx(Keepalive, { ctx: context }) : null, tab === 'herdr' ? _jsx(HerdrScreen, { ctx: context }) : null, tab === 'about' ? _jsx(About, { ctx: context }) : null, restartPending ? (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.warn, children: t('hint.restartRequired') }) })) : null, _jsx(Footer, { hints: hints })] }));
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, paddingY: 1, children: [_jsxs(Box, { marginBottom: 1, flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: t('app.name') }), _jsx(Text, { color: theme.muted, children: `  ${t('app.tagline')}` })] }), updateCheck?.updateAvailable ? (_jsx(Text, { color: theme.warn, children: t('update.banner', { latest: updateCheck.latest ?? '', current: updateCheck.current }) })) : null] }), _jsx(Box, { marginBottom: 1, children: TABS.map((entry, entryIndex) => (_jsx(Tab, { label: `${entryIndex + 1} ${t(entry.labelKey)}`, active: entry.id === tab, onSelect: () => setTab(entry.id) }, entry.id))) }), tab === 'overview' ? _jsx(Overview, { ctx: context }) : null, tab === 'pair' ? _jsx(PairScreen, { ctx: context }) : null, tab === 'services' ? _jsx(Services, { ctx: context }) : null, tab === 'relay' ? _jsx(RelayScreen, { ctx: context }) : null, tab === 'keepalive' ? _jsx(Keepalive, { ctx: context }) : null, tab === 'herdr' ? _jsx(HerdrScreen, { ctx: context }) : null, tab === 'about' ? _jsx(About, { ctx: context }) : null, restartPending ? (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.warn, children: t('hint.restartRequired') }) })) : null, _jsx(Footer, { hints: hints })] }));
 }

package/dist/tui/api.js

@@ -16,9 +16,9 @@ import { ensureRuntime, regenerateHostIdentity, setRelayPassword } from '../runt
 import { pair, readLogTail } from '../service.js';
 import { fullStatus, restartAll, startAll, stopAll, whileServicesStopped } from '../lifecycle.js';
 import * as keepalive from '../keepalive/index.js';
-import { canSelfUpdate, checkForUpdate, compareVersions, currentVersion, updateChecksEnabled, installKind, performUpdate, } from '../updater.js';
-import { checkForRelayUpdate, installedRelayVersion, performRelayUpdate, } from '../relay-updater.js';
-export { detectLocale, listReachableAddresses, MIN_HERDR_VERSION, OFFICIAL_RELAY_URL, isOfficialRelay, selectedMode, canSelfUpdate, checkForUpdate, compareVersions, currentVersion, updateChecksEnabled, installKind, performUpdate, checkForRelayUpdate, installedRelayVersion, performRelayUpdate, runsLocalRelay, bindAddress, configExists, configPath, createDraft, createTranslator, ensureRuntime, extractPairingCode, fieldsForMode, fullStatus, getField, getFieldPlaceholder, herdrVersion, keepalive, loadConfig, pair, readLogTail, regenerateHostIdentity, requiresRestart, restartAll, saveDraft, setField, setRelayPassword, startAll, stateDir, stopAll, whileServicesStopped, };
+import { canSelfUpdate, checkForUpdate, currentVersion, updateChecksEnabled, installKind, installedRelayVersion, performUpdate, } from '../updater.js';
+export { cliTarballUrl } from 'herdr-remote-relay/protocol';
+export { detectLocale, listReachableAddresses, MIN_HERDR_VERSION, OFFICIAL_RELAY_URL, isOfficialRelay, selectedMode, canSelfUpdate, checkForUpdate, currentVersion, updateChecksEnabled, installKind, performUpdate, installedRelayVersion, runsLocalRelay, bindAddress, configExists, configPath, createDraft, createTranslator, ensureRuntime, extractPairingCode, fieldsForMode, fullStatus, getField, getFieldPlaceholder, herdrVersion, keepalive, loadConfig, pair, readLogTail, regenerateHostIdentity, requiresRestart, restartAll, saveDraft, setField, setRelayPassword, startAll, stateDir, stopAll, whileServicesStopped, };
 export async function adminBrokerStatus({ waitForStart = false } = {}) {
     if (process.platform !== 'win32')
         return false;

package/dist/tui/screens/About.js

@@ -2,18 +2,17 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from 'react';
 import { Box, Text, useInput } from 'ink';
 import { theme } from '../theme.js';
-import { useRelayUpdate } from './useRelayUpdate.js';
 import { Message, Panel, Row, Selectable } from '../components/common.js';
-import { canSelfUpdate, checkForUpdate, configPath, currentVersion, detectLocale, installKind, performUpdate, saveDraft, setField, stateDir, whileServicesStopped, } from '../api.js';
+import { canSelfUpdate, cliTarballUrl, checkForUpdate, configPath, currentVersion, detectLocale, installKind, installedRelayVersion, performUpdate, runsLocalRelay, saveDraft, setField, stateDir, whileServicesStopped, } from '../api.js';
 /** `https://registry.npmmirror.com` → `registry.npmmirror.com`, for one line of text. */
-const registryHost = (registry) => registry.replace(/^https?:\/\//, '');
+const sourceHost = (source) => source.replace(/^https?:\/\//, '');
 export function About({ ctx }) {
     const { t, draft } = ctx;
     const [selected, setSelected] = useState('auto');
     const [update, setUpdate] = useState({ phase: 'idle' });
-    /** Why the install will come from somewhere other than npm's own registry. */
+    /** Why the install will come from somewhere other than where some sources said. */
     const [sourceNote, setSourceNote] = useState(null);
-    const checkRef = useState(() => ({ current: { registry: '', sources: [] } }))[0];
+    const checkRef = useState(() => ({ current: { source: '', sources: [] } }))[0];
     const detected = detectLocale({ preference: 'auto' });
     const languageOptions = [
         { id: 'auto', label: t('about.languageAuto', { detected }) },
@@ -43,24 +42,19 @@ export function About({ ctx }) {
                 return t('update.check');
         }
     })();
-    const relay = useRelayUpdate(ctx);
-    const options = [
-        ...languageOptions,
-        { id: 'update', label: updateLabel },
-        ...(relay.visible ? [{ id: 'relay-update', label: relay.label }] : []),
-    ];
+    const options = [...languageOptions, { id: 'update', label: updateLabel }];
     /** Show a check's answer, whether this screen asked or the TUI did on opening. */
     const applyCheck = (result) => {
-        checkRef.current = { registry: result.registry ?? '', sources: result.sources ?? [] };
-        // A mirror that has not synced the release yet used to be the whole
+        checkRef.current = { source: result.source ?? '', sources: result.sources ?? [] };
+        // A registry that has not synced the release yet used to be the whole
         // answer. It is still asked, and said to be behind.
         const behind = result.behind ?? [];
-        setSourceNote(result.updateAvailable && behind.length > 0 && result.registry
+        setSourceNote(result.updateAvailable && behind.length > 0 && result.source
             ? {
                 registries: behind
-                    .map((entry) => `${registryHost(entry.registry)} ${entry.version ?? ''}`.trim())
+                    .map((entry) => `${sourceHost(entry.source)} ${entry.version ?? ''}`.trim())
                     .join(', '),
-                source: registryHost(result.registry),
+                source: sourceHost(result.source),
             }
             : null);
         setUpdate(result.updateAvailable
@@ -79,7 +73,7 @@ export function About({ ctx }) {
         const result = await checkForUpdate();
         if (!result.ok) {
             setUpdate({ phase: 'error', messageKey: result.errorKey ?? 'update.errorNetwork' });
-            // Which registries were tried, and what each of them said. Without this
+            // Which sources were tried, and what each of them said. Without this
             // the row reads "could not reach npm registry" on a machine where
             // `npm install` works perfectly, and there is nothing to act on.
             const { message } = result;
@@ -93,13 +87,17 @@ export function About({ ctx }) {
     const runUpdate = async (latest) => {
         setUpdate({ phase: 'updating', latest, attempt: 1 });
         const result = await whileServicesStopped(ctx.config, () => performUpdate({
-            registry: checkRef.current.registry,
+            source: checkRef.current.source,
             sources: checkRef.current.sources,
             version: latest,
             onAttempt: ({ attempt }) => setUpdate({ phase: 'updating', latest, attempt }),
         }));
         if (!result.ok) {
-            const params = { version: latest, installed: result.installed ?? '' };
+            const params = {
+                version: latest,
+                installed: result.installed ?? '',
+                url: cliTarballUrl(latest),
+            };
             setUpdate({ phase: 'error', messageKey: result.errorKey ?? 'update.errorFailed', params });
             // npm's own words: "update failed" alone is what left this unfixable.
             ctx.notify((t) => result.summary
@@ -149,10 +147,6 @@ export function About({ ctx }) {
         }
     };
     const activate = (id) => {
-        if (id === 'relay-update') {
-            relay.activate();
-            return;
-        }
         if (id === 'update') {
             activateUpdate();
             return;
@@ -174,8 +168,5 @@ export function About({ ctx }) {
                     }, onHover: () => setSelected(option.id), children: `${option.label}${draft.ui.language === option.id ? '  ✓' : ''}` }, option.id))) }), _jsx(Text, { color: theme.muted, children: t('update.title') }), _jsxs(Box, { flexDirection: "column", marginTop: 1, marginBottom: 1, children: [_jsx(Selectable, { selected: selected === 'update', onSelect: () => {
                             setSelected('update');
                             activateUpdate();
-                        }, onHover: () => setSelected('update'), children: updateLabel }), sourceNote ? (_jsx(Text, { color: theme.muted, children: `  ${t('update.mirrorBehind', sourceNote)}` })) : null, relay.visible ? (_jsx(Selectable, { selected: selected === 'relay-update', onSelect: () => {
-                            setSelected('relay-update');
-                            relay.activate();
-                        }, onHover: () => setSelected('relay-update'), children: relay.label })) : null] }), _jsx(Row, { label: t('about.version'), children: _jsx(Text, { color: theme.muted, children: currentVersion() }) }), relay.visible ? (_jsx(Row, { label: t('about.relayPackage'), children: _jsx(Text, { color: theme.muted, children: relay.installed ?? '?' }) })) : null, _jsx(Row, { label: t('about.configPath'), children: _jsx(Text, { color: theme.muted, children: configPath() }) }), _jsx(Row, { label: t('about.statePath'), children: _jsx(Text, { color: theme.muted, children: stateDir() }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.muted, children: t('about.docs') }) }), _jsx(Message, { text: ctx.message?.text ?? null, level: ctx.message?.level ?? 'info' })] }));
+                        }, onHover: () => setSelected('update'), children: updateLabel }), sourceNote ? (_jsx(Text, { color: theme.muted, children: `  ${t('update.mirrorBehind', sourceNote)}` })) : null] }), _jsx(Row, { label: t('about.version'), children: _jsx(Text, { color: theme.muted, children: currentVersion() }) }), runsLocalRelay(ctx.config) ? (_jsx(Row, { label: t('about.relayPackage'), children: _jsx(Text, { color: theme.muted, children: installedRelayVersion() ?? '?' }) })) : null, _jsx(Row, { label: t('about.configPath'), children: _jsx(Text, { color: theme.muted, children: configPath() }) }), _jsx(Row, { label: t('about.statePath'), children: _jsx(Text, { color: theme.muted, children: stateDir() }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.muted, children: t('about.docs') }) }), _jsx(Message, { text: ctx.message?.text ?? null, level: ctx.message?.level ?? 'info' })] }));
 }

package/dist/update-command.js

@@ -6,11 +6,11 @@
 // still runs the old code, and would start the services as the old release
 // described them.
 import { spawnSync } from 'node:child_process';
+import { cliTarballUrl } from 'herdr-remote-relay/protocol';
 import { loadConfig } from './config.js';
 import { startAdminBrokerTask, stopAdminBroker, waitForAdminBroker, } from './connector/admin-broker.js';
 import { cliEntryPoint } from './keepalive/environment.js';
 import { servicesRunning, startAll, stopAll } from './lifecycle.js';
-import { checkForRelayUpdate, performRelayUpdate } from './relay-updater.js';
 import { checkForUpdate, performUpdate } from './updater.js';
 import { heldByAnotherProcess } from './updater/in-place.js';
 const RESTART_TIMEOUT_MS = 120_000;
@@ -27,16 +27,11 @@ function restartWithInstalledRelease() {
 }
 export async function runUpdate(t, options = {}) {
     const config = () => options.config ?? loadConfig();
-    const { platform = process.platform, checkCli = () => checkForUpdate(), checkRelay = () => checkForRelayUpdate(), installCli = (check, onAttempt) => performUpdate({
-        registry: check.registry,
+    const { platform = process.platform, checkCli = () => checkForUpdate(), installCli = (check, onAttempt) => performUpdate({
+        source: check.source,
         sources: check.sources,
         version: check.latest,
         onAttempt,
-    }), installRelay = (check, onAttempt) => performRelayUpdate({
-        registry: check.registry,
-        sources: check.sources,
-        relayVersion: check.latest ?? '',
-        onAttempt,
     }), isRunning = () => servicesRunning(config()), stop = () => stopAll(config()), start = () => startAll(config()), restartInstalled = restartWithInstalledRelease, stopBroker = stopAdminBroker, startBroker = async () => {
         try {
             startAdminBrokerTask(t);
@@ -47,20 +42,18 @@ export async function runUpdate(t, options = {}) {
         return waitForAdminBroker();
     }, report = (line) => process.stdout.write(`${line}\n`), } = options;
     report(t('update.checking'));
-    const [cli, relay] = await Promise.all([checkCli(), checkRelay()]);
+    const cli = await checkCli();
     const { current } = cli;
     if (!cli.ok) {
         report(t('update.errorNetworkDetail', { message: cli.message ?? '' }));
         return { ok: false, current, updated: null, restarted: false, errorKey: cli.errorKey };
     }
-    // A new herdr-remote brings the newest relay its range allows; only a
-    // current one needs the relay installed by itself.
-    const updated = cli.updateAvailable ? 'cli' : relay.ok && relay.updateAvailable ? 'relay' : null;
-    if (!updated) {
+    if (!cli.updateAvailable) {
         report(t('update.upToDate', { version: current }));
-        return { ok: true, current, updated, restarted: false };
+        return { ok: true, current, updated: null, restarted: false };
     }
-    const version = (updated === 'cli' ? cli.latest : relay.latest) ?? '';
+    const updated = 'cli';
+    const version = cli.latest ?? '';
     const wasRunning = isRunning();
     // Windows refuses to replace files a running process holds, as services
     // started by older releases do. Elsewhere they keep serving until the restart.
@@ -78,18 +71,22 @@ export async function runUpdate(t, options = {}) {
         report(t(back ? 'update.brokerRestarted' : 'update.brokerRestartFailed'));
         return back ? 'restarted' : 'failed';
     };
-    report(t(updated === 'cli' ? 'update.updating' : 'relayUpdate.updating', { version }));
+    report(t('update.updating', { version }));
     const onAttempt = ({ attempt }) => {
         if (attempt > 1)
             report(t('update.updatingRetry', { version, attempt }));
     };
-    const result = updated === 'cli' ? await installCli(cli, onAttempt) : await installRelay(relay, onAttempt);
+    const result = await installCli(cli, onAttempt);
     if (!result.ok) {
         // Nothing was replaced, so the old release starts as it was.
         if (stopped)
             start();
         const adminBroker = await restoreBroker();
-        report(t(result.errorKey ?? 'update.errorFailed', { version, installed: result.installed ?? '' }));
+        report(t(result.errorKey ?? 'update.errorFailed', {
+            version,
+            installed: result.installed ?? '',
+            url: cliTarballUrl(version),
+        }));
         if (result.summary)
             report(t('update.errorFailedDetail', { message: result.summary }));
         if (platform === 'win32' && heldByAnotherProcess(result.output)) {
@@ -99,7 +96,7 @@ export async function runUpdate(t, options = {}) {
         return { ok: false, current, updated, restarted: false, adminBroker, errorKey, summary };
     }
     const installed = result.installed ?? version;
-    report(t(updated === 'cli' ? 'update.done' : 'relayUpdate.done', { version: installed }));
+    report(t('update.done', { version: installed }));
     let ok = true;
     let restarted = false;
     if (!wasRunning) {