herdr-remote 0.2.26 → 0.2.28

package/dist/update-command.js

@@ -0,0 +1,120 @@
+// `herdr-remote update`: install the newest release and restart what was running.
+//
+// The TUI's update row installs and leaves the restart to a second key press;
+// a command run over SSH or from a script has nobody to press it. The restart
+// is run by the release just installed, not by this process: this process
+// still runs the old code, and would start the services as the old release
+// described them.
+import { spawnSync } from 'node:child_process';
+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';
+const RESTART_TIMEOUT_MS = 120_000;
+function restartWithInstalledRelease() {
+    const result = spawnSync(process.execPath, [cliEntryPoint(), 'restart', '--json'], {
+        encoding: 'utf8',
+        timeout: RESTART_TIMEOUT_MS,
+        windowsHide: true,
+    });
+    if (!result.error && result.status === 0)
+        return { ok: true, message: '' };
+    const output = String(result.stderr || result.stdout || '').trim();
+    return { ok: false, message: result.error?.message || output || `exit ${result.status}` };
+}
+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,
+        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);
+        }
+        catch {
+            // Denied or no task: the broker does not answer, which is reported next.
+        }
+        return waitForAdminBroker();
+    }, report = (line) => process.stdout.write(`${line}\n`), } = options;
+    report(t('update.checking'));
+    const [cli, relay] = await Promise.all([checkCli(), checkRelay()]);
+    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) {
+        report(t('update.upToDate', { version: current }));
+        return { ok: true, current, updated, restarted: false };
+    }
+    const version = (updated === 'cli' ? cli.latest : relay.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.
+    const stopped = platform === 'win32' && wasRunning;
+    if (stopped) {
+        report(t('update.stoppingServices'));
+        stop();
+    }
+    // The admin broker stops too, so its task starts it on the new release.
+    const broker = platform === 'win32' ? await stopBroker() : 'unavailable';
+    const restoreBroker = async () => {
+        if (broker !== 'stopped')
+            return broker === 'busy' ? 'busy' : null;
+        const back = await startBroker();
+        report(t(back ? 'update.brokerRestarted' : 'update.brokerRestartFailed'));
+        return back ? 'restarted' : 'failed';
+    };
+    report(t(updated === 'cli' ? 'update.updating' : 'relayUpdate.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);
+    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 ?? '' }));
+        if (result.summary)
+            report(t('update.errorFailedDetail', { message: result.summary }));
+        if (platform === 'win32' && /\b(EBUSY|EPERM)\b/.test(result.output ?? '')) {
+            report(t('update.errorBusy'));
+        }
+        const { errorKey, summary } = result;
+        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 }));
+    let ok = true;
+    let restarted = false;
+    if (!wasRunning) {
+        report(t('update.notRunning'));
+    }
+    else {
+        report(t('update.restarting'));
+        const restart = restartInstalled();
+        ok = restart.ok;
+        restarted = restart.ok;
+        report(restart.ok
+            ? t('services.restarted')
+            : t('update.restartFailed', { message: restart.message }));
+    }
+    if (broker === 'busy')
+        report(t('update.brokerBusy'));
+    const adminBroker = await restoreBroker();
+    return { ok, current, updated, installed, restarted, adminBroker };
+}

package/herdr-plugin.toml

@@ -1,6 +1,6 @@
 id = "herdr.remote.web"
 name = "Herdr Remote Web"
-version = "0.2.26"
+version = "0.2.28"
 min_herdr_version = "0.9.1"
 description = "Browser access to Herdr workspaces via local or self-hosted relay"
 platforms = ["linux", "macos", "windows"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "herdr-remote",
-  "version": "0.2.26",
+  "version": "0.2.28",
   "description": "Browser access to Herdr workspaces: plugin, host connector, and configuration TUI",
   "license": "MIT",
   "type": "module",

package/dist/connector/adminBrokerPipe.js

@@ -1,16 +0,0 @@
-import { createHash } from 'node:crypto';
-const ADMIN_BROKER_TASK_NAME = 'HerdrRemoteAdminBroker';
-export const ADMIN_BROKER_MAX_MESSAGE_BYTES = 2 * 1_024 * 1_024;
-function adminBrokerAccountId() {
-    const account = `${process.env.USERDOMAIN || ''}\\${process.env.USERNAME || process.env.USERPROFILE || 'default'}`;
-    return createHash('sha256').update(account.toLowerCase()).digest('hex').slice(0, 24);
-}
-export function adminBrokerPipePath() {
-    return `\\\\.\\pipe\\herdr-remote-admin-${adminBrokerAccountId()}`;
-}
-export function adminBrokerTaskName() {
-    return `${ADMIN_BROKER_TASK_NAME}-${adminBrokerAccountId()}`;
-}
-export function sendAdminBrokerMessage(socket, message) {
-    socket.write(`${JSON.stringify(message)}\n`);
-}