Update server.js

server.js

@@ -16,7 +16,6 @@ const SHEET_URL = `https://docs.google.com/spreadsheets/d/${SHEET_ID}/export?for
 
 // Bot management
 const bots = new Map();
-const botLastReconnect = new Map();
 const serverBotMap = new Map(); // Track one bot per server
 
 class BotManager {
@@ -29,8 +28,10 @@ class BotManager {
         this.status = 'Disconnected';
         this.deathCount = 0;
         this.disconnectTime = null;
+        this.lastReconnectTime = null;
         this.isManualDisconnect = false;
         this.startTime = Date.now();
+        this.inSheet = true; // Track if bot is still in sheet
     }
 
     async connect() {
@@ -68,7 +69,9 @@ class BotManager {
 
             this.bot.on('death', () => {
                 this.deathCount++;
+                this.status = 'Dead';
                 console.log(`Bot ${this.botName} died. Total deaths: ${this.deathCount}`);
+                this.handleDisconnect();
             });
 
             this.bot.on('kicked', (reason) => {
@@ -98,13 +101,13 @@ class BotManager {
             serverBotMap.delete(serverKey);
         }
         
-        this.status = 'Disconnected';
+        if (this.status !== 'Dead') {
+            this.status = 'Disconnected';
+        }
         this.disconnectTime = Date.now();
         this.bot = null;
         
-        if (!this.isManualDisconnect) {
-            console.log(`Bot ${this.botName} disconnected from ${this.ip}:${this.port}`);
-        }
+        console.log(`Bot ${this.botName} disconnected from ${this.ip}:${this.port}`);
     }
 
     disconnect() {
@@ -141,12 +144,13 @@ class BotManager {
     }
 
     canReconnect() {
-        if (this.status === 'Connected') return false;
+        if (this.status === 'Connected' || this.status === 'Connecting...') return false;
+        if (!this.inSheet) return false;
         
-        const lastReconnect = botLastReconnect.get(this.botName) || 0;
-        const hourAgo = Date.now() - (60 * 60 * 1000);
+        if (!this.lastReconnectTime) return true;
         
-        return lastReconnect < hourAgo;
+        const hourAgo = Date.now() - (60 * 60 * 1000);
+        return this.lastReconnectTime < hourAgo;
     }
 
     async reconnect() {
@@ -154,11 +158,19 @@ class BotManager {
             return false;
         }
         
+        this.lastReconnectTime = Date.now();
         this.isManualDisconnect = false;
-        botLastReconnect.set(this.botName, Date.now());
         return await this.connect();
     }
 
+    getTimeUntilReconnect() {
+        if (!this.lastReconnectTime) return 0;
+        const timeElapsed = Date.now() - this.lastReconnectTime;
+        const hourInMs = 60 * 60 * 1000;
+        const timeRemaining = Math.max(0, hourInMs - timeElapsed);
+        return Math.ceil(timeRemaining / 1000); // Return seconds
+    }
+
     getInfo() {
         const uptime = this.status === 'Connected' ? 
             Math.floor((Date.now() - this.startTime) / 1000) : 0;
@@ -169,7 +181,9 @@ class BotManager {
             deathCount: this.deathCount,
             uptime: uptime,
             canReconnect: this.canReconnect(),
-            disconnectTime: this.disconnectTime
+            disconnectTime: this.disconnectTime,
+            timeUntilReconnect: this.getTimeUntilReconnect(),
+            inSheet: this.inSheet
         };
     }
 }
@@ -197,6 +211,11 @@ async function updateBots() {
     const sheetData = await fetchSheetData();
     const activeBots = new Set();
     
+    // Mark all existing bots as not in sheet initially
+    for (const [botName, botManager] of bots.entries()) {
+        botManager.inSheet = false;
+    }
+    
     for (const row of sheetData) {
         const botName = row['BOT NAME']?.trim();
         const ip = row['IP']?.trim();
@@ -211,16 +230,18 @@ async function updateBots() {
         if (!bots.has(botName)) {
             const botManager = new BotManager(botName, ip, port, version);
             bots.set(botName, botManager);
-            await botManager.connect();
+            // Don't auto-connect, wait for manual connection
+        } else {
+            // Mark existing bot as still in sheet
+            bots.get(botName).inSheet = true;
         }
     }
     
     // Remove bots that are no longer in the sheet
     for (const [botName, botManager] of bots.entries()) {
-        if (!activeBots.has(botName)) {
+        if (!botManager.inSheet) {
             botManager.disconnect();
             bots.delete(botName);
-            botLastReconnect.delete(botName);
         }
     }
 }