@baipiaodajun/mcbots 1.0.7 → 1.0.9

package/README.md

@@ -54,7 +54,7 @@ docker run -d \
   --name mcbot \
   -e SERVERS_JSON='[{"host":"mc-yy.io","port":25565,"minBots":1,"maxBots":3,"version":"1.20.1"},{"host":"mc-xx.io","port":25565,"minBots":1,"maxBots":3,"version":"1.20.1"}]' \
   -p 3000:3000 \
-  mingli2038/macbot:latest
+  mingli2038/mcbot:latest
 ```
 ## 来源
 这个东西不是我的原创，思路来自Tweek白嫖群的[这种事可以花点钱]用户给的镜像[ghcr.io/oprmg/mcbot:latest](https://ghcr.io/oprmg/mcbot:latest)，我通过AI重构其实现并加入自己的想法从而重新发布出来。

package/package.json

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

package/server.js

@@ -117,6 +117,8 @@ class MinecraftBotManager {
     this.timeout= null;
     this.reachable=false;
     this.lastReachable = null;
+    this.resetTimer=null;
+    this.notice=true;
     // 机器人名称池
     this.botNames = Array.from({ length: 20 }, () => generateUsername());
     
@@ -151,6 +153,7 @@ class MinecraftBotManager {
         console.log(`[${this.host}:${this.port}] MC服务器恢复可达`);
       }
       this.lastReachable = this.reachable; 
+      this.notice=true;
     }
   }
   // 创建Minecraft机器人
@@ -224,21 +227,17 @@ class MinecraftBotManager {
 
     bot.on('error', (error) => {
       console.log(`[${this.host}:${this.port}] 机器人 ${botName} 错误:`, error.message);
-      if (this.activeBots.has(botName) && this.failedAttempts <= SERVER_CONFIG.maxFailedAttempts) {
+      // if (this.activeBots.has(botName) && this.failedAttempts <= SERVER_CONFIG.maxFailedAttempts) {
         this.handleBotDisconnect(botName);
-      } else {
-        this.handleBotFailure(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}`);
-      if (this.failedAttempts < SERVER_CONFIG.maxFailedAttempts) {
-        this.handleBotDisconnect(botName);
-      } else {
-        this.handleBotFailure(botName);
-      }
+      this.handleBotDisconnect(botName);
     });
 
     bot.on('kicked', (reason) => {
@@ -308,33 +307,28 @@ class MinecraftBotManager {
       console.log(`[${this.host}:${this.port}] 失败次数过多，${SERVER_CONFIG.resetTimeout / 1000}秒后再次尝试`);
       setTimeout(() => {
         this.failedAttempts = 0;
-        if(botName){
-          this.reconnect(botName);
-        }
-        else{
-          this.maintainBots();
-        }
+        this.reconnect(botName);
       }, SERVER_CONFIG.resetTimeout);
       return;
     }
-
     setTimeout(() => {
-      this.maintainBots();
+      this.reconnect(botName);
     }, BOT_CONFIG.reconnectDelay);
   }
 
   // 维护机器人数目 - 增强版本
-  maintainBots(botName) {
+  maintainBots() {
     const neededBots = this.minBots - this.currentBots;
     
     // console.log(`[${this.host}:${this.port}] 当前机器人: ${this.currentBots}, 需要: ${neededBots}, 失败次数: ${this.failedAttempts}`);
-    
     if (neededBots > 0 && this.failedAttempts < SERVER_CONFIG.maxFailedAttempts) {
-      console.log(`[${this.host}:${this.port}] 需要启动 ${neededBots} 个机器人`);
-      
+      if (this.notice) {
+        console.log(`[${this.host}:${this.port}] 需要启动 ${neededBots} 个机器人`);
+        this.notice=false;
+      }
       for (let i = 0; i < neededBots; i++) {
         setTimeout(() => {
-          this.createBot(botName);
+          this.createBot();
         }, i * 8000); // 每隔8秒启动一个
       }
     } 
@@ -351,6 +345,16 @@ class MinecraftBotManager {
           this.createBot(botName);
         }, 5000); 
     } else{
+      // 如果还没有设置过 resetTimer，就设置一次
+      if (!this.resetTimer) {
+        this.resetTimer = setTimeout(() => {
+          this.failedAttempts = 0;
+          this.resetTimer = null; // 清理标记，允许下次再设置
+          console.log(
+            `[${this.host}:${this.port}] 失败次数已重置，可以重新尝试创建机器人`
+          );
+        }, SERVER_CONFIG.resetTimeout);
+      }
       console.log(`[${this.host}:${this.port}] 由于失败次数过多，暂停创建新机器人`);
     }
     this.updateStatus();