@serfab/cadre-host 1.7.0 → 1.9.0

package/src/server/__tests__/server.smoke.test.ts

@@ -5,10 +5,9 @@ import { join } from 'node:path';
 import { describe, it, expect, beforeEach, afterEach } from 'vitest';
 
 import { createLocalUiServer } from '../index.js';
+import { fakeFounder } from './fakes.js';
 import type { HostProcessOrchestrator } from '../../orchestrator/index.js';
 import type { TrustCircleService } from '../../auth/index.js';
-import type { NatService } from '../../nat/index.js';
-import type { NatStatusSnapshot } from '../../nat/types.js';
 import { GrantService, GrantStore } from '../../donation/index.js';
 
 function fakeOrchestrator(): HostProcessOrchestrator {
@@ -43,37 +42,6 @@ function fakeTrustCircle(): TrustCircleService {
   } as unknown as TrustCircleService;
 }
 
-const SAMPLE_CONNECTIVITY: NatStatusSnapshot = {
-  portMode: 'disabled',
-  externalPort: 4001,
-  internalPort: 4001,
-  routerExternalIp: null,
-  mappingLeaseExpiresAt: null,
-  externalIp: null,
-  externalIpDetectedAt: null,
-  cgnatDetected: false,
-  directReachability: 'unknown',
-  lastTestedAt: null,
-  ddns: {
-    providerId: null,
-    hostname: null,
-    externallyManaged: false,
-    lastUpdateAt: null,
-    lastUpdateOk: null,
-    lastError: null,
-  },
-};
-
-function fakeNat(): NatService {
-  return {
-    getStatus: () => SAMPLE_CONNECTIVITY,
-    putSettings: async () => SAMPLE_CONNECTIVITY,
-    testReachability: async () => SAMPLE_CONNECTIVITY,
-    listDdnsProviders: () => [],
-    putDdns: async () => SAMPLE_CONNECTIVITY,
-  } as unknown as NatService;
-}
-
 function writeConfig(dir: string): void {
   const cfg = {
     version: 2,
@@ -102,8 +70,7 @@ describe('createLocalUiServer smoke', () => {
       uiPort: 8765,
       dataDir,
       orchestrator: fakeOrchestrator(),
-      trustCircle: fakeTrustCircle(),
-      nat: fakeNat(),
+      founder: fakeFounder({ trustCircle: fakeTrustCircle() }),
       forcePort: 0,
     });
     const { url } = await server.start();
@@ -119,8 +86,9 @@ describe('createLocalUiServer smoke', () => {
     // Without host header: undici's fetch sets it; this is the happy path.
     const res = await fetch(`${baseUrl}/api/status`);
     expect(res.status).toBe(200);
-    const body = await res.json() as { service: { name: string } };
+    const body = await res.json() as { service: { name: string }; role: string };
     expect(body.service.name).toBe('cadre-host');
+    expect(body.role).toBe('founder');
   });
 
   it('rejects requests with a foreign Host header', async () => {
@@ -205,16 +173,18 @@ describe('createLocalUiServer smoke — donor-only (no owner node)', () => {
     rmSync(dataDir, { recursive: true, force: true });
   });
 
-  it('serves /api/status with no trustCircle / connectivity and no nodes', async () => {
+  it('serves /api/status as role donor, with no trustCircle / connectivity and no nodes', async () => {
     const res = await fetch(`${baseUrl}/api/status`);
     expect(res.status).toBe(200);
     const body = await res.json() as {
       service: { name: string };
+      role: string;
       nodes: unknown[];
       trustCircle?: unknown;
       connectivity?: unknown;
     };
     expect(body.service.name).toBe('cadre-host');
+    expect(body.role).toBe('donor');
     expect(body.nodes).toEqual([]);
     expect(body.trustCircle).toBeUndefined();
     expect(body.connectivity).toBeUndefined();

package/src/server/__tests__/status-route.test.ts

@@ -11,6 +11,7 @@ import type { NatService } from '../../nat/index.js';
 import type { NatStatusSnapshot } from '../../nat/types.js';
 import type { UpdateService } from '../../update/index.js';
 import type { UpdateState } from '../../update/types.js';
+import { SAMPLE_CONNECTIVITY } from './fakes.js';
 
 function fakeOrchestrator(nodes: ManagedNodeInfo[]): HostProcessOrchestrator {
   return { listNodes: () => nodes } as unknown as HostProcessOrchestrator;
@@ -25,27 +26,6 @@ function fakeUpdate(state: UpdateState): UpdateService {
   return { getState: async () => state } as unknown as UpdateService;
 }
 
-const SAMPLE_CONNECTIVITY: NatStatusSnapshot = {
-  portMode: 'auto-upnp',
-  externalPort: 4001,
-  internalPort: 4001,
-  routerExternalIp: '203.0.113.5',
-  mappingLeaseExpiresAt: null,
-  externalIp: '203.0.113.5',
-  externalIpDetectedAt: null,
-  cgnatDetected: false,
-  directReachability: 'reachable',
-  lastTestedAt: null,
-  ddns: {
-    providerId: null,
-    hostname: null,
-    externallyManaged: false,
-    lastUpdateAt: null,
-    lastUpdateOk: null,
-    lastError: null,
-  },
-};
-
 describe('GET /api/status', () => {
   let app: ReturnType<typeof Fastify>;
 
@@ -55,6 +35,7 @@ describe('GET /api/status', () => {
     app = Fastify();
     registerErrorHandler(app);
     registerStatusRoute(app, {
+      role: 'founder',
       orchestrator: fakeOrchestrator([
         {
           id: 'alice',
@@ -78,12 +59,14 @@ describe('GET /api/status', () => {
     expect(res.statusCode).toBe(200);
     const body = res.json() as {
       service: { name: string; version: string; uptimeSeconds: number };
+      role: string;
       nodes: Array<{ id: string; status: string }>;
       trustCircle: { members: number; pending: number };
       connectivity: { portMode: string };
       update?: { available?: string };
     };
     expect(body.service.name).toBe('cadre-host');
+    expect(body.role).toBe('founder');
     expect(body.nodes).toHaveLength(1);
     expect(body.nodes[0]).toMatchObject({ id: 'alice', status: 'running' });
     expect(body.trustCircle).toEqual({ members: 1, pending: 0 });
@@ -95,6 +78,7 @@ describe('GET /api/status', () => {
     app = Fastify();
     registerErrorHandler(app);
     registerStatusRoute(app, {
+      role: 'donor',
       orchestrator: fakeOrchestrator([]),
     });
 
@@ -102,11 +86,13 @@ describe('GET /api/status', () => {
     expect(res.statusCode).toBe(200);
     const body = res.json() as {
       service: { name: string };
+      role: string;
       nodes: unknown[];
       trustCircle?: unknown;
       connectivity?: unknown;
     };
     expect(body.service.name).toBe('cadre-host');
+    expect(body.role).toBe('donor');
     expect(body.nodes).toEqual([]);
     expect(body.trustCircle).toBeUndefined();
     expect(body.connectivity).toBeUndefined();
@@ -116,6 +102,7 @@ describe('GET /api/status', () => {
     app = Fastify();
     registerErrorHandler(app);
     registerStatusRoute(app, {
+      role: 'founder',
       orchestrator: fakeOrchestrator([]),
       trustCircle: fakeTrustCircle({ members: [], pending: [] }),
       nat: fakeNat(SAMPLE_CONNECTIVITY),

package/src/server/__tests__/strands-route.test.ts

@@ -16,6 +16,7 @@ import { describe, it, expect, beforeEach, afterEach } from 'vitest';
 
 import { createLocalUiServer } from '../index.js';
 import type { LocalUiEvent } from '../events/types.js';
+import { fakeFounder } from './fakes.js';
 import type { HostProcessOrchestrator } from '../../orchestrator/index.js';
 import type { StrandService } from '../../strands/index.js';
 import { StrandError } from '../../strands/index.js';
@@ -79,7 +80,7 @@ function buildServer(opts: { withStrands: boolean }): void {
     uiPort: 8765,
     dataDir,
     orchestrator: fakeOrchestrator(),
-    ...(opts.withStrands ? { strands: strands.service } : {}),
+    ...(opts.withStrands ? { founder: fakeFounder({ strands: strands.service }) } : {}),
     forcePort: 0,
   });
   events = [];
@@ -214,7 +215,7 @@ describe('DELETE /api/strands/:id — error mapping', () => {
   });
 });
 
-describe('donor-only mode (no strands option)', () => {
+describe('donor-only mode (no founder services)', () => {
   beforeEach(async () => {
     await server.app.close();
     buildServer({ withStrands: false });

package/src/server/events/types.ts

@@ -1,23 +1,24 @@
-/**
- * Event types broadcast over the SPA's SSE channel.
- *
- * Publishers (orchestrator hook, route adapters, update observer) call
- * EventBus.publish; the `/api/events` route fan-outs to connected clients.
- */
-
-import type { ContainerStatus } from '@serfab/cadre-provider';
-
-import type { DirectReachability, PortForwardMode } from '../../nat/index.js';
-
-export type LocalUiEvent =
-  | { type: 'node-state-changed'; nodeId: string; status: ContainerStatus }
-  | { type: 'trust-circle-changed'; kind: 'invited' | 'redeemed' | 'revoked' }
-  | { type: 'strands-changed'; kind: 'removed' }
-  | {
-      type: 'connectivity-changed';
-      portMode: PortForwardMode;
-      directReachability: DirectReachability;
-    }
-  | { type: 'update-available'; version: string; releaseNotesUrl?: string };
-
-export type LocalUiEventType = LocalUiEvent['type'];
+/**
+ * Event types broadcast over the SPA's SSE channel.
+ *
+ * Publishers (orchestrator hook, route adapters, update observer) call
+ * EventBus.publish; the `/api/events` route fan-outs to connected clients.
+ */
+
+import type { ContainerStatus } from '@serfab/cadre-provider';
+
+import type { DirectReachability, PortForwardMode } from '../../nat/index.js';
+
+export type LocalUiEvent =
+  | { type: 'node-state-changed'; nodeId: string; status: ContainerStatus }
+  | { type: 'trust-circle-changed'; kind: 'invited' | 'redeemed' | 'revoked' }
+  | { type: 'strands-changed'; kind: 'removed' }
+  | { type: 'grants-changed'; kind: 'issued' | 'revoked' | 'terminated' }
+  | {
+      type: 'connectivity-changed';
+      portMode: PortForwardMode;
+      directReachability: DirectReachability;
+    }
+  | { type: 'update-available'; version: string; releaseNotesUrl?: string };
+
+export type LocalUiEventType = LocalUiEvent['type'];