herdr-remote 0.2.21 → 0.2.22

package/dist/terminal-font/files.js

@@ -4,7 +4,7 @@ import crypto from 'node:crypto';
 import fs from 'node:fs';
 import path from 'node:path';
 import { MAX_TERMINAL_FONT_BYTES, TERMINAL_FONT_STYLES, } from 'herdr-remote-relay/protocol';
-import { GENERIC_FAMILIES, withDefaults } from './deps.js';
+import { GENERIC_FAMILIES, localAppData, withDefaults } from './deps.js';
 const FACE_PATTERNS = {
     regular: ':weight=regular:slant=roman',
     bold: ':weight=bold:slant=roman',
@@ -117,12 +117,15 @@ function readSfntNames(filePath) {
             }
     }
 }
-function macFontFiles(deps) {
-    const roots = [
-        path.join(deps.home, 'Library', 'Fonts'),
-        '/Library/Fonts',
-        '/System/Library/Fonts',
-    ];
+function fontFolderFiles(deps) {
+    const roots = deps.platform === 'darwin'
+        ? [path.join(deps.home, 'Library', 'Fonts'), '/Library/Fonts', '/System/Library/Fonts']
+        : deps.platform === 'win32'
+            ? [
+                path.join(deps.env.WINDIR || deps.env.SystemRoot || 'C:\\Windows', 'Fonts'),
+                path.join(localAppData(deps), 'Microsoft', 'Windows', 'Fonts'),
+            ]
+            : [];
     const files = [];
     const walk = (directory, depth) => {
         let entries;
@@ -161,7 +164,7 @@ export function familyForPostScriptName(postscript, deps) {
         return listed.stdout.trim().split('\n')[0].split(',')[0].trim();
     if (deps.platform !== 'darwin')
         return null;
-    for (const file of macFontFiles(deps)) {
+    for (const file of fontFolderFiles(deps)) {
         const names = readSfntNames(file);
         if (names?.postscript === postscript)
             return names.family;
@@ -202,9 +205,9 @@ function locateFaceFiles(family, deps) {
             continue;
         located[style] = file;
     }
-    if (fontconfig || deps.platform !== 'darwin')
+    if (fontconfig || (deps.platform !== 'darwin' && deps.platform !== 'win32'))
         return located;
-    for (const file of macFontFiles(deps)) {
+    for (const file of fontFolderFiles(deps)) {
         const names = readSfntNames(file);
         if (!names || names.family?.toLowerCase() !== family.toLowerCase())
             continue;

package/dist/terminal-font/readers.js

@@ -1,7 +1,7 @@
 // Each terminal's own settings, read the way that terminal reads them.
 import path from 'node:path';
 import { parseBinaryPlist, unarchiveKeyed } from '../binary-plist.js';
-import { configHome, dataHome, expandHome, pointsToPx, positiveNumber, } from './deps.js';
+import { configHome, dataHome, expandHome, localAppData, pointsToPx, positiveNumber, roamingAppData, } from './deps.js';
 import { familyForPostScriptName } from './files.js';
 import { firstCssFamily, optionValue, parseFontconfigPattern, parseGVariantString, parseIni, parseJsonc, parsePangoFontDescription, parseQtFontString, parseTomlSubset, parseXFontName, xResource, xrmResources, } from './formats.js';
 function gsettingsGet(deps, schema, key) {
@@ -25,7 +25,54 @@ function readGSettingsProfileFont(deps, { schema, path: profilePath, fontKey = '
 function systemMonospaceFont(deps) {
     return parsePangoFontDescription(parseGVariantString(gsettingsGet(deps, 'org.gnome.desktop.interface', 'monospace-font-name')));
 }
+function settingsObject(value) {
+    return value !== null && typeof value === 'object' && !Array.isArray(value)
+        ? value
+        : null;
+}
+function windowsTerminalProfileFont(profile) {
+    const values = settingsObject(profile);
+    const font = settingsObject(values?.font);
+    return {
+        family: firstCssFamily(font?.face) || firstCssFamily(values?.fontFace),
+        size: positiveNumber(font?.size) || positiveNumber(values?.fontSize),
+    };
+}
+function readWindowsTerminalFont(deps) {
+    const local = localAppData(deps);
+    let settings = null;
+    for (const file of [
+        path.join(local, 'Packages', 'Microsoft.WindowsTerminal_8wekyb3d8bbwe', 'LocalState', 'settings.json'),
+        path.join(local, 'Packages', 'Microsoft.WindowsTerminalPreview_8wekyb3d8bbwe', 'LocalState', 'settings.json'),
+        path.join(local, 'Microsoft', 'Windows Terminal', 'settings.json'),
+    ]) {
+        settings = parseJsonc(deps.readFile(file));
+        if (settings)
+            break;
+    }
+    if (!settings)
+        return null;
+    const profiles = settings.profiles;
+    const profileSettings = settingsObject(profiles);
+    const list = Array.isArray(profiles)
+        ? profiles
+        : Array.isArray(profileSettings?.list)
+            ? profileSettings.list
+            : [];
+    const guidOf = (profile) => String(settingsObject(profile)?.guid || '').toLowerCase();
+    const currentId = String(deps.env.WT_PROFILE_ID || '').toLowerCase();
+    const defaultId = String(settings.defaultProfile || '').toLowerCase();
+    const selected = (currentId ? list.find((profile) => guidOf(profile) === currentId) : undefined) ||
+        (defaultId ? list.find((profile) => guidOf(profile) === defaultId) : undefined);
+    const selectedFont = windowsTerminalProfileFont(selected);
+    const defaults = windowsTerminalProfileFont(profileSettings?.defaults);
+    // These are Windows Terminal's own defaults when settings omit the values.
+    const family = selectedFont.family || defaults.family || 'Cascadia Mono';
+    const size = selectedFont.size || defaults.size || 12;
+    return { family, sizePx: pointsToPx(size) };
+}
 export const READERS = {
+    'windows-terminal': readWindowsTerminalFont,
     'gnome-terminal': (deps) => {
         const id = parseGVariantString(gsettingsGet(deps, 'org.gnome.Terminal.ProfilesList', 'default'));
         if (!id)
@@ -111,6 +158,9 @@ export const READERS = {
     },
     alacritty: (deps) => {
         const candidates = [
+            ...(deps.platform === 'win32'
+                ? [path.join(roamingAppData(deps), 'alacritty', 'alacritty.toml')]
+                : []),
             path.join(configHome(deps), 'alacritty', 'alacritty.toml'),
             path.join(configHome(deps), 'alacritty.toml'),
             path.join(deps.home, '.alacritty.toml'),
@@ -212,7 +262,9 @@ export const READERS = {
     vscode: (deps) => {
         const base = deps.platform === 'darwin'
             ? path.join(deps.home, 'Library', 'Application Support')
-            : configHome(deps);
+            : deps.platform === 'win32'
+                ? roamingAppData(deps)
+                : configHome(deps);
         for (const product of ['Code', 'Cursor', 'Code - Insiders', 'VSCodium', 'Windsurf']) {
             const settings = parseJsonc(deps.readFile(path.join(base, product, 'User', 'settings.json')));
             if (!settings)
@@ -225,7 +277,12 @@ export const READERS = {
             if (family)
                 return { family, sizePx };
         }
-        return { family: deps.platform === 'darwin' ? 'Menlo' : 'Droid Sans Mono', sizePx: 14 };
+        const family = deps.platform === 'darwin'
+            ? 'Menlo'
+            : deps.platform === 'win32'
+                ? 'Consolas'
+                : 'Droid Sans Mono';
+        return { family, sizePx: 14 };
     },
     iterm2: (deps) => {
         const prefs = readPreferences('com.googlecode.iterm2', deps);

package/dist/terminal-font/terminals.js

@@ -64,6 +64,9 @@ export function identifyTerminal({ env = process.env, ancestry = [], } = {}) {
         return 'gnome-terminal';
     if (/^rxvt-unicode/.test(env.TERM || ''))
         return 'urxvt';
+    // WT_SESSION is inherited by nested terminals, so specific terminal markers win first.
+    if (env.WT_SESSION)
+        return 'windows-terminal';
     // Last: a terminal started from xterm inherits this too.
     if (env.XTERM_VERSION)
         return 'xterm';

package/dist/terminal-palette.js

@@ -115,7 +115,11 @@ function paletteFromEnvironment(env = process.env) {
     }
 }
 function runStty(args, ttyPath) {
-    return spawnSync('stty', [...args, '-F', ttyPath], { encoding: 'utf8', timeout: 1000 });
+    return spawnSync('stty', [...args, '-F', ttyPath], {
+        encoding: 'utf8',
+        timeout: 1000,
+        windowsHide: true,
+    });
 }
 /**
  * Takes one reply out of the buffered bytes, leaving the rest.
@@ -131,6 +135,17 @@ function takeOscColorReply(state, expectedPrefix) {
     state.pending = state.pending.slice(0, found.start) + state.pending.slice(found.end);
     return found.color;
 }
+const PALETTE_QUERIES = [
+    { query: '\x1b]10;?\x1b\\', prefix: '\x1b]10', paletteKey: 'foreground' },
+    { query: '\x1b]11;?\x1b\\', prefix: '\x1b]11', paletteKey: 'background' },
+    { query: '\x1b]12;?\x1b\\', prefix: '\x1b]12', paletteKey: 'cursor' },
+    ...ANSI_KEYS.map((ansiKey, slot) => ({
+        query: `\x1b]4;${slot};?\x1b\\`,
+        prefix: `\x1b]4;${slot}`,
+        paletteKey: 'ansi',
+        ansiKey,
+    })),
+];
 /**
  * Runs the color conversation over an injected `ask(query, prefix)`.
  *
@@ -150,21 +165,17 @@ function takeOscColorReply(state, expectedPrefix) {
  */
 function collectPalette(ask) {
     const palette = {};
-    const foreground = ask('\x1b]10;?\x1b\\', '\x1b]10');
-    if (foreground)
-        palette.foreground = foreground;
-    const background = ask('\x1b]11;?\x1b\\', '\x1b]11');
-    if (background)
-        palette.background = background;
-    const cursor = ask('\x1b]12;?\x1b\\', '\x1b]12');
-    if (cursor)
-        palette.cursor = cursor;
     const ansi = {};
-    for (let slot = 0; slot < ANSI_SLOTS; slot += 1) {
-        const color = ask(`\x1b]4;${slot};?\x1b\\`, `\x1b]4;${slot}`);
-        if (!color)
-            break;
-        ansi[ANSI_KEYS[slot]] = color;
+    for (const query of PALETTE_QUERIES) {
+        const color = ask(query.query, query.prefix);
+        if (query.paletteKey === 'ansi') {
+            if (!color)
+                break;
+            ansi[query.ansiKey] = color;
+        }
+        else if (color) {
+            palette[query.paletteKey] = color;
+        }
     }
     if (Object.keys(ansi).length === ANSI_SLOTS)
         palette.ansi = ansi;
@@ -251,6 +262,55 @@ function probeTerminalPalette({ ttyPath = '/dev/tty', timeoutMs = TOTAL_TIMEOUT_
         }
     }
 }
+/** Queries Windows Terminal through the raw stdin stream, whose replies are VT bytes. */
+async function probeConsolePalette({ input = process.stdin, output = process.stdout, timeoutMs = TOTAL_TIMEOUT_MS, } = {}) {
+    if (!input.isTTY || !output.isTTY)
+        return null;
+    const state = { pending: '', overallDeadline: Date.now() + timeoutMs };
+    let listener = null;
+    let timer;
+    try {
+        input.setRawMode(true);
+        await new Promise((resolve) => {
+            let finished = false;
+            const finish = () => {
+                if (finished)
+                    return;
+                finished = true;
+                resolve();
+            };
+            listener = (chunk) => {
+                state.pending += typeof chunk === 'string' ? chunk : chunk.toString('latin1');
+                if (/\x1b\[\?[\d;]*c/.test(state.pending))
+                    finish();
+            };
+            input.on('data', listener);
+            input.resume();
+            timer = setTimeout(finish, Math.max(0, state.overallDeadline - Date.now()));
+            // Windows has no /dev/tty-style synchronous read with a timeout. Terminals
+            // answer in order, so DA1 confirms all earlier color replies arrived.
+            output.write(`${PALETTE_QUERIES.map(({ query }) => query).join('')}\x1b[c`);
+        });
+        return collectPalette((_query, prefix) => takeOscColorReply(state, prefix));
+    }
+    catch {
+        // A broken or disconnected console must not prevent the CLI from starting.
+        return null;
+    }
+    finally {
+        if (timer)
+            clearTimeout(timer);
+        if (listener)
+            input.removeListener('data', listener);
+        try {
+            input.setRawMode(false);
+        }
+        catch {
+            // A closed console can reject mode restoration, but pausing still releases the stream.
+        }
+        input.pause();
+    }
+}
 /**
  * Remembers a palette for the next start that has no terminal to ask.
  *
@@ -297,13 +357,13 @@ function resolveHostPalette({ env = process.env, probe = probeTerminalPalette, }
  * the very start of the command, means every later caller in this process tree
  * simply inherits the answer through the environment.
  */
-function captureTerminalPalette({ env = process.env, probe = probeTerminalPalette, } = {}) {
+async function captureTerminalPalette({ env = process.env, probe = probeTerminalPalette, platform = process.platform, consoleProbe = probeConsolePalette, } = {}) {
     if (env.HERDR_TERM_PALETTE_JSON)
         return paletteFromEnvironment(env);
     // Without both ends on a terminal there is nobody to answer the query.
     if (!process.stdin.isTTY || !process.stdout.isTTY)
         return null;
-    const palette = probe();
+    const palette = platform === 'win32' ? await consoleProbe() : probe();
     if (!palette)
         return null;
     env.HERDR_TERM_PALETTE_JSON = JSON.stringify(palette);
@@ -336,4 +396,4 @@ function hostTerminalPalette({ refresh = false } = {}) {
     cachedHostPalette = probed ? rememberTerminalPalette(probed) : rememberedTerminalPalette();
     return cachedHostPalette;
 }
-export { ANSI_KEYS, ANSI_SLOTS, parseXColor, parseOscColorReply, takeOscColorReply, collectPalette, sanitizePalette, paletteFromEnvironment, probeTerminalPalette, resolveHostPalette, hostTerminalPalette, captureTerminalPalette, rememberTerminalPalette, rememberedTerminalPalette, };
+export { ANSI_KEYS, ANSI_SLOTS, parseXColor, parseOscColorReply, takeOscColorReply, collectPalette, sanitizePalette, paletteFromEnvironment, probeTerminalPalette, probeConsolePalette, resolveHostPalette, hostTerminalPalette, captureTerminalPalette, rememberTerminalPalette, rememberedTerminalPalette, };

package/dist/tui/api.js

@@ -4,6 +4,7 @@
 // shared with the CLI. Funnelling it through one module gives the screens a
 // single surface to call.
 import { OFFICIAL_RELAY_URL, configExists, loadConfig } from '../config.js';
+export { KEEPALIVE_MANAGERS } from '../config.js';
 import { configPath, stateDir } from '../paths.js';
 import { bindAddress, resolveAdminOrigin, runsLocalRelay } from '../relay-urls.js';
 import { MIN_HERDR_VERSION, herdrVersion } from '../herdr-command.js';
@@ -13,11 +14,11 @@ import { createDraft, fieldsForMode, getField, getFieldPlaceholder, isOfficialRe
 import { extractPairingCode, requestJson } from '../relay-client.js';
 import { ensureRuntime, regenerateHostIdentity, setRelayPassword } from '../runtime.js';
 import { pair, readLogTail } from '../service.js';
-import { fullStatus, restartAll, startAll, stopAll } from '../lifecycle.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, };
+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, };
 /** The command that starts a matching relay, ready to paste on the server. */
 export function relayStartCommand(config, password) {
     const publicUrl = config.relay.remoteUrl

package/dist/tui/screens/About.js

@@ -4,7 +4,7 @@ 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, } from '../api.js';
+import { canSelfUpdate, checkForUpdate, configPath, currentVersion, detectLocale, installKind, performUpdate, 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?:\/\//, '');
 export function About({ ctx }) {
@@ -92,12 +92,12 @@ export function About({ ctx }) {
     };
     const runUpdate = async (latest) => {
         setUpdate({ phase: 'updating', latest, attempt: 1 });
-        const result = await performUpdate({
+        const result = await whileServicesStopped(ctx.config, () => performUpdate({
             registry: checkRef.current.registry,
             sources: checkRef.current.sources,
             version: latest,
             onAttempt: ({ attempt }) => setUpdate({ phase: 'updating', latest, attempt }),
-        });
+        }));
         if (!result.ok) {
             const params = { version: latest, installed: result.installed ?? '' };
             setUpdate({ phase: 'error', messageKey: result.errorKey ?? 'update.errorFailed', params });

package/dist/tui/screens/Keepalive.js

@@ -4,8 +4,7 @@ import { Box, Text, useInput } from 'ink';
 import { theme } from '../theme.js';
 import { Message, Panel, Row, Selectable, StatusDot } from '../components/common.js';
 import { ChoiceList } from './Relay.js';
-import { keepalive, saveDraft, setField } from '../api.js';
-const MANAGERS = ['auto', 'systemd', 'launchd', 'supervisor', 'none'];
+import { KEEPALIVE_MANAGERS, keepalive, saveDraft, setField } from '../api.js';
 export function Keepalive({ ctx }) {
     const { t, status, draft, editingId } = ctx;
     const [selected, setSelected] = useState('install');
@@ -24,14 +23,25 @@ export function Keepalive({ ctx }) {
             ctx.setEditing('keepaliveManager');
             return;
         }
-        ctx.run(() => {
+        ctx.run(async () => {
             if (id === 'install') {
-                const result = keepalive.install(ctx.config);
-                ctx.notify((t) => t('keepalive.installed', { manager: result.manager }), 'success');
+                if (keepalive.detectManager(ctx.config.keepalive.manager) === 'windows-service')
+                    ctx.notify((t) => t('keepalive.serviceWindowHint'), 'info');
+                try {
+                    const result = await keepalive.install(ctx.config);
+                    ctx.notify((t) => t('keepalive.installed', { manager: result.manager }), 'success');
+                }
+                catch (error) {
+                    if (error.code === 'ELEVATION_CANCELLED') {
+                        ctx.notify((t) => t('keepalive.elevationCancelled'), 'info');
+                        return;
+                    }
+                    throw error;
+                }
                 return;
             }
             if (id === 'uninstall') {
-                keepalive.uninstall(ctx.config);
+                await keepalive.uninstall(ctx.config);
                 ctx.notify((t) => t('keepalive.uninstalled'), 'success');
                 return;
             }
@@ -56,7 +66,7 @@ export function Keepalive({ ctx }) {
             activate(selected);
     }, { isActive: editingId === null });
     if (editingId === 'keepaliveManager') {
-        return (_jsx(Panel, { title: t('field.keepalive'), children: _jsx(ChoiceList, { options: MANAGERS.map((manager) => ({ id: manager, label: manager })), current: draft.keepalive.manager, onPick: (manager) => {
+        return (_jsx(Panel, { title: t('field.keepalive'), children: _jsx(ChoiceList, { options: KEEPALIVE_MANAGERS.map((manager) => ({ id: manager, label: manager })), current: draft.keepalive.manager, onPick: (manager) => {
                     const result = setField(draft, 'keepaliveManager', manager);
                     const { errorKey } = result;
                     if (errorKey) {
@@ -81,5 +91,5 @@ export function Keepalive({ ctx }) {
                                         : t('common.notInstalled')] })] }) }), current?.unitPath ? (_jsx(Row, { label: t('keepalive.unitPath'), children: _jsx(Text, { color: theme.muted, children: current.unitPath }) })) : null, _jsx(Box, { marginTop: 1, flexDirection: "column", children: entries.map((entry) => (_jsx(Selectable, { selected: selected === entry.id, onSelect: () => {
                         setSelected(entry.id);
                         activate(entry.id);
-                    }, onHover: () => setSelected(entry.id), children: entry.label }, entry.id))) }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [current?.manager === 'systemd' ? (_jsx(Text, { color: current.linger ? theme.muted : theme.warn, children: current.linger ? t('keepalive.lingerEnabled') : t('keepalive.lingerDisabled') })) : null, current?.manager === 'supervisor' ? (_jsx(Text, { color: theme.warn, children: t('keepalive.fallbackNote') })) : null, _jsx(Text, { color: theme.muted, children: t('keepalive.logsHint', { command: status?.logsHint ?? '' }) })] }), _jsx(Message, { text: ctx.message?.text ?? null, level: ctx.message?.level ?? 'info' })] }));
+                    }, onHover: () => setSelected(entry.id), children: entry.label }, entry.id))) }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [current?.manager === 'systemd' ? (_jsx(Text, { color: current.linger ? theme.muted : theme.warn, children: current.linger ? t('keepalive.lingerEnabled') : t('keepalive.lingerDisabled') })) : null, current?.manager === 'supervisor' ? (_jsx(Text, { color: theme.warn, children: t('keepalive.fallbackNote') })) : null, current?.manager === 'windows-service' ? (_jsx(Text, { color: theme.warn, children: t('keepalive.serviceNote') })) : null, _jsx(Text, { color: theme.muted, children: t('keepalive.logsHint', { command: status?.logsHint ?? '' }) })] }), _jsx(Message, { text: ctx.message?.text ?? null, level: ctx.message?.level ?? 'info' })] }));
 }

package/dist/tui/screens/Wizard.js

@@ -97,13 +97,18 @@ export function Wizard({ ctx, onDone }) {
             let keepaliveInstalled = false;
             if (installKeepalive) {
                 try {
-                    keepalive.install(finalConfig);
+                    if (keepalive.detectManager(finalConfig.keepalive.manager) === 'windows-service')
+                        ctx.notify((t) => t('keepalive.serviceWindowHint'), 'info');
+                    await keepalive.install(finalConfig);
                     keepaliveInstalled = true;
                 }
                 catch (error) {
                     // Keep-alive is a convenience; a container without systemd should not
                     // block a working setup.
-                    ctx.notify((t) => t('keepalive.failed', { message: error.message }), 'error');
+                    if (error.code === 'ELEVATION_CANCELLED')
+                        ctx.notify((t) => t('keepalive.elevationCancelled'), 'info');
+                    else
+                        ctx.notify((t) => t('keepalive.failed', { message: error.message }), 'error');
                 }
             }
             if (startNow && !keepaliveInstalled)

package/dist/tui/screens/useRelayUpdate.js

@@ -1,7 +1,7 @@
 // The relay row on the About tab: check for, install and switch to a newer
 // relay. Only a machine that runs its own relay has one to update.
 import { useEffect, useState } from 'react';
-import { canSelfUpdate, checkForRelayUpdate, compareVersions, currentVersion, installKind, installedRelayVersion, performRelayUpdate, restartAll, runsLocalRelay, } from '../api.js';
+import { canSelfUpdate, checkForRelayUpdate, compareVersions, currentVersion, installKind, installedRelayVersion, performRelayUpdate, restartAll, runsLocalRelay, whileServicesStopped, } from '../api.js';
 export function useRelayUpdate(ctx) {
     const { t } = ctx;
     const [state, setState] = useState({ phase: 'idle' });
@@ -51,11 +51,11 @@ export function useRelayUpdate(ctx) {
     };
     const install = async (latest) => {
         setState({ phase: 'updating', latest, attempt: 1 });
-        const result = await performRelayUpdate({
+        const result = await whileServicesStopped(ctx.config, () => performRelayUpdate({
             ...source,
             relayVersion: latest,
             onAttempt: ({ attempt }) => setState({ phase: 'updating', latest, attempt }),
-        });
+        }));
         if (!result.ok) {
             const params = { version: currentVersion(), installed: result.installed ?? '' };
             const messageKey = result.errorKey ?? 'update.errorFailed';

package/dist/updater/npm.js

@@ -0,0 +1,62 @@
+import fs from 'node:fs';
+import path from 'node:path';
+/**
+ * After the CVE-2024-27980 fix, spawning `.cmd` without a shell returns EINVAL;
+ * npm-cli.js lets the current Node process run npm without a shell. `npm.cmd`
+ * requires cmd.exe, whose quote rules cannot stop `%` expansion in registry URLs.
+ */
+export function npmInvocation({ args, platform = process.platform, env = process.env, execPath = process.execPath, exists = fs.existsSync, }) {
+    if (platform !== 'win32')
+        return { command: 'npm', args };
+    const npmExecPath = env.npm_execpath;
+    if (npmExecPath && /npm-cli\.js$/i.test(npmExecPath) && exists(npmExecPath)) {
+        return { command: execPath, args: [npmExecPath, ...args] };
+    }
+    const adjacentNpmCli = path.join(path.dirname(execPath), 'node_modules', 'npm', 'bin', 'npm-cli.js');
+    if (exists(adjacentNpmCli))
+        return { command: execPath, args: [adjacentNpmCli, ...args] };
+    return null;
+}
+export function runNpm(spawnImpl, args, timeoutMs, invocationOptions = {}) {
+    return new Promise((resolve) => {
+        let child;
+        try {
+            const invocation = npmInvocation({ args, ...invocationOptions });
+            if (!invocation) {
+                resolve({
+                    ok: false,
+                    spawnFailed: true,
+                    output: 'npm-cli.js was not found next to this Node.js; run npm install -g herdr-remote yourself.',
+                });
+                return;
+            }
+            child = spawnImpl(invocation.command, invocation.args, {
+                timeout: timeoutMs,
+                windowsHide: true,
+            });
+        }
+        catch (error) {
+            resolve({
+                ok: false,
+                spawnFailed: true,
+                output: String(error?.message || error),
+            });
+            return;
+        }
+        let output = '';
+        let settled = false;
+        const finish = (result) => {
+            if (!settled) {
+                settled = true;
+                resolve(result);
+            }
+        };
+        const collect = (chunk) => {
+            output += String(chunk);
+        };
+        child.stdout?.on('data', collect);
+        child.stderr?.on('data', collect);
+        child.on('error', (error) => finish({ ok: false, spawnFailed: true, output: error.message }));
+        child.on('close', (code) => finish({ ok: code === 0, output: output.trim() }));
+    });
+}

package/dist/updater.js

@@ -9,6 +9,7 @@ import os from 'node:os';
 import path from 'node:path';
 import { spawn } from 'node:child_process';
 import { PACKAGE_ROOT } from './paths.js';
+import { runNpm } from './updater/npm.js';
 const PACKAGE_NAME = 'herdr-remote';
 const DEFAULT_REGISTRY = 'https://registry.npmjs.org';
 /**
@@ -268,37 +269,6 @@ function installedVersionOnDisk() {
         return null;
     }
 }
-function runNpm(spawnImpl, args, timeoutMs) {
-    return new Promise((resolve) => {
-        let child;
-        try {
-            child = spawnImpl('npm', args, { timeout: timeoutMs });
-        }
-        catch (error) {
-            resolve({
-                ok: false,
-                spawnFailed: true,
-                output: String(error?.message || error),
-            });
-            return;
-        }
-        let output = '';
-        let settled = false;
-        const finish = (result) => {
-            if (!settled) {
-                settled = true;
-                resolve(result);
-            }
-        };
-        const collect = (chunk) => {
-            output += String(chunk);
-        };
-        child.stdout?.on('data', collect);
-        child.stderr?.on('data', collect);
-        child.on('error', (error) => finish({ ok: false, spawnFailed: true, output: error.message }));
-        child.on('close', (code) => finish({ ok: code === 0, output: output.trim() }));
-    });
-}
 const VERSION_PATTERN = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/;
 /**
  * Install a release over this one.

package/herdr-plugin.toml

@@ -1,9 +1,9 @@
 id = "herdr.remote.web"
 name = "Herdr Remote Web"
-version = "0.2.21"
+version = "0.2.22"
 min_herdr_version = "0.9.1"
 description = "Browser access to Herdr workspaces via local or self-hosted relay"
-platforms = ["linux", "macos"]
+platforms = ["linux", "macos", "windows"]
 
 # No [[build]] steps: this package is installed from npm with its TUI bundle and
 # web assets already built. Herdr should never compile anything on the user's

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "herdr-remote",
-  "version": "0.2.21",
+  "version": "0.2.22",
   "description": "Browser access to Herdr workspaces: plugin, host connector, and configuration TUI",
   "license": "MIT",
   "type": "module",
@@ -31,6 +31,7 @@
   "files": [
     "bin",
     "dist",
+    "vendor",
     "herdr-plugin.toml",
     "config.example.json",
     "README.zh-CN.md"

package/vendor/winsw/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2008-2020 Kohsuke Kawaguchi, Sun Microsystems, Inc., CloudBees, Inc., Oleg Nenashev and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/vendor/winsw/README.md

@@ -0,0 +1,9 @@
+# WinSW
+
+- Source: https://github.com/winsw/winsw/releases/download/v2.12.0/WinSW.NET461.exe
+- Version: 2.12.0 (`WinSW.NET461.exe`)
+- SHA-256: `b5066b7bbdfba1293e5d15cda3caaea88fbeab35bd5b38c41c913d492aadfc4f`
+- License: MIT; see [LICENSE](./LICENSE).
+- Purpose: hosts `herdr-remote run --daemon` as a Windows service.
+
+To upgrade, replace the executable as a whole and update its SHA-256 here.