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