herdr-remote-relay 0.3.19 → 0.3.20

package/dist/protocol/messages.d.ts

@@ -9,8 +9,8 @@ export declare const CAPABILITY: {
     readonly idleHeartbeat: "idle_heartbeat";
     /** The host routes output by 16-bit stream index (v2 frames). */
     readonly binaryFrameV2: "binary_frame_v2";
-    /** The host can route elevated Windows PTYs through its local broker. */
-    readonly adminSessions: "admin_sessions";
+    /** The host can open an elevated PowerShell as a tab of its Windows Herdr. */
+    readonly adminTabs: "admin_tabs";
 };
 export type ClientRole = 'controller' | 'viewer';
 export type HostShellProfile = 'posix' | 'cmd' | 'powershell' | 'git-bash';
@@ -19,8 +19,6 @@ export interface ClientHelloMessage {
     protocol: 1;
     token?: string;
     pairCode?: string;
-    /** Open this window's PTY through the host's pre-authorized admin broker. */
-    adminTerminal?: boolean;
     clientId: string;
     cols: number;
     rows: number;
@@ -54,6 +52,13 @@ export interface ClientPasteFileMessage {
 export interface ClientHerdrStartMessage {
     type: 'herdr_start';
 }
+/**
+ * Open an elevated PowerShell as a new tab of the workstation's Herdr. Carries
+ * nothing: the host decides what runs, through its own pre-authorized broker.
+ */
+export interface ClientAdminTabOpenMessage {
+    type: 'admin_tab_open';
+}
 /** One slice of an announced font file, by the file's hash. */
 export interface ClientHostFontChunkRequestMessage {
     type: 'host_font_chunk_request';
@@ -71,7 +76,7 @@ export interface ClientHostFontSubsetRequestMessage {
 export interface ClientHostFontRefreshMessage {
     type: 'host_font_refresh';
 }
-export type ClientJsonMessage = ClientHelloMessage | ClientHostFontChunkRequestMessage | ClientHostFontSubsetRequestMessage | ClientHostFontRefreshMessage | ClientClaimControlMessage | ClientReleaseControlMessage | ClientResizeMessage | ClientPingMessage | ClientPasteFileMessage | ClientHerdrStartMessage;
+export type ClientJsonMessage = ClientHelloMessage | ClientHostFontChunkRequestMessage | ClientHostFontSubsetRequestMessage | ClientHostFontRefreshMessage | ClientClaimControlMessage | ClientReleaseControlMessage | ClientResizeMessage | ClientPingMessage | ClientPasteFileMessage | ClientHerdrStartMessage | ClientAdminTabOpenMessage;
 export interface ServerReadyMessage {
     type: 'ready';
     role: ClientRole;
@@ -80,7 +85,7 @@ export interface ServerReadyMessage {
     hostname?: string;
     platform?: string;
     shellProfile?: HostShellProfile;
-    /** The relay and Windows host both understand administrator-terminal requests. */
+    /** The relay and Windows host can both open an administrator terminal tab. */
     adminTerminalSupported?: boolean;
     clientId?: string;
     terminalPalette?: HostTerminalPalette | null;
@@ -291,7 +296,6 @@ export interface RelaySessionStartMessage extends StreamAddressed {
     cols: number;
     rows: number;
     role: ClientRole;
-    adminTerminal?: boolean;
     /** Present when the host negotiated v2 frames and an index was free. */
     streamIndex?: number;
 }
@@ -306,6 +310,9 @@ export interface RelayResizeMessage extends StreamAddressed {
 export interface RelayHerdrStartMessage extends StreamAddressed {
     type: 'herdr_start';
 }
+export interface RelayAdminTabOpenMessage extends StreamAddressed {
+    type: 'admin_tab_open';
+}
 export interface RelayHostFontRefreshMessage extends StreamAddressed {
     type: 'host_font_refresh';
 }
@@ -331,5 +338,5 @@ export interface RelayErrorMessage {
     code: string;
     message: string;
 }
-export type RelayToHostMessage = RelayHostReadyMessage | RelayClientCountMessage | RelaySessionStartMessage | RelaySessionStopMessage | RelayResizeMessage | RelayHerdrStartMessage | RelayHostFontRefreshMessage | RelayHostFontChunkRequestMessage | RelayHostFontSubsetRequestMessage | RelayPasteFileMessage | RelayErrorMessage;
+export type RelayToHostMessage = RelayHostReadyMessage | RelayClientCountMessage | RelaySessionStartMessage | RelaySessionStopMessage | RelayResizeMessage | RelayHerdrStartMessage | RelayAdminTabOpenMessage | RelayHostFontRefreshMessage | RelayHostFontChunkRequestMessage | RelayHostFontSubsetRequestMessage | RelayPasteFileMessage | RelayErrorMessage;
 export {};

package/dist/protocol/messages.js

@@ -15,6 +15,6 @@ export const CAPABILITY = {
     idleHeartbeat: 'idle_heartbeat',
     /** The host routes output by 16-bit stream index (v2 frames). */
     binaryFrameV2: 'binary_frame_v2',
-    /** The host can route elevated Windows PTYs through its local broker. */
-    adminSessions: 'admin_sessions',
+    /** The host can open an elevated PowerShell as a tab of its Windows Herdr. */
+    adminTabs: 'admin_tabs',
 };

package/dist/server/client-channel.js

@@ -10,6 +10,8 @@ import { enqueueDelayedSend, notifyHostClientCount } from './transport.js';
 const HERDR_START_REPEAT_MS = 3_000;
 /** A window asks its workstation to re-read the terminal font at most this often. */
 const FONT_REFRESH_REPEAT_MS = 2_000;
+/** A window opens an administrator tab at most this often. */
+const ADMIN_TAB_REPEAT_MS = 1_000;
 function verifyImageMagicBytes(mime, dataBase64) {
     if (typeof dataBase64 !== 'string' || dataBase64.length === 0)
         return false;
@@ -86,7 +88,6 @@ export function handleClientConnection(relay, ws, req) {
                 // Stable per browser profile; used to recognise a reconnect from the
                 // same browser rather than a genuinely separate viewer.
                 browserClientId: typeof message.clientId === 'string' ? message.clientId.slice(0, 128) : null,
-                adminTerminal: message.adminTerminal === true,
                 handoffCapable: Array.isArray(message.capabilities) &&
                     message.capabilities.includes(CAPABILITY.hostHandoff),
                 session: null,
@@ -139,7 +140,7 @@ export function handleClientConnection(relay, ws, req) {
                 hostname: host.hostname,
                 platform: host.platform,
                 ...(host.shellProfile ? { shellProfile: host.shellProfile } : {}),
-                adminTerminalSupported: host.adminSessionsAvailable,
+                adminTerminalSupported: host.adminTabsAvailable,
                 clientId: client.id,
                 // Delivered with `ready`, before the first PTY byte, so the terminal
                 // is painted in the host's colors from its very first frame.
@@ -259,6 +260,30 @@ function handleClientMessage(relay, client, raw, isBinary) {
             });
         }
     }
+    else if (message.type === 'admin_tab_open') {
+        // Routed like herdr_start. The host runs the fixed elevated PowerShell of
+        // its own broker; nothing in this message chooses what starts.
+        if (!client.session || !isOpen(host.ws))
+            return;
+        if (!host.adminTabsAvailable) {
+            jsonSend(client.ws, {
+                type: 'error',
+                code: 'admin_terminal_unsupported',
+                message: 'Update the host connector to open administrator terminals.',
+            });
+            return;
+        }
+        // A double tap is one request; a second tab needs a second, later tap.
+        const now = Date.now();
+        if (client.adminTabAt && now - client.adminTabAt < ADMIN_TAB_REPEAT_MS)
+            return;
+        client.adminTabAt = now;
+        jsonSend(host.ws, {
+            type: 'admin_tab_open',
+            clientId: client.session.streamId,
+            streamId: client.session.streamId,
+        });
+    }
     else if (message.type === 'host_font_chunk_request') {
         requestFontChunk(host, client, message);
     }

package/dist/server/host-channel.js

@@ -16,7 +16,7 @@ function createHostRecord(message, ws, pending, clients = new Set()) {
         hostname: typeof message.hostname === 'string' ? message.hostname.slice(0, 128) : os.hostname(),
         platform: typeof message.platform === 'string' ? message.platform.slice(0, 32) : process.platform,
         ...(message.shellProfile === 'git-bash' ? { shellProfile: message.shellProfile } : {}),
-        adminSessionsAvailable: capabilities.includes(CAPABILITY.adminSessions),
+        adminTabsAvailable: capabilities.includes(CAPABILITY.adminTabs),
         arch: typeof message.arch === 'string' ? message.arch.slice(0, 32) : process.arch,
         connectedAt: new Date(pending.connectedAt).toISOString(),
         connectedAtMs: pending.connectedAt,

package/dist/server/sessions.js

@@ -34,14 +34,6 @@ export function releaseSession(relay, host, client) {
 export function startSession(relay, host, client, { restarted = false } = {}) {
     if (!client || !isOpen(host.ws))
         return;
-    if (client.adminTerminal && !host.adminSessionsAvailable) {
-        jsonSend(client.ws, {
-            type: 'error',
-            code: 'admin_terminal_unsupported',
-            message: 'Update the host connector to support administrator terminals.',
-        });
-        return;
-    }
     const streamId = randomId('session');
     let streamIndex = null;
     if (host.binaryFrameV2) {
@@ -65,7 +57,6 @@ export function startSession(relay, host, client, { restarted = false } = {}) {
         cols: Math.max(MIN_SESSION_COLS, client.cols),
         rows: Math.max(MIN_SESSION_ROWS, client.rows),
         role: 'controller',
-        ...(client.adminTerminal ? { adminTerminal: true } : {}),
         ...(streamIndex !== null ? { streamIndex } : {}),
     });
     if (restarted) {
@@ -77,7 +68,7 @@ export function startSession(relay, host, client, { restarted = false } = {}) {
             hostname: host.hostname,
             platform: host.platform,
             ...(host.shellProfile ? { shellProfile: host.shellProfile } : {}),
-            adminTerminalSupported: host.adminSessionsAvailable,
+            adminTerminalSupported: host.adminTabsAvailable,
             terminalPalette: host.terminalPalette || null,
             terminalFont: host.terminalFont || null,
         });

package/dist/server/types.d.ts

@@ -24,7 +24,8 @@ export interface RelayHost {
     hostname: string;
     platform: string;
     shellProfile?: HostShellProfile;
-    adminSessionsAvailable: boolean;
+    /** The host can open an administrator terminal as a Herdr tab. */
+    adminTabsAvailable: boolean;
     arch: string;
     connectedAt: string;
     connectedAtMs: number;
@@ -59,7 +60,6 @@ export interface RelayClient {
     deviceId: string;
     /** Stable per browser profile, supplied by the browser itself. */
     browserClientId: string | null;
-    adminTerminal: boolean;
     handoffCapable: boolean;
     session: ClientSession | null;
     role: ClientRole;
@@ -75,6 +75,7 @@ export interface RelayClient {
     cols: number;
     rows: number;
     herdrStartAt?: number;
+    adminTabAt?: number;
     fontRefreshAt?: number;
     /** When each outstanding font chunk request was sent. */
     fontChunkRequests?: number[];

package/package.json

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