Update app.py

app.py

@@ -44,18 +44,32 @@ def load_env_vars():
         'NGROK_TOKEN': ngrok_token
     }
 
+def get_platform():
+    """Detect the platform architecture"""
+    import platform
+    machine = platform.machine().lower()
+    if 'x86_64' in machine or 'amd64' in machine:
+        return "linux_x64"
+    elif 'aarch64' in machine or 'arm64' in machine:
+        return "linux_aarch64"
+    else:
+        print(f"Unsupported architecture: {machine}")
+        return "linux_x64"  # Default fallback
+
 def check_ngrok():
     """Check if ngrok is available and return the path"""
+    print("Checking for ngrok...")
+    
     # Check system PATH first
     ngrok_path = shutil.which("ngrok")
     if ngrok_path:
         try:
             result = subprocess.run([ngrok_path, "version"], capture_output=True, text=True)
-            print(f"Found ngrok: {ngrok_path}")
+            print(f"Found ngrok in PATH: {ngrok_path}")
             print(f"Version: {result.stdout.strip()}")
             return ngrok_path
-        except:
-            pass
+        except Exception as e:
+            print(f"Error checking system ngrok: {e}")
     
     # Check our custom ngrok installation
     custom_ngrok = NGROK_DIR / "ngrok"
@@ -65,9 +79,10 @@ def check_ngrok():
             print(f"Found custom ngrok: {custom_ngrok}")
             print(f"Version: {result.stdout.strip()}")
             return str(custom_ngrok)
-        except:
-            pass
+        except Exception as e:
+            print(f"Error checking custom ngrok: {e}")
     
+    print("ngrok not found")
     return None
 
 def install_ngrok():
@@ -105,6 +120,8 @@ def install_ngrok():
 
 def setup_ngrok():
     """Setup ngrok with authentication token"""
+    print("Setting up ngrok...")
+    
     env_vars = load_env_vars()
     ngrok_token = env_vars.get('NGROK_TOKEN')
     
@@ -145,12 +162,13 @@ def setup_ngrok():
 
 def start_ngrok_tunnel(port=25565):
     """Start ngrok tunnel for the Minecraft server"""
+    print(f"Starting ngrok tunnel for port {port}...")
+    
     ngrok_path = check_ngrok()
     if not ngrok_path:
         print("ngrok not found. Run setup first.")
-        return None
+        return None, None
     
-    print(f"Starting ngrok tunnel for port {port}...")
     try:
         # Start ngrok in background
         process = subprocess.Popen([
@@ -160,9 +178,6 @@ def start_ngrok_tunnel(port=25565):
         # Give ngrok a moment to start
         import time
         time.sleep(3)
-        stdout, stderr = process.communicate(timeout=1)  # Add timeout to avoid hanging
-        print("STDOUT:", stdout)
-        print("STDERR:", stderr)
         
         # Try to get the tunnel URL from ngrok API
         try:
@@ -217,16 +232,6 @@ def check_java():
             pass
     
     return None
-    """Detect the platform architecture"""
-    import platform
-    machine = platform.machine().lower()
-    if 'x86_64' in machine or 'amd64' in machine:
-        return "linux_x64"
-    elif 'aarch64' in machine or 'arm64' in machine:
-        return "linux_aarch64"
-    else:
-        print(f"Unsupported architecture: {machine}")
-        return "linux_x64"  # Default fallback
 
 def download_file(url, destination):
     print(f"Downloading {url}...")
@@ -417,8 +422,25 @@ def start_server():
         return False
 
 if __name__ == "__main__":
-    if setup_minecraft_server():
-        start_ngrok_tunnel()
-        start_server()
+    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:
-        print("Setup failed. Cannot start server.")
+        # 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()