diff --git a/files/usr/sbin/owrt-remote b/files/usr/sbin/owrt-remote index be8b29f..8da2488 100644 --- a/files/usr/sbin/owrt-remote +++ b/files/usr/sbin/owrt-remote @@ -294,13 +294,6 @@ post_json() { token="$2" file="$3" - if command -v uclient-fetch >/dev/null 2>&1; then - uclient-fetch -q -O - \ - --header="Authorization: Bearer $token" \ - --header="Content-Type: application/json" \ - --post-file="$file" "$url" - return - fi if command -v wget >/dev/null 2>&1; then wget -q -O - \ --header="Authorization: Bearer $token" \ @@ -315,6 +308,13 @@ post_json() { --data-binary "@$file" "$url" return fi + if command -v uclient-fetch >/dev/null 2>&1; then + uclient-fetch -q -O - \ + --header="Authorization: Bearer $token" \ + --header="Content-Type: application/json" \ + --post-file="$file" "$url" + return + fi die "для heartbeat нужен uclient-fetch, wget или curl" } diff --git a/vps/owrt-remote-hub.py b/vps/owrt-remote-hub.py index 6f4a483..8c3c0fb 100644 --- a/vps/owrt-remote-hub.py +++ b/vps/owrt-remote-hub.py @@ -690,6 +690,20 @@ class Handler(BaseHTTPRequestHandler): return False def read_body(self): + if self.headers.get("Transfer-Encoding", "").lower() == "chunked": + chunks = [] + while True: + line = self.rfile.readline().strip() + if not line: + continue + size = int(line.split(b";", 1)[0], 16) + if size == 0: + while self.rfile.readline().strip(): + pass + break + chunks.append(self.rfile.read(size)) + self.rfile.read(2) + return b"".join(chunks) length = int(self.headers.get("Content-Length", "0") or "0") return self.rfile.read(length) if length else b"" @@ -743,6 +757,7 @@ class Handler(BaseHTTPRequestHandler): router = heartbeat(conn, payload) self.send_json(200, {"ok": True, "router": router}) except Exception as exc: + self.log_message("heartbeat error: %s", exc) self.send_json(400, {"ok": False, "error": str(exc)}) return if path.startswith("/access/"):