herdr-remote-relay 0.2.4 → 0.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "herdr-remote-relay",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Standalone relay server and web terminal for Herdr Remote",
   "license": "MIT",
   "repository": {

package/src/metrics.js

@@ -12,6 +12,29 @@ function bytesPerSecond(current, previous, elapsedMs) {
   return Math.max(0, (current - previous) * 1000 / elapsedMs);
 }
 
+/**
+ * How many people are attached, rather than how many sockets are open.
+ *
+ * A phone and a laptop belonging to one person are two connections but one
+ * paired device each, and one person opening three browser windows is three
+ * connections and one device — so the distinct paired device is the closest
+ * thing the relay has to a user. Connections that predate device pairing carry
+ * no `deviceId`; they fall back to their own connection id so they still count
+ * once instead of collapsing into a single anonymous user.
+ */
+function countActiveUsers(clients = []) {
+  const identities = new Set();
+  for (const client of clients) {
+    if (!client) continue;
+    identities.add(
+      typeof client.deviceId === 'string' && client.deviceId
+        ? `device:${client.deviceId}`
+        : `client:${client.id}`
+    );
+  }
+  return identities.size;
+}
+
 class RelayMetrics {
   constructor({ version = '0.1.0', protocolVersion = 1 } = {}) {
     this.version = version;
@@ -143,7 +166,13 @@ class RelayMetrics {
     };
   }
 
-  snapshot({ clients = [], hosts = [], ptys = [], sample = true, scopeHostId = null } = {}) {
+  /**
+   * `activeUserCount` is passed in rather than derived from `clients`: the
+   * public `/api/status` rows deliberately omit `deviceId`, so only the caller
+   * still holding the full connection records can count devices correctly.
+   * Omitting it falls back to counting whatever the given rows identify.
+   */
+  snapshot({ clients = [], hosts = [], ptys = [], sample = true, scopeHostId = null, activeUserCount = null } = {}) {
     const now = Date.now();
     const elapsedMs = now - this.lastSample.at;
     const throughput = {
@@ -181,6 +210,7 @@ class RelayMetrics {
       clientCount: clients.length,
       hostCount: hosts.length,
       ptyCount: ptys.length,
+      activeUserCount: Number.isFinite(activeUserCount) ? activeUserCount : countActiveUsers(clients),
       throughput: scopedThroughput,
       cpu: {
         load1m: finite(load[0]),
@@ -208,4 +238,4 @@ class RelayMetrics {
   }
 }
 
-module.exports = { RelayMetrics };
+module.exports = { RelayMetrics, countActiveUsers };

package/src/relay-server.js

@@ -9,7 +9,7 @@ const { URL } = require('node:url');
 const { WebSocketServer, WebSocket } = require('ws');
 const { loadRelayConfig, defaultStateDir, PACKAGE_ROOT } = require('./relay-config');
 const { AuthStore } = require('./auth-store');
-const { RelayMetrics } = require('./metrics');
+const { RelayMetrics, countActiveUsers } = require('./metrics');
 const { unpackStreamFrame, packStreamFrame, sanitizeTerminalPalette } = require('./stream-frame');
 const { ensureDir } = require('./state');
 
@@ -1203,6 +1203,15 @@ class RelayServer {
       bytesSent: client.bytesSent,
       ip: client.ip,
     }));
+    // The roster is read once and used twice: the operator response carries it
+    // whole, and every response carries the per-host tally derived from it. A
+    // public caller learns how many devices a workstation has paired, never
+    // which ones.
+    const pairedDevices = this.auth.listDevices();
+    const pairedPerHost = new Map();
+    for (const device of pairedDevices) {
+      pairedPerHost.set(device.hostId, (pairedPerHost.get(device.hostId) || 0) + 1);
+    }
     const hosts = scopedHosts.map((host) => ({
       id: host.id,
       hostname: host.hostname,
@@ -1211,6 +1220,12 @@ class RelayServer {
       status: host.reconnecting ? 'reconnecting' : host.clients.size ? 'busy' : 'online',
       connectedAt: host.connectedAt,
       activePtyCount: host.ptys.length,
+      // Distinct devices attached to this workstation, not open sockets: a
+      // phone with two tabs open is one device on the operator's board.
+      connectedDeviceCount: countActiveUsers(
+        [...host.clients].map((id) => this.clients.get(id)).filter(Boolean)
+      ),
+      pairedDeviceCount: pairedPerHost.get(host.id) || 0,
       load: host.load,
     }));
     // The workstation counts one PTY per stream and cannot know how many
@@ -1225,9 +1240,19 @@ class RelayServer {
     // The paired-device roster identifies people's hardware, so it is served to
     // the relay operator only — never on /api/status, which any paired device
     // may read.
-    const devices = includeDevices ? this.auth.listDevices() : undefined;
+    const devices = includeDevices ? pairedDevices : undefined;
     return {
-      ...this.metrics.snapshot({ clients, hosts, ptys, sample, scopeHostId }),
+      ...this.metrics.snapshot({
+        clients,
+        hosts,
+        ptys,
+        sample,
+        scopeHostId,
+        // Counted from the unredacted records: the mapped rows above only carry
+        // `deviceId` for the operator, and a public caller must still see the
+        // same number of users the operator does.
+        activeUserCount: countActiveUsers(scopedClients),
+      }),
       ...(devices ? { devices } : {}),
       relayMode: this.relayMode,
       isRemoteRelay: this.relayMode === 'remote',