PySwitchbot 0.50.1__tar.gz → 0.52.0__tar.gz

{pyswitchbot-0.50.1 → pyswitchbot-0.52.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySwitchbot
-Version: 0.50.1
+Version: 0.52.0
 Summary: A library to communicate with Switchbot
 Home-page: https://github.com/Danielhiversen/pySwitchbot/
 Author: Daniel Hjelseth Hoyer

{pyswitchbot-0.50.1 → pyswitchbot-0.52.0}/PySwitchbot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySwitchbot
-Version: 0.50.1
+Version: 0.52.0
 Summary: A library to communicate with Switchbot
 Home-page: https://github.com/Danielhiversen/pySwitchbot/
 Author: Daniel Hjelseth Hoyer

{pyswitchbot-0.50.1 → pyswitchbot-0.52.0}/PySwitchbot.egg-info/SOURCES.txt

@@ -28,6 +28,7 @@ switchbot/adv_parsers/lock.py
 switchbot/adv_parsers/meter.py
 switchbot/adv_parsers/motion.py
 switchbot/adv_parsers/plug.py
+switchbot/adv_parsers/relay_switch.py
 switchbot/devices/__init__.py
 switchbot/devices/base_cover.py
 switchbot/devices/base_light.py
@@ -44,6 +45,7 @@ switchbot/devices/lock.py
 switchbot/devices/meter.py
 switchbot/devices/motion.py
 switchbot/devices/plug.py
+switchbot/devices/relay_switch.py
 tests/test_adv_parser.py
 tests/test_base_cover.py
 tests/test_blind_tilt.py

{pyswitchbot-0.50.1 → pyswitchbot-0.52.0}/setup.py

@@ -10,7 +10,7 @@ setup(
         "cryptography>=39.0.0",
         "pyOpenSSL>=23.0.0",
     ],
-    version="0.50.1",
+    version="0.52.0",
     description="A library to communicate with Switchbot",
     author="Daniel Hjelseth Hoyer",
     url="https://github.com/Danielhiversen/pySwitchbot/",

{pyswitchbot-0.50.1 → pyswitchbot-0.52.0}/switchbot/__init__.py

@@ -26,6 +26,7 @@ from .devices.humidifier import SwitchbotHumidifier
 from .devices.light_strip import SwitchbotLightStrip
 from .devices.lock import SwitchbotLock
 from .devices.plug import SwitchbotPlugMini
+from .devices.relay_switch import SwitchbotRelaySwitch
 from .discovery import GetSwitchbotDevices
 from .models import SwitchBotAdvertisement
 
@@ -54,4 +55,5 @@ __all__ = [
     "SwitchbotModel",
     "SwitchbotLock",
     "SwitchbotBlindTilt",
+    "SwitchbotRelaySwitch",
 ]

{pyswitchbot-0.50.1 → pyswitchbot-0.52.0}/switchbot/adv_parser.py

@@ -23,6 +23,10 @@ from .adv_parsers.lock import process_wolock, process_wolock_pro
 from .adv_parsers.meter import process_wosensorth, process_wosensorth_c
 from .adv_parsers.motion import process_wopresence
 from .adv_parsers.plug import process_woplugmini
+from .adv_parsers.relay_switch import (
+    process_worelay_switch_1plus,
+    process_worelay_switch_1pm,
+)
 from .const import SwitchbotModel
 from .models import SwitchBotAdvertisement
 
@@ -69,7 +73,6 @@ SUPPORTED_TYPES: dict[str, SwitchbotSupportedType] = {
         "modelFriendlyName": "Light Strip",
         "func": process_wostrip,
         "manufacturer_id": 2409,
-        "manufacturer_data_length": 16,
     },
     "{": {
         "modelName": SwitchbotModel.CURTAIN,
@@ -174,6 +177,18 @@ SUPPORTED_TYPES: dict[str, SwitchbotSupportedType] = {
         "func": process_woblindtilt,
         "manufacturer_id": 2409,
     },
+    "<": {
+        "modelName": SwitchbotModel.RelaySwitch1PM,
+        "modelFriendlyName": "Relay Switch 1PM",
+        "func": process_worelay_switch_1pm,
+        "manufacturer_id": 2409,
+    },
+    ";": {
+        "modelName": SwitchbotModel.RelaySwitch1Plus,
+        "modelFriendlyName": "Relay Switch 1",
+        "func": process_worelay_switch_1plus,
+        "manufacturer_id": 2409,
+    },
 }
 
 _SWITCHBOT_MODEL_TO_CHAR = {

{pyswitchbot-0.50.1 → pyswitchbot-0.52.0}/switchbot/adv_parsers/meter.py

@@ -1,13 +1,16 @@
 """Meter parser."""
 from __future__ import annotations
 
+import struct
 from typing import Any
 
+CO2_UNPACK = struct.Struct(">H").unpack_from
+
 
 def process_wosensorth(data: bytes | None, mfr_data: bytes | None) -> dict[str, Any]:
     """Process woSensorTH/Temp sensor services data."""
-    temp_data = None
-    battery = None
+    temp_data: bytes | None = None
+    battery: bytes | None = None
 
     if mfr_data:
         temp_data = mfr_data[8:11]
@@ -45,38 +48,8 @@ def process_wosensorth(data: bytes | None, mfr_data: bytes | None) -> dict[str,
 
 def process_wosensorth_c(data: bytes | None, mfr_data: bytes | None) -> dict[str, Any]:
     """Process woSensorTH/Temp sensor services data with CO2."""
-    temp_data = None
-    battery = None
-
-    if mfr_data:
-        temp_data = mfr_data[8:11]
-
-    if data:
-        if not temp_data:
-            temp_data = data[3:6]
-        battery = data[2] & 0b01111111
-
-    if not temp_data:
-        return {}
-
-    _temp_sign = 1 if temp_data[1] & 0b10000000 else -1
-    _temp_c = _temp_sign * (
-        (temp_data[1] & 0b01111111) + ((temp_data[0] & 0b00001111) / 10)
-    )
-    _temp_f = (_temp_c * 9 / 5) + 32
-    _temp_f = (_temp_f * 10) / 10
-    humidity = temp_data[2] & 0b01111111
-
-    if _temp_c == 0 and humidity == 0 and battery == 0:
-        return {}
-
-    _wosensorth_data = {
-        # Data should be flat, but we keep the original structure for now
-        "temp": {"c": _temp_c, "f": _temp_f},
-        "temperature": _temp_c,
-        "fahrenheit": bool(temp_data[2] & 0b10000000),
-        "humidity": humidity,
-        "battery": battery,
-    }
-
+    _wosensorth_data = process_wosensorth(data, mfr_data)
+    if _wosensorth_data and mfr_data and len(mfr_data) >= 15:
+        co2_data = mfr_data[13:15]
+        _wosensorth_data["co2"] = CO2_UNPACK(co2_data)[0]
     return _wosensorth_data

pyswitchbot-0.52.0/switchbot/adv_parsers/relay_switch.py

@@ -0,0 +1,31 @@
+"""Relay Switch adv parser."""
+from __future__ import annotations
+
+
+def process_worelay_switch_1pm(
+    data: bytes | None, mfr_data: bytes | None
+) -> dict[str, bool | int]:
+    """Process WoStrip services data."""
+    if mfr_data is None:
+        return {}
+    return {
+        "switchMode": True,  # for compatibility, useless
+        "sequence_number": mfr_data[6],
+        "isOn": bool(mfr_data[7] & 0b10000000),
+        "power": ((mfr_data[10] << 8) + mfr_data[11]) / 10,
+        "voltage": 0,
+        "current": 0,
+    }
+
+
+def process_worelay_switch_1plus(
+    data: bytes | None, mfr_data: bytes | None
+) -> dict[str, bool | int]:
+    """Process WoStrip services data."""
+    if mfr_data is None:
+        return {}
+    return {
+        "switchMode": True,  # for compatibility, useless
+        "sequence_number": mfr_data[6],
+        "isOn": bool(mfr_data[7] & 0b10000000),
+    }

{pyswitchbot-0.50.1 → pyswitchbot-0.52.0}/switchbot/const.py

@@ -52,6 +52,8 @@ class SwitchbotModel(StrEnum):
     LOCK_PRO = "WoLockPro"
     BLIND_TILT = "WoBlindTilt"
     HUB2 = "WoHub2"
+    RelaySwitch1PM = "Relay Switch 1PM"
+    RelaySwitch1Plus = "Relay Switch 1"
 
 
 class LockStatus(Enum):

pyswitchbot-0.52.0/switchbot/devices/relay_switch.py

@@ -0,0 +1,155 @@
+import time
+from typing import Any
+
+from bleak.backends.device import BLEDevice
+from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
+
+from ..const import SwitchbotModel
+from .device import SwitchbotSequenceDevice
+
+COMMAND_HEADER = "57"
+COMMAND_GET_CK_IV = f"{COMMAND_HEADER}0f2103"
+COMMAND_TURN_OFF = f"{COMMAND_HEADER}0f70010000"
+COMMAND_TURN_ON = f"{COMMAND_HEADER}0f70010100"
+COMMAND_TOGGLE = f"{COMMAND_HEADER}0f70010200"
+COMMAND_GET_VOLTAGE_AND_CURRENT = f"{COMMAND_HEADER}0f7106000000"
+PASSIVE_POLL_INTERVAL = 1 * 60
+
+
+class SwitchbotRelaySwitch(SwitchbotSequenceDevice):
+    """Representation of a Switchbot relay switch 1pm."""
+
+    def __init__(
+        self,
+        device: BLEDevice,
+        key_id: str,
+        encryption_key: str,
+        interface: int = 0,
+        model: SwitchbotModel = SwitchbotModel.RelaySwitch1PM,
+        **kwargs: Any,
+    ) -> None:
+        if len(key_id) == 0:
+            raise ValueError("key_id is missing")
+        elif len(key_id) != 2:
+            raise ValueError("key_id is invalid")
+        if len(encryption_key) == 0:
+            raise ValueError("encryption_key is missing")
+        elif len(encryption_key) != 32:
+            raise ValueError("encryption_key is invalid")
+        self._iv = None
+        self._cipher = None
+        self._key_id = key_id
+        self._encryption_key = bytearray.fromhex(encryption_key)
+        self._model: SwitchbotModel = model
+        super().__init__(device, None, interface, **kwargs)
+
+    async def update(self, interface: int | None = None) -> None:
+        """Update state of device."""
+        if info := await self.get_voltage_and_current():
+            self._last_full_update = time.monotonic()
+            self._update_parsed_data(info)
+            self._fire_callbacks()
+
+    async def get_voltage_and_current(self) -> dict[str, Any] | None:
+        """Get voltage and current because advtisement don't have these"""
+        result = await self._send_command(COMMAND_GET_VOLTAGE_AND_CURRENT)
+        ok = self._check_command_result(result, 0, {1})
+        if ok:
+            return {
+                "voltage": (result[9] << 8) + result[10],
+                "current": (result[11] << 8) + result[12],
+            }
+        return None
+
+    def poll_needed(self, seconds_since_last_poll: float | None) -> bool:
+        """Return if device needs polling."""
+        if (
+            seconds_since_last_poll is not None
+            and seconds_since_last_poll < PASSIVE_POLL_INTERVAL
+        ):
+            return False
+        time_since_last_full_update = time.monotonic() - self._last_full_update
+        if time_since_last_full_update < PASSIVE_POLL_INTERVAL:
+            return False
+        return True
+
+    async def turn_on(self) -> bool:
+        """Turn device on."""
+        result = await self._send_command(COMMAND_TURN_ON)
+        ok = self._check_command_result(result, 0, {1})
+        if ok:
+            self._override_state({"isOn": True})
+            self._fire_callbacks()
+        return ok
+
+    async def turn_off(self) -> bool:
+        """Turn device off."""
+        result = await self._send_command(COMMAND_TURN_OFF)
+        ok = self._check_command_result(result, 0, {1})
+        if ok:
+            self._override_state({"isOn": False})
+            self._fire_callbacks()
+        return ok
+
+    async def async_toggle(self, **kwargs) -> bool:
+        """Toggle device."""
+        result = await self._send_command(COMMAND_TOGGLE)
+        status = self._check_command_result(result, 0, {1})
+        return status
+
+    def is_on(self) -> bool | None:
+        """Return switch state from cache."""
+        return self._get_adv_value("isOn")
+
+    async def _send_command(
+        self, key: str, retry: int | None = None, encrypt: bool = True
+    ) -> bytes | None:
+        if not encrypt:
+            return await super()._send_command(key[:2] + "000000" + key[2:], retry)
+
+        result = await self._ensure_encryption_initialized()
+        if not result:
+            return None
+
+        encrypted = (
+            key[:2] + self._key_id + self._iv[0:2].hex() + self._encrypt(key[2:])
+        )
+        result = await super()._send_command(encrypted, retry)
+        return result[:1] + self._decrypt(result[4:])
+
+    async def _ensure_encryption_initialized(self) -> bool:
+        if self._iv is not None:
+            return True
+
+        result = await self._send_command(
+            COMMAND_GET_CK_IV + self._key_id, encrypt=False
+        )
+        ok = self._check_command_result(result, 0, {1})
+        if ok:
+            self._iv = result[4:]
+
+        return ok
+
+    async def _execute_disconnect(self) -> None:
+        await super()._execute_disconnect()
+        self._iv = None
+        self._cipher = None
+
+    def _get_cipher(self) -> Cipher:
+        if self._cipher is None:
+            self._cipher = Cipher(
+                algorithms.AES128(self._encryption_key), modes.CTR(self._iv)
+            )
+        return self._cipher
+
+    def _encrypt(self, data: str) -> str:
+        if len(data) == 0:
+            return ""
+        encryptor = self._get_cipher().encryptor()
+        return (encryptor.update(bytearray.fromhex(data)) + encryptor.finalize()).hex()
+
+    def _decrypt(self, data: bytearray) -> bytes:
+        if len(data) == 0:
+            return b""
+        decryptor = self._get_cipher().decryptor()
+        return decryptor.update(data) + decryptor.finalize()

{pyswitchbot-0.50.1 → pyswitchbot-0.52.0}/tests/test_adv_parser.py

@@ -807,43 +807,6 @@ def test_bulb_active():
     )
 
 
-def test_lightstrip_passive():
-    """Test parsing lightstrip as passive."""
-    ble_device = generate_ble_device("aa:bb:cc:dd:ee:ff", "any")
-    adv_data = generate_advertisement_data(
-        manufacturer_data={
-            2409: b"`U\xf9(\xe5\x96\x00d\x02\xb0\x00\x00\x00\x00\x00\x00"
-        },
-        service_data={},
-        tx_power=-127,
-        rssi=-50,
-    )
-    result = parse_advertisement_data(ble_device, adv_data)
-    assert result == SwitchBotAdvertisement(
-        address="aa:bb:cc:dd:ee:ff",
-        data={
-            "data": {
-                "brightness": 100,
-                "color_mode": 2,
-                "delay": False,
-                "isOn": False,
-                "loop_index": 0,
-                "preset": False,
-                "sequence_number": 0,
-                "speed": 48,
-            },
-            "isEncrypted": False,
-            "model": "r",
-            "modelFriendlyName": "Light Strip",
-            "modelName": SwitchbotModel.LIGHT_STRIP,
-            "rawAdvData": None,
-        },
-        device=ble_device,
-        rssi=-50,
-        active=False,
-    )
-
-
 def test_wosensor_passive_and_active():
     """Test parsing wosensor as passive with active data as well."""
     ble_device = generate_ble_device("aa:bb:cc:dd:ee:ff", "any")
@@ -1640,6 +1603,7 @@ def test_meter_pro_c_active() -> None:
                 "humidity": 36,
                 "temp": {"c": 27.7, "f": 81.86},
                 "temperature": 27.7,
+                "co2": 725,
             },
             "isEncrypted": False,
             "model": "5",
@@ -1671,6 +1635,7 @@ def test_meter_pro_c_passive() -> None:
                 "humidity": 36,
                 "temp": {"c": 27.7, "f": 81.86},
                 "temperature": 27.7,
+                "co2": 725,
             },
             "isEncrypted": False,
             "model": "5",