@myassis/gateway 1.0.26 → 1.0.28

package/dist/main.js

@@ -209,38 +209,50 @@ else {
     app.use(errorHandler_js_1.errorHandler);
     // 创建 HTTP Server（而非 app.listen，以便挂载 WebSocket）
     const server = http_1.default.createServer(app);
-    // 初始化 WebSocket 服务
-    WebSocketService_js_1.webSocketService.initialize(server);
-    // 启动任务调度器
-    TaskSchedulerService_js_1.taskSchedulerService.start();
     // 端口自动顺延：被占用时自动尝试下一个端口
+    const configuredPort = index_js_1.appConfig.port;
+    let schedulerStarted = false;
+    let webSocketInitialized = false;
     const startServer = (port) => {
-        server.listen(port, () => {
-            // 动态更新 appConfig.port（供 WebSocket 广播实际端口）
-            index_js_1.appConfig.port = port;
-            if (port !== index_js_1.appConfig.port) {
-                logger.info(`Port ${index_js_1.appConfig.port} is in use, fallback to port ${port}`);
-            }
-            logger.info(`我的助手 Gateway Service running on port ${port}`);
-        }).on('error', (err) => {
+        const handleListenError = (err) => {
+            server.removeListener('error', handleListenError);
             if (err.code === 'EADDRINUSE') {
                 const nextPort = port + 1;
-                if (nextPort <= (index_js_1.appConfig.port + 10)) {
+                if (nextPort <= (configuredPort + 10)) {
                     logger.warn(`Port ${port} is in use, trying ${nextPort}...`);
                     startServer(nextPort);
                 }
                 else {
-                    logger.error(`All ports from ${index_js_1.appConfig.port} to ${index_js_1.appConfig.port + 10} are in use`);
+                    logger.error(`All ports from ${configuredPort} to ${configuredPort + 10} are in use`);
                     process.exit(1);
                 }
+                return;
             }
-            else {
-                logger.error(`Server error: ${err.message}`);
-                process.exit(1);
+            logger.error(`Server error: ${err.message}`);
+            process.exit(1);
+        };
+        server.once('error', handleListenError);
+        server.listen(port, () => {
+            server.removeListener('error', handleListenError);
+            if (port !== configuredPort) {
+                logger.info(`Port ${configuredPort} is in use, fallback to port ${port}`);
+            }
+            // 动态更新 appConfig.port（供 WebSocket 广播实际端口）
+            index_js_1.appConfig.port = port;
+            // HTTP Server 监听成功后再初始化 WebSocket，避免端口冲突时 WebSocketServer 误报 EADDRINUSE
+            if (!webSocketInitialized) {
+                WebSocketService_js_1.webSocketService.initialize(server);
+                webSocketInitialized = true;
+            }
+            // HTTP Server 启动成功后再启动任务调度器，避免端口占用时重复启动后台任务
+            if (!schedulerStarted) {
+                TaskSchedulerService_js_1.taskSchedulerService.start();
+                schedulerStarted = true;
             }
+            logger.info(`我的助手 Gateway Service running on port ${port}`);
         });
     };
-    startServer(index_js_1.appConfig.port);
+    startServer(configuredPort);
     // 优雅关闭
     process.on('SIGTERM', () => {
         logger.info('收到 SIGTERM，正在关闭...');

package/dist/services/ServiceManager.js

@@ -189,21 +189,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 });
@@ -381,7 +381,7 @@ async function updateService() {
         if (isPackagedExe()) {
             // pkg 环境：从 COS 下载对应平台的 exe
             // ❗ 关键：不能在这里 stopService，进程本身即为服务进程，停止后后续代码不执行
-            // 方案：下载到临时文件后，spawn 一个独立延迟替换进程，本进程直接返回
+            // 方案：下载到临时文件后，派发一个独立延迟替换脚本，本进程直接返回
             const platform = process.platform === 'win32' ? 'win' : 'linux';
             const isWin = platform === 'win';
             const downloadUrl = isWin
@@ -404,44 +404,123 @@ async function updateService() {
                 response.data.on('error', reject);
             });
             console.log('✅ 下载完成');
-            // 生成延迟替换脚本，spawn 为独立进程（当前进程 return 后不影响它）
+            // 生成延迟替换脚本，Windows 通过 nssm 管理服务并使用 execAsync 派发脚本
             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 = [
-                    `Start-Sleep -Seconds 5`,
-                    `Stop-Service -Name '${exports.SERVICE_NAME}' -ErrorAction SilentlyContinue`,
-                    `Start-Sleep -Seconds 2`,
-                    `while (Test-Path '${currentExe}') { try { Move-Item '${currentExe}' '${currentExe}.bak' -Force; break } catch { Start-Sleep -Seconds 1 } }`,
-                    `Move-Item '${tmpExe}' '${currentExe}' -Force`,
-                    `Start-Sleep -Seconds 1`,
-                    `Start-Service -Name '${exports.SERVICE_NAME}'`,
-                    `Remove-Item '${currentExe}.bak' -Force -ErrorAction SilentlyContinue`,
-                    `Remove-Item '${tmpExe}' -Force -ErrorAction SilentlyContinue`,
-                ].join('; ');
-                const args = ['-NoProfile', '-NonInteractive', '-Command', psScript];
-                const child = (0, child_process_1.spawn)('powershell.exe', args, {
-                    detached: true,
-                    stdio: 'ignore',
-                    windowsHide: true,
+                    `$ErrorActionPreference = 'Stop'`,
+                    `$nssm = '${escapePowerShellString(nssmPath)}'`,
+                    `$serviceName = '${escapePowerShellString(exports.SERVICE_NAME)}'`,
+                    `$currentExe = '${escapePowerShellString(currentExe)}'`,
+                    `$tmpExe = '${escapePowerShellString(tmpExe)}'`,
+                    `$backupExe = '${escapePowerShellString(`${currentExe}.bak`)}'`,
+                    `$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\" }`,
+                    `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`,
+                    `  Write-UpdateLog 'waiting executable unlock'`,
+                    `  $moved = $false`,
+                    `  for ($i = 0; $i -lt 60; $i++) {`,
+                    `    try {`,
+                    `      if (Test-Path $backupExe) { Remove-Item $backupExe -Force -ErrorAction SilentlyContinue }`,
+                    `      Move-Item $currentExe $backupExe -Force`,
+                    `      $moved = $true`,
+                    `      break`,
+                    `    } catch {`,
+                    `      Start-Sleep -Seconds 1`,
+                    `    }`,
+                    `  }`,
+                    `  if (-not $moved) { throw '等待旧版本可执行文件解锁超时' }`,
+                    `  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`,
+                    `  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)\" }`,
+                    `  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}\"`, {
+                    timeout: 10000,
+                    windowsHide: true
                 });
-                child.unref();
             }
             else {
-                // Linux: bash 延迟替换
+                // Linux: 生成独立更新脚本，优先通过 systemd-run 派发，避免当前服务停止时更新脚本被一并终止
+                const escapeShellString = (value) => `'${value.replace(/'/g, `'\\''`)}'`;
+                const updateScriptPath = path_1.default.join(os_1.default.tmpdir(), 'myassis-gateway-update.sh');
+                const updateLogPath = path_1.default.join(os_1.default.tmpdir(), 'myassis-gateway-update.log');
+                const backupExe = `${currentExe}.bak`;
                 const bashScript = [
+                    '#!/usr/bin/env bash',
+                    'set -euo pipefail',
+                    `SERVICE_NAME=${escapeShellString(exports.SERVICE_NAME)}`,
+                    `CURRENT_EXE=${escapeShellString(currentExe)}`,
+                    `TMP_EXE=${escapeShellString(tmpExe)}`,
+                    `BACKUP_EXE=${escapeShellString(backupExe)}`,
+                    `LOG_PATH=${escapeShellString(updateLogPath)}`,
+                    'mkdir -p "$(dirname "$LOG_PATH")"',
+                    'log() { echo "$(date \'+%Y-%m-%d %H:%M:%S\') $*" >> "$LOG_PATH"; }',
+                    'log "update script started"',
                     'sleep 5',
-                    `systemctl stop ${exports.SERVICE_NAME} 2>/dev/null || true`,
+                    'log "stopping service by systemctl"',
+                    'systemctl stop "$SERVICE_NAME" >> "$LOG_PATH" 2>&1 || true',
                     'sleep 2',
-                    `mv -f '${currentExe}' '${currentExe}.bak' 2>/dev/null; true`,
-                    `mv -f '${tmpExe}' '${currentExe}'`,
+                    'log "waiting executable unlock"',
+                    'moved=0',
+                    'for i in $(seq 1 60); do',
+                    '  if [ -f "$BACKUP_EXE" ]; then rm -f "$BACKUP_EXE" >> "$LOG_PATH" 2>&1 || true; fi',
+                    '  if mv -f "$CURRENT_EXE" "$BACKUP_EXE" >> "$LOG_PATH" 2>&1; then',
+                    '    moved=1',
+                    '    break',
+                    '  fi',
+                    '  sleep 1',
+                    'done',
+                    'if [ "$moved" != "1" ]; then',
+                    '  log "waiting old executable unlock timeout"',
+                    '  systemctl start "$SERVICE_NAME" >> "$LOG_PATH" 2>&1 || true',
+                    '  exit 1',
+                    'fi',
+                    'log "moving new executable"',
+                    'mv -f "$TMP_EXE" "$CURRENT_EXE" >> "$LOG_PATH" 2>&1',
+                    'chmod +x "$CURRENT_EXE" >> "$LOG_PATH" 2>&1 || true',
                     'sleep 1',
-                    `systemctl start ${exports.SERVICE_NAME} 2>/dev/null || true`,
-                    `rm -f '${currentExe}.bak' '${tmpExe}'`,
-                ].join('; ');
-                const child = (0, child_process_1.spawn)('bash', ['-c', bashScript], {
-                    detached: true,
-                    stdio: 'ignore',
-                });
-                child.unref();
+                    'log "starting service by systemctl"',
+                    'systemctl start "$SERVICE_NAME" >> "$LOG_PATH" 2>&1 || true',
+                    'rm -f "$BACKUP_EXE" "$TMP_EXE" >> "$LOG_PATH" 2>&1 || true',
+                    'log "update script finished"',
+                ].join('\n');
+                fs_1.default.writeFileSync(updateScriptPath, bashScript, 'utf8');
+                fs_1.default.chmodSync(updateScriptPath, 0o755);
+                const escapedUpdateScriptPath = escapeShellString(updateScriptPath);
+                try {
+                    await execAsync(`systemd-run --unit=myassis-gateway-update --description="Myassis Gateway Update" /bin/bash ${escapedUpdateScriptPath}`, {
+                        timeout: 10000,
+                    });
+                }
+                catch (err) {
+                    logger.warn(`systemd-run 启动更新脚本失败，回退到 nohup setsid: ${err.message}`);
+                    await execAsync(`nohup setsid /bin/bash ${escapedUpdateScriptPath} >/dev/null 2>&1 < /dev/null &`, {
+                        timeout: 10000,
+                    });
+                }
             }
             console.log('✅ 后台替换进程已启动，服务将在几秒后自动重启');
             return { success: true, message: `更新成功: ${check.currentVersion} → ${check.latestVersion}，服务正在后台替换...` };

package/dist/services/session/Session.js

@@ -501,6 +501,9 @@ class Session {
             }
         };
         const toolCalls = [];
+        // 获取本地工具定义
+        const tools = (0, index_js_1.getToolDefinitions)();
+        const models = (await dataService_js_1.modelsService.list(token)).data.map(x => (0, models_js_1.toModel)(x));
         // 递归处理函数（支持多轮工具调用）
         const processModelResponse = async () => {
             if (!this.abortController || !this.abortController.signal || this.abortController.signal.aborted) {
@@ -547,9 +550,6 @@ class Session {
                     }
                 }
             }
-            // 获取本地工具定义
-            const tools = (0, index_js_1.getToolDefinitions)();
-            const models = (await dataService_js_1.modelsService.list(token)).data.map(x => (0, models_js_1.toModel)(x));
             // 使用 LLMClient 进行流式调用
             if (!this.abortController || !this.abortController.signal || this.abortController.signal.aborted) {
                 throw Error('aborted');

package/package.json

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