@walkhi/code-relax 0.1.0-beta.65 → 0.1.0-beta.68

package/dist/src/self-relay/admin-server.mjs

@@ -1,105 +1,105 @@
-import http from 'node:http';
-import fs from 'node:fs';
-import { adminPage } from './admin-page.mjs';
-import { startAdminCloud } from './admin-cloud.mjs';
-import { MAX_ADMIN_REQUEST_BYTES } from './admin-state.mjs';
-import { createAdminAuth } from './admin-auth.mjs';
-import { adminLoginPage } from './admin-login-page.mjs';
-import endpoints from '../../shared/service-endpoints.cjs';
-
-function reply(response, status, body, type = 'application/json; charset=utf-8') {
-  const bytes = typeof body === 'string' ? body : JSON.stringify(body);
-  response.writeHead(status, { 'Content-Type': type, 'Content-Length': Buffer.byteLength(bytes),
-    'Cache-Control': 'no-store', 'X-Content-Type-Options': 'nosniff',
-    'Referrer-Policy': 'no-referrer', 'X-Robots-Tag': 'noindex, nofollow', 'X-Frame-Options': 'DENY' });
-  response.end(bytes);
-}
-
-async function readBody(request) {
-  const chunks = [];
-  let size = 0;
-  for await (const chunk of request) {
-    size += chunk.length;
-    if (size > MAX_ADMIN_REQUEST_BYTES) throw Object.assign(new Error('Admin request too large'), { status: 413 });
-    chunks.push(chunk);
-  }
-  return Buffer.concat(chunks);
-}
-
-export async function startAdminServer({ port = 45851, relayUrl = 'http://127.0.0.1:45850', accessFile = '/etc/codex-relay/admin-access.json',
-  passwordFile = '/etc/codex-relay/admin-password.json', publicOrigin = endpoints.adminOrigin } = {}) {
-  const { key } = JSON.parse(fs.readFileSync(accessFile, 'utf8'));
-  if (!/^[A-Za-z0-9_-]{43}$/.test(key)) throw new Error('Invalid admin access key');
-  const auth = createAdminAuth(passwordFile);
-  const cloud = startAdminCloud();
-  const relayOrigin = new URL(relayUrl);
-  if (relayOrigin.hostname !== '127.0.0.1' || relayOrigin.protocol !== 'http:' || relayOrigin.pathname !== '/') {
-    cloud.close(); throw new Error('Admin relay endpoint must be loopback HTTP');
-  }
-  const server = http.createServer(async (request, response) => {
-    const target = new URL(request.url || '/', 'http://localhost');
-    if (request.method === 'GET' && target.pathname === '/admin/health') { reply(response, 200, { ok: true }); return; }
-    if (!['GET', 'HEAD'].includes(request.method) && (request.headers.origin !== publicOrigin
-      || request.headers['sec-fetch-site'] === 'cross-site' || request.headers['x-code-relax-admin'] !== '1')) {
-      reply(response, 403, { error: 'Cross-site request rejected' }); return;
-    }
-    if (request.method === 'GET' && target.pathname === '/') {
-      reply(response, 200, auth.authenticated(request) ? adminPage() : adminLoginPage(), 'text/html; charset=utf-8'); return;
-    }
-    if (request.method === 'GET' && ['/admin', '/admin/'].includes(target.pathname)) {
-      response.writeHead(303, { Location: '/', 'Cache-Control': 'no-store' }); response.end(); return;
-    }
-    if (request.method === 'POST' && target.pathname === '/admin/login') {
-      try {
-        if (request.headers['content-type']?.split(';')[0] !== 'application/json') {
-          reply(response, 415, { error: 'Expected application/json' }); return;
-        }
-        const { password } = JSON.parse((await readBody(request)).toString('utf8'));
-        const result = await auth.login(password, request, response);
-        reply(response, result.status, result.error ? { error: result.error } : { ok: true });
-      } catch (error) {
-        const status = error.status || (error instanceof SyntaxError || error instanceof TypeError ? 400 : 500);
-        if (status === 500) console.error('Admin login failed:', error.message);
-        reply(response, status, { error: status === 500 ? '登录服务暂不可用' : '登录请求无效' });
-      }
-      return;
-    }
-    if (request.method === 'POST' && target.pathname === '/admin/logout') {
-      auth.logout(request, response); reply(response, 200, { ok: true }); return;
-    }
-    if (!target.pathname.startsWith('/admin/api/')) { reply(response, 404, { error: 'Not found' }); return; }
-    if (!auth.authenticated(request)) { reply(response, 401, { error: '登录已过期，请重新登录' }); return; }
-    if (request.method === 'GET' && (['/admin/api/status', '/admin/api/usage', '/admin/api/usage-diagnostics',
-      '/admin/api/workstations'].includes(target.pathname) || /^\/admin\/api\/workstations\/[\w-]{16,128}$/.test(target.pathname))) {
-      try {
-        const upstream = await fetch(new URL(target.pathname + target.search, relayOrigin), {
-          signal: AbortSignal.timeout(3000), headers: { 'X-Code-Relax-Admin-Key': key } });
-        const state = await upstream.json();
-        if (!upstream.ok) { reply(response, upstream.status, state); return; }
-        reply(response, 200, target.pathname === '/admin/api/status'
-          ? { ...state, relayAvailable: true, cloud: cloud.read() } : state);
-      } catch {
-        reply(response, 503, { error: '中继服务暂不可用' });
-      }
-      return;
-    }
-    if (!target.pathname.startsWith('/admin/api/') || !['PUT', 'DELETE', 'POST'].includes(request.method || '')) {
-      reply(response, 404, { error: 'Not found' }); return;
-    }
-    try {
-      const body = await readBody(request);
-      const upstream = await fetch(new URL(target.pathname + target.search, relayOrigin), {
-        method: request.method, signal: AbortSignal.timeout(3000),
-        headers: { 'Content-Type': request.headers['content-type'] || '',
-          'X-Code-Relax-Admin': request.headers['x-code-relax-admin'] || '',
-          'X-Code-Relax-Admin-Key': key },
-        body,
-      });
-      reply(response, upstream.status, await upstream.text());
-    } catch (error) { reply(response, error.status || 503, { error: error.status === 413 ? error.message : '中继服务暂不可用' }); }
-  });
-  try {
-    await new Promise((resolve, reject) => { server.once('error', reject); server.listen(port, '127.0.0.1', resolve); });
-  } catch (error) { cloud.close(); throw error; }
-  return { port: server.address().port, async close() { cloud.close(); await new Promise(resolve => server.close(resolve)); } };
-}
+import http from 'node:http';
+import fs from 'node:fs';
+import { adminPage } from './admin-page.mjs';
+import { startAdminCloud } from './admin-cloud.mjs';
+import { MAX_ADMIN_REQUEST_BYTES } from './admin-state.mjs';
+import { createAdminAuth } from './admin-auth.mjs';
+import { adminLoginPage } from './admin-login-page.mjs';
+import endpoints from '../../shared/service-endpoints.cjs';
+
+function reply(response, status, body, type = 'application/json; charset=utf-8') {
+  const bytes = typeof body === 'string' ? body : JSON.stringify(body);
+  response.writeHead(status, { 'Content-Type': type, 'Content-Length': Buffer.byteLength(bytes),
+    'Cache-Control': 'no-store', 'X-Content-Type-Options': 'nosniff',
+    'Referrer-Policy': 'no-referrer', 'X-Robots-Tag': 'noindex, nofollow', 'X-Frame-Options': 'DENY' });
+  response.end(bytes);
+}
+
+async function readBody(request) {
+  const chunks = [];
+  let size = 0;
+  for await (const chunk of request) {
+    size += chunk.length;
+    if (size > MAX_ADMIN_REQUEST_BYTES) throw Object.assign(new Error('Admin request too large'), { status: 413 });
+    chunks.push(chunk);
+  }
+  return Buffer.concat(chunks);
+}
+
+export async function startAdminServer({ port = 45851, relayUrl = 'http://127.0.0.1:45850', accessFile = '/etc/codex-relay/admin-access.json',
+  passwordFile = '/etc/codex-relay/admin-password.json', publicOrigin = endpoints.adminOrigin } = {}) {
+  const { key } = JSON.parse(fs.readFileSync(accessFile, 'utf8'));
+  if (!/^[A-Za-z0-9_-]{43}$/.test(key)) throw new Error('Invalid admin access key');
+  const auth = createAdminAuth(passwordFile);
+  const cloud = startAdminCloud();
+  const relayOrigin = new URL(relayUrl);
+  if (relayOrigin.hostname !== '127.0.0.1' || relayOrigin.protocol !== 'http:' || relayOrigin.pathname !== '/') {
+    cloud.close(); throw new Error('Admin relay endpoint must be loopback HTTP');
+  }
+  const server = http.createServer(async (request, response) => {
+    const target = new URL(request.url || '/', 'http://localhost');
+    if (request.method === 'GET' && target.pathname === '/admin/health') { reply(response, 200, { ok: true }); return; }
+    if (!['GET', 'HEAD'].includes(request.method) && (request.headers.origin !== publicOrigin
+      || request.headers['sec-fetch-site'] === 'cross-site' || request.headers['x-code-relax-admin'] !== '1')) {
+      reply(response, 403, { error: 'Cross-site request rejected' }); return;
+    }
+    if (request.method === 'GET' && target.pathname === '/') {
+      reply(response, 200, auth.authenticated(request) ? adminPage() : adminLoginPage(), 'text/html; charset=utf-8'); return;
+    }
+    if (request.method === 'GET' && ['/admin', '/admin/'].includes(target.pathname)) {
+      response.writeHead(303, { Location: '/', 'Cache-Control': 'no-store' }); response.end(); return;
+    }
+    if (request.method === 'POST' && target.pathname === '/admin/login') {
+      try {
+        if (request.headers['content-type']?.split(';')[0] !== 'application/json') {
+          reply(response, 415, { error: 'Expected application/json' }); return;
+        }
+        const { password } = JSON.parse((await readBody(request)).toString('utf8'));
+        const result = await auth.login(password, request, response);
+        reply(response, result.status, result.error ? { error: result.error } : { ok: true });
+      } catch (error) {
+        const status = error.status || (error instanceof SyntaxError || error instanceof TypeError ? 400 : 500);
+        if (status === 500) console.error('Admin login failed:', error.message);
+        reply(response, status, { error: status === 500 ? '登录服务暂不可用' : '登录请求无效' });
+      }
+      return;
+    }
+    if (request.method === 'POST' && target.pathname === '/admin/logout') {
+      auth.logout(request, response); reply(response, 200, { ok: true }); return;
+    }
+    if (!target.pathname.startsWith('/admin/api/')) { reply(response, 404, { error: 'Not found' }); return; }
+    if (!auth.authenticated(request)) { reply(response, 401, { error: '登录已过期，请重新登录' }); return; }
+    if (request.method === 'GET' && (['/admin/api/status', '/admin/api/usage', '/admin/api/usage-diagnostics',
+      '/admin/api/workstations'].includes(target.pathname) || /^\/admin\/api\/workstations\/[\w-]{16,128}$/.test(target.pathname))) {
+      try {
+        const upstream = await fetch(new URL(target.pathname + target.search, relayOrigin), {
+          signal: AbortSignal.timeout(3000), headers: { 'X-Code-Relax-Admin-Key': key } });
+        const state = await upstream.json();
+        if (!upstream.ok) { reply(response, upstream.status, state); return; }
+        reply(response, 200, target.pathname === '/admin/api/status'
+          ? { ...state, relayAvailable: true, cloud: cloud.read() } : state);
+      } catch {
+        reply(response, 503, { error: '中继服务暂不可用' });
+      }
+      return;
+    }
+    if (!target.pathname.startsWith('/admin/api/') || !['PUT', 'DELETE', 'POST'].includes(request.method || '')) {
+      reply(response, 404, { error: 'Not found' }); return;
+    }
+    try {
+      const body = await readBody(request);
+      const upstream = await fetch(new URL(target.pathname + target.search, relayOrigin), {
+        method: request.method, signal: AbortSignal.timeout(3000),
+        headers: { 'Content-Type': request.headers['content-type'] || '',
+          'X-Code-Relax-Admin': request.headers['x-code-relax-admin'] || '',
+          'X-Code-Relax-Admin-Key': key },
+        body,
+      });
+      reply(response, upstream.status, await upstream.text());
+    } catch (error) { reply(response, error.status || 503, { error: error.status === 413 ? error.message : '中继服务暂不可用' }); }
+  });
+  try {
+    await new Promise((resolve, reject) => { server.once('error', reject); server.listen(port, '127.0.0.1', resolve); });
+  } catch (error) { cloud.close(); throw error; }
+  return { port: server.address().port, async close() { cloud.close(); await new Promise(resolve => server.close(resolve)); } };
+}

package/dist/src/self-relay/admin-state.mjs

@@ -1,127 +1,127 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { randomUUID } from 'node:crypto';
-
-// 80 title + 2000 body UTF-16 units fit even when every unit uses a six-byte JSON escape.
-export const MAX_ADMIN_REQUEST_BYTES = 16 * 1024;
-
-export function relayAdminState(file, initialMaxRelaySessions, { initial, persist } = {}) {
-  let value = initial ? validate(initial) : { version: 3, maxRelaySessions: initialMaxRelaySessions, announcement: null, announcements: [] };
-  if (file && fs.existsSync(file)) value = validate(JSON.parse(fs.readFileSync(file, 'utf8')));
-
-  async function save(next) {
-    const validated = validate(next);
-    if (persist) await persist(validated);
-    if (!file) { value = validated; return value; }
-    fs.mkdirSync(path.dirname(file), { recursive: true, mode: 0o700 });
-    const temporary = `${file}.${randomUUID()}.tmp`;
-    let descriptor;
-    try {
-      descriptor = fs.openSync(temporary, 'wx', 0o600);
-      fs.writeFileSync(descriptor, JSON.stringify(validated));
-      fs.fsyncSync(descriptor); fs.closeSync(descriptor); descriptor = undefined;
-      fs.renameSync(temporary, file);
-      if (process.platform !== 'win32') {
-        const directory = fs.openSync(path.dirname(file), 'r');
-        try { fs.fsyncSync(directory); } finally { fs.closeSync(directory); }
-      }
-    } finally {
-      if (descriptor !== undefined) fs.closeSync(descriptor);
-      fs.rmSync(temporary, { force: true });
-    }
-    value = validated;
-    return value;
-  }
-
-  return {
-    read: () => structuredClone(value),
-    setMaxRelaySessions(maxRelaySessions) { return save({ ...value, maxRelaySessions }); },
-    createAnnouncement(title, message, publish = false) {
-      const now = new Date().toISOString();
-      const record = { id: randomUUID(), title: clean(title, 80), message: clean(message, 2000),
-        createdAt: now, updatedAt: now, publishedAt: publish ? now : null, status: publish ? 'active' : 'draft' };
-      const announcements = value.announcements.map(item => publish && item.status === 'active'
-        ? { ...item, status: 'withdrawn', updatedAt: now } : item);
-      return save({ ...value, announcement: publish ? publicAnnouncement(record) : value.announcement,
-        announcements: [record, ...announcements] });
-    },
-    updateDraft(id, title, message) {
-      const existing = value.announcements.find(item => item.id === id);
-      if (!existing || existing.status !== 'draft') throw new Error('Only drafts can be edited');
-      return save({ ...value, announcements: value.announcements.map(item => item.id === id
-        ? { ...item, title: clean(title, 80), message: clean(message, 2000), updatedAt: new Date().toISOString() } : item) });
-    },
-    publishDraft(id, title, message) {
-      const existing = value.announcements.find(item => item.id === id);
-      if (!existing || existing.status !== 'draft') throw new Error('Only drafts can be published');
-      const now = new Date().toISOString();
-      const published = { ...existing, title: title === undefined ? existing.title : clean(title, 80),
-        message: message === undefined ? existing.message : clean(message, 2000),
-        publishedAt: now, updatedAt: now, status: 'active' };
-      return save({ ...value, announcement: publicAnnouncement(published),
-        announcements: value.announcements.map(item => item.id === id ? published : item.status === 'active'
-          ? { ...item, status: 'withdrawn', updatedAt: now } : item) });
-    },
-    withdraw(id) {
-      if (!value.announcement || value.announcement.id !== id) throw new Error('Announcement is no longer active');
-      const now = new Date().toISOString();
-      return save({ ...value, announcement: null, announcements: value.announcements.map(item => item.status === 'active'
-        ? { ...item, status: 'withdrawn', updatedAt: now } : item) });
-    },
-    deleteAnnouncement(id) {
-      if (typeof id !== 'string' || !value.announcements.some(item => item.id === id)) throw new Error('Announcement not found');
-      if (value.announcement?.id === id) throw new Error('Withdraw the current announcement before deleting it');
-      return save({ ...value, announcements: value.announcements.filter(item => item.id !== id) });
-    },
-  };
-}
-
-function validate(source) {
-  if (!source || ![1, 2, 3].includes(source.version) || !Number.isSafeInteger(source.maxRelaySessions) ||
-      source.maxRelaySessions < 1 || source.maxRelaySessions > 256) throw new Error('Invalid relay admin state');
-  const announcement = source.announcement == null ? null : validateAnnouncement(source.announcement);
-  const announcements = source.version === 1 ? (announcement ? [announcement] : []) : source.announcements;
-  if (!Array.isArray(announcements)) throw new Error('Invalid relay announcement history');
-  const validated = source.version === 3 ? announcements.map(validateRecord) : announcements.map(item => {
-    const old = validateAnnouncement(item);
-    return { ...old, createdAt: old.publishedAt, updatedAt: old.publishedAt,
-      status: old.id === announcement?.id ? 'active' : 'withdrawn' };
-  });
-  const active = validated.filter(item => item.status === 'active');
-  if (new Set(validated.map(item => item.id)).size !== validated.length || active.length > 1 ||
-      (active.length === 0) !== (announcement === null) ||
-      (announcement && !active.some(item => item.id === announcement.id &&
-        item.title === announcement.title && item.message === announcement.message && item.publishedAt === announcement.publishedAt))) {
-    throw new Error('Invalid relay announcement history');
-  }
-  return { version: 3, maxRelaySessions: source.maxRelaySessions, announcement, announcements: validated };
-}
-
-function validateAnnouncement(item) {
-  if (!item || !/^[\w-]{16,128}$/.test(item.id) || typeof item.publishedAt !== 'string' ||
-      !Number.isFinite(Date.parse(item.publishedAt))) throw new Error('Invalid relay announcement');
-  return { id: item.id, title: clean(item.title, 80), message: clean(item.message, 2000), publishedAt: item.publishedAt };
-}
-
-function validateRecord(item) {
-  if (!item || !/^[\w-]{16,128}$/.test(item.id) || !['draft', 'active', 'withdrawn'].includes(item.status) ||
-      typeof item.createdAt !== 'string' || !Number.isFinite(Date.parse(item.createdAt)) ||
-      typeof item.updatedAt !== 'string' || !Number.isFinite(Date.parse(item.updatedAt)) ||
-      (item.status === 'draft' ? item.publishedAt !== null :
-        typeof item.publishedAt !== 'string' || !Number.isFinite(Date.parse(item.publishedAt)))) {
-    throw new Error('Invalid relay announcement record');
-  }
-  return { id: item.id, title: clean(item.title, 80), message: clean(item.message, 2000),
-    createdAt: item.createdAt, updatedAt: item.updatedAt, publishedAt: item.publishedAt, status: item.status };
-}
-
-function publicAnnouncement(record) {
-  return { id: record.id, title: record.title, message: record.message, publishedAt: record.publishedAt };
-}
-
-function clean(value, limit) {
-  if (typeof value !== 'string' || !value.trim() || value.trim().length > limit || /[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/.test(value)) {
-    throw new Error('Invalid announcement text');
-  }
-  return value.trim();
-}
+import fs from 'node:fs';
+import path from 'node:path';
+import { randomUUID } from 'node:crypto';
+
+// 80 title + 2000 body UTF-16 units fit even when every unit uses a six-byte JSON escape.
+export const MAX_ADMIN_REQUEST_BYTES = 16 * 1024;
+
+export function relayAdminState(file, initialMaxRelaySessions, { initial, persist } = {}) {
+  let value = initial ? validate(initial) : { version: 3, maxRelaySessions: initialMaxRelaySessions, announcement: null, announcements: [] };
+  if (file && fs.existsSync(file)) value = validate(JSON.parse(fs.readFileSync(file, 'utf8')));
+
+  async function save(next) {
+    const validated = validate(next);
+    if (persist) await persist(validated);
+    if (!file) { value = validated; return value; }
+    fs.mkdirSync(path.dirname(file), { recursive: true, mode: 0o700 });
+    const temporary = `${file}.${randomUUID()}.tmp`;
+    let descriptor;
+    try {
+      descriptor = fs.openSync(temporary, 'wx', 0o600);
+      fs.writeFileSync(descriptor, JSON.stringify(validated));
+      fs.fsyncSync(descriptor); fs.closeSync(descriptor); descriptor = undefined;
+      fs.renameSync(temporary, file);
+      if (process.platform !== 'win32') {
+        const directory = fs.openSync(path.dirname(file), 'r');
+        try { fs.fsyncSync(directory); } finally { fs.closeSync(directory); }
+      }
+    } finally {
+      if (descriptor !== undefined) fs.closeSync(descriptor);
+      fs.rmSync(temporary, { force: true });
+    }
+    value = validated;
+    return value;
+  }
+
+  return {
+    read: () => structuredClone(value),
+    setMaxRelaySessions(maxRelaySessions) { return save({ ...value, maxRelaySessions }); },
+    createAnnouncement(title, message, publish = false) {
+      const now = new Date().toISOString();
+      const record = { id: randomUUID(), title: clean(title, 80), message: clean(message, 2000),
+        createdAt: now, updatedAt: now, publishedAt: publish ? now : null, status: publish ? 'active' : 'draft' };
+      const announcements = value.announcements.map(item => publish && item.status === 'active'
+        ? { ...item, status: 'withdrawn', updatedAt: now } : item);
+      return save({ ...value, announcement: publish ? publicAnnouncement(record) : value.announcement,
+        announcements: [record, ...announcements] });
+    },
+    updateDraft(id, title, message) {
+      const existing = value.announcements.find(item => item.id === id);
+      if (!existing || existing.status !== 'draft') throw new Error('Only drafts can be edited');
+      return save({ ...value, announcements: value.announcements.map(item => item.id === id
+        ? { ...item, title: clean(title, 80), message: clean(message, 2000), updatedAt: new Date().toISOString() } : item) });
+    },
+    publishDraft(id, title, message) {
+      const existing = value.announcements.find(item => item.id === id);
+      if (!existing || existing.status !== 'draft') throw new Error('Only drafts can be published');
+      const now = new Date().toISOString();
+      const published = { ...existing, title: title === undefined ? existing.title : clean(title, 80),
+        message: message === undefined ? existing.message : clean(message, 2000),
+        publishedAt: now, updatedAt: now, status: 'active' };
+      return save({ ...value, announcement: publicAnnouncement(published),
+        announcements: value.announcements.map(item => item.id === id ? published : item.status === 'active'
+          ? { ...item, status: 'withdrawn', updatedAt: now } : item) });
+    },
+    withdraw(id) {
+      if (!value.announcement || value.announcement.id !== id) throw new Error('Announcement is no longer active');
+      const now = new Date().toISOString();
+      return save({ ...value, announcement: null, announcements: value.announcements.map(item => item.status === 'active'
+        ? { ...item, status: 'withdrawn', updatedAt: now } : item) });
+    },
+    deleteAnnouncement(id) {
+      if (typeof id !== 'string' || !value.announcements.some(item => item.id === id)) throw new Error('Announcement not found');
+      if (value.announcement?.id === id) throw new Error('Withdraw the current announcement before deleting it');
+      return save({ ...value, announcements: value.announcements.filter(item => item.id !== id) });
+    },
+  };
+}
+
+function validate(source) {
+  if (!source || ![1, 2, 3].includes(source.version) || !Number.isSafeInteger(source.maxRelaySessions) ||
+      source.maxRelaySessions < 1 || source.maxRelaySessions > 256) throw new Error('Invalid relay admin state');
+  const announcement = source.announcement == null ? null : validateAnnouncement(source.announcement);
+  const announcements = source.version === 1 ? (announcement ? [announcement] : []) : source.announcements;
+  if (!Array.isArray(announcements)) throw new Error('Invalid relay announcement history');
+  const validated = source.version === 3 ? announcements.map(validateRecord) : announcements.map(item => {
+    const old = validateAnnouncement(item);
+    return { ...old, createdAt: old.publishedAt, updatedAt: old.publishedAt,
+      status: old.id === announcement?.id ? 'active' : 'withdrawn' };
+  });
+  const active = validated.filter(item => item.status === 'active');
+  if (new Set(validated.map(item => item.id)).size !== validated.length || active.length > 1 ||
+      (active.length === 0) !== (announcement === null) ||
+      (announcement && !active.some(item => item.id === announcement.id &&
+        item.title === announcement.title && item.message === announcement.message && item.publishedAt === announcement.publishedAt))) {
+    throw new Error('Invalid relay announcement history');
+  }
+  return { version: 3, maxRelaySessions: source.maxRelaySessions, announcement, announcements: validated };
+}
+
+function validateAnnouncement(item) {
+  if (!item || !/^[\w-]{16,128}$/.test(item.id) || typeof item.publishedAt !== 'string' ||
+      !Number.isFinite(Date.parse(item.publishedAt))) throw new Error('Invalid relay announcement');
+  return { id: item.id, title: clean(item.title, 80), message: clean(item.message, 2000), publishedAt: item.publishedAt };
+}
+
+function validateRecord(item) {
+  if (!item || !/^[\w-]{16,128}$/.test(item.id) || !['draft', 'active', 'withdrawn'].includes(item.status) ||
+      typeof item.createdAt !== 'string' || !Number.isFinite(Date.parse(item.createdAt)) ||
+      typeof item.updatedAt !== 'string' || !Number.isFinite(Date.parse(item.updatedAt)) ||
+      (item.status === 'draft' ? item.publishedAt !== null :
+        typeof item.publishedAt !== 'string' || !Number.isFinite(Date.parse(item.publishedAt)))) {
+    throw new Error('Invalid relay announcement record');
+  }
+  return { id: item.id, title: clean(item.title, 80), message: clean(item.message, 2000),
+    createdAt: item.createdAt, updatedAt: item.updatedAt, publishedAt: item.publishedAt, status: item.status };
+}
+
+function publicAnnouncement(record) {
+  return { id: record.id, title: record.title, message: record.message, publishedAt: record.publishedAt };
+}
+
+function clean(value, limit) {
+  if (typeof value !== 'string' || !value.trim() || value.trim().length > limit || /[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/.test(value)) {
+    throw new Error('Invalid announcement text');
+  }
+  return value.trim();
+}