@myassis/gateway 1.0.27 → 1.0.29

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/llm/LLMClient.js

@@ -1,12 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalModelSelector = exports.parseAruments = exports.LLMClient = void 0;
 const index_js_1 = require("../../stores/index.js");
 const shared_1 = require("@myassis/shared");
-const promises_1 = __importDefault(require("fs/promises"));
 const logger = (0, shared_1.getLogger)('LLMClient');
 /**
  * LLM 调用器类
@@ -18,7 +14,7 @@ class LLMClient {
     tools;
     preferredModelId;
     signal;
-    timeoutMs = 60000;
+    timeoutMs = 120000;
     constructor(models, messages, signal, tools) {
         this.models = models;
         this.messages = messages;
@@ -80,7 +76,12 @@ class LLMClient {
                 }
                 selector.markTried(model.id);
                 clearTimeout(timer);
-                lastError = error;
+                if (controller.signal.aborted) {
+                    lastError = new Error('Request timed out');
+                }
+                else {
+                    lastError = error;
+                }
             }
         }
         throw lastError || new Error('All models are unavailable or has been aborted');
@@ -401,8 +402,6 @@ class LLMClient {
             const tokens = JSON.stringify(body).length;
             logger.debug('tokens', tokens);
             if (tokens > 200000 && !existAttachments) {
-                logger.warn('message is too large and has writen to the file debug.json');
-                await promises_1.default.writeFile('debug.json', JSON.stringify(body.messages), 'utf-8');
                 throw Error('exceed max message tokens');
             }
             return {

package/dist/services/memory/MemoryManager.js

@@ -41,16 +41,13 @@ class MemoryManager {
         let messages = this.session.getMessages();
         if (this.childAgent) {
             messages.splice(-1);
-            logger.debug('history', messages);
         }
         // 2. 消息少于摘要配置的阈值数，直接返回
-        logger.debug('message length:', messages.length);
         if (messages.length < this.config.summaryThreshold) {
             return messages;
         }
         // 3. 检查是否有摘要
         const hasSummary = this.session.lastMessageSummary;
-        logger.debug('hasSummary', hasSummary);
         if (!hasSummary) {
             // 4A. 首次摘要生成
             const summary = await this.generateSummaryAsync(messages.slice(0, -index_js_2.appConfig.messageKeep), null);
@@ -65,7 +62,6 @@ class MemoryManager {
         else {
             // 4B. 增量摘要更新
             const newMessages = messages.filter((m) => m.createdAt > this.session.lastMessageSummaryAt);
-            logger.debug('new messages length:', newMessages.length);
             if (newMessages.length < this.config.summaryThreshold) {
                 // 新消息少于阈值条：返回摘要 + 从摘要时刻起的所有消息
                 const fromSummary = messages.filter((m) => m.createdAt >= this.session.lastMessageSummaryAt);

package/dist/services/tools/exec.js

@@ -120,7 +120,7 @@ exports.execTool = {
             }
             catch (e) {
                 const error = e;
-                resolve({ success: false, errorMessage: error.stdout.toLocaleString().substring(0, 100) + error.stderr.toLocaleString() + error.message });
+                resolve({ success: false, errorMessage: (error?.stdout?.toLocaleString()?.substring(0, 100) ?? '') + (error?.stderr?.toLocaleString() ?? '') + (error?.message ?? '') });
                 return;
             }
         });

package/package.json

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