yymaxapi 1.0.95 → 1.0.96

package/bin/yymaxapi.js

@@ -639,6 +639,51 @@ function getGatewayListenOwner(port = 18789) {
   return ownerResult.output.trim().split(/\s+/)[0] || null;
 }
 
+function getGatewayProcessSignature(port = 18789, environment = detectGatewayEnv()) {
+  if (!port) return '';
+
+  let result = null;
+
+  if (environment === 'docker') {
+    if (!_selectedDockerContainer?.id) return '';
+    result = safeExec(
+      dockerCmd(`exec ${_selectedDockerContainer.id} sh -c "lsof -ti :${port} 2>/dev/null"`),
+      { timeout: 3000 }
+    );
+  } else if (environment === 'wsl') {
+    result = safeExec(`wsl -- bash -c "lsof -ti :${port} 2>/dev/null"`, { timeout: 3000 });
+  } else if (process.platform === 'win32') {
+    result = safeExec(`netstat -ano | findstr ":${port}"`, { timeout: 3000 });
+  } else {
+    result = safeExec(`lsof -ti :${port} 2>/dev/null`, { timeout: 3000 });
+  }
+
+  const text = [result?.output, result?.stdout, result?.stderr]
+    .filter(Boolean)
+    .join('\n');
+  if (!text) return '';
+
+  const pids = process.platform === 'win32'
+    ? text
+      .split('\n')
+      .map(line => line.trim())
+      .filter(line => line.includes('LISTENING') && line.includes(`:${port}`))
+      .map(line => line.split(/\s+/).pop() || '')
+      .filter(pid => /^\d+$/.test(pid))
+    : text
+      .split('\n')
+      .map(line => line.trim())
+      .filter(pid => /^\d+$/.test(pid));
+
+  return [...new Set(pids)].sort().join(',');
+}
+
+function didGatewayProcessRestart({ portWasOpenBefore, beforeSignature, afterSignature }) {
+  if (!portWasOpenBefore) return true;
+  if (!beforeSignature || !afterSignature) return true;
+  return beforeSignature !== afterSignature;
+}
+
 function getConfigPath() {
   const homeDir = os.homedir();
   const openclawStateDir = process.env.OPENCLAW_STATE_DIR || path.join(homeDir, '.openclaw');
@@ -5940,14 +5985,19 @@ async function restartGatewayDocker(gatewayPort, silent = false) {
 
   const cid = container.id;
   const shellVariants = ['sh -c', 'bash -lc', 'bash -c'];
+  const portWasOpenBefore = await isPortOpen(gatewayPort, '127.0.0.1', 500);
+  const beforeSignature = portWasOpenBefore ? getGatewayProcessSignature(gatewayPort, 'docker') : '';
 
   // 策略 A：exec restart 命令（短超时），然后端口探测
   for (const cmd of buildDockerInnerCmds(container, 'gateway restart')) {
     for (const shell of shellVariants) {
       safeExec(dockerCmd(`exec ${cid} ${shell} "${cmd}"`), { timeout: 8000 });
       if (await waitForGateway(gatewayPort, '127.0.0.1', 5000)) {
-        if (!silent) console.log(chalk.green(`✅ Gateway 已重启 (Docker: ${container.name})`));
-        return true;
+        const afterSignature = getGatewayProcessSignature(gatewayPort, 'docker');
+        if (didGatewayProcessRestart({ portWasOpenBefore, beforeSignature, afterSignature })) {
+          if (!silent) console.log(chalk.green(`✅ Gateway 已重启 (Docker: ${container.name})`));
+          return true;
+        }
       }
     }
   }
@@ -5980,6 +6030,8 @@ async function restartGatewayWsl(gatewayPort, silent = false) {
   if (!silent) console.log(chalk.gray('   [检测] Gateway 运行在 WSL 中'));
   const wslCli = getWslCliBinary();
   const names = ['openclaw', 'clawdbot', 'moltbot'];
+  const portWasOpenBefore = await isPortOpen(gatewayPort, '127.0.0.1', 500);
+  const beforeSignature = portWasOpenBefore ? getGatewayProcessSignature(gatewayPort, 'wsl') : '';
 
   // 构建 WSL 重启命令
   const wslRestartCmds = [];
@@ -5990,8 +6042,11 @@ async function restartGatewayWsl(gatewayPort, silent = false) {
   for (const cmd of wslRestartCmds) {
     safeExec(cmd, { timeout: 8000 });
     if (await waitForGateway(gatewayPort, '127.0.0.1', 5000)) {
-      if (!silent) console.log(chalk.green('✅ Gateway 已重启 (WSL)'));
-      return true;
+      const afterSignature = getGatewayProcessSignature(gatewayPort, 'wsl');
+      if (didGatewayProcessRestart({ portWasOpenBefore, beforeSignature, afterSignature })) {
+        if (!silent) console.log(chalk.green('✅ Gateway 已重启 (WSL)'));
+        return true;
+      }
     }
   }
 
@@ -6030,6 +6085,8 @@ async function restartGatewayNative(silent = false) {
   const configPaths = getConfigPath();
   const gwConfig = readConfig(configPaths.openclawConfig);
   const gatewayPort = gwConfig?.gateway?.port || 18789;
+  const portWasOpenBefore = await isPortOpen(gatewayPort, '127.0.0.1', 500);
+  const beforeSignature = portWasOpenBefore ? getGatewayProcessSignature(gatewayPort, 'native') : '';
 
   // 策略 A：尝试 exec "gateway restart"（短超时），然后端口探测
   const restartCmds = buildGatewayCommands(resolved, nodeInfo, useNode, 'restart');
@@ -6037,8 +6094,12 @@ async function restartGatewayNative(silent = false) {
     // 只尝试第一条（最精确的路径），避免逐条超时累积
     safeExec(restartCmds[0], { timeout: 8000, env });
     if (await waitForGateway(gatewayPort, '127.0.0.1', 5000)) {
-      if (!silent) console.log(chalk.green(`✅ Gateway 已重启`));
-      return true;
+      const afterSignature = getGatewayProcessSignature(gatewayPort, 'native');
+      if (didGatewayProcessRestart({ portWasOpenBefore, beforeSignature, afterSignature })) {
+        if (!silent) console.log(chalk.green(`✅ Gateway 已重启`));
+        return true;
+      }
+      if (!silent) console.log(chalk.gray('   检测到 Gateway 监听进程未变化，继续执行强制重启...'));
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yymaxapi",
-  "version": "1.0.95",
+  "version": "1.0.96",
   "description": "跨平台 OpenClaw/Clawdbot 配置管理工具 - 管理中转地址、模型切换、API Keys、测速优化",
   "main": "bin/yymaxapi.js",
   "bin": {