Add body-read fallback + request diagnostics (ver marker)

control.py

@@ -4,6 +4,7 @@ import hmac
 import json
 import os
 import signal
+import socket
 import subprocess
 import sys
 import threading
@@ -12,6 +13,8 @@ from collections import deque
 from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
 from urllib.parse import parse_qs, urlparse
 
+BUILD = "diag-1"
+
 DATA_DIR = os.environ.get("MC_DATA", "/data")
 JAR = os.environ.get("MC_JAR", "/server/minecraft_server.26.3.jar")
 MEM = os.environ.get("MC_MEM", "4G")
@@ -227,6 +230,7 @@ class MCController:
             "mem_gb": round(rss / (1024 * 1024), 2),
             "playit": self.playit_state(),
             "mem_heap": MEM,
+            "ver": BUILD,
         }
 
     @staticmethod
@@ -295,17 +299,17 @@ class Handler(BaseHTTPRequestHandler):
     def _json(self, code, obj):
         self._send(code, json.dumps(obj, separators=(",", ":")), "application/json")
 
-    def _read_json(self):
-        raw = self._read_body()
-        if not raw:
-            return None
+    def _read_post(self):
+        raw = self._read_body() or b""
         try:
-            return json.loads(raw.decode("utf-8"))
+            obj = json.loads(raw.decode("utf-8")) if raw else None
         except (ValueError, json.JSONDecodeError):
-            return None
+            obj = None
+        return obj, raw
 
     def _read_body(self):
-        if self.headers.get("Transfer-Encoding", "").lower() == "chunked":
+        te = (self.headers.get("Transfer-Encoding") or "").lower()
+        if te == "chunked":
             data = bytearray()
             while True:
                 size_line = self.rfile.readline().strip()
@@ -319,10 +323,26 @@ class Handler(BaseHTTPRequestHandler):
                 data += self.rfile.read(size)
                 self.rfile.readline()
             return bytes(data)
-        n = int(self.headers.get("Content-Length") or 0)
-        if n <= 0 or n > 1 << 20:
-            return None
-        return self.rfile.read(n)
+        cl = int(self.headers.get("Content-Length") or 0)
+        if 0 < cl <= 1 << 20:
+            return self.rfile.read(cl)
+        sock = self.connection
+        sock.settimeout(0.5)
+        try:
+            data = bytearray()
+            while True:
+                try:
+                    chunk = self.rfile.read(4096)
+                except (socket.timeout, OSError):
+                    break
+                if not chunk:
+                    break
+                data += chunk
+                if len(data) > 1 << 20:
+                    break
+            return bytes(data) if data else None
+        finally:
+            sock.settimeout(None)
 
     def log_message(self, fmt, *args):
         pass
@@ -347,7 +367,8 @@ class Handler(BaseHTTPRequestHandler):
 
     def do_POST(self):
         u = urlparse(self.path)
-        body = self._read_json() or {}
+        body, raw = self._read_post()
+        body = body or {}
         if u.path == "/api/login":
             if CONTROL_PASSWORD and body.get("password") == CONTROL_PASSWORD:
                 self._json(200, {"ok": True, "token": token_for(CONTROL_PASSWORD)})
@@ -362,7 +383,20 @@ class Handler(BaseHTTPRequestHandler):
                 self._json(401, {"ok": False, "error": "auth required"})
                 return
             ok, msg = controller.send_command(body.get("cmd", ""))
-            self._json(200 if ok else 400, {"ok": ok, "error": msg})
+            if not ok and not body:
+                self._json(400, {
+                    "ok": False,
+                    "error": msg,
+                    "diag": {
+                        "cl": self.headers.get("Content-Length"),
+                        "te": self.headers.get("Transfer-Encoding"),
+                        "ct": self.headers.get("Content-Type"),
+                        "proto": self.request_version,
+                        "raw": raw[:64].decode("utf-8", "replace"),
+                    },
+                })
+            else:
+                self._json(200 if ok else 400, {"ok": ok, "error": msg})
         elif u.path == "/api/action":
             if not auth_ok(self.headers.get("X-Token", "")):
                 self._json(401, {"ok": False, "error": "auth required"})