Update app.py

app.py

@@ -9,7 +9,6 @@ import time
 from datetime import datetime
 from functools import wraps
 from pathlib import Path
-import requests
 import subprocess
 
 from flask import Flask, render_template, request, jsonify, redirect, url_for, session, send_file, Response
@@ -58,106 +57,105 @@ def login_required(f):
         return f(*args, **kwargs)
     return decorated_function
 
-def start_playit_agent():
+# ====================================================================
+# === START PLAYIT.GG AGENT FUNCTIONS (CLAIM/SECRET KEY LOGIC) ===
+# ====================================================================
+
+def run_playit_claim_mode():
     """
-    Starts the PlayIt.gg agent and polls its local API to find 
-    the public tunnel address.
+    Executes 'playit claim' to generate a claim code, required when the key is missing.
     """
-    if not os.environ.get('PLAYIT_SECRET_KEY'):
-        print("=" * 50)
-        print("⚠️ PLAYIT_SECRET_KEY NOT FOUND ⚠️")
-        print("PlayIt.gg tunnel will NOT start.")
-        print("Please set the PLAYIT_SECRET_KEY environment variable.")
-        print("=" * 50)
-        server_manager.log("PLAYIT_SECRET_KEY missing. PlayIt.gg agent not started.", "error")
-        return
+    try:
+        # Run 'playit claim' synchronously to get the output
+        result = subprocess.run(
+            ['playit', 'claim'],
+            capture_output=True,
+            text=True,
+            timeout=10 
+        )
 
-    print("=" * 50)
-    print("🚀 STARTING PLAYIT.GG AGENT (Polling for Address) 🚀")
-    print("=" * 50)
+        if result.returncode == 0:
+            # The claim code is usually the last word printed by the command
+            claim_code = result.stdout.strip().split()[-1]
+            # Call the display function with the claim code
+            start_tunneling(claim_code=claim_code)
+        else:
+            server_manager.log(f"PlayIt claim failed: {result.stderr.strip()}", "error")
+            start_tunneling(error_message="PlayIt 'claim' failed.")
 
-    # 1. Launch the agent in the background
+    except Exception as e:
+        server_manager.log(f"Error during PlayIt claim: {e}", "error")
+        start_tunneling(error_message="PlayIt claim encountered an error.")
+
+
+def run_playit_secret_mode():
+    """
+    Launches the 'playit run' agent in the background when the SECRET_KEY is present.
+    """
     try:
-        # Use subprocess.Popen to start the agent (we don't need to capture output anymore)
+        # Launch the agent in the background
         subprocess.Popen(
             ['playit', 'run', '--api-address', '127.0.0.1:9000'],
-            # Note: We added --api-address to ensure the API port is explicit
-            stdout=subprocess.DEVNULL, # Send output to nowhere
-            stderr=subprocess.DEVNULL  # Send errors to nowhere
+            stdout=subprocess.DEVNULL, # Keep console clean
+            stderr=subprocess.DEVNULL  
         )
-        server_manager.log("PlayIt.gg agent launched. Starting polling thread...", "info")
-    except Exception as e:
-        server_manager.log(f"Error launching PlayIt.gg agent: {e}", "error")
-        return
-    
-    # 2. Poll the local API until the tunnel address is found
-    API_URL = "http://127.0.0.1:9000/api/v1/status"
-    MAX_ATTEMPTS = 60 # Poll for up to 60 seconds (1 minute)
-    
-    for attempt in range(MAX_ATTEMPTS):
-        time.sleep(1) # Wait 1 second between attempts
+        server_manager.log("PlayIt.gg agent launched with SECRET KEY. The public address should appear in the main logs shortly.", "info")
+        # Display the connection info immediately
+        start_tunneling(secret_mode=True)
         
-        try:
-            response = requests.get(API_URL, timeout=5)
-            data = response.json()
-            
-            # The structure of the status API is a list of tunnels
-            for tunnel in data.get('tunnels', []):
-                # Look for a tunnel that targets the Minecraft port (25565)
-                if tunnel.get('target_ip') == '127.0.0.1' and tunnel.get('target_port') == config.SERVER_PORT:
-                    # Get the first available public address from the tunnel info
-                    public_address_info = tunnel.get('available_addresses', [None])[0]
-                    
-                    if public_address_info:
-                        # Format is {host}.playit.gg:port
-                        public_address = f"{public_address_info['host']}:{public_address_info['port']}"
-                        
-                        print("=" * 50)
-                        print(f"🎉 PLAYIT.GG TUNNEL ESTABLISHED! 🎉")
-                        print(f"MINECRAFT ADDRESS: **{public_address}**")
-                        print("=" * 50)
-                        
-                        server_manager.log(f"PlayIt.gg Tunnel Ready: {public_address}", "success")
-                        socketio.emit('server_connect_info', {'address': public_address, 'type': 'playit'})
-                        return # Success! Exit the polling loop
-
-            # If tunnels were found but the correct one wasn't ready yet, continue polling
-            if data.get('tunnels'):
-                server_manager.log(f"Attempt {attempt+1}/{MAX_ATTEMPTS}: PlayIt agent running, tunnel not yet ready...", "info")
-            else:
-                 server_manager.log(f"Attempt {attempt+1}/{MAX_ATTEMPTS}: Waiting for PlayIt API...", "info")
-
-        except requests.exceptions.ConnectionError:
-            # PlayIt agent hasn't started its API yet
-            server_manager.log(f"Attempt {attempt+1}/{MAX_ATTEMPTS}: PlayIt agent API not yet available...", "info")
-        except Exception as e:
-            server_manager.log(f"Error reading PlayIt API: {e}", "error")
-    
-    # If the loop finishes without finding the address
-    server_manager.log("PlayIt.gg tunnel address not found after 60 seconds.", "error")
+    except Exception as e:
+        server_manager.log(f"Error launching PlayIt.gg agent with key: {e}", "error")
+        start_tunneling(error_message="PlayIt 'run' failed with Secret Key. Check logs.")
+
 
+def start_playit_agent():
+    """
+    Determines which PlayIt.gg mode to run based on the environment variable.
+    """
+    if os.environ.get('PLAYIT_SECRET_KEY'):
+        print("=" * 50)
+        print("🚀 STARTING PLAYIT.GG AGENT (Secret Key Mode) 🚀")
+        print("=" * 50)
+        run_playit_secret_mode()
+    else:
+        print("=" * 50)
+        print("🔑 STARTING PLAYIT.GG AGENT (Claim Code Mode) 🔑")
+        print("Action Required: Go to playit.gg/claim and enter the code below.")
+        print("=" * 50)
+        run_playit_claim_mode()
+        
 
-# --- Tunneling/Connection Display Setup (Updated for PlayIt.gg) ---
-def start_tunneling():
-    # This function is now mainly for initial display and is called after the 
-    # PlayIt agent is started in its own thread.
+def start_tunneling(claim_code=None, secret_mode=False, error_message=None):
+    """
+    Displays the connection information based on the current PlayIt mode.
+    """
     connect_address = f"{config.SPACE_URL}:{config.SERVER_PORT}"
     
-    # We can't know the PlayIt.gg tunnel address immediately, as it's generated 
-    # asynchronously by the agent. We instruct the user to check the logs.
     print("=" * 50)
     print("🌐 MINECRAFT CONNECTION INFO 🌐")
     print(f"Web Panel Address: {connect_address}")
     print("------------------------------------------")
-    print("MC Tunnel: **CHECK THE CONTAINER LOGS**")
-    print("The PlayIt.gg agent will print the public address once connected.")
+    
+    if error_message:
+        print(f"MC Tunnel: **ERROR: {error_message}**")
+        socketio.emit('server_connect_info', {'address': error_message, 'type': 'error'})
+    elif claim_code:
+        print(f"MC Tunnel: CLAIM CODE")
+        print(f"Claim Code: **{claim_code}** (Use at playit.gg/claim)")
+        socketio.emit('server_connect_info', {'address': f'CLAIM: {claim_code}', 'type': 'claim'})
+    elif secret_mode:
+        print("MC Tunnel: **CHECK THE CONTAINER LOGS**")
+        print("The PlayIt.gg agent is running and will print the public address once connected.")
+        socketio.emit('server_connect_info', {'address': 'Agent Running (Check Logs)', 'type': 'playit'})
+
     print("------------------------------------------")
     print("=" * 50)
     
-    server_manager.log(f"Web Panel Address: {connect_address}", "info")
-    server_manager.log("PlayIt.gg agent started. Check logs for the public tunnel address.", "info")
-    # Emit a placeholder address for the UI until the user finds the real one in logs
-    socketio.emit('server_connect_info', {'address': 'Check logs for PlayIt.gg address', 'type': 'playit'})
+    server_manager.log(f"Connect Address: {connect_address}", "info")
+
+# ====================================================================
+# === END PLAYIT.GG AGENT FUNCTIONS ===
+# ====================================================================
 
 
 # --- Automated Save/Cleanup Thread ---
@@ -196,31 +194,31 @@ def logout():
 @login_required
 def index():
     return render_template('index.html', 
-                         status=server_manager.get_status(),
-                         mods_count=len(mod_manager.get_installed_mods()))
+                             status=server_manager.get_status(),
+                             mods_count=len(mod_manager.get_installed_mods()))
 
 @app.route('/console')
 @login_required
 def console():
     return render_template('console.html',
-                         history=server_manager.get_console_history(200))
+                             history=server_manager.get_console_history(200))
 
 @app.route('/players')
 @login_required
 def players():
     return render_template('players.html',
-                         online=server_manager.players_online,
-                         all_players=player_tracker.get_all_players(),
-                         whitelist=player_tracker.get_whitelist(),
-                         ops=player_tracker.get_ops(),
-                         banned=player_tracker.get_banned())
+                             online=server_manager.players_online,
+                             all_players=player_tracker.get_all_players(),
+                             whitelist=player_tracker.get_whitelist(),
+                             ops=player_tracker.get_ops(),
+                             banned=player_tracker.get_banned())
 
 @app.route('/mods')
 @login_required
 def mods():
     return render_template('mods.html',
-                         mods=mod_manager.get_installed_mods(),
-                         total_size=mod_manager.get_total_size())
+                             mods=mod_manager.get_installed_mods(),
+                             total_size=mod_manager.get_total_size())
 
 @app.route('/files')
 @app.route('/files/<path:filepath>')
@@ -228,22 +226,22 @@ def mods():
 def files(filepath=''):
     dir_content = file_manager.list_directory(filepath)
     return render_template('files.html',
-                         content=dir_content,
-                         current_path=filepath)
+                             content=dir_content,
+                             current_path=filepath)
 
 @app.route('/import')
 @login_required
 def import_page():
     return render_template('import.html',
-                         backups=file_manager.list_backups())
+                             backups=file_manager.list_backups())
 
 @app.route('/settings')
 @login_required
 def settings():
     props = file_manager.get_server_properties()
     return render_template('settings.html',
-                         properties=props,
-                         pinger_status=health_pinger.get_status())
+                             properties=props,
+                             pinger_status=health_pinger.get_status())
 
 # --- API Routes ---
 
@@ -524,12 +522,9 @@ def main():
     print(f"MC Server: Port {config.SERVER_PORT}")
     print("=" * 50)
 
-    # NEW: Start the PlayIt.gg agent
+    # 1. Start the PlayIt.gg agent (handles Claim Code or Secret Key run)
     threading.Thread(target=start_playit_agent, daemon=True).start()
     
-    # 1. Start the Tunneling/Connection Display
-    threading.Thread(target=start_tunneling, daemon=True).start()
-    
     # 2. Start the Auto-Save and Cleanup Thread
     threading.Thread(target=start_auto_save_cleanup_thread, daemon=True).start()