@walkhi/code-relax 0.1.0-beta.22 → 0.1.0-beta.24

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

@@ -1,54 +1,54 @@
-const MAX_BATCH = 200;
-
-export function relayDiagnostics(pool, onError = () => {}) {
-  let tail = Promise.resolve();
-  function validSource(source) {
-    if (!/^[a-z-]{1,32}$/.test(source)) throw new Error('Invalid diagnostic source');
-    return source;
-  }
-  function serialize(action) {
-    const result = tail.then(action);
-    tail = result.catch(error => { onError(error); });
-    return result;
-  }
-  function record(source, event, detail) {
-    validSource(source);
-    if (!/^[a-z-]{1,32}$/.test(event) || !/^[a-z-]{1,64}$/.test(detail)) throw new Error('Invalid diagnostic event');
-    void serialize(async () => {
-      await pool.execute('INSERT INTO relay_diagnostics (created_at,source,event,detail) VALUES (UTC_TIMESTAMP(3),?,?,?)', [source, event, detail]);
-      await pool.execute('DELETE FROM relay_diagnostics WHERE created_at < UTC_TIMESTAMP(3) - INTERVAL 1 DAY');
-    }).catch(() => {});
-  }
-  async function read(source) {
-    validSource(source);
-    return serialize(async () => {
-      const [rows] = await pool.execute(`SELECT id,created_at,source,event,detail FROM relay_diagnostics
-        WHERE source=? ORDER BY id LIMIT ${MAX_BATCH + 1}`, [source]);
-      return { rows: rows.slice(0, MAX_BATCH), hasMore: rows.length > MAX_BATCH };
-    });
-  }
-  async function clear(source) {
-    validSource(source);
-    return serialize(async () => {
-      const [result] = await pool.execute('DELETE FROM relay_diagnostics WHERE source=?', [source]);
-      return { cleared: result.affectedRows };
-    });
-  }
-  async function drain(source) {
-    validSource(source);
-    return serialize(async () => {
-      const db = await pool.getConnection();
-      try {
-        await db.beginTransaction();
-        const [rows] = await db.execute(`SELECT id,created_at,source,event,detail FROM relay_diagnostics
-          WHERE source=? ORDER BY id LIMIT ${MAX_BATCH + 1} FOR UPDATE`, [source]);
-        const selected = rows.slice(0, MAX_BATCH);
-        if (selected.length) await db.execute('DELETE FROM relay_diagnostics WHERE source=? AND id <= ?', [source, selected.at(-1).id]);
-        await db.commit();
-        return { rows: selected, hasMore: rows.length > MAX_BATCH };
-      } catch (error) { await db.rollback(); throw error; }
-      finally { db.release(); }
-    });
-  }
-  return { record, read, clear, drain };
-}
+const MAX_BATCH = 200;
+
+export function relayDiagnostics(pool, onError = () => {}) {
+  let tail = Promise.resolve();
+  function validSource(source) {
+    if (!/^[a-z-]{1,32}$/.test(source)) throw new Error('Invalid diagnostic source');
+    return source;
+  }
+  function serialize(action) {
+    const result = tail.then(action);
+    tail = result.catch(error => { onError(error); });
+    return result;
+  }
+  function record(source, event, detail) {
+    validSource(source);
+    if (!/^[a-z-]{1,32}$/.test(event) || !/^[a-z0-9=;.-]{1,64}$/.test(detail)) throw new Error('Invalid diagnostic event');
+    return serialize(async () => {
+      await pool.execute('INSERT INTO relay_diagnostics (created_at,source,event,detail) VALUES (UTC_TIMESTAMP(3),?,?,?)', [source, event, detail]);
+      await pool.execute('DELETE FROM relay_diagnostics WHERE created_at < UTC_TIMESTAMP(3) - INTERVAL 1 DAY');
+    }).catch(() => {});
+  }
+  async function read(source) {
+    validSource(source);
+    return serialize(async () => {
+      const [rows] = await pool.execute(`SELECT id,created_at,source,event,detail FROM relay_diagnostics
+        WHERE source=? ORDER BY id LIMIT ${MAX_BATCH + 1}`, [source]);
+      return { rows: rows.slice(0, MAX_BATCH), hasMore: rows.length > MAX_BATCH };
+    });
+  }
+  async function clear(source) {
+    validSource(source);
+    return serialize(async () => {
+      const [result] = await pool.execute('DELETE FROM relay_diagnostics WHERE source=?', [source]);
+      return { cleared: result.affectedRows };
+    });
+  }
+  async function drain(source) {
+    validSource(source);
+    return serialize(async () => {
+      const db = await pool.getConnection();
+      try {
+        await db.beginTransaction();
+        const [rows] = await db.execute(`SELECT id,created_at,source,event,detail FROM relay_diagnostics
+          WHERE source=? ORDER BY id LIMIT ${MAX_BATCH + 1} FOR UPDATE`, [source]);
+        const selected = rows.slice(0, MAX_BATCH);
+        if (selected.length) await db.execute('DELETE FROM relay_diagnostics WHERE source=? AND id <= ?', [source, selected.at(-1).id]);
+        await db.commit();
+        return { rows: selected, hasMore: rows.length > MAX_BATCH };
+      } catch (error) { await db.rollback(); throw error; }
+      finally { db.release(); }
+    });
+  }
+  return { record, read, clear, drain };
+}

package/dist/src/self-relay/email-accounts.mjs

@@ -1,141 +1,158 @@
-import fs from 'node:fs';
-import { createHash, createHmac, randomBytes, randomInt, randomUUID, timingSafeEqual } from 'node:crypto';
-import { tencentAccountProvider } from '../../relay-admin/tencent-account-provider.mjs';
-
-const sqlTime = value => value.replace('T', ' ').replace(/Z$/, '');
-const isoTime = value => value.replace(' ', 'T') + 'Z';
-const error = (status, message) => Object.assign(new Error(message), { status });
-const tokenHash = token => createHash('sha256').update(token).digest('hex');
-const normalizeEmail = value => {
-  if (typeof value !== 'string') throw error(400, 'Invalid email address');
-  const email = value.trim().toLowerCase();
-  if (email.length > 254 || !/^[a-z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-z0-9-]+(?:\.[a-z0-9-]+)+$/.test(email)) {
-    throw error(400, 'Invalid email address');
-  }
-  return email;
-};
-
-export function openEmailAccounts(pool, configFile, providerOverride) {
-  const config = JSON.parse(fs.readFileSync(configFile, 'utf8'));
-  if (![config.secretId, config.secretKey, config.captchaAppSecretKey, config.fromEmailAddress, config.sesRegion]
-    .every(value => typeof value === 'string' && value.length > 0) ||
-    !Number.isSafeInteger(config.captchaAppId) || config.captchaAppId < 1 ||
-    !Number.isSafeInteger(config.emailTemplateId) || config.emailTemplateId < 1 ||
-    typeof config.codePepper !== 'string' || config.codePepper.length < 32) {
-    throw new Error('Incomplete relay account configuration');
-  }
-  const provider = providerOverride || tencentAccountProvider(config);
-  const codeHash = (email, code) => createHmac('sha256', config.codePepper).update(`${email}\0${code}`).digest('hex');
-  const scopeHash = value => createHmac('sha256', config.codePepper).update(value).digest('hex');
-
-  async function requestCode({ email: rawEmail, ticket, randstr }, ip) {
-    const email = normalizeEmail(rawEmail);
-    if (typeof ticket !== 'string' || !ticket || ticket.length > 2048 ||
-        typeof randstr !== 'string' || !randstr || randstr.length > 128) throw error(400, 'Invalid human verification');
-    if (!ip || ip.length > 64) throw error(400, 'Invalid client address');
-    // A cheap pre-check precedes the billable human verification.
-    const [recent] = await pool.execute('SELECT sent_at FROM email_login_challenges WHERE email = ? AND sent_at > UTC_TIMESTAMP(3) - INTERVAL 60 SECOND', [email]);
-    if (recent.length) throw error(429, 'Please wait before requesting another code');
-    const [ipLimit] = await pool.execute(`SELECT request_count FROM email_send_limits
-      WHERE scope_hash=? AND window_start>=UTC_TIMESTAMP() - INTERVAL 1 HOUR ORDER BY window_start DESC LIMIT 1`, [scopeHash(`ip:${ip}`)]);
-    if (ipLimit[0]?.request_count >= 20) throw error(429, 'Too many email requests');
-    if (!await provider.verifyHuman(ticket, randstr, ip)) throw error(403, 'Human verification failed');
-    const code = String(randomInt(0, 1000000)).padStart(6, '0');
-    const hash = codeHash(email, code);
-    const windowStart = sqlTime(new Date(Math.floor(Date.now() / 3600000) * 3600000).toISOString()).slice(0, 19);
-    const db = await pool.getConnection();
-    try {
-      await db.beginTransaction();
-      for (const [scope, limit] of [[`email:${email}`, 5], [`ip:${ip}`, 20]]) {
-        const key = scopeHash(scope);
-        await db.execute('INSERT INTO email_send_limits (scope_hash,window_start,request_count) VALUES (?,?,1) ON DUPLICATE KEY UPDATE request_count=request_count+1', [key, windowStart]);
-        const [rows] = await db.execute('SELECT request_count FROM email_send_limits WHERE scope_hash=? AND window_start=? FOR UPDATE', [key, windowStart]);
-        if (rows[0].request_count > limit) throw error(429, 'Too many email requests');
-      }
-      const [existing] = await db.execute('SELECT sent_at FROM email_login_challenges WHERE email=? FOR UPDATE', [email]);
-      if (existing.length && Date.now() - new Date(`${existing[0].sent_at.replace(' ', 'T')}Z`).getTime() < 60000) {
-        throw error(429, 'Please wait before requesting another code');
-      }
-      await db.execute(`INSERT INTO email_login_challenges (email,code_hash,expires_at,attempts,sent_at)
-        VALUES (?, ?, UTC_TIMESTAMP(3) + INTERVAL 10 MINUTE, 0, UTC_TIMESTAMP(3))
-        ON DUPLICATE KEY UPDATE code_hash=VALUES(code_hash),expires_at=VALUES(expires_at),attempts=0,sent_at=VALUES(sent_at)`, [email, hash]);
-      await db.commit();
-    } catch (failure) { await db.rollback(); throw failure; }
-    finally { db.release(); }
-    try { await provider.sendLoginCode(email, code); }
-    catch (failure) {
-      await pool.execute('DELETE FROM email_login_challenges WHERE email=? AND code_hash=?', [email, hash]);
-      throw error(503, 'Email delivery unavailable');
-    }
-    return { sent: true, expiresInSeconds: 600 };
-  }
-
-  async function verifyCode({ email: rawEmail, code }) {
-    const email = normalizeEmail(rawEmail);
-    if (typeof code !== 'string' || !/^\d{6}$/.test(code)) throw error(400, 'Invalid code');
-    const db = await pool.getConnection();
-    try {
-      await db.beginTransaction();
-      const [challenges] = await db.execute('SELECT code_hash,attempts,expires_at FROM email_login_challenges WHERE email=? FOR UPDATE', [email]);
-      const challenge = challenges[0];
-      if (!challenge || new Date(`${challenge.expires_at.replace(' ', 'T')}Z`).getTime() <= Date.now()) throw error(401, 'Code expired or incorrect');
-      const supplied = Buffer.from(codeHash(email, code), 'hex');
-      if (!timingSafeEqual(supplied, Buffer.from(challenge.code_hash, 'hex'))) {
-        if (challenge.attempts >= 4) await db.execute('DELETE FROM email_login_challenges WHERE email=?', [email]);
-        else await db.execute('UPDATE email_login_challenges SET attempts=attempts+1 WHERE email=?', [email]);
-        await db.commit();
-        throw error(401, 'Code expired or incorrect');
-      }
-      await db.execute('DELETE FROM email_login_challenges WHERE email=?', [email]);
-      const [identities] = await db.execute(`SELECT u.id,u.status FROM user_login_identities i
-        JOIN users u ON u.id=i.user_id WHERE i.kind='email' AND i.normalized_value=?`, [email]);
-      let userId = identities[0]?.id;
-      if (identities[0]?.status === 'disabled') throw error(403, 'Account unavailable');
-      if (!userId) {
-        userId = randomUUID();
-        await db.execute('INSERT INTO users (id,status,created_at,updated_at) VALUES (?,\'active\',UTC_TIMESTAMP(3),UTC_TIMESTAMP(3))', [userId]);
-        await db.execute(`INSERT INTO user_login_identities (user_id,kind,normalized_value,verified_at,created_at)
-          VALUES (?,'email',?,UTC_TIMESTAMP(3),UTC_TIMESTAMP(3))`, [userId, email]);
-      }
-      const token = randomBytes(32).toString('base64url');
-      await db.execute(`INSERT INTO user_sessions (token_hash,user_id,created_at,expires_at)
-        VALUES (?,?,UTC_TIMESTAMP(3),UTC_TIMESTAMP(3) + INTERVAL 30 DAY)`, [tokenHash(token), userId]);
-      await db.commit();
-      return { token, user: { id: userId, email }, expiresInSeconds: 30 * 86400 };
-    } catch (failure) { await db.rollback(); throw failure; }
-    finally { db.release(); }
-  }
-
-  async function current(token) {
-    if (typeof token !== 'string' || !/^[A-Za-z0-9_-]{43}$/.test(token)) throw error(401, 'Unauthorized');
-    const [rows] = await pool.execute(`SELECT u.id,i.normalized_value AS email,s.expires_at FROM user_sessions s
-      JOIN users u ON u.id=s.user_id JOIN user_login_identities i ON i.user_id=u.id AND i.kind='email'
-      WHERE s.token_hash=? AND s.revoked_at IS NULL AND s.expires_at>UTC_TIMESTAMP(3) AND u.status='active'`, [tokenHash(token)]);
-    if (!rows.length) throw error(401, 'Unauthorized');
-    return { id: rows[0].id, email: rows[0].email, expiresAt: isoTime(rows[0].expires_at) };
-  }
-
-  async function usage(userId) {
-    const [settings] = await pool.query('SELECT mode FROM relay_usage_settings WHERE id=1');
-    if (settings.length !== 1) throw new Error('Missing relay usage settings');
-    const [budgets] = await pool.execute(`SELECT period_start,period_end,limit_seconds,used_seconds FROM relay_usage_budgets
-      WHERE user_id=? AND period_start<=UTC_TIMESTAMP(3) AND period_end>UTC_TIMESTAMP(3)
-      ORDER BY period_start DESC LIMIT 2`, [userId]);
-    if (budgets.length > 1) throw new Error('Overlapping relay usage budgets');
-    const budget = budgets[0];
-    const [totals] = await pool.execute('SELECT task_seconds FROM relay_usage_totals WHERE user_id=?', [userId]);
-    return { mode: settings[0].mode, periodStart: budget ? isoTime(budget.period_start) : null,
-      periodEnd: budget ? isoTime(budget.period_end) : null,
-      limitSeconds: budget?.limit_seconds == null ? null : Number(budget.limit_seconds),
-      usedSeconds: budget ? Number(budget.used_seconds) : 0,
-      taskSeconds: Number(totals[0]?.task_seconds || 0) };
-  }
-
-  async function logout(token) {
-    await current(token);
-    await pool.execute('UPDATE user_sessions SET revoked_at=UTC_TIMESTAMP(3) WHERE token_hash=? AND revoked_at IS NULL', [tokenHash(token)]);
-    return { ok: true };
-  }
-
-  return { captchaAppId: config.captchaAppId, requestCode, verifyCode, current, usage, logout };
-}
+import fs from 'node:fs';
+import { createHash, createHmac, randomBytes, randomInt, randomUUID, timingSafeEqual } from 'node:crypto';
+import { tencentAccountProvider } from '../../relay-admin/tencent-account-provider.mjs';
+
+const sqlTime = value => value.replace('T', ' ').replace(/Z$/, '');
+const isoTime = value => value.replace(' ', 'T') + 'Z';
+const error = (status, message) => Object.assign(new Error(message), { status });
+const tokenHash = token => createHash('sha256').update(token).digest('hex');
+const normalizeEmail = value => {
+  if (typeof value !== 'string') throw error(400, 'Invalid email address');
+  const email = value.trim().toLowerCase();
+  if (email.length > 254 || !/^[a-z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-z0-9-]+(?:\.[a-z0-9-]+)+$/.test(email)) {
+    throw error(400, 'Invalid email address');
+  }
+  return email;
+};
+
+export function openEmailAccounts(pool, configFile, providerOverride) {
+  const config = JSON.parse(fs.readFileSync(configFile, 'utf8'));
+  if (![config.secretId, config.secretKey, config.captchaAppSecretKey, config.fromEmailAddress, config.sesRegion]
+    .every(value => typeof value === 'string' && value.length > 0) ||
+    !Number.isSafeInteger(config.captchaAppId) || config.captchaAppId < 1 ||
+    !Number.isSafeInteger(config.emailTemplateId) || config.emailTemplateId < 1 ||
+    typeof config.codePepper !== 'string' || config.codePepper.length < 32) {
+    throw new Error('Incomplete relay account configuration');
+  }
+  const provider = providerOverride || tencentAccountProvider(config);
+  const codeHash = (email, code) => createHmac('sha256', config.codePepper).update(`${email}\0${code}`).digest('hex');
+  const scopeHash = value => createHmac('sha256', config.codePepper).update(value).digest('hex');
+
+  async function requestCode({ email: rawEmail, ticket, randstr }, ip) {
+    const email = normalizeEmail(rawEmail);
+    if (typeof ticket !== 'string' || !ticket || ticket.length > 2048 ||
+        typeof randstr !== 'string' || !randstr || randstr.length > 128) throw error(400, 'Invalid human verification');
+    if (!ip || ip.length > 64) throw error(400, 'Invalid client address');
+    const [identities] = await pool.execute("SELECT u.status FROM user_login_identities i JOIN users u ON u.id=i.user_id WHERE i.kind='email' AND i.normalized_value=?", [email]);
+    if (identities[0]?.status === 'cancelled') throw error(409, '该邮箱关联的账号正在注销清理中，暂时无法注册或登录。相关信息将在注销后7天内删除，清理完成后可重新注册。');
+    // A cheap pre-check precedes the billable human verification.
+    const [recent] = await pool.execute('SELECT sent_at FROM email_login_challenges WHERE email = ? AND sent_at > UTC_TIMESTAMP(3) - INTERVAL 60 SECOND', [email]);
+    if (recent.length) throw error(429, 'Please wait before requesting another code');
+    const [ipLimit] = await pool.execute(`SELECT request_count FROM email_send_limits
+      WHERE scope_hash=? AND window_start>=UTC_TIMESTAMP() - INTERVAL 1 HOUR ORDER BY window_start DESC LIMIT 1`, [scopeHash(`ip:${ip}`)]);
+    if (ipLimit[0]?.request_count >= 20) throw error(429, 'Too many email requests');
+    if (!await provider.verifyHuman(ticket, randstr, ip)) throw error(403, 'Human verification failed');
+    const code = String(randomInt(0, 1000000)).padStart(6, '0');
+    const hash = codeHash(email, code);
+    const windowStart = sqlTime(new Date(Math.floor(Date.now() / 3600000) * 3600000).toISOString()).slice(0, 19);
+    const db = await pool.getConnection();
+    try {
+      await db.beginTransaction();
+      for (const [scope, limit] of [[`email:${email}`, 5], [`ip:${ip}`, 20]]) {
+        const key = scopeHash(scope);
+        await db.execute('INSERT INTO email_send_limits (scope_hash,window_start,request_count) VALUES (?,?,1) ON DUPLICATE KEY UPDATE request_count=request_count+1', [key, windowStart]);
+        const [rows] = await db.execute('SELECT request_count FROM email_send_limits WHERE scope_hash=? AND window_start=? FOR UPDATE', [key, windowStart]);
+        if (rows[0].request_count > limit) throw error(429, 'Too many email requests');
+      }
+      const [existing] = await db.execute('SELECT sent_at FROM email_login_challenges WHERE email=? FOR UPDATE', [email]);
+      if (existing.length && Date.now() - new Date(`${existing[0].sent_at.replace(' ', 'T')}Z`).getTime() < 60000) {
+        throw error(429, 'Please wait before requesting another code');
+      }
+      await db.execute(`INSERT INTO email_login_challenges (email,code_hash,expires_at,attempts,sent_at)
+        VALUES (?, ?, UTC_TIMESTAMP(3) + INTERVAL 10 MINUTE, 0, UTC_TIMESTAMP(3))
+        ON DUPLICATE KEY UPDATE code_hash=VALUES(code_hash),expires_at=VALUES(expires_at),attempts=0,sent_at=VALUES(sent_at)`, [email, hash]);
+      await db.commit();
+    } catch (failure) { await db.rollback(); throw failure; }
+    finally { db.release(); }
+    try { await provider.sendLoginCode(email, code); }
+    catch (failure) {
+      await pool.execute('DELETE FROM email_login_challenges WHERE email=? AND code_hash=?', [email, hash]);
+      throw error(503, 'Email delivery unavailable');
+    }
+    return { sent: true, expiresInSeconds: 600 };
+  }
+
+  async function verifyCode({ email: rawEmail, code }) {
+    const email = normalizeEmail(rawEmail);
+    if (typeof code !== 'string' || !/^\d{6}$/.test(code)) throw error(400, 'Invalid code');
+    const db = await pool.getConnection();
+    try {
+      await db.beginTransaction();
+      const [challenges] = await db.execute('SELECT code_hash,attempts,expires_at FROM email_login_challenges WHERE email=? FOR UPDATE', [email]);
+      const challenge = challenges[0];
+      if (!challenge || new Date(`${challenge.expires_at.replace(' ', 'T')}Z`).getTime() <= Date.now()) throw error(401, 'Code expired or incorrect');
+      const supplied = Buffer.from(codeHash(email, code), 'hex');
+      if (!timingSafeEqual(supplied, Buffer.from(challenge.code_hash, 'hex'))) {
+        if (challenge.attempts >= 4) await db.execute('DELETE FROM email_login_challenges WHERE email=?', [email]);
+        else await db.execute('UPDATE email_login_challenges SET attempts=attempts+1 WHERE email=?', [email]);
+        await db.commit();
+        throw error(401, 'Code expired or incorrect');
+      }
+      await db.execute('DELETE FROM email_login_challenges WHERE email=?', [email]);
+      const [identities] = await db.execute(`SELECT u.id,u.status FROM user_login_identities i
+        JOIN users u ON u.id=i.user_id WHERE i.kind='email' AND i.normalized_value=?`, [email]);
+      let userId = identities[0]?.id;
+      if (identities[0]?.status === 'cancelled') throw error(409, '该邮箱关联的账号正在注销清理中，暂时无法注册或登录。相关信息将在注销后7天内删除，清理完成后可重新注册。');
+      if (identities[0]?.status === 'disabled') throw error(403, 'Account unavailable');
+      if (!userId) {
+        userId = randomUUID();
+        await db.execute('INSERT INTO users (id,status,created_at,updated_at) VALUES (?,\'active\',UTC_TIMESTAMP(3),UTC_TIMESTAMP(3))', [userId]);
+        await db.execute(`INSERT INTO user_login_identities (user_id,kind,normalized_value,verified_at,created_at)
+          VALUES (?,'email',?,UTC_TIMESTAMP(3),UTC_TIMESTAMP(3))`, [userId, email]);
+      }
+      const token = randomBytes(32).toString('base64url');
+      await db.execute(`INSERT INTO user_sessions (token_hash,user_id,created_at,expires_at)
+        VALUES (?,?,UTC_TIMESTAMP(3),UTC_TIMESTAMP(3) + INTERVAL 30 DAY)`, [tokenHash(token), userId]);
+      await db.commit();
+      return { token, user: { id: userId, email }, expiresInSeconds: 30 * 86400 };
+    } catch (failure) { await db.rollback(); throw failure; }
+    finally { db.release(); }
+  }
+
+  async function current(token) {
+    if (typeof token !== 'string' || !/^[A-Za-z0-9_-]{43}$/.test(token)) throw error(401, 'Unauthorized');
+    const [rows] = await pool.execute(`SELECT u.id,i.normalized_value AS email,s.expires_at FROM user_sessions s
+      JOIN users u ON u.id=s.user_id JOIN user_login_identities i ON i.user_id=u.id AND i.kind='email'
+      WHERE s.token_hash=? AND s.revoked_at IS NULL AND s.expires_at>UTC_TIMESTAMP(3) AND u.status='active'`, [tokenHash(token)]);
+    if (!rows.length) throw error(401, 'Unauthorized');
+    return { id: rows[0].id, email: rows[0].email, expiresAt: isoTime(rows[0].expires_at) };
+  }
+
+  async function usage(userId) {
+    const [settings] = await pool.query('SELECT mode FROM relay_usage_settings WHERE id=1');
+    if (settings.length !== 1) throw new Error('Missing relay usage settings');
+    const [budgets] = await pool.execute(`SELECT period_start,period_end,limit_seconds,used_seconds FROM relay_usage_budgets
+      WHERE user_id=? AND period_start<=UTC_TIMESTAMP(3) AND period_end>UTC_TIMESTAMP(3)
+      ORDER BY period_start DESC LIMIT 2`, [userId]);
+    if (budgets.length > 1) throw new Error('Overlapping relay usage budgets');
+    const budget = budgets[0];
+    const [totals] = await pool.execute('SELECT task_seconds FROM relay_usage_totals WHERE user_id=?', [userId]);
+    return { mode: settings[0].mode, periodStart: budget ? isoTime(budget.period_start) : null,
+      periodEnd: budget ? isoTime(budget.period_end) : null,
+      limitSeconds: budget?.limit_seconds == null ? null : Number(budget.limit_seconds),
+      usedSeconds: budget ? Number(budget.used_seconds) : 0,
+      taskSeconds: Number(totals[0]?.task_seconds || 0) };
+  }
+
+  async function logout(token) {
+    await current(token);
+    await pool.execute('UPDATE user_sessions SET revoked_at=UTC_TIMESTAMP(3) WHERE token_hash=? AND revoked_at IS NULL', [tokenHash(token)]);
+    return { ok: true };
+  }
+
+  async function cancelAccount(token) {
+    const user = await current(token);
+    const db = await pool.getConnection();
+    try {
+      await db.beginTransaction();
+      await db.execute("UPDATE users SET status='cancelled',cancelled_at=UTC_TIMESTAMP(3),updated_at=UTC_TIMESTAMP(3) WHERE id=? AND status='active'", [user.id]);
+      await db.execute('UPDATE user_sessions SET revoked_at=COALESCE(revoked_at,UTC_TIMESTAMP(3)) WHERE user_id=?', [user.id]);
+      await db.execute('UPDATE relay_usage_sessions SET ended_at=confirmed_until WHERE user_id=? AND ended_at IS NULL', [user.id]);
+      await db.commit();
+      return { ok: true };
+    } catch (failure) { await db.rollback(); throw failure; }
+    finally { db.release(); }
+  }
+
+  return { captchaAppId: config.captchaAppId, requestCode, verifyCode, current, usage, logout, cancelAccount };
+}