PowerBot

Sleeping

App Files Files Community

Tokipo commited on Oct 6, 2025

Commit

9c6e5f5

verified ·

1 Parent(s): ad8831a

Update app.py

Browse files

Files changed (1) hide show

app.py +238 -95

app.py CHANGED Viewed

@@ -3,17 +3,19 @@ import json
 import time
 import threading
 import requests
-import pandas as pd
 from flask import Flask, render_template_string, jsonify, request
 from datetime import datetime, timedelta
 import subprocess
-import socket
 app = Flask(__name__)
 SHEET_ID = os.environ.get("SHEET_ID")
 SHEET_URL = f"https://docs.google.com/spreadsheets/d/{SHEET_ID}/export?format=csv"
 # Bot storage
 bots = {}
 bot_processes = {}
@@ -38,36 +40,61 @@ const bot = mineflayer.createBot({
     username: botName,
     version: version,
     hideErrors: true,
-    checkTimeoutInterval: 60000
 });
 bot.on('spawn', () => {
     console.log('CONNECTED');
-    setInterval(() => {
-        // Random movement for anti-AFK
         const actions = [
-            () => bot.setControlState('forward', true),
-            () => bot.setControlState('back', true),
-            () => bot.setControlState('left', true),
-            () => bot.setControlState('right', true),
-            () => bot.setControlState('jump', true)
         ];
         const randomAction = actions[Math.floor(Math.random() * actions.length)];
         randomAction();
-        setTimeout(() => {
-            bot.clearControlStates();
-        }, 100);
     }, 30000); // Move every 30 seconds
 });
 bot.on('death', () => {
     console.log('DIED');
 });
 bot.on('kicked', (reason) => {
     console.log('KICKED:', reason);
 });
 bot.on('error', (err) => {
@@ -76,6 +103,14 @@ bot.on('error', (err) => {
 bot.on('end', () => {
     console.log('DISCONNECTED');
     process.exit();
 });
 """
@@ -85,6 +120,7 @@ HTML_TEMPLATE = """
 <html>
 <head>
     <title>Mineflayer Bot Manager</title>
     <style>
         * {
             margin: 0;
@@ -101,11 +137,18 @@ HTML_TEMPLATE = """
             max-width: 1400px;
             margin: 0 auto;
         }
-        h1 {
-            color: white;
             text-align: center;
             margin-bottom: 30px;
             text-shadow: 2px 2px 4px rgba(0,0,0,0.3);
         }
         .stats {
             display: flex;
@@ -120,19 +163,44 @@ HTML_TEMPLATE = """
             flex: 1;
             min-width: 200px;
             box-shadow: 0 4px 6px rgba(0,0,0,0.1);
         }
         .stat-card h3 {
             color: #667eea;
             margin-bottom: 10px;
         }
         .stat-card .number {
             font-size: 2em;
             font-weight: bold;
             color: #333;
         }
         .bot-grid {
             display: grid;
-            grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
             gap: 20px;
         }
         .bot-card {
@@ -140,86 +208,103 @@ HTML_TEMPLATE = """
             border-radius: 10px;
             padding: 20px;
             box-shadow: 0 4px 6px rgba(0,0,0,0.1);
-            transition: transform 0.3s;
         }
         .bot-card:hover {
             transform: translateY(-5px);
-            box-shadow: 0 6px 12px rgba(0,0,0,0.15);
         }
         .bot-name {
-            font-size: 1.2em;
             font-weight: bold;
             color: #333;
             margin-bottom: 10px;
         }
         .bot-info {
             color: #666;
             margin: 5px 0;
         }
         .status {
             display: inline-block;
-            padding: 5px 10px;
             border-radius: 20px;
-            font-size: 0.9em;
             font-weight: bold;
             margin: 10px 0;
         }
         .status.connected {
-            background: #10b981;
             color: white;
         }
         .status.disconnected {
-            background: #ef4444;
             color: white;
         }
         .status.connecting {
-            background: #f59e0b;
             color: white;
         }
         .btn {
-            padding: 10px 20px;
             border: none;
             border-radius: 5px;
             cursor: pointer;
             font-weight: bold;
             transition: all 0.3s;
             margin-top: 10px;
         }
         .btn-rejoin {
-            background: #667eea;
             color: white;
         }
         .btn-rejoin:hover:not(:disabled) {
-            background: #5a67d8;
         }
         .btn:disabled {
             opacity: 0.5;
             cursor: not-allowed;
         }
-        .refresh-btn {
-            background: white;
-            color: #667eea;
-            padding: 10px 20px;
-            border: 2px solid #667eea;
-            border-radius: 5px;
-            cursor: pointer;
-            font-weight: bold;
-            margin-bottom: 20px;
-        }
-        .refresh-btn:hover {
-            background: #667eea;
-            color: white;
-        }
         .timer {
-            font-size: 0.9em;
             color: #999;
             margin-top: 5px;
         }
     </style>
 </head>
 <body>
     <div class="container">
-        <h1>🤖 Mineflayer Bot Manager</h1>
         <div class="stats">
             <div class="stat-card">
@@ -234,12 +319,19 @@ HTML_TEMPLATE = """
                 <h3>Disconnected</h3>
                 <div class="number" id="disconnected-bots">0</div>
             </div>
         </div>
-        <button class="refresh-btn" onclick="refreshBots()">🔄 Refresh from Sheet</button>
         <div class="bot-grid" id="bot-grid">
-            <!-- Bot cards will be inserted here -->
         </div>
     </div>
@@ -257,6 +349,8 @@ HTML_TEMPLATE = """
         }
         async function rejoinBot(botName) {
             try {
                 const response = await fetch('/api/rejoin', {
                     method: 'POST',
@@ -270,18 +364,29 @@ HTML_TEMPLATE = """
                 fetchBots();
             } catch (error) {
                 console.error('Error rejoining bot:', error);
             }
         }
         async function refreshBots() {
             try {
-                await fetch('/api/refresh', {method: 'POST'});
-                fetchBots();
             } catch (error) {
-                console.error('Error refreshing:', error);
             }
         }
         function updateUI() {
             const grid = document.getElementById('bot-grid');
             grid.innerHTML = '';
@@ -289,11 +394,13 @@ HTML_TEMPLATE = """
             let total = 0;
             let connected = 0;
             let disconnected = 0;
             for (const [botName, botInfo] of Object.entries(botsData)) {
                 total++;
                 if (botInfo.status === 'connected') connected++;
                 else if (botInfo.status === 'disconnected') disconnected++;
                 const card = document.createElement('div');
                 card.className = 'bot-card';
@@ -303,36 +410,38 @@ HTML_TEMPLATE = """
                 let timeRemaining = '';
                 if (botInfo.time_until_rejoin && botInfo.time_until_rejoin > 0) {
-                    const minutes = Math.floor(botInfo.time_until_rejoin / 60);
-                    const seconds = botInfo.time_until_rejoin % 60;
-                    timeRemaining = `Wait: ${minutes}m ${seconds}s`;
                 }
                 card.innerHTML = `
-                    <div class="bot-name">${botName}</div>
-                    <div class="bot-info">Server: Hidden</div>
-                    <div class="bot-info">Version: ${botInfo.version}</div>
-                    <div class="status ${statusClass}">${botInfo.status.toUpperCase()}</div>
                     ${timeRemaining ? `<div class="timer">${timeRemaining}</div>` : ''}
                     ${botInfo.status === 'disconnected' ?
                         `<button class="btn btn-rejoin"
                             onclick="rejoinBot('${botName}')"
                             ${!canRejoin ? 'disabled' : ''}>
-                            ${canRejoin ? 'Rejoin' : timeRemaining || 'Wait...'}
                         </button>` : ''}
                 `;
                 grid.appendChild(card);
             }
             document.getElementById('total-bots').textContent = total;
             document.getElementById('connected-bots').textContent = connected;
             document.getElementById('disconnected-bots').textContent = disconnected;
         }
         // Initial fetch and periodic updates
         fetchBots();
-        setInterval(fetchBots, 5000);
     </script>
 </body>
 </html>
@@ -344,24 +453,26 @@ def write_bot_script():
 def fetch_sheet_data():
     try:
-        response = requests.get(SHEET_URL)
         if response.status_code == 200:
             lines = response.text.strip().split('\n')
             if len(lines) > 1:
                 data = []
                 for line in lines[1:]:  # Skip header
                     parts = line.split(',')
-                    if len(parts) >= 4:
                         bot_name = parts[0].strip()
                         ip = parts[1].strip()
                         port = parts[2].strip()
                         version = parts[3].strip() if len(parts) > 3 else "1.20.1"
-                        if bot_name and ip and port:
                             data.append({
                                 'bot_name': bot_name,
                                 'ip': ip,
                                 'port': port,
-                                'version': version
                             })
                 return data
     except Exception as e:
@@ -379,7 +490,9 @@ def start_bot(bot_data):
     # Kill existing process if any
     if bot_name in bot_processes:
         try:
-            bot_processes[bot_name].terminate()
         except:
             pass
@@ -388,32 +501,27 @@ def start_bot(bot_data):
         process = subprocess.Popen(
             ['node', 'bot.js', bot_name, bot_data['ip'], bot_data['port'], bot_data['version']],
             stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True
         )
         bot_processes[bot_name] = process
         server_bots[server_key] = bot_name
-        # Check initial connection
-        time.sleep(2)
-        output = ""
-        if process.poll() is None:
-            bots[bot_name] = {
-                'status': 'connecting',
-                'ip': bot_data['ip'],
-                'port': bot_data['port'],
-                'version': bot_data['version'],
-                'server_key': server_key
-            }
-            # Start monitoring thread
-            threading.Thread(target=monitor_bot, args=(bot_name,), daemon=True).start()
-            return True, "Bot started"
     except Exception as e:
         return False, str(e)
-    return False, "Failed to start bot"
 def monitor_bot(bot_name):
     if bot_name not in bot_processes:
@@ -426,34 +534,55 @@ def monitor_bot(bot_name):
             # Process ended
             if bot_name in bots:
                 bots[bot_name]['status'] = 'disconnected'
-                # Remove from server_bots
                 server_key = bots[bot_name].get('server_key')
-                if server_key and server_key in server_bots:
                     del server_bots[server_key]
             break
         try:
             line = process.stdout.readline()
             if line:
                 if 'CONNECTED' in line:
-                    bots[bot_name]['status'] = 'connected'
-                elif 'DISCONNECTED' in line or 'KICKED' in line or 'ERROR' in line:
-                    bots[bot_name]['status'] = 'disconnected'
-                elif 'DIED' in line:
-                    bots[bot_name]['status'] = 'disconnected'
         except:
             pass
         time.sleep(0.1)
 def update_bots_from_sheet():
     sheet_data = fetch_sheet_data()
     for bot_data in sheet_data:
         bot_name = bot_data['bot_name']
         if bot_name not in bots:
-            # New bot, add it
             success, message = start_bot(bot_data)
             print(f"Starting {bot_name}: {message}")
@@ -495,18 +624,16 @@ def rejoin_bot():
     current_time = datetime.now()
-    # Check if can rejoin (1 hour cooldown)
     if bot_name in last_rejoin_times:
         time_passed = current_time - last_rejoin_times[bot_name]
         if time_passed < timedelta(hours=1):
             remaining = timedelta(hours=1) - time_passed
             return jsonify({'error': f'Please wait {int(remaining.total_seconds() / 60)} minutes'}), 429
-    # Check if bot is already connected
     if bots[bot_name]['status'] == 'connected':
         return jsonify({'error': 'Bot is already connected'}), 400
-    # Rejoin the bot
     bot_data = {
         'bot_name': bot_name,
         'ip': bots[bot_name]['ip'],
@@ -527,7 +654,19 @@ def refresh():
     update_bots_from_sheet()
     return jsonify({'success': True})
 if __name__ == '__main__':
     # Write bot script
     write_bot_script()
@@ -539,9 +678,13 @@ if __name__ == '__main__':
     def periodic_update():
         while True:
             time.sleep(60)  # Check every minute
-            update_bots_from_sheet()
     threading.Thread(target=periodic_update, daemon=True).start()
     # Start Flask app
     app.run(host='0.0.0.0', port=7860, debug=False)

 import time
 import threading
 import requests
 from flask import Flask, render_template_string, jsonify, request
 from datetime import datetime, timedelta
 import subprocess
+import signal
+import sys
 app = Flask(__name__)
+# Google Sheets configuration
 SHEET_ID = os.environ.get("SHEET_ID")
 SHEET_URL = f"https://docs.google.com/spreadsheets/d/{SHEET_ID}/export?format=csv"
 # Bot storage
 bots = {}
 bot_processes = {}
     username: botName,
     version: version,
     hideErrors: true,
+    checkTimeoutInterval: 60000,
+    auth: 'offline'
 });
+let afkInterval;
 bot.on('spawn', () => {
     console.log('CONNECTED');
+    // Anti-AFK system
+    afkInterval = setInterval(() => {
         const actions = [
+            () => {
+                bot.setControlState('forward', true);
+                setTimeout(() => bot.setControlState('forward', false), 100);
+            },
+            () => {
+                bot.setControlState('back', true);
+                setTimeout(() => bot.setControlState('back', false), 100);
+            },
+            () => {
+                bot.setControlState('left', true);
+                setTimeout(() => bot.setControlState('left', false), 100);
+            },
+            () => {
+                bot.setControlState('right', true);
+                setTimeout(() => bot.setControlState('right', false), 100);
+            },
+            () => {
+                bot.setControlState('jump', true);
+                setTimeout(() => bot.setControlState('jump', false), 100);
+            },
+            () => {
+                bot.setControlState('sneak', true);
+                setTimeout(() => bot.setControlState('sneak', false), 100);
+            }
         ];
         const randomAction = actions[Math.floor(Math.random() * actions.length)];
         randomAction();
     }, 30000); // Move every 30 seconds
 });
 bot.on('death', () => {
     console.log('DIED');
+    setTimeout(() => {
+        if (bot.health !== undefined) {
+            bot.respawn();
+        }
+    }, 5000);
 });
 bot.on('kicked', (reason) => {
     console.log('KICKED:', reason);
+    if (afkInterval) clearInterval(afkInterval);
 });
 bot.on('error', (err) => {
 bot.on('end', () => {
     console.log('DISCONNECTED');
+    if (afkInterval) clearInterval(afkInterval);
+    process.exit();
+});
+// Handle process termination
+process.on('SIGTERM', () => {
+    if (afkInterval) clearInterval(afkInterval);
+    bot.quit();
     process.exit();
 });
 """
 <html>
 <head>
     <title>Mineflayer Bot Manager</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <style>
         * {
             margin: 0;
             max-width: 1400px;
             margin: 0 auto;
         }
+        .header {
             text-align: center;
             margin-bottom: 30px;
+        }
+        h1 {
+            color: white;
             text-shadow: 2px 2px 4px rgba(0,0,0,0.3);
+            margin-bottom: 10px;
+        }
+        .subtitle {
+            color: rgba(255,255,255,0.9);
+            font-size: 0.9em;
         }
         .stats {
             display: flex;
             flex: 1;
             min-width: 200px;
             box-shadow: 0 4px 6px rgba(0,0,0,0.1);
+            animation: slideIn 0.5s ease;
         }
         .stat-card h3 {
             color: #667eea;
             margin-bottom: 10px;
+            font-size: 0.9em;
+            text-transform: uppercase;
+            letter-spacing: 1px;
         }
         .stat-card .number {
             font-size: 2em;
             font-weight: bold;
             color: #333;
         }
+        .controls {
+            margin-bottom: 20px;
+            display: flex;
+            gap: 10px;
+            flex-wrap: wrap;
+        }
+        .refresh-btn, .reload-sheet-btn {
+            background: white;
+            color: #667eea;
+            padding: 10px 20px;
+            border: 2px solid #667eea;
+            border-radius: 5px;
+            cursor: pointer;
+            font-weight: bold;
+            transition: all 0.3s;
+        }
+        .refresh-btn:hover, .reload-sheet-btn:hover {
+            background: #667eea;
+            color: white;
+            transform: translateY(-2px);
+        }
         .bot-grid {
             display: grid;
+            grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
             gap: 20px;
         }
         .bot-card {
             border-radius: 10px;
             padding: 20px;
             box-shadow: 0 4px 6px rgba(0,0,0,0.1);
+            transition: all 0.3s;
+            animation: fadeIn 0.5s ease;
         }
         .bot-card:hover {
             transform: translateY(-5px);
+            box-shadow: 0 8px 15px rgba(0,0,0,0.2);
         }
         .bot-name {
+            font-size: 1.1em;
             font-weight: bold;
             color: #333;
             margin-bottom: 10px;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
         }
         .bot-info {
             color: #666;
             margin: 5px 0;
+            font-size: 0.9em;
         }
         .status {
             display: inline-block;
+            padding: 5px 12px;
             border-radius: 20px;
+            font-size: 0.85em;
             font-weight: bold;
             margin: 10px 0;
+            text-transform: uppercase;
+            letter-spacing: 0.5px;
         }
         .status.connected {
+            background: linear-gradient(135deg, #10b981, #059669);
             color: white;
         }
         .status.disconnected {
+            background: linear-gradient(135deg, #ef4444, #dc2626);
             color: white;
         }
         .status.connecting {
+            background: linear-gradient(135deg, #f59e0b, #d97706);
             color: white;
+            animation: pulse 1.5s infinite;
+        }
+        @keyframes pulse {
+            0%, 100% { opacity: 1; }
+            50% { opacity: 0.7; }
+        }
+        @keyframes slideIn {
+            from { transform: translateX(-20px); opacity: 0; }
+            to { transform: translateX(0); opacity: 1; }
+        }
+        @keyframes fadeIn {
+            from { opacity: 0; }
+            to { opacity: 1; }
         }
         .btn {
+            padding: 8px 16px;
             border: none;
             border-radius: 5px;
             cursor: pointer;
             font-weight: bold;
             transition: all 0.3s;
             margin-top: 10px;
+            font-size: 0.9em;
         }
         .btn-rejoin {
+            background: linear-gradient(135deg, #667eea, #764ba2);
             color: white;
         }
         .btn-rejoin:hover:not(:disabled) {
+            transform: scale(1.05);
+            box-shadow: 0 4px 10px rgba(102, 126, 234, 0.4);
         }
         .btn:disabled {
             opacity: 0.5;
             cursor: not-allowed;
         }
         .timer {
+            font-size: 0.85em;
             color: #999;
             margin-top: 5px;
         }
+        .loading {
+            text-align: center;
+            color: white;
+            font-size: 1.2em;
+            margin-top: 50px;
+        }
     </style>
 </head>
 <body>
     <div class="container">
+        <div class="header">
+            <h1>🤖 Mineflayer Bot Manager</h1>
+            <div class="subtitle">Manage your Minecraft bots from Google Sheets</div>
+        </div>
         <div class="stats">
             <div class="stat-card">
                 <h3>Disconnected</h3>
                 <div class="number" id="disconnected-bots">0</div>
             </div>
+            <div class="stat-card">
+                <h3>Connecting</h3>
+                <div class="number" id="connecting-bots">0</div>
+            </div>
         </div>
+        <div class="controls">
+            <button class="refresh-btn" onclick="refreshBots()">🔄 Refresh Status</button>
+            <button class="reload-sheet-btn" onclick="reloadSheet()">📊 Reload from Sheet</button>
+        </div>
         <div class="bot-grid" id="bot-grid">
+            <div class="loading">Loading bots...</div>
         </div>
     </div>
         }
         async function rejoinBot(botName) {
+            if (!confirm(`Rejoin bot ${botName}?`)) return;
             try {
                 const response = await fetch('/api/rejoin', {
                     method: 'POST',
                 fetchBots();
             } catch (error) {
                 console.error('Error rejoining bot:', error);
+                alert('Failed to rejoin bot');
             }
         }
         async function refreshBots() {
+            await fetchBots();
+        }
+        async function reloadSheet() {
             try {
+                const response = await fetch('/api/refresh', {method: 'POST'});
+                await fetchBots();
             } catch (error) {
+                console.error('Error reloading sheet:', error);
             }
         }
+        function formatTime(seconds) {
+            const minutes = Math.floor(seconds / 60);
+            const secs = seconds % 60;
+            return `${minutes}m ${secs}s`;
+        }
         function updateUI() {
             const grid = document.getElementById('bot-grid');
             grid.innerHTML = '';
             let total = 0;
             let connected = 0;
             let disconnected = 0;
+            let connecting = 0;
             for (const [botName, botInfo] of Object.entries(botsData)) {
                 total++;
                 if (botInfo.status === 'connected') connected++;
                 else if (botInfo.status === 'disconnected') disconnected++;
+                else if (botInfo.status === 'connecting') connecting++;
                 const card = document.createElement('div');
                 card.className = 'bot-card';
                 let timeRemaining = '';
                 if (botInfo.time_until_rejoin && botInfo.time_until_rejoin > 0) {
+                    timeRemaining = `⏱️ ${formatTime(botInfo.time_until_rejoin)}`;
                 }
                 card.innerHTML = `
+                    <div class="bot-name" title="${botName}">🎮 ${botName}</div>
+                    <div class="bot-info">📦 Version: ${botInfo.version}</div>
+                    <div class="status ${statusClass}">${botInfo.status}</div>
                     ${timeRemaining ? `<div class="timer">${timeRemaining}</div>` : ''}
                     ${botInfo.status === 'disconnected' ?
                         `<button class="btn btn-rejoin"
                             onclick="rejoinBot('${botName}')"
                             ${!canRejoin ? 'disabled' : ''}>
+                            ${canRejoin ? '🔄 Rejoin' : '⏳ ' + (timeRemaining || 'Cooldown')}
                         </button>` : ''}
                 `;
                 grid.appendChild(card);
             }
+            if (total === 0) {
+                grid.innerHTML = '<div class="loading">No bots configured. Add bots to your Google Sheet.</div>';
+            }
             document.getElementById('total-bots').textContent = total;
             document.getElementById('connected-bots').textContent = connected;
             document.getElementById('disconnected-bots').textContent = disconnected;
+            document.getElementById('connecting-bots').textContent = connecting;
         }
         // Initial fetch and periodic updates
         fetchBots();
+        setInterval(fetchBots, 3000); // Update every 3 seconds
     </script>
 </body>
 </html>
 def fetch_sheet_data():
     try:
+        response = requests.get(SHEET_URL, timeout=10)
         if response.status_code == 200:
             lines = response.text.strip().split('\n')
             if len(lines) > 1:
                 data = []
                 for line in lines[1:]:  # Skip header
                     parts = line.split(',')
+                    if len(parts) >= 3:
                         bot_name = parts[0].strip()
                         ip = parts[1].strip()
                         port = parts[2].strip()
                         version = parts[3].strip() if len(parts) > 3 else "1.20.1"
+                        # Skip empty rows
+                        if bot_name and ip and port and ip != "" and port.isdigit():
                             data.append({
                                 'bot_name': bot_name,
                                 'ip': ip,
                                 'port': port,
+                                'version': version if version else "1.20.1"
                             })
                 return data
     except Exception as e:
     # Kill existing process if any
     if bot_name in bot_processes:
         try:
+            process = bot_processes[bot_name]
+            process.terminate()
+            process.wait(timeout=5)
         except:
             pass
         process = subprocess.Popen(
             ['node', 'bot.js', bot_name, bot_data['ip'], bot_data['port'], bot_data['version']],
             stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            text=True,
+            bufsize=1
         )
         bot_processes[bot_name] = process
         server_bots[server_key] = bot_name
+        bots[bot_name] = {
+            'status': 'connecting',
+            'ip': bot_data['ip'],
+            'port': bot_data['port'],
+            'version': bot_data['version'],
+            'server_key': server_key
+        }
+        # Start monitoring thread
+        threading.Thread(target=monitor_bot, args=(bot_name,), daemon=True).start()
+        return True, "Bot started"
     except Exception as e:
         return False, str(e)
 def monitor_bot(bot_name):
     if bot_name not in bot_processes:
             # Process ended
             if bot_name in bots:
                 bots[bot_name]['status'] = 'disconnected'
                 server_key = bots[bot_name].get('server_key')
+                if server_key and server_key in server_bots and server_bots[server_key] == bot_name:
                     del server_bots[server_key]
             break
         try:
             line = process.stdout.readline()
             if line:
+                print(f"[{bot_name}] {line.strip()}")
                 if 'CONNECTED' in line:
+                    if bot_name in bots:
+                        bots[bot_name]['status'] = 'connected'
+                elif any(x in line for x in ['DISCONNECTED', 'KICKED', 'ERROR', 'DIED']):
+                    if bot_name in bots:
+                        bots[bot_name]['status'] = 'disconnected'
         except:
             pass
         time.sleep(0.1)
 def update_bots_from_sheet():
+    print("Updating bots from sheet...")
     sheet_data = fetch_sheet_data()
+    # Remove bots that are no longer in sheet
+    current_bot_names = {bot['bot_name'] for bot in sheet_data}
+    bots_to_remove = []
+    for bot_name in list(bots.keys()):
+        if bot_name not in current_bot_names:
+            bots_to_remove.append(bot_name)
+    for bot_name in bots_to_remove:
+        if bot_name in bot_processes:
+            try:
+                bot_processes[bot_name].terminate()
+            except:
+                pass
+        if bot_name in bots:
+            server_key = bots[bot_name].get('server_key')
+            if server_key in server_bots:
+                del server_bots[server_key]
+            del bots[bot_name]
+    # Add new bots
     for bot_data in sheet_data:
         bot_name = bot_data['bot_name']
         if bot_name not in bots:
             success, message = start_bot(bot_data)
             print(f"Starting {bot_name}: {message}")
     current_time = datetime.now()
+    # Check cooldown
     if bot_name in last_rejoin_times:
         time_passed = current_time - last_rejoin_times[bot_name]
         if time_passed < timedelta(hours=1):
             remaining = timedelta(hours=1) - time_passed
             return jsonify({'error': f'Please wait {int(remaining.total_seconds() / 60)} minutes'}), 429
     if bots[bot_name]['status'] == 'connected':
         return jsonify({'error': 'Bot is already connected'}), 400
     bot_data = {
         'bot_name': bot_name,
         'ip': bots[bot_name]['ip'],
     update_bots_from_sheet()
     return jsonify({'success': True})
+def signal_handler(sig, frame):
+    print("\nShutting down gracefully...")
+    for bot_name, process in bot_processes.items():
+        try:
+            process.terminate()
+        except:
+            pass
+    sys.exit(0)
 if __name__ == '__main__':
+    signal.signal(signal.SIGINT, signal_handler)
+    signal.signal(signal.SIGTERM, signal_handler)
     # Write bot script
     write_bot_script()
     def periodic_update():
         while True:
             time.sleep(60)  # Check every minute
+            try:
+                update_bots_from_sheet()
+            except Exception as e:
+                print(f"Error in periodic update: {e}")
     threading.Thread(target=periodic_update, daemon=True).start()
     # Start Flask app
+    print("Starting web server on port 7860...")
     app.run(host='0.0.0.0', port=7860, debug=False)