Compare commits
16
Commits
0.1.4
...
0.2.0-alpha.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
773a9b2205 | ||
|
|
998362a5e6 | ||
|
|
206d22c50b | ||
|
|
e2ac4cf8f5 | ||
|
|
ba98204ab2 | ||
|
|
8912a0bd08 | ||
|
|
db0147e7c1 | ||
|
|
c5f985b5f6 | ||
|
|
63f798ca5a | ||
|
|
483ca4049d | ||
|
|
de1ca78c90 | ||
|
|
a72f42eb4a | ||
|
|
6ce8f24477 | ||
|
|
28cd715327 | ||
|
|
49c1409656 | ||
|
|
d61459c011 |
No files matched your search
@@ -0,0 +1,3 @@
|
||||
*/__pycache__/
|
||||
*.pyc
|
||||
.DS_Store
|
||||
@@ -0,0 +1,22 @@
|
||||
name: Unittests
|
||||
on:
|
||||
push:
|
||||
pull_request:
|
||||
# Allows you to run this workflow manually from the Actions tab
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v3
|
||||
with:
|
||||
python-version: '3.x'
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
pip install -r requirements.txt
|
||||
- name: Run unittests
|
||||
run: python3 -m unittest discover -s tests -p "*_test.py"
|
||||
@@ -0,0 +1,9 @@
|
||||
FROM python:3
|
||||
|
||||
COPY requirements.txt .
|
||||
RUN pip install -r requirements.txt
|
||||
|
||||
COPY tests ./tests
|
||||
COPY custom_components ./custom_components
|
||||
|
||||
RUN python3 -m unittest discover -s tests -p "*_test.py"
|
||||
@@ -14,6 +14,7 @@ from homeassistant.helpers.entity import DeviceInfo
|
||||
from homeassistant.exceptions import ConfigEntryNotReady
|
||||
|
||||
from .const import (
|
||||
CONF_ENCRYPTION,
|
||||
CONF_MAX_RETRIES,
|
||||
CONF_PERSISTENT_CONN,
|
||||
CONF_POLLING_INTERVAL,
|
||||
@@ -33,7 +34,7 @@ _LOGGER = logging.getLogger(__name__)
|
||||
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
||||
"""Set up Bluetti Powerstation from a config entry."""
|
||||
|
||||
_LOGGER.debug("Init Bluetti BT Integration")
|
||||
_LOGGER.debug("Init Bluetti BT Integration for device %s", entry.data.get(CONF_NAME))
|
||||
|
||||
address = entry.data.get(CONF_ADDRESS)
|
||||
device_name = entry.data.get(CONF_NAME)
|
||||
@@ -42,6 +43,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
||||
persistent_conn = entry.data.get(CONF_PERSISTENT_CONN, False)
|
||||
polling_timeout = entry.data.get(CONF_POLLING_TIMEOUT, 120)
|
||||
max_retries = entry.data.get(CONF_MAX_RETRIES, 5)
|
||||
use_encryption = entry.data.get(CONF_ENCRYPTION, False)
|
||||
|
||||
if address is None:
|
||||
return False
|
||||
@@ -56,7 +58,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
||||
|
||||
# Create coordinator for polling
|
||||
_LOGGER.debug("Creating coordinator")
|
||||
coordinator = PollingCoordinator(hass, address, device_name, polling_interval, persistent_conn, polling_timeout, max_retries)
|
||||
coordinator = PollingCoordinator(hass, address, device_name, polling_interval, persistent_conn, polling_timeout, max_retries, use_encryption)
|
||||
await coordinator.async_config_entry_first_refresh()
|
||||
hass.data[DOMAIN][entry.entry_id].setdefault(DATA_COORDINATOR, coordinator)
|
||||
|
||||
|
||||
@@ -6,6 +6,8 @@ from typing import Any, Callable, List, cast
|
||||
import async_timeout
|
||||
from bleak import BleakClient, BleakError
|
||||
|
||||
from custom_components.bluetti_bt.bluetti_bt_lib.bluetooth.encryption import BluettiEncryption, Message, MessageType
|
||||
|
||||
from ..base_devices.BluettiDevice import BluettiDevice
|
||||
from ..const import NOTIFY_UUID, RESPONSE_TIMEOUT, WRITE_UUID
|
||||
from ..exceptions import BadConnectionError, ModbusError, ParseError
|
||||
@@ -23,6 +25,7 @@ class DeviceReader:
|
||||
persistent_conn: bool = False,
|
||||
polling_timeout: int = 45,
|
||||
max_retries: int = 5,
|
||||
encrypted: bool = False,
|
||||
) -> None:
|
||||
self.client = bleak_client
|
||||
self.bluetti_device = bluetti_device
|
||||
@@ -30,6 +33,7 @@ class DeviceReader:
|
||||
self.persistent_conn = persistent_conn
|
||||
self.polling_timeout = polling_timeout
|
||||
self.max_retries = max_retries
|
||||
self.encrypted = encrypted
|
||||
|
||||
self.has_notifier = False
|
||||
self.notify_future: asyncio.Future[Any] | None = None
|
||||
@@ -39,6 +43,8 @@ class DeviceReader:
|
||||
# polling mutex to guard against switches
|
||||
self.polling_lock = asyncio.Lock()
|
||||
|
||||
self.encryption = BluettiEncryption()
|
||||
|
||||
async def read_data(
|
||||
self, filter_registers: List[ReadHoldingRegisters] | None = None
|
||||
) -> dict | None:
|
||||
@@ -83,6 +89,10 @@ class DeviceReader:
|
||||
)
|
||||
self.has_notifier = True
|
||||
|
||||
while self.encrypted and not self.encryption.is_ready_for_commands:
|
||||
await asyncio.sleep(5)
|
||||
_LOGGER.debug("Encryption handshake not finished yet")
|
||||
|
||||
# Execute polling commands
|
||||
for command in polling_commands:
|
||||
try:
|
||||
@@ -165,6 +175,9 @@ class DeviceReader:
|
||||
if not parsed_data:
|
||||
return None
|
||||
|
||||
# Reset Encryption keys
|
||||
self.encryption.reset()
|
||||
|
||||
return parsed_data
|
||||
|
||||
async def _async_send_command(self, command: ReadHoldingRegisters) -> bytes:
|
||||
@@ -177,7 +190,16 @@ class DeviceReader:
|
||||
|
||||
# Make request
|
||||
_LOGGER.debug("Requesting %s", command)
|
||||
await self.client.write_gatt_char(WRITE_UUID, bytes(command))
|
||||
|
||||
command_bytes = bytes(command)
|
||||
|
||||
# Encrypt command
|
||||
if self.encrypted is True:
|
||||
if not self.encryption.is_ready_for_commands:
|
||||
return bytes()
|
||||
command_bytes = self.encryption.aes_encrypt(command_bytes, self.encryption.secure_aes_key, None)
|
||||
|
||||
await self.client.write_gatt_char(WRITE_UUID, command_bytes)
|
||||
|
||||
# Wait for response
|
||||
res = await asyncio.wait_for(self.notify_future, timeout=RESPONSE_TIMEOUT)
|
||||
@@ -201,9 +223,47 @@ class DeviceReader:
|
||||
# caught an exception, return empty bytes object
|
||||
return bytes()
|
||||
|
||||
def _notification_handler(self, _sender: int, data: bytearray):
|
||||
async def _notification_handler(self, _sender: int, data: bytearray):
|
||||
"""Handle bt data."""
|
||||
|
||||
# Handle encrypted data
|
||||
if self.encrypted is True:
|
||||
message = Message(data)
|
||||
|
||||
# Handle key exchange
|
||||
if message.is_pre_key_exchange:
|
||||
message.verify_checksum()
|
||||
|
||||
if message.type == MessageType.CHALLENGE:
|
||||
challenge_response = self.encryption.msg_challenge(message)
|
||||
await self.client.write_gatt_char(WRITE_UUID, challenge_response)
|
||||
return
|
||||
|
||||
if message.type == MessageType.CHALLENGE_ACCEPTED:
|
||||
_LOGGER.debug("Challenge accepted")
|
||||
return
|
||||
|
||||
if self.encryption.unsecure_aes_key is None:
|
||||
_LOGGER.error("Received encrypted message before key initialization")
|
||||
|
||||
key, iv = self.encryption.getKeyIv()
|
||||
decrypted = Message(self.encryption.aes_decrypt(message.buffer, key, iv))
|
||||
|
||||
if decrypted.is_pre_key_exchange:
|
||||
decrypted.verify_checksum()
|
||||
|
||||
if decrypted.type == MessageType.PEER_PUBKEY:
|
||||
peer_pubkey_response = self.encryption.msg_peer_pubkey(decrypted)
|
||||
await self.client.write_gatt_char(WRITE_UUID, peer_pubkey_response)
|
||||
return
|
||||
|
||||
if decrypted.type == MessageType.PUBKEY_ACCEPTED:
|
||||
self.encryption.msg_key_accepted(decrypted)
|
||||
return
|
||||
|
||||
# Handle as message
|
||||
data = decrypted.buffer
|
||||
|
||||
# Ignore notifications we don't expect
|
||||
if self.notify_future is None or self.notify_future.done():
|
||||
_LOGGER.warning("Unexpected notification")
|
||||
|
||||
@@ -0,0 +1,289 @@
|
||||
from enum import Enum
|
||||
import hashlib
|
||||
import logging
|
||||
import os
|
||||
import pyasn1.codec.der.decoder as der_decoder
|
||||
import pyasn1.codec.der.encoder as der_encoder
|
||||
from pyasn1.type import univ
|
||||
from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
|
||||
from cryptography.hazmat.primitives.asymmetric import ec
|
||||
from cryptography.hazmat.primitives import hashes, serialization
|
||||
from cryptography.exceptions import InvalidSignature
|
||||
|
||||
from custom_components.bluetti_bt.bluetti_bt_lib.const import LOCAL_AES_KEY, PRIVATE_KEY_L1, PUBLIC_KEY_K2, SECP_256R1_PUBLIC_PREFIX
|
||||
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
KEX_MAGIC = b"**"
|
||||
AES_BLOCK_SIZE = 16
|
||||
|
||||
def hexsum(s, sz: int):
|
||||
checksum = sum(s)
|
||||
as_hex = f"{checksum:0{sz*2}x}"
|
||||
return bytes.fromhex(as_hex)
|
||||
|
||||
def hexxor(a: bytes, b: bytes) -> bytes | None:
|
||||
if len(a) != len(b):
|
||||
_LOGGER.error("Can only XOR two identical length byte strings")
|
||||
return None
|
||||
return bytes([x ^ y for x, y in zip(a, b)])
|
||||
|
||||
def raw_ecdsa_to_der(sig):
|
||||
# <byte r[32]> <byte s[32]>
|
||||
|
||||
if len(sig) != 64:
|
||||
raise ValueError("ecdsa signature is the wrong size")
|
||||
|
||||
seq = univ.SequenceOf()
|
||||
seq.extend(
|
||||
[
|
||||
univ.Integer(int.from_bytes(sig[:32], "big")), # r
|
||||
univ.Integer(int.from_bytes(sig[32:], "big")), # s
|
||||
]
|
||||
)
|
||||
return der_encoder.encode(seq)
|
||||
|
||||
def der_to_raw_ecdsa(sig):
|
||||
# 30 45 02 20 1956307e59448178b47c222e4e1e6c8ef7d707bc230e5a9fa77f919ec44e5f74
|
||||
# | | | | |> byte r[0x20]
|
||||
# | | | |---> Length
|
||||
# | | |------> DER type (int)
|
||||
# | |---------> Payload size
|
||||
# |------------> DER type (sequence)
|
||||
|
||||
# 02 21 00cfad6e11abd5e803fb6874c3838bc968db1f3c070ae6b85db9d8ed8936a1eb5c
|
||||
# | | |> byte s[0x21]
|
||||
# | |---> Length
|
||||
# |------> DER type (int)
|
||||
|
||||
seq, remainder = der_decoder.decode(sig)
|
||||
if remainder:
|
||||
raise ValueError("Found trailing data")
|
||||
|
||||
return b"".join([int.to_bytes(int(x), 0x20, "big") for x in seq])
|
||||
|
||||
def verify_and_extract_signed_data(message, signed_data_suffix: bytes | None):
|
||||
# 64 bytes of data
|
||||
# 64 bytes of signature
|
||||
if len(message) != 128:
|
||||
raise ValueError("Unexpected message length")
|
||||
|
||||
data = message[:64]
|
||||
signature = message[64:]
|
||||
signed_data = data.tobytes() + signed_data_suffix
|
||||
der_signature = raw_ecdsa_to_der(signature)
|
||||
try:
|
||||
key_bytes = bytes.fromhex(PUBLIC_KEY_K2)
|
||||
serialization.load_der_public_key(key_bytes).verify(
|
||||
der_signature, signed_data, ec.ECDSA(hashes.SHA256())
|
||||
)
|
||||
_LOGGER.debug("Signature OK")
|
||||
except InvalidSignature:
|
||||
raise
|
||||
|
||||
return data
|
||||
|
||||
def pubkey_from_bytes(data):
|
||||
encoded_peer_pubkey = bytes.fromhex(SECP_256R1_PUBLIC_PREFIX) + data
|
||||
return serialization.load_der_public_key(encoded_peer_pubkey)
|
||||
|
||||
def generate_keypair():
|
||||
private = ec.generate_private_key(ec.SECP256R1())
|
||||
return (private.public_key(), private)
|
||||
|
||||
def pubkey_to_bytes(pubkey):
|
||||
out = pubkey.public_bytes(
|
||||
encoding=serialization.Encoding.X962,
|
||||
format=serialization.PublicFormat.UncompressedPoint,
|
||||
)
|
||||
|
||||
if out[0] != 0x4 or len(out) != 65:
|
||||
raise RuntimeError(
|
||||
"First byte should be 04 for the uncompressed format, and total size 64"
|
||||
)
|
||||
|
||||
return out[1:]
|
||||
|
||||
class MessageType(Enum):
|
||||
CHALLENGE = 1
|
||||
CHALLENGE_ACCEPTED = 3
|
||||
PEER_PUBKEY = 4
|
||||
PUBKEY_ACCEPTED = 6
|
||||
|
||||
class Message:
|
||||
"""
|
||||
Two types of messages. The first one is for communication that happens before we have
|
||||
a proper symmetric key available. These are fully handled by this file, it's purely
|
||||
to setup the encryption protocol.
|
||||
|
||||
2a2a .... 0000
|
||||
| |> Body checksum
|
||||
| |-----> Body
|
||||
|----------> Magic value for pre-key-exchange
|
||||
|
||||
The second type is for anything after. This can either contain the type 1 message above, or
|
||||
anything else -- at this point we're just wrapping the regular protocol, and we just forward
|
||||
the packets dowm the regular processing path after decrypting them.
|
||||
|
||||
See aes_decrypt() for the format.
|
||||
"""
|
||||
|
||||
def __init__(self, buffer: bytes):
|
||||
self.buffer = buffer
|
||||
self.view = memoryview(self.buffer)
|
||||
|
||||
@property
|
||||
def header(self) -> memoryview:
|
||||
return self.view[:2]
|
||||
|
||||
@property
|
||||
def is_pre_key_exchange(self) -> bool:
|
||||
return self.header == KEX_MAGIC
|
||||
|
||||
@property
|
||||
def checksum(self) -> memoryview:
|
||||
return self.view[-2:]
|
||||
|
||||
@property
|
||||
def body(self) -> memoryview:
|
||||
return self.view[len(self.header) : -len(self.checksum)]
|
||||
|
||||
@property
|
||||
def data(self) -> memoryview:
|
||||
return self.body[2:]
|
||||
|
||||
@property
|
||||
def type(self) -> int:
|
||||
return MessageType(self.body[0])
|
||||
|
||||
def verify_checksum(self):
|
||||
message_checksum = self.checksum
|
||||
computed_checksum = hexsum(self.body, len(message_checksum))
|
||||
if computed_checksum != message_checksum:
|
||||
_LOGGER.error("Checksum error!")
|
||||
_LOGGER.debug("Checksum OK")
|
||||
|
||||
class BluettiEncryption:
|
||||
# Derived exclusively from data sent over the network
|
||||
# Used for the initial handshake
|
||||
unsecure_aes_key: bytes | None = None
|
||||
|
||||
# Predictably derived from a seed sent by the peer
|
||||
# This is the same for all the messages encrypted
|
||||
# with that key during the connection
|
||||
unsecure_aes_iv: bytes | None = None
|
||||
|
||||
# Proper key exchange gives us another key,
|
||||
# that is used for the remainder of the connection
|
||||
# IV is random per message
|
||||
secure_aes_key: bytes | None = None
|
||||
|
||||
# Received through key exchange
|
||||
# The signing key for the key exchange is well-known
|
||||
peer_pubkey: bytes | None = None
|
||||
|
||||
@property
|
||||
def is_ready_for_commands(self) -> bool:
|
||||
return self.secure_aes_key is not None and self.peer_pubkey is not None
|
||||
|
||||
def aes_decrypt(self, data: bytes, aes_key: bytes | None, iv: bytes | None):
|
||||
data_len = (data[0] << 8) + data[1]
|
||||
|
||||
if iv is None:
|
||||
iv = hashlib.md5(data[2:6]).digest()
|
||||
encrypted = memoryview(data)[6:]
|
||||
else:
|
||||
encrypted = memoryview(data[2:])
|
||||
|
||||
if len(encrypted) % AES_BLOCK_SIZE != 0:
|
||||
raise ValueError("Data not aligned on aes block size")
|
||||
|
||||
cipher = Cipher(algorithms.AES(aes_key), modes.CBC(iv))
|
||||
decryptor = cipher.decryptor()
|
||||
decrypted = decryptor.update(encrypted) + decryptor.finalize()
|
||||
decrypted = decrypted[:data_len]
|
||||
|
||||
_LOGGER.debug(">PLAIN " + decrypted.hex())
|
||||
return decrypted
|
||||
|
||||
|
||||
def aes_encrypt(self, data: bytes, aes_key: bytes | None, iv: bytes | None):
|
||||
message_header = int.to_bytes(len(data), 2, "big")
|
||||
|
||||
if iv is None:
|
||||
iv_seed = os.urandom(4)
|
||||
iv = hashlib.md5(iv_seed).digest()
|
||||
message_header += iv_seed
|
||||
|
||||
padding = (AES_BLOCK_SIZE - len(data) % AES_BLOCK_SIZE) % AES_BLOCK_SIZE
|
||||
data += bytes(padding)
|
||||
|
||||
cipher = Cipher(algorithms.AES(aes_key), modes.CBC(iv))
|
||||
encryptor = cipher.encryptor()
|
||||
encrypted = encryptor.update(data) + encryptor.finalize()
|
||||
encrypted = message_header + encrypted
|
||||
|
||||
_LOGGER.debug("PLAIN> " + data.hex())
|
||||
return encrypted
|
||||
|
||||
def msg_challenge(self, message: Message) -> bytes | None:
|
||||
_LOGGER.debug("Received challenge")
|
||||
|
||||
if len(message.data) != 4:
|
||||
_LOGGER.error("Unexpected message length")
|
||||
return None
|
||||
|
||||
self.unsecure_aes_iv = hashlib.md5(message.data[::-1].tobytes()).digest()
|
||||
static_key = bytes.fromhex(LOCAL_AES_KEY)
|
||||
self.unsecure_aes_key = hexxor(self.unsecure_aes_iv, static_key)
|
||||
|
||||
_LOGGER.info("Unsecure iv " + self.unsecure_aes_iv.hex())
|
||||
_LOGGER.info("Unsecure key " + self.unsecure_aes_key.hex())
|
||||
|
||||
body = bytes.fromhex("0204") + self.unsecure_aes_iv[8:12]
|
||||
return b"".join([KEX_MAGIC, body, hexsum(body, 2)])
|
||||
|
||||
def msg_peer_pubkey(self, message: Message) -> bytes | None:
|
||||
_LOGGER.debug("Received peer pubkey, checking signature")
|
||||
data = verify_and_extract_signed_data(message.data, self.unsecure_aes_iv)
|
||||
self.peer_pubkey = pubkey_from_bytes(data)
|
||||
|
||||
_LOGGER.debug("Generating a local keypair")
|
||||
self.my_pubkey, self.my_privkey = generate_keypair()
|
||||
my_pubkey_bytes = pubkey_to_bytes(self.my_pubkey)
|
||||
|
||||
_LOGGER.debug("Signing the local pubkey")
|
||||
signing_secret = int.from_bytes(
|
||||
bytes.fromhex(PRIVATE_KEY_L1), "big"
|
||||
)
|
||||
signing_key = ec.derive_private_key(signing_secret, ec.SECP256R1())
|
||||
to_sign = my_pubkey_bytes + self.unsecure_aes_iv
|
||||
signature = signing_key.sign(to_sign, ec.ECDSA(hashes.SHA256()))
|
||||
raw_signature = der_to_raw_ecdsa(signature)
|
||||
|
||||
body = b"".join([bytes.fromhex("0580"), my_pubkey_bytes, raw_signature])
|
||||
msg = b"".join([KEX_MAGIC, body, hexsum(body, 2)])
|
||||
return self.aes_encrypt(msg, self.unsecure_aes_key, self.unsecure_aes_iv)
|
||||
|
||||
def msg_key_accepted(self, message: Message) -> None:
|
||||
_LOGGER.debug("Received key exchange confirmation, calculating shared secret")
|
||||
|
||||
if len(message.data) != 1:
|
||||
raise ValueError("Unexpected message length")
|
||||
if message.data[0] != 0:
|
||||
raise ValueError("Key acceptance response is not 0")
|
||||
|
||||
self.secure_aes_key = self.my_privkey.exchange(ec.ECDH(), self.peer_pubkey)
|
||||
_LOGGER.info("Secure key " + self.secure_aes_key.hex())
|
||||
|
||||
def getKeyIv(self):
|
||||
return (
|
||||
(self.unsecure_aes_key, self.unsecure_aes_iv)
|
||||
if self.secure_aes_key is None
|
||||
else (self.secure_aes_key, None)
|
||||
)
|
||||
|
||||
def reset(self):
|
||||
self.peer_pubkey = None
|
||||
self.secure_aes_key = None
|
||||
@@ -4,3 +4,8 @@ RESPONSE_TIMEOUT = 5
|
||||
WRITE_UUID = "0000ff02-0000-1000-8000-00805f9b34fb"
|
||||
NOTIFY_UUID = "0000ff01-0000-1000-8000-00805f9b34fb"
|
||||
DEVICE_NAME_UUID = "00002a00-0000-1000-8000-00805f9b34fb"
|
||||
|
||||
LOCAL_AES_KEY = "459FC535808941F17091E0993EE3E93D"
|
||||
PRIVATE_KEY_L1 = "4F19A16E3E87BDD9BD24D3E5495B88041511943CBC8B969ADE9641D0F56AF337"
|
||||
PUBLIC_KEY_K2 = "3059301306072a8648ce3d020106082a8648ce3d03010703420004A73ABF5D2232C8C1C72E68304343C272495E3A8FD6F30EA96DE2F4B3CE60B251EE21AC667CF8A71E18B46B664EAEFFE3C489F24F695B6411DB7E22CCC85A8594"
|
||||
SECP_256R1_PUBLIC_PREFIX = "3059301306072a8648ce3d020106082a8648ce3d03010703420004"
|
||||
@@ -22,6 +22,7 @@ from .bluetti_bt_lib.utils.device_builder import get_type_by_bt_name
|
||||
from .bluetti_bt_lib.bluetooth.device_recognizer import recognize_device
|
||||
|
||||
from .const import (
|
||||
CONF_ENCRYPTION,
|
||||
CONF_MAX_RETRIES,
|
||||
CONF_PERSISTENT_CONN,
|
||||
CONF_POLLING_INTERVAL,
|
||||
@@ -160,6 +161,7 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
|
||||
CONF_POLLING_INTERVAL: user_input[CONF_POLLING_INTERVAL],
|
||||
CONF_POLLING_TIMEOUT: user_input[CONF_POLLING_TIMEOUT],
|
||||
CONF_MAX_RETRIES: user_input[CONF_MAX_RETRIES],
|
||||
CONF_ENCRYPTION: user_input[CONF_ENCRYPTION],
|
||||
},
|
||||
},
|
||||
)
|
||||
@@ -171,6 +173,7 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
|
||||
CONF_POLLING_INTERVAL: user_input[CONF_POLLING_INTERVAL],
|
||||
CONF_POLLING_TIMEOUT: user_input[CONF_POLLING_TIMEOUT],
|
||||
CONF_MAX_RETRIES: user_input[CONF_MAX_RETRIES],
|
||||
CONF_ENCRYPTION: user_input[CONF_ENCRYPTION],
|
||||
},
|
||||
)
|
||||
|
||||
@@ -198,6 +201,10 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
|
||||
CONF_MAX_RETRIES,
|
||||
default=self.config_entry.data.get(CONF_MAX_RETRIES, 5),
|
||||
): int,
|
||||
vol.Required(
|
||||
CONF_ENCRYPTION,
|
||||
default=self.config_entry.data.get(CONF_ENCRYPTION, False),
|
||||
): selector.BooleanSelector(),
|
||||
}
|
||||
),
|
||||
)
|
||||
@@ -9,6 +9,7 @@ CONF_PERSISTENT_CONN = "persistent_conn"
|
||||
CONF_POLLING_INTERVAL = "polling_interval"
|
||||
CONF_POLLING_TIMEOUT = "polling_timeout"
|
||||
CONF_MAX_RETRIES = "max_retries"
|
||||
CONF_ENCRYPTION = "use_encryption"
|
||||
|
||||
DATA_COORDINATOR = "coordinator"
|
||||
DATA_POLLING_RUNNING = "polling_running"
|
||||
|
||||
@@ -33,6 +33,7 @@ class PollingCoordinator(DataUpdateCoordinator):
|
||||
persistent_conn: bool,
|
||||
polling_timeout: int,
|
||||
max_retries: int,
|
||||
encrypted: bool,
|
||||
):
|
||||
"""Initialize coordinator."""
|
||||
super().__init__(
|
||||
@@ -60,6 +61,7 @@ class PollingCoordinator(DataUpdateCoordinator):
|
||||
persistent_conn=persistent_conn,
|
||||
polling_timeout=polling_timeout,
|
||||
max_retries=max_retries,
|
||||
encrypted=encrypted,
|
||||
)
|
||||
|
||||
async def _async_update_data(self):
|
||||
|
||||
@@ -17,7 +17,8 @@
|
||||
"persistent_conn": "Dauerhafte Verbindung (Neustart erforderlich)",
|
||||
"polling_interval": "Datenabruf-Intervall in Sekunden (Neustart erforderlich)",
|
||||
"polling_timeout": "Datenabruf-Timeout in Sekunden (Neustart erforderlich)",
|
||||
"max_retries": "Maximale Verbindungsversuche (Neustart erforderlich)"
|
||||
"max_retries": "Maximale Verbindungsversuche (Neustart erforderlich)",
|
||||
"use_encryption": "Verschlüsselte Verbindung (erforderlich für neue Firmware-Versionen)"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -17,7 +17,8 @@
|
||||
"persistent_conn": "Persistent connection (restart required)",
|
||||
"polling_interval": "Polling interval in seconds (restart required)",
|
||||
"polling_timeout": "Polling timeout in seconds (restart required)",
|
||||
"max_retries": "Maximum amount of connection retries (restart required)"
|
||||
"max_retries": "Maximum amount of connection retries (restart required)",
|
||||
"use_encryption": "Encrypted connection (necessary for latest firmware versions)"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -2,4 +2,7 @@
|
||||
|
||||
# This script is only for development purposes
|
||||
|
||||
sudo rm -rf /var/ha_config/custom_components/*/__pycache__
|
||||
sudo cp -r ./custom_components/* /var/ha_config/custom_components/
|
||||
docker restart homeassistant
|
||||
docker logs -f homeassistant
|
||||
+8
-1
@@ -2,4 +2,11 @@ homeassistant
|
||||
bleak_retry_connector
|
||||
pyserial
|
||||
bluetooth_auto_recovery
|
||||
crcmod
|
||||
crcmod
|
||||
typing
|
||||
asyncio
|
||||
logging
|
||||
bleak
|
||||
async_timeout
|
||||
aiousbwatcher
|
||||
pyasn1
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Execute unittests of python library
|
||||
python3 -m unittest discover -s tests -p "*_test.py"
|
||||
# Execute unittests of python library inside docker
|
||||
sudo docker build --progress=plain -t bluetti-bt-tests .
|
||||
@@ -8,6 +8,7 @@ from custom_components.bluetti_bt.bluetti_bt_lib.devices.ac70 import AC70
|
||||
from custom_components.bluetti_bt.bluetti_bt_lib.devices.ac70p import AC70P
|
||||
from custom_components.bluetti_bt.bluetti_bt_lib.devices.ac180 import AC180
|
||||
from custom_components.bluetti_bt.bluetti_bt_lib.devices.ac180p import AC180P
|
||||
from custom_components.bluetti_bt.bluetti_bt_lib.devices.ac200l import AC200L
|
||||
from custom_components.bluetti_bt.bluetti_bt_lib.devices.ac200m import AC200M
|
||||
from custom_components.bluetti_bt.bluetti_bt_lib.devices.ac300 import AC300
|
||||
from custom_components.bluetti_bt.bluetti_bt_lib.devices.ac500 import AC500
|
||||
@@ -66,6 +67,14 @@ class TestDeviceBuilder(unittest.TestCase):
|
||||
self.assertIsInstance(built, AC180P)
|
||||
self.assertEqual(built.address, bt_addr)
|
||||
|
||||
def test_build_ac200l(self):
|
||||
bt_addr = "aa:bb:cc:dd:ee:ff"
|
||||
bt_name = "AC200L56786746478"
|
||||
built = build_device(bt_addr, bt_name)
|
||||
|
||||
self.assertIsInstance(built, AC200L)
|
||||
self.assertEqual(built.address, bt_addr)
|
||||
|
||||
def test_build_ac200m(self):
|
||||
bt_addr = "aa:bb:cc:dd:ee:ff"
|
||||
bt_name = "AC200M56786746478"
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
"""Unittest for device struct."""
|
||||
|
||||
import unittest
|
||||
|
||||
from custom_components.bluetti_bt.bluetti_bt_lib.utils.commands import ReadHoldingRegisters
|
||||
from custom_components.bluetti_bt.bluetti_bt_lib.utils.struct import DeviceStruct
|
||||
|
||||
class TestDeviceStruct(unittest.TestCase):
|
||||
def test_get_read_holding_registers(self):
|
||||
struct = DeviceStruct()
|
||||
|
||||
struct.add_swap_string_field("device_type", 110, 6)
|
||||
struct.add_sn_field("serial_number", 116)
|
||||
struct.add_decimal_field(
|
||||
"power_generation", 154, 1
|
||||
)
|
||||
struct.add_uint_field("total_battery_percent", 102)
|
||||
|
||||
registers = struct.get_read_holding_registers()
|
||||
|
||||
self.assertGreater(len(registers), 0)
|
||||
|
||||
for reg in registers:
|
||||
self.assertIsInstance(reg, ReadHoldingRegisters)
|
||||
Reference in new issue
Block a user