@myassis/gateway 1.0.65 → 1.0.66

package/dist/services/ServiceManager.js

@@ -146,31 +146,123 @@ async function stopGatewayProcess() {
         fs_1.default.unlinkSync(GATEWAY_PID_FILE);
     }
     catch { /* ignore */ }
+    // 同时杀掉守护进程（防止它重新拉起 gateway）
+    if (process.platform === 'win32') {
+        try {
+            const daemonPidStr = fs_1.default.readFileSync(GATEWAY_DAEMON_PID_FILE, 'utf8').trim();
+            const daemonPid = parseInt(daemonPidStr, 10);
+            if (daemonPid && !isNaN(daemonPid)) {
+                try {
+                    process.kill(daemonPid, 'SIGTERM');
+                }
+                catch { /* ignore */ }
+                await new Promise(r => setTimeout(r, 500));
+                try {
+                    process.kill(daemonPid, 'SIGKILL');
+                }
+                catch { /* ignore */ }
+            }
+        }
+        catch { /* ignore */ }
+        try {
+            fs_1.default.unlinkSync(GATEWAY_DAEMON_PID_FILE);
+        }
+        catch { /* ignore */ }
+    }
 }
 /**
  * 写入 Gateway 启动脚本（用户级，不弹出窗口）
  */
 function writeGatewayLauncherScript(exePath, scriptPath, workDir) {
     // 写入 BOM + UTF-8 内容
+    const bs = (p) => p.replace(/\\/g, '\\\\');
     const content = [
-        "$ErrorActionPreference = 'Stop'",
-        "$exe = '" + exePath.replace(/\\/g, '\\\\') + "'",
-        "$workDir = '" + workDir.replace(/\\/g, '\\\\') + "'",
-        "$pidFile = '" + GATEWAY_PID_FILE.replace(/\\/g, '\\\\') + "'",
-        "",
-        "# 启动 Gateway（无参启动，直接进入 HTTP Server 模式，监听默认端口 3001）",
-        "$psi = New-Object System.Diagnostics.ProcessStartInfo",
-        "$psi.FileName = $exe",
-        "$psi.WorkingDirectory = $workDir",
-        "# 关键：UseShellExecute=$true 走 ShellExecute API，子进程不继承父 PS 的 stdout/stderr/stdin 句柄",
-        "# 防止 PowerShell 退出后句柄失效导致 gateway 写 stdout 时 EPIPE 崩溃（运行一段时间后自杀）",
-        "$psi.UseShellExecute = $true",
-        "$psi.WindowStyle = 'Hidden'",
-        "$proc = [System.Diagnostics.Process]::Start($psi)",
-        "if ($proc) {",
-        "  $proc.Id.ToString() | Out-File -FilePath $pidFile -Encoding UTF8",
-        "}",
-        "# fire-and-forget：不 WaitForExit，PowerShell 立即退出，省 ~30MB 常驻内存",
+        "$ErrorActionPreference = 'Continue'",
+        `$exe = '${bs(exePath)}'`,
+        `$workDir = '${bs(workDir)}'`,
+        `$pidFile = '${bs(GATEWAY_PID_FILE)}'`,
+        `$stopFlag = '${bs(GATEWAY_STOP_FLAG_FILE)}'`,
+        `$daemonPidFile = '${bs(GATEWAY_DAEMON_PID_FILE)}'`,
+        `$logFile = '${bs(path_1.default.join(GATEWAY_DATA_DIR, 'gateway-daemon.log'))}'`,
+        '',
+        '# 写入守护进程 PID',
+        '$PID.ToString() | Out-File -FilePath $daemonPidFile -Encoding UTF8',
+        '',
+        'function Write-Log {',
+        '  param([string]$msg)',
+        "  $ts = Get-Date -Format 'yyyy-MM-dd HH:mm:ss'",
+        "  $line = \"[$ts] $msg\"",
+        '  $line | Out-File -FilePath $logFile -Append -Encoding UTF8',
+        '}',
+        '',
+        'function Start-Gateway {',
+        "  Write-Log '启动 Gateway 进程...'",
+        '  $psi = New-Object System.Diagnostics.ProcessStartInfo',
+        '  $psi.FileName = $exe',
+        '  $psi.WorkingDirectory = $workDir',
+        '  $psi.UseShellExecute = $false',
+        '  $psi.RedirectStandardOutput = $true',
+        '  $psi.RedirectStandardError = $true',
+        '  $psi.CreateNoWindow = $true',
+        '  $proc = [System.Diagnostics.Process]::Start($psi)',
+        '  if ($proc) {',
+        '    $proc.Id.ToString() | Out-File -FilePath $pidFile -Encoding UTF8',
+        "    Write-Log \"Gateway 已启动，PID=$($proc.Id)\"",
+        '    return $proc',
+        '  }',
+        "  Write-Log 'Gateway 启动失败'",
+        '  return $null',
+        '}',
+        '',
+        '# 清理之前的停止标记',
+        'if (Test-Path $stopFlag) { Remove-Item $stopFlag -Force }',
+        '',
+        '# 首次启动',
+        '$proc = Start-Gateway',
+        'if (-not $proc) { exit 1 }',
+        '',
+        '# 守护循环：监控进程状态，异常退出则自动重启',
+        'while ($true) {',
+        '  try {',
+        '    # 等待进程退出（每 5 秒检查一次，防止卡死）',
+        '    $exited = $proc.WaitForExit(5000)',
+        '    if ($exited) {',
+        '      $exitCode = $proc.ExitCode',
+        "      Write-Log \"Gateway 进程已退出，退出码=$exitCode\"",
+        '',
+        '      # 检查是否是主动停止',
+        '      if (Test-Path $stopFlag) {',
+        "        Write-Log '检测到停止标记，守护进程退出'",
+        '        Remove-Item $stopFlag -Force -ErrorAction SilentlyContinue',
+        '        break',
+        '      }',
+        '',
+        '      # 异常退出，等待 3 秒后重启',
+        "      Write-Log 'Gateway 异常退出，3 秒后自动重启...'",
+        '      Start-Sleep -Seconds 3',
+        '',
+        '      # 再次检查停止标记（重启等待期间可能被标记停止）',
+        '      if (Test-Path $stopFlag) {',
+        "        Write-Log '检测到停止标记，守护进程退出'",
+        '        Remove-Item $stopFlag -Force -ErrorAction SilentlyContinue',
+        '        break',
+        '      }',
+        '',
+        '      $proc = Start-Gateway',
+        '      if (-not $proc) {',
+        "        Write-Log '重启失败，5 秒后重试...'",
+        '        Start-Sleep -Seconds 5',
+        '        continue',
+        '      }',
+        '    }',
+        '  } catch {',
+        "    Write-Log \"守护循环异常: $($_.Exception.Message)\"",
+        '    Start-Sleep -Seconds 5',
+        '  }',
+        '}',
+        '',
+        '# 清理 PID 文件',
+        'Remove-Item $daemonPidFile -Force -ErrorAction SilentlyContinue',
     ].join('\r\n');
     // 确保目标目录存在（%LOCALAPPDATA%\我的助手 首次启动时可能不存在）
     try {
@@ -244,6 +336,18 @@ async function uninstallWindows() {
             fs_1.default.unlinkSync(GATEWAY_PID_FILE);
         }
         catch { /* ignore */ }
+        try {
+            fs_1.default.unlinkSync(GATEWAY_DAEMON_PID_FILE);
+        }
+        catch { /* ignore */ }
+        try {
+            fs_1.default.unlinkSync(GATEWAY_STOP_FLAG_FILE);
+        }
+        catch { /* ignore */ }
+        try {
+            fs_1.default.unlinkSync(GATEWAY_LAUNCHER_FILE);
+        }
+        catch { /* ignore */ }
         return { success: true, message: 'Gateway 已卸载（用户级进程）' };
     }
     catch (err) {
@@ -260,14 +364,16 @@ async function startServiceWindows() {
         if (!fs_1.default.existsSync(GATEWAY_LAUNCHER_FILE)) {
             writeGatewayLauncherScript(exe, GATEWAY_LAUNCHER_FILE, workDir);
         }
-        await execAsync(`powershell -NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File "${GATEWAY_LAUNCHER_FILE}"`, { timeout: 5000, windowsHide: true });
-        const maxWait = 5000;
+        // 使用 Start-Process 在后台启动守护脚本（-WindowStyle Hidden 隐藏窗口）
+        // 守护脚本会持续运行并监控 gateway 进程，异常时自动重启
+        await execAsync(`powershell -NoProfile -ExecutionPolicy Bypass -Command "Start-Process -FilePath powershell.exe -ArgumentList '-NoProfile','-ExecutionPolicy','Bypass','-WindowStyle','Hidden','-File','${GATEWAY_LAUNCHER_FILE}' -WindowStyle Hidden"`, { timeout: 5000, windowsHide: true });
+        const maxWait = 8000;
         const start = Date.now();
         while (!isGatewayRunning() && Date.now() - start < maxWait) {
             await new Promise(r => setTimeout(r, 500));
         }
         if (isGatewayRunning()) {
-            return { success: true, message: 'Gateway 启动成功' };
+            return { success: true, message: 'Gateway 启动成功（已启用异常自动重启）' };
         }
         return { success: false, message: 'Gateway 进程未能启动，请检查日志' };
     }
@@ -288,7 +394,23 @@ async function restartServiceWindows() {
 }
 async function stopServiceWindows() {
     try {
+        // 写入停止标记，告知守护进程这是主动停止，不要重启
+        try {
+            fs_1.default.writeFileSync(GATEWAY_STOP_FLAG_FILE, '1', 'utf8');
+        }
+        catch { /* ignore */ }
+        // 给守护进程一点时间检测到标记
+        await new Promise(r => setTimeout(r, 200));
         await stopGatewayProcess();
+        // 清理停止标记和守护进程 PID 文件
+        try {
+            fs_1.default.unlinkSync(GATEWAY_STOP_FLAG_FILE);
+        }
+        catch { /* ignore */ }
+        try {
+            fs_1.default.unlinkSync(GATEWAY_DAEMON_PID_FILE);
+        }
+        catch { /* ignore */ }
         return { success: true, message: 'Gateway 已停止' };
     }
     catch (err) {
@@ -822,6 +944,10 @@ const GATEWAY_PID_FILE = path_1.default.join(os_1.default.tmpdir(), 'myassis-gat
 const GATEWAY_DATA_DIR = path_1.default.join(process.env.LOCALAPPDATA || path_1.default.join(os_1.default.homedir(), 'AppData', 'Local'), '我的助手');
 /** Gateway 启动脚本路径 */
 const GATEWAY_LAUNCHER_FILE = path_1.default.join(GATEWAY_DATA_DIR, 'gateway-launcher.ps1');
+/** Gateway 停止标记文件（存在时表示是主动停止，守护进程不应重启） */
+const GATEWAY_STOP_FLAG_FILE = path_1.default.join(GATEWAY_DATA_DIR, '.gateway-stop-flag');
+/** Gateway 守护进程 PID 文件 */
+const GATEWAY_DAEMON_PID_FILE = path_1.default.join(GATEWAY_DATA_DIR, 'gateway-daemon.pid');
 /** 当前活跃的 Helper 进程 */
 let helperProcess = null;
 /** Helper 连接 socket */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myassis/gateway",
-  "version": "1.0.65",
+  "version": "1.0.66",
   "description": "我的助手 Gateway Service - 本地 AI 网关服务，支持认证、WebSocket 实时通信和任务调度",
   "main": "dist/index.js",
   "bin": {