@walkhi/code-relax 0.1.0-beta.50 → 0.1.0-beta.59

package/dist/src/service-lifecycle.mjs

@@ -1,139 +1,139 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { startBackground, processAlive } from './background-process.mjs';
-import { randomBytes, randomUUID } from 'node:crypto';
-import { setTimeout as delay } from 'node:timers/promises';
-import { fileURLToPath } from 'node:url';
-import { controlRequest } from './service-control.mjs';
-import { serviceHealth as health } from './service-health.mjs';
-
-export function readRecord(file) {
-  try { return JSON.parse(fs.readFileSync(file, 'utf8').replace(/^\uFEFF/, '')); }
-  catch (error) { if (error.code === 'ENOENT') return null; throw error; }
-}
-export function writeRecord(file, value) {
-  const temp = `${file}.${randomUUID()}.tmp`;
-  try {
-    fs.writeFileSync(temp, JSON.stringify(value, null, 2), { mode: 0o600 });
-    fs.renameSync(temp, file);
-  } finally { fs.rmSync(temp, { force: true }); }
-}
-
-export function lifecycle({ stateRoot, host }) {
-  fs.mkdirSync(stateRoot, { recursive: true });
-  const sessionPath = path.join(stateRoot, 'bridge-session.json');
-  const configPath = path.join(stateRoot, 'bridge-config.json');
-  const scriptPath = fileURLToPath(new URL('./server.mjs', import.meta.url));
-
-  async function alive(session) {
-    if (!session?.controlPort || !session.instanceId || !session.controlSecret) {
-      if (await health(session)) throw new Error('当前为旧版桌面服务，请先使用旧版停止入口结束服务，再启动新版。');
-      return false;
-    }
-    try { await controlRequest(session); return true; }
-    catch (error) { if (error.code === 'ECONNREFUSED') return false; throw error; }
-  }
-  async function stop() {
-    const session = readRecord(sessionPath);
-    if (!await alive(session)) return { stopped: true, message: '桌面服务已停止。' };
-    await controlRequest(session, 'POST');
-    const deadline = Date.now() + 10000;
-    while (true) {
-      try { if (!await alive(session)) break; }
-      catch (error) {
-        // A connection accepted just before the listener closes may be reset.
-        // Verify refusal on the next connection; never resend the shutdown request.
-        if (error.code !== 'ECONNRESET') throw error;
-      }
-      if (Date.now() > deadline) throw new Error('桌面服务未在 10 秒内退出；未强杀进程。');
-      await delay(100);
-    }
-    return { stopped: true, message: '桌面服务已正常关闭。' };
-  }
-  async function status() {
-    const session = readRecord(sessionPath);
-    const running = await alive(session);
-    const result = running ? await health(session) : null;
-    return { running: running && result?.status === 'ok', processRunning: running, pid: session?.pid,
-      port: session?.port, mode: result?.transportMode, version: result?.version, execution: result?.execution,
-      managedAppServer: result?.managedAppServer, desktop: result?.desktop,
-      keepAwake: result?.keepAwake,
-      desktopRestartRecommended: result?.desktopRestartRecommended === true,
-      resident: result?.resident === true };
-  }
-  async function pair() {
-    const session = readRecord(sessionPath);
-    const connection = await alive(session) ? await health(session) : null;
-    if (connection?.status !== 'ok' || !session.lan) {
-      throw new Error('没有健康的局域网服务，请先执行 relax start。');
-    }
-    const address = await host.lanAddress();
-    const url = new URL(session.accessUrl);
-    url.hostname = address || '127.0.0.1';
-    session.accessUrl = url.href;
-    writeRecord(sessionPath, session);
-    return { pid: session.pid, port: session.port, version: connection.version, transportMode: connection.transportMode,
-      execution: connection.execution, managedAppServer: connection.managedAppServer, desktop: connection.desktop,
-      desktopRestartRecommended: connection.desktopRestartRecommended === true, accessUrl: session.accessUrl,
-      qrPath: path.join(stateRoot, 'connection-qr.png') };
-  }
-  async function restartManagedAppServer(confirmed = false) {
-    const session = readRecord(sessionPath);
-    if (!await alive(session)) throw new Error('桌面服务尚未运行，无法迁移 Codex 内核。');
-    const action = confirmed ? 'restart-managed-app-server-confirmed' : 'restart-managed-app-server';
-    return controlRequest(session, 'POST', action);
-  }
-  async function startBridge() {
-    let session = readRecord(sessionPath);
-    if (await alive(session)) {
-      const result = await health(session);
-      if (session.scriptPath === scriptPath && session.lan && result?.status === 'ok' && result.resident) {
-        await controlRequest(session, 'POST', 'refresh-execution');
-        return pair();
-      }
-      await stop();
-    }
-    let config = readRecord(configPath);
-    if (!config && session?.lan) config = { port: session.port, token: new URL(session.accessUrl).searchParams.get('token') };
-    config ||= { port: 45831, token: randomBytes(32).toString('base64url') };
-    if (!Number.isInteger(config.port) || config.port < 1 || config.port > 65535 || !/^[A-Za-z0-9_-]{20,}$/.test(config.token)) {
-      throw new Error('bridge-config.json 中端口或 Token 无效；不会自动重置凭据。');
-    }
-    const address = await host.lanAddress() || '127.0.0.1';
-    const { executable, environment } = await host.bridgeEnvironment();
-    writeRecord(configPath, config);
-    const instanceId = randomUUID();
-    const controlSecret = randomBytes(32).toString('base64url');
-    const readyPath = path.join(stateRoot, `bridge-ready-${instanceId}.json`);
-    const pid = await startBackground(executable, [scriptPath, '--lan', '--port', String(config.port), '--token', config.token],
-      { ...environment, CODEX_REMOTE_INSTANCE: instanceId, CODEX_REMOTE_CONTROL_SECRET: controlSecret,
-        CODEX_REMOTE_READY_PATH: readyPath }, [path.join(stateRoot, 'bridge.stdout.log'), path.join(stateRoot, 'bridge.stderr.log')]);
-    try {
-      const deadline = Date.now() + 10000;
-      let ready;
-      while (!(ready = readRecord(readyPath))) {
-        if (!processAlive(pid)) throw new Error('桌面服务启动失败，请查看 bridge.stderr.log。');
-        if (Date.now() > deadline) throw new Error('桌面服务未在 10 秒内就绪。');
-        await delay(100);
-      }
-      if (ready.instanceId !== instanceId || ready.pid !== pid) throw new Error('桌面服务启动实例不匹配。');
-      session = { ...ready, controlSecret, executablePath: executable, scriptPath, port: config.port,
-        lan: true, appServer: false, accessUrl: `http://${address}:${config.port}/?token=${config.token}`,
-        startedAt: new Date().toISOString() };
-      await controlRequest(session);
-      writeRecord(sessionPath, session);
-      return await pair();
-    } catch (error) {
-      if (processAlive(pid)) process.kill(pid);
-      throw error;
-    } finally { fs.rmSync(readyPath, { force: true }); }
-  }
-  async function start() {
-    const result = await startBridge();
-    if (fs.existsSync(path.join(stateRoot, 'self-relay-config.json'))) {
-      await controlRequest(readRecord(sessionPath), 'POST', 'relay-start');
-    }
-    return result;
-  }
-  return { start, pair, status, stop, restartManagedAppServer };
-}
+import fs from 'node:fs';
+import path from 'node:path';
+import { startBackground, processAlive } from './background-process.mjs';
+import { randomBytes, randomUUID } from 'node:crypto';
+import { setTimeout as delay } from 'node:timers/promises';
+import { fileURLToPath } from 'node:url';
+import { controlRequest } from './service-control.mjs';
+import { serviceHealth as health } from './service-health.mjs';
+
+export function readRecord(file) {
+  try { return JSON.parse(fs.readFileSync(file, 'utf8').replace(/^\uFEFF/, '')); }
+  catch (error) { if (error.code === 'ENOENT') return null; throw error; }
+}
+export function writeRecord(file, value) {
+  const temp = `${file}.${randomUUID()}.tmp`;
+  try {
+    fs.writeFileSync(temp, JSON.stringify(value, null, 2), { mode: 0o600 });
+    fs.renameSync(temp, file);
+  } finally { fs.rmSync(temp, { force: true }); }
+}
+
+export function lifecycle({ stateRoot, host }) {
+  fs.mkdirSync(stateRoot, { recursive: true });
+  const sessionPath = path.join(stateRoot, 'bridge-session.json');
+  const configPath = path.join(stateRoot, 'bridge-config.json');
+  const scriptPath = fileURLToPath(new URL('./server.mjs', import.meta.url));
+
+  async function alive(session) {
+    if (!session?.controlPort || !session.instanceId || !session.controlSecret) {
+      if (await health(session)) throw new Error('当前为旧版桌面服务，请先使用旧版停止入口结束服务，再启动新版。');
+      return false;
+    }
+    try { await controlRequest(session); return true; }
+    catch (error) { if (error.code === 'ECONNREFUSED') return false; throw error; }
+  }
+  async function stop() {
+    const session = readRecord(sessionPath);
+    if (!await alive(session)) return { stopped: true, message: '桌面服务已停止。' };
+    await controlRequest(session, 'POST');
+    const deadline = Date.now() + 10000;
+    while (true) {
+      try { if (!await alive(session)) break; }
+      catch (error) {
+        // A connection accepted just before the listener closes may be reset.
+        // Verify refusal on the next connection; never resend the shutdown request.
+        if (error.code !== 'ECONNRESET') throw error;
+      }
+      if (Date.now() > deadline) throw new Error('桌面服务未在 10 秒内退出；未强杀进程。');
+      await delay(100);
+    }
+    return { stopped: true, message: '桌面服务已正常关闭。' };
+  }
+  async function status() {
+    const session = readRecord(sessionPath);
+    const running = await alive(session);
+    const result = running ? await health(session) : null;
+    return { running: running && result?.status === 'ok', processRunning: running, pid: session?.pid,
+      port: session?.port, mode: result?.transportMode, version: result?.version, execution: result?.execution,
+      managedAppServer: result?.managedAppServer, desktop: result?.desktop,
+      keepAwake: result?.keepAwake,
+      desktopRestartRecommended: result?.desktopRestartRecommended === true,
+      resident: result?.resident === true };
+  }
+  async function pair() {
+    const session = readRecord(sessionPath);
+    const connection = await alive(session) ? await health(session) : null;
+    if (connection?.status !== 'ok' || !session.lan) {
+      throw new Error('没有健康的局域网服务，请先执行 relax start。');
+    }
+    const address = await host.lanAddress();
+    const url = new URL(session.accessUrl);
+    url.hostname = address || '127.0.0.1';
+    session.accessUrl = url.href;
+    writeRecord(sessionPath, session);
+    return { pid: session.pid, port: session.port, version: connection.version, transportMode: connection.transportMode,
+      execution: connection.execution, managedAppServer: connection.managedAppServer, desktop: connection.desktop,
+      desktopRestartRecommended: connection.desktopRestartRecommended === true, accessUrl: session.accessUrl,
+      qrPath: path.join(stateRoot, 'connection-qr.png') };
+  }
+  async function restartManagedAppServer(confirmed = false) {
+    const session = readRecord(sessionPath);
+    if (!await alive(session)) throw new Error('桌面服务尚未运行，无法迁移 Codex 内核。');
+    const action = confirmed ? 'restart-managed-app-server-confirmed' : 'restart-managed-app-server';
+    return controlRequest(session, 'POST', action);
+  }
+  async function startBridge() {
+    let session = readRecord(sessionPath);
+    if (await alive(session)) {
+      const result = await health(session);
+      if (session.scriptPath === scriptPath && session.lan && result?.status === 'ok' && result.resident) {
+        await controlRequest(session, 'POST', 'refresh-execution');
+        return pair();
+      }
+      await stop();
+    }
+    let config = readRecord(configPath);
+    if (!config && session?.lan) config = { port: session.port, token: new URL(session.accessUrl).searchParams.get('token') };
+    config ||= { port: 45831, token: randomBytes(32).toString('base64url') };
+    if (!Number.isInteger(config.port) || config.port < 1 || config.port > 65535 || !/^[A-Za-z0-9_-]{20,}$/.test(config.token)) {
+      throw new Error('bridge-config.json 中端口或 Token 无效；不会自动重置凭据。');
+    }
+    const address = await host.lanAddress() || '127.0.0.1';
+    const { executable, environment } = await host.bridgeEnvironment();
+    writeRecord(configPath, config);
+    const instanceId = randomUUID();
+    const controlSecret = randomBytes(32).toString('base64url');
+    const readyPath = path.join(stateRoot, `bridge-ready-${instanceId}.json`);
+    const pid = await startBackground(executable, [scriptPath, '--lan', '--port', String(config.port), '--token', config.token],
+      { ...environment, CODEX_REMOTE_INSTANCE: instanceId, CODEX_REMOTE_CONTROL_SECRET: controlSecret,
+        CODEX_REMOTE_READY_PATH: readyPath }, [path.join(stateRoot, 'bridge.stdout.log'), path.join(stateRoot, 'bridge.stderr.log')]);
+    try {
+      const deadline = Date.now() + 10000;
+      let ready;
+      while (!(ready = readRecord(readyPath))) {
+        if (!processAlive(pid)) throw new Error('桌面服务启动失败，请查看 bridge.stderr.log。');
+        if (Date.now() > deadline) throw new Error('桌面服务未在 10 秒内就绪。');
+        await delay(100);
+      }
+      if (ready.instanceId !== instanceId || ready.pid !== pid) throw new Error('桌面服务启动实例不匹配。');
+      session = { ...ready, controlSecret, executablePath: executable, scriptPath, port: config.port,
+        lan: true, appServer: false, accessUrl: `http://${address}:${config.port}/?token=${config.token}`,
+        startedAt: new Date().toISOString() };
+      await controlRequest(session);
+      writeRecord(sessionPath, session);
+      return await pair();
+    } catch (error) {
+      if (processAlive(pid)) process.kill(pid);
+      throw error;
+    } finally { fs.rmSync(readyPath, { force: true }); }
+  }
+  async function start() {
+    const result = await startBridge();
+    if (fs.existsSync(path.join(stateRoot, 'self-relay-config.json'))) {
+      await controlRequest(readRecord(sessionPath), 'POST', 'relay-start');
+    }
+    return result;
+  }
+  return { start, pair, status, stop, restartManagedAppServer };
+}

package/dist/src/service-update.mjs

@@ -5,6 +5,7 @@ import { startBackground } from './background-process.mjs';
 import { readRecord, writeRecord } from './service-lifecycle.mjs';
 import { runtimePaths } from './platform/runtime-paths.mjs';
 import { desktopHost } from './platform/desktop-host.mjs';
+import releaseVersion from '../shared/release-version.cjs';
 
 const versionPattern = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/;
 const statusPath = root => path.join(root, 'service-update.json');
@@ -27,8 +28,10 @@ export async function checkServiceUpdate(root) {
   const result = await fetch('https://registry.npmjs.org/@walkhi%2fcode-relax/latest', { signal: AbortSignal.timeout(12000) });
   if (!result.ok) throw new Error(`查询桌面服务版本失败：HTTP ${result.status}`);
   const latest = await result.json();
-  if (!versionPattern.test(latest.version || '')) throw new Error('npm 返回的版本号无效');
-  return { ...serviceUpdateStatus(root), latestVersion: latest.version };
+  if (!versionPattern.test(latest.version || '') || releaseVersion.compare(latest.version, latest.version) !== 0) throw new Error('npm 返回的版本号无效');
+  const status = serviceUpdateStatus(root);
+  return { ...status, latestVersion: latest.version,
+    updateAvailable: releaseVersion.compare(latest.version, status.currentVersion) > 0 };
 }
 let scheduling = false;
 export async function requestServiceUpdate(root, body) {
@@ -50,7 +53,7 @@ export async function requestServiceUpdate(root, body) {
     const latest = await checkServiceUpdate(root);
     if (!latest.supported) throw new Error('当前安装缺少 npm 路径，请先安装支持手机更新的过渡版。');
     if (latest.latestVersion !== body.targetVersion) throw new Error('最新版本已变化，请重新检查后确认。');
-    if (latest.currentVersion === body.targetVersion) throw new Error('桌面服务已是此版本。');
+    if (!latest.updateAvailable) throw new Error('没有高于当前安装版本的桌面服务更新。');
     const installed = installation();
     const directory = path.join(root, 'service-updates', body.operationId);
     fs.mkdirSync(directory, { recursive: true, mode: 0o700 });