@camstack/addon-import-alexa 0.2.179 → 0.2.181

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-import-alexa",
-  "version": "0.2.179",
+  "version": "0.2.181",
   "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",
@@ -68,7 +68,7 @@
       }
     ],
     "requires": {
-      "server": ">=1.2.742"
+      "server": ">=1.2.750"
     }
   },
   "files": [

package/python/alexa_gateway.py

@@ -95,6 +95,9 @@ def normalize_device(raw: dict) -> dict | None:
 # The skill alexapy itself names for an AlexaAnnouncement node.
 ANNOUNCEMENT_SKILL_ID = "amzn1.ask.1p.routines.messaging"
 
+VOLUMES_PATH = "/api/devices/deviceType/dsn/audio/v1/allDeviceVolumes"
+
+
 class AlexaPyGateway:
     """Holds one AlexaLogin for the life of the process (one process per broker)."""
 
@@ -309,6 +312,37 @@ class AlexaPyGateway:
         self._touch_success()
         return {"devices": devices}
 
+    async def device_volumes(self) -> dict:
+        """Speaker volume and mute of every device, in one call (idle Echos included)."""
+        login = self._require_login()
+        _AlexaLogin, AlexaAPI = _import_alexapy()
+        try:
+            body = await AlexaAPI._static_request("get", login, VOLUMES_PATH)
+        except Exception as err:  # noqa: BLE001 — typed below
+            if is_rate_limited(err):
+                raise RateLimitedError("amazon rate limit (429) on the device volumes") from err
+            raise
+        if not isinstance(body, dict):
+            raise RuntimeError("amazon returned no device volume list")
+        rows = body.get("volumes")
+        devices = []
+        for row in rows if isinstance(rows, list) else []:
+            if not isinstance(row, dict):
+                continue
+            serial = row.get("dsn")
+            volume = row.get("speakerVolume")
+            muted = row.get("speakerMuted")
+            if not isinstance(serial, str) or serial == "":
+                continue
+            entry = {"serial": serial}
+            if isinstance(volume, (int, float)) and not isinstance(volume, bool):
+                entry["volume"] = volume
+            if isinstance(muted, bool):
+                entry["muted"] = muted
+            devices.append(entry)
+        self._touch_success()
+        return {"devices": devices}
+
     async def set_dnd(self, serial: str, enabled: bool) -> None:
         device_type = self._device_type_of(serial)
         async with self._lock(serial):

package/python/alexa_protocol.py

@@ -44,6 +44,8 @@ class Gateway(Protocol):
 
     async def dnd_state(self) -> dict: ...
 
+    async def device_volumes(self) -> dict: ...
+
     async def set_dnd(self, serial: str, enabled: bool) -> None: ...
 
     def target_for(self, serial: str) -> EchoTarget | None: ...
@@ -116,6 +118,8 @@ class Session:
             return {}
         if op == "dnd_state":
             return await self._gateway.dnd_state()
+        if op == "device_volumes":
+            return await self._gateway.device_volumes()
         if op == "set_dnd":
             enabled = message.get("enabled")
             if not isinstance(enabled, bool):

package/python/test_alexa_gateway_echo.py

@@ -22,7 +22,7 @@ def run(coro):
     return asyncio.run(coro)
 
 
-def install_fake(state=None, dnd=None, raises=None):
+def install_fake(state=None, dnd=None, raises=None, volumes=None):
     calls: dict = {"behaviors": [], "media": [], "dnd_set": [], "state_for": [], "active": 0, "max_active": 0}
 
     class FakeAPI:
@@ -54,6 +54,13 @@ def install_fake(state=None, dnd=None, raises=None):
                 raise raises
             calls["behaviors"].append(node)
 
+        @staticmethod
+        async def _static_request(method, login, uri, data=None, query=None):
+            if raises:
+                raise raises
+            calls.setdefault("static", []).append((method, uri))
+            return volumes
+
         @staticmethod
         async def get_dnd_state(login):
             if raises:
@@ -134,6 +141,30 @@ class EchoMediaTests(unittest.TestCase):
         result = run(gateway.dnd_state())
         self.assertEqual(result["devices"], [{"serial": "s1", "enabled": True}, {"serial": "s2", "enabled": False}])
 
+    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},
+                ]
+            }
+        )
+        result = run(gateway.device_volumes())
+        self.assertEqual(
+            result["devices"],
+            [{"serial": "s1", "volume": 46, "muted": False}, {"serial": "s2", "muted": True}],
+        )
+        self.assertEqual(
+            calls["static"], [("get", "/api/devices/deviceType/dsn/audio/v1/allDeviceVolumes")]
+        )
+
+    def test_device_volumes_429_is_typed(self) -> None:
+        gateway, _ = install_fake(raises=AlexapyTooManyRequestsError("Too Many Requests"))
+        with self.assertRaises(RateLimitedError):
+            run(gateway.device_volumes())
+
     def test_set_dnd_goes_to_the_device(self) -> None:
         gateway, calls = install_fake()
         run(gateway.set_dnd("s1", True))