@myassis/gateway 1.0.42 → 1.0.44

package/dist/services/ServiceManager.js

@@ -56,13 +56,9 @@ function getNssmPath() {
 }
 // ─── Windows 实现 ───────────────────────────────────────────
 async function queryServiceWindows() {
-    try {
-        const { stdout } = await execAsync(`sc.exe query ${exports.SERVICE_NAME}`, { timeout: 5000 });
-        return { installed: true, running: stdout.includes('RUNNING') };
-    }
-    catch {
-        return { installed: false, running: false };
-    }
+    const inRunKey = isRegisteredInRunKey();
+    const running = isGatewayRunning();
+    return { installed: inRunKey, running };
 }
 // ─── 用户级进程管理 ─────────────────────────────────────────
 /**
@@ -137,18 +133,11 @@ function writeGatewayLauncherScript(exePath, scriptPath, workDir) {
         "$exe = '" + exePath.replace(/\\/g, '\\\\') + "'",
         "$workDir = '" + workDir.replace(/\\/g, '\\\\') + "'",
         "$pidFile = '" + GATEWAY_PID_FILE.replace(/\\/g, '\\\\') + "'",
-        "$port = 19090",
-        "$svcPort = 19091",
-        "",
-        "# 防止重复启动（检查端口）",
-        "$listener = [System.Net.Sockets.TcpListener]::Start($port)",
-        "$listener.Stop()",
         "",
-        "# 启动 Gateway 进程（后台、无窗口）",
+        "# 启动 Gateway（使用 CLI start 命令，监听默认端口 3001）",
         "$psi = New-Object System.Diagnostics.ProcessStartInfo",
         "$psi.FileName = $exe",
         "$psi.WorkingDirectory = $workDir",
-        "$psi.Arguments = '--gateway --port ' + $port + ' --service-port ' + $svcPort",
         "$psi.UseShellExecute = $false",
         "$psi.RedirectStandardOutput = $true",
         "$psi.RedirectStandardError = $true",
@@ -299,21 +288,21 @@ async function installLinux() {
         if (installed)
             await stopService();
         const execStart = isPkg ? exe : `${exe} ${script}`;
-        const unitContent = `[Unit]
-Description=${exports.SERVICE_DISPLAY_NAME}
-After=network.target
-
-[Service]
-Type=simple
-User=${process.env.USER || 'root'}
-WorkingDirectory=${workDir}
-ExecStart=${execStart}
-Restart=always
-RestartSec=5
-Environment=NODE_ENV=production
-
-[Install]
-WantedBy=multi-user.target
+        const unitContent = `[Unit]
+Description=${exports.SERVICE_DISPLAY_NAME}
+After=network.target
+
+[Service]
+Type=simple
+User=${process.env.USER || 'root'}
+WorkingDirectory=${workDir}
+ExecStart=${execStart}
+Restart=always
+RestartSec=5
+Environment=NODE_ENV=production
+
+[Install]
+WantedBy=multi-user.target
 `;
         await fs_1.default.promises.writeFile('/tmp/myassis-gateway.service', unitContent, 'utf8');
         await execAsync('cp /tmp/myassis-gateway.service /etc/systemd/system/myassis-gateway.service', { timeout: 10000 });
@@ -514,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++) {`,
@@ -555,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/package.json

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