Fix Hostinger pull relay heartbeat

app.py

@@ -1114,13 +1114,12 @@ def _wp_relay_authorized() -> bool:
     return bool(expected) and hmac.compare_digest(supplied, f"Bearer {expected}")
 
 
-@app.route("/api/wp-upload-relay/next", methods=["GET"])
+@app.route("/api/wp-upload-relay/next", methods=["POST"])
 def api_wp_relay_next():
     if not _wp_relay_authorized():
         return jsonify({"error": "Unauthorized"}), 401
-    from upload_pull_queue import claim_next, record_poll
+    from upload_pull_queue import claim_next
 
-    record_poll()
     item = claim_next()
     if item is None:
         response = Response(status=204)

hostinger-upload-relay/server.js

@@ -15,10 +15,14 @@ try {
 const spaceUrl = (process.env.SPACE_URL || relayConfig.spaceUrl || "").replace(/\/$/, "");
 const relayToken = process.env.WP_PULL_RELAY_TOKEN || relayConfig.relayToken || "";
 const relayState = {
-  last_poll_at: null,
+  process_started_at: new Date().toISOString(),
+  last_poll_attempt_at: null,
+  last_poll_response_at: null,
+  last_poll_status: null,
   last_claim_at: null,
   last_success_at: null,
   last_error: null,
+  consecutive_poll_errors: 0,
   in_flight: null,
 };
 
@@ -144,19 +148,30 @@ async function pollForUpload() {
   polling = true;
   let item;
   try {
-    relayState.last_poll_at = new Date().toISOString();
+    relayState.last_poll_attempt_at = new Date().toISOString();
     const next = await fetch(
       `${spaceUrl}/api/wp-upload-relay/next?ts=${Date.now()}`,
       {
+        method: "POST",
         headers: {
           authorization: `Bearer ${relayToken}`,
-          "cache-control": "no-cache",
+          "cache-control": "no-store",
+          pragma: "no-cache",
+          "content-type": "application/json",
         },
-        signal: AbortSignal.timeout(30000),
+        body: JSON.stringify({
+          relay_id: "hostinger-primary",
+          sent_at: new Date().toISOString(),
+        }),
+        signal: AbortSignal.timeout(15000),
       },
     );
-    if (next.status === 204) return;
+    relayState.last_poll_response_at = new Date().toISOString();
+    relayState.last_poll_status = next.status;
     if (!next.ok) throw new Error(`Queue endpoint returned ${next.status}`);
+    relayState.consecutive_poll_errors = 0;
+    relayState.last_error = null;
+    if (next.status === 204) return;
     item = await next.json();
     relayState.last_claim_at = new Date().toISOString();
     relayState.in_flight = item.id;
@@ -209,6 +224,7 @@ async function pollForUpload() {
     relayState.last_error = null;
     console.log(`Completed pulled upload ${item.id}: ${upstream.status}`);
   } catch (error) {
+    relayState.consecutive_poll_errors += 1;
     relayState.last_error = `${new Date().toISOString()} ${error.message}`;
     console.error(`Pull relay error: ${error.message}`);
     if (item?.id) {

test_wordpress_transport.py

@@ -3,7 +3,11 @@ import unittest
 from types import SimpleNamespace
 from unittest.mock import patch
 
-from wordpress_transport import origin_candidates, post_multipart_to_wordpress_origin
+from wordpress_transport import (
+    WordPressUnavailableError,
+    origin_candidates,
+    post_multipart_to_wordpress_origin,
+)
 
 
 class OriginCandidatesTests(unittest.TestCase):
@@ -68,7 +72,14 @@ class OriginCandidatesTests(unittest.TestCase):
         self.assertEqual(result[3], "pull")
         submit.assert_called_once()
 
-    @patch.dict("os.environ", {"WP_PULL_RELAY_ENABLED": "true"}, clear=False)
+    @patch.dict(
+        "os.environ",
+        {
+            "WP_PULL_RELAY_ENABLED": "true",
+            "WP_PULL_DIRECT_FALLBACK": "true",
+        },
+        clear=False,
+    )
     @patch("wordpress_transport.requests.post")
     @patch("upload_pull_queue.submit")
     def test_pull_mode_falls_back_to_direct_on_failure(self, submit, post):
@@ -86,6 +97,29 @@ class OriginCandidatesTests(unittest.TestCase):
         self.assertEqual(result[3], "relay.example")
         post.assert_called_once()
 
+    @patch.dict(
+        "os.environ",
+        {
+            "WP_PULL_RELAY_ENABLED": "true",
+            "WP_PULL_DIRECT_FALLBACK": "false",
+        },
+        clear=False,
+    )
+    @patch("wordpress_transport.requests.post")
+    @patch("upload_pull_queue.submit")
+    def test_pull_mode_fails_fast_without_direct_fallback(self, submit, post):
+        submit.side_effect = TimeoutError("pull relay unavailable")
+
+        with self.assertRaisesRegex(
+            WordPressUnavailableError, "Hostinger pull relay failed"
+        ):
+            post_multipart_to_wordpress_origin(
+                "https://relay.example/upload",
+                {"file": ("x.jpg", b"data", "image/jpeg")},
+            )
+
+        post.assert_not_called()
+
 
 if __name__ == "__main__":
     unittest.main()

wordpress_transport.py

@@ -15,6 +15,13 @@ class WordPressUnavailableError(ConnectionError):
     """Raised when none of the WordPress origin addresses can be reached."""
 
 
+def _env_enabled(name: str, default: bool = False) -> bool:
+    value = os.getenv(name)
+    if value is None:
+        return default
+    return value.strip().lower() in ("1", "true", "yes")
+
+
 def request_wordpress_json(
     method: str,
     url: str,
@@ -24,7 +31,7 @@ def request_wordpress_json(
     timeout: int = 30,
 ) -> requests.Response:
     """Send a WordPress JSON request directly or through the Hostinger pull relay."""
-    if os.getenv("WP_PULL_RELAY_ENABLED", "").strip().lower() in ("1", "true", "yes"):
+    if _env_enabled("WP_PULL_RELAY_ENABLED"):
         from upload_pull_queue import submit_request
 
         parsed = urlparse(url)
@@ -40,8 +47,13 @@ def request_wordpress_json(
             response.url = url
             return response
         except Exception as exc:
+            if not _env_enabled("WP_PULL_DIRECT_FALLBACK"):
+                raise WordPressUnavailableError(
+                    f"Hostinger pull relay JSON request failed: {exc}"
+                ) from exc
             print(
-                f"   [WARNING] Hostinger pull relay JSON request failed ({exc}); falling back to direct transport.",
+                f"   [WARNING] Hostinger pull relay JSON request failed ({exc}); "
+                "WP_PULL_DIRECT_FALLBACK is enabled, trying direct transport.",
                 flush=True,
             )
 
@@ -95,15 +107,20 @@ def post_multipart_to_wordpress_origin(
         raise ValueError("WP_BRIDGE_URL must be an absolute HTTPS URL")
 
     pull_relay_error: Exception | None = None
-    if os.getenv("WP_PULL_RELAY_ENABLED", "").strip().lower() in ("1", "true", "yes"):
+    if _env_enabled("WP_PULL_RELAY_ENABLED"):
         from upload_pull_queue import submit
 
         try:
             return submit(fields, timeout=read_timeout + 30)
         except Exception as exc:
+            if not _env_enabled("WP_PULL_DIRECT_FALLBACK"):
+                raise WordPressUnavailableError(
+                    f"Hostinger pull relay failed: {exc}"
+                ) from exc
             pull_relay_error = exc
             print(
-                f"   [WARNING] Hostinger pull relay upload failed ({exc}); falling back to direct transport.",
+                f"   [WARNING] Hostinger pull relay upload failed ({exc}); "
+                "WP_PULL_DIRECT_FALLBACK is enabled, trying direct transport.",
                 flush=True,
             )