@walkhi/code-relax 0.1.0-beta.68 → 0.1.0-beta.69

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,118 +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';
-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; }
-}
+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; }
+}

package/dist/src/self-relay/phone-connections.mjs

@@ -1,55 +1,55 @@
-import { validId } from './device-store.mjs';
-
-export function validPhoneConnection(value) {
-  return value && validId(value.connectionId) && validId(value.clientId) && ['lan', 'self-relay'].includes(value.mode);
-}
-
-export function phoneConnectionEvents(pool) {
-  const recent = new Map();
-  const lastConnections = new Map();
-  return {
-    async record(computerId, event) {
-      if (!validPhoneConnection(event) || !validId(event.id) ||
-          !['connected', 'disconnected'].includes(event.state) ||
-          typeof event.at !== 'string' || !/^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d\.\d{3}Z$/.test(event.at) ||
-          !Number.isFinite(Date.parse(event.at)) || new Date(event.at).toISOString() !== event.at) throw new Error('Invalid phone connection event');
-      const item = { id: event.id, connectionId: event.connectionId, clientId: event.clientId,
-        mode: event.mode, state: event.state, at: event.at, receivedAt: new Date().toISOString() };
-      if (pool) await pool.execute(`INSERT INTO workstation_phone_events
-        (event_id,computer_id,client_id,connection_id,mode,state,occurred_at,received_at) VALUES (?,?,?,?,?,?,?,?)
-        ON DUPLICATE KEY UPDATE event_id=event_id`,
-      [item.id, computerId, item.clientId, item.connectionId, item.mode, item.state,
-        item.at.slice(0, 23).replace('T', ' '), item.receivedAt.slice(0, 23).replace('T', ' ')]);
-      else {
-        const items = recent.get(computerId) || [];
-        if (!items.some(value => value.id === item.id)) items.push(item);
-        recent.set(computerId, items.slice(-20));
-        if (item.state === 'connected') {
-          const phones = lastConnections.get(computerId) || new Map();
-          if (!phones.has(item.clientId) || phones.get(item.clientId).at <= item.at) phones.set(item.clientId, item);
-          lastConnections.set(computerId, phones);
-        }
-      }
-    },
-    async latest(computerIds) {
-      if (!computerIds.length) return [];
-      if (!pool) return computerIds.flatMap(computerId => [...(lastConnections.get(computerId)?.values() || [])]
-        .map(item => ({ computerId, clientId: item.clientId, mode: item.mode, at: item.at })));
-      const [rows] = await pool.execute(`SELECT computer_id,client_id,mode,occurred_at FROM (
-        SELECT computer_id,client_id,mode,occurred_at,
-          ROW_NUMBER() OVER (PARTITION BY computer_id,client_id ORDER BY occurred_at DESC,sequence_id DESC) AS connection_rank
-        FROM workstation_phone_events WHERE state='connected' AND computer_id IN (${computerIds.map(() => '?').join(',')})
-      ) latest WHERE connection_rank=1`, computerIds);
-      return rows.map(row => ({ computerId: row.computer_id, clientId: row.client_id,
-        mode: row.mode, at: row.occurred_at.replace(' ', 'T') + 'Z' }));
-    },
-    async list(computerId) {
-      if (!pool) return [...(recent.get(computerId) || [])].reverse();
-      const [rows] = await pool.execute(`SELECT event_id,client_id,connection_id,mode,state,occurred_at,received_at
-        FROM workstation_phone_events WHERE computer_id=? ORDER BY sequence_id DESC LIMIT 20`, [computerId]);
-      return rows.map(row => ({ id: row.event_id, clientId: row.client_id, connectionId: row.connection_id,
-        mode: row.mode, state: row.state, at: row.occurred_at.replace(' ', 'T') + 'Z',
-        receivedAt: row.received_at.replace(' ', 'T') + 'Z' }));
-    },
-  };
-}
+import { validId } from './device-store.mjs';
+
+export function validPhoneConnection(value) {
+  return value && validId(value.connectionId) && validId(value.clientId) && ['lan', 'self-relay'].includes(value.mode);
+}
+
+export function phoneConnectionEvents(pool) {
+  const recent = new Map();
+  const lastConnections = new Map();
+  return {
+    async record(computerId, event) {
+      if (!validPhoneConnection(event) || !validId(event.id) ||
+          !['connected', 'disconnected'].includes(event.state) ||
+          typeof event.at !== 'string' || !/^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d\.\d{3}Z$/.test(event.at) ||
+          !Number.isFinite(Date.parse(event.at)) || new Date(event.at).toISOString() !== event.at) throw new Error('Invalid phone connection event');
+      const item = { id: event.id, connectionId: event.connectionId, clientId: event.clientId,
+        mode: event.mode, state: event.state, at: event.at, receivedAt: new Date().toISOString() };
+      if (pool) await pool.execute(`INSERT INTO workstation_phone_events
+        (event_id,computer_id,client_id,connection_id,mode,state,occurred_at,received_at) VALUES (?,?,?,?,?,?,?,?)
+        ON DUPLICATE KEY UPDATE event_id=event_id`,
+      [item.id, computerId, item.clientId, item.connectionId, item.mode, item.state,
+        item.at.slice(0, 23).replace('T', ' '), item.receivedAt.slice(0, 23).replace('T', ' ')]);
+      else {
+        const items = recent.get(computerId) || [];
+        if (!items.some(value => value.id === item.id)) items.push(item);
+        recent.set(computerId, items.slice(-20));
+        if (item.state === 'connected') {
+          const phones = lastConnections.get(computerId) || new Map();
+          if (!phones.has(item.clientId) || phones.get(item.clientId).at <= item.at) phones.set(item.clientId, item);
+          lastConnections.set(computerId, phones);
+        }
+      }
+    },
+    async latest(computerIds) {
+      if (!computerIds.length) return [];
+      if (!pool) return computerIds.flatMap(computerId => [...(lastConnections.get(computerId)?.values() || [])]
+        .map(item => ({ computerId, clientId: item.clientId, mode: item.mode, at: item.at })));
+      const [rows] = await pool.execute(`SELECT computer_id,client_id,mode,occurred_at FROM (
+        SELECT computer_id,client_id,mode,occurred_at,
+          ROW_NUMBER() OVER (PARTITION BY computer_id,client_id ORDER BY occurred_at DESC,sequence_id DESC) AS connection_rank
+        FROM workstation_phone_events WHERE state='connected' AND computer_id IN (${computerIds.map(() => '?').join(',')})
+      ) latest WHERE connection_rank=1`, computerIds);
+      return rows.map(row => ({ computerId: row.computer_id, clientId: row.client_id,
+        mode: row.mode, at: row.occurred_at.replace(' ', 'T') + 'Z' }));
+    },
+    async list(computerId) {
+      if (!pool) return [...(recent.get(computerId) || [])].reverse();
+      const [rows] = await pool.execute(`SELECT event_id,client_id,connection_id,mode,state,occurred_at,received_at
+        FROM workstation_phone_events WHERE computer_id=? ORDER BY sequence_id DESC LIMIT 20`, [computerId]);
+      return rows.map(row => ({ id: row.event_id, clientId: row.client_id, connectionId: row.connection_id,
+        mode: row.mode, state: row.state, at: row.occurred_at.replace(' ', 'T') + 'Z',
+        receivedAt: row.received_at.replace(' ', 'T') + 'Z' }));
+    },
+  };
+}

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

@@ -471,7 +471,7 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
           void meter?.lost(task).catch(error => log({ event: 'usage-error', message: error.message }));
         }
         room.usageTasks?.clear(); room.usageArms?.clear();
-        room.host = undefined; room.hostName = undefined; room.lanCandidates = [];
+        room.host = undefined; room.hostName = undefined; room.lanCandidates = []; room.health = null;
         room.uploadHost?.close(4410, 'Computer offline');
         for (const client of room.uploadClients?.values() || []) client.ws.close(code === 4432 ? 4432 : 4410, code === 4432 ? 'Computer inbound queue limit exceeded' : 'Computer offline');
         for (const observer of room.observers.values()) send(observer.ws, { type: 'observing', online: false });
@@ -613,7 +613,7 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
               }
               room.usageTasks?.clear(); room.usageArms?.clear();
             }
-            room.host = ws; room.hostName = hostName; room.lanCandidates = lanCandidates;
+            room.host = ws; room.hostName = hostName; room.lanCandidates = lanCandidates; room.health = null;
             room.adminPhoneConnections = undefined;
             room.adminLastOnlineAt = ws.adminInfo.connectedAt; room.adminLastHostName = hostName;
             room.usageTasks ||= new Map(); room.usageArms ||= new Map();
@@ -680,7 +680,7 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
             const oldObserver = room.observers.get(clientId);
             if (oldObserver?.ws && oldObserver.ws !== ws) oldObserver.ws.close(4409, 'Metadata connection replaced by same identity');
             room.observers.set(clientId, { ws, userId });
-            send(ws, { type: 'observing', online: Boolean(room.host) });
+            send(ws, { type: 'observing', online: Boolean(room.host), health: room.host ? room.health || null : null });
             send(ws, { type: 'debug-permissions', enabled: debugAllowed(debugAllowlist, room.id, room.clients.find(client => client.id === clientId)) });
             const announcement = adminState.read().announcement;
             if (announcement) send(ws, { type: 'announcement', announcement });
@@ -716,6 +716,17 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
           await manageDevices(room, ws, message, clientId); return;
         }
         if (role === 'host') {
+          if (message.type === 'workstation-health') {
+            if (room.host !== ws) return;
+            const health = message.health;
+            if (health !== null && (!health || Array.isArray(health) || typeof health !== 'object' ||
+                health.status !== 'ok' || typeof health.serviceInstanceId !== 'string' || JSON.stringify(health).length > 65536))
+              return fail(1008, 'Invalid workstation health');
+            room.health = health;
+            for (const observer of room.observers.values()) send(observer.ws, { type: 'workstation-health', health });
+            return;
+          }
+
           if (['phone-connection', 'phone-connections'].includes(message.type)) {
             if (room.host !== ws) return;
             if (message.type === 'phone-connections') {

package/dist/src/self-relay/usage-daily.mjs

@@ -1,55 +1,55 @@
-const dayMs = 86400000;
-const chinaOffsetMs = 8 * 3600000;
-
-export function usageDaySlices(start, end) {
-  const slices = [];
-  for (let cursor = start; cursor < end;) {
-    const date = new Date(cursor + chinaOffsetMs).toISOString().slice(0, 10);
-    const nextDay = Date.parse(`${date}T00:00:00Z`) + dayMs - chinaOffsetMs;
-    const until = Math.min(end, nextDay);
-    slices.push({ date, start: cursor, end: until });
-    cursor = until;
-  }
-  return slices;
-}
-
-const readIntervals = value => Array.isArray(value) ? value : JSON.parse(value || '[]');
-
-export function mergeUsageIntervals(existing, start, end) {
-  const sorted = [...existing, [start, end]].sort((a, b) => a[0] - b[0]);
-  const merged = [];
-  for (const range of sorted) {
-    const last = merged.at(-1);
-    if (last && range[0] <= last[1]) last[1] = Math.max(last[1], range[1]);
-    else merged.push([...range]);
-  }
-  return { intervals: merged, seconds: merged.reduce((sum, [from, until]) => sum + until - from, 0) / 1000 };
-}
-
-export async function recordDailyUsage(db, userId, computerId, free, start, end, now) {
-  for (const slice of usageDaySlices(start, end)) {
-    await db.execute(`INSERT IGNORE INTO relay_usage_user_days
-      (user_id,usage_date,intervals,updated_at) VALUES (?,?,'[]',?)`, [userId, slice.date, now]);
-    const [userRows] = await db.execute(`SELECT intervals FROM relay_usage_user_days
-      WHERE user_id=? AND usage_date=? FOR UPDATE`, [userId, slice.date]);
-    const user = mergeUsageIntervals(readIntervals(userRows[0].intervals), slice.start, slice.end);
-    await db.execute(`UPDATE relay_usage_user_days SET intervals=?,task_seconds=?,updated_at=?
-      WHERE user_id=? AND usage_date=?`,
-      [JSON.stringify(user.intervals), user.seconds, now, userId, slice.date]);
-
-    await db.execute(`INSERT IGNORE INTO relay_usage_computer_days
-      (computer_id,usage_date,intervals,free_intervals,updated_at) VALUES (?,?,'[]','[]',?)`,
-      [computerId, slice.date, now]);
-    const [computerRows] = await db.execute(`SELECT intervals,free_intervals FROM relay_usage_computer_days
-      WHERE computer_id=? AND usage_date=? FOR UPDATE`, [computerId, slice.date]);
-    const computer = mergeUsageIntervals(readIntervals(computerRows[0].intervals), slice.start, slice.end);
-    const freeIntervals = readIntervals(computerRows[0].free_intervals);
-    const freeComputer = free ? mergeUsageIntervals(freeIntervals, slice.start, slice.end) : null;
-    await db.execute(`UPDATE relay_usage_computer_days SET intervals=?,task_seconds=?,
-      free_intervals=?,free_task_seconds=COALESCE(?,free_task_seconds),updated_at=?
-      WHERE computer_id=? AND usage_date=?`,
-      [JSON.stringify(computer.intervals), computer.seconds,
-        JSON.stringify(freeComputer?.intervals || freeIntervals), freeComputer?.seconds ?? null,
-        now, computerId, slice.date]);
-  }
-}
+const dayMs = 86400000;
+const chinaOffsetMs = 8 * 3600000;
+
+export function usageDaySlices(start, end) {
+  const slices = [];
+  for (let cursor = start; cursor < end;) {
+    const date = new Date(cursor + chinaOffsetMs).toISOString().slice(0, 10);
+    const nextDay = Date.parse(`${date}T00:00:00Z`) + dayMs - chinaOffsetMs;
+    const until = Math.min(end, nextDay);
+    slices.push({ date, start: cursor, end: until });
+    cursor = until;
+  }
+  return slices;
+}
+
+const readIntervals = value => Array.isArray(value) ? value : JSON.parse(value || '[]');
+
+export function mergeUsageIntervals(existing, start, end) {
+  const sorted = [...existing, [start, end]].sort((a, b) => a[0] - b[0]);
+  const merged = [];
+  for (const range of sorted) {
+    const last = merged.at(-1);
+    if (last && range[0] <= last[1]) last[1] = Math.max(last[1], range[1]);
+    else merged.push([...range]);
+  }
+  return { intervals: merged, seconds: merged.reduce((sum, [from, until]) => sum + until - from, 0) / 1000 };
+}
+
+export async function recordDailyUsage(db, userId, computerId, free, start, end, now) {
+  for (const slice of usageDaySlices(start, end)) {
+    await db.execute(`INSERT IGNORE INTO relay_usage_user_days
+      (user_id,usage_date,intervals,updated_at) VALUES (?,?,'[]',?)`, [userId, slice.date, now]);
+    const [userRows] = await db.execute(`SELECT intervals FROM relay_usage_user_days
+      WHERE user_id=? AND usage_date=? FOR UPDATE`, [userId, slice.date]);
+    const user = mergeUsageIntervals(readIntervals(userRows[0].intervals), slice.start, slice.end);
+    await db.execute(`UPDATE relay_usage_user_days SET intervals=?,task_seconds=?,updated_at=?
+      WHERE user_id=? AND usage_date=?`,
+      [JSON.stringify(user.intervals), user.seconds, now, userId, slice.date]);
+
+    await db.execute(`INSERT IGNORE INTO relay_usage_computer_days
+      (computer_id,usage_date,intervals,free_intervals,updated_at) VALUES (?,?,'[]','[]',?)`,
+      [computerId, slice.date, now]);
+    const [computerRows] = await db.execute(`SELECT intervals,free_intervals FROM relay_usage_computer_days
+      WHERE computer_id=? AND usage_date=? FOR UPDATE`, [computerId, slice.date]);
+    const computer = mergeUsageIntervals(readIntervals(computerRows[0].intervals), slice.start, slice.end);
+    const freeIntervals = readIntervals(computerRows[0].free_intervals);
+    const freeComputer = free ? mergeUsageIntervals(freeIntervals, slice.start, slice.end) : null;
+    await db.execute(`UPDATE relay_usage_computer_days SET intervals=?,task_seconds=?,
+      free_intervals=?,free_task_seconds=COALESCE(?,free_task_seconds),updated_at=?
+      WHERE computer_id=? AND usage_date=?`,
+      [JSON.stringify(computer.intervals), computer.seconds,
+        JSON.stringify(freeComputer?.intervals || freeIntervals), freeComputer?.seconds ?? null,
+        now, computerId, slice.date]);
+  }
+}