Update app.py

app.py

@@ -5,12 +5,25 @@ import subprocess
 import sys
 import shutil
 
+# Try to import pyngrok, install if not available
+try:
+    from pyngrok import ngrok, conf
+    PYNGROK_AVAILABLE = True
+except ImportError:
+    print("pyngrok not found. Installing...")
+    try:
+        subprocess.check_call([sys.executable, "-m", "pip", "install", "pyngrok"])
+        from pyngrok import ngrok, conf
+        PYNGROK_AVAILABLE = True
+        print("✓ pyngrok installed successfully")
+    except Exception as e:
+        print(f"Failed to install pyngrok: {e}")
+        PYNGROK_AVAILABLE = False
+
 PAPER_JAR_URL = "https://fill-data.papermc.io/v1/objects/234a9b32098100c6fc116664d64e36ccdb58b5b649af0f80bcccb08b0255eaea/paper-1.20.1-196.jar"
-NGROK_URL = "https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-amd64.tgz"
 
 DATA_DIR = Path("/data")
 JAVA_DIR = DATA_DIR / "java"
-NGROK_DIR = DATA_DIR / "ngrok"
 JAR_NAME = "paper-1.20.1-196.jar"
 JAR_PATH = DATA_DIR / JAR_NAME
 
@@ -119,9 +132,13 @@ def install_ngrok():
         return False
 
 def setup_ngrok():
-    """Setup ngrok with authentication token"""
+    """Setup ngrok with authentication token using pyngrok"""
     print("Setting up ngrok...")
     
+    if not PYNGROK_AVAILABLE:
+        print("pyngrok is not available. Cannot setup ngrok.")
+        return False
+    
     env_vars = load_env_vars()
     ngrok_token = env_vars.get('NGROK_TOKEN')
     
@@ -130,109 +147,39 @@ def setup_ngrok():
         print("Please set NGROK_TOKEN in your .env file or Hugging Face Space secrets")
         return False
     
-    # Get ngrok path
-    ngrok_path = check_ngrok()
-    if not ngrok_path:
-        print("ngrok not found. Installing...")
-        if not install_ngrok():
-            print("Failed to install ngrok")
-            return False
-        ngrok_path = check_ngrok()
-        if not ngrok_path:
-            print("ngrok installation failed")
-            return False
-    
-    # Configure ngrok with auth token
-    print("Configuring ngrok with auth token...")
     try:
-        result = subprocess.run([
-            ngrok_path, "config", "add-authtoken", ngrok_token
-        ], capture_output=True, text=True)
+        # Set the auth token
+        ngrok.set_auth_token(ngrok_token)
+        print("✓ ngrok configured successfully with pyngrok")
+        return True
         
-        if result.returncode == 0:
-            print("✓ ngrok configured successfully")
-            return True
-        else:
-            print(f"Failed to configure ngrok: {result.stderr}")
-            return False
-            
     except Exception as e:
         print(f"Failed to configure ngrok: {e}")
         return False
 
 def start_ngrok_tunnel(port=25565):
-    """Start ngrok tunnel for the Minecraft server"""
+    """Start ngrok tunnel for the Minecraft server using pyngrok"""
     print(f"Starting ngrok tunnel for port {port}...")
     
-    ngrok_path = check_ngrok()
-    if not ngrok_path:
-        print("ngrok not found. Run setup first.")
+    if not PYNGROK_AVAILABLE:
+        print("pyngrok is not available. Cannot start tunnel.")
         return None, None
     
     try:
-        # Start ngrok in background
-        print("Launching ngrok process...")
-        process = subprocess.Popen([
-            ngrok_path, "tcp", str(port), "--log", "stdout"
-        ], stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+        # Create a TCP tunnel
+        print("Creating ngrok tunnel...")
+        tunnel = ngrok.connect(port, "tcp")
+        tunnel_url = tunnel.public_url
         
-        # Give ngrok more time to start and wait for API to be available
-        import time
-        import json
-        import urllib.request
+        print(f"✓ ngrok tunnel active: {tunnel_url}")
+        print(f"Players can connect to: {tunnel_url.replace('tcp://', '')}")
         
-        print("Waiting for ngrok to initialize...")
-        max_retries = 30  # Try for up to 30 seconds
-        retry_count = 0
+        # Get all active tunnels for reference
+        tunnels = ngrok.get_tunnels()
+        print(f"Active tunnels: {len(tunnels)}")
         
-        while retry_count < max_retries:
-            time.sleep(1)
-            retry_count += 1
-            
-            try:
-                # Check if ngrok process is still running
-                if process.poll() is not None:
-                    # Process has ended, check for errors
-                    stdout, stderr = process.communicate()
-                    print(f"ngrok process ended unexpectedly:")
-                    print(f"STDOUT: {stdout}")
-                    print(f"STDERR: {stderr}")
-                    return None, None
-                
-                # Try to connect to ngrok API
-                api_url = "http://localhost:4040/api/tunnels"
-                with urllib.request.urlopen(api_url, timeout=2) as response:
-                    data = json.loads(response.read().decode())
-                    
-                if data.get('tunnels'):
-                    tunnel_url = data['tunnels'][0]['public_url']
-                    print(f"✓ ngrok tunnel active: {tunnel_url}")
-                    print(f"Players can connect to: {tunnel_url.replace('tcp://', '')}")
-                    return process, tunnel_url
-                else:
-                    print(f"Waiting for tunnel... (attempt {retry_count}/{max_retries})")
-                    
-            except urllib.error.URLError as e:
-                if retry_count % 5 == 0:  # Print every 5 seconds
-                    print(f"Waiting for ngrok API... (attempt {retry_count}/{max_retries})")
-                continue
-            except Exception as e:
-                print(f"Error checking ngrok status: {e}")
-                continue
+        return tunnel, tunnel_url
         
-        # If we get here, we timed out
-        print("Timeout waiting for ngrok to start. Checking process status...")
-        if process.poll() is None:
-            print("ngrok process is still running but API is not responding.")
-            print("You may need to check the ngrok dashboard manually at http://localhost:4040")
-            return process, None
-        else:
-            stdout, stderr = process.communicate()
-            print(f"ngrok process ended during startup:")
-            print(f"STDOUT: {stdout}")
-            print(f"STDERR: {stderr}")
-            return None, None
-            
     except Exception as e:
         print(f"Failed to start ngrok tunnel: {e}")
         return None, None
@@ -451,26 +398,45 @@ def start_server():
         print(f"Failed to start server: {e}")
         return False
 
+def cleanup_ngrok():
+    """Clean up ngrok tunnels on exit"""
+    if PYNGROK_AVAILABLE:
+        try:
+            ngrok.kill()
+            print("✓ ngrok tunnels cleaned up")
+        except:
+            pass
+
 if __name__ == "__main__":
     print("=== Minecraft Server Setup ===")
     
-    # Step 1: Setup Minecraft server
-    if not setup_minecraft_server():
-        print("Setup failed. Cannot start server.")
-        sys.exit(1)
-    
-    # Step 2: Setup ngrok
-    print("\n=== Setting up ngrok ===")
-    if not setup_ngrok():
-        print("ngrok setup failed. Server will start but won't be accessible externally.")
-        ngrok_process = None
-    else:
-        # Step 3: Start ngrok tunnel
-        print("\n=== Starting ngrok tunnel ===")
-        ngrok_process, tunnel_url = start_ngrok_tunnel()
-        if not ngrok_process:
-            print("Failed to start ngrok tunnel. Server will start but won't be accessible externally.")
-    
-    # Step 4: Start the server
-    print("\n=== Starting Minecraft Server ===")
-    start_server()
+    try:
+        # Step 1: Setup Minecraft server
+        if not setup_minecraft_server():
+            print("Setup failed. Cannot start server.")
+            sys.exit(1)
+        
+        # Step 2: Setup ngrok
+        print("\n=== Setting up ngrok ===")
+        if not setup_ngrok():
+            print("ngrok setup failed. Server will start but won't be accessible externally.")
+            tunnel = None
+        else:
+            # Step 3: Start ngrok tunnel
+            print("\n=== Starting ngrok tunnel ===")
+            tunnel, tunnel_url = start_ngrok_tunnel()
+            if not tunnel:
+                print("Failed to start ngrok tunnel. Server will start but won't be accessible externally.")
+        
+        # Step 4: Start the server
+        print("\n=== Starting Minecraft Server ===")
+        start_server()
+        
+    except KeyboardInterrupt:
+        print("\n\nShutting down...")
+        cleanup_ngrok()
+        sys.exit(0)
+    except Exception as e:
+        print(f"Unexpected error: {e}")
+        cleanup_ngrok()
+        sys.exit(1)