relay over ws supossedly working

packages/tracker/meshnet_tracker/server.py

@@ -37,6 +37,19 @@ from .gossip import NodeGossip
 from .raft import RaftNode
 
 
+def derive_relay_url_from_public_tracker_url(url: str | None) -> str | None:
+    """Return wss://host/ws when url is a public HTTPS tracker origin."""
+    if not url:
+        return None
+    parsed = urllib.parse.urlparse(url)
+    if parsed.scheme != "https":
+        return None
+    host = parsed.hostname
+    if not host or host in ("127.0.0.1", "localhost"):
+        return None
+    return f"wss://{parsed.netloc}/ws"
+
+
 DEFAULT_MODEL_PRESETS: dict[str, dict] = {
     "stub-model": {
         "layers_start": 0,
@@ -1228,6 +1241,33 @@ class _TrackerHandler(http.server.BaseHTTPRequestHandler):
         if auth:
             req.add_header("Authorization", auth)
 
+        relay_headers = {
+            "Content-Type": "application/json",
+            "X-Meshnet-Route": downstream_urls,
+            **({"Authorization": auth} if auth else {}),
+        }
+
+        if node.relay_addr:
+            print(
+                f"[tracker] proxy via relay {request_id}: {node.relay_addr} "
+                f"(direct endpoint {target_url})",
+                flush=True,
+            )
+            relayed = _relay_http_request(
+                node.relay_addr,
+                path="/v1/chat/completions",
+                body=raw_body,
+                headers=relay_headers,
+            )
+            if relayed is not None:
+                self._send_relayed_response(relayed)
+                return
+            print(
+                f"[tracker] relay proxy failed {request_id}: {node.relay_addr}; "
+                f"trying direct {target_url}",
+                flush=True,
+            )
+
         try:
             upstream = urllib.request.urlopen(req, timeout=300.0)
             print(f"[tracker] proxy connected {request_id}: {target_url}", flush=True)
@@ -1247,23 +1287,11 @@ class _TrackerHandler(http.server.BaseHTTPRequestHandler):
             if node.relay_addr:
                 print(
                     f"[tracker] direct proxy failed {request_id}: {target_url}: {exc}; "
-                    f"trying relay {node.relay_addr}",
+                    f"relay already attempted for {node.relay_addr}",
                     flush=True,
                 )
-                relayed = _relay_http_request(
-                    node.relay_addr,
-                    path="/v1/chat/completions",
-                    body=raw_body,
-                    headers={
-                        "Content-Type": "application/json",
-                        "X-Meshnet-Route": downstream_urls,
-                        **({"Authorization": auth} if auth else {}),
-                    },
-                )
-                if relayed is not None:
-                    self._send_relayed_response(relayed)
-                    return
-            print(f"[tracker] proxy failed {request_id}: {target_url}: {exc}", flush=True)
+            else:
+                print(f"[tracker] proxy failed {request_id}: {target_url}: {exc}", flush=True)
             self._send_json(503, {"error": {
                 "message": f"upstream node unreachable: {exc}",
                 "type": "service_unavailable",
@@ -2040,6 +2068,11 @@ class TrackerServer:
         if self._server is not None:
             raise RuntimeError("TrackerServer is already running")
 
+        effective_relay_url = (
+            self._relay_url
+            or derive_relay_url_from_public_tracker_url(self._cluster_self_url)
+        )
+
         # Start HTTP server first so we know our port
         self._server = _TrackerHTTPServer(
             (self._host, self._requested_port),
@@ -2050,7 +2083,7 @@ class TrackerServer:
             self._model_presets,
             self._contracts,
             self._minimum_stake,
-            relay_url=self._relay_url,
+            relay_url=effective_relay_url,
             stats=self._stats,
         )
         self.port = self._server.server_address[1]