@walkhi/code-relax 0.1.0-beta.4 → 0.1.0-beta.41

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

@@ -1,18 +1,40 @@
-import http from 'node:http';
-import { deviceStore, validId } from './device-store.mjs';
-import { randomUUID } from 'node:crypto';
-import { WebSocketServer } from 'ws';
+import { privacyPage } from './privacy-page.mjs';
+import { createAndroidReleaseHandler } from './android-releases.mjs';
+import { androidReleaseStorage } from '../../relay-admin/android-release-storage.mjs';
+import { longPairing } from './long-pairing.mjs';
+import http from 'node:http';
+import fs from 'node:fs';
+import { isIP } from 'node:net';
+import { deviceStore, validId } from './device-store.mjs';
+import { randomUUID, timingSafeEqual } from 'node:crypto';
+import { WebSocketServer } from 'ws';
 import { secret, digest, matches, validSecret, send, decode } from './wire.mjs';
+import { routedFileBytes, parseFileBytes } from './file-wire.mjs';
 import { readDebugAllowlist, debugAllowed } from './debug-allowlist.mjs';
 import { validProbeSignal } from './p2p-probe.mjs';
-import { relayAdminState } from './admin-state.mjs';
+import { MAX_ADMIN_REQUEST_BYTES, relayAdminState } from './admin-state.mjs';
+import { openRelayMysql } from './mysql-state.mjs';
+import { openEmailAccounts } from './email-accounts.mjs';
+import { accountConnections } from './account-connections.mjs';
+import { usageMeter, usageReport } from './usage-meter.mjs';
+import { relayDiagnostics } from './diagnostics.mjs';
+import { connectionInfo, deviceInfo } from './device-info.mjs';
 
-// Always loopback; a TLS reverse proxy supplies the private-trial Internet endpoint.
+// Always loopback; a TLS reverse proxy supplies the private-trial Internet endpoint.
 export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlMs = 120000,
-  maxConnections = 32, maxClientsPerHost = 16, maxPayload = 8 * 1024 * 1024, stateFile,
-  maxRelaySessions = 8, adminStateFile, publicRelayUrl = '', appDownloadUrl = '', debugAllowlistFile, log = () => {} } = {}) {
+  maxConnections = 128, maxPayload = 8 * 1024 * 1024, stateFile,
+  maxRelaySessions = 8, adminStateFile, mysqlConfigFile, accountConfigFile, usageDiagnosticKeyFile,
+  publicRelayUrl = '', appDownloadUrl = '', debugAllowlistFile, longPairingFile,
+  androidReleaseConfigFile, androidReleaseCredentialFile, log = () => {} } = {}) {
+  const androidReleases = createAndroidReleaseHandler({
+    ...(androidReleaseConfigFile ? androidReleaseStorage(androidReleaseConfigFile, androidReleaseCredentialFile) : {}), log });
+  const longInvitations = longPairing(longPairingFile);
+  longInvitations.list();
+  function longInvitation(code) {
+    try { return longInvitations.find(code); }
+    catch (error) { log({ event: 'long-pairing-error', message: error.message }); return undefined; }
+  }
   if (!validSecret(hostKey)) throw new Error('Invalid host credential');
-  if (!Number.isSafeInteger(maxClientsPerHost) || maxClientsPerHost < 1 || maxClientsPerHost > 64) throw new Error('Invalid mobile device limit');
   if (!Number.isSafeInteger(maxRelaySessions) || maxRelaySessions < 1 || maxRelaySessions > 256) throw new Error('Invalid relay session limit');
   if (publicRelayUrl) relayPublicAddress(publicRelayUrl);
   // Harmony's native WebSocket supplies the endpoint Origin automatically.
@@ -20,24 +42,112 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
   const nativeOrigins = publicRelayUrl ? ['http:', 'https:'].map(protocol => `${protocol}//${new URL(publicRelayUrl).host}`) : [];
   if (appDownloadUrl && !/^https:\/\/[^\s]+$/.test(appDownloadUrl)) throw new Error('Invalid app download URL');
   const hostHash = digest(hostKey), rooms = new Map();
-  const store = deviceStore(stateFile);
+  const database = mysqlConfigFile ? await openRelayMysql(mysqlConfigFile, maxRelaySessions) : null;
+  if (accountConfigFile && !database?.schemaVersions.includes('003_relay_usage')) throw new Error('Relay account and usage schema is required');
+  const accounts = accountConfigFile ? openEmailAccounts(database.pool, accountConfigFile) : null;
+  const accountSockets = accountConnections();
+  const meter = accounts ? usageMeter(database.pool) : null;
+  const cancelledAccountIds = new Set();
+  const accountCancellationWork = new Map();
+  const diagnostics = database?.schemaVersions.includes('006_relay_diagnostics')
+    ? relayDiagnostics(database.pool, error => log({ event: 'relay-diagnostic-error', message: error.message })) : null;
+  const adminAccessFile = '/etc/codex-relay/admin-access.json';
+  const adminAccessKey = fs.existsSync(adminAccessFile) ? JSON.parse(fs.readFileSync(adminAccessFile, 'utf8')).key : '';
+  if (adminAccessKey && !validSecret(adminAccessKey)) throw new Error('Invalid admin access key');
+  const diagnosticKey = usageDiagnosticKeyFile ? fs.readFileSync(usageDiagnosticKeyFile, 'utf8').trim() : '';
+  if (diagnosticKey && !/^[A-Za-z0-9_-]{43}$/.test(diagnosticKey)) throw new Error('Invalid usage diagnostic key');
+  const store = database?.devices || deviceStore(stateFile);
   const debugAllowlist = readDebugAllowlist(debugAllowlistFile);
-  const adminState = relayAdminState(adminStateFile, maxRelaySessions);
+  const adminState = database?.admin || relayAdminState(adminStateFile, maxRelaySessions);
   let activeRelaySessions = 0;
-  for (const record of store.entries()) rooms.set(record.id, { ...record, durable: true, connections: new Map(), observers: new Map() });
+  for (const record of store.entries()) rooms.set(record.id, { ...record, durable: true, connections: new Map(), observers: new Map(), uploadClients: new Map() });
+  let commitTail = Promise.resolve();
+  function queueStore(operation) {
+    const pending = commitTail.then(operation);
+    commitTail = pending.catch(() => {});
+    return pending;
+  }
   function commit(room, changes) {
-    const next = { ...room, ...changes, updatedAt: new Date().toISOString() };
-    if (room.durable) {
-      const { id, hostHash, clients, revision, status, createdAt, updatedAt, officialComputer } = next;
-      store.save({ id, hostHash, clients, revision, status, createdAt, updatedAt, ...(officialComputer ? { officialComputer } : {}) });
-    }
-    Object.assign(room, changes, { updatedAt: next.updatedAt });
-  }
-  function invitation(room) {
-    const code = secret(); room.pairingHash = digest(code); room.expires = Date.now() + pairingTtlMs;
-    return { code, expires: room.expires };
-  }
+    return queueStore(async () => {
+      changes = typeof changes === 'function' ? changes(room) : changes;
+      const next = { ...room, ...changes, updatedAt: new Date().toISOString() };
+      if (room.durable) {
+        const { id, hostHash, clients, revision, status, createdAt, updatedAt, officialComputer } = next;
+        await store.save({ id, hostHash, clients, revision, status, createdAt, updatedAt, ...(officialComputer ? { officialComputer } : {}) });
+      }
+      Object.assign(room, changes, { updatedAt: next.updatedAt });
+    });
+  }
+  function registerRoom(id, durable, credential) {
+    return queueStore(async () => {
+      // Resolve concurrent first connections before writing the device identity.
+      if (durable && rooms.has(id)) return rooms.get(id);
+      const now = new Date().toISOString();
+      const record = { id, revision: 0, status: 'active', clients: [], createdAt: now, updatedAt: now,
+        ...(durable ? { hostHash: digest(credential) } : {}) };
+      if (durable) await store.save(record);
+      const room = { ...record, durable, connections: new Map(), observers: new Map(), uploadClients: new Map() };
+      rooms.set(id, room);
+      return room;
+    });
+  }
+  function recordConnection(room, clientId, at, info) {
+    return queueStore(async () => {
+      const client = room.clients.find(item => item.id === clientId);
+      if (!client) return false;
+      const updated = room.durable ? await store.recordConnection(room.id, clientId, at, info) : connectionInfo(client, at, info);
+      if (!updated) return false;
+      room.clients = room.clients.map(item => item.id === clientId ? updated : item);
+      return true;
+    });
+  }
+  async function manageDevices(room, ws, message, currentClientId) {
+    try {
+      if (!validId(message.commandId)) throw new Error('Invalid device management request');
+      if (message.type === 'devices-list') {
+        await commitTail;
+        if (currentClientId && !room.clients.some(item => item.id === currentClientId)) throw new Error('配对授权已撤销');
+        const clients = room.clients.map(({ id, createdAt, lastConnectedAt, platform, deviceName }) => ({
+          id, createdAt, lastConnectedAt: lastConnectedAt || null, platform: platform || null, deviceName: deviceName || null,
+          current: id === currentClientId,
+        })).sort((a, b) => (b.lastConnectedAt || b.createdAt).localeCompare(a.lastConnectedAt || a.createdAt));
+        send(ws, { type: message.type, commandId: message.commandId, clients, workstationOnline: Boolean(room.host) });
+        return;
+      }
+      if (!validId(message.id) || message.confirmed !== true) throw new Error('请确认要撤销的配对授权');
+      await commit(room, current => {
+        if (currentClientId && !current.clients.some(item => item.id === currentClientId)) throw new Error('配对授权已撤销');
+        return { clients: current.clients.filter(item => item.id !== message.id), revision: current.revision + 1 };
+      });
+      if (room.host) send(room.host, { type: 'authorization-changed', clients: room.clients, revision: room.revision });
+      // Acknowledge self-revocation before closing this connection.
+      send(ws, { type: message.type, commandId: message.commandId, id: message.id, revoked: true, workstationOnline: Boolean(room.host) });
+      const connection = room.connections.get(message.id);
+      if (connection) {
+        releaseRelay(connection);
+        if (room.host) send(room.host, { type: 'detach', session: connection.session });
+        room.connections.delete(message.id);
+        connection.ws.close(4401, 'Device authorization revoked');
+      }
+      const observer = room.observers?.get(message.id);
+      room.observers?.delete(message.id);
+      observer?.ws.close(4401, 'Device authorization revoked');
+      for (const [key, upload] of room.uploadClients || []) if (upload.clientId === message.id) {
+        room.uploadClients.delete(key);
+        if (room.uploadHost) send(room.uploadHost, { type: 'file-close', session: upload.session });
+        upload.ws.close(4401, 'Device authorization revoked');
+      }
+      for (const [socket, id] of room.deviceManagers || []) if (id === message.id) {
+        room.deviceManagers.delete(socket); socket.close(4401, 'Device authorization revoked');
+      }
+    } catch (error) { send(ws, { type: message.type, commandId: message.commandId, error: error.message }); }
+  }
+  function invitation(room) {
+    const code = secret(); room.pairingHash = digest(code); room.expires = Date.now() + pairingTtlMs;
+    return { code, expires: room.expires };
+  }
   let listenUrl = '';
+  let adminTail = Promise.resolve();
   function relayUrl(request) {
     if (publicRelayUrl) return relayPublicAddress(publicRelayUrl);
     const host = request.headers.host || new URL(listenUrl).host;
@@ -46,12 +156,31 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
   }
   function findInvitation(code) {
     if (!validSecret(code)) return undefined;
-    return [...rooms.values()].find(room => room.status === 'active' && room.pairingHash && Date.now() < room.expires && matches(code, room.pairingHash));
+    const room = [...rooms.values()].find(room => room.status === 'active' && room.pairingHash && Date.now() < room.expires && matches(code, room.pairingHash));
+    if (room) return { room, expires: room.expires };
+    const invite = longInvitation(code), target = invite && rooms.get(invite.room);
+    return target?.status === 'active' ? { room: target, expires: invite.expires } : undefined;
   }
   const server = http.createServer((request, response) => {
     const target = new URL(request.url || '/', `http://${request.headers.host || 'localhost'}`);
+    if (target.pathname.startsWith('/code-relax/android/')) {
+      void androidReleases(request, response, target); return;
+    }
     if (target.pathname === '/admin' || target.pathname.startsWith('/admin/')) {
-      void handleAdmin(request, response, target); return;
+      adminTail = adminTail.then(() => handleAdmin(request, response, target)).catch(() => {
+        if (!response.headersSent) adminReply(response, 500, { error: 'Admin operation failed' });
+      });
+      return;
+    }
+    if (target.pathname === '/account/privacy' && request.method === 'GET') {
+      response.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8', 'Cache-Control': 'no-cache',
+        'Content-Security-Policy': "default-src 'none'; style-src 'unsafe-inline'; base-uri 'none'; form-action 'none'; frame-ancestors 'none'",
+        'X-Content-Type-Options': 'nosniff' });
+      response.end(privacyPage); return;
+    }
+    if (accounts && target.pathname.startsWith('/account/')) {
+      void handleAccount(request, response, target).catch(() => accountReply(response, 500, { error: 'Account operation failed' }));
+      return;
     }
     if (request.method === 'GET' && target.pathname === '/announcement') {
       const body = JSON.stringify({ announcement: adminState.read().announcement });
@@ -61,19 +190,19 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
       response.writeHead(404, { 'Cache-Control': 'no-store' }); response.end(); return;
     }
     const code = target.searchParams.get('invite') || '';
-    const room = findInvitation(code);
-    if (!room) {
+    const invitation = findInvitation(code);
+    if (!invitation) {
       const json = target.pathname === '/pair/resolve' || /application\/json/i.test(request.headers.accept || '');
       const body = json ? JSON.stringify({ error: '配对邀请已过期或已使用' }) : pairingPage({ expired: true });
       response.writeHead(410, pairingHeaders(json ? 'application/json; charset=utf-8' : 'text/html; charset=utf-8', body)); response.end(body); return;
     }
     if (target.pathname === '/pair/resolve' || /application\/json/i.test(request.headers.accept || '')) {
-      const body = JSON.stringify({ version: 6, relayUrl: relayUrl(request), room: room.id, expires: room.expires });
+      const body = JSON.stringify({ version: 6, relayUrl: relayUrl(request), room: invitation.room.id, expires: invitation.expires });
       response.writeHead(200, pairingHeaders('application/json; charset=utf-8', body)); response.end(body); return;
     }
     const secure = request.socket.encrypted || request.headers['x-forwarded-proto'] === 'https';
     const current = new URL(target.pathname + target.search, `${secure ? 'https' : 'http'}://${request.headers.host || new URL(listenUrl).host}`);
-    const body = pairingPage({ deepLink: `codex-remote://pair?url=${encodeURIComponent(current.href)}`, expires: room.expires, appDownloadUrl });
+    const body = pairingPage({ deepLink: `codex-remote://pair?url=${encodeURIComponent(current.href)}`, expires: invitation.expires, appDownloadUrl });
     response.writeHead(200, pairingHeaders('text/html; charset=utf-8', body)); response.end(body);
   });
   function adminReply(response, status, body, type = 'application/json; charset=utf-8') {
@@ -82,30 +211,156 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
       'X-Content-Type-Options': 'nosniff', 'Content-Security-Policy': "default-src 'self'; style-src 'unsafe-inline'; script-src 'unsafe-inline'; base-uri 'none'; frame-ancestors 'none'" });
     response.end(value);
   }
-  async function handleAdmin(request, response, target) {
-    if (request.method === 'GET' && target.pathname === '/admin') {
-      adminReply(response, 200, adminPage(), 'text/html; charset=utf-8'); return;
+  function accountReply(response, status, body) {
+    if (response.headersSent || response.destroyed) return;
+    const value = JSON.stringify(body);
+    response.writeHead(status, { 'Content-Type': 'application/json; charset=utf-8', 'Content-Length': Buffer.byteLength(value),
+      'Cache-Control': 'no-store', 'X-Content-Type-Options': 'nosniff' });
+    response.end(value);
+  }
+  function cancelAccountConnections(userId, token) {
+    const pending = accountCancellationWork.get(userId);
+    if (pending) return pending;
+    if (cancelledAccountIds.has(userId)) return Promise.resolve();
+    cancelledAccountIds.add(userId);
+    const work = (async () => {
+      try { await accounts.cancelAccount(token); }
+      catch (failure) { cancelledAccountIds.delete(userId); throw failure; }
+      for (const room of rooms.values()) {
+        for (const [key, arm] of room.usageArms || []) if (arm.userId === userId) room.usageArms.delete(key);
+        for (const [key, task] of room.usageTasks || []) if (task.userId === userId) room.usageTasks.delete(key);
+        for (const [clientId, connection] of room.connections) {
+          if (connection.userId !== userId) continue;
+          releaseRelay(connection); room.connections.delete(clientId);
+          if (room.host) send(room.host, { type: 'detach', session: connection.session });
+          connection.ws.close(4431, 'Account cancelled');
+        }
+        for (const [clientId, observer] of room.observers) {
+          if (observer.userId !== userId) continue;
+          room.observers.delete(clientId); observer.ws.close(4431, 'Account cancelled');
+        }
+        for (const [clientId, upload] of room.uploadClients) {
+          if (upload.userId !== userId) continue;
+          room.uploadClients.delete(clientId);
+          if (room.uploadHost) send(room.uploadHost, { type: 'file-close', session: upload.session });
+          upload.ws.close(4431, 'Account cancelled');
+        }
+      }
+    })().finally(() => accountCancellationWork.delete(userId));
+    accountCancellationWork.set(userId, work);
+    return work;
+  }
+  async function handleAccount(request, response, target) {
+    try {
+      if (target.pathname === '/account/config' && request.method === 'GET') {
+        accountReply(response, 200, { captchaAppId: accounts.captchaAppId }); return;
+      }
+      const bearer = /^Bearer ([A-Za-z0-9_-]{43})$/.exec(request.headers.authorization || '')?.[1];
+      if (target.pathname === '/account/me' && request.method === 'GET') {
+        const user = await accounts.current(bearer);
+        accountReply(response, 200, { user, usage: await accounts.usage(user.id) }); return;
+      }
+      if (target.pathname === '/account/logout' && request.method === 'POST') {
+        const result = await accounts.logout(bearer);
+        accountSockets.revoke(bearer);
+        accountReply(response, 200, result); return;
+      }
+      if (target.pathname === '/account/me' && request.method === 'DELETE') {
+        const user = await accounts.current(bearer);
+        await cancelAccountConnections(user.id, bearer);
+        accountReply(response, 200, { ok: true }); return;
+      }
+      if (request.method !== 'POST' || request.headers['content-type'] !== 'application/json') {
+        accountReply(response, 404, { error: 'Account route not found' }); return;
+      }
+      const body = JSON.parse(await readBody(request, 4096));
+      if (!body || typeof body !== 'object' || Array.isArray(body)) { accountReply(response, 400, { error: 'Invalid request body' }); return; }
+      if (target.pathname === '/account/email/request') {
+        const ip = request.headers['x-real-ip'] || request.socket.remoteAddress || '';
+        if (typeof ip !== 'string' || !isIP(ip)) { accountReply(response, 400, { error: 'Invalid client address' }); return; }
+        accountReply(response, 202, await accounts.requestCode(body, ip));
+      } else if (target.pathname === '/account/email/verify') {
+        accountReply(response, 200, await accounts.verifyCode(body));
+      } else accountReply(response, 404, { error: 'Account route not found' });
+    } catch (failure) {
+      accountReply(response, failure.status || 503, { error: failure.status ? failure.message : 'Account service unavailable' });
     }
+  }
+  async function handleAdmin(request, response, target) {
+    const accessKey = request.headers['x-code-relax-admin-key'];
+    const internalAccess = adminAccessKey && validSecret(accessKey) &&
+      timingSafeEqual(Buffer.from(accessKey), Buffer.from(adminAccessKey));
+    const token = /^Bearer ([A-Za-z0-9_-]{43})$/.exec(request.headers.authorization || '')?.[1];
+    const diagnosticRoute = ['/admin/api/usage-diagnostics', '/admin/api/usage-diagnostics/drain'].includes(target.pathname);
+    const diagnosticAccess = diagnosticRoute && diagnosticKey && token &&
+      timingSafeEqual(Buffer.from(token), Buffer.from(diagnosticKey));
+    if (!internalAccess && !diagnosticAccess) { adminReply(response, 404, { error: 'Not found' }); return; }
     if (request.method === 'GET' && target.pathname === '/admin/api/status') {
       const state = adminState.read();
       adminReply(response, 200, { maxRelaySessions: state.maxRelaySessions, activeRelaySessions,
         activeExemptRelaySessions: [...rooms.values()].reduce((sum, room) => sum + [...room.connections.values()].filter(connection => connection.relayExempt).length, 0),
         websocketConnections: wss.clients.size, onlineComputers: [...rooms.values()].filter(room => room.host).length,
-        activePhones: [...rooms.values()].reduce((sum, room) => sum + room.connections.size, 0), announcement: state.announcement }); return;
+        activePhones: [...rooms.values()].reduce((sum, room) => sum + room.connections.size, 0),
+        processRssBytes: process.memoryUsage().rss, processUptimeSeconds: process.uptime(),
+        announcement: state.announcement, announcements: state.announcements }); return;
+    }
+    if (request.method === 'GET' && target.pathname === '/admin/api/usage' && meter) {
+      const page = Number(target.searchParams.get('page') || '1');
+      const view = target.searchParams.get('view') || 'user';
+      if (!Number.isSafeInteger(page) || page < 1 || page > 100000 ||
+          !['user', 'computer'].includes(view) || target.searchParams.has('user') ||
+          target.searchParams.has('computer')) {
+        adminReply(response, 400, { error: 'Invalid usage query' }); return;
+      }
+      adminReply(response, 200, await usageReport(database.pool, page, view)); return;
+    }
+    const diagnosticSource = target.searchParams.get('source') || 'usage';
+    if (target.pathname.startsWith('/admin/api/usage-diagnostics') && !['usage', 'account-cleanup'].includes(diagnosticSource)) {
+      adminReply(response, 400, { error: 'Invalid diagnostic source' }); return;
+    }
+    if (diagnostics && target.pathname === '/admin/api/usage-diagnostics') {
+      if (request.method === 'GET') adminReply(response, 200, await diagnostics.read(diagnosticSource));
+      else if (request.method === 'DELETE') adminReply(response, 200, await diagnostics.clear(diagnosticSource));
+      else adminReply(response, 405, { error: 'Unsupported diagnostic request' });
+      return;
+    }
+    if (diagnostics && target.pathname === '/admin/api/usage-diagnostics/drain') {
+      if (request.method === 'POST') adminReply(response, 200, await diagnostics.drain(diagnosticSource));
+      else adminReply(response, 405, { error: 'Unsupported diagnostic request' });
+      return;
     }
     if (!['PUT', 'DELETE'].includes(request.method || '') || request.headers['content-type'] !== 'application/json' ||
         request.headers['x-code-relax-admin'] !== '1') { adminReply(response, 405, { error: 'Unsupported admin request' }); return; }
     try {
-      const body = request.method === 'DELETE' ? {} : JSON.parse(await readBody(request, 4096));
+      const body = request.method === 'DELETE' ? {} : JSON.parse(await readBody(request, MAX_ADMIN_REQUEST_BYTES));
       if (target.pathname === '/admin/api/settings' && request.method === 'PUT') {
-        const state = adminState.setMaxRelaySessions(body.maxRelaySessions);
+        const state = await adminState.setMaxRelaySessions(body.maxRelaySessions);
         log({ event: 'admin-relay-limit-updated', maxRelaySessions: state.maxRelaySessions });
-      } else if (target.pathname === '/admin/api/announcement' && request.method === 'PUT') {
-        const state = adminState.publish(body.title, body.message); broadcastAnnouncement(state.announcement);
-        log({ event: 'admin-announcement-published', announcementId: state.announcement.id });
-      } else if (target.pathname === '/admin/api/announcement' && request.method === 'DELETE') {
-        const state = adminState.withdraw(); broadcastAnnouncement(state.announcement);
-        log({ event: 'admin-announcement-withdrawn' });
+      } else if (target.pathname === '/admin/api/announcements' && request.method === 'PUT') {
+        const state = await adminState.createAnnouncement(body.title, body.message, body.publish === true);
+        if (body.publish === true) {
+          broadcastAnnouncement(state.announcement);
+          log({ event: 'admin-announcement-published', announcementId: state.announcement.id });
+        } else log({ event: 'admin-announcement-draft-created', announcementId: state.announcements[0].id });
+      } else if (target.pathname.startsWith('/admin/api/announcements/')) {
+        const parts = target.pathname.slice('/admin/api/announcements/'.length).split('/');
+        const id = parts[0];
+        if (!/^[\w-]{16,128}$/.test(id)) { adminReply(response, 404, { error: 'Admin route not found' }); return; }
+        if (parts.length === 1 && request.method === 'PUT') {
+          await adminState.updateDraft(id, body.title, body.message);
+          log({ event: 'admin-announcement-draft-updated', announcementId: id });
+        } else if (parts.length === 1 && request.method === 'DELETE') {
+          await adminState.deleteAnnouncement(id);
+          log({ event: 'admin-announcement-deleted', announcementId: id });
+        } else if (parts.length === 2 && parts[1] === 'publish' && request.method === 'PUT') {
+          const state = await adminState.publishDraft(id, body.title, body.message);
+          broadcastAnnouncement(state.announcement);
+          log({ event: 'admin-announcement-published', announcementId: id });
+        } else if (parts.length === 2 && parts[1] === 'withdraw' && request.method === 'PUT') {
+          const state = await adminState.withdraw(id);
+          broadcastAnnouncement(state.announcement);
+          log({ event: 'admin-announcement-withdrawn', announcementId: id });
+        } else { adminReply(response, 404, { error: 'Admin route not found' }); return; }
       } else { adminReply(response, 404, { error: 'Admin route not found' }); return; }
       adminReply(response, 200, { ok: true });
     } catch (error) { adminReply(response, 400, { error: error.message }); }
@@ -137,23 +392,40 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
     serverNoContextTakeover: true, clientNoContextTakeover: true,
     threshold: 1024, concurrencyLimit: 4, zlibDeflateOptions: { level: 3 },
   } });
-  let admissionStart = Date.now(), admissions = 0;
-  server.on('upgrade', (request, socket, head) => {
+  let admissionStart = Date.now(), admissions = 0;
+  server.on('upgrade', (request, socket, head) => {
     if (request.url !== '/relay' || (request.headers.origin && request.headers.origin !== 'null' && !nativeOrigins.includes(request.headers.origin))) {
       log({ event: 'upgrade-rejected', reason: request.url !== '/relay' ? 'path' : 'origin' });
-      socket.end('HTTP/1.1 403 Forbidden\r\nConnection: close\r\n\r\n'); return;
-    }
-    if (Date.now() - admissionStart >= 60000) { admissionStart = Date.now(); admissions = 0; }
-    if (wss.clients.size >= maxConnections || ++admissions > 60) {
-      socket.end('HTTP/1.1 429 Too Many Requests\r\nConnection: close\r\n\r\n'); return;
-    }
-    wss.handleUpgrade(request, socket, head, ws => wss.emit('connection', ws));
-  });
+      socket.end('HTTP/1.1 403 Forbidden\r\nConnection: close\r\n\r\n'); return;
+    }
+    if (Date.now() - admissionStart >= 60000) { admissionStart = Date.now(); admissions = 0; }
+    if (wss.clients.size >= maxConnections || ++admissions > 240) {
+      socket.end('HTTP/1.1 429 Too Many Requests\r\nConnection: close\r\n\r\n'); return;
+    }
+    wss.handleUpgrade(request, socket, head, ws => wss.emit('connection', ws));
+  });
   wss.on('connection', ws => {
     let role, room, session, clientId, alive = true;
-    const authTimer = setTimeout(() => ws.close(1008, 'Authentication timeout'), 5000);
-    ws.on('pong', () => { alive = true; });
-    const heartbeat = setInterval(() => { if (!alive) ws.terminate(); else { alive = false; ws.ping(); } }, 30000);
+    let accountConnection;
+    function invalidateAccountConnection() {
+      if (role === 'client' && room?.connections.get(clientId)?.ws === ws) {
+        releaseRelay(room.connections.get(clientId));
+        room.connections.delete(clientId);
+        // Detach also closes the workstation RTC peer; closing only the
+        // phone's signaling socket would leave the direct data path alive.
+        if (room.host) send(room.host, { type: 'detach', session });
+      } else if (role === 'file-client' && room?.uploadClients.get(session)?.ws === ws) {
+        room.uploadClients.delete(session);
+        if (room.uploadHost) send(room.uploadHost, { type: 'file-close', session });
+      }
+      ws.close(4431, 'Account session invalid');
+    }
+    const authTimer = setTimeout(() => ws.close(1008, 'Authentication timeout'), 5000);
+    ws.on('pong', () => { alive = true; });
+    const heartbeat = setInterval(() => {
+      sampleInboundQueue();
+      if (!alive) ws.terminate(); else { alive = false; ws.ping(); }
+    }, 30000);
     const fail = (code = 4401, reason = 'Device authorization rejected') => ws.close(code, reason);
     const queueClientMessage = (connection, message, pause = 0) => {
       const bytes = Buffer.byteLength(JSON.stringify(message));
@@ -167,27 +439,132 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
         send(connection.ws, message);
       }).catch(() => connection.ws.close(1011, 'Relay delivery failed'));
     };
-    ws.on('error', () => {}); // close owns routing cleanup.
-    ws.on('close', (code, reason) => {
-      log({ event: 'closed', role: role || 'unauthenticated', device: room?.id, code, reason: reason.toString() });
-      clearTimeout(authTimer); clearInterval(heartbeat);
+    ws.on('error', () => {}); // close owns routing cleanup.
+    ws.on('close', (code, reason) => {
+      log({ event: 'closed', role: role || 'unauthenticated', device: room?.id, code, reason: reason.toString() });
+      clearTimeout(authTimer); clearInterval(heartbeat);
+      accountConnection?.dispose();
       if (role === 'host' && room?.host === ws) {
+        for (const task of room.usageTasks?.values() || []) {
+          void meter?.lost(task).catch(error => log({ event: 'usage-error', message: error.message }));
+        }
+        room.usageTasks?.clear(); room.usageArms?.clear();
         room.host = undefined; room.hostName = undefined; room.lanCandidates = [];
+        room.uploadHost?.close(4410, 'Computer offline');
+        for (const client of room.uploadClients?.values() || []) client.ws.close(code === 4432 ? 4432 : 4410, code === 4432 ? 'Computer inbound queue limit exceeded' : 'Computer offline');
         for (const observer of room.observers.values()) send(observer.ws, { type: 'observing', online: false });
         if (!room.durable) rooms.delete(room.id);
-        for (const connection of room.connections.values()) connection.ws.close(4410, 'Computer offline; authorization retained');
+        for (const connection of room.connections.values()) connection.ws.close(
+          code === 4432 ? 4432 : 4410,
+          code === 4432 ? 'Computer inbound queue limit exceeded' : 'Computer offline; authorization retained');
       } else if (role === 'client' && room?.connections.get(clientId)?.ws === ws) {
-        releaseRelay(room.connections.get(clientId));
+        const connection = room.connections.get(clientId);
+        releaseRelay(connection);
         room.connections.delete(clientId);
         if (room.host) send(room.host, { type: 'detach', session });
       } else if (role === 'observer' && room?.observers.get(clientId)?.ws === ws) {
         room.observers.delete(clientId);
-      }
-    });
-    ws.on('message', (bytes, binary) => {
-      try {
-        const message = decode(bytes, binary);
-        if (!role) {
+      } else if (role === 'file-host' && room?.uploadHost === ws) {
+        room.uploadHost = undefined;
+        for (const client of room.uploadClients?.values() || []) client.ws.close(code === 4432 ? 4432 : 4410, code === 4432 ? 'File receiver inbound queue limit exceeded' : 'File receiver offline');
+      } else if (role === 'file-client' && room?.uploadClients?.get(session)?.ws === ws) {
+        room.uploadClients.delete(session);
+        if (room.uploadHost) send(room.uploadHost, { type: 'file-close', session });
+      }
+    });
+    let messageTail = Promise.resolve();
+    // Include the in-flight message: async database work must not permit an
+    // unbounded chain of closures retaining incoming payloads.
+    let pendingMessages = 0, pendingBytes = 0;
+    const maxPendingMessages = 128, maxPendingBytes = 16 * 1024 * 1024;
+    let sampleStarted = Date.now(), peakMessages = 0, peakBytes = 0, maxWaitMs = 0, receivedMessages = 0;
+    function sampleInboundQueue() {
+      const now = Date.now();
+      if (now - sampleStarted < 60000) return;
+      // Summarize only intervals with an actual backlog; never log payloads or credentials.
+      if (peakMessages > 1) log({ event: 'inbound-queue-sample', role: role || 'unauthenticated',
+        windowMs: now - sampleStarted, receivedMessages, peakMessages, peakBytes, maxWaitMs,
+        pendingMessages, pendingBytes });
+      sampleStarted = now; peakMessages = pendingMessages; peakBytes = pendingBytes;
+      maxWaitMs = 0; receivedMessages = 0;
+    }
+    ws.on('message', (bytes, binary) => {
+      if (ws.readyState !== ws.OPEN) return;
+      const size = bytes.length;
+      if (pendingMessages >= maxPendingMessages || pendingBytes + size > maxPendingBytes) {
+        log({ event: 'inbound-queue-limit', role: role || 'unauthenticated',
+          pendingMessages, pendingBytes, incomingBytes: size, maxWaitMs });
+        ws.close(4432, 'Inbound queue limit exceeded');
+        return;
+      }
+      pendingMessages++; pendingBytes += size;
+      receivedMessages++;
+      peakMessages = Math.max(peakMessages, pendingMessages); peakBytes = Math.max(peakBytes, pendingBytes);
+      const enqueuedAt = Date.now();
+      messageTail = messageTail.then(async () => {
+      try {
+        maxWaitMs = Math.max(maxWaitMs, Date.now() - enqueuedAt);
+        if (ws.readyState !== ws.OPEN) return;
+        if (accountConnection && !accountConnection.valid()) return;
+        if (binary) {
+          if (role === 'file-host' && room.uploadHost === ws) {
+            const frame = parseFileBytes(bytes);
+            const client = room.uploadClients.get(frame.session);
+            if (!client || client.ws.readyState !== ws.OPEN) return;
+            if (client.ws.bufferedAmount > 1024 * 1024) return client.ws.close(1013, 'File receiver too slow');
+            client.ws.send(frame.data); return;
+          }
+          if (role === 'file-client' && room.uploadClients?.get(session)?.ws === ws) {
+            if (room.uploadHost?.readyState !== ws.OPEN) return fail(4410, 'File receiver offline');
+            if (room.uploadHost.bufferedAmount > 1024 * 1024) return fail(1013, 'File receiver too slow');
+            room.uploadHost.send(routedFileBytes(session, bytes)); return;
+          }
+          return fail(1008, 'Invalid binary frame');
+        }
+        const message = decode(bytes, binary);
+        if (!role) {
+          let userId;
+          if (!['host', 'file-host', 'observe', 'device-management'].includes(message.type) &&
+              !(['pair', 'resume'].includes(message.type) && message.management === true)) {
+            if (!['pair', 'resume', 'observe', 'file-client'].includes(message.type)) return fail();
+            if (!accounts || !validSecret(message.accountToken)) return fail(4431, 'Account login required');
+            accountConnection = accountSockets.track(message.accountToken, invalidateAccountConnection);
+            try {
+              const user = await accounts.current(message.accountToken);
+              if (!accountConnection.activate(user.expiresAt)) return;
+              userId = user.id;
+            }
+            catch { return fail(4431, 'Account session invalid'); }
+            if (ws.readyState !== ws.OPEN) return;
+            if (cancelledAccountIds.has(userId)) return fail(4431, 'Account cancelled');
+          }
+          if (message.type === 'file-host') {
+            room = rooms.get(message.deviceId);
+            if (!room?.host || room.status !== 'active' || !matches(message.deviceSecret, room.hostHash)) return fail();
+            role = 'file-host'; clearTimeout(authTimer);
+            room.uploadClients ||= new Map();
+            room.uploadHost?.close(4409, 'File receiver replaced');
+            room.uploadHost = ws;
+            send(ws, { type: 'file-host-ready' }); return;
+          }
+          if (message.type === 'file-client') {
+            room = rooms.get(message.room);
+            const client = room?.clients.find(item => item.id === message.clientId);
+            if (!room?.host || !room.uploadHost || room.status !== 'active' || !client ||
+                !matches(message.credential, client.hash)) return fail();
+            room.uploadClients ||= new Map();
+            if (!['upload', 'download'].includes(message.purpose)) return fail(1008, 'Invalid file purpose');
+            const same = [...room.uploadClients.values()].filter(item => item.clientId === message.clientId && item.purpose === message.purpose);
+            const all = [...rooms.values()].flatMap(item => [...(item.uploadClients?.values() || [])]);
+            if (same.length >= (message.purpose === 'upload' ? 1 : 3) ||
+                all.length >= 8 || (message.purpose === 'upload' && all.filter(item => item.purpose === 'upload').length >= 2)) {
+              return fail(4429, 'Too many file transfers');
+            }
+            role = 'file-client'; clientId = message.clientId; session = randomUUID(); clearTimeout(authTimer);
+            if (!await recordConnection(room, clientId, new Date().toISOString(), deviceInfo(message))) return fail(4401, 'Device authorization revoked');
+            room.uploadClients.set(session, { ws, session, clientId, userId, purpose: message.purpose });
+            send(room.uploadHost, { type: 'file-open', session, purpose: message.purpose }); return;
+          }
           if (message.type === 'host') {
             const durable = message.deviceId !== undefined;
             if (durable && (!validId(message.deviceId) || !validSecret(message.deviceSecret))) return fail();
@@ -199,21 +576,23 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
             }
             catch { return fail(1008, 'Invalid LAN candidates'); }
             room = durable ? rooms.get(message.deviceId) : undefined;
-            if (room && (room.status !== 'active' || !matches(message.deviceSecret, room.hostHash))) return fail();
             if (!room) {
-              // Durable computers prove future ownership with their generated device secret.
-              // The legacy deployment key remains accepted, but is no longer required for first registration.
               if (!durable && !matches(message.key, hostHash)) return fail();
-              if (rooms.size >= 256) return fail(4429, 'Device limit reached');
-              const now = new Date().toISOString();
-              room = { id: durable ? message.deviceId : randomUUID(), durable,
-                revision: 0, status: 'active', clients: [], connections: new Map(), observers: new Map(), createdAt: now, updatedAt: now,
-                ...(durable ? { hostHash: digest(message.deviceSecret) } : {}) };
-              commit(room, {}); rooms.set(room.id, room);
-            }
+              room = await registerRoom(durable ? message.deviceId : randomUUID(), durable, message.deviceSecret);
+              if (ws.readyState !== ws.OPEN) return;
+            }
+            if (durable && (room.status !== 'active' || !matches(message.deviceSecret, room.hostHash))) return fail();
             const oldHost = room.host;
             room.observers ||= new Map();
+            if (oldHost && oldHost !== ws) {
+              for (const task of room.usageTasks?.values() || []) {
+                try { await meter?.lost(task); } catch (error) { log({ event: 'usage-error', message: error.message }); }
+              }
+              room.usageTasks?.clear(); room.usageArms?.clear();
+            }
             room.host = ws; room.hostName = hostName; room.lanCandidates = lanCandidates;
+            room.usageTasks ||= new Map(); room.usageArms ||= new Map();
+            if (oldHost && oldHost !== ws) room.uploadHost?.close(4409, 'Computer connection replaced');
             room.p2pProbe = message.p2pProbe === 1; room.p2pProbeRepeat = message.p2pProbeRepeat === true;
             role = 'host'; clearTimeout(authTimer);
             if (oldHost && oldHost !== ws) {
@@ -232,32 +611,50 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
           room = rooms.get(message.room);
           if (!room || room.status !== 'active') return fail();
           let credential;
-          if (message.type === 'pair' && room.pairingHash && Date.now() < room.expires && matches(message.code, room.pairingHash)) {
+          const longInvite = message.type === 'pair' ? longInvitation(message.code) : undefined;
+          const reusableInvite = longInvite?.room === room.id;
+          if (message.type === 'pair' && !room.pairingInProgress && (reusableInvite ||
+              (room.pairingHash && Date.now() < room.expires && matches(message.code, room.pairingHash)))) {
             if (!room.host) return fail(4410, 'Computer offline; authorization retained');
             credential = message.credential || secret();
             clientId = message.clientId || (!room.durable ? randomUUID() : undefined);
             if (!validSecret(credential) || !validId(clientId)) return fail();
             const existing = room.clients.find(client => client.id === clientId);
-            if (!existing && room.clients.length >= maxClientsPerHost) return fail(4429, 'Mobile device limit reached');
             const now = new Date().toISOString();
-            const client = { id: clientId, hash: digest(credential), createdAt: existing?.createdAt || now, updatedAt: now };
-            commit(room, { clients: [...room.clients.filter(item => item.id !== clientId), client], revision: room.revision + 1 });
-            room.pairingHash = undefined;
+            const client = { ...existing, id: clientId, hash: digest(credential), createdAt: existing?.createdAt || now, updatedAt: now,
+              ...deviceInfo(message), lastConnectedAt: now };
+            room.pairingInProgress = true;
+            try {
+              await commit(room, current => ({ clients: [...current.clients.filter(item => item.id !== clientId), client], revision: current.revision + 1 }));
+              if (!reusableInvite) room.pairingHash = undefined;
+            } finally { room.pairingInProgress = false; }
+            if (!room.host) return fail(4410, 'Computer offline; authorization retained');
             send(room.host, { type: 'authorization-changed', clients: room.clients, revision: room.revision });
           } else {
             clientId = message.clientId;
             const client = room.clients.find(item => item.id === clientId) ||
               (!room.durable && !clientId ? room.clients.find(item => matches(message.credential, item.hash)) : undefined);
             if (client) clientId = client.id;
-            if (!['resume', 'pair', 'observe'].includes(message.type) || !client || !matches(message.credential, client.hash)) {
+            if (!['resume', 'pair', 'observe', 'device-management'].includes(message.type) || !client || !matches(message.credential, client.hash)) {
             return fail(message.type === 'pair' ? 4408 : 4401, message.type === 'pair' ? 'Pairing code expired or used' : 'Device authorization rejected');
             }
           }
+          if (ws.readyState !== ws.OPEN) return;
+          if (accountConnection && !accountConnection.valid()) return;
+          if (cancelledAccountIds.has(userId)) return fail(4431, 'Account cancelled');
+          if (!await recordConnection(room, clientId, new Date().toISOString(), deviceInfo(message))) return fail(4401, 'Device authorization revoked');
+          if (ws.readyState !== ws.OPEN) return;
+          if (message.type === 'device-management') {
+            role = 'device-manager'; clearTimeout(authTimer); room.deviceManagers ||= new Map();
+            room.deviceManagers.set(ws, clientId);
+            ws.once('close', () => room.deviceManagers.delete(ws));
+            send(ws, { type: 'device-management-ready' }); return;
+          }
           if (message.type === 'observe') {
             role = 'observer'; clearTimeout(authTimer); room.observers ||= new Map();
             const oldObserver = room.observers.get(clientId);
             if (oldObserver?.ws && oldObserver.ws !== ws) oldObserver.ws.close(4409, 'Metadata connection replaced by same identity');
-            room.observers.set(clientId, { ws });
+            room.observers.set(clientId, { ws, userId });
             send(ws, { type: 'observing', online: Boolean(room.host) });
             send(ws, { type: 'debug-permissions', enabled: debugAllowed(debugAllowlist, room.id, room.clients.find(client => client.id === clientId)) });
             const announcement = adminState.read().announcement;
@@ -275,7 +672,8 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
             send(room.host, { type: 'detach', session: oldConnection.session });
             oldConnection.ws.close(4409, 'Phone connection replaced by same identity');
           }
-          room.connections.set(clientId, { ws, session, p2pProbe: room.p2pProbe && message.p2pProbe === 1,
+          room.connections.set(clientId, { ws, session, p2pProbe: Boolean(userId) && room.p2pProbe && message.p2pProbe === 1,
+            userId,
             repeat: room.p2pProbeRepeat, signals: 0, probeStarted: 0, outbound: Promise.resolve(), queuedBytes: 0,
             relayAdmitted: false, relayExempt: false,
             capacityExempt: debugAllowed(debugAllowlist, room.id, room.clients.find(client => client.id === clientId)) });
@@ -285,9 +683,99 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
           const announcement = adminState.read().announcement;
           if (announcement) send(ws, { type: 'announcement', announcement });
           send(room.host, { type: 'attach', session, clientId, p2pProbe: room.connections.get(clientId).p2pProbe ? 1 : 0 }); return;
-        }
+        }
+        if (role === 'device-manager') {
+          if (!room.clients.some(item => item.id === clientId)) return fail(4401, 'Device authorization revoked');
+          if (!['devices-list', 'device-revoke'].includes(message.type)) return fail(1008, 'Invalid device management command');
+          await manageDevices(room, ws, message, clientId); return;
+        }
         if (role === 'host') {
           if (room.host !== ws) return;
+          if (['devices-list', 'device-revoke'].includes(message.type)) { await manageDevices(room, ws, message); return; }
+          if (message.type === 'device-connected') {
+            const at = new Date(Math.min(Date.parse(message.at), Date.now())).toISOString();
+            if (!validId(message.clientId)) return fail(1008, 'Invalid mobile identity');
+            await recordConnection(room, message.clientId, at, deviceInfo(message));
+            return;
+          }
+          if (meter && ['usage-arm', 'usage-message', 'usage-cancel', 'usage-turn', 'usage-observer-lost'].includes(message.type)) {
+            if (message.type === 'usage-observer-lost') {
+              for (const task of room.usageTasks.values()) {
+                try { await meter.lost(task); } catch (error) { log({ event: 'usage-error', message: error.message }); }
+              }
+              room.usageTasks.clear();
+              return;
+            }
+            const armKey = `${message.session}:${message.requestId}`;
+            const connection = [...room.connections.values()].find(item => item.session === message.session);
+            if (message.type === 'usage-arm') {
+              if (!connection?.userId || !Number.isSafeInteger(message.requestId) || message.requestId < 1 ||
+                  (message.threadId !== null && (!plainText(message.threadId, 128, false)))) {
+                diagnostics?.record('usage', 'arm-rejected', !connection?.userId ? 'account-missing' : 'invalid-request');
+                return;
+              }
+              for (const [key, arm] of room.usageArms) if (Date.now() - arm.at > 120000) room.usageArms.delete(key);
+              if (room.usageArms.size >= 256) return;
+              room.usageArms.set(armKey, { userId: connection.userId,
+                clientId: [...room.connections.entries()].find(([, item]) => item === connection)?.[0],
+                session: message.session, at: Date.now() });
+              return;
+            }
+            if (message.type === 'usage-cancel') {
+              room.usageArms.delete(armKey); return;
+            }
+            if (message.type === 'usage-message') {
+              const arm = room.usageArms.get(armKey);
+              room.usageArms.delete(armKey);
+              if (!arm || Date.now() - arm.at > 120000 || !plainText(message.messageKey, 128, false)) {
+                diagnostics?.record('usage', 'message-rejected', !arm ? 'arm-missing' : 'expired-or-invalid');
+                return;
+              }
+              try {
+                await meter.action(arm, room.id, arm.clientId, 'message', message.messageKey);
+                if (['start', 'steer'].includes(message.turnKind) &&
+                    plainText(message.threadId, 80, false) && plainText(message.turnId, 80, false)) {
+                  const key = `${message.threadId}:${message.turnId}`;
+                  if (key.length <= 128) {
+                    const counted = await meter.action(arm, room.id, arm.clientId, 'turn', key);
+                    if (counted && message.turnKind === 'steer') diagnostics?.record('usage', 'turn-recovered', 'steer');
+                    if (!room.usageTasks.has(key) && message.observerReady === true && message.completed !== true &&
+                        (message.turnKind === 'start' || message.active === true)) {
+                      const task = await meter.turnOrigin(room.id, key);
+                      if (task) {
+                        await meter.pulse(task, true, room.id, task.clientId, counted ? key : randomUUID());
+                        room.usageTasks.set(key, task);
+                      }
+                    }
+                  }
+                }
+              } catch (error) { diagnostics?.record('usage', 'message-error', 'database'); log({ event: 'usage-error', message: error.message }); }
+              return;
+            }
+            if (!['turn/started', 'turn/completed', 'heartbeat', 'resume', 'inactive'].includes(message.method) ||
+                !plainText(message.threadId, 80, false) || !plainText(message.turnId, 80, false)) return;
+            const key = `${message.threadId}:${message.turnId}`;
+            if (key.length > 128) return;
+            let task = room.usageTasks.get(key);
+            try {
+              if (message.method === 'resume' && !task) {
+                task = await meter.turnOrigin(room.id, key);
+                if (!task) { diagnostics?.record('usage', 'turn-resume', 'origin-missing'); return; }
+                await meter.pulse(task, true, room.id, task.clientId, `${key}:${randomUUID()}`);
+                diagnostics?.record('usage', 'turn-resume', 'confirmed');
+                room.usageTasks.set(key, task);
+              } else if (task && message.method === 'heartbeat') await meter.pulse(task, true, room.id, task.clientId);
+              else if (task && message.method === 'inactive') {
+                await meter.lost(task);
+                room.usageTasks.delete(key);
+              }
+              else if (task && message.method === 'turn/completed') {
+                await meter.pulse(task, false, room.id, task.clientId);
+                room.usageTasks.delete(key);
+              }
+            } catch (error) { log({ event: 'usage-error', message: error.message }); }
+            return;
+          }
           if (message.type === 'lan-candidates') {
             room.lanCandidates = normalizeLanCandidates(message.candidates);
             for (const connection of room.connections.values()) send(connection.ws, { type: 'lan-candidates', candidates: room.lanCandidates });
@@ -300,8 +788,23 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
           if (message.type === 'pair-code') {
             send(ws, { type: 'pair-code', commandId: message.commandId, room: room.id, ...invitation(room) }); return;
           }
+          if (['invite-create', 'invite-list', 'invite-revoke'].includes(message.type)) {
+            try {
+              if (!room.durable) throw new Error('长期邀请需要持久工作站身份');
+              let result;
+              if (message.type === 'invite-create') result = longInvitations.create(room.id, message.expires);
+              else if (message.type === 'invite-list') result = { invitations: longInvitations.list().filter(item => item.room === room.id) };
+              else {
+                if (!longInvitations.list().some(item => item.id === message.id && item.room === room.id)) throw new Error('未找到本工作站的邀请');
+                longInvitations.revoke(message.id);
+                result = { id: message.id, revoked: true };
+              }
+              send(ws, { type: message.type, commandId: message.commandId, ...result });
+            } catch (error) { send(ws, { type: message.type, commandId: message.commandId, error: error.message }); }
+            return;
+          }
           if (message.type === 'revoke') {
-            commit(room, { clients: [], revision: room.revision + 1 });
+            await commit(room, current => ({ clients: [], revision: current.revision + 1 }));
             room.pairingHash = undefined;
             for (const connection of room.connections.values()) {
               releaseRelay(connection);
@@ -309,8 +812,12 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
               connection.ws.close(4401, 'Device authorization revoked');
             }
             room.connections.clear();
+            for (const client of room.uploadClients?.values() || []) client.ws.close(4401, 'Device authorization revoked');
+            room.uploadClients?.clear();
             for (const observer of room.observers.values()) observer.ws.close(4401, 'Device authorization revoked');
             room.observers.clear();
+            for (const socket of room.deviceManagers?.keys() || []) socket.close(4401, 'Device authorization revoked');
+            room.deviceManagers?.clear();
             send(ws, { type: 'authorization-changed', clients: [], revision: room.revision });
             send(ws, { type: 'revoked', commandId: message.commandId, room: room.id }); return;
           }
@@ -320,49 +827,76 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
           else if (message.type === 'ready') queueClientMessage(connection, { type: 'ready', p2pProbe: connection.p2pProbe ? 1 : 0,
             p2pProbeRepeat: connection.p2pProbe && connection.repeat });
           else if (message.type === 'p2p-probe' && connection.p2pProbe && validProbeSignal(message)) {
-            if (connection.probeId !== message.probeId) return;
-            if (++connection.signals > 150) return fail(1008, 'Probe signal limit');
+            const diagnostic = message.purpose === 'diagnostic';
+            const file = message.purpose === 'file';
+            if (message.purpose && !diagnostic && !file) return fail(1008, 'Invalid probe purpose');
+            if (connection[file ? 'fileProbeId' : diagnostic ? 'diagnosticProbeId' : 'probeId'] !== message.probeId) return;
+            if (++connection[file ? 'fileSignals' : diagnostic ? 'diagnosticSignals' : 'signals'] > 150) return fail(1008, 'Probe signal limit');
             send(connection.ws, { ...message, session: undefined });
           }
           else if (message.type === 'detach') connection.ws.close(1011, 'Local Bridge unavailable');
           else fail();
+        } else if (role === 'file-host' && room.uploadHost === ws) {
+          const client = room.uploadClients.get(message.session);
+          if (!client) return;
+          if (message.type === 'file-frame' && typeof message.payload === 'string' && message.payload.length <= 512 * 1024) {
+            if (client.ws.bufferedAmount > 1024 * 1024) return client.ws.close(1013, 'File receiver too slow');
+            send(client.ws, { type: 'file-frame', payload: message.payload });
+          } else if (message.type === 'file-close') client.ws.close(1011, 'File receiver unavailable');
+          else fail(1008, 'Invalid file frame');
+        } else if (role === 'file-client' && room.uploadClients?.get(session)?.ws === ws) {
+          if (message.type !== 'file-frame' || typeof message.payload !== 'string' || message.payload.length > 512 * 1024) return fail(1008, 'Invalid file frame');
+          if (room.uploadHost?.bufferedAmount > 1024 * 1024) return fail(1013, 'File receiver too slow');
+          send(room.uploadHost, { type: 'file-frame', session, payload: message.payload });
         } else if (role === 'observer' && room.observers.get(clientId)?.ws === ws && message.type === 'official-computer') {
           const computer = normalizeOfficialComputer(message);
-          commit(room, { officialComputer: computer });
+          await commit(room, { officialComputer: computer });
           send(ws, { type: 'official-computer-saved', computer });
         } else if (role === 'client' && room.connections.get(clientId)?.ws === ws && message.type === 'p2p-probe') {
           const connection = room.connections.get(clientId);
           if (!connection.p2pProbe || !validProbeSignal(message)) return fail(1008, 'Invalid probe signal');
+          const diagnostic = message.purpose === 'diagnostic';
+          const file = message.purpose === 'file';
+          if (message.purpose && !diagnostic && !file) return fail(1008, 'Invalid probe purpose');
+          const idField = file ? 'fileProbeId' : diagnostic ? 'diagnosticProbeId' : 'probeId';
+          const signalsField = file ? 'fileSignals' : diagnostic ? 'diagnosticSignals' : 'signals';
+          const startedField = file ? 'fileProbeStarted' : diagnostic ? 'diagnosticProbeStarted' : 'probeStarted';
           if (message.kind === 'start') {
-            if (connection.probeId && (!connection.repeat || Date.now() - connection.probeStarted < 2000)) {
-              send(ws, { type: 'p2p-probe', version: 1, probeId: message.probeId, kind: 'close' }); return;
+            if (connection[idField] && (!connection.repeat || Date.now() - connection[startedField] < 2000)) {
+              send(ws, { type: 'p2p-probe', version: 1, probeId: message.probeId,
+                ...(message.purpose ? { purpose: message.purpose } : {}), kind: 'close' }); return;
             }
-            connection.probeId = message.probeId; connection.signals = 0; connection.probeStarted = Date.now();
+            connection[idField] = message.probeId; connection[signalsField] = 0; connection[startedField] = Date.now();
           }
-          if (connection.probeId !== message.probeId) return;
-          if (++connection.signals > 150) return fail(1008, 'Probe signal limit');
+          if (connection[idField] !== message.probeId) return;
+          if (++connection[signalsField] > 150) return fail(1008, 'Probe signal limit');
           send(room.host, { ...message, session });
+          if (diagnostic && message.kind === 'close') connection.diagnosticProbeId = undefined;
         } else if (room.connections.get(clientId)?.ws === ws && message.type === 'p2p-route' && message.direct === 1) {
           releaseRelay(room.connections.get(clientId));
         } else if (room.connections.get(clientId)?.ws === ws && message.type === 'data' && typeof message.payload === 'string') {
           const connection = room.connections.get(clientId);
-          if (!controlPayload(message.payload) && !admitRelay(connection, room)) {
+          if (!connection.userId && !managementPayload(message.payload)) return fail(4431, 'Account login required');
+          if (connection.userId && !controlPayload(message.payload) && !admitRelay(connection, room)) {
             ws.close(4428, 'Server busy'); return;
           }
           send(room.host, { type: 'data', session, payload: message.payload });
-        } else fail();
-      } catch (error) { log({ event: 'request-error', role, message: 'Relay operation failed' }); ws.close(1011, 'Relay operation failed'); }
-    });
-  });
+        } else fail();
+      } catch (error) { log({ event: 'request-error', role, message: 'Relay operation failed' }); ws.close(1011, 'Relay operation failed'); }
+      finally { pendingMessages--; pendingBytes -= size; }
+      }).catch(() => ws.close(1011, 'Relay operation failed'));
+    });
+  });
   await new Promise((resolve, reject) => { server.once('error', reject); server.listen(port, '127.0.0.1', resolve); });
   listenUrl = `ws://127.0.0.1:${server.address().port}/relay`;
   return {
     url: listenUrl, hostKey,
-    async close() {
-      for (const ws of wss.clients) ws.terminate();
-      await new Promise(resolve => wss.close(resolve));
-      await new Promise(resolve => server.close(resolve));
-    },
+    async close() {
+      for (const ws of wss.clients) ws.terminate();
+      await new Promise(resolve => wss.close(resolve));
+      await new Promise(resolve => server.close(resolve));
+      if (database) await database.close();
+    },
   };
 }
 
@@ -436,6 +970,20 @@ function plainText(value, limit, empty) {
   return typeof value === 'string' && (empty || value.trim().length > 0) && value.trim().length <= limit && !/[\u0000-\u001f\u007f]/.test(value);
 }
 
+// Device-authorized management must not become an anonymous chat tunnel.
+function managementPayload(value) {
+  try {
+    const message = JSON.parse(value);
+    if (['unsubscribe', 'cancel', 'response-ack'].includes(message.type)) return true;
+    if (message.type === 'subscribe') return message.path === '/api/shared-recovery/events';
+    if (message.type !== 'request') return false;
+    const method = message.method || 'GET';
+    if (method === 'GET') return ['/api/health', '/api/official-remote/status'].includes(message.path) ||
+      /^\/api\/threads\/[0-9a-f-]{28,64}\/model-changes(?:\?|$)/i.test(message.path);
+    return method === 'POST' && message.path === '/api/official-remote/pairing';
+  } catch { return false; }
+}
+
 function controlPayload(value) {
   try {
     const message = JSON.parse(value);
@@ -456,13 +1004,3 @@ function readBody(request, limit) {
     request.on('end', () => resolve(value)); request.on('error', reject);
   });
 }
-
-function adminPage() {
-  return `<!doctype html><html lang="zh-CN"><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Code Relax 管理</title><style>
-body{margin:0;background:#0d1210;color:#eef4f0;font:15px system-ui,sans-serif}main{max-width:760px;margin:40px auto;padding:0 20px}section{background:#151d19;border:1px solid #2a3931;border-radius:14px;padding:18px;margin:16px 0}h1{font-size:24px}h2{font-size:17px}label{display:block;margin:12px 0 6px;color:#aab7af}input,textarea{box-sizing:border-box;width:100%;padding:11px;border:1px solid #43564b;border-radius:9px;background:#0d1210;color:#eef4f0}textarea{min-height:120px;resize:vertical}button{margin:12px 8px 0 0;padding:10px 16px;border:0;border-radius:9px;background:#2c7653;color:white}button.secondary{background:#39443e}pre{white-space:pre-wrap;color:#b9c8bf}.row{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:10px}.metric{padding:12px;background:#0d1210;border-radius:9px}.metric b{display:block;font-size:22px}</style><main><h1>Code Relax 管理</h1><section><h2>运行状态</h2><div id="metrics" class="row"></div><button onclick="load()">刷新</button></section><section><h2>服务器转发容量</h2><label>最大并发 WSS 转发会话</label><input id="limit" type="number" min="1" max="256"><button onclick="saveLimit()">保存</button></section><section><h2>系统公告</h2><label>标题</label><input id="title" maxlength="80"><label>正文</label><textarea id="message" maxlength="2000"></textarea><button onclick="publish()">发布</button><button class="secondary" onclick="withdraw()">撤下</button><pre id="current"></pre></section><pre id="result"></pre><script>
-const request=async(path,options={})=>{const response=await fetch(path,options);const body=await response.json();if(!response.ok)throw new Error(body.error||('HTTP '+response.status));return body};
-async function load(){try{const s=await request('/admin/api/status');limit.value=s.maxRelaySessions;metrics.innerHTML='<div class="metric"><b>'+s.activeRelaySessions+'</b>受限转发 / '+s.maxRelaySessions+'</div><div class="metric"><b>'+s.activeExemptRelaySessions+'</b>白名单转发</div><div class="metric"><b>'+s.websocketConnections+'</b>WebSocket</div><div class="metric"><b>'+s.onlineComputers+'</b>在线工作站</div><div class="metric"><b>'+s.activePhones+'</b>活动手机</div>';current.textContent=s.announcement?s.announcement.title+'\\n'+s.announcement.message+'\\n'+s.announcement.publishedAt:'当前无公告';}catch(e){result.textContent=e.message}}
-const write=(method,path,body)=>request(path,{method,headers:{'Content-Type':'application/json','X-Code-Relax-Admin':'1'},body:JSON.stringify(body)}).then(()=>{result.textContent='已保存';return load()}).catch(e=>result.textContent=e.message);
-function saveLimit(){return write('PUT','/admin/api/settings',{maxRelaySessions:Number(limit.value)})}function publish(){return write('PUT','/admin/api/announcement',{title:title.value,message:message.value})}function withdraw(){return write('DELETE','/admin/api/announcement',{})}load();
-</script></main></html>`;
-}