openclawsetup 2.8.10 → 2.8.11

package/bin/cli.mjs

@@ -1286,9 +1286,13 @@ async function tryFixPortConflict(cliName, currentPort) {
     return { ok: false, newPort: currentPort, note: '未找到可用替代端口' };
   }
 
-  const setResult = safeExec(`${cliName} config set gateway.port ${availablePort}`);
+  // 优先用 CLI 设置，超时则直接改配置文件
+  const setResult = safeExec(`${cliName} config set gateway.port ${availablePort}`, { timeout: 10000 });
   if (!setResult.ok) {
-    return { ok: false, newPort: currentPort, note: `端口切换失败: ${setResult.stderr || setResult.error}` };
+    const fileSet = setGatewayPortInConfig(availablePort);
+    if (!fileSet.ok) {
+      return { ok: false, newPort: currentPort, note: `端口切换失败: ${fileSet.error}` };
+    }
   }
 
   const restartResult = await ensureGatewayRunning(cliName, 'restart');
@@ -1299,6 +1303,109 @@ async function tryFixPortConflict(cliName, currentPort) {
   return { ok: true, newPort: availablePort, note: `端口已切换到 ${availablePort}` };
 }
 
+/**
+ * 直接修改 openclaw.json 中的 gateway.port（不依赖 openclaw CLI）
+ */
+function setGatewayPortInConfig(newPort) {
+  const config = getConfigInfo();
+  if (!config.configPath || !existsSync(config.configPath)) {
+    return { ok: false, error: '配置文件不存在' };
+  }
+  try {
+    const raw = readFileSync(config.configPath, 'utf8');
+    const json = JSON.parse(raw);
+    if (!json.gateway) json.gateway = {};
+    json.gateway.port = newPort;
+    writeFileSync(config.configPath, JSON.stringify(json, null, 2), 'utf8');
+    return { ok: true };
+  } catch (e) {
+    return { ok: false, error: e.message };
+  }
+}
+
+/**
+ * 重置/更改端口：找可用端口 → 写配置 → 重启 Gateway
+ */
+async function resetGatewayPort(cliName, requestedPort = null) {
+  const config = getConfigInfo();
+  const currentPort = config.port || DEFAULT_GATEWAY_PORT;
+
+  console.log(colors.cyan('\n🔧 Gateway 端口管理\n'));
+  console.log(colors.gray(`  当前端口: ${currentPort}`));
+
+  // 确定目标端口
+  let targetPort;
+  if (requestedPort && requestedPort !== currentPort) {
+    // 用户指定了端口，检查是否可用
+    const inUse = await isPortInUse(requestedPort);
+    if (inUse) {
+      const processInfo = detectGatewayProcess(requestedPort);
+      if (processInfo.found) {
+        log.error(`端口 ${requestedPort} 已被占用: ${processInfo.processName || '未知'} (PID ${processInfo.pid})`);
+      } else {
+        log.error(`端口 ${requestedPort} 已被占用`);
+      }
+      return { ok: false, port: currentPort };
+    }
+    targetPort = requestedPort;
+  } else {
+    // 自动找可用端口
+    console.log(colors.gray('  正在扫描可用端口...'));
+    targetPort = await findAvailablePort(DEFAULT_GATEWAY_PORT);
+    if (!targetPort) {
+      log.error('未找到可用端口');
+      return { ok: false, port: currentPort };
+    }
+  }
+
+  console.log(colors.cyan(`  目标端口: ${targetPort}`));
+
+  // 先尝试用 CLI 设置（如果可用）
+  const cliSet = safeExec(`${cliName} config set gateway.port ${targetPort}`, { timeout: 10000 });
+  if (!cliSet.ok) {
+    // CLI 不可用，直接改配置文件
+    console.log(colors.gray('  CLI 设置超时，直接修改配置文件...'));
+    const fileSet = setGatewayPortInConfig(targetPort);
+    if (!fileSet.ok) {
+      log.error(`配置写入失败: ${fileSet.error}`);
+      return { ok: false, port: currentPort };
+    }
+  }
+
+  log.success(`端口已设置为 ${targetPort}`);
+
+  // 重启 Gateway
+  console.log(colors.gray('  正在重启 Gateway...'));
+  await ensureGatewayRunning(cliName, 'restart');
+
+  // 等待并验证新端口
+  const maxWait = platform() === 'win32' ? 15000 : 8000;
+  const interval = 1500;
+  let waited = 0;
+  let portReady = false;
+  while (waited < maxWait) {
+    await sleep(interval);
+    waited += interval;
+    const check = getPortCheckOutput(targetPort);
+    if (check.ok && hasListeningState(check.output)) {
+      portReady = true;
+      break;
+    }
+  }
+
+  if (portReady) {
+    log.success(`Gateway 已在端口 ${targetPort} 上运行`);
+    const token = getDashboardToken(config);
+    if (token) {
+      console.log(colors.cyan(`\n  Dashboard: http://127.0.0.1:${targetPort}/?token=${token}`));
+    }
+    return { ok: true, port: targetPort };
+  }
+
+  log.warn('Gateway 重启后端口未就绪，请手动检查');
+  return { ok: false, port: targetPort };
+}
+
 function summarizeIssue(level, title, detail, solution, fixCmd = '') {
   return { level, title, detail, solution, fixCmd };
 }
@@ -2801,9 +2908,10 @@ async function showInteractiveMenu(existing) {
     console.log(`  ${colors.yellow('9')}. 配置技能`);
     console.log(`  ${colors.yellow('10')}. 重新安装`);
     console.log(`  ${colors.yellow('11')}. 完全卸载`);
+    console.log(`  ${colors.yellow('12')}. 重置/更改端口`);
     console.log(`  ${colors.yellow('0')}. 退出`);
 
-    const choice = await askQuestion('\n请输入选项 (0-11): ');
+    const choice = await askQuestion('\n请输入选项 (0-12): ');
 
     switch (choice.trim()) {
       case '1':
@@ -2883,12 +2991,23 @@ async function showInteractiveMenu(existing) {
           process.exit(0);
         }
         break;
+      case '12': {
+        const portInput = await askQuestion('输入新端口号（留空自动分配）: ');
+        const requestedPort = portInput.trim() ? Number(portInput.trim()) : null;
+        if (requestedPort && (isNaN(requestedPort) || requestedPort < 1024 || requestedPort > 65535)) {
+          log.error('端口号无效，请输入 1024-65535 之间的数字');
+        } else {
+          await resetGatewayPort(cliName, requestedPort);
+        }
+        await waitForEnter('\n按回车返回菜单...');
+        break;
+      }
       case '0':
       case '':
         console.log(colors.gray('\n再见！'));
         process.exit(0);
       default:
-        log.warn('无效选项，请输入 0-11');
+        log.warn('无效选项，请输入 0-12');
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclawsetup",
-  "version": "2.8.10",
+  "version": "2.8.11",
   "description": "OpenClaw 安装向导 - 智能安装、诊断、自动修复",
   "type": "module",
   "bin": {