@serfab/cadre-host 0.9.0 → 0.11.0

package/src/server/routes/status.ts

@@ -1,118 +1,118 @@
-/**
- * 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 { TrustCircleService } from '../../auth/index.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;
-  /** Present only when the host runs its own personal cadre (`ownCadre.enabled`). */
-  trustCircle?: TrustCircleService;
-  /** Present only when the host runs its own personal cadre (`ownCadre.enabled`). */
-  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'];
-  }>;
-  /** Omitted in donor-only mode (no host-own trust circle). */
-  trustCircle?: { members: number; pending: number };
-  /** Omitted in donor-only mode (no NAT service). */
-  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,
-    };
-
-    // Trust-circle + connectivity exist only when the host runs its own
-    // personal cadre; donor-only mode omits both.
-    if (opts.trustCircle) {
-      const tc = await opts.trustCircle.list();
-      response.trustCircle = { members: tc.members.length, pending: tc.pending.length };
-    }
-    if (opts.nat) {
-      response.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 { 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 { TrustCircleService } from '../../auth/index.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;
+  /** Present only when the host runs its own personal cadre (`ownCadre.enabled`). */
+  trustCircle?: TrustCircleService;
+  /** Present only when the host runs its own personal cadre (`ownCadre.enabled`). */
+  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'];
+  }>;
+  /** Omitted in donor-only mode (no host-own trust circle). */
+  trustCircle?: { members: number; pending: number };
+  /** Omitted in donor-only mode (no NAT service). */
+  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,
+    };
+
+    // Trust-circle + connectivity exist only when the host runs its own
+    // personal cadre; donor-only mode omits both.
+    if (opts.trustCircle) {
+      const tc = await opts.trustCircle.list();
+      response.trustCircle = { members: tc.members.length, pending: tc.pending.length };
+    }
+    if (opts.nat) {
+      response.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;
+}

package/src/server/routes/strands.ts

@@ -0,0 +1,54 @@
+/**
+ * Strand HTTP routes — thin adapters around `StrandHandlers`
+ * (`createStrandHandlers(service)`).
+ *
+ * Mount path: `/api/strands` — a UI-only surface with no CLI contract to
+ * preserve. (The `/auth/*` and `/nat/*` mounts sit outside `/api` only because
+ * the existing CLI already targets those URLs.) Envelope form therefore follows
+ * the other `/api/*` routes: `{ ok: true, data }`.
+ *
+ * A removal that actually issued a delete publishes `strands-changed` so other
+ * open tabs refresh. A call that found no row publishes nothing — nothing changed.
+ */
+
+import type { FastifyInstance } from 'fastify';
+
+import type { StrandHandlers } from '../../strands/types.js';
+import type { EventBus } from '../events/bus.js';
+
+export interface StrandRoutesOptions {
+  handlers: StrandHandlers;
+  events: EventBus;
+}
+
+/**
+ * The only accepted `confirm` values — the same strict pair the admin channel
+ * accepts. Not a general truthiness parser: `yes`, `on` and an empty value all
+ * count as NOT confirmed, because a guessy parser here would turn a typo into a
+ * destroyed membership key.
+ *
+ * NOTE: deliberately duplicated from cadre-cli's `admin-server.ts` rather than
+ * imported — cadre-host depends on cadre-cli for its bin path only, never its
+ * source. Keep the two in step by hand; do not DRY them into an import.
+ */
+const CONFIRM_VALUES = new Set(['1', 'true']);
+
+export function registerStrandRoutes(app: FastifyInstance, opts: StrandRoutesOptions): void {
+  const { handlers, events } = opts;
+
+  app.get('/api/strands', async () => {
+    return { ok: true, data: await handlers.listStrands() };
+  });
+
+  app.delete<{ Params: { id: string }; Querystring: { confirm?: string } }>(
+    '/api/strands/:id',
+    async (request) => {
+      const confirm = typeof request.query.confirm === 'string' && CONFIRM_VALUES.has(request.query.confirm);
+      const result = await handlers.removeStrand(request.params.id, { confirm });
+      if (result.removed) {
+        events.publish({ type: 'strands-changed', kind: 'removed' });
+      }
+      return { ok: true, data: result };
+    },
+  );
+}

package/src/server/routes/trust-circle.ts

@@ -1,49 +1,49 @@
-/**
- * Trust-circle HTTP routes — thin adapters around `TrustCircleHandlers`
- * (`createTrustCircleHandlers(service)`). Side-effects (invite issued,
- * pending revoked, member removed) emit a `trust-circle-changed` bus
- * event so the SPA can refresh without polling.
- *
- * Mount path: `/auth/*` — the existing CLI (cadre-host invite / trust)
- * already targets these URLs; do not change them.
- */
-
-import type { FastifyInstance } from 'fastify';
-
-import type { TrustCircleHandlers } from '../../auth/types.js';
-import type { EventBus } from '../events/bus.js';
-
-export interface TrustCircleRoutesOptions {
-  handlers: TrustCircleHandlers;
-  events: EventBus;
-}
-
-export function registerTrustCircleRoutes(app: FastifyInstance, opts: TrustCircleRoutesOptions): void {
-  const { handlers, events } = opts;
-
-  app.get('/auth/trust-circle', async () => {
-    return handlers.listTrustCircle();
-  });
-
-  app.post('/auth/invites', async (request) => {
-    const body = (request.body ?? {}) as { label?: unknown; ttlMs?: unknown };
-    const label = typeof body.label === 'string' ? body.label : '';
-    const ttlMs = typeof body.ttlMs === 'number' ? body.ttlMs : undefined;
-    const args = ttlMs !== undefined ? { label, ttlMs } : { label };
-    const result = await handlers.postInvite(args);
-    events.publish({ type: 'trust-circle-changed', kind: 'invited' });
-    return result;
-  });
-
-  app.delete<{ Params: { token: string } }>('/auth/invites/:token', async (request) => {
-    await handlers.deleteInvite(request.params.token);
-    events.publish({ type: 'trust-circle-changed', kind: 'revoked' });
-    return { ok: true };
-  });
-
-  app.delete<{ Params: { peerId: string } }>('/auth/members/:peerId', async (request) => {
-    await handlers.deleteMember(request.params.peerId);
-    events.publish({ type: 'trust-circle-changed', kind: 'revoked' });
-    return { ok: true };
-  });
-}
+/**
+ * Trust-circle HTTP routes — thin adapters around `TrustCircleHandlers`
+ * (`createTrustCircleHandlers(service)`). Side-effects (invite issued,
+ * pending revoked, member removed) emit a `trust-circle-changed` bus
+ * event so the SPA can refresh without polling.
+ *
+ * Mount path: `/auth/*` — the existing CLI (cadre-host invite / trust)
+ * already targets these URLs; do not change them.
+ */
+
+import type { FastifyInstance } from 'fastify';
+
+import type { TrustCircleHandlers } from '../../auth/types.js';
+import type { EventBus } from '../events/bus.js';
+
+export interface TrustCircleRoutesOptions {
+  handlers: TrustCircleHandlers;
+  events: EventBus;
+}
+
+export function registerTrustCircleRoutes(app: FastifyInstance, opts: TrustCircleRoutesOptions): void {
+  const { handlers, events } = opts;
+
+  app.get('/auth/trust-circle', async () => {
+    return handlers.listTrustCircle();
+  });
+
+  app.post('/auth/invites', async (request) => {
+    const body = (request.body ?? {}) as { label?: unknown; ttlMs?: unknown };
+    const label = typeof body.label === 'string' ? body.label : '';
+    const ttlMs = typeof body.ttlMs === 'number' ? body.ttlMs : undefined;
+    const args = ttlMs !== undefined ? { label, ttlMs } : { label };
+    const result = await handlers.postInvite(args);
+    events.publish({ type: 'trust-circle-changed', kind: 'invited' });
+    return result;
+  });
+
+  app.delete<{ Params: { token: string } }>('/auth/invites/:token', async (request) => {
+    await handlers.deleteInvite(request.params.token);
+    events.publish({ type: 'trust-circle-changed', kind: 'revoked' });
+    return { ok: true };
+  });
+
+  app.delete<{ Params: { peerId: string } }>('/auth/members/:peerId', async (request) => {
+    await handlers.deleteMember(request.params.peerId);
+    events.publish({ type: 'trust-circle-changed', kind: 'revoked' });
+    return { ok: true };
+  });
+}

package/src/server/routes/update.ts

@@ -1,43 +1,43 @@
-/**
- * Update-flow HTTP routes — thin adapters around `UpdateHandlers`
- * (`createUpdateHandlers(service)`). The /update/apply route publishes
- * `update-available` for the post-apply state when the new version
- * differs from the running one.
- *
- * Mount path: `/update/*` (matches docs/cadre-host.md).
- */
-
-import type { FastifyInstance } from 'fastify';
-
-import type { UpdateHandlers } from '../../update/index.js';
-import type { EventBus } from '../events/bus.js';
-
-export interface UpdateRoutesOptions {
-  handlers: UpdateHandlers;
-  events: EventBus;
-}
-
-export function registerUpdateRoutes(app: FastifyInstance, opts: UpdateRoutesOptions): void {
-  const { handlers, events } = opts;
-
-  app.get('/update', async () => handlers.getState());
-
-  app.post('/update/apply', async () => {
-    const result = await handlers.postApply();
-    // Apply succeeded — the still-running binary is the *old* one; the new
-    // one becomes live after the service-host restarts. Surface the version
-    // we just applied so the UI can prompt the user to refresh.
-    events.publish({
-      type: 'update-available',
-      version: result.toVersion,
-    });
-    return result;
-  });
-
-  app.get('/update/settings', async () => handlers.getSettings());
-
-  app.put('/update/settings', async (request) => {
-    const body = (request.body ?? {}) as { autoApply?: boolean; manifestUrl?: string };
-    return handlers.putSettings(body);
-  });
-}
+/**
+ * Update-flow HTTP routes — thin adapters around `UpdateHandlers`
+ * (`createUpdateHandlers(service)`). The /update/apply route publishes
+ * `update-available` for the post-apply state when the new version
+ * differs from the running one.
+ *
+ * Mount path: `/update/*` (matches docs/cadre-host.md).
+ */
+
+import type { FastifyInstance } from 'fastify';
+
+import type { UpdateHandlers } from '../../update/index.js';
+import type { EventBus } from '../events/bus.js';
+
+export interface UpdateRoutesOptions {
+  handlers: UpdateHandlers;
+  events: EventBus;
+}
+
+export function registerUpdateRoutes(app: FastifyInstance, opts: UpdateRoutesOptions): void {
+  const { handlers, events } = opts;
+
+  app.get('/update', async () => handlers.getState());
+
+  app.post('/update/apply', async () => {
+    const result = await handlers.postApply();
+    // Apply succeeded — the still-running binary is the *old* one; the new
+    // one becomes live after the service-host restarts. Surface the version
+    // we just applied so the UI can prompt the user to refresh.
+    events.publish({
+      type: 'update-available',
+      version: result.toVersion,
+    });
+    return result;
+  });
+
+  app.get('/update/settings', async () => handlers.getSettings());
+
+  app.put('/update/settings', async (request) => {
+    const body = (request.body ?? {}) as { autoApply?: boolean; manifestUrl?: string };
+    return handlers.putSettings(body);
+  });
+}