@serfab/cadre-host 1.14.0 → 1.16.0

package/src/server/routes/settings.ts

@@ -1,115 +1,128 @@
-/**
- * /api/settings — host-level settings UI surface.
- *
- * The persisted shape is `host.config.json` (managed by the installer).
- * This route is a thin passthrough plus a write-whitelist:
- *
- *   - uiPort        rejected (restart required; only edit at install time)
- *   - upnpEnabled   accepted → also propagated to NatService.putSettings
- *   - updates.autoApply  accepted → propagated to UpdateService.putSettings
- *   - updates.manifestUrl accepted → propagated to UpdateService.putSettings
- *   - anything else 400 invalid_setting
- *
- * GET returns the full `HostConfigFile` (the SPA wants the full shape so it
- * can render a read-only view of the rejected keys).
- */
-
-import type { FastifyInstance } from 'fastify';
-
-import type { NatService } from '../../nat/index.js';
-import type { UpdateService } from '../../update/index.js';
-import type { HostSettingsStore } from '../settings-store.js';
-
-const FORBIDDEN_KEYS = new Set<string>(['uiPort', 'dataDir', 'installId', 'installedAt', 'installerVersion', 'version']);
-
-const WRITABLE_TOP_KEYS = new Set<string>(['upnpEnabled', 'updates']);
-const WRITABLE_UPDATES_KEYS = new Set<string>(['autoApply', 'manifestUrl']);
-
-export interface SettingsRoutesOptions {
-  settingsStore: HostSettingsStore;
-  /** An `upnpEnabled` write takes effect on it at once. */
-  nat: NatService;
-  update?: UpdateService;
-}
-
-export function registerSettingsRoutes(app: FastifyInstance, opts: SettingsRoutesOptions): void {
-  const { settingsStore, nat, update } = opts;
-
-  app.get('/api/settings', async () => {
-    return { ok: true, data: settingsStore.read() };
-  });
-
-  app.put('/api/settings', async (request, reply) => {
-    const body = (request.body ?? {}) as Record<string, unknown>;
-    const validation = validatePatch(body);
-    if (validation.error) {
-      return reply.code(400).send({
-        ok: false,
-        error: { code: 'invalid_setting', message: validation.error },
-      });
-    }
-
-    const current = settingsStore.read();
-    const patch: { upnpEnabled?: boolean; updates?: typeof current.updates } = {};
-
-    if ('upnpEnabled' in body) {
-      patch.upnpEnabled = body.upnpEnabled as boolean;
-      // Propagate the UPnP toggle into the running NatService so the change
-      // takes effect immediately. NatService persists into nat.json — that's
-      // independent of host.config.json's `upnpEnabled` (which the installer
-      // uses on first run to seed nat.json). Update both for consistency.
-      await nat.putSettings({ upnpEnabled: body.upnpEnabled as boolean });
-    }
-    if ('updates' in body) {
-      const updates = body.updates as { autoApply?: boolean; manifestUrl?: string };
-      const nextUpdates = { ...current.updates };
-      if ('autoApply' in updates) nextUpdates.autoApply = updates.autoApply as boolean;
-      if ('manifestUrl' in updates) nextUpdates.manifestUrl = updates.manifestUrl as string;
-      patch.updates = nextUpdates;
-      if (update) {
-        const propagate: { autoApply?: boolean; manifestUrl?: string } = {};
-        if ('autoApply' in updates) propagate.autoApply = updates.autoApply as boolean;
-        if ('manifestUrl' in updates) propagate.manifestUrl = updates.manifestUrl as string;
-        await update.putSettings(propagate);
-      }
-    }
-
-    const next = settingsStore.update(patch);
-    return { ok: true, data: next };
-  });
-}
-
-function validatePatch(body: Record<string, unknown>): { error?: string } {
-  for (const key of Object.keys(body)) {
-    if (FORBIDDEN_KEYS.has(key)) {
-      return { error: `Setting "${key}" is not editable at runtime; change it in host.config.json and restart cadre-host.` };
-    }
-    if (!WRITABLE_TOP_KEYS.has(key)) {
-      return { error: `Unknown setting "${key}"` };
-    }
-  }
-  if ('upnpEnabled' in body && typeof body.upnpEnabled !== 'boolean') {
-    return { error: '"upnpEnabled" must be a boolean' };
-  }
-  if ('updates' in body) {
-    if (!body.updates || typeof body.updates !== 'object') {
-      return { error: '"updates" must be an object' };
-    }
-    const updates = body.updates as Record<string, unknown>;
-    for (const key of Object.keys(updates)) {
-      if (!WRITABLE_UPDATES_KEYS.has(key)) {
-        return { error: `Unknown setting "updates.${key}"` };
-      }
-    }
-    if ('autoApply' in updates && typeof updates.autoApply !== 'boolean') {
-      return { error: '"updates.autoApply" must be a boolean' };
-    }
-    if (
-      'manifestUrl' in updates &&
-      typeof updates.manifestUrl !== 'string'
-    ) {
-      return { error: '"updates.manifestUrl" must be a string' };
-    }
-  }
-  return {};
-}
+/**
+ * /api/settings — host-level settings UI surface.
+ *
+ * The persisted shape is `host.config.json` (managed by the installer).
+ * This route is a thin passthrough plus a write-whitelist:
+ *
+ *   - uiPort        rejected (restart required; only edit at install time)
+ *   - upnpEnabled   accepted → also propagated to NatService.putSettings
+ *   - updates.autoApply  accepted → propagated to UpdateService.putSettings
+ *   - updates.manifestUrl accepted → propagated to UpdateService.putSettings
+ *   - claimAddresses accepted (replaced whole) → read by the next claim code
+ *   - anything else 400 invalid_setting
+ *
+ * GET returns the full `HostConfigFile` (the SPA wants the full shape so it
+ * can render a read-only view of the rejected keys).
+ */
+
+import type { FastifyInstance } from 'fastify';
+
+import type { NatService } from '../../nat/index.js';
+import type { UpdateService } from '../../update/index.js';
+import type { HostSettingsStore } from '../settings-store.js';
+import { claimAddressSettingsProblem, type ClaimAddressSettings } from '../../installer/config.js';
+
+const FORBIDDEN_KEYS = new Set<string>(['uiPort', 'dataDir', 'installId', 'installedAt', 'installerVersion', 'version']);
+
+const WRITABLE_TOP_KEYS = new Set<string>(['upnpEnabled', 'updates', 'claimAddresses']);
+const WRITABLE_UPDATES_KEYS = new Set<string>(['autoApply', 'manifestUrl']);
+
+export interface SettingsRoutesOptions {
+  settingsStore: HostSettingsStore;
+  /** An `upnpEnabled` write takes effect on it at once. */
+  nat: NatService;
+  update?: UpdateService;
+}
+
+export function registerSettingsRoutes(app: FastifyInstance, opts: SettingsRoutesOptions): void {
+  const { settingsStore, nat, update } = opts;
+
+  app.get('/api/settings', async () => {
+    return { ok: true, data: settingsStore.read() };
+  });
+
+  app.put('/api/settings', async (request, reply) => {
+    const body = (request.body ?? {}) as Record<string, unknown>;
+    const validation = validatePatch(body);
+    if (validation.error) {
+      return reply.code(400).send({
+        ok: false,
+        error: { code: 'invalid_setting', message: validation.error },
+      });
+    }
+
+    const current = settingsStore.read();
+    const patch: { upnpEnabled?: boolean; updates?: typeof current.updates; claimAddresses?: ClaimAddressSettings } = {};
+
+    if ('upnpEnabled' in body) {
+      patch.upnpEnabled = body.upnpEnabled as boolean;
+      // Propagate the UPnP toggle into the running NatService so the change
+      // takes effect immediately. NatService persists into nat.json — that's
+      // independent of host.config.json's `upnpEnabled` (which the installer
+      // uses on first run to seed nat.json). Update both for consistency.
+      await nat.putSettings({ upnpEnabled: body.upnpEnabled as boolean });
+    }
+    if ('updates' in body) {
+      const updates = body.updates as { autoApply?: boolean; manifestUrl?: string };
+      const nextUpdates = { ...current.updates };
+      if ('autoApply' in updates) nextUpdates.autoApply = updates.autoApply as boolean;
+      if ('manifestUrl' in updates) nextUpdates.manifestUrl = updates.manifestUrl as string;
+      patch.updates = nextUpdates;
+      if (update) {
+        const propagate: { autoApply?: boolean; manifestUrl?: string } = {};
+        if ('autoApply' in updates) propagate.autoApply = updates.autoApply as boolean;
+        if ('manifestUrl' in updates) propagate.manifestUrl = updates.manifestUrl as string;
+        await update.putSettings(propagate);
+      }
+    }
+
+    if ('claimAddresses' in body) {
+      const { lan, addrs } = body.claimAddresses as ClaimAddressSettings;
+      patch.claimAddresses = {
+        ...(lan !== undefined ? { lan } : {}),
+        ...(addrs !== undefined ? { addrs: addrs.map((a) => a.trim()).filter((a) => a.length > 0) } : {}),
+      };
+    }
+    const next = settingsStore.update(patch);
+    return { ok: true, data: next };
+  });
+}
+
+function validatePatch(body: Record<string, unknown>): { error?: string } {
+  for (const key of Object.keys(body)) {
+    if (FORBIDDEN_KEYS.has(key)) {
+      return { error: `Setting "${key}" is not editable at runtime; change it in host.config.json and restart cadre-host.` };
+    }
+    if (!WRITABLE_TOP_KEYS.has(key)) {
+      return { error: `Unknown setting "${key}"` };
+    }
+  }
+  if ('upnpEnabled' in body && typeof body.upnpEnabled !== 'boolean') {
+    return { error: '"upnpEnabled" must be a boolean' };
+  }
+  if ('claimAddresses' in body) {
+    const problem = claimAddressSettingsProblem(body.claimAddresses);
+    if (problem) return { error: problem };
+  }
+  if ('updates' in body) {
+    if (!body.updates || typeof body.updates !== 'object') {
+      return { error: '"updates" must be an object' };
+    }
+    const updates = body.updates as Record<string, unknown>;
+    for (const key of Object.keys(updates)) {
+      if (!WRITABLE_UPDATES_KEYS.has(key)) {
+        return { error: `Unknown setting "updates.${key}"` };
+      }
+    }
+    if ('autoApply' in updates && typeof updates.autoApply !== 'boolean') {
+      return { error: '"updates.autoApply" must be a boolean' };
+    }
+    if (
+      'manifestUrl' in updates &&
+      typeof updates.manifestUrl !== 'string'
+    ) {
+      return { error: '"updates.manifestUrl" must be a string' };
+    }
+  }
+  return {};
+}

package/src/server/routes/status.ts

@@ -1,102 +1,72 @@
-/**
- * GET /api/status — aggregated health snapshot used by the SPA's dashboard.
- *
- * All inputs are in-memory subsystem state — no disk reads on each call.
- * The response budget is < 5 ms; favour `getStatus()` over `testReachability()`.
- */
-
-import { readFileSync } from 'node:fs';
-import { dirname, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-import type { FastifyInstance } from 'fastify';
-
-import type { HostProcessOrchestrator } from '../../orchestrator/index.js';
-import type { ManagedNodeInfo } from '../../orchestrator/types.js';
-import type { NatService } from '../../nat/index.js';
-import type { NatStatusSnapshot } from '../../nat/types.js';
-import type { UpdateService } from '../../update/index.js';
-
-const PROCESS_STARTED_AT = process.hrtime.bigint();
-
-export interface StatusRouteOptions {
-  orchestrator: HostProcessOrchestrator;
-  nat: NatService;
-  update?: UpdateService;
-}
-
-export interface StatusResponse {
-  service: { name: 'cadre-host'; version: string; uptimeSeconds: number };
-  nodes: Array<{
-    id: string;
-    partyId: string;
-    status: ManagedNodeInfo['status'];
-    profile: ManagedNodeInfo['profile'];
-  }>;
-  connectivity: NatStatusSnapshot;
-  update?: { available?: string; lastChecked?: string };
-}
-
-export function registerStatusRoute(app: FastifyInstance, opts: StatusRouteOptions): void {
-  const version = readPackageVersion();
-
-  app.get('/api/status', async (): Promise<StatusResponse> => {
-    const nodes = opts.orchestrator.listNodes().map((n) => ({
-      id: n.id,
-      partyId: n.partyId,
-      status: n.status,
-      profile: n.profile,
-    }));
-
-    const response: StatusResponse = {
-      service: {
-        name: 'cadre-host',
-        version,
-        uptimeSeconds: secondsSince(PROCESS_STARTED_AT),
-      },
-      nodes,
-      connectivity: opts.nat.getStatus(),
-    };
-
-    if (opts.update) {
-      const state = await opts.update.getState();
-      const update: { available?: string; lastChecked?: string } = {};
-      if (state.available?.version) update.available = state.available.version;
-      if (state.lastChecked) update.lastChecked = state.lastChecked;
-      response.update = update;
-    }
-
-    return response;
-  });
-}
-
-function secondsSince(start: bigint): number {
-  const now = process.hrtime.bigint();
-  const elapsedNs = now - start;
-  return Number(elapsedNs / 1_000_000_000n);
-}
-
-let cachedVersion: string | null = null;
-function readPackageVersion(): string {
-  if (cachedVersion) return cachedVersion;
-  try {
-    // dist/server/routes/status.js -> ../../../package.json
-    // src/server/routes/status.ts  -> ../../../package.json (vitest)
-    const here = dirname(fileURLToPath(import.meta.url));
-    const candidates = [
-      resolve(here, '..', '..', '..', 'package.json'),
-      resolve(here, '..', '..', 'package.json'),
-    ];
-    for (const p of candidates) {
-      try {
-        const parsed = JSON.parse(readFileSync(p, 'utf8')) as { version?: string };
-        if (parsed.version) {
-          cachedVersion = parsed.version;
-          return cachedVersion;
-        }
-      } catch { /* try next */ }
-    }
-  } catch { /* ignore */ }
-  cachedVersion = '0.0.0-unknown';
-  return cachedVersion;
-}
+/**
+ * GET /api/status — aggregated health snapshot used by the SPA's dashboard.
+ *
+ * All inputs are in-memory subsystem state — no disk reads on each call.
+ * The response budget is < 5 ms; favour `getStatus()` over `testReachability()`.
+ */
+
+import type { FastifyInstance } from 'fastify';
+
+import type { HostProcessOrchestrator } from '../../orchestrator/index.js';
+import type { ManagedNodeInfo } from '../../orchestrator/types.js';
+import type { NatService } from '../../nat/index.js';
+import type { NatStatusSnapshot } from '../../nat/types.js';
+import type { UpdateService } from '../../update/index.js';
+import { packageVersion } from '../../package-version.js';
+
+const PROCESS_STARTED_AT = process.hrtime.bigint();
+
+export interface StatusRouteOptions {
+  orchestrator: HostProcessOrchestrator;
+  nat: NatService;
+  update?: UpdateService;
+}
+
+export interface StatusResponse {
+  service: { name: 'cadre-host'; version: string; uptimeSeconds: number };
+  nodes: Array<{
+    id: string;
+    partyId: string;
+    status: ManagedNodeInfo['status'];
+    profile: ManagedNodeInfo['profile'];
+  }>;
+  connectivity: NatStatusSnapshot;
+  update?: { available?: string; lastChecked?: string };
+}
+
+export function registerStatusRoute(app: FastifyInstance, opts: StatusRouteOptions): void {
+  app.get('/api/status', async (): Promise<StatusResponse> => {
+    const nodes = opts.orchestrator.listNodes().map((n) => ({
+      id: n.id,
+      partyId: n.partyId,
+      status: n.status,
+      profile: n.profile,
+    }));
+
+    const response: StatusResponse = {
+      service: {
+        name: 'cadre-host',
+        version: packageVersion,
+        uptimeSeconds: secondsSince(PROCESS_STARTED_AT),
+      },
+      nodes,
+      connectivity: opts.nat.getStatus(),
+    };
+
+    if (opts.update) {
+      const state = await opts.update.getState();
+      const update: { available?: string; lastChecked?: string } = {};
+      if (state.available?.version) update.available = state.available.version;
+      if (state.lastChecked) update.lastChecked = state.lastChecked;
+      response.update = update;
+    }
+
+    return response;
+  });
+}
+
+function secondsSince(start: bigint): number {
+  const now = process.hrtime.bigint();
+  const elapsedNs = now - start;
+  return Number(elapsedNs / 1_000_000_000n);
+}