PowerBot

Sleeping

App Files Files Community

Tokipo commited on Oct 6, 2025

Commit

78662ef

verified ·

1 Parent(s): 50ddab5

Update app.py

Browse files

Files changed (1) hide show

app.py +72 -16

app.py CHANGED Viewed

@@ -9,13 +9,17 @@ 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 = {}
@@ -297,6 +301,13 @@ HTML_TEMPLATE = """
             font-size: 1.2em;
             margin-top: 50px;
         }
     </style>
 </head>
 <body>
@@ -330,6 +341,8 @@ HTML_TEMPLATE = """
             <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>
@@ -341,10 +354,13 @@ HTML_TEMPLATE = """
         async function fetchBots() {
             try {
                 const response = await fetch('/api/bots');
                 botsData = await response.json();
                 updateUI();
             } catch (error) {
                 console.error('Error fetching bots:', error);
             }
         }
@@ -360,8 +376,9 @@ HTML_TEMPLATE = """
                 const result = await response.json();
                 if (result.error) {
                     alert(result.error);
                 }
-                fetchBots();
             } catch (error) {
                 console.error('Error rejoining bot:', error);
                 alert('Failed to rejoin bot');
@@ -375,12 +392,24 @@ HTML_TEMPLATE = """
         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;
@@ -413,14 +442,17 @@ HTML_TEMPLATE = """
                     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>` : ''}
@@ -448,10 +480,19 @@ HTML_TEMPLATE = """
 """
 def write_bot_script():
-    with open('bot.js', 'w') as f:
-        f.write(BOT_SCRIPT)
 def fetch_sheet_data():
     try:
         response = requests.get(SHEET_URL, timeout=10)
         if response.status_code == 200:
@@ -459,27 +500,30 @@ def fetch_sheet_data():
             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:
         print(f"Error fetching sheet: {e}")
     return []
 def start_bot(bot_data):
     bot_name = bot_data['bot_name']
     server_key = f"{bot_data['ip']}:{bot_data['port']}"
@@ -498,12 +542,14 @@ def start_bot(bot_data):
     # Start new bot process
     try:
         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
@@ -521,9 +567,11 @@ def start_bot(bot_data):
         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:
         return
@@ -555,6 +603,7 @@ def monitor_bot(bot_name):
         time.sleep(0.1)
 def update_bots_from_sheet():
     print("Updating bots from sheet...")
     sheet_data = fetch_sheet_data()
@@ -577,6 +626,7 @@ def update_bots_from_sheet():
             if server_key in server_bots:
                 del server_bots[server_key]
             del bots[bot_name]
     # Add new bots
     for bot_data in sheet_data:
@@ -592,6 +642,7 @@ def index():
 @app.route('/api/bots')
 def get_bots():
     result = {}
     current_time = datetime.now()
@@ -616,6 +667,7 @@ def get_bots():
 @app.route('/api/rejoin', methods=['POST'])
 def rejoin_bot():
     data = request.json
     bot_name = data.get('bot_name')
@@ -651,10 +703,12 @@ def rejoin_bot():
 @app.route('/api/refresh', methods=['POST'])
 def refresh():
     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:
@@ -667,8 +721,10 @@ if __name__ == '__main__':
     signal.signal(signal.SIGINT, signal_handler)
     signal.signal(signal.SIGTERM, signal_handler)
-    # Write bot script
-    write_bot_script()
     # Initial load from sheet
     print("Loading bots from Google Sheet...")

 import signal
 import sys
 app = Flask(__name__)
+# Working directory for bot files
+WORK_DIR = "/tmp"
+BOT_SCRIPT_PATH = os.path.join(WORK_DIR, "bot.js")
 # 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 = {}
             font-size: 1.2em;
             margin-top: 50px;
         }
+        .error-msg {
+            background: #fee;
+            color: #c00;
+            padding: 10px;
+            border-radius: 5px;
+            margin: 10px 0;
+        }
     </style>
 </head>
 <body>
             <button class="reload-sheet-btn" onclick="reloadSheet()">📊 Reload from Sheet</button>
         </div>
+        <div id="error-container"></div>
         <div class="bot-grid" id="bot-grid">
             <div class="loading">Loading bots...</div>
         </div>
         async function fetchBots() {
             try {
                 const response = await fetch('/api/bots');
+                if (!response.ok) throw new Error('Failed to fetch');
                 botsData = await response.json();
                 updateUI();
+                clearError();
             } catch (error) {
                 console.error('Error fetching bots:', error);
+                showError('Failed to fetch bot status');
             }
         }
                 const result = await response.json();
                 if (result.error) {
                     alert(result.error);
+                } else {
+                    await fetchBots();
                 }
             } catch (error) {
                 console.error('Error rejoining bot:', error);
                 alert('Failed to rejoin bot');
         async function reloadSheet() {
             try {
                 const response = await fetch('/api/refresh', {method: 'POST'});
+                if (!response.ok) throw new Error('Failed to reload');
                 await fetchBots();
+                clearError();
             } catch (error) {
                 console.error('Error reloading sheet:', error);
+                showError('Failed to reload from sheet');
             }
         }
+        function showError(message) {
+            const container = document.getElementById('error-container');
+            container.innerHTML = `<div class="error-msg">${message}</div>`;
+        }
+        function clearError() {
+            document.getElementById('error-container').innerHTML = '';
+        }
         function formatTime(seconds) {
             const minutes = Math.floor(seconds / 60);
             const secs = seconds % 60;
                     timeRemaining = `⏱️ ${formatTime(botInfo.time_until_rejoin)}`;
                 }
+                // Escape bot name for HTML
+                const safeBotName = botName.replace(/'/g, "\\'").replace(/"/g, "&quot;");
                 card.innerHTML = `
+                    <div class="bot-name" title="${safeBotName}">🎮 ${safeBotName}</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('${safeBotName}')"
                             ${!canRejoin ? 'disabled' : ''}>
                             ${canRejoin ? '🔄 Rejoin' : '⏳ ' + (timeRemaining || 'Cooldown')}
                         </button>` : ''}
 """
 def write_bot_script():
+    """Write the bot script to /tmp directory"""
+    try:
+        os.makedirs(WORK_DIR, exist_ok=True)
+        with open(BOT_SCRIPT_PATH, 'w') as f:
+            f.write(BOT_SCRIPT)
+        print(f"Bot script written to {BOT_SCRIPT_PATH}")
+        return True
+    except Exception as e:
+        print(f"Error writing bot script: {e}")
+        return False
 def fetch_sheet_data():
+    """Fetch bot configuration from Google Sheets"""
     try:
         response = requests.get(SHEET_URL, timeout=10)
         if response.status_code == 200:
             if len(lines) > 1:
                 data = []
                 for line in lines[1:]:  # Skip header
+                    # Handle CSV parsing properly
                     parts = line.split(',')
                     if len(parts) >= 3:
+                        bot_name = parts[0].strip().strip('"')
+                        ip = parts[1].strip().strip('"')
+                        port = parts[2].strip().strip('"')
+                        version = parts[3].strip().strip('"') if len(parts) > 3 else "1.20.1"
                         # Skip empty rows
+                        if bot_name and ip and port and port.isdigit():
                             data.append({
                                 'bot_name': bot_name,
                                 'ip': ip,
                                 'port': port,
                                 'version': version if version else "1.20.1"
                             })
+                print(f"Fetched {len(data)} bots from sheet")
                 return data
     except Exception as e:
         print(f"Error fetching sheet: {e}")
     return []
 def start_bot(bot_data):
+    """Start a Minecraft bot"""
     bot_name = bot_data['bot_name']
     server_key = f"{bot_data['ip']}:{bot_data['port']}"
     # Start new bot process
     try:
+        # Change working directory to /app where node_modules are installed
         process = subprocess.Popen(
+            ['node', BOT_SCRIPT_PATH, bot_name, bot_data['ip'], bot_data['port'], bot_data['version']],
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
             text=True,
+            bufsize=1,
+            cwd='/app'  # Use /app as working directory
         )
         bot_processes[bot_name] = process
         threading.Thread(target=monitor_bot, args=(bot_name,), daemon=True).start()
         return True, "Bot started"
     except Exception as e:
+        print(f"Error starting bot {bot_name}: {e}")
         return False, str(e)
 def monitor_bot(bot_name):
+    """Monitor bot process output"""
     if bot_name not in bot_processes:
         return
         time.sleep(0.1)
 def update_bots_from_sheet():
+    """Update bots from Google Sheet"""
     print("Updating bots from sheet...")
     sheet_data = fetch_sheet_data()
             if server_key in server_bots:
                 del server_bots[server_key]
             del bots[bot_name]
+        print(f"Removed bot: {bot_name}")
     # Add new bots
     for bot_data in sheet_data:
 @app.route('/api/bots')
 def get_bots():
+    """Get all bot statuses"""
     result = {}
     current_time = datetime.now()
 @app.route('/api/rejoin', methods=['POST'])
 def rejoin_bot():
+    """Rejoin a disconnected bot"""
     data = request.json
     bot_name = data.get('bot_name')
 @app.route('/api/refresh', methods=['POST'])
 def refresh():
+    """Refresh bots from Google Sheet"""
     update_bots_from_sheet()
     return jsonify({'success': True})
 def signal_handler(sig, frame):
+    """Handle shutdown gracefully"""
     print("\nShutting down gracefully...")
     for bot_name, process in bot_processes.items():
         try:
     signal.signal(signal.SIGINT, signal_handler)
     signal.signal(signal.SIGTERM, signal_handler)
+    # Write bot script to /tmp
+    if not write_bot_script():
+        print("Failed to write bot script, exiting...")
+        sys.exit(1)
     # Initial load from sheet
     print("Loading bots from Google Sheet...")