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

package/dist/bin/cleanup-accounts.mjs

@@ -0,0 +1,63 @@
+#!/usr/bin/env node
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { createHmac } from 'node:crypto';
+import mysql from 'mysql2/promise';
+import { relayDiagnostics } from '../src/self-relay/diagnostics.mjs';
+import { purgeCancelledAccounts } from '../src/self-relay/account-cleanup.mjs';
+
+const config = JSON.parse(await fs.readFile('/etc/codex-relay/mysql.json', 'utf8'));
+const account = JSON.parse(await fs.readFile('/etc/codex-relay/account.json', 'utf8'));
+if (typeof account.codePepper !== 'string' || account.codePepper.length < 32) throw new Error('Invalid account cleanup configuration');
+const pool = mysql.createPool({ ...config, connectionLimit: 1, dateStrings: true, timezone: 'Z' });
+const startedAt = Date.now();
+let stage = 'accounts';
+const diagnostics = relayDiagnostics(pool, () => console.error('Account cleanup diagnostic write failed'));
+const record = (event, detail) => diagnostics.record('account-cleanup', event, detail);
+let purged = 0;
+try {
+  await record('started', 'scheduled');
+  purged = await purgeCancelledAccounts(pool, value => createHmac('sha256', account.codePepper).update(value).digest('hex'));
+  await record('accounts-cleared', `count=${purged}`);
+  stage = 'backups';
+
+// Only deployment SQL snapshots; never follow symlinks or remove release directories.
+const root = '/opt/codex-relay/releases';
+if (await fs.realpath(root) !== root) throw new Error('Unexpected backup root');
+const files = [];
+for (const entry of await fs.readdir(root, { withFileTypes: true })) {
+  if (entry.isDirectory() && /^deploy-\d{8}T\d{6}Z$/.test(entry.name)) {
+    files.push(path.join(root, entry.name, 'database.sql'));
+  }
+}
+// Pre-deployment snapshots observed on this installation, before the release tool existed.
+for (const directory of ['before-email-20260925', 'before-usage-20260925']) {
+  files.push(path.join(root, directory, 'code_relax.sql'));
+}
+let backups = 0;
+for (const file of files) {
+  let stat;
+  try { stat = await fs.lstat(file); } catch (error) { if (error.code === 'ENOENT') continue; throw error; }
+  if (!stat.isFile() || stat.isSymbolicLink() || Date.now() - stat.mtimeMs < 86400000) continue;
+  if (await fs.realpath(file) !== file) throw new Error('Unexpected backup path');
+  await fs.unlink(file); backups++;
+}
+await record('backups-cleared', `count=${backups}`);
+stage = 'recovery-logs';
+// Rotate even on a quiet server so expired binlogs are actually purged.
+const maintenance = await mysql.createConnection({ user: 'root', socketPath: '/var/run/mysqld/mysqld.sock' });
+try {
+  const [settings] = await maintenance.query('SELECT @@GLOBAL.binlog_expire_logs_seconds AS seconds, @@GLOBAL.binlog_expire_logs_auto_purge AS autoPurge');
+  if (Number(settings[0].seconds) <= 0 || Number(settings[0].seconds) > 259200 || Number(settings[0].autoPurge) !== 1) {
+    throw new Error('MySQL recovery-log retention exceeds account cleanup policy');
+  }
+  await maintenance.query('FLUSH BINARY LOGS');
+} finally { await maintenance.end(); }
+await record('completed', `users=${purged};backups=${backups};ms=${Date.now() - startedAt}`);
+console.log(JSON.stringify({ event: 'account-cleanup', purged, expiredBackups: backups, recoveryLogsRotated: true }));
+} catch (error) {
+  // Codes and stage only: SQL errors may contain email addresses or credentials.
+  const code = String(error.code || 'operation-failed').toLowerCase().replace(/[^a-z0-9-]/g, '-').slice(0, 32);
+  await record('failed', `stage=${stage};code=${code}`);
+  throw error;
+} finally { await pool.end(); }

package/dist/src/self-relay/account-cleanup.mjs

@@ -0,0 +1,30 @@
+// Process one account per transaction; foreign keys keep incomplete deletion atomic.
+export async function purgeCancelledAccounts(pool, scopeHash) {
+  let purged = 0;
+  for (;;) {
+    const db = await pool.getConnection();
+    try {
+      await db.beginTransaction();
+      const [rows] = await db.query(`SELECT id FROM users WHERE status='cancelled'
+        AND cancelled_at <= UTC_TIMESTAMP(3) - INTERVAL 1 DAY
+        ORDER BY cancelled_at LIMIT 1 FOR UPDATE`);
+      if (!rows.length) { await db.commit(); return purged; }
+      const id = rows[0].id;
+      const [identities] = await db.execute("SELECT normalized_value FROM user_login_identities WHERE user_id=? AND kind='email'", [id]);
+      for (const { normalized_value: email } of identities) {
+        await db.execute('DELETE FROM email_login_challenges WHERE email=?', [email]);
+        await db.execute('DELETE FROM email_send_limits WHERE scope_hash=?', [scopeHash(`email:${email}`)]);
+        await db.execute('DELETE FROM relay_admin_emails WHERE email=?', [email]);
+      }
+      for (const table of ['user_sessions', 'relay_usage_actions', 'relay_usage_sessions',
+        'relay_usage_user_days', 'relay_usage_budgets', 'relay_usage_entitlements',
+        'relay_usage_totals', 'user_login_identities']) {
+        await db.execute(`DELETE FROM ${table} WHERE user_id=?`, [id]);
+      }
+      await db.execute('UPDATE computers SET owner_user_id=NULL WHERE owner_user_id=?', [id]);
+      await db.execute('DELETE FROM users WHERE id=?', [id]);
+      await db.commit(); purged++;
+    } catch (error) { await db.rollback(); throw error; }
+    finally { db.release(); }
+  }
+}

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

@@ -1,6 +1,6 @@
 import { adminUiTokens } from './admin-style.mjs';
 
-export function adminPage() {
+export function adminPage(basePath = '/admin') {
   return `<!doctype html><html lang="zh-CN"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="color-scheme" content="only light"><meta name="theme-color" content="#f5f7fa"><title>Code Relax 管理</title><style>${adminUiTokens}</style>
 <style>@media(max-width:600px){body main{padding:12px 12px 40px}header.page-head{align-items:center;gap:8px;margin-bottom:8px}header.page-head h1{font-size:20px;line-height:1.2;margin:0}main .nav{gap:0;margin-bottom:12px}main .nav button{padding:8px 11px}main .stack,main .grid{gap:10px}main .card{padding:12px}main .hero strong{font-size:20px}main .throughput{grid-template-columns:repeat(2,minmax(0,1fr));gap:6px;margin-top:10px}main .metrics{gap:6px}main .metric{display:flex;flex-direction:row-reverse;align-items:center;justify-content:space-between;gap:6px;min-width:0;padding:9px 10px}main .metric strong{font-size:17px;margin:0;white-space:nowrap}main .metric span{font-size:11px}main .card-head{margin-bottom:10px}}</style>
 <style>@media(max-width:600px){main .throughput .metric strong{font-size:17px}}</style>
@@ -21,9 +21,8 @@ button{background:#e0f0e5;color:#235d3a;border-color:#a9cbb4}button:hover{backgr
 #metrics{grid-template-columns:repeat(5,minmax(0,1fr))}.relay-heading{margin-bottom:14px}.resource-head{display:flex;align-items:center;justify-content:space-between;gap:10px}.resource-head .hint{white-space:nowrap}.resource-card .throughput{border-top:1px solid #dce5df;padding-top:10px;margin-top:12px}.resource-card .throughput .metric{display:flex;flex-direction:row-reverse;align-items:center;justify-content:space-between;gap:8px;padding:8px 10px}.resource-card .throughput .metric strong{font-size:16px;margin:0;white-space:nowrap}
 @media(max-width:800px){#metrics{grid-template-columns:repeat(2,minmax(0,1fr))}}
 @media(max-width:600px){.resource-card .throughput .metric strong{font-size:14px}}
-</style><style>main:not(.authenticated)>:not(#adminLogin){display:none!important}#adminLogin{max-width:430px;margin:10vh auto}#adminLogin[hidden]{display:none}.usage-toolbar{display:flex;align-items:center;justify-content:space-between;gap:12px;flex-wrap:wrap;margin-bottom:16px}.usage-views,.usage-pages{display:flex;align-items:center;gap:8px}.usage-views button[aria-pressed=true]{background:#286e43;color:#fff}.usage-rows{display:grid;gap:8px}.usage-row{display:grid;gap:8px;padding:12px 14px;border:1px solid var(--admin-row-border);border-radius:var(--admin-control-radius);background:var(--admin-row)}.usage-row-head{display:flex;align-items:baseline;justify-content:space-between;gap:12px;min-width:0}.usage-row-head span{min-width:0;overflow-wrap:anywhere}.usage-row-head small{flex-shrink:0;white-space:nowrap}.usage-row strong{font-variant-numeric:tabular-nums}.usage-row small{text-align:right}.usage-pages{margin-top:16px}</style></head><body><main>
-<section id="adminLogin" class="card" hidden><h1>管理员登录</h1><p class="subtle">使用已授予管理权限的 Code Relax 邮箱账号</p><div class="field"><label for="loginEmail">邮箱</label><input id="loginEmail" type="email" autocomplete="email"></div><div class="field"><label for="loginCode">邮件验证码</label><input id="loginCode" inputmode="numeric" maxlength="6" autocomplete="one-time-code"></div><div class="actions"><button id="sendLoginCode" type="button">发送验证码</button><button id="verifyLogin" type="button">登录后台</button></div><p id="loginError" class="status error" role="alert"></p></section>
-<header class="page-head"><h1>中继管理</h1><nav class="nav" aria-label="管理页面"><button type="button" data-page="overview" aria-current="page">运行概览</button><button type="button" data-page="announcements">系统公告</button><button type="button" data-page="settings">容量设置</button><button type="button" data-page="usage">使用统计</button><button id="adminLogout" type="button" class="secondary">退出后台</button></nav></header>
+</style><style>main:not(.authenticated)>:not(#adminLogin){display:none!important}#adminLogin{max-width:430px;margin:10vh auto}#adminLogin[hidden]{display:none}.usage-toolbar{display:flex;align-items:center;justify-content:space-between;gap:12px;flex-wrap:wrap;margin-bottom:16px}.usage-views,.usage-pages{display:flex;align-items:center;gap:8px}.usage-views button[aria-pressed=true]{background:#286e43;color:#fff}.usage-rows{display:grid;gap:8px}.usage-row{display:grid;gap:8px;padding:12px 14px;border:1px solid var(--admin-row-border);border-radius:var(--admin-control-radius);background:var(--admin-row)}.usage-row-head{display:flex;align-items:baseline;justify-content:space-between;gap:12px;min-width:0}.usage-row-head span{min-width:0;overflow-wrap:anywhere}.usage-row-head small{flex-shrink:0;white-space:nowrap}.usage-row strong{font-variant-numeric:tabular-nums}.usage-row small{text-align:right}.usage-pages{margin-top:16px}</style></head><body><main class="authenticated">
+<header class="page-head"><h1>中继管理</h1><nav class="nav" aria-label="管理页面"><button type="button" data-page="overview" aria-current="page">运行概览</button><button type="button" data-page="announcements">系统公告</button><button type="button" data-page="settings">容量设置</button><button type="button" data-page="usage">使用统计</button></nav></header>
 <section id="overview" class="page stack"><section class="card" aria-label="中继连接与转发"><div class="relay-heading"><h2>中继连接与转发</h2><span id="healthText" class="state">读取中</span></div><div id="metrics" class="metrics"></div></section><div class="grid"><section class="card resource-card" aria-label="服务器资源"><div class="card-head resource-head"><h2>服务器资源</h2><span id="sampleTime" class="hint">等待采样</span></div><div id="serverMetrics" class="metrics"></div><div class="throughput" id="throughput"></div></section><section class="card quota-card"><div class="card-head"><h2>流量包</h2><span id="trafficNote" class="hint">等待更新</span></div><p id="trafficUsage" class="traffic-usage">—</p><div id="trafficTimeline" class="quota-timeline" hidden><div class="quota-heading"><strong id="trafficRemaining">流量剩余 —</strong><span id="trafficPace" class="quota-pace">—×</span><span id="timeRemaining">时间剩余 —</span></div><div id="quotaTrack" class="quota-track" role="img"><span id="quotaFill" class="quota-fill"></span><span id="quotaNow" class="quota-now"></span></div><div class="quota-period"><span id="trafficEnd">到期 —</span><span id="trafficStart">本期开始 —</span></div></div></section></div></section>
 <section id="announcements" class="page" hidden><section class="card"><div class="announcement-toolbar"><div><h2>公告管理</h2><p id="announcementCount" class="hint">正在读取</p></div><button id="newAnnouncement" type="button">新建公告</button></div><div class="announcement-controls"><input id="announcementSearch" type="search" aria-label="搜索公告" placeholder="搜索标题或正文"><select id="announcementFilter" aria-label="筛选状态"><option value="all">全部状态</option><option value="active">发布中</option><option value="draft">草稿</option><option value="withdrawn">已撤下</option></select></div><div id="announcementList" class="announcement-list" style="margin-top:14px"></div></section></section>
 <dialog id="announcementEditor" aria-labelledby="editorHeading"><div class="editor-head"><h2 id="editorHeading">新建公告</h2><button id="closeEditor" class="secondary" type="button" aria-label="关闭">关闭</button></div><div class="field"><label for="title">标题</label><input id="title" maxlength="80" placeholder="输入公告标题"></div><div class="field"><label for="message">正文</label><textarea id="message" maxlength="2000" placeholder="输入公告内容"></textarea></div><p id="editorNote" class="hint"></p><p id="editorError" class="status error" role="alert" hidden></p><div id="editorActions" class="editor-actions"><button id="saveDraft" class="secondary" type="button">保存草稿</button><button id="publish" type="button">发布公告</button></div></dialog>
@@ -31,7 +30,7 @@ button{background:#e0f0e5;color:#235d3a;border-color:#a9cbb4}button:hover{backgr
 <section id="usage" class="page" hidden><section class="card"><div class="usage-toolbar"><div><h2>今日使用统计</h2><p id="usageCount" class="hint">正在读取</p></div><div class="usage-views"><button id="usageUsers" type="button" class="secondary" aria-pressed="true">用户</button><button id="usageComputers" type="button" class="secondary" aria-pressed="false">工作站</button><button id="usageRefresh" type="button" class="secondary">刷新</button></div></div><div id="usageRows" class="usage-rows"></div><div class="usage-pages"><button id="usagePrev" type="button" class="secondary">上一页</button><span id="usagePageText" class="hint"></span><button id="usageNext" type="button" class="secondary">下一页</button></div><p id="usageError" class="status error" role="alert"></p></section></section><p id="result" class="status" role="status" aria-live="polite"></p>
 </main><script>
 const el=id=>document.getElementById(id);let snapshot=null;
-const request=async(path,options={})=>{const token=localStorage.getItem('codeRelaxAdminToken');const headers={...options.headers,...(token?{Authorization:'Bearer '+token}:{})};const response=await fetch(path,{...options,headers});const body=await response.json();if(!response.ok){const message=body.error||('HTTP '+response.status);if(path.startsWith('/admin/api/')&&(response.status===401||response.status===403)){localStorage.removeItem('codeRelaxAdminToken');showLogin(message)}throw new Error(message)}return body};
+const request=async(path,options={})=>{const response=await fetch(path,{...options,referrerPolicy:'no-referrer'});const body=await response.json();if(!response.ok)throw new Error(body.error||('HTTP '+response.status));return body};
 function setResult(message,error=false){el('result').textContent=message;el('result').classList.toggle('error',error)}
 function node(tag,className,value){const item=document.createElement(tag);if(className)item.className=className;if(value!==undefined)item.textContent=value;return item}
 function metric(value,label,extra,tone){const item=node('div','metric'+(tone?' '+tone:''));item.append(node('strong','',value),node('span','',label));if(extra)item.append(node('small','',extra));return item}
@@ -76,11 +75,6 @@ el('saveLimit').addEventListener('click',()=>write('PUT','/admin/api/settings',{
 el('newAnnouncement').addEventListener('click',()=>openEditor());el('closeEditor').addEventListener('click',()=>el('announcementEditor').close());el('announcementSearch').addEventListener('input',()=>{if(snapshot)renderAnnouncements(snapshot)});el('announcementFilter').addEventListener('change',()=>{if(snapshot)renderAnnouncements(snapshot)});
 async function saveAnnouncement(publish){const title=el('title').value.trim(),message=el('message').value.trim();if(!title||!message){el('editorError').textContent='请填写标题和正文';el('editorError').hidden=false;return}if(publish&&snapshot?.announcement&&snapshot.announcement.id!==editorItem?.id&&!confirm('发布后将替换当前公告，确定发布？'))return;const path=editorMode==='draft'?'/admin/api/announcements/'+encodeURIComponent(editorItem.id):'/admin/api/announcements';const target=publish&&editorMode==='draft'?path+'/publish':path;const body={title,message};if(publish&&editorMode==='new')body.publish=true;const ok=await write('PUT',target,body,publish?'公告已发布':'草稿已保存');if(ok)el('announcementEditor').close()}
 el('saveDraft').addEventListener('click',()=>saveAnnouncement(false));el('publish').addEventListener('click',()=>saveAnnouncement(true));
-function showLogin(error=''){document.querySelector('main').classList.remove('authenticated');el('adminLogin').hidden=false;el('loginError').textContent=error}
-async function authorize(){try{await request('/admin/api/session');document.querySelector('main').classList.add('authenticated');el('adminLogin').hidden=true;showPage(['overview','announcements','settings','usage'].includes(location.hash.slice(1))?location.hash.slice(1):'overview')}catch(error){showLogin(localStorage.getItem('codeRelaxAdminToken')?'登录验证暂时失败，请刷新页面重试：'+error.message:error.message)}}
-el('sendLoginCode').onclick=async()=>{const email=el('loginEmail').value.trim().toLowerCase();if(!email){showLogin('请输入邮箱');return}el('loginError').textContent='';try{const config=await request('/account/config');if(!window.TencentCaptcha){await new Promise((resolve,reject)=>{const script=document.createElement('script');script.src='https://turing.captcha.qcloud.com/TJCaptcha.js';script.onload=resolve;script.onerror=reject;document.head.append(script)})}new TencentCaptcha(String(config.captchaAppId),async result=>{if(result.ret!==0)return;try{await request('/account/email/request',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({email,ticket:result.ticket,randstr:result.randstr})});el('loginError').textContent='验证码已发送'}catch(error){el('loginError').textContent=error.message}}).show()}catch(error){el('loginError').textContent='人机验证不可用：'+error.message}};
-el('verifyLogin').onclick=async()=>{const email=el('loginEmail').value.trim().toLowerCase(),code=el('loginCode').value.trim();if(!/^[0-9]{6}$/.test(code)){el('loginError').textContent='请输入 6 位验证码';return}try{const result=await request('/account/email/verify',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({email,code})});localStorage.setItem('codeRelaxAdminToken',result.token);await authorize()}catch(error){el('loginError').textContent=error.message}};
-el('adminLogout').onclick=()=>{localStorage.removeItem('codeRelaxAdminToken');showLogin()};
-if(localStorage.getItem('codeRelaxAdminToken'))void authorize();else showLogin();setInterval(()=>{if(!document.hidden&&!el('overview').hidden&&document.querySelector('main').classList.contains('authenticated'))load()},5000);
-</script></body></html>`;
+showPage(['overview','announcements','settings','usage'].includes(location.hash.slice(1))?location.hash.slice(1):'overview');setInterval(()=>{if(!document.hidden&&!el('overview').hidden)load()},5000);
+</script></body></html>`.replaceAll('/admin/api/', basePath + '/api/');
 }

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

@@ -1,15 +1,20 @@
 import http from 'node:http';
+import fs from 'node:fs';
 import { adminPage } from './admin-page.mjs';
 import { startAdminCloud } from './admin-cloud.mjs';
 
 function reply(response, status, body, type = 'application/json; charset=utf-8') {
   const bytes = typeof body === 'string' ? body : JSON.stringify(body);
   response.writeHead(status, { 'Content-Type': type, 'Content-Length': Buffer.byteLength(bytes),
-    'Cache-Control': 'no-store', 'X-Content-Type-Options': 'nosniff' });
+    'Cache-Control': 'no-store', 'X-Content-Type-Options': 'nosniff',
+    'Referrer-Policy': 'no-referrer', 'X-Robots-Tag': 'noindex, nofollow', 'X-Frame-Options': 'DENY' });
   response.end(bytes);
 }
 
-export async function startAdminServer({ port = 45851, relayUrl = 'http://127.0.0.1:45850' } = {}) {
+export async function startAdminServer({ port = 45851, relayUrl = 'http://127.0.0.1:45850', accessFile = '/etc/codex-relay/admin-access.json' } = {}) {
+  const { key } = JSON.parse(fs.readFileSync(accessFile, 'utf8'));
+  if (!/^[A-Za-z0-9_-]{43}$/.test(key)) throw new Error('Invalid admin access key');
+  const basePath = '/admin/' + key;
   const cloud = startAdminCloud();
   const relayOrigin = new URL(relayUrl);
   if (relayOrigin.hostname !== '127.0.0.1' || relayOrigin.protocol !== 'http:' || relayOrigin.pathname !== '/') {
@@ -17,17 +22,20 @@ export async function startAdminServer({ port = 45851, relayUrl = 'http://127.0.
   }
   const server = http.createServer(async (request, response) => {
     const target = new URL(request.url || '/', 'http://localhost');
-    if (!target.pathname.startsWith('/admin')) { reply(response, 404, { error: 'Not found' }); return; }
-    if (request.method === 'GET' && target.pathname === '/admin') {
-      reply(response, 200, adminPage(), 'text/html; charset=utf-8'); return;
+    if (request.method === 'GET' && target.pathname === '/admin/health') { reply(response, 200, { ok: true }); return; }
+    if (request.headers['sec-fetch-site'] === 'cross-site' && request.method !== 'GET') { reply(response, 403, { error: 'Cross-site request rejected' }); return; }
+    if (target.pathname !== basePath && !target.pathname.startsWith(basePath + '/')) { reply(response, 404, { error: 'Not found' }); return; }
+    target.pathname = '/admin' + target.pathname.slice(basePath.length);
+    if (request.method === 'GET' && ['/admin', '/admin/'].includes(target.pathname)) {
+      reply(response, 200, adminPage(basePath), 'text/html; charset=utf-8'); return;
     }
     if (request.method === 'GET' && target.pathname === '/admin/usage') {
-      response.writeHead(302, { Location: '/admin#usage', 'Cache-Control': 'no-store' }); response.end(); return;
+      response.writeHead(302, { Location: basePath + '#usage', 'Cache-Control': 'no-store' }); response.end(); return;
     }
     if (request.method === 'GET' && ['/admin/api/status', '/admin/api/session', '/admin/api/usage', '/admin/api/usage-diagnostics'].includes(target.pathname)) {
       try {
         const upstream = await fetch(new URL(target.pathname + target.search, relayOrigin), {
-          signal: AbortSignal.timeout(3000), headers: { Authorization: request.headers.authorization || '' } });
+          signal: AbortSignal.timeout(3000), headers: { 'X-Code-Relax-Admin-Key': key } });
         const state = await upstream.json();
         if (!upstream.ok) { reply(response, upstream.status, state); return; }
         reply(response, 200, target.pathname === '/admin/api/status'
@@ -48,11 +56,11 @@ export async function startAdminServer({ port = 45851, relayUrl = 'http://127.0.
         if (size > 4096) { reply(response, 413, { error: 'Admin request too large' }); return; }
         chunks.push(chunk);
       }
-      const upstream = await fetch(new URL(target.pathname, relayOrigin), {
+      const upstream = await fetch(new URL(target.pathname + target.search, relayOrigin), {
         method: request.method, signal: AbortSignal.timeout(3000),
         headers: { 'Content-Type': request.headers['content-type'] || '',
           'X-Code-Relax-Admin': request.headers['x-code-relax-admin'] || '',
-          Authorization: request.headers.authorization || '' },
+          'X-Code-Relax-Admin-Key': key },
         body: Buffer.concat(chunks),
       });
       reply(response, upstream.status, await upstream.text());

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

@@ -1,26 +1,26 @@
-import { EventEmitter } from 'node:events';
-import WebSocket from 'ws';
-import { decode, relayAddress, send } from './wire.mjs';
-
-// Headless mobile-side adapter for the local validation. No OpenAI credentials.
-export function connectRelayClient({ relayUrl, room, code, credential, clientId, observe = false }) {
-  relayAddress(relayUrl);
-  const events = new EventEmitter(), pending = new Map();
+import { EventEmitter } from 'node:events';
+import WebSocket from 'ws';
+import { decode, relayAddress, send } from './wire.mjs';
+
+// Headless mobile-side adapter for the local validation. No OpenAI credentials.
+export function connectRelayClient({ relayUrl, room, code, credential, clientId, accountToken, observe = false }) {
+  relayAddress(relayUrl);
+  const events = new EventEmitter(), pending = new Map();
   const socket = new WebSocket(relayUrl, { maxPayload: 64 * 1024 * 1024, perMessageDeflate: true });
   let serial = 0, connected = false, pairedCredential = credential, pairedClientId = clientId;
-  const ready = new Promise((resolve, reject) => {
-    const timer = setTimeout(() => { reject(new Error('Relay connection timeout')); socket.terminate(); }, 7000);
-    socket.on('open', () => send(socket, observe ? { type: 'observe', room, credential, clientId }
-      : code ? { type: 'pair', room, code, credential, clientId } : { type: 'resume', room, credential, clientId }));
-    socket.on('error', error => { reject(error); events.emit('diagnostic', error.message); });
-    socket.on('close', () => {
-      clearTimeout(timer); connected = false; reject(new Error('Relay connection closed'));
-      for (const request of pending.values()) { clearTimeout(request.timer); request.reject(new Error('连接断开，操作结果未确认，不自动重发')); }
-      pending.clear(); events.emit('disconnected');
-    });
-    socket.on('message', (bytes, binary) => {
-      try {
-        const message = decode(bytes, binary);
+  const ready = new Promise((resolve, reject) => {
+    const timer = setTimeout(() => { reject(new Error('Relay connection timeout')); socket.terminate(); }, 7000);
+    socket.on('open', () => send(socket, observe ? { type: 'observe', room, credential, clientId, accountToken }
+      : code ? { type: 'pair', room, code, credential, clientId, accountToken } : { type: 'resume', room, credential, clientId, accountToken }));
+    socket.on('error', error => { reject(error); events.emit('diagnostic', error.message); });
+    socket.on('close', () => {
+      clearTimeout(timer); connected = false; reject(new Error('Relay connection closed'));
+      for (const request of pending.values()) { clearTimeout(request.timer); request.reject(new Error('连接断开，操作结果未确认，不自动重发')); }
+      pending.clear(); events.emit('disconnected');
+    });
+    socket.on('message', (bytes, binary) => {
+      try {
+        const message = decode(bytes, binary);
         if (message.type === 'paired') { if (message.credential) pairedCredential = message.credential; if (message.clientId) pairedClientId = message.clientId; }
         else if (message.type === 'observing') { clearTimeout(timer); connected = true; events.emit('observing', message); resolve({ room, credential: pairedCredential, clientId: pairedClientId }); }
         else if (message.type === 'computer-info') events.emit('computer-info', { hostName: message.hostName });
@@ -29,33 +29,33 @@ export function connectRelayClient({ relayUrl, room, code, credential, clientId,
         else if (message.type === 'official-computer-saved') events.emit('official-computer-saved', message.computer);
         else if (message.type === 'announcement') events.emit('announcement', message.announcement);
         else if (message.type === 'ready') { clearTimeout(timer); connected = true; resolve({ room, credential: pairedCredential, clientId: pairedClientId }); }
-        else if (message.type === 'data') {
-          const body = decode(message.payload, false), request = pending.get(body.id);
-          if (body.type === 'response' && request) { clearTimeout(request.timer); pending.delete(body.id); request.resolve(body); }
-          else events.emit('message', body);
-        } else throw new Error('Invalid relay message');
-      } catch (error) { reject(error); events.emit('diagnostic', error.message); socket.close(1008, 'Invalid response'); }
-    });
-  });
-  return {
-    ready, events,
-    request(path, { method = 'GET', body, timeoutMs = 5000 } = {}) {
-      if (!connected) return Promise.reject(new Error('Relay not ready'));
-      const id = ++serial;
-      return new Promise((resolve, reject) => {
-        const timer = setTimeout(() => { pending.delete(id); reject(new Error('请求超时，结果未确认，不自动重发')); }, timeoutMs);
-        pending.set(id, { resolve, reject, timer });
-        if (!send(socket, { type: 'data', payload: JSON.stringify({ type: 'request', id, path, method, ...(body ? { body } : {}) }) })) {
-          clearTimeout(timer); pending.delete(id); reject(new Error('Relay not connected'));
-        }
-      });
-    },
+        else if (message.type === 'data') {
+          const body = decode(message.payload, false), request = pending.get(body.id);
+          if (body.type === 'response' && request) { clearTimeout(request.timer); pending.delete(body.id); request.resolve(body); }
+          else events.emit('message', body);
+        } else throw new Error('Invalid relay message');
+      } catch (error) { reject(error); events.emit('diagnostic', error.message); socket.close(1008, 'Invalid response'); }
+    });
+  });
+  return {
+    ready, events,
+    request(path, { method = 'GET', body, timeoutMs = 5000 } = {}) {
+      if (!connected) return Promise.reject(new Error('Relay not ready'));
+      const id = ++serial;
+      return new Promise((resolve, reject) => {
+        const timer = setTimeout(() => { pending.delete(id); reject(new Error('请求超时，结果未确认，不自动重发')); }, timeoutMs);
+        pending.set(id, { resolve, reject, timer });
+        if (!send(socket, { type: 'data', payload: JSON.stringify({ type: 'request', id, path, method, ...(body ? { body } : {}) }) })) {
+          clearTimeout(timer); pending.delete(id); reject(new Error('Relay not connected'));
+        }
+      });
+    },
     send(message) { if (!connected) throw new Error('Relay not ready'); return send(socket, { type: 'data', payload: JSON.stringify(message) }); },
     routeDirect() { if (!connected) throw new Error('Relay not ready'); return send(socket, { type: 'p2p-route', direct: 1 }); },
     recordOfficialComputer(computer) {
       if (!connected || !observe) throw new Error('Metadata channel not ready');
       return send(socket, { type: 'official-computer', ...computer });
     },
-    close() { socket.terminate(); },
-  };
-}
+    close() { socket.terminate(); },
+  };
+}