Spaces:

misukisu
/

world

Paused

App Files Files Community

misukisu commited on 6 days ago

Commit

4941a65

verified ·

1 Parent(s): cb8b795

Update app.py

Browse files

Files changed (1) hide show

app.py +68 -42

app.py CHANGED Viewed

@@ -1,65 +1,91 @@
 import http.server
 import socketserver
 import os
-import re
 PORT = 7860
-LOG_FILE = "/bedrock/server_combined.log"
-HTML_TEMPLATE = """<!DOCTYPE html>
 <html>
 <head>
-    <title>Bedrock Server Console</title>
     <meta http-equiv="refresh" content="3">
     <style>
-        body { font-family: monospace; background: #121212; color: #e0e0e0; padding: 20px; }
-        .box { background: #1e1e1e; padding: 15px; border-radius: 8px; border: 1px solid #333; margin-bottom: 20px; }
-        .claim { background: #2e4a2e; color: #a3e635; padding: 10px; border-radius: 5px; font-size: 16px; font-weight: bold; }
-        pre { white-space: pre-wrap; word-wrap: break-word; font-size: 13px; color: #d4d4d4; }
-        a { color: #38bdf8; text-decoration: underline; }
     </style>
 </head>
 <body>
-    <h2>🧱 Hugging Face Bedrock Server</h2>
-    <div class="box">
-        <h3>🔗 playit.gg Claim URL:</h3>
-        <p class="claim">{claim_url}</p>
     </div>
-    <div class="box">
         <h3>📜 Live Console Output:</h3>
-        <pre>{logs}</pre>
     </div>
 </body>
-</html>
-"""
-class Handler(http.server.SimpleHTTPRequestHandler):
-    def do_GET(self):
-        logs = "Starting Bedrock..."
-        claim_url = "Waiting for playit.gg claim link..."
-        if os.path.exists(LOG_FILE):
-            try:
-                with open(LOG_FILE, "r", errors="ignore") as f:
-                    all_lines = f.readlines()
-                    logs = "".join(all_lines[-100:])
-                    match = re.search(r'(https://playit\.gg/claim/[a-zA-Z0-9]+)', logs)
-                    if match:
-                        url = match.group(1)
-                        claim_url = f'<a href="{url}" target="_blank">{url}</a> (Click to link to your playit account)'
-                    elif "playit" in logs.lower() and "ready" in logs.lower():
-                        claim_url = "Tunnel active! Check your playit.gg dashboard for your public Bedrock IP & Port."
-            except Exception as e:
-                logs = f"Error reading logs: {e}"
-        html = HTML_TEMPLATE.format(claim_url=claim_url, logs=logs)
         self.send_response(200)
         self.send_header("Content-type", "text/html; charset=utf-8")
         self.end_headers()
         self.wfile.write(html.encode("utf-8"))
-with socketserver.TCPServer(("", PORT), Handler) as httpd:
-    print(f"Web interface running on port {PORT}")
     httpd.serve_forever()

 import http.server
 import socketserver
+import subprocess
+import threading
 import os
+import time
 PORT = 7860
+logs = []
+def stream_process(proc, prefix):
+    for line in iter(proc.stdout.readline, ""):
+        if line:
+            formatted = f"[{prefix}] {line.strip()}"
+            print(formatted, flush=True)
+            logs.append(formatted)
+            if len(logs) > 200:
+                logs.pop(0)
+def start_services():
+    # 1. Start playit tunnel
+    playit_proc = subprocess.Popen(
+        ["playit"],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+        text=True,
+        bufsize=1
+    )
+    threading.Thread(target=stream_process, args=(playit_proc, "PLAYIT"), daemon=True).start()
+    # 2. Start Bedrock server
+    env = os.environ.copy()
+    env["LD_LIBRARY_PATH"] = "/app"
+    bedrock_proc = subprocess.Popen(
+        ["./bedrock_server"],
+        cwd="/app",
+        env=env,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+        text=True,
+        bufsize=1
+    )
+    threading.Thread(target=stream_process, args=(bedrock_proc, "BEDROCK"), daemon=True).start()
+# Start background services
+start_services()
+class WebHandler(http.server.SimpleHTTPRequestHandler):
+    def do_GET(self):
+        log_text = "\n".join(logs)
+        claim_url = "Looking for claim URL in logs..."
+        for line in logs:
+            if "playit.gg/claim/" in line:
+                parts = line.split()
+                for p in parts:
+                    if "playit.gg/claim/" in p:
+                        claim_url = f'<a href="{p}" target="_blank" style="color:#4ade80;">{p}</a>'
+                        break
+        html = f"""<!DOCTYPE html>
 <html>
 <head>
+    <title>Bedrock Server</title>
     <meta http-equiv="refresh" content="3">
     <style>
+        body {{ background: #0f172a; color: #f8fafc; font-family: monospace; padding: 20px; }}
+        .card {{ background: #1e293b; border-radius: 8px; padding: 15px; margin-bottom: 15px; }}
+        pre {{ white-space: pre-wrap; font-size: 12px; color: #cbd5e1; }}
     </style>
 </head>
 <body>
+    <h2>🎮 Minecraft Bedrock Server</h2>
+    <div class="card">
+        <h3>🔗 Playit Claim Link:</h3>
+        <p>{claim_url}</p>
     </div>
+    <div class="card">
         <h3>📜 Live Console Output:</h3>
+        <pre>{log_text if log_text else 'Starting processes...'}</pre>
     </div>
 </body>
+</html>"""
         self.send_response(200)
         self.send_header("Content-type", "text/html; charset=utf-8")
         self.end_headers()
         self.wfile.write(html.encode("utf-8"))
+with socketserver.TCPServer(("", PORT), WebHandler) as httpd:
+    print(f"Server console online at port {PORT}", flush=True)
     httpd.serve_forever()