@bolloon/bolloon-agent 0.1.26 → 0.1.27

package/dist/index.js

@@ -1426,9 +1426,9 @@ async function main() {
         const port = parseInt(process.env.PORT || '54188');
         const { createWebServer, openBrowser } = await import('./web/server.js');
         s.info(`启动 Web 服务端口 ${port}...`);
-        await createWebServer(port);
-        s.success(`浏览器已打开 → http://localhost:${port}`);
-        openBrowser(`http://localhost:${port}`);
+        const { port: actualPort } = await createWebServer(port);
+        s.success(`浏览器已打开 → http://localhost:${actualPort}`);
+        openBrowser(`http://localhost:${actualPort}`);
     }
     else if (isNonInteractive) {
         console.log = originalLog;

package/dist/web/server.js

@@ -2811,19 +2811,52 @@ export async function createWebServer(port = 3000, options = {}) {
     }
     // 安装自改总线 -> SSE 桥
     void installSelfImproveHook();
-    return new Promise((resolve) => {
-        server.listen(port, () => {
-            console.log(`Web 服务器启动完成: http://localhost:${port}`);
-            console.log('服务器已监听');
-            // 安装 chat bus -> SSE 桥 (供前端 inbox UI 实时刷新)
-            void installChatBusHook();
-            setInterval(() => {
-                for (const client of sseClients) {
-                    client.res.write(': ping\n\n');
+    // 端口冲突时自动找下一个可用端口（最多 10 次），避免 EADDRINUSE 直接崩溃
+    return new Promise((resolve, reject) => {
+        const maxAttempts = 10;
+        const startPort = port;
+        let currentPort = startPort;
+        let attempt = 0;
+        // 局部可变 server 引用 — listen 失败后必须重新 createServer 再 listen
+        let currentServer = server;
+        const tryListen = () => {
+            currentServer.removeAllListeners('error');
+            currentServer.once('error', onError);
+            currentServer.listen(currentPort, () => {
+                if (currentPort !== startPort) {
+                    console.warn(`⚠ 端口 ${startPort} 被占用，已自动切换到 ${currentPort}`);
                 }
-            }, 30000);
-            resolve({ app, server });
-        });
+                console.log(`Web 服务器启动完成: http://localhost:${currentPort}`);
+                console.log('服务器已监听');
+                // 安装 chat bus -> SSE 桥 (供前端 inbox UI 实时刷新)
+                void installChatBusHook();
+                setInterval(() => {
+                    for (const client of sseClients) {
+                        client.res.write(': ping\n\n');
+                    }
+                }, 30000);
+                resolve({ app, server: currentServer, port: currentPort });
+            });
+        };
+        const onError = (err) => {
+            if (err && err.code === 'EADDRINUSE' && attempt < maxAttempts - 1) {
+                attempt += 1;
+                const nextPort = currentPort + 1;
+                console.log(`⚠ 端口 ${currentPort} 被占用，尝试 ${nextPort}...`);
+                try {
+                    currentServer.close();
+                }
+                catch { /* ignore */ }
+                // 重新创建 server 实例（listen 失败后原 server 无法再次 listen）
+                currentServer = createServer(app);
+                currentPort = nextPort;
+                tryListen();
+            }
+            else {
+                reject(err);
+            }
+        };
+        tryListen();
     });
 }
 function broadcast(data, channelId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bolloon/bolloon-agent",
-  "version": "0.1.26",
+  "version": "0.1.27",
   "type": "module",
   "description": "P2P AI Document Agent - 全局安装后执行 `bolloon` 启动产品",
   "main": "dist/cli.js",

package/src/index.ts

@@ -1629,10 +1629,10 @@ async function main() {
     const { createWebServer, openBrowser } = await import('./web/server.js');
 
     s.info(`启动 Web 服务端口 ${port}...`);
-    await createWebServer(port);
+    const { port: actualPort } = await createWebServer(port);
 
-    s.success(`浏览器已打开 → http://localhost:${port}`);
-    openBrowser(`http://localhost:${port}`);
+    s.success(`浏览器已打开 → http://localhost:${actualPort}`);
+    openBrowser(`http://localhost:${actualPort}`);
   } else if (isNonInteractive) {
     console.log = originalLog;
     console.info = originalInfo;

package/src/web/server.ts

@@ -3151,19 +3151,51 @@ app.get('/channels', async (_req, res) => {
   // 安装自改总线 -> SSE 桥
   void installSelfImproveHook();
 
-  return new Promise<{ app: express.Express; server: typeof server }>((resolve) => {
-    server.listen(port, () => {
-      console.log(`Web 服务器启动完成: http://localhost:${port}`);
-      console.log('服务器已监听');
-      // 安装 chat bus -> SSE 桥 (供前端 inbox UI 实时刷新)
-      void installChatBusHook();
-      setInterval(() => {
-        for (const client of sseClients) {
-          client.res.write(': ping\n\n');
+  // 端口冲突时自动找下一个可用端口（最多 10 次），避免 EADDRINUSE 直接崩溃
+  return new Promise<{ app: express.Express; server: ReturnType<typeof createServer>; port: number }>((resolve, reject) => {
+    const maxAttempts = 10;
+    const startPort = port;
+    let currentPort = startPort;
+    let attempt = 0;
+    // 局部可变 server 引用 — listen 失败后必须重新 createServer 再 listen
+    let currentServer: ReturnType<typeof createServer> = server;
+
+    const tryListen = () => {
+      currentServer.removeAllListeners('error');
+      currentServer.once('error', onError);
+      currentServer.listen(currentPort, () => {
+        if (currentPort !== startPort) {
+          console.warn(`⚠ 端口 ${startPort} 被占用，已自动切换到 ${currentPort}`);
         }
-      }, 30000);
-      resolve({ app, server });
-    });
+        console.log(`Web 服务器启动完成: http://localhost:${currentPort}`);
+        console.log('服务器已监听');
+        // 安装 chat bus -> SSE 桥 (供前端 inbox UI 实时刷新)
+        void installChatBusHook();
+        setInterval(() => {
+          for (const client of sseClients) {
+            client.res.write(': ping\n\n');
+          }
+        }, 30000);
+        resolve({ app, server: currentServer, port: currentPort });
+      });
+    };
+
+    const onError = (err: NodeJS.ErrnoException) => {
+      if (err && err.code === 'EADDRINUSE' && attempt < maxAttempts - 1) {
+        attempt += 1;
+        const nextPort = currentPort + 1;
+        console.log(`⚠ 端口 ${currentPort} 被占用，尝试 ${nextPort}...`);
+        try { currentServer.close(); } catch { /* ignore */ }
+        // 重新创建 server 实例（listen 失败后原 server 无法再次 listen）
+        currentServer = createServer(app);
+        currentPort = nextPort;
+        tryListen();
+      } else {
+        reject(err);
+      }
+    };
+
+    tryListen();
   });
 }