@camstack/addon-import-alexa 0.2.181 → 0.2.183

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-import-alexa",
-  "version": "0.2.181",
+  "version": "0.2.183",
   "description": "Alexa device-import provider for CamStack — imports the smart-home devices in a user's Alexa account via the unofficial alexa-remote2 cookie/token client (the inverse of the Alexa exporter)",
   "keywords": [
     "camstack",
@@ -35,6 +35,7 @@
     "addons": [
       {
         "id": "import-alexa",
+        "integrationRole": "both",
         "category": "providers",
         "name": "Alexa",
         "version": "0.1.0",
@@ -52,6 +53,9 @@
           {
             "name": "broker"
           },
+          {
+            "name": "integration-instances"
+          },
           {
             "name": "device-adoption"
           },
@@ -68,7 +72,7 @@
       }
     ],
     "requires": {
-      "server": ">=1.2.750"
+      "server": ">=1.2.761"
     }
   },
   "files": [

package/python/alexa_gateway.py

@@ -322,8 +322,20 @@ class AlexaPyGateway:
             if is_rate_limited(err):
                 raise RateLimitedError("amazon rate limit (429) on the device volumes") from err
             raise
+        # `_static_request` hands back the raw response (None on status >= 400): parse it here.
+        if body is None:
+            raise RuntimeError("amazon returned no response for the device volume list (HTTP >= 400)")
+        status = getattr(body, "status", None)
+        try:
+            body = await body.json(content_type=None)
+        except Exception as err:  # noqa: BLE001 — typed below
+            raise RuntimeError(
+                f"amazon returned an unexpected body for the device volume list (HTTP {status}, unparseable)"
+            ) from err
         if not isinstance(body, dict):
-            raise RuntimeError("amazon returned no device volume list")
+            raise RuntimeError(
+                f"amazon returned an unexpected body for the device volume list (HTTP {status}, not an object)"
+            )
         rows = body.get("volumes")
         devices = []
         for row in rows if isinstance(rows, list) else []:

package/python/test_alexa_gateway_echo.py

@@ -18,6 +18,20 @@ class AlexapyTooManyRequestsError(Exception):
     pass
 
 
+class FakeResponse:
+    """What alexapy's `_static_request` really returns: an aiohttp-like response, parsed by the caller."""
+
+    def __init__(self, status, payload=None, bad_json=False):
+        self.status = status
+        self._payload = payload
+        self._bad_json = bad_json
+
+    async def json(self, content_type=None):
+        if self._bad_json:
+            raise ValueError("not json")
+        return self._payload
+
+
 def run(coro):
     return asyncio.run(coro)
 
@@ -143,13 +157,16 @@ class EchoMediaTests(unittest.TestCase):
 
     def test_device_volumes_is_one_call_keeping_only_typed_readings(self) -> None:
         gateway, calls = install_fake(
-            volumes={
-                "volumes": [
-                    {"dsn": "s1", "deviceType": "T1", "speakerVolume": 46, "speakerMuted": False},
-                    {"dsn": "s2", "speakerVolume": None, "speakerMuted": True},
-                    {"deviceType": "T1", "speakerVolume": 10},
-                ]
-            }
+            volumes=FakeResponse(
+                200,
+                {
+                    "volumes": [
+                        {"dsn": "s1", "deviceType": "T1", "speakerVolume": 46, "speakerMuted": False},
+                        {"dsn": "s2", "speakerVolume": None, "speakerMuted": True},
+                        {"deviceType": "T1", "speakerVolume": 10},
+                    ]
+                },
+            )
         )
         result = run(gateway.device_volumes())
         self.assertEqual(
@@ -160,6 +177,17 @@ class EchoMediaTests(unittest.TestCase):
             calls["static"], [("get", "/api/devices/deviceType/dsn/audio/v1/allDeviceVolumes")]
         )
 
+    def test_device_volumes_http_failure_is_told_apart_from_a_bad_body(self) -> None:
+        gateway, _ = install_fake(volumes=None)
+        with self.assertRaisesRegex(RuntimeError, "no response"):
+            run(gateway.device_volumes())
+        gateway, _ = install_fake(volumes=FakeResponse(200, ["not", "a", "dict"]))
+        with self.assertRaisesRegex(RuntimeError, "unexpected body"):
+            run(gateway.device_volumes())
+        gateway, _ = install_fake(volumes=FakeResponse(200, bad_json=True))
+        with self.assertRaisesRegex(RuntimeError, "unexpected body"):
+            run(gateway.device_volumes())
+
     def test_device_volumes_429_is_typed(self) -> None:
         gateway, _ = install_fake(raises=AlexapyTooManyRequestsError("Too Many Requests"))
         with self.assertRaises(RateLimitedError):