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

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

@@ -1,105 +1,105 @@
-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';
+
+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; }
+}

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

@@ -8,7 +8,7 @@ const HIGH_WATER = 1024 * 1024;
 const LOW_WATER = 512 * 1024;
 const MAX_QUEUED = 16 * 1024 * 1024;
 
-export async function createP2pProbe({ signal, report = () => {}, onData = () => {}, onFileChannel, iceServers = [] }) {
+export async function createP2pProbe({ signal, report = () => {}, onData = () => {}, onFileChannel, iceServers = [], purpose = '' }) {
   if (!validProbeIceServers(iceServers)) throw new Error('Invalid probe STUN configuration');
   const { default: rtc } = await import('node-datachannel');
   const peer = new rtc.PeerConnection('code-relax-probe', {
@@ -25,18 +25,23 @@ export async function createP2pProbe({ signal, report = () => {}, onData = () =>
   const outbound = [];
   const files = new Map();
   const nonce = randomUUID();
+  const idle = new P2pDataFramer.IdleWatch(message => {
+    if (!channel.sendMessage(JSON.stringify(message))) throw new Error('Idle probe send failed');
+  }, () => finish('idle-timeout'));
   const timer = setTimeout(() => finish(verified ? 'closed' : 'timeout'), 15000);
   function finish(state) {
     if (closed) return;
-    closed = true; clearTimeout(timer); candidates = []; queuedBytes = 0; outbound.length = 0; framer.reset();
+    closed = true; clearTimeout(timer); idle.close(); candidates = []; queuedBytes = 0; outbound.length = 0; framer.reset();
     for (const socket of files.values()) socket.close(1011);
     files.clear();
     const summary = diagnostic.snapshot(state);
     channel?.close(); peer.close(); report(state, summary);
+    signal({ kind: 'close' });
   }
   function verify() {
     if (verified || !pingReceived || !pongReceived) return;
     verified = true; clearTimeout(timer);
+    if (remoteDirect) idle.received();
     report(remoteDirect ? 'direct' : 'verified', diagnostic.snapshot('verified'));
     pump();
     for (const raw of files.keys()) activateFile(raw);
@@ -48,9 +53,9 @@ export async function createP2pProbe({ signal, report = () => {}, onData = () =>
     raw.sendMessage('{"type":"rtc-file-ready"}');
   }
   peer.onDataChannel(raw => {
-    if (closed || !onFileChannel || raw.getLabel() !== 'code-relax-file-v1' || files.size >= 4) { raw.close(); return; }
+    if (closed || purpose !== 'file' || !onFileChannel || raw.getLabel() !== 'code-relax-file-v1' || files.size >= 4) { raw.close(); return; }
     const socket = new FileChannel({ buffered: () => raw.bufferedAmount(),
-      send: value => typeof value === 'string' ? raw.sendMessage(value) : raw.sendMessageBinary(value), close: () => raw.close() });
+      send: value => typeof value === 'string' ? raw.sendMessage(value) : raw.sendMessageBinary(value), close: () => raw.close(), received: () => idle.received() });
     files.set(raw, socket);
     socket.addEventListener('close', () => files.delete(raw));
     try { onFileChannel(socket); }
@@ -76,7 +81,7 @@ export async function createP2pProbe({ signal, report = () => {}, onData = () =>
     } catch { diagnostic.error = 'channel'; finish('failed'); }
   }
   function sendData(payload) {
-    if (!verified || !remoteDirect || closed || !channel?.isOpen()) return false;
+    if (!verified || !remoteDirect || closed || purpose === 'file' || !channel?.isOpen()) return false;
     let item;
     try { item = framer.create(payload, `${dataPrefix}-${++dataSerial}`); }
     catch { return false; }
@@ -98,9 +103,11 @@ export async function createP2pProbe({ signal, report = () => {}, onData = () =>
     try {
       if (closed || typeof value !== 'string' || value.length > 65536) throw new Error('Invalid P2P frame');
       const message = JSON.parse(value);
+      if (verified && remoteDirect && idle.accept(message)) return;
       const data = framer.accept(message);
       if (data.handled) {
-        if (!verified || !remoteDirect) throw new Error('P2P transport not verified');
+        if (!verified || !remoteDirect || purpose === 'file') throw new Error('P2P transport not verified');
+        idle.received();
         if (data.complete) onData(data.payload);
         return;
       }

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

@@ -1,4 +1,6 @@
 import { privacyPage } from './privacy-page.mjs';
+import { createAndroidReleaseHandler } from './android-releases.mjs';
+import { androidReleaseStorage } from '../../relay-admin/android-release-storage.mjs';
 import { longPairing } from './long-pairing.mjs';
 import http from 'node:http';
 import fs from 'node:fs';
@@ -21,7 +23,10 @@ import { relayDiagnostics } from './diagnostics.mjs';
 export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlMs = 120000,
   maxConnections = 128, maxClientsPerHost = 16, maxPayload = 8 * 1024 * 1024, stateFile,
   maxRelaySessions = 8, adminStateFile, mysqlConfigFile, accountConfigFile, usageDiagnosticKeyFile,
-  publicRelayUrl = '', appDownloadUrl = '', debugAllowlistFile, longPairingFile, log = () => {} } = {}) {
+  publicRelayUrl = '', appDownloadUrl = '', debugAllowlistFile, longPairingFile,
+  androidReleaseConfigFile, androidReleaseCredentialFile, log = () => {} } = {}) {
+  const androidReleases = createAndroidReleaseHandler({
+    ...(androidReleaseConfigFile ? androidReleaseStorage(androidReleaseConfigFile, androidReleaseCredentialFile) : {}), log });
   const longInvitations = longPairing(longPairingFile);
   longInvitations.list();
   function longInvitation(code) {
@@ -107,6 +112,9 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
   }
   const server = http.createServer((request, response) => {
     const target = new URL(request.url || '/', `http://${request.headers.host || 'localhost'}`);
+    if (target.pathname.startsWith('/code-relax/android/')) {
+      void androidReleases(request, response, target); return;
+    }
     if (target.pathname === '/admin' || target.pathname.startsWith('/admin/')) {
       adminTail = adminTail.then(() => handleAdmin(request, response, target)).catch(() => {
         if (!response.headersSent) adminReply(response, 500, { error: 'Admin operation failed' });
@@ -746,9 +754,10 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
             p2pProbeRepeat: connection.p2pProbe && connection.repeat });
           else if (message.type === 'p2p-probe' && connection.p2pProbe && validProbeSignal(message)) {
             const diagnostic = message.purpose === 'diagnostic';
-            if (message.purpose && !diagnostic) return fail(1008, 'Invalid probe purpose');
-            if ((diagnostic ? connection.diagnosticProbeId : connection.probeId) !== message.probeId) return;
-            if (++connection[diagnostic ? 'diagnosticSignals' : 'signals'] > 150) return fail(1008, 'Probe signal limit');
+            const file = message.purpose === 'file';
+            if (message.purpose && !diagnostic && !file) return fail(1008, 'Invalid probe purpose');
+            if (connection[file ? 'fileProbeId' : diagnostic ? 'diagnosticProbeId' : 'probeId'] !== message.probeId) return;
+            if (++connection[file ? 'fileSignals' : diagnostic ? 'diagnosticSignals' : 'signals'] > 150) return fail(1008, 'Probe signal limit');
             send(connection.ws, { ...message, session: undefined });
           }
           else if (message.type === 'detach') connection.ws.close(1011, 'Local Bridge unavailable');
@@ -773,14 +782,15 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
           const connection = room.connections.get(clientId);
           if (!connection.p2pProbe || !validProbeSignal(message)) return fail(1008, 'Invalid probe signal');
           const diagnostic = message.purpose === 'diagnostic';
-          if (message.purpose && !diagnostic) return fail(1008, 'Invalid probe purpose');
-          const idField = diagnostic ? 'diagnosticProbeId' : 'probeId';
-          const signalsField = diagnostic ? 'diagnosticSignals' : 'signals';
-          const startedField = diagnostic ? 'diagnosticProbeStarted' : 'probeStarted';
+          const file = message.purpose === 'file';
+          if (message.purpose && !diagnostic && !file) return fail(1008, 'Invalid probe purpose');
+          const idField = file ? 'fileProbeId' : diagnostic ? 'diagnosticProbeId' : 'probeId';
+          const signalsField = file ? 'fileSignals' : diagnostic ? 'diagnosticSignals' : 'signals';
+          const startedField = file ? 'fileProbeStarted' : diagnostic ? 'diagnosticProbeStarted' : 'probeStarted';
           if (message.kind === 'start') {
             if (connection[idField] && (!connection.repeat || Date.now() - connection[startedField] < 2000)) {
               send(ws, { type: 'p2p-probe', version: 1, probeId: message.probeId,
-                ...(diagnostic ? { purpose: 'diagnostic' } : {}), kind: 'close' }); return;
+                ...(message.purpose ? { purpose: message.purpose } : {}), kind: 'close' }); return;
             }
             connection[idField] = message.probeId; connection[signalsField] = 0; connection[startedField] = Date.now();
           }

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]);
+  }
+}

package/dist/src/self-relay/windows-route-helper.mjs

@@ -1,75 +1,75 @@
-import net from 'node:net';
-
-const pipePath = String.raw`\\.\pipe\CodeRelaxRtcRouteHelper`;
-
-export function createWindowsRouteHelper({ enabled = false, token = '', iceServers = [], report = () => {} } = {}) {
-  const addresses = new Set();
-  const routeAddresses = new Set(iceServers.map(stunAddress).filter(publicIpv4));
-  let chain = Promise.resolve();
-  const enqueue = task => chain = chain.then(task, task);
-  if (!enabled || process.platform !== 'win32') return { prepare() { return Promise.resolve(); }, include() { return Promise.resolve(); } };
-  if (!/^[A-Za-z0-9_-]{32,128}$/.test(token)) throw new Error('Windows RTC 路由辅助凭据无效');
-  const add = values => enqueue(async () => {
-    for (const value of values) addresses.add(value);
-    if (!values.length) return;
-    const result = await request({ token, action: 'add', addresses: [...addresses], ttlSeconds: 120 });
-    if (!result.ok) throw new Error(result.error || 'Windows RTC 路由辅助不可用');
-    report('windows-route-helper', { count: addresses.size });
-  });
-  return {
-    prepare() { return add([...routeAddresses]); },
-    include(message) {
-      const discovered = candidateAddresses(message);
-      return add(discovered.filter(value => !addresses.has(value)));
-    }
-  };
-}
-
-function stunAddress(value) {
-  const match = /^stun:([^:]+):\d{1,5}$/i.exec(value || '');
-  return match?.[1] || '';
-}
-
-function candidateAddresses(message) {
-  const text = message?.kind === 'candidate' ? message.candidate : ['offer', 'answer'].includes(message?.kind) ? message.sdp : '';
-  const result = new Set();
-  for (const line of String(text || '').split(/\r?\n/)) {
-    const parts = line.trim().replace(/^a=/, '').split(/\s+/);
-    if (parts[0]?.startsWith('candidate:') && parts[6] === 'typ' && publicIpv4(parts[4])) result.add(parts[4]);
-  }
-  return [...result];
-}
-
-function publicIpv4(value) {
-  const parts = String(value).split('.').map(Number);
-  if (parts.length !== 4 || parts.some(part => !Number.isInteger(part) || part < 0 || part > 255)) return false;
-  const [a, b] = parts;
-  return a !== 0 && a !== 10 && a !== 127 && a < 224 && !(a === 169 && b === 254) && !(a === 172 && b >= 16 && b <= 31) &&
-    !(a === 192 && b === 168) && !(a === 100 && b >= 64 && b <= 127) && !(a === 198 && (b === 18 || b === 19));
-}
-
-function request(value) {
-  return new Promise((resolve, reject) => {
-    const socket = net.createConnection(pipePath);
-    let text = '';
-    let settled = false;
-    const rejectOnce = error => { if (!settled) { settled = true; reject(error); } };
-    const resolveOnce = result => { if (!settled) { settled = true; resolve(result); } };
-    socket.setTimeout(3000);
-    socket.setEncoding('utf8');
-    socket.once('connect', () => socket.write(`${JSON.stringify(value)}\n`));
-    socket.on('data', chunk => {
-      text += chunk;
-      const line = text.indexOf('\n');
-      if (line < 0) return;
-      try { resolveOnce(JSON.parse(text.slice(0, line))); socket.end(); }
-      catch { rejectOnce(new Error('Windows RTC 路由辅助响应无效')); socket.destroy(); }
-    });
-    socket.once('timeout', () => socket.destroy(new Error('Windows RTC 路由辅助超时')));
-    socket.once('error', rejectOnce);
-    socket.once('close', hadError => {
-      if (hadError || settled) return;
-      rejectOnce(new Error('Windows RTC 路由辅助响应无效'));
-    });
-  });
-}
+import net from 'node:net';
+
+const pipePath = String.raw`\\.\pipe\CodeRelaxRtcRouteHelper`;
+
+export function createWindowsRouteHelper({ enabled = false, token = '', iceServers = [], report = () => {} } = {}) {
+  const addresses = new Set();
+  const routeAddresses = new Set(iceServers.map(stunAddress).filter(publicIpv4));
+  let chain = Promise.resolve();
+  const enqueue = task => chain = chain.then(task, task);
+  if (!enabled || process.platform !== 'win32') return { prepare() { return Promise.resolve(); }, include() { return Promise.resolve(); } };
+  if (!/^[A-Za-z0-9_-]{32,128}$/.test(token)) throw new Error('Windows RTC 路由辅助凭据无效');
+  const add = values => enqueue(async () => {
+    for (const value of values) addresses.add(value);
+    if (!values.length) return;
+    const result = await request({ token, action: 'add', addresses: [...addresses], ttlSeconds: 120 });
+    if (!result.ok) throw new Error(result.error || 'Windows RTC 路由辅助不可用');
+    report('windows-route-helper', { count: addresses.size });
+  });
+  return {
+    prepare() { return add([...routeAddresses]); },
+    include(message) {
+      const discovered = candidateAddresses(message);
+      return add(discovered.filter(value => !addresses.has(value)));
+    }
+  };
+}
+
+function stunAddress(value) {
+  const match = /^stun:([^:]+):\d{1,5}$/i.exec(value || '');
+  return match?.[1] || '';
+}
+
+function candidateAddresses(message) {
+  const text = message?.kind === 'candidate' ? message.candidate : ['offer', 'answer'].includes(message?.kind) ? message.sdp : '';
+  const result = new Set();
+  for (const line of String(text || '').split(/\r?\n/)) {
+    const parts = line.trim().replace(/^a=/, '').split(/\s+/);
+    if (parts[0]?.startsWith('candidate:') && parts[6] === 'typ' && publicIpv4(parts[4])) result.add(parts[4]);
+  }
+  return [...result];
+}
+
+function publicIpv4(value) {
+  const parts = String(value).split('.').map(Number);
+  if (parts.length !== 4 || parts.some(part => !Number.isInteger(part) || part < 0 || part > 255)) return false;
+  const [a, b] = parts;
+  return a !== 0 && a !== 10 && a !== 127 && a < 224 && !(a === 169 && b === 254) && !(a === 172 && b >= 16 && b <= 31) &&
+    !(a === 192 && b === 168) && !(a === 100 && b >= 64 && b <= 127) && !(a === 198 && (b === 18 || b === 19));
+}
+
+function request(value) {
+  return new Promise((resolve, reject) => {
+    const socket = net.createConnection(pipePath);
+    let text = '';
+    let settled = false;
+    const rejectOnce = error => { if (!settled) { settled = true; reject(error); } };
+    const resolveOnce = result => { if (!settled) { settled = true; resolve(result); } };
+    socket.setTimeout(3000);
+    socket.setEncoding('utf8');
+    socket.once('connect', () => socket.write(`${JSON.stringify(value)}\n`));
+    socket.on('data', chunk => {
+      text += chunk;
+      const line = text.indexOf('\n');
+      if (line < 0) return;
+      try { resolveOnce(JSON.parse(text.slice(0, line))); socket.end(); }
+      catch { rejectOnce(new Error('Windows RTC 路由辅助响应无效')); socket.destroy(); }
+    });
+    socket.once('timeout', () => socket.destroy(new Error('Windows RTC 路由辅助超时')));
+    socket.once('error', rejectOnce);
+    socket.once('close', hadError => {
+      if (hadError || settled) return;
+      rejectOnce(new Error('Windows RTC 路由辅助响应无效'));
+    });
+  });
+}