@serfab/cadre-host 0.10.0 → 0.11.0

package/src/server/__tests__/error-handler.test.ts

@@ -1,118 +1,118 @@
-import Fastify, { type FastifyRequest } from 'fastify';
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-
-import { TrustCircleError } from '../../auth/types.js';
-import { NatError } from '../../nat/types.js';
-import { UpdateErrorException } from '../../update/types.js';
-import { GrantError } from '../../donation/types.js';
-import { registerErrorHandler } from '../error-handler.js';
-
-describe('error handler', () => {
-  let app: ReturnType<typeof Fastify>;
-
-  beforeEach(async () => {
-    app = Fastify();
-    registerErrorHandler(app);
-    app.get('/trust/:code', async (req: FastifyRequest) => {
-      const { code } = req.params as { code: string };
-      throw new TrustCircleError(code as never, `trust err: ${code}`);
-    });
-    app.get('/nat/:code', async (req: FastifyRequest) => {
-      const { code } = req.params as { code: string };
-      throw new NatError(code as never, `nat err: ${code}`);
-    });
-    app.get('/update/:code', async (req: FastifyRequest) => {
-      const { code } = req.params as { code: string };
-      throw new UpdateErrorException(code as never, `update err: ${code}`);
-    });
-    app.get('/grant/:code', async (req: FastifyRequest) => {
-      const { code } = req.params as { code: string };
-      throw new GrantError(code as never, `grant err: ${code}`);
-    });
-    app.get('/unknown', async () => {
-      throw new Error('mystery');
-    });
-  });
-
-  afterEach(async () => {
-    await app.close();
-  });
-
-  it('TrustCircleError invalid_label → 400', async () => {
-    const res = await app.inject({ method: 'GET', url: '/trust/invalid_label' });
-    expect(res.statusCode).toBe(400);
-    const body = res.json() as { ok: boolean; error: { code: string; message: string } };
-    expect(body).toEqual({
-      ok: false,
-      error: { code: 'invalid_label', message: 'trust err: invalid_label' },
-    });
-  });
-
-  it('TrustCircleError not_found → 404', async () => {
-    const res = await app.inject({ method: 'GET', url: '/trust/not_found' });
-    expect(res.statusCode).toBe(404);
-  });
-
-  it('TrustCircleError already_redeemed → 404', async () => {
-    const res = await app.inject({ method: 'GET', url: '/trust/already_redeemed' });
-    expect(res.statusCode).toBe(404);
-  });
-
-  it('TrustCircleError expired → 410', async () => {
-    const res = await app.inject({ method: 'GET', url: '/trust/expired' });
-    expect(res.statusCode).toBe(410);
-  });
-
-  it('TrustCircleError storage_error → 500', async () => {
-    const res = await app.inject({ method: 'GET', url: '/trust/storage_error' });
-    expect(res.statusCode).toBe(500);
-  });
-
-  it('NatError invalid_config → 400', async () => {
-    const res = await app.inject({ method: 'GET', url: '/nat/invalid_config' });
-    expect(res.statusCode).toBe(400);
-    const body = res.json() as { error: { code: string } };
-    expect(body.error.code).toBe('invalid_config');
-  });
-
-  it('NatError secrets_unavailable → 500', async () => {
-    const res = await app.inject({ method: 'GET', url: '/nat/secrets_unavailable' });
-    expect(res.statusCode).toBe(500);
-  });
-
-  it('UpdateErrorException apply_in_progress → 409', async () => {
-    const res = await app.inject({ method: 'GET', url: '/update/apply_in_progress' });
-    expect(res.statusCode).toBe(409);
-  });
-
-  it('UpdateErrorException no_update_available → 400', async () => {
-    const res = await app.inject({ method: 'GET', url: '/update/no_update_available' });
-    expect(res.statusCode).toBe(400);
-  });
-
-  it('GrantError invalid_max_nodes → 400', async () => {
-    const res = await app.inject({ method: 'GET', url: '/grant/invalid_max_nodes' });
-    expect(res.statusCode).toBe(400);
-    const body = res.json() as { error: { code: string } };
-    expect(body.error.code).toBe('invalid_max_nodes');
-  });
-
-  it('GrantError not_found → 404', async () => {
-    const res = await app.inject({ method: 'GET', url: '/grant/not_found' });
-    expect(res.statusCode).toBe(404);
-  });
-
-  it('GrantError storage_error → 500', async () => {
-    const res = await app.inject({ method: 'GET', url: '/grant/storage_error' });
-    expect(res.statusCode).toBe(500);
-  });
-
-  it('unknown Error → 500 internal', async () => {
-    const res = await app.inject({ method: 'GET', url: '/unknown' });
-    expect(res.statusCode).toBe(500);
-    const body = res.json() as { ok: boolean; error: { code: string; message: string } };
-    expect(body.ok).toBe(false);
-    expect(body.error.code).toBe('internal');
-    expect(body.error.message).toBe('mystery');
-  });
-});
+import Fastify, { type FastifyRequest } from 'fastify';
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+
+import { TrustCircleError } from '../../auth/types.js';
+import { NatError } from '../../nat/types.js';
+import { UpdateErrorException } from '../../update/types.js';
+import { GrantError } from '../../donation/types.js';
+import { registerErrorHandler } from '../error-handler.js';
+
+describe('error handler', () => {
+  let app: ReturnType<typeof Fastify>;
+
+  beforeEach(async () => {
+    app = Fastify();
+    registerErrorHandler(app);
+    app.get('/trust/:code', async (req: FastifyRequest) => {
+      const { code } = req.params as { code: string };
+      throw new TrustCircleError(code as never, `trust err: ${code}`);
+    });
+    app.get('/nat/:code', async (req: FastifyRequest) => {
+      const { code } = req.params as { code: string };
+      throw new NatError(code as never, `nat err: ${code}`);
+    });
+    app.get('/update/:code', async (req: FastifyRequest) => {
+      const { code } = req.params as { code: string };
+      throw new UpdateErrorException(code as never, `update err: ${code}`);
+    });
+    app.get('/grant/:code', async (req: FastifyRequest) => {
+      const { code } = req.params as { code: string };
+      throw new GrantError(code as never, `grant err: ${code}`);
+    });
+    app.get('/unknown', async () => {
+      throw new Error('mystery');
+    });
+  });
+
+  afterEach(async () => {
+    await app.close();
+  });
+
+  it('TrustCircleError invalid_label → 400', async () => {
+    const res = await app.inject({ method: 'GET', url: '/trust/invalid_label' });
+    expect(res.statusCode).toBe(400);
+    const body = res.json() as { ok: boolean; error: { code: string; message: string } };
+    expect(body).toEqual({
+      ok: false,
+      error: { code: 'invalid_label', message: 'trust err: invalid_label' },
+    });
+  });
+
+  it('TrustCircleError not_found → 404', async () => {
+    const res = await app.inject({ method: 'GET', url: '/trust/not_found' });
+    expect(res.statusCode).toBe(404);
+  });
+
+  it('TrustCircleError already_redeemed → 404', async () => {
+    const res = await app.inject({ method: 'GET', url: '/trust/already_redeemed' });
+    expect(res.statusCode).toBe(404);
+  });
+
+  it('TrustCircleError expired → 410', async () => {
+    const res = await app.inject({ method: 'GET', url: '/trust/expired' });
+    expect(res.statusCode).toBe(410);
+  });
+
+  it('TrustCircleError storage_error → 500', async () => {
+    const res = await app.inject({ method: 'GET', url: '/trust/storage_error' });
+    expect(res.statusCode).toBe(500);
+  });
+
+  it('NatError invalid_config → 400', async () => {
+    const res = await app.inject({ method: 'GET', url: '/nat/invalid_config' });
+    expect(res.statusCode).toBe(400);
+    const body = res.json() as { error: { code: string } };
+    expect(body.error.code).toBe('invalid_config');
+  });
+
+  it('NatError secrets_unavailable → 500', async () => {
+    const res = await app.inject({ method: 'GET', url: '/nat/secrets_unavailable' });
+    expect(res.statusCode).toBe(500);
+  });
+
+  it('UpdateErrorException apply_in_progress → 409', async () => {
+    const res = await app.inject({ method: 'GET', url: '/update/apply_in_progress' });
+    expect(res.statusCode).toBe(409);
+  });
+
+  it('UpdateErrorException no_update_available → 400', async () => {
+    const res = await app.inject({ method: 'GET', url: '/update/no_update_available' });
+    expect(res.statusCode).toBe(400);
+  });
+
+  it('GrantError invalid_max_nodes → 400', async () => {
+    const res = await app.inject({ method: 'GET', url: '/grant/invalid_max_nodes' });
+    expect(res.statusCode).toBe(400);
+    const body = res.json() as { error: { code: string } };
+    expect(body.error.code).toBe('invalid_max_nodes');
+  });
+
+  it('GrantError not_found → 404', async () => {
+    const res = await app.inject({ method: 'GET', url: '/grant/not_found' });
+    expect(res.statusCode).toBe(404);
+  });
+
+  it('GrantError storage_error → 500', async () => {
+    const res = await app.inject({ method: 'GET', url: '/grant/storage_error' });
+    expect(res.statusCode).toBe(500);
+  });
+
+  it('unknown Error → 500 internal', async () => {
+    const res = await app.inject({ method: 'GET', url: '/unknown' });
+    expect(res.statusCode).toBe(500);
+    const body = res.json() as { ok: boolean; error: { code: string; message: string } };
+    expect(body.ok).toBe(false);
+    expect(body.error.code).toBe('internal');
+    expect(body.error.message).toBe('mystery');
+  });
+});

package/src/server/__tests__/grants-admin-route.test.ts

@@ -1,73 +1,73 @@
-import Fastify from 'fastify';
-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 { registerErrorHandler } from '../error-handler.js';
-import { registerGrantsAdminRoutes } from '../routes/grants-admin.js';
-import { GrantService, GrantStore, createGrantAdminHandlers } from '../../donation/index.js';
-import type { Grant } from '../../donation/index.js';
-
-let tmpRoot: string;
-let app: ReturnType<typeof Fastify>;
-
-beforeEach(() => {
-  tmpRoot = mkdtempSync(join(tmpdir(), 'cadre-host-grants-route-'));
-  const service = new GrantService({ store: new GrantStore(tmpRoot) });
-  app = Fastify();
-  registerErrorHandler(app);
-  registerGrantsAdminRoutes(app, { handlers: createGrantAdminHandlers(service) });
-});
-
-afterEach(async () => {
-  await app.close();
-  try { rmSync(tmpRoot, { recursive: true, force: true }); } catch { /* ignore */ }
-});
-
-describe('/grants-admin routes', () => {
-  it('POST issues a grant, GET lists it, DELETE revokes it', async () => {
-    const post = await app.inject({
-      method: 'POST',
-      url: '/grants-admin',
-      payload: { label: "Alice's cadre", maxNodes: 2 },
-    });
-    expect(post.statusCode).toBe(200);
-    const created = (post.json() as { grant: Grant }).grant;
-    expect(created.token).toBeTruthy();
-    expect(created.maxNodes).toBe(2);
-
-    const list = await app.inject({ method: 'GET', url: '/grants-admin' });
-    expect(list.statusCode).toBe(200);
-    expect((list.json() as { grants: Grant[] }).grants.map(g => g.token)).toContain(created.token);
-
-    const del = await app.inject({
-      method: 'DELETE',
-      url: `/grants-admin/${encodeURIComponent(created.token)}`,
-    });
-    expect(del.statusCode).toBe(200);
-
-    // Revoked → still listed, now carries revokedAt.
-    const after = await app.inject({ method: 'GET', url: '/grants-admin' });
-    const row = (after.json() as { grants: Grant[] }).grants.find(g => g.token === created.token);
-    expect(row?.revokedAt).toBeTruthy();
-  });
-
-  it('POST with an empty label → 400 invalid_label', async () => {
-    const res = await app.inject({ method: 'POST', url: '/grants-admin', payload: { label: '  ' } });
-    expect(res.statusCode).toBe(400);
-    expect((res.json() as { error: { code: string } }).error.code).toBe('invalid_label');
-  });
-
-  it('POST with a bad maxNodes → 400 invalid_max_nodes', async () => {
-    const res = await app.inject({ method: 'POST', url: '/grants-admin', payload: { label: 'X', maxNodes: 0 } });
-    expect(res.statusCode).toBe(400);
-    expect((res.json() as { error: { code: string } }).error.code).toBe('invalid_max_nodes');
-  });
-
-  it('DELETE of an unknown token → 404 not_found', async () => {
-    const res = await app.inject({ method: 'DELETE', url: '/grants-admin/nope' });
-    expect(res.statusCode).toBe(404);
-    expect((res.json() as { error: { code: string } }).error.code).toBe('not_found');
-  });
-});
+import Fastify from 'fastify';
+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 { registerErrorHandler } from '../error-handler.js';
+import { registerGrantsAdminRoutes } from '../routes/grants-admin.js';
+import { GrantService, GrantStore, createGrantAdminHandlers } from '../../donation/index.js';
+import type { Grant } from '../../donation/index.js';
+
+let tmpRoot: string;
+let app: ReturnType<typeof Fastify>;
+
+beforeEach(() => {
+  tmpRoot = mkdtempSync(join(tmpdir(), 'cadre-host-grants-route-'));
+  const service = new GrantService({ store: new GrantStore(tmpRoot) });
+  app = Fastify();
+  registerErrorHandler(app);
+  registerGrantsAdminRoutes(app, { handlers: createGrantAdminHandlers(service) });
+});
+
+afterEach(async () => {
+  await app.close();
+  try { rmSync(tmpRoot, { recursive: true, force: true }); } catch { /* ignore */ }
+});
+
+describe('/grants-admin routes', () => {
+  it('POST issues a grant, GET lists it, DELETE revokes it', async () => {
+    const post = await app.inject({
+      method: 'POST',
+      url: '/grants-admin',
+      payload: { label: "Alice's cadre", maxNodes: 2 },
+    });
+    expect(post.statusCode).toBe(200);
+    const created = (post.json() as { grant: Grant }).grant;
+    expect(created.token).toBeTruthy();
+    expect(created.maxNodes).toBe(2);
+
+    const list = await app.inject({ method: 'GET', url: '/grants-admin' });
+    expect(list.statusCode).toBe(200);
+    expect((list.json() as { grants: Grant[] }).grants.map(g => g.token)).toContain(created.token);
+
+    const del = await app.inject({
+      method: 'DELETE',
+      url: `/grants-admin/${encodeURIComponent(created.token)}`,
+    });
+    expect(del.statusCode).toBe(200);
+
+    // Revoked → still listed, now carries revokedAt.
+    const after = await app.inject({ method: 'GET', url: '/grants-admin' });
+    const row = (after.json() as { grants: Grant[] }).grants.find(g => g.token === created.token);
+    expect(row?.revokedAt).toBeTruthy();
+  });
+
+  it('POST with an empty label → 400 invalid_label', async () => {
+    const res = await app.inject({ method: 'POST', url: '/grants-admin', payload: { label: '  ' } });
+    expect(res.statusCode).toBe(400);
+    expect((res.json() as { error: { code: string } }).error.code).toBe('invalid_label');
+  });
+
+  it('POST with a bad maxNodes → 400 invalid_max_nodes', async () => {
+    const res = await app.inject({ method: 'POST', url: '/grants-admin', payload: { label: 'X', maxNodes: 0 } });
+    expect(res.statusCode).toBe(400);
+    expect((res.json() as { error: { code: string } }).error.code).toBe('invalid_max_nodes');
+  });
+
+  it('DELETE of an unknown token → 404 not_found', async () => {
+    const res = await app.inject({ method: 'DELETE', url: '/grants-admin/nope' });
+    expect(res.statusCode).toBe(404);
+    expect((res.json() as { error: { code: string } }).error.code).toBe('not_found');
+  });
+});