@walkhi/code-relax 0.1.0-beta.3 → 0.1.0-beta.5

package/README.md

@@ -80,4 +80,4 @@ npm uninstall -g @walkhi/code-relax
 
 ## 发布边界
 
-registry 当前公开包为 `@walkhi/code-relax@0.1.0-beta.2`，主 CLI 为 `relax`，并保留 `code-relax` 兼容入口。待发布的 `0.1.0-beta.3` 将 WMI 后的第二层 PowerShell broker 改为 Node worker，并加入 `%LOCALAPPDATA%\CodexRemote\install.log` 持久安装日志；本机启动交接和 npm 打包已验证，发布后仍需在原故障电脑复核。详细规则见 [npm 分发](../docs/npm-distribution.md)。
+registry 当前公开包为 `@walkhi/code-relax@0.1.0-beta.5`，主 CLI 为 `relax`，并保留 `code-relax` 兼容入口。该版让 WMI 所有的 Node broker 在目标进程期间保留隐藏控制台，避免 Codex 调用工具时反复弹出控制台窗口；同时沿用官方中继自助登记和持久安装日志，通信协议仍为 7。详细规则见 [npm 分发](../docs/npm-distribution.md)。

package/dist/src/platform/windows/launch-worker.mjs

@@ -17,7 +17,6 @@ try {
   const descriptors = (spec.logs || []).map(file => fs.openSync(file, 'a'));
   try {
     const child = spawn(spec.executable, spec.args || [], {
-      detached: true,
       windowsHide: true,
       env: spec.environment,
       stdio: ['ignore', descriptors[0] ?? 'ignore', descriptors[1] ?? 'ignore'],
@@ -26,7 +25,8 @@ try {
       child.once('spawn', resolve);
       child.once('error', reject);
     });
-    child.unref();
+    // Keep this WMI-owned broker alive with the target so Codex tools inherit
+    // its hidden console instead of creating a visible console per command.
     result.pid = child.pid;
     diagnostic(`target started (PID ${child.pid})`);
   } finally {

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) {
@@ -134,12 +138,12 @@ 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 }; }
@@ -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 || [],

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

@@ -198,11 +198,13 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
               hostName = normalizeHostName(message.hostName);
             }
             catch { return fail(1008, 'Invalid LAN candidates'); }
-            room = durable ? rooms.get(message.deviceId) : undefined;
-            if (room && (room.status !== 'active' || !matches(message.deviceSecret, room.hostHash))) return fail();
-            if (!room) {
-              if (!matches(message.key, hostHash)) return fail();
-              if (rooms.size >= 256) return fail(4429, 'Device limit reached');
+            room = durable ? rooms.get(message.deviceId) : undefined;
+            if (room && (room.status !== 'active' || !matches(message.deviceSecret, room.hostHash))) return fail();
+            if (!room) {
+              // Durable computers prove future ownership with their generated device secret.
+              // The legacy deployment key remains accepted, but is no longer required for first registration.
+              if (!durable && !matches(message.key, hostHash)) return fail();
+              if (rooms.size >= 256) return fail(4429, 'Device limit reached');
               const now = new Date().toISOString();
               room = { id: durable ? message.deviceId : randomUUID(), durable,
                 revision: 0, status: 'active', clients: [], connections: new Map(), observers: new Map(), createdAt: now, updatedAt: now,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@walkhi/code-relax",
-  "version": "0.1.0-beta.3",
+  "version": "0.1.0-beta.5",
   "license": "UNLICENSED",
   "type": "module",
   "scripts": {