@walkhi/code-relax 0.1.0-beta.1 → 0.1.0-beta.10

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

@@ -1,9 +1,9 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { execFile } from 'node:child_process';
-import { setTimeout as delay } from 'node:timers/promises';
-import { startBackground, processAlive } from '../background-process.mjs';
-import { promisify } from 'node:util';
+import fs from 'node:fs';
+import path from 'node:path';
+import { execFile } from 'node:child_process';
+import { setTimeout as delay } from 'node:timers/promises';
+import { startBackground, processAlive } from '../background-process.mjs';
+import { promisify } from 'node:util';
 import { randomBytes, randomUUID } from 'node:crypto';
 import { fileURLToPath } from 'node:url';
 import { hostname } from 'node:os';
@@ -16,45 +16,49 @@ import { connectBridgeRelay } from './connector.mjs';
 import { validProbeIceServers } from './p2p-probe.mjs';
 import { relayAddress, validSecret } from './wire.mjs';
 import { saveLanAuthorizations } from './lan-authorizations.mjs';
-import { lanNetworks } from '../platform/windows/network-info.mjs';
-
-const exec = promisify(execFile);
-const script = fileURLToPath(import.meta.url);
-const recordPath = root => path.join(root, 'self-relay-session.json');
-
-async function loadConfig(stateRoot) {
-  const config = readRecord(path.join(stateRoot, 'self-relay-config.json')) || {};
+import { lanNetworks } from '../platform/windows/network-info.mjs';
+
+const exec = promisify(execFile);
+const script = fileURLToPath(import.meta.url);
+const recordPath = root => path.join(root, 'self-relay-session.json');
+const officialConfig = { url: 'wss://api.uulife.site/relay' };
+
+async function loadConfig(stateRoot) {
+  const configPath = path.join(stateRoot, 'self-relay-config.json');
+  const stored = readRecord(configPath) || {};
+  const config = { ...officialConfig, ...stored };
+  if (!stored.url) writeRecord(configPath, config);
   if (config.p2pIceServers !== undefined && !validProbeIceServers(config.p2pIceServers)) throw new Error('p2pIceServers 只接受最多 4 个 stun:主机:端口地址');
   if (config.p2pWindowsRouteHelper !== undefined && typeof config.p2pWindowsRouteHelper !== 'boolean') throw new Error('p2pWindowsRouteHelper 必须是布尔值');
   if (config.p2pWindowsRouteHelper && !/^[A-Za-z0-9_-]{32,128}$/.test(config.p2pWindowsRouteHelperToken || '')) throw new Error('p2pWindowsRouteHelperToken 无效');
   const url = process.env.RELAY_URL || config.url;
-  if (!url) throw new Error('请先配置 self-relay-config.json 的 url 和 hostKeyFile（或 sshHost、sshKeyPath），详见自建中继文档。');
+  if (!url) throw new Error('请先配置 self-relay-config.json 的 url 和 hostKeyFile（或 sshHost、sshKeyPath），详见自建中继文档。');
   relayAddress(url);
   const resolved = relayAddress(url);
   const pairingUrl = config.pairingUrl || `${resolved.startsWith('wss:') ? 'https:' : 'http:'}//${new URL(resolved).host}/pair`;
   const pairing = new URL(pairingUrl);
   if (!['https:', 'http:'].includes(pairing.protocol) || pairing.pathname !== '/pair' || pairing.search || pairing.hash || pairing.username || pairing.password ||
       (pairing.protocol === 'http:' && pairing.hostname !== '127.0.0.1')) throw new Error('self-relay-config.json 的 pairingUrl 必须是 HTTPS /pair 地址。');
-  return { ...config, url: resolved, pairingUrl: pairing.href };
-}
-async function registrationKey(config) {
-  const hostKeyFile = process.env.RELAY_HOST_KEY_FILE || config.hostKeyFile;
-  let hostKey;
-  if (hostKeyFile) hostKey = fs.readFileSync(hostKeyFile, 'utf8').trim();
-  else {
-    if (!/^[a-zA-Z0-9][a-zA-Z0-9._-]*$/.test(config.sshHost || '') ||
-      !/^\/[a-zA-Z0-9/_.-]+$/.test(config.sshKeyPath || '')) throw new Error('中继注册凭据配置不完整或无效。');
-    try {
-      const result = await exec('ssh', ['-o', 'BatchMode=yes', '-o', 'ConnectTimeout=10', config.sshHost,
-        `sudo -n cat ${config.sshKeyPath}`], { encoding: 'utf8', timeout: 15000, windowsHide: true });
-      hostKey = result.stdout.trim();
-    } catch { throw new Error('无法通过已配置 SSH 读取中继注册凭据。'); }
-  }
-  if (!validSecret(hostKey)) throw new Error('中继注册凭据格式无效。');
-  return hostKey;
-}
-
-export async function selfRelay(command, stateRoot, requiredMode = '') {
+  return { ...config, url: resolved, pairingUrl: pairing.href };
+}
+async function registrationKey(config) {
+  if (config.url === officialConfig.url) return undefined;
+  const hostKeyFile = process.env.RELAY_HOST_KEY_FILE || config.hostKeyFile;
+  let hostKey;
+  if (hostKeyFile) hostKey = fs.readFileSync(hostKeyFile, 'utf8').trim();
+  else {
+    if (!/^[a-zA-Z0-9][a-zA-Z0-9._-]*$/.test(config.sshHost || '') ||
+      !/^\/[a-zA-Z0-9/_.-]+$/.test(config.sshKeyPath || '')) throw new Error('中继注册凭据配置不完整或无效。');
+    try {
+      const result = await exec('ssh', ['-o', 'BatchMode=yes', '-o', 'ConnectTimeout=10', config.sshHost,
+        `sudo -n cat ${config.sshKeyPath}`], { encoding: 'utf8', timeout: 15000, windowsHide: true });
+      hostKey = result.stdout.trim();
+    } catch { throw new Error('无法通过已配置 SSH 读取中继注册凭据。'); }
+  }
+  if (!validSecret(hostKey)) throw new Error('中继注册凭据格式无效。');
+  return hostKey;
+}
+export async function selfRelay(command, stateRoot, requiredMode = '') {
   const previous = readRecord(recordPath(stateRoot));
   let current;
   if (previous) {
@@ -75,7 +79,7 @@ export async function selfRelay(command, stateRoot, requiredMode = '') {
   if (current) {
     if (requiredMode) {
       const bridge = await serviceHealth(readRecord(path.join(stateRoot, 'bridge-session.json')));
-      if (bridge?.transportMode !== requiredMode) throw new Error('当前 Bridge 未启用完整控制；请先执行 shared-start。');
+      if (bridge?.transportMode !== requiredMode) throw new Error('Codex 内核未就绪；请先执行 shared-start。');
     }
     if (command === 'relay-revoke') return controlRequest(previous, 'POST', 'revoke');
     if (command === 'relay-pair' || (current.relayConnected && !current.paired && !current.qrPath)) return controlRequest(previous, 'POST', 'pair');
@@ -111,7 +115,7 @@ async function worker(stateRoot, instanceId, refresh = false, requiredMode = '')
   const session = () => readRecord(path.join(stateRoot, 'bridge-session.json'));
   let health = await serviceHealth(session());
   if (health?.status !== 'ok') throw new Error('Bridge 尚未运行，请先执行 relax start --json。');
-  if (requiredMode && health.transportMode !== requiredMode) throw new Error('完整控制的 Code Relax 中继需要完整控制 Bridge，请先执行 relax shared-start --json。');
+  if (requiredMode && health.transportMode !== requiredMode) throw new Error('Codex 内核未就绪，请先执行 relax shared-start --json。');
   const legacyPath = path.join(stateRoot, 'self-relay-device.json');
   const legacy = readRecord(legacyPath);
   const stored = await credentialStore('load');
@@ -134,15 +138,15 @@ async function worker(stateRoot, instanceId, refresh = false, requiredMode = '')
     fs.rmSync(legacyPath);
   }
   let identity = identities.servers[config.url];
-  if (!identity) {
-    identity = { id: randomUUID(), secret: randomBytes(32).toString('base64url'), registered: false };
-    identities.servers[config.url] = identity; await credentialStore('save', identities);
-  }
-  const hostKey = identity.registered ? undefined : await registrationKey(config);
-  let bridgeError = '';
+  if (!identity) {
+    identity = { id: randomUUID(), secret: randomBytes(32).toString('base64url'), registered: false };
+    identities.servers[config.url] = identity; await credentialStore('save', identities);
+  }
+  const hostKey = identity.registered ? undefined : await registrationKey(config);
+  let bridgeError = '';
   async function refreshHealth() {
-    try { health = await serviceHealth(session()) || { transportMode: health.transportMode, status: 'offline', desktopConnected: false }; bridgeError = ''; }
-    catch (error) { bridgeError = error.message; health = { transportMode: health.transportMode, status: 'offline', desktopConnected: false }; }
+    try { health = await serviceHealth(session()) || { transportMode: health.transportMode, status: 'offline' }; bridgeError = ''; }
+    catch (error) { bridgeError = error.message; health = { transportMode: health.transportMode, status: 'offline' }; }
   }
   const secret = randomBytes(32).toString('base64url');
   let connector, control, qrPath, expiresAt = 0, paired = false, clientCount = 0, attachedCount = 0;
@@ -164,10 +168,10 @@ async function worker(stateRoot, instanceId, refresh = false, requiredMode = '')
           : '尚未完成设备授权；调用 relax pair --json 生成配对二维码。';
     return { running: !closing, relayConnected: online, mode: 'self-relay', transportMode: health.transportMode,
       relayUrl: config.url, deviceId: identity.id, paired, clientCount, authorization: online ? (paired ? 'authorized' : 'unpaired') : 'unverified', phoneConnected: attachedCount > 0,
-      bridgeReady: health.status === 'ok' && Boolean(health.sharedAppServerConnected || health.desktopConnected), bridgeError,
+      bridgeReady: health.status === 'ok' && health.execution?.ready === true && health.sharedAppServerConnected === true, bridgeError,
       expiresAt: expiresAt ? new Date(expiresAt).toISOString() : null,
       ...(available ? { qrPath } : {}), mobileAccess: 'unverified', lastError,
-      displayText: `Code Relax 中继 · ${health.transportMode === 'lan-shared' ? '完整控制' : '基础控制'}\n${next}\n停止连接器保留授权：relax relay-stop --json。撤销全部移动设备：relax relay-revoke --json。` };
+      displayText: `Code Relax 中继 · ${health.transportMode === 'lan-shared' ? 'Codex 内核已就绪' : 'Codex 内核未就绪'}\n${next}\n停止连接器保留授权：relax relay-stop --json。撤销全部移动设备：relax relay-revoke --json。` };
   };
   async function shutdown() {
     if (closing) return;
@@ -199,7 +203,7 @@ async function worker(stateRoot, instanceId, refresh = false, requiredMode = '')
       await refreshHealth();
       const lanCandidates = await currentLanCandidates();
       connector?.events.removeAllListeners(); connector?.close();
-      const current = connector = connectBridgeRelay({ relayUrl: config.url, hostKey: identity.registered ? undefined : hostKey, identity,
+      const current = connector = connectBridgeRelay({ relayUrl: config.url, hostKey: identity.registered ? undefined : hostKey, identity,
         bridgeUrl: `ws://127.0.0.1:${bridge?.port || 45831}/api/socket`, bridgeToken: bridge?.accessUrl ? new URL(bridge.accessUrl).searchParams.get('token') : 'unavailable',
         bridgeConnection: () => { const latest = session(); return { url: `ws://127.0.0.1:${latest.port}/api/socket`, token: new URL(latest.accessUrl).searchParams.get('token') }; },
         hostName: hostname(), lanCandidates, p2pProbe: config.p2pProbe === true, iceServers: config.p2pIceServers || [],
@@ -219,7 +223,7 @@ async function worker(stateRoot, instanceId, refresh = false, requiredMode = '')
         if (![1008, 4401, 4406, 4409, 4429].includes(event.code)) scheduleRetry();
       });
       const registration = await current.ready;
-      if (registration.protocolVersion !== 3 || registration.room !== identity.id) {
+      if (registration.protocolVersion !== 7 || registration.room !== identity.id) {
         current.events.removeAllListeners(); current.close(); throw Object.assign(new Error('中继服务器尚未升级设备授权协议，未使用临时配对降级。'), { code: 4401 });
       }
       if (!identity.registered) {

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

@@ -1,83 +1,123 @@
-import { randomUUID } from 'node:crypto';
-import P2pDiagnostics from '../../shared/p2p-diagnostics.cjs';
-
-// Reserve this narrow range so a full-TUN client can identify only the P2P UDP flow.
-const PROBE_UDP_PORT_RANGE = Object.freeze({ begin: 42000, end: 42031 });
-
-// Capability probe only: never accepts or forwards Bridge business messages.
-export async function createP2pProbe({ signal, report = () => {}, iceServers = [] }) {
-  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', {
-    iceServers,
-    maxMessageSize: 4096,
-    portRangeBegin: PROBE_UDP_PORT_RANGE.begin,
-    portRangeEnd: PROBE_UDP_PORT_RANGE.end
-  });
-  const diagnostic = new P2pDiagnostics();
-  let channel, closed = false, answered = false, candidates = [], received = 0, verified = false;
-  const nonce = randomUUID();
-  const timer = setTimeout(() => finish(verified ? 'closed' : 'timeout'), 15000);
-  function finish(state) {
-    if (closed) return;
-    closed = true; clearTimeout(timer); candidates = [];
-    const summary = diagnostic.snapshot(state);
-    channel?.close(); peer.close(); report(state, summary);
-  }
-  peer.onIceStateChange(state => { if (!closed) diagnostic.ice = state; });
-  peer.onGatheringStateChange(state => { if (!closed) diagnostic.gathering = state; });
-  peer.onStateChange(state => { if (!closed && (state === 'failed' || state === 'closed')) { diagnostic.error = 'peer'; finish('failed'); } });
-  peer.onLocalDescription((sdp, type) => { if (!closed) { diagnostic.offer = type === 'offer'; signal({ kind: type, sdp, iceServers }); } });
-  peer.onLocalCandidate((candidate, mid) => { if (!closed) { diagnostic.candidate('local', candidate); signal({ kind: 'candidate', candidate, mid }); } });
-  channel = peer.createDataChannel('code-relax-probe-v1');
-  channel.onOpen(() => { if (!closed) { diagnostic.open = true; channel.sendMessage(JSON.stringify({ type: 'ping', nonce })); } });
-  channel.onError(() => { if (!closed) diagnostic.error = 'channel'; finish('failed'); });
-  channel.onClosed(() => finish('closed'));
-  channel.onMessage(value => {
-    try {
-      if (closed) return;
-      if (typeof value !== 'string' || value.length > 4096 || ++received > 4) throw new Error('Invalid probe frame');
-      const message = JSON.parse(value);
-      if (message.type === 'ping' && /^[\w-]{16,128}$/.test(message.nonce)) {
-        diagnostic.ping = true;
-        channel.sendMessage(JSON.stringify({ type: 'pong', nonce: message.nonce }));
-      } else if (message.type === 'pong' && message.nonce === nonce) {
-        diagnostic.pong = true; verified = true; report('verified', diagnostic.snapshot('verified'));
-      } else throw new Error('Invalid probe response');
-    } catch { diagnostic.error = 'frame'; finish('failed'); }
-  });
-  return {
-    receive(message) {
-      if (closed) return;
-      if (message.kind === 'answer' && !answered) {
-        try { peer.setRemoteDescription(message.sdp, 'answer'); }
-        catch { diagnostic.error = 'description'; finish('failed'); return; }
-        answered = true; diagnostic.answer = true;
-        for (const item of candidates) peer.addRemoteCandidate(item.candidate, item.mid);
-        candidates = [];
-      } else if (message.kind === 'candidate') {
-        diagnostic.candidate('remote', message.candidate);
-        if (answered) peer.addRemoteCandidate(message.candidate, message.mid);
-        else if (candidates.length < 64) candidates.push(message);
-        else finish('failed');
-      } else if (message.kind === 'close') finish('closed');
-      else finish('failed');
-    },
-    close() { finish('closed'); }
-  };
-}
-
-export function validProbeSignal(value) {
-  if (!value || value.version !== 1 || !/^[\w-]{16,128}$/.test(value.probeId || '')) return false;
-  if (['start', 'close'].includes(value.kind)) return true;
-  if (['offer', 'answer'].includes(value.kind)) return typeof value.sdp === 'string' && value.sdp.length <= 65536 &&
-    (value.iceServers === undefined || validProbeIceServers(value.iceServers));
-  if (value.kind === 'candidate') return typeof value.candidate === 'string' && value.candidate.length <= 2048 &&
-    typeof value.mid === 'string' && value.mid.length <= 64;
-  return false;
-}
-
-export function validProbeIceServers(value) {
-  return Array.isArray(value) && value.length <= 4 && value.every(item =>
-    typeof item === 'string' && /^stun:[a-zA-Z0-9.-]+:[0-9]{1,5}$/.test(item) && Number(item.split(':').at(-1)) <= 65535);
-}
+import { randomUUID } from 'node:crypto';
+import P2pDiagnostics from '../../shared/p2p-diagnostics.cjs';
+import P2pDataFramer from '../../shared/p2p-data-channel.cjs';
+
+const PROBE_UDP_PORT_RANGE = Object.freeze({ begin: 42000, end: 42031 });
+const HIGH_WATER = 1024 * 1024;
+const LOW_WATER = 512 * 1024;
+const MAX_QUEUED = 16 * 1024 * 1024;
+
+export async function createP2pProbe({ signal, report = () => {}, onData = () => {}, iceServers = [] }) {
+  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', {
+    iceServers,
+    maxMessageSize: 65536,
+    portRangeBegin: PROBE_UDP_PORT_RANGE.begin,
+    portRangeEnd: PROBE_UDP_PORT_RANGE.end
+  });
+  const diagnostic = new P2pDiagnostics();
+  const framer = new P2pDataFramer();
+  const dataPrefix = randomUUID().replaceAll('-', '');
+  let channel, closed = false, answered = false, candidates = [], verified = false, remoteDirect = false;
+  let pingReceived = false, pongReceived = false, dataSerial = 0, queuedBytes = 0;
+  const outbound = [];
+  const nonce = randomUUID();
+  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();
+    const summary = diagnostic.snapshot(state);
+    channel?.close(); peer.close(); report(state, summary);
+  }
+  function verify() {
+    if (verified || !pingReceived || !pongReceived) return;
+    verified = true; clearTimeout(timer);
+    report(remoteDirect ? 'direct' : 'verified', diagnostic.snapshot('verified'));
+    pump();
+  }
+  function pump() {
+    if (!verified || !remoteDirect || closed || !channel?.isOpen()) return;
+    try {
+      while (outbound.length && channel.bufferedAmount() < HIGH_WATER) {
+        const item = outbound[0], frame = framer.frame(item);
+        if (!channel.sendMessage(frame)) return;
+        if (framer.commit(item)) { outbound.shift(); queuedBytes -= item.bytes; }
+      }
+    } catch { diagnostic.error = 'channel'; finish('failed'); }
+  }
+  function sendData(payload) {
+    if (!verified || !remoteDirect || closed || !channel?.isOpen()) return false;
+    let item;
+    try { item = framer.create(payload, `${dataPrefix}-${++dataSerial}`); }
+    catch { return false; }
+    if (queuedBytes + item.bytes > MAX_QUEUED) return false;
+    outbound.push(item); queuedBytes += item.bytes; pump(); return true;
+  }
+  peer.onIceStateChange(state => { if (!closed) diagnostic.ice = state; });
+  peer.onGatheringStateChange(state => { if (!closed) diagnostic.gathering = state; });
+  peer.onStateChange(state => { if (!closed && (state === 'failed' || state === 'closed')) { diagnostic.error = 'peer'; finish('failed'); } });
+  peer.onLocalDescription((sdp, type) => { if (!closed) { diagnostic.offer = type === 'offer'; signal({ kind: type, sdp, iceServers, direct: 1 }); } });
+  peer.onLocalCandidate((candidate, mid) => { if (!closed) { diagnostic.candidate('local', candidate); signal({ kind: 'candidate', candidate, mid }); } });
+  channel = peer.createDataChannel('code-relax-probe-v1');
+  channel.setBufferedAmountLowThreshold(LOW_WATER);
+  channel.onBufferedAmountLow(pump);
+  channel.onOpen(() => { if (!closed) { diagnostic.open = true; channel.sendMessage(JSON.stringify({ type: 'ping', nonce })); } });
+  channel.onError(() => { if (!closed) diagnostic.error = 'channel'; finish('failed'); });
+  channel.onClosed(() => finish('closed'));
+  channel.onMessage(value => {
+    try {
+      if (closed || typeof value !== 'string' || value.length > 65536) throw new Error('Invalid P2P frame');
+      const message = JSON.parse(value);
+      const data = framer.accept(message);
+      if (data.handled) {
+        if (!verified || !remoteDirect) throw new Error('P2P transport not verified');
+        if (data.complete) onData(data.payload);
+        return;
+      }
+      if (message.type === 'ping' && /^[\w-]{16,128}$/.test(message.nonce)) {
+        diagnostic.ping = true; pingReceived = true;
+        channel.sendMessage(JSON.stringify({ type: 'pong', nonce: message.nonce }));
+      } else if (message.type === 'pong' && message.nonce === nonce) {
+        diagnostic.pong = true; pongReceived = true;
+      } else throw new Error('Invalid P2P response');
+      verify();
+    } catch { diagnostic.error = 'frame'; finish('failed'); }
+  });
+  return {
+    receive(message) {
+      if (closed) return;
+      if (message.kind === 'answer' && !answered) {
+        try { peer.setRemoteDescription(message.sdp, 'answer'); }
+        catch { diagnostic.error = 'description'; finish('failed'); return; }
+        answered = true; remoteDirect = message.direct === 1; diagnostic.answer = true;
+        for (const item of candidates) peer.addRemoteCandidate(item.candidate, item.mid);
+        candidates = [];
+      } else if (message.kind === 'candidate') {
+        diagnostic.candidate('remote', message.candidate);
+        if (answered) peer.addRemoteCandidate(message.candidate, message.mid);
+        else if (candidates.length < 64) candidates.push(message);
+        else finish('failed');
+      } else if (message.kind === 'close') finish('closed');
+      else finish('failed');
+    },
+    send: sendData,
+    close() { finish('closed'); }
+  };
+}
+
+export function validProbeSignal(value) {
+  if (!value || value.version !== 1 || !/^[\w-]{16,128}$/.test(value.probeId || '')) return false;
+  if (['start', 'close'].includes(value.kind)) return true;
+  if (['offer', 'answer'].includes(value.kind)) return typeof value.sdp === 'string' && value.sdp.length <= 65536 &&
+    (value.direct === undefined || value.direct === 1) &&
+    (value.iceServers === undefined || validProbeIceServers(value.iceServers));
+  if (value.kind === 'candidate') return typeof value.candidate === 'string' && value.candidate.length <= 2048 &&
+    typeof value.mid === 'string' && value.mid.length <= 64;
+  return false;
+}
+
+export function validProbeIceServers(value) {
+  return Array.isArray(value) && value.length <= 4 && value.every(item =>
+    typeof item === 'string' && /^stun:[a-zA-Z0-9.-]+:[0-9]{1,5}$/.test(item) && Number(item.split(':').at(-1)) <= 65535);
+}