@serfab/cadre-host 0.10.0 → 0.12.0

package/src/installer/__tests__/config.test.ts

@@ -1,112 +1,134 @@
-import { afterEach, beforeEach, describe, expect, it } from 'vitest';
-import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-
-import { readHostConfig, writeHostConfig, hostOwnsCadre, type HostConfigFile } from '../config.js';
-
-describe('host.config.json round-trip', () => {
-  let tmp: string;
-
-  beforeEach(() => {
-    tmp = mkdtempSync(join(tmpdir(), 'cadre-host-cfg-'));
-  });
-
-  afterEach(() => {
-    rmSync(tmp, { recursive: true, force: true });
-  });
-
-  function makeCfg(overrides: Partial<HostConfigFile> = {}): HostConfigFile {
-    return {
-      version: 2,
-      installId: 'abc123',
-      uiPort: 8765,
-      libp2pPort: 4001,
-      dataDir: tmp,
-      identityPath: join(tmp, 'identity.key'),
-      upnpEnabled: true,
-      installedAt: '2026-01-01T00:00:00.000Z',
-      installerVersion: '0.6.0',
-      updates: { autoApply: false },
-      ...overrides,
-    };
-  }
-
-  it('writes and reads the same shape', () => {
-    const cfg = makeCfg();
-    const path = join(tmp, 'host.config.json');
-    writeHostConfig(path, cfg);
-    expect(readHostConfig(path)).toEqual(cfg);
-  });
-
-  it('upgrades v1 files in place on read', () => {
-    const path = join(tmp, 'host.config.json');
-    const v1 = {
-      version: 1,
-      installId: 'abc123',
-      uiPort: 8765,
-      libp2pPort: 4001,
-      dataDir: tmp,
-      identityPath: join(tmp, 'identity.key'),
-      upnpEnabled: true,
-      installedAt: '2026-01-01T00:00:00.000Z',
-      installerVersion: '0.6.0',
-    };
-    writeFileSync(path, JSON.stringify(v1));
-    const upgraded = readHostConfig(path);
-    expect(upgraded.version).toBe(2);
-    expect(upgraded.updates).toEqual({ autoApply: false });
-    // Reading again should be idempotent and stay v2.
-    const reRead = readHostConfig(path);
-    expect(reRead.version).toBe(2);
-  });
-
-  it('rejects unknown versions', () => {
-    const path = join(tmp, 'host.config.json');
-    writeFileSync(path, JSON.stringify({ ...makeCfg(), version: 99 }));
-    expect(() => readHostConfig(path)).toThrow(/unsupported version=99/);
-  });
-
-  it('rejects malformed JSON', () => {
-    const path = join(tmp, 'host.config.json');
-    writeFileSync(path, 'not json');
-    expect(() => readHostConfig(path)).toThrow(/Failed to parse/);
-  });
-
-  it('rejects missing required fields', () => {
-    const path = join(tmp, 'host.config.json');
-    writeFileSync(path, JSON.stringify({ version: 2, uiPort: 1234 }));
-    expect(() => readHostConfig(path)).toThrow(/missing required fields/);
-  });
-
-  it('refuses to write the wrong version', () => {
-    const path = join(tmp, 'host.config.json');
-    expect(() => writeHostConfig(path, { ...makeCfg(), version: 3 as never })).toThrow(/version=3/);
-  });
-
-  it('round-trips ownCadre and hostOwnsCadre reflects it', () => {
-    const path = join(tmp, 'host.config.json');
-    const cfg = makeCfg({ ownCadre: { enabled: true } });
-    writeHostConfig(path, cfg);
-    const read = readHostConfig(path);
-    expect(read.ownCadre).toEqual({ enabled: true });
-    expect(hostOwnsCadre(read)).toBe(true);
-  });
-
-  it('treats an absent ownCadre as donor-only (hostOwnsCadre false)', () => {
-    // A pre-ownCadre v2 config (field absent) must read back cleanly and be
-    // donor-only — no migration, field stays absent.
-    const path = join(tmp, 'host.config.json');
-    const cfg = makeCfg();
-    writeHostConfig(path, cfg);
-    const read = readHostConfig(path);
-    expect(read.ownCadre).toBeUndefined();
-    expect(hostOwnsCadre(read)).toBe(false);
-  });
-
-  it('rejects a malformed ownCadre shape', () => {
-    const path = join(tmp, 'host.config.json');
-    writeFileSync(path, JSON.stringify({ ...makeCfg(), ownCadre: { enabled: 'yes' } }));
-    expect(() => readHostConfig(path)).toThrow(/missing required fields/);
-  });
-});
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import { readHostConfig, updateHostConfig, writeHostConfig, hostOwnsCadre, type HostConfigFile } from '../config.js';
+
+describe('host.config.json round-trip', () => {
+  let tmp: string;
+
+  beforeEach(() => {
+    tmp = mkdtempSync(join(tmpdir(), 'cadre-host-cfg-'));
+  });
+
+  afterEach(() => {
+    rmSync(tmp, { recursive: true, force: true });
+  });
+
+  function makeCfg(overrides: Partial<HostConfigFile> = {}): HostConfigFile {
+    return {
+      version: 2,
+      installId: 'abc123',
+      uiPort: 8765,
+      libp2pPort: 4001,
+      dataDir: tmp,
+      identityPath: join(tmp, 'identity.key'),
+      upnpEnabled: true,
+      installedAt: '2026-01-01T00:00:00.000Z',
+      installerVersion: '0.6.0',
+      updates: { autoApply: false },
+      ...overrides,
+    };
+  }
+
+  it('writes and reads the same shape', () => {
+    const cfg = makeCfg();
+    const path = join(tmp, 'host.config.json');
+    writeHostConfig(path, cfg);
+    expect(readHostConfig(path)).toEqual(cfg);
+  });
+
+  it('rejects v1 files without rewriting them', () => {
+    const path = join(tmp, 'host.config.json');
+    const v1 = {
+      version: 1,
+      installId: 'abc123',
+      uiPort: 8765,
+      libp2pPort: 4001,
+      dataDir: tmp,
+      identityPath: join(tmp, 'identity.key'),
+      upnpEnabled: true,
+      installedAt: '2026-01-01T00:00:00.000Z',
+      installerVersion: '0.6.0',
+    };
+    const raw = JSON.stringify(v1);
+    writeFileSync(path, raw);
+    expect(() => readHostConfig(path)).toThrow(/unsupported version=1/);
+    expect(readFileSync(path, 'utf8')).toBe(raw);
+  });
+
+  it('rejects unknown versions', () => {
+    const path = join(tmp, 'host.config.json');
+    writeFileSync(path, JSON.stringify({ ...makeCfg(), version: 99 }));
+    expect(() => readHostConfig(path)).toThrow(/unsupported version=99/);
+  });
+
+  it('rejects a file with no version field', () => {
+    const { version: _version, ...noVersion } = makeCfg();
+    const path = join(tmp, 'host.config.json');
+    writeFileSync(path, JSON.stringify(noVersion));
+    expect(() => readHostConfig(path)).toThrow(/unsupported version=undefined/);
+  });
+
+  it('rejects malformed JSON', () => {
+    const path = join(tmp, 'host.config.json');
+    writeFileSync(path, 'not json');
+    expect(() => readHostConfig(path)).toThrow(/Failed to parse/);
+  });
+
+  it('rejects missing required fields', () => {
+    const path = join(tmp, 'host.config.json');
+    writeFileSync(path, JSON.stringify({ version: 2, uiPort: 1234 }));
+    expect(() => readHostConfig(path)).toThrow(/missing required fields/);
+  });
+
+  it('refuses to write the wrong version', () => {
+    const path = join(tmp, 'host.config.json');
+    expect(() => writeHostConfig(path, { ...makeCfg(), version: 3 as never })).toThrow(/version=3/);
+  });
+
+  it('update patches fields and re-stamps the current version', () => {
+    const path = join(tmp, 'host.config.json');
+    writeHostConfig(path, makeCfg());
+    const next = updateHostConfig(path, { updates: { autoApply: true } });
+    expect(next.version).toBe(2);
+    expect(next.updates).toEqual({ autoApply: true });
+    expect(next.installId).toBe('abc123');
+    expect(readHostConfig(path)).toEqual(next);
+  });
+
+  it('update never lets a patch downgrade the version', () => {
+    const path = join(tmp, 'host.config.json');
+    writeHostConfig(path, makeCfg());
+    const patch = { version: 1 } as unknown as Partial<Omit<HostConfigFile, 'version'>>;
+    expect(updateHostConfig(path, patch).version).toBe(2);
+    expect(readHostConfig(path).version).toBe(2);
+  });
+
+  it('round-trips ownCadre and hostOwnsCadre reflects it', () => {
+    const path = join(tmp, 'host.config.json');
+    const cfg = makeCfg({ ownCadre: { enabled: true } });
+    writeHostConfig(path, cfg);
+    const read = readHostConfig(path);
+    expect(read.ownCadre).toEqual({ enabled: true });
+    expect(hostOwnsCadre(read)).toBe(true);
+  });
+
+  it('treats an absent ownCadre as donor-only (hostOwnsCadre false)', () => {
+    // A pre-ownCadre v2 config (field absent) must read back cleanly and be
+    // donor-only — no migration, field stays absent.
+    const path = join(tmp, 'host.config.json');
+    const cfg = makeCfg();
+    writeHostConfig(path, cfg);
+    const read = readHostConfig(path);
+    expect(read.ownCadre).toBeUndefined();
+    expect(hostOwnsCadre(read)).toBe(false);
+  });
+
+  it('rejects a malformed ownCadre shape', () => {
+    const path = join(tmp, 'host.config.json');
+    writeFileSync(path, JSON.stringify({ ...makeCfg(), ownCadre: { enabled: 'yes' } }));
+    expect(() => readHostConfig(path)).toThrow(/missing required fields/);
+  });
+});

package/src/installer/__tests__/identity.test.ts

@@ -1,34 +1,34 @@
-import { afterEach, beforeEach, describe, expect, it } from 'vitest';
-import { mkdtempSync, rmSync, statSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-
-import { generateIdentity, loadIdentity } from '../identity.js';
-
-describe('installer identity', () => {
-  let tmp: string;
-
-  beforeEach(() => {
-    tmp = mkdtempSync(join(tmpdir(), 'cadre-host-id-'));
-  });
-
-  afterEach(() => {
-    rmSync(tmp, { recursive: true, force: true });
-  });
-
-  it('round-trips an Ed25519 keypair through the file', async () => {
-    const path = join(tmp, 'identity.key');
-    const generated = await generateIdentity(path);
-    expect(generated.peerId).toMatch(/^12D3Koo/);
-
-    const loaded = loadIdentity(path);
-    expect(loaded.peerId).toBe(generated.peerId);
-  });
-
-  it.runIf(process.platform !== 'win32')('persists with mode 0600 on POSIX', async () => {
-    const path = join(tmp, 'identity.key');
-    await generateIdentity(path);
-    const mode = statSync(path).mode & 0o777;
-    expect(mode).toBe(0o600);
-  });
-});
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { mkdtempSync, rmSync, statSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import { generateIdentity, loadIdentity } from '../identity.js';
+
+describe('installer identity', () => {
+  let tmp: string;
+
+  beforeEach(() => {
+    tmp = mkdtempSync(join(tmpdir(), 'cadre-host-id-'));
+  });
+
+  afterEach(() => {
+    rmSync(tmp, { recursive: true, force: true });
+  });
+
+  it('round-trips an Ed25519 keypair through the file', async () => {
+    const path = join(tmp, 'identity.key');
+    const generated = await generateIdentity(path);
+    expect(generated.peerId).toMatch(/^12D3Koo/);
+
+    const loaded = loadIdentity(path);
+    expect(loaded.peerId).toBe(generated.peerId);
+  });
+
+  it.runIf(process.platform !== 'win32')('persists with mode 0600 on POSIX', async () => {
+    const path = join(tmp, 'identity.key');
+    await generateIdentity(path);
+    const mode = statSync(path).mode & 0o777;
+    expect(mode).toBe(0o600);
+  });
+});

package/src/installer/__tests__/paths.test.ts

@@ -1,47 +1,47 @@
-import { describe, expect, it } from 'vitest';
-
-import { defaultDataDir, serviceInstallPath } from '../paths.js';
-
-describe('defaultDataDir', () => {
-  it('honors XDG_DATA_HOME on linux', () => {
-    expect(defaultDataDir('linux', { XDG_DATA_HOME: '/tmp/xdg', HOME: '/home/me' }, '/home/me'))
-      .toBe('/tmp/xdg/cadre-host');
-  });
-
-  it('falls back to ~/.local/share on linux', () => {
-    expect(defaultDataDir('linux', { HOME: '/home/me' }, '/home/me'))
-      .toBe('/home/me/.local/share/cadre-host');
-  });
-
-  it('uses Application Support on darwin', () => {
-    expect(defaultDataDir('darwin', { HOME: '/Users/me' }, '/Users/me'))
-      .toBe('/Users/me/Library/Application Support/CadreHost');
-  });
-
-  it('uses LocalAppData on win32', () => {
-    expect(defaultDataDir('win32', { LocalAppData: 'C:\\Users\\me\\AppData\\Local' }, 'C:\\Users\\me'))
-      .toBe('C:\\Users\\me\\AppData\\Local\\CadreHost');
-  });
-
-  it('falls back to ~/AppData/Local on win32 without LocalAppData', () => {
-    expect(defaultDataDir('win32', {}, 'C:\\Users\\me'))
-      .toBe('C:\\Users\\me\\AppData\\Local\\CadreHost');
-  });
-});
-
-describe('serviceInstallPath', () => {
-  it('honors XDG_CONFIG_HOME on linux', () => {
-    expect(serviceInstallPath('linux', { XDG_CONFIG_HOME: '/tmp/cfg', HOME: '/home/me' }, '/home/me'))
-      .toBe('/tmp/cfg/systemd/user/cadre-host.service');
-  });
-
-  it('uses LaunchAgents on darwin', () => {
-    expect(serviceInstallPath('darwin', { HOME: '/Users/me' }, '/Users/me'))
-      .toBe('/Users/me/Library/LaunchAgents/com.serfab.cadre-host.plist');
-  });
-
-  it('returns a registry-style path on win32 (for logging only)', () => {
-    expect(serviceInstallPath('win32', {}, 'C:\\Users\\me'))
-      .toMatch(/CadreHost/);
-  });
-});
+import { describe, expect, it } from 'vitest';
+
+import { defaultDataDir, serviceInstallPath } from '../paths.js';
+
+describe('defaultDataDir', () => {
+  it('honors XDG_DATA_HOME on linux', () => {
+    expect(defaultDataDir('linux', { XDG_DATA_HOME: '/tmp/xdg', HOME: '/home/me' }, '/home/me'))
+      .toBe('/tmp/xdg/cadre-host');
+  });
+
+  it('falls back to ~/.local/share on linux', () => {
+    expect(defaultDataDir('linux', { HOME: '/home/me' }, '/home/me'))
+      .toBe('/home/me/.local/share/cadre-host');
+  });
+
+  it('uses Application Support on darwin', () => {
+    expect(defaultDataDir('darwin', { HOME: '/Users/me' }, '/Users/me'))
+      .toBe('/Users/me/Library/Application Support/CadreHost');
+  });
+
+  it('uses LocalAppData on win32', () => {
+    expect(defaultDataDir('win32', { LocalAppData: 'C:\\Users\\me\\AppData\\Local' }, 'C:\\Users\\me'))
+      .toBe('C:\\Users\\me\\AppData\\Local\\CadreHost');
+  });
+
+  it('falls back to ~/AppData/Local on win32 without LocalAppData', () => {
+    expect(defaultDataDir('win32', {}, 'C:\\Users\\me'))
+      .toBe('C:\\Users\\me\\AppData\\Local\\CadreHost');
+  });
+});
+
+describe('serviceInstallPath', () => {
+  it('honors XDG_CONFIG_HOME on linux', () => {
+    expect(serviceInstallPath('linux', { XDG_CONFIG_HOME: '/tmp/cfg', HOME: '/home/me' }, '/home/me'))
+      .toBe('/tmp/cfg/systemd/user/cadre-host.service');
+  });
+
+  it('uses LaunchAgents on darwin', () => {
+    expect(serviceInstallPath('darwin', { HOME: '/Users/me' }, '/Users/me'))
+      .toBe('/Users/me/Library/LaunchAgents/com.serfab.cadre-host.plist');
+  });
+
+  it('returns a registry-style path on win32 (for logging only)', () => {
+    expect(serviceInstallPath('win32', {}, 'C:\\Users\\me'))
+      .toMatch(/CadreHost/);
+  });
+});

package/src/installer/__tests__/service-host.test.ts

@@ -1,62 +1,62 @@
-import { describe, expect, it } from 'vitest';
-import { resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-import { LaunchdServiceHost } from '../service-host/launchd.js';
-import { SystemdServiceHost } from '../service-host/systemd.js';
-import { NssmServiceHost } from '../service-host/nssm.js';
-import { renderTemplate } from '../service-host/template.js';
-import type { ServiceHostContext } from '../service-host/types.js';
-
-const here = fileURLToPath(new URL('.', import.meta.url));
-const serviceDir = resolve(here, '..', '..', '..', 'service');
-
-function ctx(): ServiceHostContext {
-  return {
-    nodePath: '/usr/local/bin/node',
-    hostJs: '/opt/cadre-host/dist/bin/host.js',
-    dataDir: '/var/data/cadre-host',
-    serviceDir,
-  };
-}
-
-describe('renderTemplate', () => {
-  it('substitutes @TOKEN@ values', () => {
-    expect(renderTemplate('@A@ x @B@', { A: 'foo', B: 'bar' })).toBe('foo x bar');
-  });
-
-  it('throws on unknown tokens', () => {
-    expect(() => renderTemplate('@A@ @MISSING@', { A: 'foo' })).toThrow(/missing value for token @MISSING@/);
-  });
-});
-
-describe('SystemdServiceHost.renderUnit', () => {
-  it('produces an enable-able [Install] section and substitutes ExecStart', () => {
-    const unit = new SystemdServiceHost().renderUnit(ctx());
-    expect(unit).toContain('[Install]');
-    expect(unit).toContain('WantedBy=default.target');
-    expect(unit).toContain('ExecStart=/usr/local/bin/node /opt/cadre-host/dist/bin/host.js start --no-tui --data-dir /var/data/cadre-host');
-    expect(unit).toContain('RestartPreventExitStatus=0');
-  });
-});
-
-describe('LaunchdServiceHost.renderUnit', () => {
-  it('produces a plist with the substituted ProgramArguments', () => {
-    const unit = new LaunchdServiceHost().renderUnit(ctx());
-    expect(unit).toContain('<key>Label</key>');
-    expect(unit).toContain('<string>com.serfab.cadre-host</string>');
-    expect(unit).toContain('<string>/usr/local/bin/node</string>');
-    expect(unit).toContain('<string>/opt/cadre-host/dist/bin/host.js</string>');
-    expect(unit).toContain('<string>--data-dir</string>');
-    expect(unit).toContain('<string>/var/data/cadre-host</string>');
-    expect(unit).toContain('<key>KeepAlive</key>');
-    expect(unit).toContain('<key>SuccessfulExit</key>');
-    expect(unit).toContain('<key>Crashed</key>');
-  });
-});
-
-describe('NssmServiceHost', () => {
-  it('returns null from renderUnit (NSSM stores config in the registry)', () => {
-    expect(new NssmServiceHost().renderUnit(ctx())).toBeNull();
-  });
-});
+import { describe, expect, it } from 'vitest';
+import { resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+import { LaunchdServiceHost } from '../service-host/launchd.js';
+import { SystemdServiceHost } from '../service-host/systemd.js';
+import { NssmServiceHost } from '../service-host/nssm.js';
+import { renderTemplate } from '../service-host/template.js';
+import type { ServiceHostContext } from '../service-host/types.js';
+
+const here = fileURLToPath(new URL('.', import.meta.url));
+const serviceDir = resolve(here, '..', '..', '..', 'service');
+
+function ctx(): ServiceHostContext {
+  return {
+    nodePath: '/usr/local/bin/node',
+    hostJs: '/opt/cadre-host/dist/bin/host.js',
+    dataDir: '/var/data/cadre-host',
+    serviceDir,
+  };
+}
+
+describe('renderTemplate', () => {
+  it('substitutes @TOKEN@ values', () => {
+    expect(renderTemplate('@A@ x @B@', { A: 'foo', B: 'bar' })).toBe('foo x bar');
+  });
+
+  it('throws on unknown tokens', () => {
+    expect(() => renderTemplate('@A@ @MISSING@', { A: 'foo' })).toThrow(/missing value for token @MISSING@/);
+  });
+});
+
+describe('SystemdServiceHost.renderUnit', () => {
+  it('produces an enable-able [Install] section and substitutes ExecStart', () => {
+    const unit = new SystemdServiceHost().renderUnit(ctx());
+    expect(unit).toContain('[Install]');
+    expect(unit).toContain('WantedBy=default.target');
+    expect(unit).toContain('ExecStart=/usr/local/bin/node /opt/cadre-host/dist/bin/host.js start --no-tui --data-dir /var/data/cadre-host');
+    expect(unit).toContain('RestartPreventExitStatus=0');
+  });
+});
+
+describe('LaunchdServiceHost.renderUnit', () => {
+  it('produces a plist with the substituted ProgramArguments', () => {
+    const unit = new LaunchdServiceHost().renderUnit(ctx());
+    expect(unit).toContain('<key>Label</key>');
+    expect(unit).toContain('<string>com.serfab.cadre-host</string>');
+    expect(unit).toContain('<string>/usr/local/bin/node</string>');
+    expect(unit).toContain('<string>/opt/cadre-host/dist/bin/host.js</string>');
+    expect(unit).toContain('<string>--data-dir</string>');
+    expect(unit).toContain('<string>/var/data/cadre-host</string>');
+    expect(unit).toContain('<key>KeepAlive</key>');
+    expect(unit).toContain('<key>SuccessfulExit</key>');
+    expect(unit).toContain('<key>Crashed</key>');
+  });
+});
+
+describe('NssmServiceHost', () => {
+  it('returns null from renderUnit (NSSM stores config in the registry)', () => {
+    expect(new NssmServiceHost().renderUnit(ctx())).toBeNull();
+  });
+});