Update app.py

app.py

@@ -1,280 +1,159 @@
-import os
 import subprocess
 import threading
 import time
-import shutil
-import zipfile
-import requests
-from datetime import datetime
-from fastapi import FastAPI
-from fastapi.responses import HTMLResponse, JSONResponse
-import uvicorn
-
-app = FastAPI()
+import os
+import socket
+from flask import Flask, jsonify
 
-# Config from env
-SERVER_VERSION  = os.getenv("SERVER_VERSION", "1.20.4")
-MAX_RAM         = os.getenv("MAX_RAM", "10G")
-MIN_RAM         = os.getenv("MIN_RAM", "2G")
-PORT            = int(os.getenv("PORT", "7860"))
-SERVER_PORT     = int(os.getenv("SERVER_PORT", "25565"))
-RCON_PASSWORD   = os.getenv("RCON_PASSWORD", "minecraft")
-MC_PATH         = os.getenv("MINECRAFT_PATH", "/data/minecraft")
-BACKUP_PATH     = os.getenv("BACKUP_PATH", "/data/backups")
-HF_TOKEN        = os.getenv("HF_TOKEN", "")
-HF_DATASET_REPO = os.getenv("HF_DATASET_REPO", "")  # e.g. "username/mc-world-backup"
-SPACE_URL       = os.getenv("SPACE_URL", "")          # e.g. "https://yourname-spacename.hf.space"
+app = Flask(__name__)
 
+# ── Minecraft process handle ─────────────────────────────────────────────────
 mc_process = None
-server_log = []
-start_time = None
-
-# ── helpers ──────────────────────────────────────────────────────────────────
+mc_start_time = None
 
-def log(msg):
-    ts = datetime.now().strftime("%H:%M:%S")
-    entry = f"[{ts}] {msg}"
-    server_log.append(entry)
-    if len(server_log) > 500:
-        server_log.pop(0)
-    print(entry)
-
-def setup_dirs():
-    os.makedirs(MC_PATH, exist_ok=True)
-    os.makedirs(BACKUP_PATH, exist_ok=True)
-
-def download_paper():
-    jar = os.path.join(MC_PATH, "server.jar")
-    if os.path.exists(jar):
-        log("server.jar already present, skipping download")
-        return
-    log(f"Downloading Paper {SERVER_VERSION}...")
-    url = f"https://api.papermc.io/v2/projects/paper/versions/{SERVER_VERSION}/builds"
-    try:
-        builds = requests.get(url, timeout=30).json()["builds"]
-        latest = builds[-1]
-        build_num = latest["build"]
-        jar_name = latest["downloads"]["application"]["name"]
-        dl_url = (f"https://api.papermc.io/v2/projects/paper/versions/{SERVER_VERSION}"
-                  f"/builds/{build_num}/downloads/{jar_name}")
-        r = requests.get(dl_url, stream=True, timeout=120)
-        with open(jar, "wb") as f:
-            for chunk in r.iter_content(8192):
-                f.write(chunk)
-        log("Paper downloaded successfully")
-    except Exception as e:
-        log(f"Download failed: {e}")
+def start_minecraft():
+    global mc_process, mc_start_time
 
-def write_configs():
-    # eula
-    with open(os.path.join(MC_PATH, "eula.txt"), "w") as f:
-        f.write("eula=true\n")
-    # server.properties
-    props_path = os.path.join(MC_PATH, "server.properties")
-    if not os.path.exists(props_path):
-        with open(props_path, "w") as f:
-            f.write(f"""server-port={SERVER_PORT}
-online-mode=false
-difficulty=normal
-gamemode=survival
-max-players=20
-enable-rcon=true
-rcon.port=25575
-rcon.password={RCON_PASSWORD}
-view-distance=8
-simulation-distance=6
-""")
+    # Start Tailscale daemon
+    subprocess.Popen(
+        ["tailscaled", "--tun=userspace-networking", "--socks5-server=localhost:1055"],
+        stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
+    )
+    time.sleep(3)
 
-# ── server lifecycle ──────────────────────────────────────────────────────────
+    # Authenticate Tailscale (only if authkey provided)
+    authkey = os.environ.get("TAILSCALE_AUTHKEY", "")
+    if authkey:
+        subprocess.run(["tailscale", "up", "--authkey", authkey],
+                       stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
-def start_server():
-    global mc_process, start_time
-    setup_dirs()
-    download_paper()
-    write_configs()
-    jar = os.path.join(MC_PATH, "server.jar")
-    cmd = [
-        "java",
-        f"-Xms{MIN_RAM}", f"-Xmx{MAX_RAM}",
-        "-XX:+UseG1GC",
-        "-XX:+ParallelRefProcEnabled",
-        "-XX:MaxGCPauseMillis=200",
-        "-jar", jar, "nogui"
-    ]
-    log("Starting Minecraft server...")
+    # Launch Minecraft with Aikar's flags
+    mc_start_time = time.time()
     mc_process = subprocess.Popen(
-        cmd, cwd=MC_PATH,
-        stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
-        text=True, bufsize=1
+        [
+            "java",
+            "-Xmx4G", "-Xms4G",
+            "-XX:+UseG1GC",
+            "-XX:+ParallelRefProcEnabled",
+            "-XX:MaxGCPauseMillis=200",
+            "-XX:+UnlockExperimentalVMOptions",
+            "-XX:+DisableExplicitGC",
+            "-XX:+AlwaysPreTouch",
+            "-XX:G1NewSizePercent=30",
+            "-XX:G1MaxNewSizePercent=40",
+            "-XX:G1HeapRegionSize=8M",
+            "-XX:G1ReservePercent=20",
+            "-XX:G1HeapWastePercent=5",
+            "-XX:G1MixedGCCountTarget=4",
+            "-XX:InitiatingHeapOccupancyPercent=15",
+            "-XX:G1MixedGCLiveThresholdPercent=90",
+            "-XX:G1RSetUpdatingPauseTimePercent=5",
+            "-XX:SurvivorRatio=32",
+            "-XX:+PerfDisableSharedMem",
+            "-XX:MaxTenuringThreshold=1",
+            "-Dusing.aikars.flags=https://mcflags.emc.gs",
+            "-Daikars.new.flags=true",
+            "-jar", "paper.jar", "nogui"
+        ],
+        cwd="/minecraft",
+        stdout=subprocess.PIPE, stderr=subprocess.STDOUT
     )
-    start_time = datetime.now()
-    # stream stdout
-    def read_output():
-        for line in mc_process.stdout:
-            server_log.append(line.rstrip())
-            if len(server_log) > 500:
-                server_log.pop(0)
-    threading.Thread(target=read_output, daemon=True).start()
-
-def stop_server():
-    global mc_process
-    if mc_process and mc_process.poll() is None:
-        mc_process.terminate()
-        mc_process.wait(timeout=30)
-        mc_process = None
-        log("Server stopped")
-
-def is_running():
-    return mc_process is not None and mc_process.poll() is None
-
-# ── watchdog ─────────────────────────────────────────────────────────────────
-
-def watchdog():
-    """Restart the server if it crashes."""
-    time.sleep(60)  # give initial start time
-    while True:
-        time.sleep(30)
-        if not is_running() and start_time is not None:
-            log("⚠️  Server not running — auto-restarting...")
-            start_server()
-
-# ── self-ping keepalive ───────────────────────────────────────────────────────
 
-def keepalive():
-    """Ping our own /health every 25 min to prevent HF sleep."""
-    time.sleep(120)
-    while True:
-        if SPACE_URL:
-            try:
-                requests.get(f"{SPACE_URL}/health", timeout=10)
-                log("keepalive ping sent")
-            except Exception:
-                pass
-        time.sleep(25 * 60)
 
-# ── world backup to HF Dataset ───────────────────────────────────────────────
-
-def backup_world():
-    """Zip world folder and push to a HF Dataset repo every 30 min."""
-    time.sleep(300)
-    while True:
-        time.sleep(30 * 60)
-        if not HF_TOKEN or not HF_DATASET_REPO:
-            continue
-        try:
-            ts = datetime.now().strftime("%Y%m%d_%H%M")
-            zip_path = f"/tmp/world_backup_{ts}.zip"
-            world_dir = os.path.join(MC_PATH, "world")
-            if not os.path.exists(world_dir):
-                continue
-            log("Creating world backup...")
-            with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED) as z:
-                for root, _, files in os.walk(world_dir):
-                    for file in files:
-                        fp = os.path.join(root, file)
-                        z.write(fp, os.path.relpath(fp, MC_PATH))
-            # Upload via HF API
-            api_url = f"https://huggingface.co/api/datasets/{HF_DATASET_REPO}/upload/world_backup_{ts}.zip"
-            with open(zip_path, "rb") as f:
-                r = requests.put(
-                    api_url,
-                    headers={"Authorization": f"Bearer {HF_TOKEN}"},
-                    data=f,
-                    timeout=120
-                )
-            if r.ok:
-                log(f"World backed up: world_backup_{ts}.zip")
-            else:
-                log(f"Backup upload failed: {r.status_code}")
-            os.remove(zip_path)
-        except Exception as e:
-            log(f"Backup error: {e}")
-
-# ── startup ───────────────────────────────────────────────────────────────────
-
-@app.on_event("startup")
-async def on_startup():
-    threading.Thread(target=start_server, daemon=True).start()
-    threading.Thread(target=watchdog, daemon=True).start()
-    threading.Thread(target=keepalive, daemon=True).start()
-    threading.Thread(target=backup_world, daemon=True).start()
-
-# ── routes ────────────────────────────────────────────────────────────────────
-
-@app.get("/", response_class=HTMLResponse)
-async def index():
-    status = "🟢 Running" if is_running() else "🔴 Stopped"
-    uptime = ""
-    if start_time and is_running():
-        delta = datetime.now() - start_time
-        h, rem = divmod(int(delta.total_seconds()), 3600)
-        m, s   = divmod(rem, 60)
-        uptime = f"{h}h {m}m {s}s"
-    logs_html = "\n".join(server_log[-60:])
-    return f"""<!DOCTYPE html>
-<html><head>
-<title>Minecraft Server Manager</title>
-<meta http-equiv="refresh" content="15">
-<style>
-  body{{font-family:monospace;background:#1a1a2e;color:#e0e0e0;margin:0;padding:20px}}
-  h1{{color:#00d4ff}} .card{{background:#16213e;border-radius:8px;padding:16px;margin:12px 0}}
-  .status{{font-size:1.4em;font-weight:bold}}
-  pre{{background:#0f0f23;padding:12px;border-radius:6px;max-height:400px;overflow-y:auto;font-size:0.8em}}
-  button{{padding:10px 24px;border:none;border-radius:6px;cursor:pointer;font-size:1em;margin:4px}}
-  .start{{background:#00b894;color:#fff}} .stop{{background:#d63031;color:#fff}}
-</style>
-</head><body>
-<h1>🎮 Minecraft Server Manager</h1>
-<div class="card">
-  <div class="status">{status}</div>
-  {"<div>Uptime: "+uptime+"</div>" if uptime else ""}
-  <div>Version: {SERVER_VERSION} | RAM: {MIN_RAM}–{MAX_RAM}</div>
-</div>
-<div class="card">
-  <form action="/start" method="post" style="display:inline">
-    <button class="start" type="submit">▶ Start</button>
-  </form>
-  <form action="/stop" method="post" style="display:inline">
-    <button class="stop" type="submit">⏹ Stop</button>
-  </form>
-  <form action="/backup" method="post" style="display:inline">
-    <button style="background:#6c5ce7;color:#fff" type="submit">💾 Backup Now</button>
-  </form>
-</div>
-<div class="card">
-  <b>Server Logs</b>
-  <pre>{logs_html}</pre>
-</div>
-</body></html>"""
-
-@app.get("/health")
-async def health():
-    return JSONResponse({"status": "running" if is_running() else "stopped", "uptime_ok": True})
-
-@app.post("/start")
-async def api_start():
-    if not is_running():
-        threading.Thread(target=start_server, daemon=True).start()
-    from fastapi.responses import RedirectResponse
-    return RedirectResponse("/", status_code=303)
-
-@app.post("/stop")
-async def api_stop():
-    stop_server()
-    from fastapi.responses import RedirectResponse
-    return RedirectResponse("/", status_code=303)
-
-@app.post("/backup")
-async def api_backup():
-    threading.Thread(target=backup_world, daemon=True).start()
-    from fastapi.responses import RedirectResponse
-    return RedirectResponse("/", status_code=303)
-
-@app.get("/logs")
-async def api_logs():
-    return JSONResponse({"logs": server_log[-100:]})
-
-# ── main ──────────────────────────────────────────────────────────────────────
+def is_minecraft_port_open():
+    """Check if Minecraft port 25565 is accepting connections."""
+    try:
+        with socket.create_connection(("127.0.0.1", 25565), timeout=2):
+            return True
+    except OSError:
+        return False
+
+
+def get_uptime():
+    if mc_start_time is None:
+        return "Not started"
+    elapsed = int(time.time() - mc_start_time)
+    h, m, s = elapsed // 3600, (elapsed % 3600) // 60, elapsed % 60
+    return f"{h}h {m}m {s}s"
+
+
+# ── Routes ───────────────────────────────────────────────────────────────────
+
+@app.route("/")
+def index():
+    mc_alive = mc_process is not None and mc_process.poll() is None
+    port_open = is_minecraft_port_open()
+    status = "🟢 Running" if mc_alive else "🔴 Stopped"
+    port_status = "🟢 Open" if port_open else "🟡 Starting…"
+
+    html = f"""<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta http-equiv="refresh" content="30">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Minecraft Server Status</title>
+  <style>
+    body {{
+      font-family: 'Segoe UI', sans-serif;
+      background: #1a1a2e; color: #eee;
+      display: flex; align-items: center; justify-content: center;
+      min-height: 100vh; margin: 0;
+    }}
+    .card {{
+      background: #16213e; border-radius: 16px;
+      padding: 40px 50px; text-align: center;
+      box-shadow: 0 8px 32px rgba(0,0,0,0.4);
+      max-width: 480px; width: 90%;
+    }}
+    h1 {{ margin: 0 0 8px; font-size: 1.8rem; color: #e94560; }}
+    .subtitle {{ color: #888; margin-bottom: 28px; font-size: 0.95rem; }}
+    .row {{ display: flex; justify-content: space-between;
+            padding: 12px 0; border-bottom: 1px solid #0f3460; }}
+    .row:last-child {{ border-bottom: none; }}
+    .label {{ color: #aaa; }}
+    .value {{ font-weight: 600; }}
+    .footer {{ margin-top: 24px; font-size: 0.8rem; color: #555; }}
+  </style>
+</head>
+<body>
+  <div class="card">
+    <h1>⛏ Minecraft Server</h1>
+    <p class="subtitle">Paper 1.21.11 &nbsp;|&nbsp; Auto-refreshes every 30s</p>
+    <div class="row"><span class="label">Process</span><span class="value">{status}</span></div>
+    <div class="row"><span class="label">Port 25565</span><span class="value">{port_status}</span></div>
+    <div class="row"><span class="label">Uptime</span><span class="value">{get_uptime()}</span></div>
+    <div class="row"><span class="label">Version</span><span class="value">Paper 1.21.11</span></div>
+    <p class="footer">Connect via your Tailscale IP on port 25565</p>
+  </div>
+</body>
+</html>"""
+    return html
+
+
+@app.route("/health")
+def health():
+    """Hugging Face health-check endpoint — always returns 200."""
+    return jsonify({"status": "ok"}), 200
+
+
+@app.route("/api/status")
+def api_status():
+    mc_alive = mc_process is not None and mc_process.poll() is None
+    return jsonify({
+        "minecraft_running": mc_alive,
+        "port_open": is_minecraft_port_open(),
+        "uptime": get_uptime(),
+        "version": "Paper 1.21.11"
+    })
+
+
+# ── Entry point ──────────────────────────────────────────────────────────────
 
 if __name__ == "__main__":
-    uvicorn.run(app, host="0.0.0.0", port=PORT)
+    # Start Minecraft in a background thread so Flask starts immediately
+    t = threading.Thread(target=start_minecraft, daemon=True)
+    t.start()
+
+    # Flask must bind 0.0.0.0:7860 for Hugging Face Spaces
+    app.run(host="0.0.0.0", port=7860, threaded=True)