openclawsetup 2.8.9 → 2.8.11

package/bin/cli.mjs

@@ -953,6 +953,76 @@ function isLikelyOpenClawProcess(output = '') {
   );
 }
 
+/**
+ * 通过端口直接检测 Gateway 进程信息（不依赖 openclaw status 命令）
+ * 返回 { found, pid, processName, cmdline, isOpenClaw }
+ */
+function detectGatewayProcess(port) {
+  const result = { found: false, pid: null, processName: '', cmdline: '', isOpenClaw: false };
+
+  if (platform() === 'win32') {
+    // Windows: netstat 找 PID，再用 wmic 查进程详情
+    const netstat = safeExec(`netstat -ano -p tcp | findstr LISTENING | findstr :${port}`, { timeout: 8000 });
+    if (!netstat.ok || !netstat.output) return result;
+
+    // 提取 PID（netstat 输出最后一列是 PID）
+    const pidMatch = netstat.output.match(/LISTENING\s+(\d+)/);
+    if (!pidMatch) return result;
+    result.pid = pidMatch[1];
+    result.found = true;
+
+    // 用 wmic 获取进程命令行
+    const wmic = safeExec(`wmic process where "ProcessId=${result.pid}" get CommandLine,Name /format:list`, { timeout: 5000 });
+    if (wmic.ok && wmic.output) {
+      const nameMatch = wmic.output.match(/Name=(.+)/i);
+      const cmdMatch = wmic.output.match(/CommandLine=(.+)/i);
+      result.processName = nameMatch ? nameMatch[1].trim() : '';
+      result.cmdline = cmdMatch ? cmdMatch[1].trim() : '';
+    }
+
+    // wmic 可能不可用（新版 Windows），回退用 tasklist
+    if (!result.processName) {
+      const tasklist = safeExec(`tasklist /FI "PID eq ${result.pid}" /FO CSV /NH`, { timeout: 5000 });
+      if (tasklist.ok && tasklist.output) {
+        const parts = tasklist.output.split(',');
+        if (parts.length > 0) {
+          result.processName = parts[0].replace(/"/g, '').trim();
+        }
+      }
+    }
+  } else {
+    // Linux/macOS: lsof 找 PID 和进程名
+    const lsof = safeExec(`lsof -nP -iTCP:${port} -sTCP:LISTEN -F pcn 2>/dev/null`, { timeout: 5000 });
+    if (lsof.ok && lsof.output) {
+      const pidMatch = lsof.output.match(/p(\d+)/);
+      const nameMatch = lsof.output.match(/c(.+)/);
+      if (pidMatch) {
+        result.pid = pidMatch[1];
+        result.found = true;
+        result.processName = nameMatch ? nameMatch[1].trim() : '';
+      }
+    }
+
+    // 获取完整命令行
+    if (result.pid) {
+      const cmdline = safeExec(`cat /proc/${result.pid}/cmdline 2>/dev/null | tr '\\0' ' ' || ps -p ${result.pid} -o args= 2>/dev/null`, { timeout: 3000 });
+      if (cmdline.ok && cmdline.output) {
+        result.cmdline = cmdline.output.trim();
+      }
+    }
+  }
+
+  // 判断是否是 OpenClaw 进程
+  const combined = `${result.processName} ${result.cmdline}`.toLowerCase();
+  result.isOpenClaw = combined.includes('openclaw') || combined.includes('clawdbot') || combined.includes('moltbot');
+  // node 进程运行 gateway 也算
+  if (!result.isOpenClaw && combined.includes('node') && combined.includes('gateway')) {
+    result.isOpenClaw = true;
+  }
+
+  return result;
+}
+
 function hasListeningState(output = '') {
   if (!output) return false;
   if (platform() !== 'win32') return Boolean(output.trim());
@@ -1216,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');
@@ -1229,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 };
 }
@@ -2573,61 +2750,44 @@ async function showStatusInfo(cliName) {
   const dashboardUrl = `http://127.0.0.1:${port}/?token=${token}`;
 
   console.log(colors.bold(colors.cyan('\n📊 OpenClaw 状态信息\n')));
-  console.log(colors.gray('  … 正在检查服务状态（超时自动跳过）...'));
-
-  // 服务状态（兼容不同 CLI 版本，避免 Windows 下误判）
-  const statusAttempts = [
-    { cmd: `${cliName} status`, label: 'status' },
-    { cmd: `${cliName} gateway status`, label: 'gateway status' },
-  ];
-  let statusState = 'unknown';
-  let statusOutput = '';
-  let statusTimedOut = false;
-
-  for (const attempt of statusAttempts) {
-    const statusResult = safeExec(attempt.cmd, { timeout: STATUS_CMD_TIMEOUT_MS });
-    if (!statusResult.ok && /timed out|etimedout|SIGTERM|killed/i.test(`${statusResult.error || ''} ${statusResult.stderr || ''}`)) {
-      statusTimedOut = true;
-      continue;
-    }
-    if (!statusResult.ok || !statusResult.output) continue;
-    statusOutput = statusResult.output;
-    const parsed = parseStatusOutput(statusResult.output);
-    if (parsed === 'running') {
-      statusState = 'running';
-      break;
-    }
-    if (parsed === 'stopped') {
-      statusState = 'stopped';
-    }
-  }
+  console.log(colors.gray('  … 正在检查服务状态...'));
 
-  // 端口检查（作为状态命令兜底）
+  // 1. 直接通过端口检测进程（不依赖 openclaw status 命令）
+  const processInfo = detectGatewayProcess(port);
   const portResult = getPortCheckOutput(port, PORT_CHECK_TIMEOUT_MS);
   const portListening = Boolean(portResult.ok && portResult.output);
 
-  if (statusTimedOut && !portListening) {
-    console.log(colors.yellow('  ⚠ 状态命令超时，已自动切换端口探测模式'));
-  }
-  if (portResolved.source === 'runtime' && Number(config?.port) !== Number(port)) {
-    console.log(colors.gray(`  … 运行时端口为 ${port}（与本地配置文件不一致）`));
+  // 2. 如果直接检测没结果，再尝试 openclaw status 命令
+  let statusState = 'unknown';
+  if (!processInfo.found && !portListening) {
+    const statusProbe = probeGatewayStatus(cliName, STATUS_CMD_TIMEOUT_MS);
+    statusState = statusProbe.state;
   }
 
-  if (statusState === 'running') {
+  // 3. 综合判断并显示
+  if (processInfo.found && processInfo.isOpenClaw) {
     console.log(colors.green('  ✓ Gateway 服务正在运行'));
+    console.log(colors.gray(`    进程: ${processInfo.processName || 'node'} (PID ${processInfo.pid})`));
+  } else if (processInfo.found && !processInfo.isOpenClaw) {
+    console.log(colors.yellow(`  ⚠ 端口 ${port} 被其他进程占用`));
+    console.log(colors.gray(`    进程: ${processInfo.processName || '未知'} (PID ${processInfo.pid})`));
+    if (processInfo.cmdline) {
+      console.log(colors.gray(`    命令: ${processInfo.cmdline.substring(0, 120)}`));
+    }
+    console.log(colors.yellow('    → 请先选择「检查修复」解决端口冲突\n'));
+    return;
   } else if (portListening) {
-    // 端口在监听 = Gateway 在运行，状态命令超时/不准确不影响判断
+    // 端口在监听但无法获取进程详情（权限不足等）
+    console.log(colors.green('  ✓ Gateway 服务正在运行'));
+  } else if (statusState === 'running') {
     console.log(colors.green('  ✓ Gateway 服务正在运行'));
   } else {
     console.log(colors.red('  ✗ Gateway 服务未运行'));
-    if (statusOutput) {
-      console.log(colors.gray(`    状态输出: ${statusOutput.split('\n')[0].slice(0, 100)}`));
-    }
     console.log(colors.yellow('    → 请先选择「检查修复」自动修复此问题\n'));
     return;
   }
 
-  if (portResult.ok && portResult.output) {
+  if (portListening) {
     console.log(colors.green(`  ✓ 端口 ${port} 正在监听`));
   } else {
     console.log(colors.red(`  ✗ 端口 ${port} 未监听`));
@@ -2748,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':
@@ -2830,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.9",
+  "version": "2.8.11",
   "description": "OpenClaw 安装向导 - 智能安装、诊断、自动修复",
   "type": "module",
   "bin": {