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

package/package.json

@@ -1,50 +1,47 @@
-{
+{
   "name": "@walkhi/code-relax",
-  "version": "0.1.0-beta.3",
+  "version": "0.1.0-beta.30",
+  "private": false,
   "license": "UNLICENSED",
-  "type": "module",
-  "scripts": {
-    "postinstall": "node ./tools/postinstall.mjs",
-    "relay:demo": "node ./bin/self-relay-demo.mjs",
-    "relay:check": "node ./bin/self-relay-demo.mjs --check",
-    "probe:app-server": "node ./tools/probe-app-server.mjs",
-    "probe:app-server-tasks": "node ./tools/probe-app-server-tasks.mjs",
-    "build": "node ./tools/build-package.mjs",
-    "prepack": "npm run build"
-  },
-  "dependencies": {
-    "node-datachannel": "0.33.4",
-    "qrcode": "1.5.4",
-    "sharp": "0.35.4",
-    "ws": "8.21.3"
-  },
+  "type": "module",
+  "scripts": {
+    "postinstall": "node ./tools/postinstall.mjs"
+  },
+  "dependencies": {
+    "mysql2": "^3.24.4",
+    "node-datachannel": "0.33.4",
+    "qrcode": "1.5.4",
+    "sharp": "0.35.5",
+    "ws": "8.21.3"
+  },
   "bin": {
     "relax": "dist/bin/codex-remote.mjs",
     "code-relax": "dist/bin/codex-remote.mjs"
   },
-  "description": "Windows Code Relax LAN Bridge and CLI",
-  "engines": {
-    "node": ">=22.12.0"
-  },
-  "os": [
-    "win32"
-  ],
-  "cpu": [
-    "x64"
-  ],
-  "files": [
-    "dist/",
-    "tools/postinstall.mjs"
-  ],
-  "bundleDependencies": [
-    "node-datachannel",
-    "qrcode",
-    "sharp",
-    "ws"
+  "description": "Code Relax Windows and macOS workstation service",
+  "engines": {
+    "node": ">=22.12.0"
+  },
+  "os": [
+    "win32",
+    "darwin"
+  ],
+  "cpu": [
+    "x64",
+    "arm64"
+  ],
+  "files": [
+    "dist/",
+    "tools/postinstall.mjs"
   ],
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org",
     "tag": "beta"
+  },
+  "optionalDependencies": {
+    "@walkhi/code-relax-native-win32-x64": "0.1.0-beta.30",
+    "@walkhi/code-relax-native-darwin-arm64": "0.1.0-beta.30",
+    "@walkhi/code-relax-native-darwin-x64": "0.1.0-beta.30"
   }
 }

package/tools/postinstall.mjs

@@ -1,118 +1,127 @@
-import { execFileSync } from 'node:child_process';
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const serviceRoot = path.join(process.env.LOCALAPPDATA || path.join(os.homedir(), 'AppData', 'Local'),
-  'Programs', 'CodexRemote', 'service');
-const stateRoot = path.join(process.env.LOCALAPPDATA || path.join(os.homedir(), 'AppData', 'Local'), 'CodexRemote');
-const installLog = path.join(stateRoot, 'install.log');
-
-function sanitizeLog(value) {
-  let result = String(value).replace(/npm_[A-Za-z0-9]+/gu, '[redacted npm token]')
-    .replace(/([?&]token=)[^&\s"']+/giu, '$1[redacted]');
-  const paths = [['LOCALAPPDATA', process.env.LOCALAPPDATA], ['APPDATA', process.env.APPDATA],
-    ['USERPROFILE', process.env.USERPROFILE], ['TEMP', process.env.TEMP], ['TMP', process.env.TMP]]
-    .filter(([, item]) => item).sort((left, right) => right[1].length - left[1].length);
-  for (const [name, item] of paths) {
-    const pattern = item.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
-    result = result.replace(new RegExp(pattern, 'giu'), `%${name}%`);
-  }
-  return result;
-}
-
-function appendLog(message) {
-  fs.mkdirSync(stateRoot, { recursive: true });
-  fs.appendFileSync(installLog, `${new Date().toISOString()} ${sanitizeLog(message)}\n`, 'utf8');
-}
-
-function systemSummary() {
-  const npm = String(process.env.npm_config_user_agent || 'unknown').replace(/[\r\n]/gu, ' ');
-  return `platform=${process.platform} osRelease=${os.release()} osVersion=${os.version()} `
-    + `osArch=${os.arch()} processArch=${process.arch} node=${process.version} npmUserAgent=${npm}`;
-}
-
-function runStage(entry, stage, args) {
-  appendLog(`[${stage}] start`);
-  try {
-    const output = execFileSync(process.execPath, [entry, ...args], { encoding: 'utf8', windowsHide: true,
-      stdio: ['inherit', 'pipe', 'pipe'] });
-    if (output) { process.stdout.write(output); appendLog(`[${stage}] stdout\n${output.trimEnd()}`); }
-    appendLog(`[${stage}] success`);
-  } catch (error) {
-    if (error?.stdout) { process.stdout.write(error.stdout); appendLog(`[${stage}] stdout\n${String(error.stdout).trimEnd()}`); }
-    if (error?.stderr) { process.stderr.write(error.stderr); appendLog(`[${stage}] stderr\n${String(error.stderr).trimEnd()}`); }
-    appendLog(`[${stage}] failed: ${error?.stack || error?.message || String(error)}`);
-    throw error;
-  }
-}
-
-function installationSnapshot() {
-  const recordPath = path.join(serviceRoot, 'installation.json');
-  if (!fs.existsSync(serviceRoot)) return { exists: false, valid: false };
-  try {
-    const record = JSON.parse(fs.readFileSync(recordPath, 'utf8').replace(/^\uFEFF/u, ''));
-    return { exists: true, valid: Boolean(record?.installedAt && record?.version),
-      version: record?.version, installedAt: record?.installedAt };
-  } catch {
-    return { exists: true, valid: false };
-  }
-}
-
-function sameInstallation(left, right) {
-  return left.valid && right.valid && left.version === right.version && left.installedAt === right.installedAt;
-}
-
-function setupFailureGuidance(previous, current) {
-  if (previous.valid && sameInstallation(previous, current)) {
-    return `检测到旧安装 ${previous.version}；新版本部署未完成，旧安装记录仍保留。\n`
-      + '请先执行 relax doctor；修复报错原因后重新运行 npm 安装命令，无需卸载旧版本。';
-  }
-  if (previous.valid && current.valid) {
-    return `检测到旧安装 ${previous.version}；服务文件已更新为 ${current.version}，但 setup 后续步骤失败。\n`
-      + '请执行 relax doctor 确认当前状态，修复后执行 relax setup；无需先卸载。';
-  }
-  if (previous.exists && current.valid) {
-    return `检测到既有服务目录，但无法确认有效的旧安装记录；服务文件现已写入 ${current.version}，setup 后续步骤仍失败。\n`
-      + '请执行 relax doctor 确认当前状态，修复后执行 relax setup；不要直接删除配置目录。';
-  }
-  if (previous.exists) {
-    return '检测到既有服务目录，但无法确认有效的旧安装记录；本次部署未完成。\n'
-      + '请执行 relax doctor，根据检查结果修复后重新运行 npm 安装命令，不要直接删除配置目录。';
-  }
-  if (current.valid) {
-    return `这是首次安装；服务文件 ${current.version} 已写入，但 setup 后续步骤失败。\n`
-      + '如果 relax 命令仍可用，请执行 relax doctor，再执行 relax setup；否则修复原因后重新运行 npm 安装命令。';
-  }
-  return '这是首次安装，尚未形成可确认的固定服务。\n修复上方错误后重新运行 npm 安装命令；无需执行卸载。';
-}
-
-function skillFailureGuidance(previous, current) {
-  const service = current.valid
-    ? `${previous.valid ? `服务已从 ${previous.version} 更新到` : '固定服务已安装为'} ${current.version}`
-    : 'setup 已返回成功，但当前固定服务记录无法确认';
-  return `${service}；Codex Skill 安装失败。\n请执行 relax skill-install，再执行 relax doctor；无需重新卸载服务。`;
-}
-
-if (process.env.npm_config_global === 'true') {
-  const entry = fileURLToPath(new URL('../dist/bin/codex-remote.mjs', import.meta.url));
-  const previous = installationSnapshot();
-  let stage = 'setup';
-  appendLog(`[postinstall] start package=${process.env.npm_package_version || 'unknown'} ${systemSummary()}`);
-  try {
-    runStage(entry, stage, ['setup', '--json']);
-    stage = 'skill-install';
-    runStage(entry, stage, ['skill-install', '--json']);
-    appendLog('[postinstall] success');
-  } catch (error) {
-    const current = installationSnapshot();
-    console.error(`\nCode Relax 安装未完全完成：\n${stage === 'setup'
-      ? setupFailureGuidance(previous, current)
-      : skillFailureGuidance(previous, current)}`);
-    if (error?.code && error.code !== 'ERR_CHILD_PROCESS_STDIO_MAXBUFFER') console.error(`启动安装步骤失败：${error.message}`);
-    console.error(`安装日志：${installLog}`);
-    appendLog(`[postinstall] failed stage=${stage}`);
-    process.exitCode = Number.isInteger(error?.status) && error.status > 0 ? error.status : 1;
-  }
-}
+import { execFileSync } from 'node:child_process';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+// The same path adapter is available in published dist and in a source checkout.
+const pathsModule = new URL('../dist/src/platform/runtime-paths.mjs', import.meta.url);
+const { runtimePaths } = await import(fs.existsSync(pathsModule) ? pathsModule : new URL('../src/platform/runtime-paths.mjs', import.meta.url));
+const { serviceRoot, stateRoot } = runtimePaths();
+const installLog = path.join(stateRoot, 'install.log');
+
+function sanitizeLog(value) {
+  let result = String(value).replace(/npm_[A-Za-z0-9]+/gu, '[redacted npm token]')
+    .replace(/([?&]token=)[^&\s"']+/giu, '$1[redacted]');
+  const paths = [['LOCALAPPDATA', process.env.LOCALAPPDATA], ['APPDATA', process.env.APPDATA],
+    ['USERPROFILE', process.env.USERPROFILE], ['TEMP', process.env.TEMP], ['TMP', process.env.TMP]]
+    .filter(([, item]) => item).sort((left, right) => right[1].length - left[1].length);
+  for (const [name, item] of paths) {
+    const pattern = item.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
+    result = result.replace(new RegExp(pattern, 'giu'), `%${name}%`);
+  }
+  return result;
+}
+
+function appendLog(message) {
+  fs.mkdirSync(stateRoot, { recursive: true });
+  fs.appendFileSync(installLog, `${new Date().toISOString()} ${sanitizeLog(message)}\n`, 'utf8');
+}
+
+function systemSummary() {
+  const npm = String(process.env.npm_config_user_agent || 'unknown').replace(/[\r\n]/gu, ' ');
+  return `platform=${process.platform} osRelease=${os.release()} osVersion=${os.version()} `
+    + `osArch=${os.arch()} processArch=${process.arch} node=${process.version} npmUserAgent=${npm}`;
+}
+
+function runStage(entry, stage, args, formatOutput = value => value) {
+  appendLog(`[${stage}] start`);
+  try {
+    const output = execFileSync(process.execPath, [entry, ...args], { encoding: 'utf8', windowsHide: true,
+      stdio: ['inherit', 'pipe', 'pipe'] });
+    if (output) { process.stdout.write(formatOutput(output)); appendLog(`[${stage}] stdout\n${output.trimEnd()}`); }
+    appendLog(`[${stage}] success`);
+  } catch (error) {
+    if (error?.stdout) { process.stdout.write(error.stdout); appendLog(`[${stage}] stdout\n${String(error.stdout).trimEnd()}`); }
+    if (error?.stderr) { process.stderr.write(error.stderr); appendLog(`[${stage}] stderr\n${String(error.stderr).trimEnd()}`); }
+    appendLog(`[${stage}] failed: ${error?.stack || error?.message || String(error)}`);
+    throw error;
+  }
+}
+
+export function formatSetupOutput(output) {
+  try {
+    const result = JSON.parse(output);
+    const migration = result.managedAppServerMigration || {};
+    return `Code Relax ${result.version || '未知版本'} 安装成功。\n`
+      + '工作站服务和 Codex 内核已就绪，已启用登录自启。\n'
+      + (migration.restarted ? 'Codex 内核已更新并重启；请检查安装前正在进行的任务。\n' : '')
+      + (result.desktopRestartRecommended ? 'Codex Desktop：请完全退出后重新打开。\n' : '')
+      + '生成配对二维码：relax pair\n';
+  } catch { return output; }
+}
+
+function installationSnapshot() {
+  const recordPath = path.join(serviceRoot, 'installation.json');
+  if (!fs.existsSync(serviceRoot)) return { exists: false, valid: false };
+  try {
+    const record = JSON.parse(fs.readFileSync(recordPath, 'utf8').replace(/^\uFEFF/u, ''));
+    return { exists: true, valid: Boolean(record?.installedAt && record?.version),
+      version: record?.version, installedAt: record?.installedAt };
+  } catch {
+    return { exists: true, valid: false };
+  }
+}
+
+function sameInstallation(left, right) {
+  return left.valid && right.valid && left.version === right.version && left.installedAt === right.installedAt;
+}
+
+function setupFailureGuidance(previous, current) {
+  if (previous.valid && sameInstallation(previous, current)) {
+    return `检测到旧安装 ${previous.version}；新版本部署未完成，旧安装记录仍保留。\n`
+      + '请先执行 relax doctor；修复报错原因后重新运行 npm 安装命令，无需卸载旧版本。';
+  }
+  if (previous.valid && current.valid) {
+    return `检测到旧安装 ${previous.version}；服务文件已更新为 ${current.version}，但 setup 后续步骤失败。\n`
+      + '请执行 relax doctor 确认当前状态，修复后执行 relax setup；无需先卸载。';
+  }
+  if (previous.exists && current.valid) {
+    return `检测到既有服务目录，但无法确认有效的旧安装记录；服务文件现已写入 ${current.version}，setup 后续步骤仍失败。\n`
+      + '请执行 relax doctor 确认当前状态，修复后执行 relax setup；不要直接删除配置目录。';
+  }
+  if (previous.exists) {
+    return '检测到既有服务目录，但无法确认有效的旧安装记录；本次部署未完成。\n'
+      + '请执行 relax doctor，根据检查结果修复后重新运行 npm 安装命令，不要直接删除配置目录。';
+  }
+  if (current.valid) {
+    return `这是首次安装；服务文件 ${current.version} 已写入，但 setup 后续步骤失败。\n`
+      + '如果 relax 命令仍可用，请执行 relax doctor，再执行 relax setup；否则修复原因后重新运行 npm 安装命令。';
+  }
+  return '这是首次安装，尚未形成可确认的固定服务。\n修复上方错误后重新运行 npm 安装命令；无需执行卸载。';
+}
+
+const invokedDirectly = process.argv[1]
+  && path.resolve(process.argv[1]) === path.resolve(fileURLToPath(import.meta.url));
+if (invokedDirectly && process.env.npm_config_global === 'true') {
+  const entry = fileURLToPath(new URL('../dist/bin/codex-remote.mjs', import.meta.url));
+  const previous = installationSnapshot();
+  appendLog(`[postinstall] start package=${process.env.npm_package_version || 'unknown'} ${systemSummary()}`);
+  let setupStarted = false;
+  try {
+    const { prepareNativePackage } = await import('../dist/src/platform/native-package.mjs');
+    prepareNativePackage(fileURLToPath(new URL('../', import.meta.url)));
+    setupStarted = true;
+    runStage(entry, 'setup', ['setup', '--json'], output => formatSetupOutput(output));
+    console.log(`安装日志：${installLog}`);
+    appendLog('[postinstall] success');
+  } catch (error) {
+    const current = installationSnapshot();
+    if (!setupStarted) console.error(`平台组件检查失败：${error.message}`);
+    console.error(`\nCode Relax 安装未完全完成：\n${setupFailureGuidance(previous, current)}`);
+    if (error?.code && error.code !== 'ERR_CHILD_PROCESS_STDIO_MAXBUFFER') console.error(`启动安装步骤失败：${error.message}`);
+    console.error(`安装日志：${installLog}`);
+    appendLog('[postinstall] failed stage=setup');
+    process.exitCode = Number.isInteger(error?.status) && error.status > 0 ? error.status : 1;
+  }
+}