Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion src/tailscale/tailscale.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from __future__ import annotations

import asyncio
import json
import socket
from dataclasses import dataclass
from typing import Any, Self
Expand Down Expand Up @@ -111,7 +112,27 @@ async def devices(self) -> dict[str, Device]:

"""
data = await self._request(f"tailnet/{self.tailnet}/devices?fields=all")
return Devices.from_json(data).devices
try:
obj = json.loads(data)
devs = obj.get("devices")
if isinstance(devs, dict):
devs = list(devs.values())
if not isinstance(devs, list):
msg = "Unexpected devices payload from Tailscale API"
raise TailscaleError(msg)

for d in devs:
cc = d.get("clientConnectivity")
if isinstance(cc, dict):
cs = cc.get("clientSupports")
if isinstance(cs, dict) and "hairPinning" not in cs:
cs["hairPinning"] = None

obj["devices"] = devs
return Devices.from_json(json.dumps(obj)).devices
except Exception as exception:
msg = "Error occurred while communicating with the Tailscale API"
raise TailscaleConnectionError(msg) from exception

async def close(self) -> None:
"""Close open client session."""
Expand Down