wpmfun

Paused

App Files Files Community

srinetwork commited on Apr 10

Commit

2e5d75b

verified ·

1 Parent(s): e0f3430

Update Dockerfile

Browse files

Files changed (1) hide show

Dockerfile +354 -58

Dockerfile CHANGED Viewed

@@ -3,13 +3,17 @@ FROM openjdk:21-jdk-slim
 # Install required packages
 RUN apt-get update && apt-get install -y \
     python3 \
     curl \
     git \
     && rm -rf /var/lib/apt/lists/*
 WORKDIR /app
-# Create startup script with health check server (REQUIRED for HF Spaces)
 RUN cat > start.sh << 'EOF'
 #!/bin/bash
 set -e
@@ -17,14 +21,14 @@ set -e
 cd /app
 echo "=========================================="
-echo "🚀 Starting Minecraft Server on HF Spaces"
 echo "⏰ $(date)"
 echo "=========================================="
 # Clone private repo (requires GITHUB_TOKEN)
 if [ -n "$GITHUB_TOKEN" ]; then
     echo "📥 Cloning Minecraft server from GitHub..."
-    git clone https://$GITHUB_TOKEN@github.com/Walukapah/mcserver.git mcserver
     cd mcserver
     echo "✅ Repository cloned successfully"
 else
@@ -39,6 +43,16 @@ if [ ! -f eula.txt ]; then
     echo "✅ EULA accepted"
 fi
 # Create backup script
 cat > /app/backup.sh << 'BACKUPSCRIPT'
 #!/bin/bash
@@ -60,7 +74,7 @@ BACKUPSCRIPT
 chmod +x /app/backup.sh
-# Start backup loop in background (every 5 minutes to avoid rate limits)
 (
     while true; do
         sleep 300
@@ -75,81 +89,363 @@ echo "✅ Auto-backup enabled (every 5 minutes)"
 echo ""
 # ==========================================
-# HF Spaces Health Check Server (REQUIRED)
-# This keeps the Space in "Running" state
 # ==========================================
-cat > /app/health_server.py << 'PYTHON_SCRIPT'
-import http.server
-import socketserver
-import subprocess
 import os
 import json
 import threading
 import time
-class Handler(http.server.BaseHTTPRequestHandler):
-    def do_GET(self):
-        self.send_response(200)
-        self.send_header('Content-type', 'application/json')
-        self.send_header('Access-Control-Allow-Origin', '*')
-        self.end_headers()
-        # Check if Minecraft is running
         try:
-            # Check if Java process is running
-            result = subprocess.run(['pgrep', '-f', 'server.jar'], capture_output=True)
-            mc_running = result.returncode == 0
         except:
-            mc_running = False
-        # Get server stats
         try:
-            import psutil
-            cpu = psutil.cpu_percent(interval=0.1)
-            memory = psutil.virtual_memory().percent
         except:
-            cpu = 0
-            memory = 0
-        status = {
-            'status': 'running',
-            'minecraft': 'online' if mc_running else 'offline',
-            'cpu_percent': cpu,
-            'memory_percent': memory,
-            'timestamp': time.strftime('%Y-%m-%d %H:%M:%S')
-        }
-        self.wfile.write(json.dumps(status).encode())
-    def log_message(self, format, *args):
-        # Suppress health check logs to avoid spam
-        pass
-# Start health check server on port 7860 (HF Spaces requirement)
-PORT = 7860
-with socketserver.TCPServer(('0.0.0.0', PORT), Handler) as httpd:
-    print(f'🏥 Health server running on port {PORT}')
-    httpd.serve_forever()
 PYTHON_SCRIPT
-# Start health check server in background
-echo "🏥 Starting health check server on port 7860..."
-python3 /app/health_server.py &
-# Wait a moment for health server to start
-sleep 2
 echo ""
-echo "⛏️  Starting Minecraft Server..."
-echo "💡 Logs will appear below:"
 echo "=========================================="
-# Start Minecraft server in foreground
-exec java -Xms1G -Xmx14G -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -jar server.jar nogui
 EOF
 RUN chmod +x start.sh
-# HF Spaces requires port 7860 for health checks
-EXPOSE 25565 25575 7860
 CMD ["./start.sh"]

 # Install required packages
 RUN apt-get update && apt-get install -y \
     python3 \
+    python3-pip \
     curl \
     git \
     && rm -rf /var/lib/apt/lists/*
+# Install Python WebSocket and Flask
+RUN pip3 install flask flask-sock psutil --break-system-packages
 WORKDIR /app
+# Create startup script with web terminal
 RUN cat > start.sh << 'EOF'
 #!/bin/bash
 set -e
 cd /app
 echo "=========================================="
+echo "🚀 Starting Minecraft Server with Web Terminal"
 echo "⏰ $(date)"
 echo "=========================================="
 # Clone private repo (requires GITHUB_TOKEN)
 if [ -n "$GITHUB_TOKEN" ]; then
     echo "📥 Cloning Minecraft server from GitHub..."
+    git clone https://$GITHUB_TOKEN@github.com/Walukapah/bungemcserver.git mcserver
     cd mcserver
     echo "✅ Repository cloned successfully"
 else
     echo "✅ EULA accepted"
 fi
+# Enable RCON for web terminal control
+if ! grep -q "enable-rcon=true" server.properties 2>/dev/null; then
+    echo "" >> server.properties
+    echo "enable-rcon=true" >> server.properties
+    echo "rcon.port=25575" >> server.properties
+    echo "rcon.password=mcadmin123" >> server.properties
+    echo "broadcast-rcon-to-ops=true" >> server.properties
+    echo "✅ RCON enabled for web terminal"
+fi
 # Create backup script
 cat > /app/backup.sh << 'BACKUPSCRIPT'
 #!/bin/bash
 chmod +x /app/backup.sh
+# Start backup loop in background (every 5 minutes)
 (
     while true; do
         sleep 300
 echo ""
 # ==========================================
+# WEB TERMINAL SERVER (Flask + WebSocket)
 # ==========================================
+cat > /app/web_terminal.py << 'PYTHON_SCRIPT'
 import os
+import sys
+import subprocess
 import json
 import threading
 import time
+import queue
+from flask import Flask, render_template_string
+from flask_sock import Sock
+import psutil
+app = Flask(__name__)
+sock = Sock(app)
+# Global variables for process management
+mc_process = None
+output_queue = queue.Queue()
+command_queue = queue.Queue()
+def start_minecraft():
+    global mc_process
+    mc_dir = "/app/mcserver"
+    # Start Minecraft server with stdin/stdout pipes
+    mc_process = subprocess.Popen(
+        ["java", "-Xms1G", "-Xmx14G", "-XX:+UseG1GC",
+         "-XX:+ParallelRefProcEnabled", "-XX:MaxGCPauseMillis=200",
+         "-jar", "server.jar", "nogui"],
+        cwd=mc_dir,
+        stdin=subprocess.PIPE,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+        text=True,
+        bufsize=1
+    )
+    # Read output and put in queue
+    def read_output():
+        for line in mc_process.stdout:
+            output_queue.put(line)
+    threading.Thread(target=read_output, daemon=True).start()
+    # Process commands from queue
+    def process_commands():
+        while True:
+            try:
+                cmd = command_queue.get(timeout=0.1)
+                if mc_process and mc_process.poll() is None:
+                    mc_process.stdin.write(cmd + "\n")
+                    mc_process.stdin.flush()
+            except queue.Empty:
+                continue
+            except:
+                break
+    threading.Thread(target=process_commands, daemon=True).start()
+# HTML Template with xterm.js
+HTML_TEMPLATE = '''
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Minecraft Server - Web Terminal</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/xterm@5.3.0/css/xterm.css" />
+    <style>
+        body {
+            margin: 0;
+            padding: 0;
+            background: #1e1e1e;
+            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+        }
+        .header {
+            background: #2d2d2d;
+            color: #fff;
+            padding: 15px 20px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            border-bottom: 3px solid #4CAF50;
+        }
+        .header h1 {
+            margin: 0;
+            font-size: 20px;
+            display: flex;
+            align-items: center;
+            gap: 10px;
+        }
+        .status {
+            display: flex;
+            align-items: center;
+            gap: 15px;
+        }
+        .status-badge {
+            background: #4CAF50;
+            color: white;
+            padding: 5px 15px;
+            border-radius: 20px;
+            font-size: 12px;
+            font-weight: bold;
+        }
+        .status-badge.offline {
+            background: #f44336;
+        }
+        .terminal-container {
+            padding: 20px;
+            height: calc(100vh - 80px);
+        }
+        #terminal {
+            width: 100%;
+            height: 100%;
+            background: #000;
+            border-radius: 8px;
+            padding: 10px;
+        }
+        .quick-cmds {
+            position: fixed;
+            bottom: 20px;
+            right: 20px;
+            display: flex;
+            gap: 10px;
+            flex-wrap: wrap;
+            max-width: 400px;
+            justify-content: flex-end;
+        }
+        .quick-cmds button {
+            background: #4CAF50;
+            color: white;
+            border: none;
+            padding: 8px 16px;
+            border-radius: 5px;
+            cursor: pointer;
+            font-size: 12px;
+            transition: all 0.3s;
+        }
+        .quick-cmds button:hover {
+            background: #45a049;
+            transform: scale(1.05);
+        }
+        .quick-cmds button.danger {
+            background: #f44336;
+        }
+        .quick-cmds button.danger:hover {
+            background: #da190b;
+        }
+    </style>
+</head>
+<body>
+    <div class="header">
+        <h1>
+            <span>⛏️</span>
+            Minecraft Server Console
+        </h1>
+        <div class="status">
+            <span id="cpu">CPU: --%</span>
+            <span id="memory">RAM: --%</span>
+            <span class="status-badge" id="status">ONLINE</span>
+        </div>
+    </div>
+    <div class="terminal-container">
+        <div id="terminal"></div>
+    </div>
+    <div class="quick-cmds">
+        <button onclick="sendCmd('help')">Help</button>
+        <button onclick="sendCmd('list')">Players</button>
+        <button onclick="sendCmd('save-all')">Save World</button>
+        <button onclick="sendCmd('say Server restart in 30s!')">Broadcast</button>
+        <button class="danger" onclick="sendCmd('stop')">Stop Server</button>
+    </div>
+    <script src="https://cdn.jsdelivr.net/npm/xterm@5.3.0/lib/xterm.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/xterm-addon-fit@0.8.0/lib/xterm-addon-fit.min.js"></script>
+    <script>
+        const term = new Terminal({
+            fontSize: 14,
+            fontFamily: 'Consolas, "Courier New", monospace',
+            cursorBlink: true,
+            theme: {
+                background: '#000000',
+                foreground: '#00ff00',
+                cursor: '#00ff00',
+                selection: '#4CAF50'
+            },
+            scrollback: 10000,
+            cols: 120,
+            rows: 40
+        });
+        const fitAddon = new FitAddon.FitAddon();
+        term.loadAddon(fitAddon);
+        term.open(document.getElementById('terminal'));
+        fitAddon.fit();
+        // Connect to WebSocket
+        const ws = new WebSocket('ws://' + window.location.host + '/ws');
+        let inputBuffer = '';
+        ws.onopen = () => {
+            term.writeln('\\r\\n');
+            term.writeln('\\x1b[32m╔════════════════════════════════════════╗\\x1b[0m');
+            term.writeln('\\x1b[32m║     Minecraft Server Web Terminal      ║\\x1b[0m');
+            term.writeln('\\x1b[32m╚════════════════════════════════════════╝\\x1b[0m');
+            term.writeln('');
+            term.writeln('\\x1b[33mConnected to server console...\\x1b[0m');
+            term.writeln('');
+        };
+        ws.onmessage = (event) => {
+            const data = JSON.parse(event.data);
+            if (data.type === 'output') {
+                term.write(data.data);
+            } else if (data.type === 'stats') {
+                document.getElementById('cpu').textContent = 'CPU: ' + data.cpu + '%';
+                document.getElementById('memory').textContent = 'RAM: ' + data.memory + '%';
+                if (!data.running) {
+                    document.getElementById('status').textContent = 'OFFLINE';
+                    document.getElementById('status').classList.add('offline');
+                }
+            }
+        };
+        ws.onclose = () => {
+            term.writeln('\\r\\n\\x1b[31m[Disconnected from server]\\x1b[0m');
+        };
+        // Handle input
+        term.onData((data) => {
+            const code = data.charCodeAt(0);
+            if (code === 13) { // Enter
+                ws.send(JSON.stringify({type: 'command', data: inputBuffer}));
+                inputBuffer = '';
+                term.write('\\r\\n');
+            } else if (code === 127) { // Backspace
+                if (inputBuffer.length > 0) {
+                    inputBuffer = inputBuffer.slice(0, -1);
+                    term.write('\\b \\b');
+                }
+            } else if (code >= 32 && code <= 126) { // Printable chars
+                inputBuffer += data;
+                term.write(data);
+            }
+        });
+        // Quick command sender
+        function sendCmd(cmd) {
+            ws.send(JSON.stringify({type: 'command', data: cmd}));
+            term.writeln('');
+            term.writeln('\\x1b[36m[Quick Command] ' + cmd + '\\x1b[0m');
+        }
+        // Resize handling
+        window.addEventListener('resize', () => {
+            fitAddon.fit();
+        });
+    </script>
+</body>
+</html>
+'''
+@app.route('/')
+def index():
+    return render_template_string(HTML_TEMPLATE)
+@app.route('/health')
+def health():
+    return {'status': 'running', 'minecraft': mc_process is not None and mc_process.poll() is None}
+@sock.route('/ws')
+def websocket(ws):
+    # Send initial output history
+    buffer = []
+    while not output_queue.empty() and len(buffer) < 100:
         try:
+            buffer.append(output_queue.get_nowait())
         except:
+            break
+    for line in buffer:
+        ws.send(json.dumps({'type': 'output', 'data': line}))
+    def send_output():
+        while True:
+            try:
+                line = output_queue.get(timeout=0.1)
+                ws.send(json.dumps({'type': 'output', 'data': line}))
+            except queue.Empty:
+                # Send stats periodically
+                try:
+                    cpu = psutil.cpu_percent(interval=0.1)
+                    memory = psutil.virtual_memory().percent
+                    running = mc_process is not None and mc_process.poll() is None
+                    ws.send(json.dumps({
+                        'type': 'stats',
+                        'cpu': cpu,
+                        'memory': memory,
+                        'running': running
+                    }))
+                except:
+                    pass
+                time.sleep(1)
+            except:
+                break
+    output_thread = threading.Thread(target=send_output, daemon=True)
+    output_thread.start()
+    # Receive commands
+    while True:
         try:
+            data = ws.receive()
+            msg = json.loads(data)
+            if msg.get('type') == 'command':
+                command_queue.put(msg.get('data', ''))
         except:
+            break
+if __name__ == '__main__':
+    # Start Minecraft in background thread
+    mc_thread = threading.Thread(target=start_minecraft, daemon=True)
+    mc_thread.start()
+    # Wait for Minecraft to start
+    time.sleep(5)
+    # Start Flask server
+    app.run(host='0.0.0.0', port=7860, threaded=True)
 PYTHON_SCRIPT
+echo "🌐 Starting Web Terminal Server on port 7860..."
+python3 /app/web_terminal.py &
 echo ""
+echo "✅ Web Terminal ready at: http://your-domain:7860"
+echo "💡 Minecraft logs will stream to the web terminal"
 echo "=========================================="
+# Keep script running
+while true; do
+    sleep 10
+    # Check if processes are running
+    if ! pgrep -f "web_terminal.py" > /dev/null; then
+        echo "❌ Web terminal crashed, restarting..."
+        python3 /app/web_terminal.py &
+    fi
+done
 EOF
 RUN chmod +x start.sh
+# HF Spaces required port
+EXPOSE 7860 25565 25575
 CMD ["./start.sh"]