added option to enable encryption
This commit is contained in:
1 parent
ba98204ab2
commit
e2ac4cf8f5
8 files changed
+20
-3
No files matched your search
@@ -14,6 +14,7 @@ from homeassistant.helpers.entity import DeviceInfo
|
|||||||
from homeassistant.exceptions import ConfigEntryNotReady
|
from homeassistant.exceptions import ConfigEntryNotReady
|
||||||
|
|
||||||
from .const import (
|
from .const import (
|
||||||
|
CONF_ENCRYPTION,
|
||||||
CONF_MAX_RETRIES,
|
CONF_MAX_RETRIES,
|
||||||
CONF_PERSISTENT_CONN,
|
CONF_PERSISTENT_CONN,
|
||||||
CONF_POLLING_INTERVAL,
|
CONF_POLLING_INTERVAL,
|
||||||
@@ -42,6 +43,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
|||||||
persistent_conn = entry.data.get(CONF_PERSISTENT_CONN, False)
|
persistent_conn = entry.data.get(CONF_PERSISTENT_CONN, False)
|
||||||
polling_timeout = entry.data.get(CONF_POLLING_TIMEOUT, 120)
|
polling_timeout = entry.data.get(CONF_POLLING_TIMEOUT, 120)
|
||||||
max_retries = entry.data.get(CONF_MAX_RETRIES, 5)
|
max_retries = entry.data.get(CONF_MAX_RETRIES, 5)
|
||||||
|
use_encryption = entry.data.get(CONF_ENCRYPTION, False)
|
||||||
|
|
||||||
if address is None:
|
if address is None:
|
||||||
return False
|
return False
|
||||||
@@ -56,7 +58,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
|||||||
|
|
||||||
# Create coordinator for polling
|
# Create coordinator for polling
|
||||||
_LOGGER.debug("Creating coordinator")
|
_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()
|
await coordinator.async_config_entry_first_refresh()
|
||||||
hass.data[DOMAIN][entry.entry_id].setdefault(DATA_COORDINATOR, coordinator)
|
hass.data[DOMAIN][entry.entry_id].setdefault(DATA_COORDINATOR, coordinator)
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ class DeviceReader:
|
|||||||
persistent_conn: bool = False,
|
persistent_conn: bool = False,
|
||||||
polling_timeout: int = 45,
|
polling_timeout: int = 45,
|
||||||
max_retries: int = 5,
|
max_retries: int = 5,
|
||||||
|
encrypted: bool = False,
|
||||||
) -> None:
|
) -> None:
|
||||||
self.client = bleak_client
|
self.client = bleak_client
|
||||||
self.bluetti_device = bluetti_device
|
self.bluetti_device = bluetti_device
|
||||||
@@ -30,6 +31,7 @@ class DeviceReader:
|
|||||||
self.persistent_conn = persistent_conn
|
self.persistent_conn = persistent_conn
|
||||||
self.polling_timeout = polling_timeout
|
self.polling_timeout = polling_timeout
|
||||||
self.max_retries = max_retries
|
self.max_retries = max_retries
|
||||||
|
self.encrypted = encrypted
|
||||||
|
|
||||||
self.has_notifier = False
|
self.has_notifier = False
|
||||||
self.notify_future: asyncio.Future[Any] | None = None
|
self.notify_future: asyncio.Future[Any] | None = None
|
||||||
|
|||||||
@@ -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 .bluetti_bt_lib.bluetooth.device_recognizer import recognize_device
|
||||||
|
|
||||||
from .const import (
|
from .const import (
|
||||||
|
CONF_ENCRYPTION,
|
||||||
CONF_MAX_RETRIES,
|
CONF_MAX_RETRIES,
|
||||||
CONF_PERSISTENT_CONN,
|
CONF_PERSISTENT_CONN,
|
||||||
CONF_POLLING_INTERVAL,
|
CONF_POLLING_INTERVAL,
|
||||||
@@ -160,6 +161,7 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
|
|||||||
CONF_POLLING_INTERVAL: user_input[CONF_POLLING_INTERVAL],
|
CONF_POLLING_INTERVAL: user_input[CONF_POLLING_INTERVAL],
|
||||||
CONF_POLLING_TIMEOUT: user_input[CONF_POLLING_TIMEOUT],
|
CONF_POLLING_TIMEOUT: user_input[CONF_POLLING_TIMEOUT],
|
||||||
CONF_MAX_RETRIES: user_input[CONF_MAX_RETRIES],
|
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_INTERVAL: user_input[CONF_POLLING_INTERVAL],
|
||||||
CONF_POLLING_TIMEOUT: user_input[CONF_POLLING_TIMEOUT],
|
CONF_POLLING_TIMEOUT: user_input[CONF_POLLING_TIMEOUT],
|
||||||
CONF_MAX_RETRIES: user_input[CONF_MAX_RETRIES],
|
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,
|
CONF_MAX_RETRIES,
|
||||||
default=self.config_entry.data.get(CONF_MAX_RETRIES, 5),
|
default=self.config_entry.data.get(CONF_MAX_RETRIES, 5),
|
||||||
): int,
|
): 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_INTERVAL = "polling_interval"
|
||||||
CONF_POLLING_TIMEOUT = "polling_timeout"
|
CONF_POLLING_TIMEOUT = "polling_timeout"
|
||||||
CONF_MAX_RETRIES = "max_retries"
|
CONF_MAX_RETRIES = "max_retries"
|
||||||
|
CONF_ENCRYPTION = "use_encryption"
|
||||||
|
|
||||||
DATA_COORDINATOR = "coordinator"
|
DATA_COORDINATOR = "coordinator"
|
||||||
DATA_POLLING_RUNNING = "polling_running"
|
DATA_POLLING_RUNNING = "polling_running"
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ class PollingCoordinator(DataUpdateCoordinator):
|
|||||||
persistent_conn: bool,
|
persistent_conn: bool,
|
||||||
polling_timeout: int,
|
polling_timeout: int,
|
||||||
max_retries: int,
|
max_retries: int,
|
||||||
|
encrypted: bool,
|
||||||
):
|
):
|
||||||
"""Initialize coordinator."""
|
"""Initialize coordinator."""
|
||||||
super().__init__(
|
super().__init__(
|
||||||
@@ -60,6 +61,7 @@ class PollingCoordinator(DataUpdateCoordinator):
|
|||||||
persistent_conn=persistent_conn,
|
persistent_conn=persistent_conn,
|
||||||
polling_timeout=polling_timeout,
|
polling_timeout=polling_timeout,
|
||||||
max_retries=max_retries,
|
max_retries=max_retries,
|
||||||
|
encrypted=encrypted,
|
||||||
)
|
)
|
||||||
|
|
||||||
async def _async_update_data(self):
|
async def _async_update_data(self):
|
||||||
|
|||||||
@@ -17,7 +17,8 @@
|
|||||||
"persistent_conn": "Dauerhafte Verbindung (Neustart erforderlich)",
|
"persistent_conn": "Dauerhafte Verbindung (Neustart erforderlich)",
|
||||||
"polling_interval": "Datenabruf-Intervall in Sekunden (Neustart erforderlich)",
|
"polling_interval": "Datenabruf-Intervall in Sekunden (Neustart erforderlich)",
|
||||||
"polling_timeout": "Datenabruf-Timeout 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)",
|
"persistent_conn": "Persistent connection (restart required)",
|
||||||
"polling_interval": "Polling interval in seconds (restart required)",
|
"polling_interval": "Polling interval in seconds (restart required)",
|
||||||
"polling_timeout": "Polling timeout 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,6 +2,7 @@
|
|||||||
|
|
||||||
# This script is only for development purposes
|
# 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/
|
sudo cp -r ./custom_components/* /var/ha_config/custom_components/
|
||||||
docker restart homeassistant
|
docker restart homeassistant
|
||||||
docker logs -f homeassistant
|
docker logs -f homeassistant
|
||||||
Reference in new issue
Block a user