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

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 路由辅助响应无效'));
+    });
+  });
+}

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

@@ -1,36 +1,36 @@
-import { randomBytes, createHash, timingSafeEqual } from 'node:crypto';
-import { WebSocket } from 'ws';
-
-export const secret = () => randomBytes(32).toString('base64url');
-export const digest = value => createHash('sha256').update(value).digest('hex');
-export const validSecret = value => typeof value === 'string' && /^[\w-]{43}$/.test(value);
-export function matches(value, hash) {
-  return validSecret(value) && typeof hash === 'string' && timingSafeEqual(Buffer.from(digest(value)), Buffer.from(hash));
-}
-export function send(socket, message) {
-  if (socket.readyState !== WebSocket.OPEN) return false;
-  if (socket.bufferedAmount > 64 * 1024 * 1024) { socket.close(1013, 'Receiver too slow'); return false; }
-  socket.send(JSON.stringify(message)); return true;
-}
-export function decode(bytes, binary) {
-  if (binary) throw new Error('Text frames required');
-  const value = JSON.parse(bytes.toString());
-  if (!value || typeof value !== 'object' || Array.isArray(value)) throw new Error('Object required');
-  return value;
-}
-export function loopbackUrl(value, pathname) {
-  const url = new URL(value);
-  if (url.protocol !== 'ws:' || url.hostname !== '127.0.0.1' || url.pathname !== pathname || url.search || url.hash || url.username || url.password) {
-    throw new Error('本地原型仅接受指定路径的 ws://127.0.0.1 地址');
-  }
-  return url.href;
-}
-
-export function relayAddress(value) {
-  const url = new URL(value);
-  if (url.protocol === 'ws:') return loopbackUrl(value, '/relay');
-  if (url.protocol !== 'wss:' || url.pathname !== '/relay' || url.search || url.hash || url.username || url.password) {
-    throw new Error('远程中继必须使用无查询凭据的 wss://主机/relay 地址');
-  }
-  return url.href;
-}
+import { randomBytes, createHash, timingSafeEqual } from 'node:crypto';
+import { WebSocket } from 'ws';
+
+export const secret = () => randomBytes(32).toString('base64url');
+export const digest = value => createHash('sha256').update(value).digest('hex');
+export const validSecret = value => typeof value === 'string' && /^[\w-]{43}$/.test(value);
+export function matches(value, hash) {
+  return validSecret(value) && typeof hash === 'string' && timingSafeEqual(Buffer.from(digest(value)), Buffer.from(hash));
+}
+export function send(socket, message) {
+  if (socket.readyState !== WebSocket.OPEN) return false;
+  if (socket.bufferedAmount > 64 * 1024 * 1024) { socket.close(1013, 'Receiver too slow'); return false; }
+  socket.send(JSON.stringify(message)); return true;
+}
+export function decode(bytes, binary) {
+  if (binary) throw new Error('Text frames required');
+  const value = JSON.parse(bytes.toString());
+  if (!value || typeof value !== 'object' || Array.isArray(value)) throw new Error('Object required');
+  return value;
+}
+export function loopbackUrl(value, pathname) {
+  const url = new URL(value);
+  if (url.protocol !== 'ws:' || url.hostname !== '127.0.0.1' || url.pathname !== pathname || url.search || url.hash || url.username || url.password) {
+    throw new Error('本地原型仅接受指定路径的 ws://127.0.0.1 地址');
+  }
+  return url.href;
+}
+
+export function relayAddress(value) {
+  const url = new URL(value);
+  if (url.protocol === 'ws:') return loopbackUrl(value, '/relay');
+  if (url.protocol !== 'wss:' || url.pathname !== '/relay' || url.search || url.hash || url.username || url.password) {
+    throw new Error('远程中继必须使用无查询凭据的 wss://主机/relay 地址');
+  }
+  return url.href;
+}