@myassis/gateway 1.0.43 → 1.0.45

package/dist/services/ServiceManager.js

@@ -503,31 +503,49 @@ async function updateService() {
                 response.data.on('error', reject);
             });
             console.log('✅ 下载完成');
-            // 生成延迟替换脚本，Windows 通过 nssm 管理服务并使用 execAsync 派发脚本
+            // 生成延迟替换脚本：Windows 已改为用户级进程（PID 文件 + Run key + launcher.ps1）
+            // 因此更新脚本不再依赖 nssm，而是按 PID 文件 kill 旧进程 -> 替换 exe -> 调 launcher.ps1 重启
             if (isWin) {
-                const nssmPath = getNssmPath();
-                if (!nssmPath || !fs_1.default.existsSync(nssmPath)) {
-                    throw new Error('未找到 nssm.exe，无法执行 Windows 服务更新');
-                }
                 const escapePowerShellString = (value) => value.replace(/'/g, "''");
                 const updateScriptPath = path_1.default.join(os_1.default.tmpdir(), 'myassis-gateway-update.ps1');
                 const psScript = [
                     `$ErrorActionPreference = 'Stop'`,
-                    `$nssm = '${escapePowerShellString(nssmPath)}'`,
                     `$serviceName = '${escapePowerShellString(exports.SERVICE_NAME)}'`,
                     `$currentExe = '${escapePowerShellString(currentExe)}'`,
                     `$tmpExe = '${escapePowerShellString(tmpExe)}'`,
                     `$backupExe = '${escapePowerShellString(`${currentExe}.bak`)}'`,
+                    `$pidFile = '${escapePowerShellString(GATEWAY_PID_FILE)}'`,
+                    `$launcher = '${escapePowerShellString(GATEWAY_LAUNCHER_FILE)}'`,
                     `$logPath = Join-Path $env:TEMP 'myassis-gateway-update.log'`,
                     `$logDir = Split-Path -Parent $logPath`,
                     `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 }`,
+                    `  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)\" }`,
+                    `    for ($w = 0; $w -lt 30; $w++) {`,
+                    `      $p = Get-Process -Id $pidInt -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 }`,
+                    `  Write-UpdateLog 'starting gateway via launcher.ps1'`,
+                    `  Start-Process -FilePath 'powershell.exe' -ArgumentList @('-NoProfile','-ExecutionPolicy','Bypass','-WindowStyle','Hidden','-File',$launcher) -WindowStyle Hidden`,
+                    `}`,
                     `try {`,
                     `  Write-UpdateLog 'update script started'`,
                     `  Start-Sleep -Seconds 5`,
-                    `  Write-UpdateLog 'stopping service by nssm'`,
-                    `  & $nssm stop $serviceName | Out-Null`,
-                    `  Start-Sleep -Seconds 2`,
+                    `  Stop-GatewayProcess`,
+                    `  Start-Sleep -Seconds 1`,
                     `  Write-UpdateLog 'waiting executable unlock'`,
                     `  $moved = $false`,
                     `  for ($i = 0; $i -lt 60; $i++) {`,
@@ -544,19 +562,18 @@ async function updateService() {
                     `  Write-UpdateLog 'moving new executable'`,
                     `  Move-Item $tmpExe $currentExe -Force`,
                     `  Start-Sleep -Seconds 1`,
-                    `  Write-UpdateLog 'starting service by nssm'`,
-                    `  & $nssm start $serviceName | Out-Null`,
+                    `  Start-GatewayProcess`,
                     `  Remove-Item $backupExe -Force -ErrorAction SilentlyContinue`,
                     `  Remove-Item $tmpExe -Force -ErrorAction SilentlyContinue`,
                     `  Write-UpdateLog 'update script finished'`,
                     `} catch {`,
                     `  Write-UpdateLog \"update script failed: $($_.Exception.Message)\"`,
-                    `  try { & $nssm start $serviceName | Out-Null } catch { Write-UpdateLog \"restart service failed: $($_.Exception.Message)\" }`,
+                    `  try { Start-GatewayProcess } catch { Write-UpdateLog \"restart gateway failed: $($_.Exception.Message)\" }`,
                     `  throw`,
                     `}`,
                 ].join('\r\n');
                 fs_1.default.writeFileSync(updateScriptPath, `\uFEFF${psScript}`, 'utf8');
-                await execAsync(`cmd.exe /c start \"\" powershell.exe -NoProfile -ExecutionPolicy Bypass -File \"${updateScriptPath}\"`, {
+                await execAsync(`cmd.exe /c start \"\" powershell.exe -NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File \"${updateScriptPath}\"`, {
                     timeout: 10000,
                     windowsHide: true
                 });

package/dist/services/tools/exec.js

@@ -10,7 +10,6 @@ const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
 const shared_1 = require("@myassis/shared");
 const crypto_1 = __importDefault(require("crypto"));
-const ServiceManager_js_1 = require("../ServiceManager.js");
 const logger = (0, shared_1.getLogger)('exec');
 const execAsync = (0, util_1.promisify)(child_process_1.exec);
 // 待批准的命令缓存：token -> { command, cwd, timeout, sessionId, expiresAt }
@@ -176,23 +175,6 @@ exports.execTool = {
                     return;
                 }
             }
-            // Windows 下通过 Helper 以登录用户身份执行
-            if (process.platform === 'win32') {
-                try {
-                    const result = await (0, ServiceManager_js_1.execAsUser)(command, cwd);
-                    resolve({
-                        success: result.exitCode === 0,
-                        output: result.stdout.substring(0, 100000),
-                        errorMessage: result.stderr.substring(0, 100000),
-                        exitCode: result.exitCode,
-                    });
-                    return;
-                }
-                catch (e) {
-                    resolve({ success: false, errorMessage: e?.message || String(e) });
-                    return;
-                }
-            }
             const options = {
                 cwd,
                 timeout,

package/package.json

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