@serfab/cadre-host 0.10.0 → 0.11.0

package/src/update/__tests__/update-service.integration.test.ts

@@ -1,256 +1,256 @@
-import { afterEach, beforeEach, describe, expect, it } from 'vitest';
-import { mkdtempSync, rmSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { generateKeyPairSync, type KeyObject } from 'node:crypto';
-
-import { signManifest } from '../manifest.js';
-import { UpdateService } from '../index.js';
-import { UpdateStateStore } from '../store.js';
-import type { UpdateManifest } from '../types.js';
-
-function freshKeypair(): { privateKey: KeyObject; publicRawB64: string } {
-  const { publicKey, privateKey } = generateKeyPairSync('ed25519');
-  const spki = publicKey.export({ format: 'der', type: 'spki' });
-  return { privateKey, publicRawB64: Buffer.from(spki.subarray(12)).toString('base64') };
-}
-
-function manifest(version: string, opts: Partial<UpdateManifest> = {}): UpdateManifest {
-  return {
-    v: 1,
-    version,
-    publishedAt: '2026-05-15T18:00:00.000Z',
-    channels: { npm: { package: '@serfab/cadre-host', tag: 'latest' } },
-    ...opts,
-  };
-}
-
-function fakeFetch(envelope: unknown): typeof fetch {
-  return (async (_url: string, _init?: RequestInit) => {
-    return {
-      ok: true,
-      status: 200,
-      json: async () => envelope,
-    } as Response;
-  }) as typeof fetch;
-}
-
-describe('UpdateService', () => {
-  let tmp: string;
-  let kp: ReturnType<typeof freshKeypair>;
-
-  beforeEach(() => {
-    tmp = mkdtempSync(join(tmpdir(), 'cadre-update-svc-'));
-    kp = freshKeypair();
-    process.env.CADRE_HOST_UPDATE_DEV_KEY = kp.publicRawB64;
-  });
-
-  afterEach(() => {
-    delete process.env.CADRE_HOST_UPDATE_DEV_KEY;
-    rmSync(tmp, { recursive: true, force: true });
-  });
-
-  it('check(): records an available update when manifest > current', async () => {
-    const envelope = signManifest(manifest('0.7.0', { releaseNotesUrl: 'https://x' }), kp.privateKey);
-    const svc = new UpdateService({
-      dataDir: tmp,
-      currentVersion: '0.6.0',
-      fetcher: fakeFetch(envelope),
-      manifestUrl: 'https://example.com/m',
-    });
-    await svc.check();
-    const state = await svc.getState();
-    expect(state.available).toEqual({
-      version: '0.7.0',
-      publishedAt: '2026-05-15T18:00:00.000Z',
-      releaseNotesUrl: 'https://x',
-    });
-    expect(state.lastChecked).toBeDefined();
-    expect(state.lastError).toBeUndefined();
-  });
-
-  it('check(): clears stale available when up-to-date', async () => {
-    const envelope = signManifest(manifest('0.6.0'), kp.privateKey);
-    const svc = new UpdateService({
-      dataDir: tmp,
-      currentVersion: '0.7.0',
-      fetcher: fakeFetch(envelope),
-      manifestUrl: 'https://example.com/m',
-    });
-    await svc.check();
-    const state = await svc.getState();
-    expect(state.available).toBeUndefined();
-    expect(state.lastChecked).toBeDefined();
-  });
-
-  it('check(): silent on network failure', async () => {
-    const svc = new UpdateService({
-      dataDir: tmp,
-      currentVersion: '0.6.0',
-      fetcher: (async () => { throw new Error('ECONNREFUSED'); }) as typeof fetch,
-      manifestUrl: 'https://example.com/m',
-    });
-    await svc.check();
-    const state = await svc.getState();
-    expect(state.lastChecked).toBeUndefined();
-    expect(state.lastError).toBeUndefined();
-  });
-
-  it('check(): records signature_invalid as lastError', async () => {
-    const envelope = signManifest(manifest('0.7.0'), kp.privateKey);
-    // Swap the trusted key after signing.
-    const other = freshKeypair();
-    process.env.CADRE_HOST_UPDATE_DEV_KEY = other.publicRawB64;
-    const svc = new UpdateService({
-      dataDir: tmp,
-      currentVersion: '0.6.0',
-      fetcher: fakeFetch(envelope),
-      manifestUrl: 'https://example.com/m',
-    });
-    await svc.check();
-    const state = await svc.getState();
-    expect(state.lastError?.code).toBe('signature_invalid');
-    expect(state.available).toBeUndefined();
-  });
-
-  it('apply(): records applyInProgress, calls npm + restart, clears on success', async () => {
-    const envelope = signManifest(manifest('0.7.0'), kp.privateKey);
-    const calls: string[][] = [];
-    const svc = new UpdateService({
-      dataDir: tmp,
-      currentVersion: '0.6.0',
-      fetcher: fakeFetch(envelope),
-      manifestUrl: 'https://example.com/m',
-      npmExecutor: async (args) => { calls.push(args); return { exitCode: 0, stdout: '', stderr: '' }; },
-      restart: async () => undefined,
-    });
-    const result = await svc.apply();
-    expect(result).toMatchObject({ fromVersion: '0.6.0', toVersion: '0.7.0', restarted: true });
-    expect(calls).toEqual([['install', '-g', '@serfab/cadre-host@0.7.0']]);
-    const state = await svc.getState();
-    expect(state.applyInProgress).toBeUndefined();
-    expect(state.lastError).toBeUndefined();
-  });
-
-  it('apply(): rejects when current is below minPreviousVersion', async () => {
-    const envelope = signManifest(manifest('0.8.0', { minPreviousVersion: '0.7.0' }), kp.privateKey);
-    const svc = new UpdateService({
-      dataDir: tmp,
-      currentVersion: '0.6.0',
-      fetcher: fakeFetch(envelope),
-      manifestUrl: 'https://example.com/m',
-    });
-    await expect(svc.apply()).rejects.toMatchObject({ code: 'min_previous_version' });
-  });
-
-  it('apply(): rejects when current >= latest', async () => {
-    const envelope = signManifest(manifest('0.6.0'), kp.privateKey);
-    const svc = new UpdateService({
-      dataDir: tmp,
-      currentVersion: '0.7.0',
-      fetcher: fakeFetch(envelope),
-      manifestUrl: 'https://example.com/m',
-    });
-    await expect(svc.apply()).rejects.toMatchObject({ code: 'no_update_available' });
-  });
-
-  it('apply(): records lastError + clears applyInProgress when npm install fails', async () => {
-    const envelope = signManifest(manifest('0.7.0'), kp.privateKey);
-    let installCount = 0;
-    const svc = new UpdateService({
-      dataDir: tmp,
-      currentVersion: '0.6.0',
-      fetcher: fakeFetch(envelope),
-      manifestUrl: 'https://example.com/m',
-      npmExecutor: async () => {
-        installCount++;
-        return { exitCode: installCount === 1 ? 1 : 0, stdout: '', stderr: installCount === 1 ? 'EACCES' : '' };
-      },
-    });
-    await expect(svc.apply()).rejects.toMatchObject({ code: 'apply_failed' });
-    const state = await svc.getState();
-    expect(state.applyInProgress).toBeUndefined();
-    expect(state.lastError?.code).toBe('apply_failed');
-  });
-
-  it('settings: onSettingsChanged fires when putSettings mutates state', async () => {
-    const svc = new UpdateService({
-      dataDir: tmp,
-      currentVersion: '0.6.0',
-      fetcher: fakeFetch({}),
-      manifestUrl: 'https://example.com/m',
-      settings: { autoApply: false },
-    });
-    let observed: { autoApply: boolean } | null = null;
-    svc.onSettingsChanged((next) => { observed = { autoApply: next.autoApply }; });
-    await svc.putSettings({ autoApply: true });
-    expect(observed).toEqual({ autoApply: true });
-    expect(svc.getSettings().autoApply).toBe(true);
-  });
-
-  it('autoApply: check() triggers apply when settings.autoApply is true', async () => {
-    const envelope = signManifest(manifest('0.7.0'), kp.privateKey);
-    const calls: string[][] = [];
-    const svc = new UpdateService({
-      dataDir: tmp,
-      currentVersion: '0.6.0',
-      fetcher: fakeFetch(envelope),
-      manifestUrl: 'https://example.com/m',
-      settings: { autoApply: true },
-      npmExecutor: async (args) => { calls.push(args); return { exitCode: 0, stdout: '', stderr: '' }; },
-      restart: async () => undefined,
-    });
-    await svc.check();
-    expect(calls.some((c) => c[2] === '@serfab/cadre-host@0.7.0')).toBe(true);
-  });
-
-  it('recovers from a stale applyInProgress at construction time', async () => {
-    // Simulate a crash: write a state file that records an in-flight apply.
-    const seed = new UpdateStateStore(tmp);
-    seed.update({
-      applyInProgress: {
-        fromVersion: '0.6.0',
-        toVersion: '0.7.0',
-        startedAt: '2026-05-15T18:00:00.000Z',
-      },
-    });
-
-    const svc = new UpdateService({
-      dataDir: tmp,
-      currentVersion: '0.6.0',
-      fetcher: fakeFetch({}),
-      manifestUrl: 'https://example.com/m',
-    });
-    const state = await svc.getState();
-    expect(state.applyInProgress).toBeUndefined();
-    expect(state.lastError?.code).toBe('apply_failed');
-    expect(state.lastError?.message).toMatch(/interrupted/i);
-
-    // Now apply() must not short-circuit on apply_in_progress; with a stub
-    // manifest mismatch we expect the usual no_update_available path instead.
-    const envelope = signManifest(manifest('0.6.0'), kp.privateKey);
-    const svc2 = new UpdateService({
-      dataDir: tmp,
-      currentVersion: '0.7.0',
-      fetcher: fakeFetch(envelope),
-      manifestUrl: 'https://example.com/m',
-    });
-    await expect(svc2.apply()).rejects.toMatchObject({ code: 'no_update_available' });
-  });
-
-  it('start()/stop(): timer can be armed and cleared', async () => {
-    const svc = new UpdateService({
-      dataDir: tmp,
-      currentVersion: '0.6.0',
-      fetcher: (async () => { throw new Error('no'); }) as typeof fetch,
-      manifestUrl: 'https://example.com/m',
-      checkIntervalMs: 1_000_000,
-    });
-    svc.start();
-    // Calling start a second time is a no-op (no thrown error).
-    svc.start();
-    svc.stop();
-    // Calling stop without an active timer is safe.
-    svc.stop();
-  });
-});
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { mkdtempSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { generateKeyPairSync, type KeyObject } from 'node:crypto';
+
+import { signManifest } from '../manifest.js';
+import { UpdateService } from '../index.js';
+import { UpdateStateStore } from '../store.js';
+import type { UpdateManifest } from '../types.js';
+
+function freshKeypair(): { privateKey: KeyObject; publicRawB64: string } {
+  const { publicKey, privateKey } = generateKeyPairSync('ed25519');
+  const spki = publicKey.export({ format: 'der', type: 'spki' });
+  return { privateKey, publicRawB64: Buffer.from(spki.subarray(12)).toString('base64') };
+}
+
+function manifest(version: string, opts: Partial<UpdateManifest> = {}): UpdateManifest {
+  return {
+    v: 1,
+    version,
+    publishedAt: '2026-05-15T18:00:00.000Z',
+    channels: { npm: { package: '@serfab/cadre-host', tag: 'latest' } },
+    ...opts,
+  };
+}
+
+function fakeFetch(envelope: unknown): typeof fetch {
+  return (async (_url: string, _init?: RequestInit) => {
+    return {
+      ok: true,
+      status: 200,
+      json: async () => envelope,
+    } as Response;
+  }) as typeof fetch;
+}
+
+describe('UpdateService', () => {
+  let tmp: string;
+  let kp: ReturnType<typeof freshKeypair>;
+
+  beforeEach(() => {
+    tmp = mkdtempSync(join(tmpdir(), 'cadre-update-svc-'));
+    kp = freshKeypair();
+    process.env.CADRE_HOST_UPDATE_DEV_KEY = kp.publicRawB64;
+  });
+
+  afterEach(() => {
+    delete process.env.CADRE_HOST_UPDATE_DEV_KEY;
+    rmSync(tmp, { recursive: true, force: true });
+  });
+
+  it('check(): records an available update when manifest > current', async () => {
+    const envelope = signManifest(manifest('0.7.0', { releaseNotesUrl: 'https://x' }), kp.privateKey);
+    const svc = new UpdateService({
+      dataDir: tmp,
+      currentVersion: '0.6.0',
+      fetcher: fakeFetch(envelope),
+      manifestUrl: 'https://example.com/m',
+    });
+    await svc.check();
+    const state = await svc.getState();
+    expect(state.available).toEqual({
+      version: '0.7.0',
+      publishedAt: '2026-05-15T18:00:00.000Z',
+      releaseNotesUrl: 'https://x',
+    });
+    expect(state.lastChecked).toBeDefined();
+    expect(state.lastError).toBeUndefined();
+  });
+
+  it('check(): clears stale available when up-to-date', async () => {
+    const envelope = signManifest(manifest('0.6.0'), kp.privateKey);
+    const svc = new UpdateService({
+      dataDir: tmp,
+      currentVersion: '0.7.0',
+      fetcher: fakeFetch(envelope),
+      manifestUrl: 'https://example.com/m',
+    });
+    await svc.check();
+    const state = await svc.getState();
+    expect(state.available).toBeUndefined();
+    expect(state.lastChecked).toBeDefined();
+  });
+
+  it('check(): silent on network failure', async () => {
+    const svc = new UpdateService({
+      dataDir: tmp,
+      currentVersion: '0.6.0',
+      fetcher: (async () => { throw new Error('ECONNREFUSED'); }) as typeof fetch,
+      manifestUrl: 'https://example.com/m',
+    });
+    await svc.check();
+    const state = await svc.getState();
+    expect(state.lastChecked).toBeUndefined();
+    expect(state.lastError).toBeUndefined();
+  });
+
+  it('check(): records signature_invalid as lastError', async () => {
+    const envelope = signManifest(manifest('0.7.0'), kp.privateKey);
+    // Swap the trusted key after signing.
+    const other = freshKeypair();
+    process.env.CADRE_HOST_UPDATE_DEV_KEY = other.publicRawB64;
+    const svc = new UpdateService({
+      dataDir: tmp,
+      currentVersion: '0.6.0',
+      fetcher: fakeFetch(envelope),
+      manifestUrl: 'https://example.com/m',
+    });
+    await svc.check();
+    const state = await svc.getState();
+    expect(state.lastError?.code).toBe('signature_invalid');
+    expect(state.available).toBeUndefined();
+  });
+
+  it('apply(): records applyInProgress, calls npm + restart, clears on success', async () => {
+    const envelope = signManifest(manifest('0.7.0'), kp.privateKey);
+    const calls: string[][] = [];
+    const svc = new UpdateService({
+      dataDir: tmp,
+      currentVersion: '0.6.0',
+      fetcher: fakeFetch(envelope),
+      manifestUrl: 'https://example.com/m',
+      npmExecutor: async (args) => { calls.push(args); return { exitCode: 0, stdout: '', stderr: '' }; },
+      restart: async () => undefined,
+    });
+    const result = await svc.apply();
+    expect(result).toMatchObject({ fromVersion: '0.6.0', toVersion: '0.7.0', restarted: true });
+    expect(calls).toEqual([['install', '-g', '@serfab/cadre-host@0.7.0']]);
+    const state = await svc.getState();
+    expect(state.applyInProgress).toBeUndefined();
+    expect(state.lastError).toBeUndefined();
+  });
+
+  it('apply(): rejects when current is below minPreviousVersion', async () => {
+    const envelope = signManifest(manifest('0.8.0', { minPreviousVersion: '0.7.0' }), kp.privateKey);
+    const svc = new UpdateService({
+      dataDir: tmp,
+      currentVersion: '0.6.0',
+      fetcher: fakeFetch(envelope),
+      manifestUrl: 'https://example.com/m',
+    });
+    await expect(svc.apply()).rejects.toMatchObject({ code: 'min_previous_version' });
+  });
+
+  it('apply(): rejects when current >= latest', async () => {
+    const envelope = signManifest(manifest('0.6.0'), kp.privateKey);
+    const svc = new UpdateService({
+      dataDir: tmp,
+      currentVersion: '0.7.0',
+      fetcher: fakeFetch(envelope),
+      manifestUrl: 'https://example.com/m',
+    });
+    await expect(svc.apply()).rejects.toMatchObject({ code: 'no_update_available' });
+  });
+
+  it('apply(): records lastError + clears applyInProgress when npm install fails', async () => {
+    const envelope = signManifest(manifest('0.7.0'), kp.privateKey);
+    let installCount = 0;
+    const svc = new UpdateService({
+      dataDir: tmp,
+      currentVersion: '0.6.0',
+      fetcher: fakeFetch(envelope),
+      manifestUrl: 'https://example.com/m',
+      npmExecutor: async () => {
+        installCount++;
+        return { exitCode: installCount === 1 ? 1 : 0, stdout: '', stderr: installCount === 1 ? 'EACCES' : '' };
+      },
+    });
+    await expect(svc.apply()).rejects.toMatchObject({ code: 'apply_failed' });
+    const state = await svc.getState();
+    expect(state.applyInProgress).toBeUndefined();
+    expect(state.lastError?.code).toBe('apply_failed');
+  });
+
+  it('settings: onSettingsChanged fires when putSettings mutates state', async () => {
+    const svc = new UpdateService({
+      dataDir: tmp,
+      currentVersion: '0.6.0',
+      fetcher: fakeFetch({}),
+      manifestUrl: 'https://example.com/m',
+      settings: { autoApply: false },
+    });
+    let observed: { autoApply: boolean } | null = null;
+    svc.onSettingsChanged((next) => { observed = { autoApply: next.autoApply }; });
+    await svc.putSettings({ autoApply: true });
+    expect(observed).toEqual({ autoApply: true });
+    expect(svc.getSettings().autoApply).toBe(true);
+  });
+
+  it('autoApply: check() triggers apply when settings.autoApply is true', async () => {
+    const envelope = signManifest(manifest('0.7.0'), kp.privateKey);
+    const calls: string[][] = [];
+    const svc = new UpdateService({
+      dataDir: tmp,
+      currentVersion: '0.6.0',
+      fetcher: fakeFetch(envelope),
+      manifestUrl: 'https://example.com/m',
+      settings: { autoApply: true },
+      npmExecutor: async (args) => { calls.push(args); return { exitCode: 0, stdout: '', stderr: '' }; },
+      restart: async () => undefined,
+    });
+    await svc.check();
+    expect(calls.some((c) => c[2] === '@serfab/cadre-host@0.7.0')).toBe(true);
+  });
+
+  it('recovers from a stale applyInProgress at construction time', async () => {
+    // Simulate a crash: write a state file that records an in-flight apply.
+    const seed = new UpdateStateStore(tmp);
+    seed.update({
+      applyInProgress: {
+        fromVersion: '0.6.0',
+        toVersion: '0.7.0',
+        startedAt: '2026-05-15T18:00:00.000Z',
+      },
+    });
+
+    const svc = new UpdateService({
+      dataDir: tmp,
+      currentVersion: '0.6.0',
+      fetcher: fakeFetch({}),
+      manifestUrl: 'https://example.com/m',
+    });
+    const state = await svc.getState();
+    expect(state.applyInProgress).toBeUndefined();
+    expect(state.lastError?.code).toBe('apply_failed');
+    expect(state.lastError?.message).toMatch(/interrupted/i);
+
+    // Now apply() must not short-circuit on apply_in_progress; with a stub
+    // manifest mismatch we expect the usual no_update_available path instead.
+    const envelope = signManifest(manifest('0.6.0'), kp.privateKey);
+    const svc2 = new UpdateService({
+      dataDir: tmp,
+      currentVersion: '0.7.0',
+      fetcher: fakeFetch(envelope),
+      manifestUrl: 'https://example.com/m',
+    });
+    await expect(svc2.apply()).rejects.toMatchObject({ code: 'no_update_available' });
+  });
+
+  it('start()/stop(): timer can be armed and cleared', async () => {
+    const svc = new UpdateService({
+      dataDir: tmp,
+      currentVersion: '0.6.0',
+      fetcher: (async () => { throw new Error('no'); }) as typeof fetch,
+      manifestUrl: 'https://example.com/m',
+      checkIntervalMs: 1_000_000,
+    });
+    svc.start();
+    // Calling start a second time is a no-op (no thrown error).
+    svc.start();
+    svc.stop();
+    // Calling stop without an active timer is safe.
+    svc.stop();
+  });
+});

package/src/update/__tests__/version.test.ts

@@ -1,31 +1,31 @@
-import { describe, expect, it } from 'vitest';
-
-import { compareVersions, parseVersion } from '../version.js';
-
-describe('compareVersions', () => {
-  it('orders releases by major/minor/patch', () => {
-    expect(compareVersions('0.6.0', '0.7.0')).toBeLessThan(0);
-    expect(compareVersions('1.0.0', '0.99.99')).toBeGreaterThan(0);
-    expect(compareVersions('1.2.3', '1.2.3')).toBe(0);
-    expect(compareVersions('1.2.4', '1.2.3')).toBeGreaterThan(0);
-  });
-
-  it('puts prereleases below their associated release (semver §11)', () => {
-    expect(compareVersions('0.7.0-rc1', '0.7.0')).toBeLessThan(0);
-    expect(compareVersions('0.7.0', '0.7.0-rc1')).toBeGreaterThan(0);
-  });
-
-  it('compares prereleases by identifier with numeric < alphanumeric', () => {
-    expect(compareVersions('0.7.0-alpha', '0.7.0-beta')).toBeLessThan(0);
-    expect(compareVersions('0.7.0-rc.1', '0.7.0-rc.2')).toBeLessThan(0);
-    expect(compareVersions('0.7.0-rc.2', '0.7.0-rc.10')).toBeLessThan(0);
-    expect(compareVersions('0.7.0-1', '0.7.0-rc')).toBeLessThan(0);
-  });
-
-  it('rejects ill-formed input', () => {
-    expect(() => parseVersion('not a version')).toThrow(/Invalid version/);
-    expect(() => parseVersion('1.2')).toThrow(/Invalid version/);
-    expect(() => parseVersion('1.2.3+build')).toThrow(/Invalid version/);
-    expect(() => compareVersions('1.2.3', '1.x.0')).toThrow(/Invalid version/);
-  });
-});
+import { describe, expect, it } from 'vitest';
+
+import { compareVersions, parseVersion } from '../version.js';
+
+describe('compareVersions', () => {
+  it('orders releases by major/minor/patch', () => {
+    expect(compareVersions('0.6.0', '0.7.0')).toBeLessThan(0);
+    expect(compareVersions('1.0.0', '0.99.99')).toBeGreaterThan(0);
+    expect(compareVersions('1.2.3', '1.2.3')).toBe(0);
+    expect(compareVersions('1.2.4', '1.2.3')).toBeGreaterThan(0);
+  });
+
+  it('puts prereleases below their associated release (semver §11)', () => {
+    expect(compareVersions('0.7.0-rc1', '0.7.0')).toBeLessThan(0);
+    expect(compareVersions('0.7.0', '0.7.0-rc1')).toBeGreaterThan(0);
+  });
+
+  it('compares prereleases by identifier with numeric < alphanumeric', () => {
+    expect(compareVersions('0.7.0-alpha', '0.7.0-beta')).toBeLessThan(0);
+    expect(compareVersions('0.7.0-rc.1', '0.7.0-rc.2')).toBeLessThan(0);
+    expect(compareVersions('0.7.0-rc.2', '0.7.0-rc.10')).toBeLessThan(0);
+    expect(compareVersions('0.7.0-1', '0.7.0-rc')).toBeLessThan(0);
+  });
+
+  it('rejects ill-formed input', () => {
+    expect(() => parseVersion('not a version')).toThrow(/Invalid version/);
+    expect(() => parseVersion('1.2')).toThrow(/Invalid version/);
+    expect(() => parseVersion('1.2.3+build')).toThrow(/Invalid version/);
+    expect(() => compareVersions('1.2.3', '1.x.0')).toThrow(/Invalid version/);
+  });
+});