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

package/dist/src/self-relay/long-pairing.mjs

@@ -1,40 +1,40 @@
-import fs from 'node:fs';
-import { randomUUID } from 'node:crypto';
-import { validId } from './device-store.mjs';
-import { digest, matches, secret } from './wire.mjs';
-
-// Operator-owned file, separate from device state. Only hashes are retained here.
-export function longPairing(file) {
-  function read() {
-    if (!file || !fs.existsSync(file)) return [];
-    const data = JSON.parse(fs.readFileSync(file, 'utf8'));
-    if (data.version !== 1 || !Array.isArray(data.invitations) || data.invitations.some(item =>
-      !validId(item.id) || !validId(item.room) || !/^[a-f0-9]{64}$/.test(item.hash) ||
-      !Number.isSafeInteger(item.expires))) throw new Error('Invalid long pairing invitations');
-    return data.invitations;
-  }
-  function write(invitations) {
-    if (!file) throw new Error('Long pairing file is not configured');
-    const temporary = `${file}.${randomUUID()}.tmp`;
-    try {
-      fs.writeFileSync(temporary, JSON.stringify({ version: 1, invitations }), { mode: 0o600, flag: 'wx' });
-      fs.renameSync(temporary, file);
-    } finally { fs.rmSync(temporary, { force: true }); }
-  }
-  return {
-    list: () => read().map(({ hash, ...item }) => item),
-    find: code => read().find(item => Date.now() < item.expires && matches(code, item.hash)),
-    create(room, expires) {
-      if (!validId(room) || !Number.isSafeInteger(expires) || expires <= Date.now()) throw new Error('Invalid invitation room or expiry');
-      const invitations = read(), code = secret();
-      const item = { id: randomUUID(), room, expires, hash: digest(code) };
-      write([...invitations, item]);
-      return { id: item.id, room, expires, code };
-    },
-    revoke(id) {
-      const invitations = read();
-      if (!invitations.some(item => item.id === id)) throw new Error('Invitation not found');
-      write(invitations.filter(item => item.id !== id));
-    },
-  };
-}
+import fs from 'node:fs';
+import { randomUUID } from 'node:crypto';
+import { validId } from './device-store.mjs';
+import { digest, matches, secret } from './wire.mjs';
+
+// Operator-owned file, separate from device state. Only hashes are retained here.
+export function longPairing(file) {
+  function read() {
+    if (!file || !fs.existsSync(file)) return [];
+    const data = JSON.parse(fs.readFileSync(file, 'utf8'));
+    if (data.version !== 1 || !Array.isArray(data.invitations) || data.invitations.some(item =>
+      !validId(item.id) || !validId(item.room) || !/^[a-f0-9]{64}$/.test(item.hash) ||
+      !Number.isSafeInteger(item.expires))) throw new Error('Invalid long pairing invitations');
+    return data.invitations;
+  }
+  function write(invitations) {
+    if (!file) throw new Error('Long pairing file is not configured');
+    const temporary = `${file}.${randomUUID()}.tmp`;
+    try {
+      fs.writeFileSync(temporary, JSON.stringify({ version: 1, invitations }), { mode: 0o600, flag: 'wx' });
+      fs.renameSync(temporary, file);
+    } finally { fs.rmSync(temporary, { force: true }); }
+  }
+  return {
+    list: () => read().map(({ hash, ...item }) => item),
+    find: code => read().find(item => Date.now() < item.expires && matches(code, item.hash)),
+    create(room, expires) {
+      if (!validId(room) || !Number.isSafeInteger(expires) || expires <= Date.now()) throw new Error('Invalid invitation room or expiry');
+      const invitations = read(), code = secret();
+      const item = { id: randomUUID(), room, expires, hash: digest(code) };
+      write([...invitations, item]);
+      return { id: item.id, room, expires, code };
+    },
+    revoke(id) {
+      const invitations = read();
+      if (!invitations.some(item => item.id === id)) throw new Error('Invitation not found');
+      write(invitations.filter(item => item.id !== id));
+    },
+  };
+}

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

@@ -1,105 +1,118 @@
-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';
-import { relaySchemaVersions } from '../../database/versions.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 = relaySchemaVersions;
-    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; }
-}
+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';
+import { relaySchemaVersions } from '../../database/versions.mjs';
+import { connectionInfo } from './device-info.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 = relaySchemaVersions;
+    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, last_connected_at, platform, device_name 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),
+        ...(row.last_connected_at ? { lastConnectedAt: isoTime(row.last_connected_at) } : {}),
+        ...(row.platform ? { platform: row.platform } : {}), ...(row.device_name ? { deviceName: row.device_name } : {}) });
+    }
+    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 recordConnection(id, clientId, at, info) {
+          const record = records.get(id), client = record?.clients.find(item => item.id === clientId);
+          if (!client) return;
+          const updated = connectionInfo(client, at, info);
+          await pool.execute('UPDATE mobile_authorizations SET last_connected_at=?,platform=?,device_name=? WHERE computer_id=? AND client_id=?',
+            [sqlTime(updated.lastConnectedAt), updated.platform || null, updated.deviceName || null, id, clientId]);
+          records.set(id, { ...record, clients: record.clients.map(item => item.id === clientId ? updated : item) });
+          return updated;
+        },
+        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,last_connected_at,platform,device_name) VALUES (?,?,?,?,?,?,?,?)',
+              [record.id, client.id, client.hash, sqlTime(client.createdAt), sqlTime(client.updatedAt),
+                client.lastConnectedAt ? sqlTime(client.lastConnectedAt) : null, client.platform || null, client.deviceName || null]);
+            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; }
+}