@serfab/cadre-host 1.13.0 → 1.14.0

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

@@ -1,195 +1,179 @@
-import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-
-import Fastify from 'fastify';
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-
-import { registerErrorHandler } from '../error-handler.js';
-import { registerSettingsRoutes } from '../routes/settings.js';
-import { HostSettingsStore } from '../settings-store.js';
-import type { NatService } from '../../nat/index.js';
-import type { NatStatusSnapshot } from '../../nat/types.js';
-import type { UpdateService } from '../../update/index.js';
-import type { UpdateSettings } from '../../update/types.js';
-
-function fakeNat(): { svc: NatService; calls: Array<unknown> } {
-  const calls: unknown[] = [];
-  const stub = {
-    putSettings: async (patch: unknown) => { calls.push(patch); return {} as NatStatusSnapshot; },
-  } as unknown as NatService;
-  return { svc: stub, calls };
-}
-
-function fakeUpdate(): { svc: UpdateService; calls: UpdateSettings[] } {
-  const calls: UpdateSettings[] = [];
-  const stub = {
-    putSettings: async (patch: { autoApply?: boolean; manifestUrl?: string }) => {
-      calls.push({ autoApply: patch.autoApply ?? false, ...(patch.manifestUrl ? { manifestUrl: patch.manifestUrl } : {}) });
-      return { autoApply: patch.autoApply ?? false } as UpdateSettings;
-    },
-  } as unknown as UpdateService;
-  return { svc: stub, calls };
-}
-
-function writeV2Config(dir: string): string {
-  const cfg = {
-    version: 2,
-    installId: 'inst-x',
-    uiPort: 8765,
-    libp2pPort: 4001,
-    dataDir: dir,
-    identityPath: join(dir, 'identity.key'),
-    upnpEnabled: true,
-    installedAt: '2025-01-01T00:00:00Z',
-    installerVersion: '0.6.0',
-    updates: { autoApply: false },
-  };
-  const path = join(dir, 'host.config.json');
-  writeFileSync(path, JSON.stringify(cfg, null, 2) + '\n', 'utf8');
-  return path;
-}
-
-function writeV1Config(dir: string): string {
-  const cfg = {
-    version: 1,
-    installId: 'inst-x',
-    uiPort: 8765,
-    libp2pPort: 4001,
-    dataDir: dir,
-    identityPath: join(dir, 'identity.key'),
-    upnpEnabled: true,
-    installedAt: '2025-01-01T00:00:00Z',
-    installerVersion: '0.6.0',
-  };
-  const path = join(dir, 'host.config.json');
-  writeFileSync(path, JSON.stringify(cfg, null, 2) + '\n', 'utf8');
-  return path;
-}
-
-describe('/api/settings routes', () => {
-  let app: ReturnType<typeof Fastify>;
-  let dataDir: string;
-
-  beforeEach(async () => {
-    dataDir = mkdtempSync(join(tmpdir(), 'cadre-host-settings-'));
-  });
-
-  afterEach(async () => {
-    if (app) await app.close();
-    rmSync(dataDir, { recursive: true, force: true });
-  });
-
-  it('GET returns the persisted config', async () => {
-    writeV2Config(dataDir);
-    app = Fastify();
-    registerErrorHandler(app);
-    registerSettingsRoutes(app, {
-      settingsStore: new HostSettingsStore({ dataDir }),
-      nat: fakeNat().svc,
-    });
-    const res = await app.inject({ method: 'GET', url: '/api/settings' });
-    expect(res.statusCode).toBe(200);
-    const body = res.json() as { data: { uiPort: number; updates: { autoApply: boolean } } };
-    expect(body.data.uiPort).toBe(8765);
-    expect(body.data.updates.autoApply).toBe(false);
-  });
-
-  it('PUT propagates upnpEnabled to nat service and host.config.json', async () => {
-    writeV2Config(dataDir);
-    const nat = fakeNat();
-    app = Fastify();
-    registerErrorHandler(app);
-    registerSettingsRoutes(app, { settingsStore: new HostSettingsStore({ dataDir }), nat: nat.svc });
-    const res = await app.inject({
-      method: 'PUT',
-      url: '/api/settings',
-      headers: { 'content-type': 'application/json' },
-      payload: JSON.stringify({ upnpEnabled: false }),
-    });
-    expect(res.statusCode).toBe(200);
-    expect(nat.calls).toEqual([{ upnpEnabled: false }]);
-    const body = res.json() as { data: { upnpEnabled: boolean } };
-    expect(body.data.upnpEnabled).toBe(false);
-  });
-
-  it('PUT updates.autoApply propagates to update service', async () => {
-    writeV2Config(dataDir);
-    const nat = fakeNat();
-    const update = fakeUpdate();
-    app = Fastify();
-    registerErrorHandler(app);
-    registerSettingsRoutes(app, { settingsStore: new HostSettingsStore({ dataDir }), nat: nat.svc, update: update.svc });
-    const res = await app.inject({
-      method: 'PUT',
-      url: '/api/settings',
-      headers: { 'content-type': 'application/json' },
-      payload: JSON.stringify({ updates: { autoApply: true } }),
-    });
-    expect(res.statusCode).toBe(200);
-    expect(update.calls).toEqual([{ autoApply: true }]);
-    const body = res.json() as { data: { updates: { autoApply: boolean } } };
-    expect(body.data.updates.autoApply).toBe(true);
-  });
-
-  it('PUT uiPort returns 400 invalid_setting', async () => {
-    writeV2Config(dataDir);
-    app = Fastify();
-    registerErrorHandler(app);
-    registerSettingsRoutes(app, { settingsStore: new HostSettingsStore({ dataDir }), nat: fakeNat().svc });
-    const res = await app.inject({
-      method: 'PUT',
-      url: '/api/settings',
-      headers: { 'content-type': 'application/json' },
-      payload: JSON.stringify({ uiPort: 9999 }),
-    });
-    expect(res.statusCode).toBe(400);
-    const body = res.json() as { error: { code: string; message: string } };
-    expect(body.error.code).toBe('invalid_setting');
-    expect(body.error.message).toMatch(/uiPort/);
-  });
-
-  it('PUT ownCadre returns 400 invalid_setting (install-time only)', async () => {
-    writeV2Config(dataDir);
-    app = Fastify();
-    registerErrorHandler(app);
-    registerSettingsRoutes(app, { settingsStore: new HostSettingsStore({ dataDir }), nat: fakeNat().svc });
-    const res = await app.inject({
-      method: 'PUT',
-      url: '/api/settings',
-      headers: { 'content-type': 'application/json' },
-      payload: JSON.stringify({ ownCadre: { enabled: true } }),
-    });
-    expect(res.statusCode).toBe(400);
-    const body = res.json() as { error: { code: string; message: string } };
-    expect(body.error.code).toBe('invalid_setting');
-    expect(body.error.message).toMatch(/ownCadre/);
-  });
-
-  it('PUT unknown setting returns 400', async () => {
-    writeV2Config(dataDir);
-    app = Fastify();
-    registerErrorHandler(app);
-    registerSettingsRoutes(app, { settingsStore: new HostSettingsStore({ dataDir }), nat: fakeNat().svc });
-    const res = await app.inject({
-      method: 'PUT',
-      url: '/api/settings',
-      headers: { 'content-type': 'application/json' },
-      payload: JSON.stringify({ totallyMadeUp: 'value' }),
-    });
-    expect(res.statusCode).toBe(400);
-  });
-
-  it('rejects a v1 host.config.json without rewriting it', async () => {
-    const path = writeV1Config(dataDir);
-    const raw = readFileSync(path, 'utf8');
-    app = Fastify();
-    registerErrorHandler(app);
-    registerSettingsRoutes(app, { settingsStore: new HostSettingsStore({ dataDir }), nat: fakeNat().svc });
-    const res = await app.inject({ method: 'GET', url: '/api/settings' });
-    expect(res.statusCode).toBe(500);
-    const body = res.json() as { error: { message: string } };
-    expect(body.error.message).toMatch(/unsupported version=1/);
-    expect(readFileSync(path, 'utf8')).toBe(raw);
-  });
-});
+import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import Fastify from 'fastify';
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+
+import { registerErrorHandler } from '../error-handler.js';
+import { registerSettingsRoutes } from '../routes/settings.js';
+import { HostSettingsStore } from '../settings-store.js';
+import type { NatService } from '../../nat/index.js';
+import type { NatStatusSnapshot } from '../../nat/types.js';
+import type { UpdateService } from '../../update/index.js';
+import type { UpdateSettings } from '../../update/types.js';
+
+function fakeNat(): { svc: NatService; calls: Array<unknown> } {
+  const calls: unknown[] = [];
+  const stub = {
+    putSettings: async (patch: unknown) => { calls.push(patch); return {} as NatStatusSnapshot; },
+  } as unknown as NatService;
+  return { svc: stub, calls };
+}
+
+function fakeUpdate(): { svc: UpdateService; calls: UpdateSettings[] } {
+  const calls: UpdateSettings[] = [];
+  const stub = {
+    putSettings: async (patch: { autoApply?: boolean; manifestUrl?: string }) => {
+      calls.push({ autoApply: patch.autoApply ?? false, ...(patch.manifestUrl ? { manifestUrl: patch.manifestUrl } : {}) });
+      return { autoApply: patch.autoApply ?? false } as UpdateSettings;
+    },
+  } as unknown as UpdateService;
+  return { svc: stub, calls };
+}
+
+function writeConfig(dir: string): string {
+  const cfg = {
+    version: 3,
+    installId: 'inst-x',
+    uiPort: 8765,
+    dataDir: dir,
+    upnpEnabled: true,
+    installedAt: '2025-01-01T00:00:00Z',
+    installerVersion: '0.6.0',
+    updates: { autoApply: false },
+  };
+  const path = join(dir, 'host.config.json');
+  writeFileSync(path, JSON.stringify(cfg, null, 2) + '\n', 'utf8');
+  return path;
+}
+
+/** A founder-era file: refused on read, never migrated. */
+function writeV2Config(dir: string): string {
+  const cfg = {
+    version: 2,
+    installId: 'inst-x',
+    uiPort: 8765,
+    libp2pPort: 4001,
+    dataDir: dir,
+    identityPath: join(dir, 'identity.key'),
+    upnpEnabled: true,
+    installedAt: '2025-01-01T00:00:00Z',
+    installerVersion: '0.6.0',
+    updates: { autoApply: false },
+    ownCadre: { enabled: true },
+  };
+  const path = join(dir, 'host.config.json');
+  writeFileSync(path, JSON.stringify(cfg, null, 2) + '\n', 'utf8');
+  return path;
+}
+
+describe('/api/settings routes', () => {
+  let app: ReturnType<typeof Fastify>;
+  let dataDir: string;
+
+  beforeEach(async () => {
+    dataDir = mkdtempSync(join(tmpdir(), 'cadre-host-settings-'));
+  });
+
+  afterEach(async () => {
+    if (app) await app.close();
+    rmSync(dataDir, { recursive: true, force: true });
+  });
+
+  it('GET returns the persisted config', async () => {
+    writeConfig(dataDir);
+    app = Fastify();
+    registerErrorHandler(app);
+    registerSettingsRoutes(app, {
+      settingsStore: new HostSettingsStore({ dataDir }),
+      nat: fakeNat().svc,
+    });
+    const res = await app.inject({ method: 'GET', url: '/api/settings' });
+    expect(res.statusCode).toBe(200);
+    const body = res.json() as { data: { uiPort: number; updates: { autoApply: boolean } } };
+    expect(body.data.uiPort).toBe(8765);
+    expect(body.data.updates.autoApply).toBe(false);
+  });
+
+  it('PUT propagates upnpEnabled to nat service and host.config.json', async () => {
+    writeConfig(dataDir);
+    const nat = fakeNat();
+    app = Fastify();
+    registerErrorHandler(app);
+    registerSettingsRoutes(app, { settingsStore: new HostSettingsStore({ dataDir }), nat: nat.svc });
+    const res = await app.inject({
+      method: 'PUT',
+      url: '/api/settings',
+      headers: { 'content-type': 'application/json' },
+      payload: JSON.stringify({ upnpEnabled: false }),
+    });
+    expect(res.statusCode).toBe(200);
+    expect(nat.calls).toEqual([{ upnpEnabled: false }]);
+    const body = res.json() as { data: { upnpEnabled: boolean } };
+    expect(body.data.upnpEnabled).toBe(false);
+  });
+
+  it('PUT updates.autoApply propagates to update service', async () => {
+    writeConfig(dataDir);
+    const nat = fakeNat();
+    const update = fakeUpdate();
+    app = Fastify();
+    registerErrorHandler(app);
+    registerSettingsRoutes(app, { settingsStore: new HostSettingsStore({ dataDir }), nat: nat.svc, update: update.svc });
+    const res = await app.inject({
+      method: 'PUT',
+      url: '/api/settings',
+      headers: { 'content-type': 'application/json' },
+      payload: JSON.stringify({ updates: { autoApply: true } }),
+    });
+    expect(res.statusCode).toBe(200);
+    expect(update.calls).toEqual([{ autoApply: true }]);
+    const body = res.json() as { data: { updates: { autoApply: boolean } } };
+    expect(body.data.updates.autoApply).toBe(true);
+  });
+
+  it('PUT uiPort returns 400 invalid_setting', async () => {
+    writeConfig(dataDir);
+    app = Fastify();
+    registerErrorHandler(app);
+    registerSettingsRoutes(app, { settingsStore: new HostSettingsStore({ dataDir }), nat: fakeNat().svc });
+    const res = await app.inject({
+      method: 'PUT',
+      url: '/api/settings',
+      headers: { 'content-type': 'application/json' },
+      payload: JSON.stringify({ uiPort: 9999 }),
+    });
+    expect(res.statusCode).toBe(400);
+    const body = res.json() as { error: { code: string; message: string } };
+    expect(body.error.code).toBe('invalid_setting');
+    expect(body.error.message).toMatch(/uiPort/);
+  });
+
+  it('PUT unknown setting returns 400', async () => {
+    writeConfig(dataDir);
+    app = Fastify();
+    registerErrorHandler(app);
+    registerSettingsRoutes(app, { settingsStore: new HostSettingsStore({ dataDir }), nat: fakeNat().svc });
+    const res = await app.inject({
+      method: 'PUT',
+      url: '/api/settings',
+      headers: { 'content-type': 'application/json' },
+      payload: JSON.stringify({ totallyMadeUp: 'value' }),
+    });
+    expect(res.statusCode).toBe(400);
+  });
+
+  it('rejects a v2 host.config.json without rewriting it', async () => {
+    const path = writeV2Config(dataDir);
+    const raw = readFileSync(path, 'utf8');
+    app = Fastify();
+    registerErrorHandler(app);
+    registerSettingsRoutes(app, { settingsStore: new HostSettingsStore({ dataDir }), nat: fakeNat().svc });
+    const res = await app.inject({ method: 'GET', url: '/api/settings' });
+    expect(res.statusCode).toBe(500);
+    const body = res.json() as { error: { message: string } };
+    expect(body.error.message).toMatch(/unsupported version=2/);
+    expect(readFileSync(path, 'utf8')).toBe(raw);
+  });
+});

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

@@ -1,119 +1,119 @@
-import { createServer, type AddressInfo } from 'node:net';
-
-import Fastify from 'fastify';
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-
-import { EventBus } from '../events/bus.js';
-import { registerSseRoute } from '../events/sse-route.js';
-
-async function pickFreePort(): Promise<number> {
-  return await new Promise<number>((resolve, reject) => {
-    const server = createServer();
-    server.unref();
-    server.on('error', reject);
-    server.listen({ host: '127.0.0.1', port: 0 }, () => {
-      const addr = server.address() as AddressInfo;
-      server.close(() => resolve(addr.port));
-    });
-  });
-}
-
-/** Parse SSE chunks and append decoded events to `events`. */
-function parseSseChunk(buf: string, state: { current: { type: string; data: string } }, events: Array<{ type: string; data: string }>): string {
-  let buffered = buf;
-  let nl: number;
-  while ((nl = buffered.indexOf('\n')) !== -1) {
-    const line = buffered.slice(0, nl).replace(/\r$/, '');
-    buffered = buffered.slice(nl + 1);
-    if (line === '') {
-      if (state.current.type || state.current.data) {
-        events.push({ ...state.current });
-        state.current.type = '';
-        state.current.data = '';
-      }
-      continue;
-    }
-    if (line.startsWith(':')) continue;
-    if (line.startsWith('event:')) { state.current.type = line.slice(6).trim(); continue; }
-    if (line.startsWith('data:')) { state.current.data = line.slice(5).trim(); continue; }
-  }
-  return buffered;
-}
-
-describe('GET /api/events (SSE)', () => {
-  let app: ReturnType<typeof Fastify>;
-  let bus: EventBus;
-  let port: number;
-
-  beforeEach(async () => {
-    port = await pickFreePort();
-    bus = new EventBus();
-    app = Fastify();
-    registerSseRoute(app, { events: bus, heartbeatIntervalMs: 50 });
-    await app.listen({ host: '127.0.0.1', port });
-  });
-
-  afterEach(async () => {
-    await app.close();
-  });
-
-  it('delivers published events in order and cleans up on disconnect', async () => {
-    const { request: httpRequest } = await import('node:http');
-    const events: Array<{ type: string; data: string }> = [];
-    const state = { current: { type: '', data: '' } };
-    let leftover = '';
-    let done = false;
-
-    const req = httpRequest({
-      hostname: '127.0.0.1',
-      port,
-      path: '/api/events',
-      method: 'GET',
-      headers: { accept: 'text/event-stream' },
-    });
-
-    const responseReady = new Promise<void>((resolve) => {
-      req.on('response', (res) => {
-        res.setEncoding('utf8');
-        res.on('data', (chunk: string) => {
-          leftover = parseSseChunk(leftover + chunk, state, events);
-        });
-        res.on('end', () => { done = true; });
-        resolve();
-      });
-    });
-    req.end();
-    await responseReady;
-
-    // Give the connection a beat to settle on the server, then publish.
-    await new Promise<void>((r) => setTimeout(r, 30));
-    bus.publish({ type: 'trust-circle-changed', kind: 'invited' });
-    bus.publish({ type: 'trust-circle-changed', kind: 'redeemed' });
-    bus.publish({ type: 'connectivity-changed', portMode: 'auto-upnp', directReachability: 'reachable' });
-
-    // Wait until at least 3 events have arrived (or 1s).
-    const deadline = Date.now() + 1000;
-    while (events.length < 3 && Date.now() < deadline) {
-      await new Promise<void>((r) => setTimeout(r, 25));
-    }
-
-    expect(events.length).toBeGreaterThanOrEqual(3);
-    expect(events.slice(0, 3).map((e) => e.type)).toEqual([
-      'trust-circle-changed',
-      'trust-circle-changed',
-      'connectivity-changed',
-    ]);
-    const first = JSON.parse(events[0]!.data) as { kind: string };
-    expect(first.kind).toBe('invited');
-
-    expect(bus.listenerCount()).toBe(1);
-    req.destroy();
-    // Give the server's 'close' handler a tick to run.
-    const dropDeadline = Date.now() + 1000;
-    while (bus.listenerCount() > 0 && Date.now() < dropDeadline) {
-      await new Promise<void>((r) => setTimeout(r, 25));
-    }
-    expect(bus.listenerCount()).toBe(0);
-    void done;
-  });
-});
+import { createServer, type AddressInfo } from 'node:net';
+
+import Fastify from 'fastify';
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+
+import { EventBus } from '../events/bus.js';
+import { registerSseRoute } from '../events/sse-route.js';
+
+async function pickFreePort(): Promise<number> {
+  return await new Promise<number>((resolve, reject) => {
+    const server = createServer();
+    server.unref();
+    server.on('error', reject);
+    server.listen({ host: '127.0.0.1', port: 0 }, () => {
+      const addr = server.address() as AddressInfo;
+      server.close(() => resolve(addr.port));
+    });
+  });
+}
+
+/** Parse SSE chunks and append decoded events to `events`. */
+function parseSseChunk(buf: string, state: { current: { type: string; data: string } }, events: Array<{ type: string; data: string }>): string {
+  let buffered = buf;
+  let nl: number;
+  while ((nl = buffered.indexOf('\n')) !== -1) {
+    const line = buffered.slice(0, nl).replace(/\r$/, '');
+    buffered = buffered.slice(nl + 1);
+    if (line === '') {
+      if (state.current.type || state.current.data) {
+        events.push({ ...state.current });
+        state.current.type = '';
+        state.current.data = '';
+      }
+      continue;
+    }
+    if (line.startsWith(':')) continue;
+    if (line.startsWith('event:')) { state.current.type = line.slice(6).trim(); continue; }
+    if (line.startsWith('data:')) { state.current.data = line.slice(5).trim(); continue; }
+  }
+  return buffered;
+}
+
+describe('GET /api/events (SSE)', () => {
+  let app: ReturnType<typeof Fastify>;
+  let bus: EventBus;
+  let port: number;
+
+  beforeEach(async () => {
+    port = await pickFreePort();
+    bus = new EventBus();
+    app = Fastify();
+    registerSseRoute(app, { events: bus, heartbeatIntervalMs: 50 });
+    await app.listen({ host: '127.0.0.1', port });
+  });
+
+  afterEach(async () => {
+    await app.close();
+  });
+
+  it('delivers published events in order and cleans up on disconnect', async () => {
+    const { request: httpRequest } = await import('node:http');
+    const events: Array<{ type: string; data: string }> = [];
+    const state = { current: { type: '', data: '' } };
+    let leftover = '';
+    let done = false;
+
+    const req = httpRequest({
+      hostname: '127.0.0.1',
+      port,
+      path: '/api/events',
+      method: 'GET',
+      headers: { accept: 'text/event-stream' },
+    });
+
+    const responseReady = new Promise<void>((resolve) => {
+      req.on('response', (res) => {
+        res.setEncoding('utf8');
+        res.on('data', (chunk: string) => {
+          leftover = parseSseChunk(leftover + chunk, state, events);
+        });
+        res.on('end', () => { done = true; });
+        resolve();
+      });
+    });
+    req.end();
+    await responseReady;
+
+    // Give the connection a beat to settle on the server, then publish.
+    await new Promise<void>((r) => setTimeout(r, 30));
+    bus.publish({ type: 'hosted-nodes-changed', kind: 'added', nodeId: 'hn_a' });
+    bus.publish({ type: 'hosted-nodes-changed', kind: 'claimed', nodeId: 'hn_a' });
+    bus.publish({ type: 'connectivity-changed', directReachability: 'reachable' });
+
+    // Wait until at least 3 events have arrived (or 1s).
+    const deadline = Date.now() + 1000;
+    while (events.length < 3 && Date.now() < deadline) {
+      await new Promise<void>((r) => setTimeout(r, 25));
+    }
+
+    expect(events.length).toBeGreaterThanOrEqual(3);
+    expect(events.slice(0, 3).map((e) => e.type)).toEqual([
+      'hosted-nodes-changed',
+      'hosted-nodes-changed',
+      'connectivity-changed',
+    ]);
+    const first = JSON.parse(events[0]!.data) as { kind: string };
+    expect(first.kind).toBe('added');
+
+    expect(bus.listenerCount()).toBe(1);
+    req.destroy();
+    // Give the server's 'close' handler a tick to run.
+    const dropDeadline = Date.now() + 1000;
+    while (bus.listenerCount() > 0 && Date.now() < dropDeadline) {
+      await new Promise<void>((r) => setTimeout(r, 25));
+    }
+    expect(bus.listenerCount()).toBe(0);
+    void done;
+  });
+});