feat(federation): peering-notifications endpoints + janitor expiry fanout

- GET /api/federation/peering-notifications (?unread=1 filter)
- POST /api/federation/peering-notifications/:id/read (per-row mark-read)
- POST /api/federation/peering-notifications/read-all (bulk mark-read,
  preserves already-read readAt; returns affected count)
- janitor: outbound expired rows fan out kind='expired' notifications
  to each subscriber before cascade-deleting parent (replaces Task 1's
  scaffolding 'continue' guard); inbound expired rows are deleted outright
  (both sides expire independently — no cross-instance network call)
- janitor: 30-day cleanup pass for read notifications
  (cleanupReadPeeringNotifications); unread rows persist indefinitely
- cleanupExpiredApprovalRequests is now sync (no async network IO)

Notes:
- No WS broadcast on janitor expiry — offline users see notifications on
  next GET, matching the persistence guarantee of the notifications table.
- The previous /peer/denied network call on inbound expiry is removed;
  symmetric per-side expiry now handles termination on both sides.

Tests: 12 new (3 + 4 endpoint cases on 3 endpoints; 2 outbound/inbound
janitor expiry cases + 1 not-yet-expired guard + 1 retention sweep);
247 server tests passing total.
This commit is contained in:
Jannis Braun
2026-04-26 22:18:44 +02:00
parent 45ab0ea2c8
commit 86ac54b913
4 changed files with 985 additions and 52 deletions
@@ -0,0 +1,526 @@
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
import Fastify, { type FastifyInstance } from 'fastify';
import Database from 'better-sqlite3';
import { drizzle } from 'drizzle-orm/better-sqlite3';
import { eq } from 'drizzle-orm';
import fs from 'node:fs';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import * as schema from '../db/schema.js';
import { setWorkerId } from '../utils/snowflake.js';
setWorkerId(1);
const __dirname = path.dirname(fileURLToPath(import.meta.url));
type TestDb = ReturnType<typeof drizzle<typeof schema>>;
let sqlite: Database.Database;
let testDb: TestDb;
// The userId set onto request by the mocked authenticate preHandler. Tests
// override this per-case to simulate different authenticated users.
let currentUserId = 'alice';
vi.mock('../db/index.js', () => ({
getDb: () => testDb,
getRawDb: () => sqlite,
schema,
}));
vi.mock('../config.js', () => ({
config: {
domain: 'local.example',
port: 3000,
host: '0.0.0.0',
jwtSecret: 'test-secret-12345678901234567890123456789012',
maxUploadSize: 100 * 1024 * 1024,
registrationOpen: true,
},
}));
vi.mock('../utils/auth.js', () => ({
authenticate: async (req: { userId?: string }) => {
req.userId = currentUserId;
},
requireAdmin: async () => {},
}));
vi.mock('../utils/federationAuth.js', async () => {
const actual = await vi.importActual<typeof import('../utils/federationAuth.js')>('../utils/federationAuth.js');
return {
...actual,
getOurOrigin: () => 'https://local.example',
generateHmacSecret: () => 'mock-generated-secret',
};
});
vi.mock('../ws/handler.js', () => ({
connectionManager: {
sendToAdmins: vi.fn(),
getAllOnlineUserIds: () => [],
sendToUser: vi.fn(),
sendToDmMembers: vi.fn(),
},
}));
vi.mock('../utils/federationPeerActivation.js', () => ({
onPeerActivated: vi.fn(async () => undefined),
onPeerDeactivated: vi.fn(async () => undefined),
}));
function applyMigrations(db: Database.Database): void {
const migrationsDir = path.resolve(__dirname, '../../drizzle');
const files = fs.readdirSync(migrationsDir).filter(f => f.endsWith('.sql')).sort();
for (const f of files) {
const sqlText = fs.readFileSync(path.join(migrationsDir, f), 'utf8');
const statements = sqlText.split(/-->\s*statement-breakpoint/);
for (const stmt of statements) {
const clean = stmt.trim();
if (clean) db.exec(clean);
}
}
}
function seedInstanceSettings(): void {
testDb.insert(schema.instanceSettings).values({
id: 1,
instanceName: 'Local Backspace',
autoAcceptPeering: 0,
registrationOpen: 1,
updatedAt: Date.now(),
}).run();
}
function seedUser(id: string, username: string): void {
testDb.insert(schema.users).values({
id,
username,
passwordHash: 'x',
displayName: username,
createdAt: Date.now(),
}).run();
}
interface SeedNotif {
id: string;
userId: string;
kind: 'approved' | 'denied' | 'expired';
peerOrigin: string;
triggerReason: string;
triggerTarget: string;
createdAt: number;
readAt: number | null;
}
function seedNotification(n: SeedNotif): void {
testDb.insert(schema.peerApprovalNotifications).values({
id: n.id,
userId: n.userId,
kind: n.kind,
peerOrigin: n.peerOrigin,
triggerReason: n.triggerReason,
triggerTarget: n.triggerTarget,
createdAt: n.createdAt,
readAt: n.readAt,
}).run();
}
async function buildApp(): Promise<FastifyInstance> {
const app = Fastify({ logger: false });
const { federationRoutes } = await import('./federation.js');
await app.register(federationRoutes);
await app.ready();
return app;
}
describe('GET /api/federation/peering-notifications', () => {
let app: FastifyInstance;
beforeEach(async () => {
sqlite = new Database(':memory:');
testDb = drizzle(sqlite, { schema });
applyMigrations(sqlite);
seedInstanceSettings();
seedUser('alice', 'alice');
seedUser('bob', 'bob');
currentUserId = 'alice';
app = await buildApp();
});
afterEach(() => {
vi.restoreAllMocks();
sqlite.close();
});
// Test 22: GET → user's rows ordered DESC by createdAt.
it("returns the user's notifications ordered DESC by createdAt", async () => {
const t0 = 1_700_000_000_000;
seedNotification({
id: 'notif-old',
userId: 'alice',
kind: 'approved',
peerOrigin: 'https://orbit.example',
triggerReason: 'friend_add',
triggerTarget: 'someone@orbit.example',
createdAt: t0,
readAt: null,
});
seedNotification({
id: 'notif-new',
userId: 'alice',
kind: 'denied',
peerOrigin: 'https://other.example',
triggerReason: 'space_join',
triggerTarget: 'invite-xyz',
createdAt: t0 + 1_000,
readAt: null,
});
seedNotification({
id: 'notif-mid',
userId: 'alice',
kind: 'expired',
peerOrigin: 'https://third.example',
triggerReason: 'direct_message',
triggerTarget: 'pal@third.example',
createdAt: t0 + 500,
readAt: t0 + 800,
});
const response = await app.inject({
method: 'GET',
url: '/api/federation/peering-notifications',
});
expect(response.statusCode).toBe(200);
const body = response.json() as {
notifications: Array<{
id: string;
userId: string;
kind: string;
peerOrigin: string;
triggerReason: string;
triggerTarget: string;
createdAt: number;
readAt: number | null;
}>;
};
expect(body.notifications).toHaveLength(3);
expect(body.notifications.map(n => n.id)).toEqual(['notif-new', 'notif-mid', 'notif-old']);
// Shape check on the newest row.
expect(body.notifications[0]).toEqual({
id: 'notif-new',
userId: 'alice',
kind: 'denied',
peerOrigin: 'https://other.example',
triggerReason: 'space_join',
triggerTarget: 'invite-xyz',
createdAt: t0 + 1_000,
readAt: null,
});
});
// Test 23: GET ?unread=1 → only readAt IS NULL rows.
it('filters to only unread notifications when ?unread=1', async () => {
const t0 = 1_700_000_000_000;
seedNotification({
id: 'notif-unread-1',
userId: 'alice',
kind: 'approved',
peerOrigin: 'https://a.example',
triggerReason: 'friend_add',
triggerTarget: 'a@a.example',
createdAt: t0,
readAt: null,
});
seedNotification({
id: 'notif-read',
userId: 'alice',
kind: 'denied',
peerOrigin: 'https://b.example',
triggerReason: 'space_join',
triggerTarget: 'invite-y',
createdAt: t0 + 100,
readAt: t0 + 200,
});
seedNotification({
id: 'notif-unread-2',
userId: 'alice',
kind: 'expired',
peerOrigin: 'https://c.example',
triggerReason: 'direct_message',
triggerTarget: 'c@c.example',
createdAt: t0 + 300,
readAt: null,
});
const response = await app.inject({
method: 'GET',
url: '/api/federation/peering-notifications?unread=1',
});
expect(response.statusCode).toBe(200);
const body = response.json() as { notifications: Array<{ id: string; readAt: number | null }> };
expect(body.notifications).toHaveLength(2);
// DESC ordering: unread-2 (newer) before unread-1 (older).
expect(body.notifications.map(n => n.id)).toEqual(['notif-unread-2', 'notif-unread-1']);
for (const n of body.notifications) {
expect(n.readAt).toBeNull();
}
});
// Test 26 (cross-user): GET shows only the requesting user's notifications.
it('does NOT return other users\' notifications', async () => {
seedNotification({
id: 'alice-notif',
userId: 'alice',
kind: 'approved',
peerOrigin: 'https://a.example',
triggerReason: 'friend_add',
triggerTarget: 'a@a.example',
createdAt: 1,
readAt: null,
});
seedNotification({
id: 'bob-notif',
userId: 'bob',
kind: 'denied',
peerOrigin: 'https://b.example',
triggerReason: 'friend_add',
triggerTarget: 'b@b.example',
createdAt: 2,
readAt: null,
});
const response = await app.inject({
method: 'GET',
url: '/api/federation/peering-notifications',
});
expect(response.statusCode).toBe(200);
const body = response.json() as { notifications: Array<{ id: string; userId: string }> };
expect(body.notifications).toHaveLength(1);
expect(body.notifications[0]!.id).toBe('alice-notif');
expect(body.notifications[0]!.userId).toBe('alice');
});
});
describe('POST /api/federation/peering-notifications/:id/read', () => {
let app: FastifyInstance;
beforeEach(async () => {
sqlite = new Database(':memory:');
testDb = drizzle(sqlite, { schema });
applyMigrations(sqlite);
seedInstanceSettings();
seedUser('alice', 'alice');
seedUser('bob', 'bob');
currentUserId = 'alice';
app = await buildApp();
});
afterEach(() => {
vi.restoreAllMocks();
sqlite.close();
});
// Test 24: POST :id/read → sets readAt.
it('marks the notification as read by setting readAt', async () => {
const t0 = 1_700_000_000_000;
seedNotification({
id: 'notif-1',
userId: 'alice',
kind: 'approved',
peerOrigin: 'https://a.example',
triggerReason: 'friend_add',
triggerTarget: 'a@a.example',
createdAt: t0,
readAt: null,
});
const before = Date.now();
const response = await app.inject({
method: 'POST',
url: '/api/federation/peering-notifications/notif-1/read',
});
const after = Date.now();
expect(response.statusCode).toBe(200);
expect(response.json()).toEqual({ success: true });
const row = testDb.select()
.from(schema.peerApprovalNotifications)
.where(eq(schema.peerApprovalNotifications.id, 'notif-1'))
.get();
expect(row).toBeDefined();
expect(row!.readAt).not.toBeNull();
expect(row!.readAt!).toBeGreaterThanOrEqual(before);
expect(row!.readAt!).toBeLessThanOrEqual(after);
});
// Test 26: POST :id/read on another user's notif → 403.
it("returns 403 when the notification belongs to another user; row UNTOUCHED", async () => {
seedNotification({
id: 'bob-notif',
userId: 'bob',
kind: 'denied',
peerOrigin: 'https://b.example',
triggerReason: 'friend_add',
triggerTarget: 'b@b.example',
createdAt: 1,
readAt: null,
});
// currentUserId is alice; row belongs to bob.
const response = await app.inject({
method: 'POST',
url: '/api/federation/peering-notifications/bob-notif/read',
});
expect(response.statusCode).toBe(403);
expect((response.json() as { error: string }).error).toBe('forbidden');
const row = testDb.select()
.from(schema.peerApprovalNotifications)
.where(eq(schema.peerApprovalNotifications.id, 'bob-notif'))
.get();
expect(row!.readAt).toBeNull();
});
// Test 26: POST :id/read on non-existent → 404.
it('returns 404 when the notification does not exist', async () => {
const response = await app.inject({
method: 'POST',
url: '/api/federation/peering-notifications/does-not-exist/read',
});
expect(response.statusCode).toBe(404);
expect((response.json() as { error: string }).error).toBe('notification_not_found');
});
});
describe('POST /api/federation/peering-notifications/read-all', () => {
let app: FastifyInstance;
beforeEach(async () => {
sqlite = new Database(':memory:');
testDb = drizzle(sqlite, { schema });
applyMigrations(sqlite);
seedInstanceSettings();
seedUser('alice', 'alice');
seedUser('bob', 'bob');
currentUserId = 'alice';
app = await buildApp();
});
afterEach(() => {
vi.restoreAllMocks();
sqlite.close();
});
// Test 25: POST read-all → marks all unread as read; returns count.
// Already-read rows are NOT touched (their readAt is preserved).
it('marks the user\'s unread rows as read; preserves already-read readAt; returns affected count', async () => {
const t0 = 1_700_000_000_000;
const ALREADY_READ_AT = t0 + 50;
seedNotification({
id: 'unread-1',
userId: 'alice',
kind: 'approved',
peerOrigin: 'https://a.example',
triggerReason: 'friend_add',
triggerTarget: 'a@a.example',
createdAt: t0,
readAt: null,
});
seedNotification({
id: 'unread-2',
userId: 'alice',
kind: 'denied',
peerOrigin: 'https://b.example',
triggerReason: 'space_join',
triggerTarget: 'invite-y',
createdAt: t0 + 100,
readAt: null,
});
seedNotification({
id: 'already-read',
userId: 'alice',
kind: 'expired',
peerOrigin: 'https://c.example',
triggerReason: 'direct_message',
triggerTarget: 'c@c.example',
createdAt: t0 + 200,
readAt: ALREADY_READ_AT,
});
const before = Date.now();
const response = await app.inject({
method: 'POST',
url: '/api/federation/peering-notifications/read-all',
});
const after = Date.now();
expect(response.statusCode).toBe(200);
expect(response.json()).toEqual({ success: true, count: 2 });
const u1 = testDb.select().from(schema.peerApprovalNotifications)
.where(eq(schema.peerApprovalNotifications.id, 'unread-1')).get();
const u2 = testDb.select().from(schema.peerApprovalNotifications)
.where(eq(schema.peerApprovalNotifications.id, 'unread-2')).get();
const ar = testDb.select().from(schema.peerApprovalNotifications)
.where(eq(schema.peerApprovalNotifications.id, 'already-read')).get();
expect(u1!.readAt).not.toBeNull();
expect(u1!.readAt!).toBeGreaterThanOrEqual(before);
expect(u1!.readAt!).toBeLessThanOrEqual(after);
expect(u2!.readAt).not.toBeNull();
expect(u2!.readAt!).toBeGreaterThanOrEqual(before);
expect(u2!.readAt!).toBeLessThanOrEqual(after);
// already-read row's readAt is preserved (unchanged).
expect(ar!.readAt).toBe(ALREADY_READ_AT);
});
// Test 26: POST read-all only marks the requesting user's rows.
it('does NOT touch other users\' notifications', async () => {
seedNotification({
id: 'alice-unread',
userId: 'alice',
kind: 'approved',
peerOrigin: 'https://a.example',
triggerReason: 'friend_add',
triggerTarget: 'a@a.example',
createdAt: 1,
readAt: null,
});
seedNotification({
id: 'bob-unread',
userId: 'bob',
kind: 'denied',
peerOrigin: 'https://b.example',
triggerReason: 'friend_add',
triggerTarget: 'b@b.example',
createdAt: 2,
readAt: null,
});
const response = await app.inject({
method: 'POST',
url: '/api/federation/peering-notifications/read-all',
});
expect(response.statusCode).toBe(200);
expect(response.json()).toEqual({ success: true, count: 1 });
const aliceRow = testDb.select().from(schema.peerApprovalNotifications)
.where(eq(schema.peerApprovalNotifications.id, 'alice-unread')).get();
const bobRow = testDb.select().from(schema.peerApprovalNotifications)
.where(eq(schema.peerApprovalNotifications.id, 'bob-unread')).get();
expect(aliceRow!.readAt).not.toBeNull();
expect(bobRow!.readAt).toBeNull();
});
});
+86
View File
@@ -1852,6 +1852,92 @@ export async function federationRoutes(app: FastifyInstance): Promise<void> {
},
);
// ─── GET /api/federation/peering-notifications ─────────────────────────────
// User-facing: list the requesting user's terminal-state peering
// notifications (kind='approved'|'denied'|'expired'). Optional ?unread=1
// filter narrows to rows where readAt IS NULL. Ordered DESC by createdAt
// (newest first).
app.get<{ Querystring: { unread?: string } }>(
'/api/federation/peering-notifications',
{ preHandler: [authenticate] },
async (request, reply) => {
const db = getDb();
const userId = request.userId;
const unread = request.query?.unread === '1';
const whereClause = unread
? and(
eq(schema.peerApprovalNotifications.userId, userId),
isNull(schema.peerApprovalNotifications.readAt),
)
: eq(schema.peerApprovalNotifications.userId, userId);
const notifications = db
.select()
.from(schema.peerApprovalNotifications)
.where(whereClause)
.orderBy(desc(schema.peerApprovalNotifications.createdAt))
.all();
return reply.send({ notifications });
},
);
// ─── POST /api/federation/peering-notifications/:id/read ───────────────────
// User-facing: mark a single peering notification as read. Authorization:
// notification.userId must match request.userId.
app.post<{ Params: { id: string } }>(
'/api/federation/peering-notifications/:id/read',
{ preHandler: [authenticate] },
async (request, reply) => {
const db = getDb();
const { id } = request.params;
const userId = request.userId;
const notif = db
.select()
.from(schema.peerApprovalNotifications)
.where(eq(schema.peerApprovalNotifications.id, id))
.get();
if (!notif) {
return reply.code(404).send({ error: 'notification_not_found', statusCode: 404 });
}
if (notif.userId !== userId) {
return reply.code(403).send({ error: 'forbidden', statusCode: 403 });
}
db.update(schema.peerApprovalNotifications)
.set({ readAt: Date.now() })
.where(eq(schema.peerApprovalNotifications.id, id))
.run();
return reply.send({ success: true });
},
);
// ─── POST /api/federation/peering-notifications/read-all ───────────────────
// User-facing: mark all the requesting user's unread peering notifications
// as read. Already-read rows are NOT touched (their readAt is preserved).
// Returns the count of rows affected for UI feedback.
app.post(
'/api/federation/peering-notifications/read-all',
{ preHandler: [authenticate] },
async (request, reply) => {
const db = getDb();
const userId = request.userId;
const result = db
.update(schema.peerApprovalNotifications)
.set({ readAt: Date.now() })
.where(
and(
eq(schema.peerApprovalNotifications.userId, userId),
isNull(schema.peerApprovalNotifications.readAt),
),
)
.run();
return reply.send({ success: true, count: result.changes });
},
);
// ─── POST /api/federation/peers/:id/rotate ──────────────────────────────────
// Admin-only: trigger immediate secret rotation for a peer.
app.post<{ Params: { id: string } }>(