@baipiaodajun/mcbots 1.2.3 → 1.2.5

package/README.md

@@ -62,7 +62,8 @@ docker run -d \
 - 新版本引入了 **热更新功能：`SERVER_JSON`**  
 - 目前该功能处于 **实验状态**，可能会导致一些 **意料之外的问题**  
 - 如果需要稳定使用，推荐继续使用 **1.1 版本**
-
+-  **1.2.4**  优化机器人断开逻辑，避免幽灵机器人出现。
+-  **1.2.5**  根据群友建议加入服务备注，以便能够区分是哪一家服务器，因为一些服务器没有域名。
 ---
 
 ### 页面更新

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@baipiaodajun/mcbots",
-    "version": "1.2.3",
+    "version": "1.2.5",
     "description": "Minecraft bot and status dashboard for multi-server management",
     "main": "server.js",
     "scripts": {

package/server.js

@@ -42,6 +42,7 @@ if (fs.existsSync(CONFIG_FILE)) {
         SERVERS.length = 0;
         SERVERS.push(...fileConfig);
         console.log(`从 ${CONFIG_FILE} 加载服务器配置成功，数量: ${SERVERS.length} 项`);
+        debugPrint(`配置为：${JSON.stringify(SERVERS, null, 2)}`);
         loaded = true;
       } else {
         console.warn('配置文件内容不是数组，已忽略');
@@ -206,11 +207,12 @@ class HotUpdateAuth {
 const hotUpdateAuth =new HotUpdateAuth();
 // Minecraft机器人管理器
 class MinecraftBotManager {
-  constructor(host, port, minBots, maxBots, version) {
+  constructor(host, port, minBots, maxBots, version,note) {
     this.host = host;
     this.port = port;
     this.minBots = minBots;
     this.maxBots = maxBots;
+    this.note=note;
     this.version = version || "1.20.1";
     this.currentBots = 0;
     this.activeBots = new Map();
@@ -233,6 +235,7 @@ class MinecraftBotManager {
       port: port,
       minBots: minBots,
       maxBots: maxBots,
+      note:note,
       currentBots: 0,
       activeBots: [],
       lastUpdate: Date.now(),
@@ -401,6 +404,12 @@ class MinecraftBotManager {
 
   // 设置机器人事件
   setupBotEvents(bot, botName) {
+    const triggerDisconnect = (reason) => {
+      // 检查机器人是否还在活跃列表中，避免重复调用
+      if (this.activeBots.has(botName)) {
+        this.handleBotDisconnect(botName);
+      }
+    };
     bot.on('login', () => {
       console.log(`[${this.host}:${this.port}] 机器人 ${botName} 登录成功`);
       if (this.timeout) {
@@ -423,25 +432,9 @@ class MinecraftBotManager {
       debugPrint(`[${this.host}:${this.port}] ${botName} 收到消息: ${text}`);
     });
 
-    bot.on('error', (error) => {
-      console.log(`[${this.host}:${this.port}] 机器人 ${botName} 错误:`, error.message);
-      // if (this.activeBots.has(botName) && this.failedAttempts <= SERVER_CONFIG.maxFailedAttempts) {
-        this.handleBotDisconnect(botName);
-      // } else {
-      //   this.handleBotFailure(botName);
-      // }
-    });
-
-    bot.on('end', (reason) => {
-      console.log(`[${this.host}:${this.port}] 机器人 ${botName} 断开连接:`, reason);
-      // console.log(`[${this.host}:${this.port}] ${botName}:失败次数${this.failedAttempts}`);
-      this.handleBotDisconnect(botName);
-    });
-
-    bot.on('kicked', (reason) => {
-      console.log(`[${this.host}:${this.port}] 机器人 ${botName} 被踢出:`, reason);
-      this.handleBotDisconnect(botName);
-    });
+    bot.on('error', (err) => triggerDisconnect(`错误: ${err.message}`));
+    bot.on('end', (reason) => triggerDisconnect(`断开: ${reason}`));
+    bot.on('kicked', (reason) => triggerDisconnect(`被踢: ${reason}`));
   }
 
   // 设置机器人行为
@@ -474,12 +467,34 @@ class MinecraftBotManager {
   }
 
   handleBotDisconnect(botName) {
-    if (this.activeBots.has(botName)) {
+    // 获取当前的机器人实例
+    const bot = this.activeBots.get(botName);
+  
+    if (bot) {
       debugPrint(`[${this.host}:${this.port}] 从活跃列表中移除机器人: ${botName}`);
+  
+      // --- 核心修复：物理销毁机器人对象 ---
+      try {
+        // 1. 移除所有事件监听器，防止它继续打印日志或触发回调
+        bot.removeAllListeners(); 
+        
+        // 2. 尝试优雅退出
+        if (typeof bot.quit === 'function') bot.quit();
+        
+        // 3. 强制销毁底层 socket 确保连接彻底断开
+        if (bot._client && bot._client.socket) {
+          bot._client.socket.destroy();
+        }
+      } catch (err) {
+        debugPrint(`[${this.host}:${this.port}] 销毁幽灵机器人 ${botName} 时出错: ${err.message}`);
+      }
+      // ----------------------------------
+  
       this.activeBots.delete(botName);
       this.currentBots = Math.max(0, this.currentBots - 1);
       this.updateStatus();
       this.pendingReconnect.add(botName);
+      
       debugPrint(`[${this.host}:${this.port}] 当前活跃机器人数量: ${this.currentBots}, 目标: ${this.minBots}`);
   
       setTimeout(() => {
@@ -813,14 +828,28 @@ class StatusServer {
                   .server-header {
                       display: flex;
                       justify-content: space-between;
-                      align-items: center;
                       margin-bottom: 15px;
+                      gap: 8px;
+                  }
+                  .server-note {
+                      font-size: 0.85rem;
+                      font-weight: 600;
+                      display: inline-block;
+                      padding: 6px 12px;
+                      background: #e6f0ff;
+                      color: #1e40af;
+                      border-radius: 20px;
+                      border: 1px solid #93c5fd;
+                      flex-shrink: 0;
+                      white-space: nowrap;
+                      margin-right: 8px;
                   }
-                  
                   .server-title {
                       font-size: 1.2rem;
                       font-weight: 600;
                       color: #2d3748;
+                      min-width: 0;
+                      flex: 1;
                   }
                   
                   .status-badge {
@@ -829,6 +858,7 @@ class StatusServer {
                       font-size: 0.85rem;
                       font-weight: 600;
                       text-transform: uppercase;
+                      flex-shrink: 0;
                   }
                   
                   .status-healthy {
@@ -1018,9 +1048,9 @@ class StatusServer {
                                   <div class="server-card ${server.status}">
                                       <div class="server-header">
                                           <div class="server-title">${server.host}:${server.port}</div>
+                                          ${server.note ? `<div class="server-note">${server.note}</div>` : "" }
                                           <div class="status-badge ${statusClass}">${statusText}</div>
                                       </div>
-                                      
                                       <div class="server-info">
                                           <div class="info-item">
                                               <div class="info-label">机器人数量</div>
@@ -1572,7 +1602,8 @@ async function initialize() {
       server.port,
       server.minBots,
       server.maxBots,
-      server.version
+      server.version,
+      server.note ?? ""
     )
   );
   
@@ -1627,6 +1658,14 @@ async function hotUpdateServers() {
         // 完全一致：保留，并从 newServerMap 删除（避免重复创建）
         newServerMap.delete(key);
         // 状态保持最新（可选：刷新 lastUpdate）
+        
+        //备注处理，不重建机器人，只是更新备注
+        if (manager.note !== newConfig.note) {
+          manager.note = newConfig.note;
+          const status = globalServerStatus.servers.get(key);
+          if (status) status.note = newConfig.note;
+        }
+
         const status = globalServerStatus.servers.get(key);
         if (status) status.lastUpdate = Date.now();
       } else {
@@ -1663,7 +1702,8 @@ async function hotUpdateServers() {
       config.port,
       config.minBots,
       config.maxBots,
-      config.version
+      config.version,
+      config.note
     );
     newManager.startMonitoring();
     botManagers.push(newManager);