@myassis/gateway 1.0.46 → 1.0.48

package/dist/services/ServiceManager.js

@@ -103,11 +103,35 @@ function getStoredPid() {
 }
 /**
  * 停止 Gateway 用户进程（优雅终止）
+ *
+ * 注意：当 pid 指向当前进程自己时，绝不能使用 process.kill(pid)。
+ *   - Windows 上 Node 的 process.kill 等同 TerminateProcess，无清理机会，
+ *     server.close() / WebSocket / 文件句柄都不会被释放，会导致后续 exe 解锁超时。
+ *   - 因此自杀场景改走 process.emit('SIGTERM')，复用 main.ts 已注册的优雅关闭逻辑，
+ *     并在响应返回后异步退出，避免 HTTP 调用方读不到结果。
  */
 async function stopGatewayProcess() {
     const pid = getStoredPid();
     if (!pid)
         return;
+    // —— 场景 1：要停的就是自己 —— 走优雅退出
+    if (pid === process.pid) {
+        try {
+            fs_1.default.unlinkSync(GATEWAY_PID_FILE);
+        }
+        catch { /* ignore */ }
+        // 异步触发，确保当前调用栈（含 HTTP 响应）有机会先返回
+        setTimeout(() => {
+            try {
+                process.emit('SIGTERM');
+            }
+            catch { /* ignore */ }
+            // 兜底：5s 内 SIGTERM handler 没把进程关掉，再强退
+            setTimeout(() => process.exit(0), 5000).unref();
+        }, 100).unref();
+        return;
+    }
+    // —— 场景 2：停的是别人（孤儿进程 / 旧实例）—— 才真正发信号
     try {
         process.kill(pid, 'SIGTERM');
         await new Promise(r => setTimeout(r, 2000));
@@ -521,20 +545,40 @@ async function updateService() {
                     `if (-not (Test-Path $logDir)) { New-Item -ItemType Directory -Path $logDir -Force | Out-Null }`,
                     `function Write-UpdateLog { param([string]$Message) Add-Content -Path $logPath -Encoding UTF8 -Value \"$(Get-Date -Format 'yyyy-MM-dd HH:mm:ss') $Message\" }`,
                     `function Stop-GatewayProcess {`,
-                    `  if (-not (Test-Path $pidFile)) { Write-UpdateLog 'pid file not found, skip stop'; return }`,
+                    `  $stoppedPids = @{}`,
+                    `  if (Test-Path $pidFile) {`,
+                    `    try {`,
+                    `      $pidValue = (Get-Content $pidFile -Raw).Trim()`,
+                    `      if ($pidValue) {`,
+                    `        $pidInt = [int]$pidValue`,
+                    `        Write-UpdateLog \"stopping gateway process by pid file pid=$pidInt\"`,
+                    `        try { Stop-Process -Id $pidInt -Force -ErrorAction Stop; $stoppedPids[$pidInt] = $true } catch { Write-UpdateLog \"stop-process by pid failed: $($_.Exception.Message)\" }`,
+                    `      }`,
+                    `    } catch { Write-UpdateLog \"read pid file error: $($_.Exception.Message)\" }`,
+                    `    Remove-Item $pidFile -Force -ErrorAction SilentlyContinue`,
+                    `  } else { Write-UpdateLog 'pid file not found, fallback to path match' }`,
                     `  try {`,
-                    `    $pidValue = (Get-Content $pidFile -Raw).Trim()`,
-                    `    if (-not $pidValue) { return }`,
-                    `    $pidInt = [int]$pidValue`,
-                    `    Write-UpdateLog \"stopping gateway process pid=$pidInt\"`,
-                    `    try { Stop-Process -Id $pidInt -Force -ErrorAction Stop } catch { Write-UpdateLog \"stop-process failed: $($_.Exception.Message)\" }`,
+                    `    $targetFull = [System.IO.Path]::GetFullPath($currentExe)`,
+                    `    $targetName = [System.IO.Path]::GetFileNameWithoutExtension($currentExe)`,
+                    `    $procs = Get-Process -Name $targetName -ErrorAction SilentlyContinue`,
+                    `    foreach ($proc in $procs) {`,
+                    `      try {`,
+                    `        $procPath = $null`,
+                    `        try { $procPath = $proc.Path } catch { $procPath = $null }`,
+                    `        if ($procPath -and ([System.IO.Path]::GetFullPath($procPath) -ieq $targetFull)) {`,
+                    `          Write-UpdateLog \"stopping gateway process by path pid=$($proc.Id), path=$procPath\"`,
+                    `          try { Stop-Process -Id $proc.Id -Force -ErrorAction Stop; $stoppedPids[$proc.Id] = $true } catch { Write-UpdateLog \"stop-process by path failed pid=$($proc.Id): $($_.Exception.Message)\" }`,
+                    `        }`,
+                    `      } catch { Write-UpdateLog \"inspect process failed pid=$($proc.Id): $($_.Exception.Message)\" }`,
+                    `    }`,
+                    `  } catch { Write-UpdateLog \"enumerate processes error: $($_.Exception.Message)\" }`,
+                    `  foreach ($spid in $stoppedPids.Keys) {`,
                     `    for ($w = 0; $w -lt 30; $w++) {`,
-                    `      $p = Get-Process -Id $pidInt -ErrorAction SilentlyContinue`,
+                    `      $p = Get-Process -Id $spid -ErrorAction SilentlyContinue`,
                     `      if (-not $p) { break }`,
                     `      Start-Sleep -Milliseconds 500`,
                     `    }`,
-                    `    Remove-Item $pidFile -Force -ErrorAction SilentlyContinue`,
-                    `  } catch { Write-UpdateLog \"stop gateway error: $($_.Exception.Message)\" }`,
+                    `  }`,
                     `}`,
                     `function Start-GatewayProcess {`,
                     `  if (-not (Test-Path $launcher)) { Write-UpdateLog \"launcher script not found: $launcher\"; return }`,
@@ -548,17 +592,35 @@ async function updateService() {
                     `  Start-Sleep -Seconds 1`,
                     `  Write-UpdateLog 'waiting executable unlock'`,
                     `  $moved = $false`,
-                    `  for ($i = 0; $i -lt 60; $i++) {`,
+                    `  $lastMoveError = ''`,
+                    `  for ($i = 0; $i -lt 120; $i++) {`,
                     `    try {`,
                     `      if (Test-Path $backupExe) { Remove-Item $backupExe -Force -ErrorAction SilentlyContinue }`,
-                    `      Move-Item $currentExe $backupExe -Force`,
+                    `      Move-Item $currentExe $backupExe -Force -ErrorAction Stop`,
                     `      $moved = $true`,
                     `      break`,
                     `    } catch {`,
+                    `      $lastMoveError = $_.Exception.Message`,
+                    `      if (($i % 5) -eq 0) { Write-UpdateLog \"move-item failed try=$i error=$lastMoveError\" }`,
+                    `      if (($i -gt 0) -and (($i % 10) -eq 0)) { try { Stop-GatewayProcess } catch { Write-UpdateLog \"retry stop failed: $($_.Exception.Message)\" } }`,
                     `      Start-Sleep -Seconds 1`,
                     `    }`,
                     `  }`,
-                    `  if (-not $moved) { throw '等待旧版本可执行文件解锁超时' }`,
+                    `  if (-not $moved) {`,
+                    `    $holders = ''`,
+                    `    try {`,
+                    `      $targetName = [System.IO.Path]::GetFileNameWithoutExtension($currentExe)`,
+                    `      $procs = Get-Process -Name $targetName -ErrorAction SilentlyContinue`,
+                    `      $infos = @()`,
+                    `      foreach ($proc in $procs) {`,
+                    `        try { $procPath = $proc.Path } catch { $procPath = '' }`,
+                    `        $infos += \"pid=$($proc.Id) path=$procPath\"`,
+                    `      }`,
+                    `      $holders = ($infos -join '; ')`,
+                    `    } catch { $holders = \"enumerate failed: $($_.Exception.Message)\" }`,
+                    `    Write-UpdateLog \"executable still locked, lastError=$lastMoveError, holders=$holders\"`,
+                    `    throw \"等待旧版本可执行文件解锁超时: lastError=$lastMoveError; holders=$holders\"`,
+                    `  }`,
                     `  Write-UpdateLog 'moving new executable'`,
                     `  Move-Item $tmpExe $currentExe -Force`,
                     `  Start-Sleep -Seconds 1`,

package/package.json

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