@serfab/cadre-host 1.13.0 → 1.15.0

package/dist/ui/index.html

@@ -5,8 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="color-scheme" content="light dark" />
     <title>cadre-host</title>
-    <script type="module" crossorigin src="./assets/index-C6nELNfC.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/index-TtIYSeZO.css">
+    <script type="module" crossorigin src="./assets/index-Ccr2GjPT.js"></script>
+    <link rel="stylesheet" crossorigin href="./assets/index-BHd8CWZA.css">
   </head>
   <body>
     <div id="app"></div>

package/dist/update/index.d.ts

@@ -98,8 +98,8 @@ export declare class UpdateService {
     stop(): void;
 }
 /**
- * Typed handler facade — mirrors `createTrustCircleHandlers` /
- * `createNatHandlers`. The local-UI ticket consumes these.
+ * Typed handler facade — same shape as `createNatHandlers`. The local-UI
+ * server consumes these.
  */
 export declare function createUpdateHandlers(service: UpdateService): UpdateHandlers;
 export type { UpdateState, UpdateApplyResult, UpdateSettings, UpdateManifest, SignedManifest } from './types.js';

package/dist/update/index.js

@@ -231,8 +231,8 @@ export class UpdateService {
     }
 }
 /**
- * Typed handler facade — mirrors `createTrustCircleHandlers` /
- * `createNatHandlers`. The local-UI ticket consumes these.
+ * Typed handler facade — same shape as `createNatHandlers`. The local-UI
+ * server consumes these.
  */
 export function createUpdateHandlers(service) {
     return {

package/dist/update/store.d.ts

@@ -1,7 +1,7 @@
 /**
  * Atomic JSON store for `<dataDir>/update-state.json`.
  *
- * Mirrors `TrustCircleStore` / `NatStore`: load on demand, write to
+ * Mirrors `NatStore`: load on demand, write to
  * `<path>.tmp` then rename. Single-writer assumption — only one cadre-host
  * process owns a given dataDir.
  */

package/dist/update/store.js

@@ -1,7 +1,7 @@
 /**
  * Atomic JSON store for `<dataDir>/update-state.json`.
  *
- * Mirrors `TrustCircleStore` / `NatStore`: load on demand, write to
+ * Mirrors `NatStore`: load on demand, write to
  * `<path>.tmp` then rename. Single-writer assumption — only one cadre-host
  * process owns a given dataDir.
  */

package/dist/update/types.d.ts

@@ -8,7 +8,7 @@
  *   - apply.ts    — invoke `npm install -g` + rollback on failure.
  *   - index.ts    — composes the above (UpdateService).
  *
- * Mirrors the typed-handler pattern used by trust-circle and NAT (handlers
+ * Mirrors the typed-handler pattern used by NAT (handlers
  * throw `UpdateError` whose `.code` the local-UI maps to HTTP status).
  */
 /** Inner manifest object — signed by the release key. */

package/dist/update/types.js

@@ -8,7 +8,7 @@
  *   - apply.ts    — invoke `npm install -g` + rollback on failure.
  *   - index.ts    — composes the above (UpdateService).
  *
- * Mirrors the typed-handler pattern used by trust-circle and NAT (handlers
+ * Mirrors the typed-handler pattern used by NAT (handlers
  * throw `UpdateError` whose `.code` the local-UI maps to HTTP status).
  */
 /** Thrown by UpdateService.apply() and related entry points. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serfab/cadre-host",
-  "version": "1.13.0",
+  "version": "1.15.0",
   "type": "module",
   "description": "Self-hosted cadre node manager for basement-PC deployments",
   "main": "dist/index.js",
@@ -29,8 +29,7 @@
     "cadre",
     "host",
     "self-hosted",
-    "p2p",
-    "trust-circle"
+    "p2p"
   ],
   "scripts": {
     "clean": "rimraf dist",
@@ -64,10 +63,9 @@
     "@libp2p/crypto": "^5.1.23",
     "@libp2p/interface": "^3.3.0",
     "@libp2p/peer-id": "^6.0.15",
-    "@multiformats/multiaddr": "^13.0.3",
-    "@serfab/cadre-cli": "^1.13.0",
-    "@serfab/cadre-core": "^1.13.0",
-    "@serfab/cadre-provider": "^1.13.0",
+    "@serfab/cadre-cli": "^1.15.0",
+    "@serfab/cadre-core": "^1.15.0",
+    "@serfab/cadre-provider": "^1.15.0",
     "commander": "^14.0.2",
     "debug": "^4.4.3",
     "fastify": "^5.7.1",

package/src/__tests__/cli-nat.smoke.test.ts

@@ -1,212 +1,219 @@
-/**
- * CLI smoke test for the `nat` subcommand. Spawns a stub HTTP server playing
- * the role of cadre-host's management API and asserts the CLI:
- *   - GETs /nat/status
- *   - POSTs /nat/test
- *   - PUTs /nat/ddns with the expected body
- *   - PUTs /nat/settings
- *   - Exits non-zero when the host is not reachable
- *
- * Relies on `yarn build` having produced dist/bin/host.js.
- */
-
-import { spawn } from 'node:child_process';
-import { createServer, type IncomingMessage, type Server, type ServerResponse } from 'node:http';
-import { existsSync } from 'node:fs';
-import { fileURLToPath } from 'node:url';
-import { dirname, resolve } from 'node:path';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
-const here = dirname(fileURLToPath(import.meta.url));
-const binPath = resolve(here, '../../dist/bin/host.js');
-
-// These smoke tests cold-start the built CLI as a child process (Node boot +,
-// for some, an HTTP server). That comfortably exceeds vitest's 5s default under
-// heavy parallel load, so give the subprocess generous headroom.
-vi.setConfig({ testTimeout: 30000 });
-
-interface StubServer {
-  server: Server;
-  port: number;
-  requests: Array<{ method: string; url: string; body: string }>;
-  setResponse(handler: (req: IncomingMessage, res: ServerResponse) => void): void;
-}
-
-const DEFAULT_STATUS = {
-  portMode: 'auto-upnp',
-  externalPort: 4001,
-  internalPort: 4001,
-  routerExternalIp: '203.0.113.5',
-  mappingLeaseExpiresAt: null,
-  externalIp: '203.0.113.5',
-  externalIpDetectedAt: new Date().toISOString(),
-  cgnatDetected: false,
-  directReachability: 'reachable',
-  lastTestedAt: null,
-  ddns: {
-    providerId: 'duckdns',
-    hostname: 'foo.duckdns.org',
-    externallyManaged: false,
-    lastUpdateAt: null,
-    lastUpdateOk: null,
-    lastError: null,
-  },
-};
-
-async function startStub(): Promise<StubServer> {
-  const requests: StubServer['requests'] = [];
-  let handler: (req: IncomingMessage, res: ServerResponse) => void = (_req, res) => {
-    res.statusCode = 200;
-    res.setHeader('content-type', 'application/json');
-    res.end(JSON.stringify(DEFAULT_STATUS));
-  };
-
-  const server = createServer((req, res) => {
-    const chunks: Buffer[] = [];
-    req.on('data', (chunk: Buffer) => chunks.push(chunk));
-    req.on('end', () => {
-      requests.push({ method: req.method ?? '', url: req.url ?? '', body: Buffer.concat(chunks).toString('utf8') });
-      handler(req, res);
-    });
-  });
-
-  await new Promise<void>((resolveStart) => server.listen(0, '127.0.0.1', () => resolveStart()));
-  const addr = server.address();
-  const port = typeof addr === 'object' && addr ? addr.port : 0;
-  return {
-    server,
-    port,
-    requests,
-    setResponse: (h) => { handler = h; },
-  };
-}
-
-function runCli(args: string[]): Promise<{ code: number; stdout: string; stderr: string }> {
-  return new Promise((resolveRun) => {
-    const child = spawn(process.execPath, [binPath, ...args], { stdio: ['ignore', 'pipe', 'pipe'] });
-    let stdout = '';
-    let stderr = '';
-    child.stdout.on('data', (chunk: Buffer) => { stdout += chunk.toString('utf8'); });
-    child.stderr.on('data', (chunk: Buffer) => { stderr += chunk.toString('utf8'); });
-    child.on('close', (code) => resolveRun({ code: code ?? -1, stdout, stderr }));
-  });
-}
-
-let stub: StubServer;
-
-beforeEach(async () => {
-  if (!existsSync(binPath)) {
-    throw new Error(`cadre-host bin not built at ${binPath}; run \`yarn build\` first`);
-  }
-  stub = await startStub();
-});
-
-afterEach(async () => {
-  await new Promise<void>((resolveClose) => stub.server.close(() => resolveClose()));
-});
-
-describe('cadre-host nat status', () => {
-  it('GETs /nat/status and renders the snapshot', async () => {
-    const result = await runCli(['nat', 'status', '--port', String(stub.port)]);
-    expect(result.code).toBe(0);
-    expect(stub.requests).toHaveLength(1);
-    expect(stub.requests[0]!.method).toBe('GET');
-    expect(stub.requests[0]!.url).toBe('/nat/status');
-    expect(result.stdout).toContain('auto-upnp');
-    expect(result.stdout).toContain('203.0.113.5');
-    expect(result.stdout).toContain('foo.duckdns.org');
-  });
-
-  it('--json prints raw JSON', async () => {
-    const result = await runCli(['nat', 'status', '--port', String(stub.port), '--json']);
-    expect(result.code).toBe(0);
-    const parsed = JSON.parse(result.stdout);
-    expect(parsed.portMode).toBe('auto-upnp');
-  });
-
-  it('exits 2 when cadre-host is unreachable', async () => {
-    const port = stub.port;
-    await new Promise<void>((resolveClose) => stub.server.close(() => resolveClose()));
-    const result = await runCli(['nat', 'status', '--port', String(port)]);
-    expect(result.code).toBe(2);
-    expect(result.stderr).toMatch(/cadre-host start|Failed to reach/);
-  });
-});
-
-describe('cadre-host nat test', () => {
-  it('POSTs /nat/test', async () => {
-    const result = await runCli(['nat', 'test', '--port', String(stub.port)]);
-    expect(result.code).toBe(0);
-    expect(stub.requests[0]!.method).toBe('POST');
-    expect(stub.requests[0]!.url).toBe('/nat/test');
-  });
-});
-
-describe('cadre-host nat ddns set', () => {
-  it('PUTs /nat/ddns with provider + hostname + token', async () => {
-    const result = await runCli([
-      'nat', 'ddns', 'set', 'duckdns',
-      '--hostname', 'foo.duckdns.org',
-      '--token', 'TOK',
-      '--port', String(stub.port),
-    ]);
-    expect(result.code).toBe(0);
-    expect(stub.requests[0]!.method).toBe('PUT');
-    expect(stub.requests[0]!.url).toBe('/nat/ddns');
-    const body = JSON.parse(stub.requests[0]!.body);
-    expect(body.providerId).toBe('duckdns');
-    expect(body.hostname).toBe('foo.duckdns.org');
-    expect(body.config).toEqual({ token: 'TOK' });
-  });
-
-  it('exits 1 when --hostname is missing', async () => {
-    const result = await runCli([
-      'nat', 'ddns', 'set', 'duckdns',
-      '--token', 'TOK',
-      '--port', String(stub.port),
-    ]);
-    expect(result.code).toBe(1);
-    expect(result.stderr).toMatch(/--hostname/);
-  });
-
-  it('exits 1 when --token is missing on a non-TTY stdin', async () => {
-    const result = await runCli([
-      'nat', 'ddns', 'set', 'duckdns',
-      '--hostname', 'foo.duckdns.org',
-      '--port', String(stub.port),
-    ]);
-    expect(result.code).toBe(1);
-    expect(result.stderr).toMatch(/--token/);
-  });
-});
-
-describe('cadre-host nat ddns external', () => {
-  it('PUTs /nat/settings with externallyManaged=true', async () => {
-    const result = await runCli([
-      'nat', 'ddns', 'external',
-      '--hostname', 'mydomain.example.com',
-      '--port', String(stub.port),
-    ]);
-    expect(result.code).toBe(0);
-    expect(stub.requests[0]!.method).toBe('PUT');
-    expect(stub.requests[0]!.url).toBe('/nat/settings');
-    const body = JSON.parse(stub.requests[0]!.body);
-    expect(body.ddns.hostname).toBe('mydomain.example.com');
-    expect(body.ddns.externallyManaged).toBe(true);
-  });
-});
-
-describe('cadre-host nat settings', () => {
-  it('PUTs /nat/settings with --external-port and --no-upnp', async () => {
-    const result = await runCli([
-      'nat', 'settings',
-      '--external-port', '4002',
-      '--no-upnp',
-      '--port', String(stub.port),
-    ]);
-    expect(result.code).toBe(0);
-    const body = JSON.parse(stub.requests[0]!.body);
-    expect(body.externalPort).toBe(4002);
-    expect(body.upnpEnabled).toBe(false);
-  });
-});
+/**
+ * CLI smoke test for the `nat` subcommand. Spawns a stub HTTP server playing
+ * the role of cadre-host's management API and asserts the CLI:
+ *   - GETs /nat/status
+ *   - POSTs /nat/test
+ *   - PUTs /nat/ddns with the expected body
+ *   - PUTs /nat/settings
+ *   - Exits non-zero when the host is not reachable
+ *
+ * Relies on `yarn build` having produced dist/bin/host.js.
+ */
+
+import { spawn } from 'node:child_process';
+import { createServer, type IncomingMessage, type Server, type ServerResponse } from 'node:http';
+import { existsSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { dirname, resolve } from 'node:path';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+const here = dirname(fileURLToPath(import.meta.url));
+const binPath = resolve(here, '../../dist/bin/host.js');
+
+// These smoke tests cold-start the built CLI as a child process (Node boot +,
+// for some, an HTTP server). That comfortably exceeds vitest's 5s default under
+// heavy parallel load, so give the subprocess generous headroom.
+vi.setConfig({ testTimeout: 30000 });
+
+interface StubServer {
+  server: Server;
+  port: number;
+  requests: Array<{ method: string; url: string; body: string }>;
+  setResponse(handler: (req: IncomingMessage, res: ServerResponse) => void): void;
+}
+
+const DEFAULT_STATUS = {
+  upnpEnabled: true,
+  gateway: { found: true, lanAddress: '192.168.1.20', routerExternalIp: '203.0.113.5', lastError: null },
+  externalIp: '203.0.113.5',
+  externalIpDetectedAt: new Date().toISOString(),
+  cgnatDetected: false,
+  directReachability: 'reachable',
+  lastTestedAt: null,
+  nodes: [
+    {
+      nodeId: 'owner',
+      running: true,
+      verdict: 'mapped',
+      reason: null,
+      tcp: { internalPort: 4001, externalPort: 4001, source: 'upnp', leaseExpiresAt: null, error: null },
+      ws: { internalPort: 10001, externalPort: 10001, source: 'upnp', leaseExpiresAt: null, error: null },
+      publicAddrs: ['/ip4/203.0.113.5/tcp/4001', '/ip4/203.0.113.5/tcp/10001/ws'],
+    },
+  ],
+  ddns: {
+    providerId: 'duckdns',
+    hostname: 'foo.duckdns.org',
+    externallyManaged: false,
+    lastUpdateAt: null,
+    lastUpdateOk: null,
+    lastError: null,
+  },
+};
+
+async function startStub(): Promise<StubServer> {
+  const requests: StubServer['requests'] = [];
+  let handler: (req: IncomingMessage, res: ServerResponse) => void = (_req, res) => {
+    res.statusCode = 200;
+    res.setHeader('content-type', 'application/json');
+    res.end(JSON.stringify(DEFAULT_STATUS));
+  };
+
+  const server = createServer((req, res) => {
+    const chunks: Buffer[] = [];
+    req.on('data', (chunk: Buffer) => chunks.push(chunk));
+    req.on('end', () => {
+      requests.push({ method: req.method ?? '', url: req.url ?? '', body: Buffer.concat(chunks).toString('utf8') });
+      handler(req, res);
+    });
+  });
+
+  await new Promise<void>((resolveStart) => server.listen(0, '127.0.0.1', () => resolveStart()));
+  const addr = server.address();
+  const port = typeof addr === 'object' && addr ? addr.port : 0;
+  return {
+    server,
+    port,
+    requests,
+    setResponse: (h) => { handler = h; },
+  };
+}
+
+function runCli(args: string[]): Promise<{ code: number; stdout: string; stderr: string }> {
+  return new Promise((resolveRun) => {
+    const child = spawn(process.execPath, [binPath, ...args], { stdio: ['ignore', 'pipe', 'pipe'] });
+    let stdout = '';
+    let stderr = '';
+    child.stdout.on('data', (chunk: Buffer) => { stdout += chunk.toString('utf8'); });
+    child.stderr.on('data', (chunk: Buffer) => { stderr += chunk.toString('utf8'); });
+    child.on('close', (code) => resolveRun({ code: code ?? -1, stdout, stderr }));
+  });
+}
+
+let stub: StubServer;
+
+beforeEach(async () => {
+  if (!existsSync(binPath)) {
+    throw new Error(`cadre-host bin not built at ${binPath}; run \`yarn build\` first`);
+  }
+  stub = await startStub();
+});
+
+afterEach(async () => {
+  await new Promise<void>((resolveClose) => stub.server.close(() => resolveClose()));
+});
+
+describe('cadre-host nat status', () => {
+  it('GETs /nat/status and renders the snapshot', async () => {
+    const result = await runCli(['nat', 'status', '--port', String(stub.port)]);
+    expect(result.code).toBe(0);
+    expect(stub.requests).toHaveLength(1);
+    expect(stub.requests[0]!.method).toBe('GET');
+    expect(stub.requests[0]!.url).toBe('/nat/status');
+    expect(result.stdout).toContain('reachable');
+    expect(result.stdout).toContain('203.0.113.5');
+    expect(result.stdout).toContain('owner: mapped');
+    expect(result.stdout).toContain('foo.duckdns.org');
+  });
+
+  it('--json prints raw JSON', async () => {
+    const result = await runCli(['nat', 'status', '--port', String(stub.port), '--json']);
+    expect(result.code).toBe(0);
+    const parsed = JSON.parse(result.stdout);
+    expect(parsed.directReachability).toBe('reachable');
+  });
+
+  it('exits 2 when cadre-host is unreachable', async () => {
+    const port = stub.port;
+    await new Promise<void>((resolveClose) => stub.server.close(() => resolveClose()));
+    const result = await runCli(['nat', 'status', '--port', String(port)]);
+    expect(result.code).toBe(2);
+    expect(result.stderr).toMatch(/cadre-host start|Failed to reach/);
+  });
+});
+
+describe('cadre-host nat test', () => {
+  it('POSTs /nat/test', async () => {
+    const result = await runCli(['nat', 'test', '--port', String(stub.port)]);
+    expect(result.code).toBe(0);
+    expect(stub.requests[0]!.method).toBe('POST');
+    expect(stub.requests[0]!.url).toBe('/nat/test');
+  });
+});
+
+describe('cadre-host nat ddns set', () => {
+  it('PUTs /nat/ddns with provider + hostname + token', async () => {
+    const result = await runCli([
+      'nat', 'ddns', 'set', 'duckdns',
+      '--hostname', 'foo.duckdns.org',
+      '--token', 'TOK',
+      '--port', String(stub.port),
+    ]);
+    expect(result.code).toBe(0);
+    expect(stub.requests[0]!.method).toBe('PUT');
+    expect(stub.requests[0]!.url).toBe('/nat/ddns');
+    const body = JSON.parse(stub.requests[0]!.body);
+    expect(body.providerId).toBe('duckdns');
+    expect(body.hostname).toBe('foo.duckdns.org');
+    expect(body.config).toEqual({ token: 'TOK' });
+  });
+
+  it('exits 1 when --hostname is missing', async () => {
+    const result = await runCli([
+      'nat', 'ddns', 'set', 'duckdns',
+      '--token', 'TOK',
+      '--port', String(stub.port),
+    ]);
+    expect(result.code).toBe(1);
+    expect(result.stderr).toMatch(/--hostname/);
+  });
+
+  it('exits 1 when --token is missing on a non-TTY stdin', async () => {
+    const result = await runCli([
+      'nat', 'ddns', 'set', 'duckdns',
+      '--hostname', 'foo.duckdns.org',
+      '--port', String(stub.port),
+    ]);
+    expect(result.code).toBe(1);
+    expect(result.stderr).toMatch(/--token/);
+  });
+});
+
+describe('cadre-host nat ddns external', () => {
+  it('PUTs /nat/settings with externallyManaged=true', async () => {
+    const result = await runCli([
+      'nat', 'ddns', 'external',
+      '--hostname', 'mydomain.example.com',
+      '--port', String(stub.port),
+    ]);
+    expect(result.code).toBe(0);
+    expect(stub.requests[0]!.method).toBe('PUT');
+    expect(stub.requests[0]!.url).toBe('/nat/settings');
+    const body = JSON.parse(stub.requests[0]!.body);
+    expect(body.ddns.hostname).toBe('mydomain.example.com');
+    expect(body.ddns.externallyManaged).toBe(true);
+  });
+});
+
+describe('cadre-host nat settings', () => {
+  it('PUTs /nat/settings with --no-upnp', async () => {
+    const result = await runCli([
+      'nat', 'settings',
+      '--no-upnp',
+      '--port', String(stub.port),
+    ]);
+    expect(result.code).toBe(0);
+    expect(stub.requests[0]!.url).toBe('/nat/settings');
+    expect(JSON.parse(stub.requests[0]!.body)).toEqual({ upnpEnabled: false });
+  });
+});

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

@@ -28,7 +28,7 @@ describe('cadre-host CLI smoke test', () => {
     });
 
     expect(stdout.length).toBeGreaterThan(0);
-    for (const cmd of ['install', 'start', 'status', 'invite', 'uninstall']) {
+    for (const cmd of ['install', 'start', 'status', 'uninstall']) {
       expect(stdout).toContain(cmd);
     }
   });
@@ -42,7 +42,7 @@ describe('cadre-host CLI smoke test', () => {
       encoding: 'utf8',
     });
     // The built CLI reads package.json at runtime, so this holds even against a
-    // stale dist — it catches the version falling back to '0.0.0-unknown'.
+    // stale dist — it catches dist/package-version.js resolving the wrong path.
     const pkg = JSON.parse(
       readFileSync(resolve(here, '../../package.json'), 'utf8'),
     ) as { version: string };

package/src/__tests__/global-setup.ts

@@ -2,9 +2,8 @@
  * Vitest global setup — runs once before the whole cadre-host suite.
  *
  * `src/update/manifest.ts` and `src/push/index.ts` import real symbols from
- * `@serfab/cadre-core` (`canonicalJson`, `validatePushCredentials`), and
- * `trust-circle-integration.test.ts` imports and drives a real `CadreNode` from
- * it too. `@serfab/cadre-core`'s compiled entry point in turn imports
+ * `@serfab/cadre-core` (`canonicalJson`, `validatePushCredentials`).
+ * `@serfab/cadre-core`'s compiled entry point in turn imports
  * `@serfab/quereus-plugin-sereus`, which imports the `@optimystic/*` and
  * `@quereus/quereus` packages linked in from their sibling checkouts.
  * `host-process-orchestrator.ts` also resolves `@serfab/cadre-cli`'s bin path at