PySwitchbot 2.2.0__tar.gz → 2.4.0__tar.gz

{pyswitchbot-2.2.0/PySwitchbot.egg-info → pyswitchbot-2.4.0}/PKG-INFO

@@ -1,35 +1,33 @@
 Metadata-Version: 2.4
 Name: PySwitchbot
-Version: 2.2.0
+Version: 2.4.0
 Summary: A library to communicate with Switchbot
-Home-page: https://github.com/sblibs/pySwitchbot/
-Author: Daniel Hjelseth Hoyer
 License: MIT
+License-File: LICENSE
+Author: Daniel Hjelseth Hoyer
+Requires-Python: >=3.11,<4.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Other Environment
 Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Home Automation
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.11
+Requires-Dist: aiohttp (>=3.9.5)
+Requires-Dist: bleak (>=0.19.0)
+Requires-Dist: bleak-retry-connector (>=3.4.0)
+Requires-Dist: cryptography (>=39.0.0)
+Requires-Dist: pyOpenSSL (>=23.0.0)
+Project-URL: Bug Tracker, https://github.com/sblibs/pySwitchbot/issues
+Project-URL: Changelog, https://github.com/sblibs/pySwitchbot/blob/main/CHANGELOG.md
+Project-URL: Repository, https://github.com/sblibs/pySwitchbot/
 Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: aiohttp>=3.9.5
-Requires-Dist: bleak>=0.19.0
-Requires-Dist: bleak-retry-connector>=3.4.0
-Requires-Dist: cryptography>=39.0.0
-Requires-Dist: pyOpenSSL>=23.0.0
-Dynamic: author
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license
-Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # pySwitchbot [![codecov](https://codecov.io/gh/sblibs/pySwitchbot/graph/badge.svg?token=TI027U5ISQ)](https://codecov.io/gh/sblibs/pySwitchbot)
 
@@ -58,6 +56,31 @@ Encryption key: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 Where `MAC` is MAC address of the lock and `USERNAME` is your SwitchBot account username, after that script will ask for your password.
 If authentication succeeds then script should output your key id and encryption key.
 
+### Troubleshooting key retrieval
+
+Key retrieval talks to SwitchBot's account API with your username and
+password. The most common failures are account-side, not bugs in this library:
+
+- **`Authentication failed: ...`** — the username/password were rejected. This
+  happens when:
+  - Two-factor authentication (2FA) is enabled on the account. The API login
+    used here does not support a verification code, so 2FA accounts cannot
+    retrieve keys this way — temporarily disable 2FA, fetch the key, then
+    re-enable it.
+  - The account was created via "Sign in with Apple"/Google and has no
+    password set. Set a password in the SwitchBot app first, or use an
+    email/password account.
+  - The username is an email but the account is registered to a phone number
+    (or vice versa). Use the exact identifier you log in with.
+- **`Failed to retrieve encryption key from SwitchBot Account: ...`** —
+  authentication succeeded but the key could not be read. Usually the account
+  is not the device **owner**: keys are only returned to the owning account,
+  not to shared/family members. Retrieve the key from the owner account, or
+  transfer ownership in the app.
+
+The key only needs to be fetched once; store the `key_id` and encryption key
+and reuse them — there is no need to call the script on every connection.
+
 ## Examples:
 
 #### WoLock (Lock-Pro)
@@ -79,7 +102,7 @@ LOCK_MODEL=SwitchbotModel.LOCK_PRO # Your lock model (here we use the Lock-Pro)
 async def main():
     wolock = await GetSwitchbotDevices().get_locks()
     await lock.SwitchbotLock(
-        wolock[BLE_MAC].device, KEY_ID, ENCRYPTION_KEY, model=LOCK_MODEL
+        wolock[BLE_MAC].device, KEY_ID, ENC_KEY, model=LOCK_MODEL
     ).unlock()
 
 
@@ -103,7 +126,7 @@ LOCK_MODEL=SwitchbotModel.LOCK_PRO # Your lock model (here we use the Lock-Pro)
 async def main():
     wolock = await GetSwitchbotDevices().get_locks()
     await lock.SwitchbotLock(
-        wolock[BLE_MAC].device, KEY_ID, ENCRYPTION_KEY, model=LOCK_MODEL
+        wolock[BLE_MAC].device, KEY_ID, ENC_KEY, model=LOCK_MODEL
     ).lock()
 
 
@@ -141,3 +164,4 @@ async def main():
 if __name__ == "__main__":
     asyncio.run(main())
 ```
+

pyswitchbot-2.2.0/PKG-INFO → pyswitchbot-2.4.0/README.md

@@ -1,36 +1,3 @@
-Metadata-Version: 2.4
-Name: PySwitchbot
-Version: 2.2.0
-Summary: A library to communicate with Switchbot
-Home-page: https://github.com/sblibs/pySwitchbot/
-Author: Daniel Hjelseth Hoyer
-License: MIT
-Classifier: Development Status :: 3 - Alpha
-Classifier: Environment :: Other Environment
-Classifier: Intended Audience :: Developers
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Topic :: Home Automation
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.11
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: aiohttp>=3.9.5
-Requires-Dist: bleak>=0.19.0
-Requires-Dist: bleak-retry-connector>=3.4.0
-Requires-Dist: cryptography>=39.0.0
-Requires-Dist: pyOpenSSL>=23.0.0
-Dynamic: author
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license
-Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
-
 # pySwitchbot [![codecov](https://codecov.io/gh/sblibs/pySwitchbot/graph/badge.svg?token=TI027U5ISQ)](https://codecov.io/gh/sblibs/pySwitchbot)
 
 Library to control Switchbot IoT devices https://www.switch-bot.com/
@@ -58,6 +25,31 @@ Encryption key: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 Where `MAC` is MAC address of the lock and `USERNAME` is your SwitchBot account username, after that script will ask for your password.
 If authentication succeeds then script should output your key id and encryption key.
 
+### Troubleshooting key retrieval
+
+Key retrieval talks to SwitchBot's account API with your username and
+password. The most common failures are account-side, not bugs in this library:
+
+- **`Authentication failed: ...`** — the username/password were rejected. This
+  happens when:
+  - Two-factor authentication (2FA) is enabled on the account. The API login
+    used here does not support a verification code, so 2FA accounts cannot
+    retrieve keys this way — temporarily disable 2FA, fetch the key, then
+    re-enable it.
+  - The account was created via "Sign in with Apple"/Google and has no
+    password set. Set a password in the SwitchBot app first, or use an
+    email/password account.
+  - The username is an email but the account is registered to a phone number
+    (or vice versa). Use the exact identifier you log in with.
+- **`Failed to retrieve encryption key from SwitchBot Account: ...`** —
+  authentication succeeded but the key could not be read. Usually the account
+  is not the device **owner**: keys are only returned to the owning account,
+  not to shared/family members. Retrieve the key from the owner account, or
+  transfer ownership in the app.
+
+The key only needs to be fetched once; store the `key_id` and encryption key
+and reuse them — there is no need to call the script on every connection.
+
 ## Examples:
 
 #### WoLock (Lock-Pro)
@@ -79,7 +71,7 @@ LOCK_MODEL=SwitchbotModel.LOCK_PRO # Your lock model (here we use the Lock-Pro)
 async def main():
     wolock = await GetSwitchbotDevices().get_locks()
     await lock.SwitchbotLock(
-        wolock[BLE_MAC].device, KEY_ID, ENCRYPTION_KEY, model=LOCK_MODEL
+        wolock[BLE_MAC].device, KEY_ID, ENC_KEY, model=LOCK_MODEL
     ).unlock()
 
 
@@ -103,7 +95,7 @@ LOCK_MODEL=SwitchbotModel.LOCK_PRO # Your lock model (here we use the Lock-Pro)
 async def main():
     wolock = await GetSwitchbotDevices().get_locks()
     await lock.SwitchbotLock(
-        wolock[BLE_MAC].device, KEY_ID, ENCRYPTION_KEY, model=LOCK_MODEL
+        wolock[BLE_MAC].device, KEY_ID, ENC_KEY, model=LOCK_MODEL
     ).lock()
 
 

{pyswitchbot-2.2.0 → pyswitchbot-2.4.0}/pyproject.toml

@@ -1,8 +1,64 @@
+[tool.poetry]
+name = "PySwitchbot"
+version = "2.4.0"
+description = "A library to communicate with Switchbot"
+authors = ["Daniel Hjelseth Hoyer"]
+license = "MIT"
+readme = "README.md"
+repository = "https://github.com/sblibs/pySwitchbot/"
+packages = [
+    { include = "switchbot" },
+]
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Environment :: Other Environment",
+    "Intended Audience :: Developers",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Topic :: Home Automation",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+]
+
+[tool.poetry.urls]
+"Bug Tracker" = "https://github.com/sblibs/pySwitchbot/issues"
+"Changelog" = "https://github.com/sblibs/pySwitchbot/blob/main/CHANGELOG.md"
+
+[tool.poetry.dependencies]
+python = ">=3.11,<4.0"
+aiohttp = ">=3.9.5"
+bleak = ">=0.19.0"
+bleak-retry-connector = ">=3.4.0"
+cryptography = ">=39.0.0"
+pyOpenSSL = ">=23.0.0"
+
+[tool.poetry.group.dev.dependencies]
+pytest = ">=7,<10"
+pytest-cov = ">=3,<8"
+pytest-asyncio = ">=0.19,<1.5"
+
+[tool.semantic_release]
+branch = "main"
+# Existing release tags have no "v" prefix (e.g. 2.2.0), unlike PSR's default
+# "v{version}"; without this PSR finds no prior release and bumps from 0.0.0.
+tag_format = "{version}"
+version_toml = ["pyproject.toml:tool.poetry.version"]
+version_variables = ["switchbot/__version__.py:__version__"]
+build_command = "pip install poetry && poetry build"
+
+[tool.pytest.ini_options]
+addopts = "--cov=switchbot --cov-report=term-missing"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
+
 [tool.ruff]
 target-version = "py311"
 line-length = 88
 
 [tool.ruff.lint]
+preview = true
+explicit-preview-rules = true # opt in ONLY explicitly-listed preview rules
 ignore = [
     "S101", # use of assert
     "D203", # 1 blank line required before class docstring
@@ -34,15 +90,30 @@ ignore = [
 ]
 select = [
     "ASYNC", # async rules
+    "A",   # flake8-builtins
     "B",   # flake8-bugbear
+    "BLE", # flake8-blind-except
     "D",   # flake8-docstrings
     "C4",  # flake8-comprehensions
+    "C90", # mccabe complexity
+    "DTZ", # flake8-datetimez
+    "ERA", # eradicate
+    "EXE", # flake8-executable
     "S",   # flake8-bandit
     "F",   # pyflake
+    "FA",  # flake8-future-annotations
+    "FIX", # flake8-fixme
+    "FURB", # refurb
+    "FURB118", # reimplemented-operator (preview) - unneeded lambdas
     "E",   # pycodestyle
     "W",   # pycodestyle
     "UP",  # pyupgrade
     "I",   # isort
+    "ICN", # flake8-import-conventions
+    "INP", # flake8-no-pep420
+    "ISC", # flake8-implicit-str-concat
+    "LOG", # flake8-logging
+    "Q",   # flake8-quotes
     "RUF", # ruff specific
     "FLY", # flynt
     "G", # flake8-logging-format   ,
@@ -60,8 +131,10 @@ select = [
     "SLOT", # flake8-slots
     "T100", # Trace found: {name} used
     "T20", # flake8-print
+    "TD",  # flake8-todos
     "TID", # Tidy imports
     "TRY", # tryceratops
+    "YTT", # flake8-2020
 ]
 
 [tool.ruff.lint.per-file-ignores]

{pyswitchbot-2.2.0 → pyswitchbot-2.4.0}/switchbot/__init__.py

@@ -57,10 +57,11 @@ from .devices.light_strip import (
     SwitchbotPermanentOutdoorLight,
     SwitchbotRgbicLight,
     SwitchbotRgbicNeonLight,
+    SwitchbotRgbicwwCeilingLight,
     SwitchbotStripLight3,
 )
 from .devices.lock import SwitchbotLock
-from .devices.meter_pro import SwitchbotMeterProCO2
+from .devices.meter_pro import SwitchbotMeterPro, SwitchbotMeterProCO2
 from .devices.plug import SwitchbotPlugMini
 from .devices.relay_switch import (
     SwitchbotGarageDoorOpener,
@@ -94,7 +95,6 @@ __all__ = [
     "StripLightColorMode",
     "SwitchBotAdvertisement",
     "Switchbot",
-    "Switchbot",
     "SwitchbotAccountConnectionError",
     "SwitchbotAirPurifier",
     "SwitchbotApiError",
@@ -115,23 +115,22 @@ __all__ = [
     "SwitchbotKeypadVision",
     "SwitchbotLightStrip",
     "SwitchbotLock",
+    "SwitchbotMeterPro",
     "SwitchbotMeterProCO2",
     "SwitchbotModel",
-    "SwitchbotModel",
     "SwitchbotOperationError",
     "SwitchbotPermanentOutdoorLight",
     "SwitchbotPlugMini",
-    "SwitchbotPlugMini",
     "SwitchbotRelaySwitch",
     "SwitchbotRelaySwitch2PM",
     "SwitchbotRgbicLight",
     "SwitchbotRgbicNeonLight",
+    "SwitchbotRgbicwwCeilingLight",
     "SwitchbotRollerShade",
     "SwitchbotSmartThermostatRadiator",
     "SwitchbotStandingFan",
     "SwitchbotStripLight3",
     "SwitchbotSupportedType",
-    "SwitchbotSupportedType",
     "SwitchbotVacuum",
     "VerticalOscillationAngle",
     "close_stale_connections",

pyswitchbot-2.4.0/switchbot/__version__.py

@@ -0,0 +1 @@
+__version__ = "2.4.0"

{pyswitchbot-2.2.0 → pyswitchbot-2.4.0}/switchbot/adv_parser.py

@@ -32,6 +32,7 @@ from .adv_parsers.light_strip import (
     process_candle_warmer_lamp,
     process_light,
     process_rgbic_light,
+    process_rgbicww_ceiling_light,
     process_wostrip,
 )
 from .adv_parsers.lock import (
@@ -677,6 +678,30 @@ SUPPORTED_TYPES: dict[str | bytes, SwitchbotSupportedType] = {
         "func": process_rgbic_light,
         "manufacturer_id": 2409,
     },
+    b"\x00\x11\xbe\xf8": {
+        "modelName": SwitchbotModel.RGBICWW_LIGHT_BARS,
+        "modelFriendlyName": "RGBICWW Light Bars",
+        "func": process_rgbic_light,
+        "manufacturer_id": 2409,
+    },
+    b"\x01\x11\xbe\xf8": {
+        "modelName": SwitchbotModel.RGBICWW_LIGHT_BARS,
+        "modelFriendlyName": "RGBICWW Light Bars",
+        "func": process_rgbic_light,
+        "manufacturer_id": 2409,
+    },
+    b"\x00\x11\xbb\x10": {
+        "modelName": SwitchbotModel.RGBICWW_CEILING_LIGHT,
+        "modelFriendlyName": "RGBICWW Ceiling Light",
+        "func": process_rgbicww_ceiling_light,
+        "manufacturer_id": 2409,
+    },
+    b"\x01\x11\xbb\x10": {
+        "modelName": SwitchbotModel.RGBICWW_CEILING_LIGHT,
+        "modelFriendlyName": "RGBICWW Ceiling Light",
+        "func": process_rgbicww_ceiling_light,
+        "manufacturer_id": 2409,
+    },
     b"\x00\x10\xd0\xb7": {
         "modelName": SwitchbotModel.PERMANENT_OUTDOOR_LIGHT,
         "modelFriendlyName": "Permanent Outdoor Light",

{pyswitchbot-2.2.0 → pyswitchbot-2.4.0}/switchbot/adv_parsers/air_purifier.py

@@ -11,7 +11,7 @@ def process_air_purifier(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int]:
     """Process air purifier services data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 14:
         return {}
     device_data = mfr_data[6:]
 

{pyswitchbot-2.2.0 → pyswitchbot-2.4.0}/switchbot/adv_parsers/art_frame.py

@@ -9,7 +9,7 @@ def process_art_frame(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int | str]:
     """Process Art Frame data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 10:
         return {}
 
     _seq_num = mfr_data[6]

{pyswitchbot-2.2.0 → pyswitchbot-2.4.0}/switchbot/adv_parsers/blind_tilt.py

@@ -7,7 +7,7 @@ def process_woblindtilt(
     data: bytes | None, mfr_data: bytes | None, reverse: bool = False
 ) -> dict[str, bool | int]:
     """Process woBlindTilt services data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 10:
         return {}
 
     device_data = mfr_data[6:]
@@ -19,7 +19,7 @@ def process_woblindtilt(
 
     return {
         "calibration": _calibrated,
-        "battery": data[2] & 0b01111111 if data else None,
+        "battery": data[2] & 0b01111111 if data and len(data) >= 3 else None,
         "inMotion": _in_motion,
         "tilt": (100 - _tilt) if reverse else _tilt,
         "lightLevel": _light_level,

{pyswitchbot-2.2.0 → pyswitchbot-2.4.0}/switchbot/adv_parsers/bot.py

@@ -8,7 +8,7 @@ def process_wohand(data: bytes | None, mfr_data: bytes | None) -> dict[str, bool
     if data is None and mfr_data is None:
         return {}
 
-    if data is None:
+    if data is None or len(data) < 3:
         return {
             "switchMode": None,
             "isOn": None,

{pyswitchbot-2.2.0 → pyswitchbot-2.4.0}/switchbot/adv_parsers/bulb.py

@@ -7,7 +7,7 @@ def process_color_bulb(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int]:
     """Process WoBulb services data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 11:
         return {}
     return {
         "sequence_number": mfr_data[6],

{pyswitchbot-2.2.0 → pyswitchbot-2.4.0}/switchbot/adv_parsers/ceiling_light.py

@@ -15,7 +15,7 @@ _LOGGER = logging.getLogger(__name__)
 
 def process_woceiling(data: bytes, mfr_data: bytes | None) -> dict[str, bool | int]:
     """Process WoCeiling services data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 11:
         return {}
     return {
         "sequence_number": mfr_data[6],

{pyswitchbot-2.2.0 → pyswitchbot-2.4.0}/switchbot/adv_parsers/climate_panel.py

@@ -9,7 +9,7 @@ def process_climate_panel(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int | str]:
     """Process Climate Panel data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 16:
         return {}
 
     seq_number = mfr_data[6]

{pyswitchbot-2.2.0 → pyswitchbot-2.4.0}/switchbot/adv_parsers/contact.py

@@ -10,10 +10,15 @@ def process_wocontact(
     if data is None and mfr_data is None:
         return {}
 
-    battery = data[2] & 0b01111111 if data else None
-    tested = bool(data[1] & 0b10000000) if data else None
+    has_full_mfr = mfr_data is not None and len(mfr_data) >= 13
+    has_full_data = data is not None and len(data) >= 9
+    if not has_full_mfr and not has_full_data:
+        return {}
+
+    battery = data[2] & 0b01111111 if data and len(data) >= 3 else None
+    tested = bool(data[1] & 0b10000000) if data and len(data) >= 2 else None
 
-    if mfr_data and len(mfr_data) >= 13:
+    if has_full_mfr:
         motion_detected = bool(mfr_data[7] & 0b10000000)
         contact_open = bool(mfr_data[7] & 0b00010000)
         contact_timeout = bool(mfr_data[7] & 0b00100000)

{pyswitchbot-2.2.0 → pyswitchbot-2.4.0}/switchbot/adv_parsers/curtain.py

@@ -12,8 +12,8 @@ def process_wocurtain(
         battery_data = mfr_data[12]
     elif mfr_data and len(mfr_data) >= 11:
         device_data = mfr_data[8:11]
-        battery_data = data[2] if data else None
-    elif data:
+        battery_data = data[2] if data and len(data) >= 3 else None
+    elif data and len(data) >= 6:
         device_data = data[3:6]
         battery_data = data[2]
     else:
@@ -25,7 +25,7 @@ def process_wocurtain(
     _device_chain = device_data[1] & 0b00000111
 
     return {
-        "calibration": bool(data[1] & 0b01000000) if data else None,
+        "calibration": bool(data[1] & 0b01000000) if data and len(data) >= 2 else None,
         "battery": battery_data & 0b01111111 if battery_data is not None else None,
         "inMotion": _in_motion,
         "position": (100 - _position) if reverse else _position,

{pyswitchbot-2.2.0 → pyswitchbot-2.4.0}/switchbot/adv_parsers/fan.py

@@ -11,10 +11,13 @@ _STANDING_FAN_MODE_MAP: dict[int, str] = {
 
 
 def _parse_fan(
-    mfr_data: bytes | None, mode_map: dict[int, str]
+    mfr_data: bytes | None,
+    mode_map: dict[int, str],
+    *,
+    with_charging: bool = False,
 ) -> dict[str, bool | int | str | None]:
     """Shared fan advertisement parse, parameterized on the mode map."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 10:
         return {}
 
     device_data = mfr_data[6:]
@@ -28,7 +31,7 @@ def _parse_fan(
     _battery = device_data[2] & 0b01111111
     _speed = device_data[3] & 0b01111111
 
-    return {
+    result: dict[str, bool | int | str | None] = {
         "sequence_number": _seq_num,
         "isOn": _isOn,
         "mode": mode_map.get(_mode),
@@ -39,6 +42,10 @@ def _parse_fan(
         "battery": _battery,
         "speed": _speed,
     }
+    if with_charging:
+        # Bit 7 of the battery byte is the charging flag (Standing Fan only).
+        result["charging"] = bool(device_data[2] & 0b10000000)
+    return result
 
 
 def process_fan(
@@ -52,4 +59,4 @@ def process_standing_fan(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int | str | None]:
     """Process Standing Fan services data (modes 1-5; adds CUSTOM_NATURAL)."""
-    return _parse_fan(mfr_data, _STANDING_FAN_MODE_MAP)
+    return _parse_fan(mfr_data, _STANDING_FAN_MODE_MAP, with_charging=True)

{pyswitchbot-2.2.0 → pyswitchbot-2.4.0}/switchbot/adv_parsers/hub2.py

@@ -12,7 +12,7 @@ def process_wohub2(data: bytes | None, mfr_data: bytes | None) -> dict[str, Any]
     """Process woHub2 sensor manufacturer data."""
     temp_data = None
 
-    if mfr_data:
+    if mfr_data and len(mfr_data) >= 16:
         status = mfr_data[12]
         temp_data = mfr_data[13:16]
 

{pyswitchbot-2.2.0 → pyswitchbot-2.4.0}/switchbot/adv_parsers/hub3.py

@@ -10,7 +10,7 @@ from ..helpers import celsius_to_fahrenheit
 
 def process_hub3(data: bytes | None, mfr_data: bytes | None) -> dict[str, Any]:
     """Process hub3 sensor manufacturer data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 17:
         return {}
     device_data = mfr_data[6:]
 

{pyswitchbot-2.2.0 → pyswitchbot-2.4.0}/switchbot/adv_parsers/hubmini_matter.py

@@ -13,7 +13,7 @@ def process_hubmini_matter(
     """Process Hubmini matter sensor manufacturer data."""
     temp_data = None
 
-    if mfr_data:
+    if mfr_data and len(mfr_data) >= 16:
         temp_data = mfr_data[13:16]
 
     if not temp_data:

{pyswitchbot-2.2.0 → pyswitchbot-2.4.0}/switchbot/adv_parsers/humidifier.py

@@ -46,7 +46,7 @@ def process_wohumidifier(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int]:
     """Process WoHumi services data."""
-    if data is None:
+    if data is None or len(data) < 5:
         return {
             "isOn": None,
             "level": None,
@@ -64,7 +64,7 @@ def process_evaporative_humidifier(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, bool | int]:
     """Process WoHumi services data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 17:
         return {}
 
     seq_number = mfr_data[6]

{pyswitchbot-2.2.0 → pyswitchbot-2.4.0}/switchbot/adv_parsers/keypad.py

@@ -12,7 +12,7 @@ def process_wokeypad(
     mfr_data: bytes | None,
 ) -> dict[str, bool | int | None]:
     """Process woKeypad services data."""
-    if data is None or mfr_data is None:
+    if data is None or mfr_data is None or len(data) < 3 or len(mfr_data) < 7:
         return {"battery": None, "attempt_state": None}
 
     _LOGGER.debug("mfr_data: %s", mfr_data.hex())

{pyswitchbot-2.2.0 → pyswitchbot-2.4.0}/switchbot/adv_parsers/keypad_vision.py

@@ -7,7 +7,7 @@ _LOGGER = logging.getLogger(__name__)
 
 def process_common_mfr_data(mfr_data: bytes | None) -> dict[str, bool | int]:
     """Process common Keypad Vision (Pro) manufacturer data."""
-    if mfr_data is None:
+    if mfr_data is None or len(mfr_data) < 13:
         return {}
 
     sequence_number = mfr_data[6]
@@ -41,7 +41,7 @@ def process_keypad_vision(
     """Process Keypad Vision data."""
     result = process_common_mfr_data(mfr_data)
 
-    if not result:
+    if not result or len(mfr_data) < 14:
         return {}
 
     pir_triggered_level = mfr_data[13] & 0x03
@@ -63,7 +63,7 @@ def process_keypad_vision_pro(
     """Process Keypad Vision Pro data."""
     result = process_common_mfr_data(mfr_data)
 
-    if not result:
+    if not result or len(mfr_data) < 14:
         return {}
 
     radar_triggered_level = mfr_data[13] & 0x03

{pyswitchbot-2.2.0 → pyswitchbot-2.4.0}/switchbot/adv_parsers/leak.py

@@ -3,7 +3,7 @@
 
 def process_leak(data: bytes | None, mfr_data: bytes | None) -> dict[str, bool | int]:
     """Process SwitchBot Water Leak Detector advertisement data."""
-    if data is None or len(data) < 3 or mfr_data is None or len(mfr_data) < 2:
+    if mfr_data is None or len(mfr_data) < 9:
         return {}
 
     water_leak_detected = None