@walkhi/code-relax 0.1.0-beta.3 → 0.1.0-beta.31

package/dist/bin/migrate-relay-db.mjs

@@ -0,0 +1,109 @@
+#!/usr/bin/env node
+import fs from 'node:fs';
+import { createHash } from 'node:crypto';
+import { fileURLToPath } from 'node:url';
+import mysql from 'mysql2/promise';
+import { relaySchemaVersions } from '../database/versions.mjs';
+import { deviceStore } from '../src/self-relay/device-store.mjs';
+import { relayAdminState } from '../src/self-relay/admin-state.mjs';
+
+const command = process.argv[2];
+if (!['--schema', '--import', '--check'].includes(command) || !process.env.RELAY_MYSQL_CONFIG_FILE) {
+  throw new Error('Use --schema, --import or --check with RELAY_MYSQL_CONFIG_FILE');
+}
+const config = JSON.parse(fs.readFileSync(process.env.RELAY_MYSQL_CONFIG_FILE, 'utf8'));
+const db = await mysql.createConnection({ ...config, dateStrings: true, timezone: 'Z', multipleStatements: false });
+const sqlTime = value => value.replace('T', ' ').replace(/Z$/, '');
+const migrations = relaySchemaVersions;
+try {
+  if (command === '--schema') {
+    const [existing] = await db.query("SHOW TABLES LIKE 'schema_migrations'");
+    const [applied] = existing.length ? await db.query('SELECT version, sha256 FROM schema_migrations') : [[]];
+    const known = new Map(applied.map(row => [row.version, row.sha256]));
+    if (known.size !== applied.length || [...known.keys()].some(version => !migrations.includes(version))) throw new Error('Unexpected schema version');
+    for (const version of migrations) {
+      const source = fs.readFileSync(fileURLToPath(new URL(`../database/${version}.sql`, import.meta.url)), 'utf8');
+      const sha256 = createHash('sha256').update(source).digest('hex');
+      if (known.has(version)) {
+        if (known.get(version) !== sha256) throw new Error(`Migration changed: ${version}`);
+        continue;
+      }
+      if (version !== migrations[0] && !known.has(migrations[migrations.indexOf(version) - 1])) throw new Error('Previous migration missing');
+      const statements = source.split('\n').filter(line => !line.trimStart().startsWith('--')).join('\n');
+      for (const statement of statements.split(';').map(item => item.trim()).filter(Boolean)) await db.query(statement);
+      await db.execute('INSERT INTO schema_migrations (version, sha256) VALUES (?,?)', [version, sha256]);
+      known.set(version, sha256);
+      console.log(JSON.stringify({ schema: version, sha256 }));
+    }
+  } else {
+    const [versions] = await db.query('SELECT version FROM schema_migrations');
+    if (!versions.some(row => row.version === '001_relay_core') || versions.some(row => !migrations.includes(row.version))) throw new Error('Unexpected schema version');
+    if (command === '--check') {
+      const names = ['computers', 'mobile_authorizations', 'official_computers', 'announcements', 'relay_settings', 'users', 'user_login_identities'];
+      if (versions.some(row => row.version === '002_email_accounts')) names.push('email_login_challenges', 'user_sessions', 'email_send_limits');
+      if (versions.some(row => row.version === '003_relay_usage')) names.push('relay_admin_emails', 'relay_usage_settings', 'relay_usage_totals', 'relay_usage_computer_totals', 'relay_usage_entitlements', 'relay_usage_budgets', 'relay_usage_computer_budgets', 'relay_usage_sessions');
+      if (versions.some(row => row.version === '004_relay_usage_actions')) names.push('relay_usage_actions');
+      if (versions.some(row => row.version === '006_relay_diagnostics')) names.push('relay_diagnostics');
+      if (versions.some(row => row.version === '007_relay_usage_daily')) names.push('relay_usage_user_days', 'relay_usage_computer_days');
+      const counts = {};
+      for (const name of names) { const [rows] = await db.query(`SELECT COUNT(*) AS count FROM ${name}`); counts[name] = rows[0].count; }
+      if (process.env.RELAY_STATE_FILE && process.env.RELAY_ADMIN_STATE_FILE) {
+        const devices = deviceStore(process.env.RELAY_STATE_FILE).entries();
+        const admin = relayAdminState(process.env.RELAY_ADMIN_STATE_FILE, 8).read();
+        const expected = { computers: devices.length,
+          mobile_authorizations: devices.reduce((sum, item) => sum + item.clients.length, 0),
+          official_computers: devices.filter(item => item.officialComputer).length,
+          announcements: admin.announcements.length, relay_settings: 1 };
+        if (Object.keys(expected).some(name => counts[name] !== expected[name])) throw new Error('Imported row counts differ from JSON');
+        const [saved] = await db.query('SELECT id,host_hash,status,revision FROM computers');
+        const original = new Map(devices.map(item => [item.id, item]));
+        for (const row of saved) {
+          const item = original.get(row.id);
+          if (!item || item.hostHash !== row.host_hash || item.status !== row.status || item.revision !== Number(row.revision)) {
+            throw new Error('Imported computer identity differs from JSON');
+          }
+        }
+        const [authorized] = await db.query('SELECT computer_id,client_id,credential_hash FROM mobile_authorizations');
+        for (const row of authorized) {
+          const item = original.get(row.computer_id)?.clients.find(client => client.id === row.client_id);
+          if (!item || item.hash !== row.credential_hash) throw new Error('Imported mobile authorization differs from JSON');
+        }
+        const [settings] = await db.query('SELECT max_relay_sessions FROM relay_settings WHERE id=1');
+        if (settings[0]?.max_relay_sessions !== admin.maxRelaySessions) throw new Error('Imported relay setting differs from JSON');
+        console.log(JSON.stringify({ verified: true, counts }));
+      } else console.log(JSON.stringify(counts));
+    } else {
+      const stateFile = process.env.RELAY_STATE_FILE, adminFile = process.env.RELAY_ADMIN_STATE_FILE;
+      if (!stateFile || !adminFile) throw new Error('RELAY_STATE_FILE and RELAY_ADMIN_STATE_FILE required for import');
+      const devices = deviceStore(stateFile).entries();
+      const admin = relayAdminState(adminFile, 8).read();
+      const [existing] = await db.query('SELECT (SELECT COUNT(*) FROM computers) AS computers, (SELECT COUNT(*) FROM relay_settings) AS settings');
+      if (existing[0].computers || existing[0].settings) throw new Error('Import target is not empty');
+      await db.beginTransaction();
+      try {
+        for (const item of devices) {
+          await db.execute('INSERT INTO computers (id,host_hash,status,revision,created_at,updated_at) VALUES (?,?,?,?,?,?)',
+            [item.id, item.hostHash, item.status, item.revision, sqlTime(item.createdAt), sqlTime(item.updatedAt)]);
+          for (const client of item.clients) await db.execute(
+            'INSERT INTO mobile_authorizations (computer_id,client_id,credential_hash,created_at,updated_at) VALUES (?,?,?,?,?)',
+            [item.id, client.id, client.hash, sqlTime(client.createdAt), sqlTime(client.updatedAt)]);
+          if (item.officialComputer) {
+            const official = item.officialComputer;
+            await db.execute('INSERT INTO official_computers (computer_id,environment_id,name,hostname,updated_at) VALUES (?,?,?,?,?)',
+              [item.id, official.environmentId, official.name, official.hostname, sqlTime(official.updatedAt)]);
+          }
+        }
+        await db.execute('INSERT INTO relay_settings (id,max_relay_sessions,updated_at) VALUES (1,?,UTC_TIMESTAMP(3))', [admin.maxRelaySessions]);
+        for (const item of admin.announcements) await db.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 db.commit();
+      } catch (error) { await db.rollback(); throw error; }
+      console.log(JSON.stringify({ imported: true, computers: devices.length,
+        mobileAuthorizations: devices.reduce((sum, item) => sum + item.clients.length, 0),
+        officialComputers: devices.filter(item => item.officialComputer).length,
+        announcements: admin.announcements.length }));
+    }
+  }
+} finally { await db.end(); }

package/dist/bin/publish-android-release.mjs

@@ -0,0 +1,62 @@
+#!/usr/bin/env node
+import fs from 'node:fs';
+import path from 'node:path';
+import { createHash } from 'node:crypto';
+import { androidReleaseStorage } from '../relay-admin/android-release-storage.mjs';
+import { readAndroidCatalog } from '../src/self-relay/android-releases.mjs';
+import { readPublicManifest, updatePublicAndroid } from '../src/self-relay/public-releases.mjs';
+
+// This administrative command runs only on the deployment host; no keys cross SSH.
+const [apkFile, metadataFile] = process.argv.slice(2);
+if (!apkFile || !metadataFile) throw new Error('Usage: publish-android-release.mjs APK METADATA');
+const storage = androidReleaseStorage('/etc/codex-relay/android-releases.json', '/etc/codex-relay/tencent-monitor.json');
+const metadata = JSON.parse(fs.readFileSync(metadataFile, 'utf8'));
+if (metadata.packageName !== 'cn.walkhi.coderelax' || !/^[a-f0-9]{64}$/.test(metadata.certificateSha256)) throw new Error('Invalid APK identity');
+const { certificateSha256: expectedCertificate } = JSON.parse(fs.readFileSync('/etc/codex-relay/android-releases.json', 'utf8'));
+if (!/^[a-f0-9]{64}$/.test(expectedCertificate) || metadata.certificateSha256 !== expectedCertificate) throw new Error('APK signing certificate does not match release configuration');
+const bytes = fs.readFileSync(apkFile), sha256 = createHash('sha256').update(bytes).digest('hex');
+if (sha256 !== metadata.sha256 || bytes.length !== metadata.size) throw new Error('Uploaded APK integrity mismatch');
+const { versionCode, versionName, size, notes, certificateSha256 } = metadata;
+const release = { versionCode, versionName, size, sha256, notes, certificateSha256,
+  objectKey: `code-relax/android/${versionCode}/Code-Relax-${sha256.slice(0, 16)}.apk` };
+const catalogFile = storage.catalogFile, temporary = catalogFile + '.new', lock = catalogFile + '.lock';
+const lockHandle = fs.openSync(lock, 'wx', 0o600);
+try {
+  readPublicManifest();
+  const catalog = fs.existsSync(catalogFile) ? readAndroidCatalog(catalogFile) : { releases: [] };
+  const previous = catalog.releases.find(item => item.versionCode === versionCode);
+  if (previous && previous.sha256 !== sha256) throw new Error('A different APK already uses this versionCode');
+  if (catalog.latestVersionCode > versionCode) throw new Error('Refusing to publish an older version as latest');
+  const next = { latestVersionCode: versionCode, releases: [...catalog.releases.filter(item => item.versionCode !== versionCode), release] };
+  fs.writeFileSync(temporary, JSON.stringify(next, null, 2) + '\n', { mode: 0o640 });
+  readAndroidCatalog(temporary);
+  if (!previous) {
+    await new Promise((resolve, reject) => storage.cos.putObject({ ...storage.object(release), Body: bytes,
+      ContentLength: bytes.length, ContentType: 'application/vnd.android.package-archive',
+      ContentDisposition: `attachment; filename="Code-Relax-${versionName}.apk"`
+    }, (error, value) => error ? reject(error) : resolve(value)));
+  }
+  // Validate the exact signed GET that website and App use, before switching latest.
+  const ticket = await storage.signDownload(release);
+  const response = await fetch(ticket.url, { signal: AbortSignal.timeout(120000) });
+  if (!response.ok) throw new Error(`Signed download failed: HTTP ${response.status}`);
+  const downloaded = Buffer.from(await response.arrayBuffer());
+  if (downloaded.length !== size || createHash('sha256').update(downloaded).digest('hex') !== sha256) throw new Error('Stored APK integrity mismatch');
+  const unsigned = new URL(ticket.url); unsigned.search = '';
+  const denied = await fetch(unsigned, { method: 'HEAD', signal: AbortSignal.timeout(15000) });
+  if (denied.status !== 403) throw new Error(`Private object check failed: HTTP ${denied.status}`);
+  const owner = fs.statSync(path.dirname(catalogFile));
+  fs.chownSync(temporary, owner.uid, owner.gid);
+  fs.renameSync(temporary, catalogFile);
+  updatePublicAndroid(release);
+  console.log(JSON.stringify({ published: true, versionCode, versionName, size, sha256, unsignedStatus: denied.status,
+    entry: 'https://www.coderelax.cn/code-relax/android' }));
+} catch (error) {
+  // COS errors can carry signed request details. Keep CLI output credential-free.
+  console.error('Android publication failed:', error?.code || (error?.name === 'Error' ? error.message : 'storage-request-failed'));
+  process.exitCode = 1;
+} finally {
+  fs.closeSync(lockHandle);
+  fs.unlinkSync(lock);
+  if (fs.existsSync(temporary)) fs.unlinkSync(temporary);
+}

package/dist/bin/self-relay-admin.mjs

@@ -0,0 +1,8 @@
+import { startAdminServer } from '../src/self-relay/admin-server.mjs';
+
+const port = Number(process.env.RELAY_ADMIN_PORT || 45851);
+if (!Number.isSafeInteger(port) || port < 1 || port > 65535) throw new Error('Invalid RELAY_ADMIN_PORT');
+const server = await startAdminServer({ port });
+console.log(JSON.stringify({ service: 'codex-relay-admin', port: server.port }));
+await new Promise(resolve => { process.once('SIGTERM', resolve); process.once('SIGINT', resolve); });
+await server.close();

package/dist/bin/self-relay-demo.mjs

@@ -3,7 +3,7 @@ import { startRelayDemo } from '../src/self-relay/demo.mjs';
 import fs from 'node:fs';
 import { spawnSync } from 'node:child_process';
 
-const mode = process.argv.includes('--legacy') ? 'lan-legacy' : 'lan-shared';
+const mode = 'lan-shared';
 let remoteRelay;
 if (process.env.RELAY_URL) {
   let hostKey;
@@ -25,7 +25,7 @@ try {
   const health = await client.request('/api/health');
   if (health.status !== 200 || health.body.transportMode !== mode) throw new Error('Relay validation failed');
   console.log(JSON.stringify({ ok: true, simulated: true, mode, relay: demo.relay.url,
-    bridge: demo.bridgeUrl, message: '中继 → 连接器 → 模拟 Bridge 已连通；未连接 Codex，未执行任务。' }, null, 2));
+    bridge: demo.bridgeUrl, message: '中继 → 连接器 → 模拟桌面服务已连通；未连接 Codex，未执行任务。' }, null, 2));
   if (!process.argv.includes('--check')) {
     console.log('验证连接保持运行。Ctrl+C 停止全部模拟进程内服务。');
     await new Promise(resolve => { process.once('SIGINT', resolve); process.once('SIGTERM', resolve); });

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

@@ -1,23 +1,29 @@
-#!/usr/bin/env node
-import fs from 'node:fs';
-import { deviceStore, validId } from '../src/self-relay/device-store.mjs';
+#!/usr/bin/env node
+import fs from 'node:fs';
+import serviceEndpoints from '../shared/service-endpoints.cjs';
+import { deviceStore, validId } from '../src/self-relay/device-store.mjs';
+import { openRelayMysql } from '../src/self-relay/mysql-state.mjs';
 import { startSelfRelay } from '../src/self-relay/server.mjs';
 import { updateDebugAllowlist } from '../src/self-relay/debug-allowlist.mjs';
-
-const keyFile = process.env.RELAY_HOST_KEY_FILE;
-if (!keyFile) throw new Error('RELAY_HOST_KEY_FILE is required');
-const hostKey = fs.readFileSync(keyFile, 'utf8').trim();
-const port = Number(process.env.RELAY_PORT || 45850);
-if (!Number.isInteger(port) || port < 1024 || port > 65535) throw new Error('Invalid RELAY_PORT');
-const stateFile = process.env.RELAY_STATE_FILE;
-if (!stateFile) throw new Error('RELAY_STATE_FILE is required');
+
+const keyFile = process.env.RELAY_HOST_KEY_FILE;
+if (!keyFile) throw new Error('RELAY_HOST_KEY_FILE is required');
+const hostKey = fs.readFileSync(keyFile, 'utf8').trim();
+const port = Number(process.env.RELAY_PORT || 45850);
+if (!Number.isInteger(port) || port < 1024 || port > 65535) throw new Error('Invalid RELAY_PORT');
+const stateFile = process.env.RELAY_STATE_FILE;
+const mysqlConfigFile = process.env.RELAY_MYSQL_CONFIG_FILE;
+const accountConfigFile = process.env.RELAY_ACCOUNT_CONFIG_FILE;
+const longPairingFile = process.env.RELAY_LONG_PAIRING_FILE || '/var/lib/codex-relay/long-pairing.json';
+if (!stateFile && !mysqlConfigFile) throw new Error('RELAY_STATE_FILE or RELAY_MYSQL_CONFIG_FILE is required');
 const debugAllowlistFile = process.env.RELAY_DEBUG_ALLOWLIST_FILE || '/etc/codex-relay/debug-allowlist.json';
 const adminStateFile = process.env.RELAY_ADMIN_STATE_FILE || '/var/lib/codex-relay/admin.json';
 const maxRelaySessions = Number(process.env.RELAY_MAX_RELAY_SESSIONS || 8);
 if (!Number.isSafeInteger(maxRelaySessions) || maxRelaySessions < 1 || maxRelaySessions > 256) throw new Error('Invalid RELAY_MAX_RELAY_SESSIONS');
 const debugCommand = process.argv.find(value => ['--debug-list', '--debug-allow', '--debug-deny'].includes(value));
 if (debugCommand) {
-  const records = deviceStore(stateFile).entries();
+  const database = mysqlConfigFile ? await openRelayMysql(mysqlConfigFile, maxRelaySessions) : null;
+  const records = (database?.devices || deviceStore(stateFile)).entries();
   if (debugCommand === '--debug-list') {
     console.log(JSON.stringify(records.map(record => ({
       deviceId: record.id, status: record.status, clientCount: record.clients.length,
@@ -30,24 +36,31 @@ if (debugCommand) {
     updateDebugAllowlist(debugAllowlistFile, deviceId, debugCommand === '--debug-allow');
     console.log('Debug allowlist updated; restart relay to apply.');
   }
+  if (database) await database.close();
   process.exit(0);
 }
-if (process.argv.includes('--init-state')) { deviceStore(stateFile, { initialize: true }); console.log('Device store initialized'); process.exit(0); }
-const revokeIndex = process.argv.indexOf('--revoke-host');
-if (revokeIndex >= 0) {
-  // Run only with the service stopped: this is an offline administrator operation.
-  if (!process.argv.includes('--offline')) throw new Error('Stop the relay service and supply --offline');
-  const id = process.argv[revokeIndex + 1];
-  if (!validId(id)) throw new Error('Invalid device ID');
-  const store = deviceStore(stateFile), record = store.entries().find(item => item.id === id);
-  if (!record) throw new Error('Device not found');
-  store.save({ ...record, status: 'revoked', clientHash: undefined, clientId: undefined, revision: record.revision + 1, updatedAt: new Date().toISOString() });
-  console.log('Computer and phone authorization revoked'); process.exit(0);
-}
-const relay = await startSelfRelay({ port, hostKey, stateFile, debugAllowlistFile, adminStateFile, maxRelaySessions,
-  publicRelayUrl: process.env.RELAY_PUBLIC_URL || '', appDownloadUrl: process.env.RELAY_APP_DOWNLOAD_URL || '',
+if (process.argv.includes('--init-state')) { if (mysqlConfigFile) throw new Error('Use migrations for MySQL mode'); deviceStore(stateFile, { initialize: true }); console.log('Device store initialized'); process.exit(0); }
+const revokeIndex = process.argv.indexOf('--revoke-host');
+if (revokeIndex >= 0) {
+  // Run only with the service stopped: this is an offline administrator operation.
+  if (!process.argv.includes('--offline')) throw new Error('Stop the relay service and supply --offline');
+  const id = process.argv[revokeIndex + 1];
+  if (!validId(id)) throw new Error('Invalid device ID');
+  const database = mysqlConfigFile ? await openRelayMysql(mysqlConfigFile, maxRelaySessions) : null;
+  const store = database?.devices || deviceStore(stateFile), record = store.entries().find(item => item.id === id);
+  if (!record) throw new Error('Device not found');
+  await store.save({ ...record, status: 'revoked', clients: [], revision: record.revision + 1, updatedAt: new Date().toISOString() });
+  if (database) await database.close();
+  console.log('Computer and phone authorization revoked'); process.exit(0);
+}
+const relay = await startSelfRelay({ port, hostKey, stateFile, mysqlConfigFile, accountConfigFile, debugAllowlistFile, adminStateFile, maxRelaySessions,
+  longPairingFile,
+  androidReleaseConfigFile: process.env.RELAY_ANDROID_RELEASE_CONFIG_FILE,
+  androidReleaseCredentialFile: process.env.CREDENTIALS_DIRECTORY ? `${process.env.CREDENTIALS_DIRECTORY}/tencent-monitor.json` : undefined,
+  usageDiagnosticKeyFile: process.env.RELAY_USAGE_DIAGNOSTIC_KEY_FILE,
+  publicRelayUrl: process.env.RELAY_PUBLIC_URL || serviceEndpoints.relayUrl, appDownloadUrl: process.env.RELAY_APP_DOWNLOAD_URL || serviceEndpoints.installUrl,
   log: entry => console.log(JSON.stringify({ time: new Date().toISOString(), ...entry })) });
-console.log(JSON.stringify({ service: 'codex-self-relay', listen: relay.url, maxConnections: 32, maxRelaySessions,
-  maxFrameMiB: 8, encryption: 'TLS must be supplied by reverse proxy; no end-to-end encryption' }));
-await new Promise(resolve => { process.once('SIGTERM', resolve); process.once('SIGINT', resolve); });
-await relay.close();
+console.log(JSON.stringify({ service: 'codex-self-relay', listen: relay.url, maxConnections: 128, maxRelaySessions,
+  maxFrameMiB: 8, encryption: 'TLS must be supplied by reverse proxy; no end-to-end encryption' }));
+await new Promise(resolve => { process.once('SIGTERM', resolve); process.once('SIGINT', resolve); });
+await relay.close();

package/dist/build-platform.json

@@ -0,0 +1 @@
+{"layout":"npm-platform-packages","version":"0.1.0-beta.31"}

package/dist/get-shared-service-url.ps1

@@ -1,6 +1,6 @@
-# Detect the Desktop connection, not merely a listening standalone server.
-$connections = @(Get-NetTCPConnection -RemotePort 45839 -State Established -ErrorAction SilentlyContinue | Where-Object {
-    $_.RemoteAddress -eq '127.0.0.1' -and
-    (Get-Process -Id $_.OwningProcess -ErrorAction SilentlyContinue).ProcessName -eq 'ChatGPT'
-})
-if ($connections.Count) { 'ws://127.0.0.1:45839' }
+# Detect the Desktop connection, not merely a listening standalone server.
+$connections = @(Get-NetTCPConnection -RemotePort 45839 -State Established -ErrorAction SilentlyContinue | Where-Object {
+    $_.RemoteAddress -eq '127.0.0.1' -and
+    (Get-Process -Id $_.OwningProcess -ErrorAction SilentlyContinue).ProcessName -eq 'ChatGPT'
+})
+if ($connections.Count) { 'ws://127.0.0.1:45839' }