herdr-remote 0.2.39 → 0.3.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "herdr-remote",
-  "version": "0.2.39",
+  "version": "0.3.31",
   "description": "Browser access to Herdr workspaces: plugin, host connector, and configuration TUI",
   "license": "MIT",
   "type": "module",
@@ -27,7 +27,6 @@
   "bin": {
     "herdr-remote": "./bin/herdr-remote.js"
   },
-  "main": "./dist/service.js",
   "files": [
     "bin",
     "dist",
@@ -36,32 +35,14 @@
     "config.example.json",
     "README.zh-CN.md"
   ],
-  "scripts": {
-    "build": "node -e \"fs.rmSync('dist',{recursive:true,force:true})\" && tsc -p tsconfig.json",
-    "prepack": "npm run build",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
-    "test": "vitest run",
-    "start": "node bin/herdr-remote.js"
-  },
   "dependencies": {
-    "harfbuzzjs": "^1.6.2",
-    "herdr-remote-relay": "0.3.30",
-    "ink": "^7.1.1",
-    "node-pty": "^1.1.0",
-    "qrcode": "^1.5.4",
-    "react": "^19.2.0",
-    "ws": "^8.18.0"
-  },
-  "devDependencies": {
-    "@types/node": "^22.13.5",
-    "@types/qrcode": "^1.5.6",
-    "@types/react": "^19.2.0",
-    "ink-testing-library": "^4.0.0",
-    "typescript": "~5.7.3",
-    "vitest": "^3.2.7"
+    "herdr-remote-relay": "0.3.31",
+    "node-pty": "^1.1.0"
   },
   "bundleDependencies": [
-    "herdr-remote-relay",
-    "ws"
-  ]
+    "herdr-remote-relay"
+  ],
+  "scripts": {
+    "postinstall": "node dist/postinstall.js"
+  }
 }

package/dist/agent-status.js

@@ -1,130 +0,0 @@
-/**
- * What the agents on this workstation are doing, small enough to put in a
- * status bar.
- *
- * The question a phone actually has is "does anything need me?", and the
- * terminal is a poor way to ask it: finding a blocked agent means navigating
- * Herdr's sidebar through a viewport the width of a hand. Herdr already knows
- * the answer — it classifies every pane as idle, working, blocked, done or
- * unknown — so this turns a session snapshot into the two-line version.
- *
- * Deliberately a pure function over a snapshot. The socket, the debounce and
- * the retry live in the host connector; what counts as "needs me" lives here,
- * where it can be tested without either.
- */
-/** Herdr's own vocabulary, in the order a person cares about them. */
-const AGENT_STATUSES = ['blocked', 'done', 'working', 'idle', 'unknown'];
-/**
- * How many agents travel with the summary.
- *
- * The counts are always exact; this caps only the named list, which exists so a
- * future screen can say *which* agent is blocked. A workstation with more than
- * this many live agents is not going to be read off a phone anyway.
- */
-const MAX_LISTED_AGENTS = 16;
-/** Titles come from a remote program; keep them short and printable. */
-const MAX_TITLE_LENGTH = 48;
-function cleanText(value, limit = MAX_TITLE_LENGTH) {
-    if (typeof value !== 'string')
-        return null;
-    const collapsed = value
-        .replace(/[\u0000-\u001F\u007F-\u009F]/g, ' ')
-        .replace(/\s+/g, ' ')
-        .trim();
-    if (!collapsed)
-        return null;
-    return collapsed.length > limit ? collapsed.slice(0, limit) : collapsed;
-}
-function normalizeStatus(value) {
-    return AGENT_STATUSES.includes(value)
-        ? value
-        : 'unknown';
-}
-function emptyCounts() {
-    return Object.fromEntries(AGENT_STATUSES.map((status) => [status, 0]));
-}
-/**
- * Turn `session.snapshot` into the summary the browser receives.
- *
- * Sorted by how much each status wants attention, so the capped list keeps the
- * agents worth naming rather than the first ones Herdr happened to report.
- * `focusedPaneId` and `focusedAgent` also track the live pane selection,
- * including shells and panes Herdr has not added to its agent summary.
- */
-function summarizeAgents(snapshot) {
-    const entries = Array.isArray(snapshot?.agents) ? snapshot.agents : [];
-    const panes = Array.isArray(snapshot?.panes) ? snapshot.panes : [];
-    const reportedFocusId = typeof snapshot?.focused_pane_id === 'string' && snapshot.focused_pane_id
-        ? snapshot.focused_pane_id
-        : null;
-    // `focused_pane_id` is the primary signal in Herdr snapshots. The focused
-    // flags are a fallback for snapshots where that top-level field is absent.
-    const focusedPane = (reportedFocusId
-        ? panes.find((pane) => pane?.pane_id === reportedFocusId)
-        : panes.find((pane) => pane?.focused === true)) || null;
-    const focusedAgentEntry = (reportedFocusId
-        ? entries.find((entry) => entry?.pane_id === reportedFocusId)
-        : entries.find((entry) => entry?.focused === true)) || null;
-    const focusedPaneId = reportedFocusId ||
-        (typeof focusedPane?.pane_id === 'string' ? focusedPane.pane_id : null) ||
-        (typeof focusedAgentEntry?.pane_id === 'string' ? focusedAgentEntry.pane_id : null);
-    const focusedAgent = typeof focusedPane?.agent === 'string'
-        ? focusedPane.agent
-        : typeof focusedAgentEntry?.agent === 'string'
-            ? focusedAgentEntry.agent
-            : null;
-    const counts = emptyCounts();
-    const ranked = [];
-    for (const entry of entries) {
-        if (!entry || typeof entry.pane_id !== 'string')
-            continue;
-        const status = normalizeStatus(entry.agent_status);
-        counts[status] += 1;
-        ranked.push({
-            paneId: entry.pane_id,
-            workspaceId: typeof entry.workspace_id === 'string' ? entry.workspace_id : null,
-            agent: cleanText(entry.display_agent || entry.agent, 24),
-            title: cleanText(entry.terminal_title_stripped || entry.terminal_title),
-            status,
-            focused: entry.focused === true,
-        });
-    }
-    ranked.sort((left, right) => AGENT_STATUSES.indexOf(left.status) - AGENT_STATUSES.indexOf(right.status));
-    return {
-        focusedPaneId,
-        focusedAgent,
-        counts,
-        // Total rather than a sum the browser has to compute, and the one number a
-        // collapsed chip can show on its own.
-        total: ranked.length,
-        agents: ranked.slice(0, MAX_LISTED_AGENTS),
-    };
-}
-/** Whether two summaries say the same thing, so an unchanged one is not sent. */
-function sameSummary(left, right) {
-    if (!left || !right)
-        return left === right;
-    if (left.focusedPaneId !== right.focusedPaneId || left.focusedAgent !== right.focusedAgent)
-        return false;
-    if (left.total !== right.total)
-        return false;
-    for (const status of AGENT_STATUSES) {
-        if ((left.counts?.[status] || 0) !== (right.counts?.[status] || 0))
-            return false;
-    }
-    if (left.agents.length !== right.agents.length)
-        return false;
-    return left.agents.every((agent, index) => {
-        const other = right.agents[index];
-        return (other &&
-            agent.paneId === other.paneId &&
-            agent.status === other.status &&
-            agent.agent === other.agent &&
-            agent.title === other.title);
-    });
-}
-/** The summary of a workstation with nothing to report, or nothing to ask. */
-function emptySummary() {
-    return { focusedPaneId: null, focusedAgent: null, counts: emptyCounts(), total: 0, agents: [] };
-}
-export { AGENT_STATUSES, emptySummary, sameSummary, summarizeAgents };

package/dist/binary-plist.js

@@ -1,157 +0,0 @@
-/**
- * Reads Apple binary property lists (`bplist00`), the format macOS writes its
- * preference files in, and the NSKeyedArchiver graphs stored inside them.
- *
- * Terminal.app keeps each profile's font as an archived NSFont — a binary
- * plist nested in a binary plist — and there is no command-line tool that
- * turns that into something readable without asking Terminal itself (an
- * AppleScript that prompts for Automation access). A reader this small is
- * less intrusive than any of those.
- */
-/** A reference to another object in a keyed archive (`CF$UID`). */
-class Uid {
-    value;
-    constructor(value) {
-        this.value = value;
-    }
-}
-function readSizedInt(buffer, offset, size) {
-    let value = 0;
-    for (let i = 0; i < size; i += 1)
-        value = value * 256 + buffer[offset + i];
-    return value;
-}
-/**
- * Parses a whole `bplist00` buffer into plain values: objects, arrays,
- * strings, numbers, booleans, Buffers (data), Dates and `Uid`s. Throws on
- * anything malformed; callers treat that as "no answer".
- */
-function parseBinaryPlist(buffer) {
-    if (!Buffer.isBuffer(buffer) ||
-        buffer.length < 40 ||
-        buffer.toString('latin1', 0, 8) !== 'bplist00') {
-        throw new Error('not a binary plist');
-    }
-    const trailer = buffer.length - 32;
-    const offsetSize = buffer[trailer + 6];
-    const refSize = buffer[trailer + 7];
-    const count = readSizedInt(buffer, trailer + 8, 8);
-    const top = readSizedInt(buffer, trailer + 16, 8);
-    const tableOffset = readSizedInt(buffer, trailer + 24, 8);
-    if (!offsetSize || !refSize || count > 1_000_000 || tableOffset + count * offsetSize > trailer) {
-        throw new Error('corrupt binary plist trailer');
-    }
-    const offsets = [];
-    for (let i = 0; i < count; i += 1)
-        offsets.push(readSizedInt(buffer, tableOffset + i * offsetSize, offsetSize));
-    const parsing = new Set();
-    const parse = (index) => {
-        if (index >= count || parsing.has(index))
-            throw new Error('corrupt binary plist reference');
-        parsing.add(index);
-        try {
-            return parseObject(offsets[index]);
-        }
-        finally {
-            parsing.delete(index);
-        }
-    };
-    // A length stored in the marker's low nibble, or as the int object after it.
-    const lengthAt = (offset) => {
-        const low = buffer[offset] & 0x0f;
-        if (low !== 0x0f)
-            return { length: low, start: offset + 1 };
-        const marker = buffer[offset + 1];
-        if ((marker & 0xf0) !== 0x10)
-            throw new Error('corrupt binary plist length');
-        const size = 1 << (marker & 0x0f);
-        return { length: readSizedInt(buffer, offset + 2, size), start: offset + 2 + size };
-    };
-    const parseObject = (offset) => {
-        const marker = buffer[offset];
-        const type = marker >> 4;
-        const low = marker & 0x0f;
-        switch (type) {
-            case 0x0:
-                if (marker === 0x08)
-                    return false;
-                if (marker === 0x09)
-                    return true;
-                return null;
-            case 0x1: {
-                const size = 1 << low;
-                if (size === 8)
-                    return Number(buffer.readBigInt64BE(offset + 1));
-                return readSizedInt(buffer, offset + 1, size);
-            }
-            case 0x2:
-                return low === 2 ? buffer.readFloatBE(offset + 1) : buffer.readDoubleBE(offset + 1);
-            case 0x3:
-                return new Date(Date.UTC(2001, 0, 1) + buffer.readDoubleBE(offset + 1) * 1000);
-            case 0x4: {
-                const { length, start } = lengthAt(offset);
-                return buffer.subarray(start, start + length);
-            }
-            case 0x5: {
-                const { length, start } = lengthAt(offset);
-                return buffer.toString('latin1', start, start + length);
-            }
-            case 0x6: {
-                const { length, start } = lengthAt(offset);
-                return Buffer.from(buffer.subarray(start, start + length * 2))
-                    .swap16()
-                    .toString('utf16le');
-            }
-            case 0x8:
-                return new Uid(readSizedInt(buffer, offset + 1, low + 1));
-            case 0xa:
-            case 0xc: {
-                const { length, start } = lengthAt(offset);
-                const items = [];
-                for (let i = 0; i < length; i += 1)
-                    items.push(parse(readSizedInt(buffer, start + i * refSize, refSize)));
-                return items;
-            }
-            case 0xd: {
-                const { length, start } = lengthAt(offset);
-                const result = {};
-                for (let i = 0; i < length; i += 1) {
-                    const key = parse(readSizedInt(buffer, start + i * refSize, refSize));
-                    result[String(key)] = parse(readSizedInt(buffer, start + (length + i) * refSize, refSize));
-                }
-                return result;
-            }
-            default:
-                throw new Error(`unsupported binary plist object 0x${marker.toString(16)}`);
-        }
-    };
-    return parse(top);
-}
-/**
- * The root object of an NSKeyedArchiver plist, with every `Uid` replaced by
- * the object it points at (to a bounded depth; archives may be cyclic).
- */
-function unarchiveKeyed(archive, depth = 6) {
-    const record = (value) => value && typeof value === 'object' && !Array.isArray(value)
-        ? value
-        : undefined;
-    const objects = record(archive)?.$objects;
-    const rootRef = record(record(archive)?.$top)?.root;
-    if (!Array.isArray(objects) || !(rootRef instanceof Uid))
-        throw new Error('not a keyed archive');
-    const resolve = (value, level) => {
-        if (value instanceof Uid)
-            return level > depth ? null : resolve(objects[value.value], level + 1);
-        if (Array.isArray(value))
-            return value.map((item) => resolve(item, level));
-        if (value && typeof value === 'object' && !Buffer.isBuffer(value) && !(value instanceof Date)) {
-            const result = {};
-            for (const [key, item] of Object.entries(value))
-                result[key] = resolve(item, level);
-            return result;
-        }
-        return value === '$null' ? null : value;
-    };
-    return resolve(rootRef, 0);
-}
-export { parseBinaryPlist, unarchiveKeyed };

package/dist/config.js

@@ -1,278 +0,0 @@
-// The configuration file: its shape, its defaults, and how a file on disk,
-// older schemas and the environment become one validated Config.
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import { DEFAULTS as RELAY_DEFAULTS } from 'herdr-remote-relay/config';
-import { configPath, legacyConfigPath } from './paths.js';
-import { isLoopbackHost, isUnspecifiedAddress, isUnspecifiedHost, normalizeUrl, } from './relay-urls.js';
-// Access modes
-//   local  — a relay runs on this machine, reachable only from this machine.
-//   lan    — a relay runs on this machine, bound to every interface so other
-//            devices on the LAN (or on a Tailscale/WireGuard overlay) reach it.
-//   remote — no local relay; the host connector dials an operator-run relay,
-//            which is the only way in from outside the local network.
-const ACCESS_MODES = ['local', 'lan', 'remote'];
-// The relay this project runs for people who do not want to host one. Offered
-// as a one-keystroke choice during setup; it is never selected automatically,
-// because routing a terminal through someone else's server has to be a
-// deliberate decision. It is a plain public relay: no join password, and each
-// workstation stays reachable only through its own host token.
-const OFFICIAL_RELAY_URL = 'wss://herdr-remote.564616.xyz';
-const LANGUAGES = ['auto', 'zh', 'en'];
-const KEEPALIVE_MANAGERS = [
-    'auto',
-    'systemd',
-    'launchd',
-    'supervisor',
-    'windows-task',
-    'windows-service',
-    'none',
-];
-function isOneOf(list, value) {
-    return list.includes(value);
-}
-const DEFAULTS = {
-    ui: {
-        language: 'auto',
-    },
-    relay: {
-        mode: 'local',
-        port: 8787,
-        // Address advertised in pairing URLs when mode is "lan". Empty means "pick
-        // the first non-internal IPv4 automatically".
-        lanHost: '',
-        // Manual override for the URL browsers open. Empty means "derive it".
-        publicUrl: '',
-        // Operator-run relay, e.g. wss://herdr.example.com (mode "remote" only).
-        remoteUrl: '',
-        // The CLI starts a relay of its own, so its limits are the relay
-        // package's: a smaller ceiling here would reject an upload the hosted
-        // relay accepts.
-        maxPayloadBytes: RELAY_DEFAULTS.relay.maxPayloadBytes,
-        maxClientsPerHost: RELAY_DEFAULTS.relay.maxClientsPerHost,
-        maxHosts: RELAY_DEFAULTS.relay.maxHosts,
-        maxPendingHandshakes: RELAY_DEFAULTS.relay.maxPendingHandshakes,
-        maxBufferedBytesPerClient: RELAY_DEFAULTS.relay.maxBufferedBytesPerClient,
-        hostReconnectGraceMs: RELAY_DEFAULTS.relay.hostReconnectGraceMs,
-        allowedOrigins: [],
-    },
-    herdr: {
-        socketPath: null,
-        args: [],
-        cwd: os.homedir(),
-        // Start Herdr's server when herdr-remote starts (at boot, under keep-alive).
-        // Off: Herdr starts when the user runs it, or confirms it from the WebUI.
-        autoStart: false,
-    },
-    auth: {
-        pairingTtlMs: RELAY_DEFAULTS.auth.pairingTtlMs,
-        deviceTtlMs: RELAY_DEFAULTS.auth.deviceTtlMs,
-        maxDevices: RELAY_DEFAULTS.auth.maxDevices,
-    },
-    cleanup: { ...RELAY_DEFAULTS.cleanup },
-    keepalive: {
-        manager: 'auto',
-    },
-};
-function clone(value) {
-    return JSON.parse(JSON.stringify(value));
-}
-function readJson(filePath) {
-    try {
-        return JSON.parse(fs.readFileSync(filePath, 'utf8'));
-    }
-    catch (error) {
-        const { code, message } = error;
-        if (code !== 'ENOENT') {
-            process.stderr.write(`herdr-remote: ignoring invalid JSON at ${filePath}: ${message}\n`);
-        }
-        return {};
-    }
-}
-/**
- * Copy a config written by an older, plugin-scoped install into the canonical
- * location. Runs at most once: it never overwrites an existing config.
- */
-function migrateLegacyConfig() {
-    const target = configPath();
-    if (fs.existsSync(target))
-        return { migrated: false, reason: 'config already exists' };
-    const legacy = legacyConfigPath();
-    if (!legacy || !fs.existsSync(legacy))
-        return { migrated: false, reason: 'no legacy config' };
-    try {
-        fs.mkdirSync(path.dirname(target), { recursive: true, mode: 0o700 });
-        fs.copyFileSync(legacy, target);
-        return { migrated: true, from: legacy, to: target };
-    }
-    catch (error) {
-        return { migrated: false, reason: error.message };
-    }
-}
-function mergeConfig(fileConfig) {
-    const config = clone(DEFAULTS);
-    const file = (fileConfig ?? {});
-    for (const section of Object.keys(config)) {
-        const values = file[section];
-        if (values && typeof values === 'object')
-            Object.assign(config[section], values);
-    }
-    return config;
-}
-/**
- * Accept configs written before access modes existed. The 0.1 schema used
- * `relay.local` (boolean), `relay.host` (bind address) and `relay.url`.
- */
-function normalizeLegacyFields(config, fileConfig) {
-    const legacy = fileConfig?.relay || {};
-    // The absence of an explicit `mode` — not an invalid one — is what marks a
-    // file as pre-0.2, since merging defaults always leaves a valid mode behind.
-    const hasExplicitMode = isOneOf(ACCESS_MODES, legacy.mode);
-    if (!hasExplicitMode) {
-        if (legacy.local === false && typeof legacy.url === 'string' && legacy.url) {
-            config.relay.mode = 'remote';
-            if (!config.relay.remoteUrl)
-                config.relay.remoteUrl = legacy.url;
-        }
-        else if (typeof legacy.host === 'string' && legacy.host && !isLoopbackHost(legacy.host)) {
-            config.relay.mode = 'lan';
-        }
-        else {
-            config.relay.mode = 'local';
-        }
-    }
-    if (config.relay.mode === 'lan' &&
-        !config.relay.lanHost &&
-        typeof legacy.host === 'string' &&
-        !isLoopbackHost(legacy.host) &&
-        legacy.host !== '0.0.0.0') {
-        config.relay.lanHost = legacy.host;
-    }
-    // Superseded keys copied in by the merge would otherwise reappear in the
-    // in-memory config and confuse anything reading it.
-    delete config.relay.local;
-    delete config.relay.host;
-    delete config.relay.url;
-    // `publicUrl` used to be mandatory and defaulted to the loopback URL; treat
-    // that default as "no override" so derivation can take over.
-    if (typeof config.relay.publicUrl === 'string' &&
-        /^https?:\/\/(127\.0\.0\.1|localhost)(:\d+)?\/?$/.test(config.relay.publicUrl)) {
-        config.relay.publicUrl = '';
-    }
-}
-function parseInteger(value, fallback, min, max) {
-    const numeric = Number(value);
-    if (!Number.isInteger(numeric) || numeric < min || numeric > max)
-        return fallback;
-    return numeric;
-}
-function validate(config) {
-    if (!isOneOf(ACCESS_MODES, config.relay.mode))
-        config.relay.mode = DEFAULTS.relay.mode;
-    if (!isOneOf(LANGUAGES, config.ui.language))
-        config.ui.language = DEFAULTS.ui.language;
-    if (!isOneOf(KEEPALIVE_MANAGERS, config.keepalive.manager))
-        config.keepalive.manager = DEFAULTS.keepalive.manager;
-    config.relay.port = parseInteger(config.relay.port, DEFAULTS.relay.port, 1, 65535);
-    config.relay.maxPayloadBytes = parseInteger(config.relay.maxPayloadBytes, DEFAULTS.relay.maxPayloadBytes, 4096, 16 * 1024 * 1024);
-    config.relay.maxClientsPerHost = parseInteger(config.relay.maxClientsPerHost, DEFAULTS.relay.maxClientsPerHost, 1, 256);
-    config.relay.maxHosts = parseInteger(config.relay.maxHosts, DEFAULTS.relay.maxHosts, 1, 100000);
-    config.relay.maxPendingHandshakes = parseInteger(config.relay.maxPendingHandshakes, DEFAULTS.relay.maxPendingHandshakes, 16, 100000);
-    config.relay.maxBufferedBytesPerClient = parseInteger(config.relay.maxBufferedBytesPerClient, DEFAULTS.relay.maxBufferedBytesPerClient, 64 * 1024, 256 * 1024 * 1024);
-    config.relay.hostReconnectGraceMs = parseInteger(config.relay.hostReconnectGraceMs, DEFAULTS.relay.hostReconnectGraceMs, 1000, 24 * 60 * 60 * 1000);
-    config.auth.pairingTtlMs = parseInteger(config.auth.pairingTtlMs, DEFAULTS.auth.pairingTtlMs, 30 * 1000, 24 * 60 * 60 * 1000);
-    config.auth.deviceTtlMs = parseInteger(config.auth.deviceTtlMs, DEFAULTS.auth.deviceTtlMs, 60 * 1000, 365 * 24 * 60 * 60 * 1000);
-    config.auth.maxDevices = parseInteger(config.auth.maxDevices, DEFAULTS.auth.maxDevices, 1, 10000);
-    config.cleanup.intervalMs = parseInteger(config.cleanup.intervalMs, DEFAULTS.cleanup.intervalMs, 1000, 24 * 60 * 60 * 1000);
-    config.cleanup.heartbeatIntervalMs = parseInteger(config.cleanup.heartbeatIntervalMs, DEFAULTS.cleanup.heartbeatIntervalMs, 1000, 10 * 60 * 1000);
-    config.cleanup.staleAfterMs = parseInteger(config.cleanup.staleAfterMs, DEFAULTS.cleanup.staleAfterMs, config.cleanup.heartbeatIntervalMs * 2, 24 * 60 * 60 * 1000);
-    config.relay.publicUrl = normalizeUrl(config.relay.publicUrl);
-    config.relay.remoteUrl = normalizeUrl(config.relay.remoteUrl);
-    config.relay.lanHost =
-        typeof config.relay.lanHost === 'string' ? config.relay.lanHost.trim() : '';
-    // A LAN relay listens on every interface, but a loopback or wildcard value
-    // cannot be opened by another device. Clear stale values from older TUI
-    // versions so the advertised URL falls back to a real interface address.
-    if (config.relay.mode === 'lan' &&
-        (isLoopbackHost(config.relay.lanHost) || isUnspecifiedAddress(config.relay.lanHost))) {
-        config.relay.lanHost = '';
-    }
-    // 0.0.0.0 is a server-side bind wildcard, never a destination a browser can
-    // open. Treat it like an empty override so LAN mode derives the real address.
-    if (isUnspecifiedHost(config.relay.publicUrl))
-        config.relay.publicUrl = '';
-    if (!Array.isArray(config.relay.allowedOrigins))
-        config.relay.allowedOrigins = [];
-    if (!Array.isArray(config.herdr.args) ||
-        !config.herdr.args.every((arg) => typeof arg === 'string')) {
-        config.herdr.args = [];
-    }
-    const args = config.herdr.args;
-    // Herdr 0.9.0 removed --no-session; retaining it in saved configs causes
-    // session creation to fail. Filter it out if present.
-    if (args.includes('--no-session')) {
-        config.herdr.args = args.filter((arg) => arg !== '--no-session');
-        process.stderr.write('herdr-remote: ignoring removed --no-session argument (removed in Herdr 0.9.0)\n');
-    }
-    if (typeof config.herdr.socketPath !== 'string' || config.herdr.socketPath.length === 0) {
-        config.herdr.socketPath = null;
-    }
-    if (typeof config.herdr.cwd !== 'string' || config.herdr.cwd.length === 0) {
-        config.herdr.cwd = os.homedir();
-    }
-    config.herdr.autoStart = config.herdr.autoStart === true;
-    // A "remote" config without a relay URL cannot reach anything; fall back to
-    // local rather than silently starting a host connector that dials nowhere.
-    if (config.relay.mode === 'remote' && !config.relay.remoteUrl) {
-        config.relay.mode = 'local';
-    }
-    // Every field `Config` promises has been normalised above.
-    return config;
-}
-function applyEnvironment(config) {
-    const env = process.env;
-    if (env.HERDR_REMOTE_LANG && isOneOf(LANGUAGES, env.HERDR_REMOTE_LANG))
-        config.ui.language = env.HERDR_REMOTE_LANG;
-    if (env.HERDR_REMOTE_MODE && isOneOf(ACCESS_MODES, env.HERDR_REMOTE_MODE))
-        config.relay.mode = env.HERDR_REMOTE_MODE;
-    if (env.RELAY_PORT)
-        config.relay.port = env.RELAY_PORT;
-    if (env.RELAY_PUBLIC_URL)
-        config.relay.publicUrl = env.RELAY_PUBLIC_URL;
-    if (env.RELAY_REMOTE_URL)
-        config.relay.remoteUrl = env.RELAY_REMOTE_URL;
-    if (env.RELAY_MAX_HOSTS)
-        config.relay.maxHosts = env.RELAY_MAX_HOSTS;
-    if (env.RELAY_MAX_PENDING_HANDSHAKES)
-        config.relay.maxPendingHandshakes = env.RELAY_MAX_PENDING_HANDSHAKES;
-    if (env.RELAY_MAX_BUFFERED_BYTES_PER_CLIENT)
-        config.relay.maxBufferedBytesPerClient = env.RELAY_MAX_BUFFERED_BYTES_PER_CLIENT;
-    if (env.RELAY_HOST_RECONNECT_GRACE_MS)
-        config.relay.hostReconnectGraceMs = env.RELAY_HOST_RECONNECT_GRACE_MS;
-    if (env.HERDR_SOCKET_PATH)
-        config.herdr.socketPath = env.HERDR_SOCKET_PATH;
-    if (env.HERDR_CWD)
-        config.herdr.cwd = env.HERDR_CWD;
-    if (env.HERDR_ARGS_JSON) {
-        try {
-            const args = JSON.parse(env.HERDR_ARGS_JSON);
-            if (Array.isArray(args))
-                config.herdr.args = args;
-        }
-        catch (error) {
-            process.stderr.write(`herdr-remote: invalid HERDR_ARGS_JSON: ${error.message}\n`);
-        }
-    }
-}
-function loadConfig() {
-    const fileConfig = readJson(configPath());
-    const draft = mergeConfig(fileConfig);
-    normalizeLegacyFields(draft, fileConfig);
-    applyEnvironment(draft);
-    return validate(draft);
-}
-function configExists() {
-    return fs.existsSync(configPath());
-}
-export { DEFAULTS, ACCESS_MODES, OFFICIAL_RELAY_URL, LANGUAGES, KEEPALIVE_MANAGERS, configExists, migrateLegacyConfig, loadConfig, validate, };

package/dist/connector/admin-broker-setup.js

@@ -1,40 +0,0 @@
-import { spawn } from 'node:child_process';
-import { cliEntryPoint } from '../keepalive/environment.js';
-import { encodePowerShellCommand, escapePowerShellSingleQuoted, } from '../keepalive/windows-service.js';
-function waitForChild(child) {
-    return new Promise((resolve, reject) => {
-        child.once('error', reject);
-        child.once('close', (code) => resolve(code ?? 1));
-    });
-}
-export function renderAdminBrokerElevationScript({ action, nodePath, entryPoint, }) {
-    const quote = escapePowerShellSingleQuoted;
-    const args = `"${entryPoint}" admin-broker ${action} --elevated`;
-    return `$ErrorActionPreference = 'Stop'
-try {
-  $process = Start-Process -FilePath '${quote(nodePath)}' -ArgumentList '${quote(args)}' -Verb RunAs -Wait -PassThru -WindowStyle Hidden
-} catch {
-  if (($_.Exception.HResult -band 65535) -eq 1223) { exit 1223 }
-  exit 1
-}
-exit $process.ExitCode`;
-}
-function elevatedErrorCode(message, code) {
-    return Object.assign(new Error(message), { code });
-}
-/** Register the per-user task from the Windows TUI, requesting elevation once. */
-export async function configureAdminBroker(action, t) {
-    if (process.platform !== 'win32')
-        throw new Error(t('adminBroker.windowsOnly'));
-    const script = renderAdminBrokerElevationScript({
-        action,
-        nodePath: process.execPath,
-        entryPoint: cliEntryPoint(),
-    });
-    const child = spawn('powershell.exe', ['-NoProfile', '-NonInteractive', '-EncodedCommand', encodePowerShellCommand(script)], { windowsHide: true, stdio: 'ignore' });
-    const exitCode = await waitForChild(child);
-    if (exitCode === 1223)
-        throw elevatedErrorCode(t('adminBroker.elevationCancelled'), 'ELEVATION_CANCELLED');
-    if (exitCode !== 0)
-        throw new Error(t('adminBroker.setupFailed'));
-}