@myassis/gateway 1.0.25 → 1.0.27

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

@@ -378,21 +378,92 @@ async function updateService() {
             return { success: true, message: `已是最新版本 ${check.currentVersion}` };
         }
         console.log(`发现新版本 ${check.latestVersion}，正在更新...`);
-        const { stdout, stderr } = await execAsync('npm install -g @myassis/gateway@latest', { timeout: 120000 });
-        if (stdout)
-            console.log(stdout);
-        if (stderr)
-            console.error(stderr);
-        console.log('✅ npm 更新完成');
-        const info = await getServiceInfo();
-        if (info.installed) {
-            console.log('正在重启服务...');
-            const r = await restartService();
-            if (!r.success) {
-                return { success: false, message: `更新成功但服务重启失败: ${r.message}` };
+        if (isPackagedExe()) {
+            // pkg 环境：从 COS 下载对应平台的 exe
+            // ❗ 关键：不能在这里 stopService，进程本身即为服务进程，停止后后续代码不执行
+            // 方案：下载到临时文件后，spawn 一个独立延迟替换进程，本进程直接返回
+            const platform = process.platform === 'win32' ? 'win' : 'linux';
+            const isWin = platform === 'win';
+            const downloadUrl = isWin
+                ? `https://myassis-1251246038.cos.ap-guangzhou.myqcloud.com/myassis-1251246038/installs/myassis-gateway-win.exe`
+                : `https://myassis-1251246038.cos.ap-guangzhou.myqcloud.com/myassis-1251246038/installs/myassis-gateway-linux`;
+            const currentExe = process.execPath;
+            const tmpExe = currentExe + '.new';
+            console.log(`正在下载 ${downloadUrl} ...`);
+            const response = await (0, axios_1.default)({
+                method: 'GET',
+                url: downloadUrl,
+                responseType: 'stream',
+                timeout: 300000,
+            });
+            const writeStream = fs_1.default.createWriteStream(tmpExe);
+            await new Promise((resolve, reject) => {
+                response.data.pipe(writeStream);
+                writeStream.on('finish', resolve);
+                writeStream.on('error', reject);
+                response.data.on('error', reject);
+            });
+            console.log('✅ 下载完成');
+            // 生成延迟替换脚本，spawn 为独立进程（当前进程 return 后不影响它）
+            if (isWin) {
+                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,
+                });
+                child.unref();
+            }
+            else {
+                // Linux: bash 延迟替换
+                const bashScript = [
+                    'sleep 5',
+                    `systemctl stop ${exports.SERVICE_NAME} 2>/dev/null || true`,
+                    'sleep 2',
+                    `mv -f '${currentExe}' '${currentExe}.bak' 2>/dev/null; true`,
+                    `mv -f '${tmpExe}' '${currentExe}'`,
+                    '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();
+            }
+            console.log('✅ 后台替换进程已启动，服务将在几秒后自动重启');
+            return { success: true, message: `更新成功: ${check.currentVersion} → ${check.latestVersion}，服务正在后台替换...` };
+        }
+        else {
+            // npm 环境
+            const { stdout, stderr } = await execAsync('npm install -g @myassis/gateway@latest', { timeout: 120000 });
+            if (stdout)
+                console.log(stdout);
+            if (stderr)
+                console.error(stderr);
+            console.log('✅ npm 更新完成');
+            const info = await getServiceInfo();
+            if (info.installed) {
+                console.log('正在重启服务...');
+                const r = await restartService();
+                if (!r.success) {
+                    return { success: false, message: `更新成功但服务重启失败: ${r.message}` };
+                }
             }
+            return { success: true, message: `更新成功: ${check.currentVersion} → ${check.latestVersion}` };
         }
-        return { success: true, message: `更新成功: ${check.currentVersion} → ${check.latestVersion}` };
     }
     catch (err) {
         return { success: false, message: `更新失败: ${err.message}` };

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.25",
+  "version": "1.0.27",
   "description": "我的助手 Gateway Service - 本地 AI 网关服务，支持认证、WebSocket 实时通信和任务调度",
   "main": "dist/index.js",
   "bin": {