herdr-remote-relay 0.3.23 → 0.3.25

package/dist/auth-store.js

@@ -17,6 +17,19 @@ function nowIso(now = Date.now()) {
 function validHostId(value) {
     return typeof value === 'string' && /^[A-Za-z0-9][A-Za-z0-9._:-]{0,127}$/.test(value);
 }
+/**
+ * What a person reads off one screen and types on another: six characters,
+ * without 0/O or 1/I/L to confuse. Cutting base64 and dropping its `-` and `_`
+ * made one code in seven shorter than six, and some too short to pair at all.
+ */
+const PAIR_CODE_ALPHABET = 'ABCDEFGHJKMNPQRSTUVWXYZ23456789';
+const PAIR_CODE_LENGTH = 6;
+function newPairCode() {
+    let code = '';
+    for (let i = 0; i < PAIR_CODE_LENGTH; i += 1)
+        code += PAIR_CODE_ALPHABET[crypto.randomInt(PAIR_CODE_ALPHABET.length)];
+    return code;
+}
 class AuthStore {
     stateFile;
     pairingTtlMs;
@@ -119,7 +132,7 @@ class AuthStore {
         this.cleanup(now);
         let code;
         do {
-            code = randomToken(4).toUpperCase().replace(/[-_]/g, '').slice(0, 6);
+            code = newPairCode();
         } while ([...this.pairings.values()].some((pairing) => equalHash(pairing.codeHash, hash(code))));
         const expiresAt = now + this.pairingTtlMs;
         this.pairings.set(code, {

package/dist/protocol/herdr-keys.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Validates the Herdr prefix keys crossing the wire, or read from a config
+ * file, into one canonical list: lowercase, no whitespace, no duplicates, at
+ * most `MAX_HERDR_PREFIX_KEYS` short entries. Herdr ignores entries it cannot
+ * read and so does this. `undefined` when nothing usable is left, so a host
+ * that says nothing and one that says garbage look the same.
+ */
+export declare function sanitizeHerdrPrefixKeys(value: unknown): string[] | undefined;

package/dist/protocol/herdr-keys.js

@@ -0,0 +1,34 @@
+// The keys that put the workstation's Herdr into prefix mode, as a host reads
+// them from Herdr's config and a browser receives them. Browser-safe: no Node
+// APIs, so the web app imports it.
+/** Herdr accepts any number of prefix keys; a window has no use for more than this. */
+const MAX_HERDR_PREFIX_KEYS = 8;
+/** Longest real combo is `ctrl+shift+double_quote`; this leaves room for spelling variants. */
+const MAX_HERDR_PREFIX_KEY_LENGTH = 32;
+/**
+ * What the browser can act on: a key combo is printable ASCII (modifiers and
+ * key names joined by `+`). Whitespace is removed before this is tested.
+ */
+const PREFIX_KEY = /^[\x21-\x7e]+$/;
+/**
+ * Validates the Herdr prefix keys crossing the wire, or read from a config
+ * file, into one canonical list: lowercase, no whitespace, no duplicates, at
+ * most `MAX_HERDR_PREFIX_KEYS` short entries. Herdr ignores entries it cannot
+ * read and so does this. `undefined` when nothing usable is left, so a host
+ * that says nothing and one that says garbage look the same.
+ */
+export function sanitizeHerdrPrefixKeys(value) {
+    if (!Array.isArray(value))
+        return undefined;
+    const keys = new Set();
+    for (const entry of value) {
+        if (keys.size >= MAX_HERDR_PREFIX_KEYS)
+            break;
+        if (typeof entry !== 'string')
+            continue;
+        const key = entry.replace(/\s+/g, '').toLowerCase();
+        if (key.length <= MAX_HERDR_PREFIX_KEY_LENGTH && PREFIX_KEY.test(key))
+            keys.add(key);
+    }
+    return keys.size > 0 ? [...keys] : undefined;
+}

package/dist/protocol/index.d.ts

@@ -1,5 +1,6 @@
 export * from './frames.js';
 export * from './terminal.js';
+export * from './herdr-keys.js';
 export * from './messages.js';
 export * from './paste.js';
 export type * from './http.js';

package/dist/protocol/index.js

@@ -3,5 +3,6 @@
 // packages build against; nothing here may be copied into the CLI or the web.
 export * from './frames.js';
 export * from './terminal.js';
+export * from './herdr-keys.js';
 export * from './messages.js';
 export * from './paste.js';

package/dist/protocol/messages.d.ts

@@ -94,6 +94,11 @@ export interface ServerReadyMessage {
     clientCount?: number;
     /** The workstation's herdr-remote release; null when it is too old to say. */
     hostVersion?: string | null;
+    /**
+     * The keys that put the workstation's Herdr into prefix mode, lowercase,
+     * like `ctrl+b`. Left out when the host is too old to say.
+     */
+    herdrPrefixKeys?: string[];
 }
 export interface ServerPairedMessage {
     type: 'paired';
@@ -133,6 +138,8 @@ export interface ServerSessionRestartedMessage {
     terminalFont?: HostTerminalFont | null;
     /** As in `ready`: the host may have come back on another release. */
     hostVersion?: string | null;
+    /** As in `ready`: the host may have come back with another Herdr config. */
+    herdrPrefixKeys?: string[];
 }
 export interface ServerExitMessage {
     type: 'exit';
@@ -239,6 +246,11 @@ export interface HostHelloMessage {
     version?: string;
     terminalPalette?: HostTerminalPalette | null;
     terminalFont?: HostTerminalFont | null;
+    /**
+     * The keys `keys.prefix` in the workstation's Herdr config names, as the
+     * host read them. The relay sanitizes them; older connectors leave them out.
+     */
+    herdrPrefixKeys?: string[];
     capabilities?: string[];
 }
 /** One PTY the host is running, as the relay's status page lists it. */

package/dist/server/client-channel.js

@@ -148,6 +148,7 @@ export function handleClientConnection(relay, ws, req) {
                 terminalFont: host.terminalFont || null,
                 clientCount: host.clients.size,
                 hostVersion: host.version,
+                ...(host.herdrPrefixKeys ? { herdrPrefixKeys: host.herdrPrefixKeys } : {}),
             });
             if (host.agentStatus)
                 jsonSend(ws, host.agentStatus);

package/dist/server/host-channel.js

@@ -1,7 +1,7 @@
 // The host side of the relay: a workstation's WebSocket, from its hello and
 // the hand-off from an older connection to every message it sends after.
 import os from 'node:os';
-import { CAPABILITY, PROTOCOL_VERSION, sanitizeTerminalFont, sanitizeTerminalPalette, unpackStreamFrame, } from '../protocol/index.js';
+import { CAPABILITY, PROTOCOL_VERSION, sanitizeHerdrPrefixKeys, sanitizeTerminalFont, sanitizeTerminalPalette, unpackStreamFrame, } from '../protocol/index.js';
 import { forwardFontChunk, forwardFontSubset, settleFontChunk, settleFontSubset, } from './font-proxy.js';
 import { broadcastAgentStatus, broadcastTerminalFont, broadcastUpdateStatus, releaseVersion, } from './host-broadcasts.js';
 import { allowHostHandshake } from './requests.js';
@@ -10,6 +10,7 @@ import { closeSocket, isOpen, jsonSend, parseJson, randomId, rejectHandshake } f
 import { broadcastToClients, notifyHostClientCount, sendClientBinary } from './transport.js';
 function createHostRecord(message, ws, pending, clients = new Set()) {
     const capabilities = Array.isArray(message.capabilities) ? message.capabilities : [];
+    const herdrPrefixKeys = sanitizeHerdrPrefixKeys(message.herdrPrefixKeys);
     return {
         id: message.hostId,
         ws,
@@ -23,6 +24,7 @@ function createHostRecord(message, ws, pending, clients = new Set()) {
         terminalPalette: sanitizeTerminalPalette(message.terminalPalette),
         /** Family, size and fetchable files of the workstation's terminal font. */
         terminalFont: sanitizeTerminalFont(message.terminalFont),
+        ...(herdrPrefixKeys ? { herdrPrefixKeys } : {}),
         /** The latest workstation snapshot is replayed when a browser joins late. */
         agentStatus: null,
         /** Whether the workstation's herdr-remote is behind; replayed the same way. */

package/dist/server/sessions.js

@@ -72,6 +72,7 @@ export function startSession(relay, host, client, { restarted = false } = {}) {
             terminalPalette: host.terminalPalette || null,
             terminalFont: host.terminalFont || null,
             hostVersion: host.version,
+            ...(host.herdrPrefixKeys ? { herdrPrefixKeys: host.herdrPrefixKeys } : {}),
         });
     }
 }

package/dist/server/types.d.ts

@@ -31,6 +31,8 @@ export interface RelayHost {
     connectedAtMs: number;
     terminalPalette: HostTerminalPalette | null;
     terminalFont: HostTerminalFont | null;
+    /** Sanitized `keys.prefix` of the host's Herdr; absent when the host did not say. */
+    herdrPrefixKeys?: string[];
     /** The latest agent summary, replayed to a window that joins late. */
     agentStatus: ServerAgentStatusMessage | null;
     /** Whether the workstation's herdr-remote is behind; replayed the same way. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "herdr-remote-relay",
-  "version": "0.3.23",
+  "version": "0.3.25",
   "description": "Standalone relay server and web terminal for Herdr Remote",
   "license": "MIT",
   "type": "module",