@walkhi/code-relax 0.1.0-beta.10 → 0.1.0-beta.12

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

@@ -1,17 +1,14 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { execFile } from 'node:child_process';
-import { setTimeout as delay } from 'node:timers/promises';
-import { startBackground, processAlive } from '../background-process.mjs';
 import { promisify } from 'node:util';
 import { randomBytes, randomUUID } from 'node:crypto';
-import { fileURLToPath } from 'node:url';
 import { hostname } from 'node:os';
 import QRCode from 'qrcode';
 import { credentialStore } from '../platform/windows/credential-store.mjs';
 import { readRecord, writeRecord } from '../service-lifecycle.mjs';
 import { serviceHealth } from '../service-health.mjs';
-import { openControl, controlRequest } from '../service-control.mjs';
+import { controlRequest } from '../service-control.mjs';
 import { connectBridgeRelay } from './connector.mjs';
 import { validProbeIceServers } from './p2p-probe.mjs';
 import { relayAddress, validSecret } from './wire.mjs';
@@ -19,8 +16,6 @@ import { saveLanAuthorizations } from './lan-authorizations.mjs';
 import { lanNetworks } from '../platform/windows/network-info.mjs';
 
 const exec = promisify(execFile);
-const script = fileURLToPath(import.meta.url);
-const recordPath = root => path.join(root, 'self-relay-session.json');
 const officialConfig = { url: 'wss://api.uulife.site/relay' };
 
 async function loadConfig(stateRoot) {
@@ -58,68 +53,23 @@ async function registrationKey(config) {
   if (!validSecret(hostKey)) throw new Error('中继注册凭据格式无效。');
   return hostKey;
 }
-export async function selfRelay(command, stateRoot, requiredMode = '') {
-  const previous = readRecord(recordPath(stateRoot));
-  let current;
-  if (previous) {
-    try { current = await controlRequest(previous); }
-    catch (error) { if (error.code !== 'ECONNREFUSED') throw error; }
-  }
-  if (command === 'relay-status' && current) return controlRequest(previous, 'POST', 'inspect');
-  if (command === 'relay-status') return current || { running: false, displayText: '私有中继连接器未运行。' };
-  if (command === 'relay-stop') {
-    if (current) await controlRequest(previous, 'POST');
-    const deadline = Date.now() + 10000;
-    while (current && processAlive(previous.pid)) {
-      if (Date.now() >= deadline) throw new Error('私有中继未在 10 秒内退出，未继续恢复服务。');
-      await delay(100);
-    }
-    return { stopped: true, displayText: '私有中继连接器已停止；Bridge 和 Codex 保持运行。' };
-  }
-  if (current) {
-    if (requiredMode) {
-      const bridge = await serviceHealth(readRecord(path.join(stateRoot, 'bridge-session.json')));
-      if (bridge?.transportMode !== requiredMode) throw new Error('Codex 内核未就绪；请先执行 shared-start。');
-    }
-    if (command === 'relay-revoke') return controlRequest(previous, 'POST', 'revoke');
-    if (command === 'relay-pair' || (current.relayConnected && !current.paired && !current.qrPath)) return controlRequest(previous, 'POST', 'pair');
-    if (command === 'relay-start' && current.relayConnected) return controlRequest(previous, 'POST', 'refresh-lan');
-    return current;
-  }
-  if (command === 'relay-revoke') throw new Error('请先启动连接器，再撤销手机授权。');
-  fs.mkdirSync(stateRoot, { recursive: true });
-  const instanceId = randomUUID();
-  const log = path.join(stateRoot, 'self-relay.log');
-  const readyPath = path.join(stateRoot, `relay-ready-${instanceId}.json`);
-  const pid = await startBackground(process.execPath, [script, '--worker', stateRoot, instanceId,
-    command === 'relay-pair' ? 'pair' : '', requiredMode], process.env, [log, log]);
-  try {
-    const deadline = Date.now() + 25000;
-    while (true) {
-      const result = readRecord(readyPath);
-      if (result) {
-        if (result.pid !== pid || result.instanceId !== instanceId) throw new Error('私有中继启动实例不匹配。');
-        if (result.error) throw new Error(result.error);
-        return result.status;
-      }
-      if (!processAlive(pid)) throw new Error('私有中继启动失败，请查看 self-relay.log。');
-      if (Date.now() >= deadline) throw new Error('私有中继启动超时。');
-      await delay(100);
-    }
-  } catch (error) { if (processAlive(pid)) process.kill(pid); throw error; }
-  finally { fs.rmSync(readyPath, { force: true }); }
-}
-
-async function worker(stateRoot, instanceId, refresh = false, requiredMode = '') {
+export async function selfRelay(command, stateRoot) {
+  const session = readRecord(path.join(stateRoot, 'bridge-session.json'));
+  if (!session) {
+    if (command === 'relay-status') return { running: false, displayText: 'Bridge 未运行。' };
+    if (command === 'relay-stop') return { stopped: true, displayText: '中继连接已停止。' };
+    throw new Error('Bridge 尚未运行，请先执行 relax start。');
+  }
+  return controlRequest(session, 'POST', command);
+}
+
+async function createRelayRuntime(stateRoot) {
   const config = await loadConfig(stateRoot);
   const session = () => readRecord(path.join(stateRoot, 'bridge-session.json'));
   let health = await serviceHealth(session());
   if (health?.status !== 'ok') throw new Error('Bridge 尚未运行，请先执行 relax start --json。');
-  if (requiredMode && health.transportMode !== requiredMode) throw new Error('Codex 内核未就绪，请先执行 relax shared-start --json。');
-  const legacyPath = path.join(stateRoot, 'self-relay-device.json');
-  const legacy = readRecord(legacyPath);
-  const stored = await credentialStore('load');
-  let identities = stored.record || legacy || { version: 1, servers: {} };
+  const stored = await credentialStore('load');
+  const identities = stored.record || { version: 1, servers: {} };
   const validate = value => {
     if (value?.version !== 1 || !value.servers || typeof value.servers !== 'object' || Array.isArray(value.servers)) throw new Error('本机设备身份损坏，未自动覆盖');
     for (const [url, item] of Object.entries(value.servers)) {
@@ -128,15 +78,6 @@ async function worker(stateRoot, instanceId, refresh = false, requiredMode = '')
     }
   };
   validate(identities);
-  if (legacy) {
-    validate(legacy);
-    if (stored.record && JSON.stringify(stored.record) !== JSON.stringify(legacy)) throw new Error('新旧设备身份冲突，未覆盖任何凭据');
-    if (!stored.record) {
-      const verified = await credentialStore('save', identities);
-      if (JSON.stringify(verified.record) !== JSON.stringify(identities)) throw new Error('凭据迁移校验失败');
-    }
-    fs.rmSync(legacyPath);
-  }
   let identity = identities.servers[config.url];
   if (!identity) {
     identity = { id: randomUUID(), secret: randomBytes(32).toString('base64url'), registered: false };
@@ -148,8 +89,7 @@ async function worker(stateRoot, instanceId, refresh = false, requiredMode = '')
     try { health = await serviceHealth(session()) || { transportMode: health.transportMode, status: 'offline' }; bridgeError = ''; }
     catch (error) { bridgeError = error.message; health = { transportMode: health.transportMode, status: 'offline' }; }
   }
-  const secret = randomBytes(32).toString('base64url');
-  let connector, control, qrPath, expiresAt = 0, paired = false, clientCount = 0, attachedCount = 0;
+  let connector, qrPath, expiresAt = 0, paired = false, clientCount = 0, attachedCount = 0;
   let closing = false, online = false, connecting = false, retryTimer, attempts = 0, lastError = '';
   const audit = (event, details = {}) => console.log(JSON.stringify({ time: new Date().toISOString(), event, ...details }));
   async function currentLanCandidates() {
@@ -163,7 +103,7 @@ async function worker(stateRoot, instanceId, refresh = false, requiredMode = '')
   const status = () => {
     const available = online && !paired && qrPath && Date.now() < expiresAt;
     const next = !online ? (lastError || '电脑连接器正在恢复中继连接，已保存授权。')
-      : paired ? '设备已授权，手机可直接重连；网络断开不需要重新扫码。'
+      : paired ? '设备已授权，移动端可直接重连；网络断开不需要重新扫码。'
         : available ? '用要添加的移动设备在有效期内扫描统一配对二维码。连接器在后台运行。'
           : '尚未完成设备授权；调用 relax pair --json 生成配对二维码。';
     return { running: !closing, relayConnected: online, mode: 'self-relay', transportMode: health.transportMode,
@@ -177,8 +117,6 @@ async function worker(stateRoot, instanceId, refresh = false, requiredMode = '')
     if (closing) return;
     closing = true; clearTimeout(retryTimer);
     connector?.events.removeAllListeners(); connector?.close();
-    if (readRecord(recordPath(stateRoot))?.instanceId === instanceId) fs.rmSync(recordPath(stateRoot), { force: true });
-    await control?.close();
   }
   async function saveInvitation(message) {
     if (!message.code) return;
@@ -261,25 +199,39 @@ async function worker(stateRoot, instanceId, refresh = false, requiredMode = '')
     audit('lan-candidates-updated', { count: candidates.length });
     return { ...status(), lanCandidateCount: candidates.length };
   }
-  try {
-    const freshStatus = async () => {
-      if (online) {
-        const remote = await connector.command('status'); paired = remote.paired;
-        await refreshHealth();
-      }
-      return status();
-    };
-    control = await openControl({ instanceId, secret, shutdown, status, actions: { pair, revoke, inspect: freshStatus, 'refresh-lan': refreshLan } });
-    writeRecord(recordPath(stateRoot), { pid: process.pid, instanceId, controlSecret: secret, controlPort: control.port });
-    await connect();
-    const result = refresh && online ? await pair() : status();
-    writeRecord(path.join(stateRoot, `relay-ready-${instanceId}.json`), { instanceId, pid: process.pid, status: { ...result, pid: process.pid } });
-  } catch (error) { await shutdown(); throw error; }
-}
-
-if (process.argv[1] && path.resolve(process.argv[1]) === script && process.argv[2] === '--worker') {
-  worker(process.argv[3], process.argv[4], process.argv[5] === 'pair', process.argv[6]).catch(error => {
-    writeRecord(path.join(process.argv[3], `relay-ready-${process.argv[4]}.json`), { instanceId: process.argv[4], pid: process.pid, error: error.message });
-    console.error(error.message); process.exitCode = 1;
-  });
-}
+  const inspect = async () => {
+    if (online) {
+      const remote = await connector.command('status'); paired = remote.paired;
+      await refreshHealth();
+    }
+    return status();
+  };
+  try { await connect(); return { status, inspect, pair, revoke, refreshLan, shutdown }; }
+  catch (error) { await shutdown(); throw error; }
+}
+
+export function createRelayManager(stateRoot) {
+  let current;
+  let operation = Promise.resolve();
+  const run = command => {
+    const next = operation.then(async () => {
+      if (command === 'relay-status') return current ? current.inspect() : { running: false, displayText: '中继连接未运行。' };
+      if (command === 'relay-stop') {
+        await current?.shutdown(); current = undefined;
+        return { stopped: true, displayText: '中继连接已停止；Bridge 和 Codex 保持运行。' };
+      }
+      if (!current) {
+        if (command === 'relay-revoke') throw new Error('请先启动中继连接，再撤销移动端授权。');
+        current = await createRelayRuntime(stateRoot);
+        return command === 'relay-pair' && current.status().relayConnected ? current.pair() : current.status();
+      }
+      if (command === 'relay-revoke') return current.revoke();
+      if (command === 'relay-pair' || (current.status().relayConnected && !current.status().paired && !current.status().qrPath)) return current.pair();
+      if (command === 'relay-start' && current.status().relayConnected) return current.refreshLan();
+      return current.status();
+    });
+    operation = next.catch(() => {});
+    return next;
+  };
+  return { run, close: () => run('relay-stop'), status: () => current?.status() || { running: false } };
+}

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

@@ -0,0 +1,104 @@
+import fs from 'node:fs';
+import { createHash } from 'node:crypto';
+import { fileURLToPath } from 'node:url';
+import mysql from 'mysql2/promise';
+import { deviceStore } from './device-store.mjs';
+import { relayAdminState } from './admin-state.mjs';
+
+const sqlTime = value => value.replace('T', ' ').replace(/Z$/, '');
+const isoTime = value => value.replace(' ', 'T') + 'Z';
+
+export async function openRelayMysql(configFile, initialMaxRelaySessions) {
+  const config = JSON.parse(fs.readFileSync(configFile, 'utf8'));
+  if (!config.database || !config.user || !config.password || !(config.socketPath || config.host)) {
+    throw new Error('Incomplete relay MySQL configuration');
+  }
+  const pool = mysql.createPool({ ...config, waitForConnections: true, connectionLimit: 4,
+    namedPlaceholders: false, dateStrings: true, timezone: 'Z', multipleStatements: false });
+  try {
+    const [versions] = await pool.query('SELECT version, sha256 FROM schema_migrations');
+    const knownVersions = ['001_relay_core', '002_email_accounts'];
+    if (!versions.some(row => row.version === knownVersions[0]) || versions.length > knownVersions.length) throw new Error('Unexpected relay database schema');
+    for (const row of versions) {
+      if (!knownVersions.includes(row.version)) throw new Error('Unexpected relay database schema');
+      const source = fs.readFileSync(fileURLToPath(new URL(`../../database/${row.version}.sql`, import.meta.url)));
+      if (row.sha256 !== createHash('sha256').update(source).digest('hex')) throw new Error(`Unexpected relay database schema: ${row.version}`);
+    }
+    const [computers] = await pool.query('SELECT id, host_hash, status, revision, created_at, updated_at FROM computers');
+    const [clients] = await pool.query('SELECT computer_id, client_id, credential_hash, created_at, updated_at FROM mobile_authorizations ORDER BY created_at');
+    const [official] = await pool.query('SELECT computer_id, environment_id, name, hostname, updated_at FROM official_computers');
+    const records = new Map(computers.map(row => [row.id, { id: row.id, hostHash: row.host_hash, status: row.status,
+      revision: Number(row.revision), createdAt: isoTime(row.created_at), updatedAt: isoTime(row.updated_at), clients: [] }]));
+    for (const row of clients) {
+      const record = records.get(row.computer_id);
+      if (!record) throw new Error('Orphan mobile authorization');
+      record.clients.push({ id: row.client_id, hash: row.credential_hash,
+        createdAt: isoTime(row.created_at), updatedAt: isoTime(row.updated_at) });
+    }
+    for (const row of official) {
+      const record = records.get(row.computer_id);
+      if (!record) throw new Error('Orphan official computer');
+      record.officialComputer = { environmentId: row.environment_id, name: row.name,
+        hostname: row.hostname, updatedAt: isoTime(row.updated_at) };
+    }
+    const validator = deviceStore();
+    for (const record of records.values()) validator.save(record);
+
+    const [settings] = await pool.query('SELECT max_relay_sessions FROM relay_settings WHERE id = 1');
+    if (settings.length !== 1) throw new Error('Missing relay settings');
+    const [rows] = await pool.query('SELECT id, title, message, status, created_at, updated_at, published_at FROM announcements ORDER BY created_at DESC');
+    const announcements = rows.map(row => ({ id: row.id, title: row.title, message: row.message, status: row.status,
+      createdAt: isoTime(row.created_at), updatedAt: isoTime(row.updated_at),
+      publishedAt: row.published_at ? isoTime(row.published_at) : null }));
+    const active = announcements.find(item => item.status === 'active');
+    const initial = { version: 3, maxRelaySessions: settings[0].max_relay_sessions, announcements,
+      announcement: active ? { id: active.id, title: active.title, message: active.message, publishedAt: active.publishedAt } : null };
+    const admin = relayAdminState(undefined, initialMaxRelaySessions, { initial, persist: async next => {
+      const connection = await pool.getConnection();
+      try {
+        await connection.beginTransaction();
+        await connection.execute('UPDATE relay_settings SET max_relay_sessions = ?, updated_at = UTC_TIMESTAMP(3) WHERE id = 1', [next.maxRelaySessions]);
+        await connection.query('DELETE FROM announcements');
+        for (const item of next.announcements) await connection.execute(
+          'INSERT INTO announcements (id,title,message,status,created_at,updated_at,published_at) VALUES (?,?,?,?,?,?,?)',
+          [item.id, item.title, item.message, item.status, sqlTime(item.createdAt), sqlTime(item.updatedAt),
+            item.publishedAt ? sqlTime(item.publishedAt) : null]);
+        await connection.commit();
+      } catch (error) { await connection.rollback(); throw error; }
+      finally { connection.release(); }
+    } });
+    return {
+      pool,
+      schemaVersions: versions.map(row => row.version),
+      devices: {
+        entries: () => [...records.values()],
+        async save(record) {
+          validator.save(record);
+          const connection = await pool.getConnection();
+          try {
+            await connection.beginTransaction();
+            await connection.execute(`INSERT INTO computers (id,host_hash,status,revision,created_at,updated_at)
+              VALUES (?,?,?,?,?,?) ON DUPLICATE KEY UPDATE host_hash=VALUES(host_hash),status=VALUES(status),
+              revision=VALUES(revision),updated_at=VALUES(updated_at)`,
+            [record.id, record.hostHash, record.status, record.revision, sqlTime(record.createdAt), sqlTime(record.updatedAt)]);
+            await connection.execute('DELETE FROM mobile_authorizations WHERE computer_id = ?', [record.id]);
+            for (const client of record.clients) await connection.execute(
+              'INSERT INTO mobile_authorizations (computer_id,client_id,credential_hash,created_at,updated_at) VALUES (?,?,?,?,?)',
+              [record.id, client.id, client.hash, sqlTime(client.createdAt), sqlTime(client.updatedAt)]);
+            if (record.officialComputer) {
+              const item = record.officialComputer;
+              await connection.execute(`INSERT INTO official_computers (computer_id,environment_id,name,hostname,updated_at)
+                VALUES (?,?,?,?,?) ON DUPLICATE KEY UPDATE environment_id=VALUES(environment_id),name=VALUES(name),
+                hostname=VALUES(hostname),updated_at=VALUES(updated_at)`,
+              [record.id, item.environmentId, item.name, item.hostname, sqlTime(item.updatedAt)]);
+            }
+            await connection.commit(); records.set(record.id, record);
+          } catch (error) { await connection.rollback(); throw error; }
+          finally { connection.release(); }
+        },
+      },
+      admin,
+      close: () => pool.end(),
+    };
+  } catch (error) { await pool.end(); throw error; }
+}

package/dist/src/self-relay/p2p-probe.mjs

@@ -110,7 +110,7 @@ export function validProbeSignal(value) {
   if (!value || value.version !== 1 || !/^[\w-]{16,128}$/.test(value.probeId || '')) return false;
   if (['start', 'close'].includes(value.kind)) return true;
   if (['offer', 'answer'].includes(value.kind)) return typeof value.sdp === 'string' && value.sdp.length <= 65536 &&
-    (value.direct === undefined || value.direct === 1) &&
+    (value.direct === undefined || value.direct === 0 || value.direct === 1) &&
     (value.iceServers === undefined || validProbeIceServers(value.iceServers));
   if (value.kind === 'candidate') return typeof value.candidate === 'string' && value.candidate.length <= 2048 &&
     typeof value.mid === 'string' && value.mid.length <= 64;