@baipiaodajun/mcbots 1.2.2 → 1.2.4

package/README.md

@@ -62,6 +62,7 @@ docker run -d \
 - 新版本引入了 **热更新功能：`SERVER_JSON`**  
 - 目前该功能处于 **实验状态**，可能会导致一些 **意料之外的问题**  
 - 如果需要稳定使用，推荐继续使用 **1.1 版本**
+-  **1.2.4**  优化机器人断开逻辑，避免幽灵机器人出现。
 
 ---
 

package/package.json

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

package/server.js

@@ -354,9 +354,23 @@ class MinecraftBotManager {
       console.log(`[${this.host}:${this.port}] 已达到最大机器人限制: ${this.maxBots}`);
       return null;
     }
-    if(!botName){
-      botName = this.generateBotName();
+
+    if (!botName) {
+      if (this.pendingReconnect.size > 0) {
+        botName = this.pendingReconnect.keys().next().value;
+        this.pendingReconnect.delete(botName);  // 用完就移除，避免重复分配
+        debugPrint(`[${this.host}:${this.port}] 优先重用待重连名字: ${botName} (剩余待重连: ${this.pendingReconnect.size})`);
+      } else {
+        botName = this.generateBotName();
+        debugPrint(`[${this.host}:${this.port}] 无待重连名字，生成新名字: ${botName}`);
+      }
+    } else {
+      if (this.pendingReconnect.has(botName)) {
+        this.pendingReconnect.delete(botName);
+        debugPrint(`[${this.host}:${this.port}] 使用指定的重连名字: ${botName} (已从待重连名单移除)`);
+      }
     }
+
     try {
       console.log(`[${this.host}:${this.port}] 创建机器人: ${botName}`);
         const bot = mineflayer.createBot({
@@ -387,6 +401,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) {
@@ -409,25 +429,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}`));
   }
 
   // 设置机器人行为
@@ -460,12 +464,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(() => {