Merge pull request #15 from Angelius007/tolwi-main

Tolwi main

Author: Angelius007

custom_components/ecoflow_cloud/__init__.py

@@ -163,9 +163,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
             CONF_DEVICE_TYPE: deviceConf.device_type
         })
 
-        api_client.configure_device(deviceConf.sn, deviceConf.name, deviceConf.device_type)
-        api_client.devices[sn].configure(int(entry.options[OPTS_REFRESH_PERIOD_SEC]), bool(entry.options[OPTS_DIAGNOSTIC_MODE]))
+        device = api_client.configure_device(deviceConf.sn, deviceConf.name, deviceConf.device_type)
+        device.configure(int(entry.options[OPTS_REFRESH_PERIOD_SEC]), bool(entry.options[OPTS_DIAGNOSTIC_MODE]))
 
+    api_client.start()
     hass.data[DOMAIN][entry.entry_id] = api_client
 
     hass.config_entries.async_update_entry(entry, data=new_data, options=entry.options)

custom_components/ecoflow_cloud/api/__init__.py

@@ -23,11 +23,10 @@ class EcoflowMqttInfo:
 
 class EcoflowApiClient:
 
-    def __init__(self):
-        self.mqtt_info: EcoflowMqttInfo | None = None
-        self.devices: dict[str, Any] = {}
-        self.mqtt_client = None
-        self.installation_site = None
+    mqtt_info: EcoflowMqttInfo
+    devices: dict[str, Any] = {}
+    mqtt_client = None
+    installation_site: str
 
     @abstractmethod
     async def login(self):
@@ -45,21 +44,11 @@ async def quota_all(self, device_sn: str):
     def configure_device(self, device_sn: str, device_name: str, device_type: str):
         pass
 
-    def addOrUpdateDevice(self, device ):
-        trouve=False
-        for (k, v) in self.devices.items():
-            if k == device.device_info.sn:
-                self.devices[k] = device
-                trouve=True
-                break
-        if not trouve:
-            self.devices[device.device_info.sn] = device
-    
-    def removeDevice(self, device ):
-        for (k, v) in self.devices.items():
-            if k == device.device_info.sn:
-                self.devices.pop(k)
-                break
+    def add_device(self, device):
+        self.devices[device.device_info.sn] = device
+
+    def remove_device(self, device):
+        self.devices.pop(device.device_info.sn, None)
 
     def _accept_mqqt_certification(self, resp_json: dict):
         _LOGGER.info(f"Received MQTT credentials: {resp_json}")
@@ -91,5 +80,9 @@ async def _get_json_response(self, resp: ClientResponse):
 
         return json_resp
 
+    def start(self):
+        from custom_components.ecoflow_cloud.api.ecoflow_mqtt import EcoflowMQTTClient
+        self.mqtt_client = EcoflowMQTTClient(self.mqtt_info, self.devices)
+
     def stop(self):
         self.mqtt_client.stop()

custom_components/ecoflow_cloud/api/ecoflow_mqtt.py

@@ -18,7 +18,6 @@ class EcoflowMQTTClient:
     def __init__(self, mqtt_info: EcoflowMqttInfo, devices: dict[str, BaseDevice]):
 
         from ..devices import BaseDevice
-        # Status pour ne pas boucler
         self.__autorise = True
         self.__mqtt_info = mqtt_info
         self.__error_count = 0
@@ -30,7 +29,7 @@ def __init__(self, mqtt_info: EcoflowMqttInfo, devices: dict[str, BaseDevice]):
         self.__client.on_connect = self.on_connect
         self.__client.on_disconnect = self.on_disconnect
         self.__client.on_message = self.on_message
-        self.__client.on_socket_close = self.on_socket_close
+        # self.__client.on_socket_close = self.on_socket_close
 
         _LOGGER.info(f"Connecting to MQTT Broker {self.__mqtt_info.url}:{self.__mqtt_info.port} with client id {self.__mqtt_info.client_id} and username {self.__mqtt_info.username}")
         self.__client.connect(self.__mqtt_info.url, self.__mqtt_info.port, 30)
@@ -65,15 +64,8 @@ def on_connect(self, client, userdata, flags, rc):
                 topics = []
                 for (sn, device) in self.__devices.items():
                     _LOGGER.debug(f"Add Topics for  {sn}")
-
-                    if device.device_info.data_topic:
-                        topics.append((device.device_info.data_topic, 1))
-                    if device.device_info.set_topic:
-                        topics.append((device.device_info.set_topic, 1))
-                    if device.device_info.set_reply_topic:
-                        topics.append((device.device_info.set_reply_topic, 1))
-                    if device.device_info.status_topic:
-                        topics.append((device.device_info.status_topic, 1))
+                    for topic in device.device_info.topics():
+                        topics.append((topic, 1))
 
                 self.__client.subscribe(topics)
                 _LOGGER.info(f"Subscribed to MQTT topics {topics}")
@@ -101,9 +93,9 @@ def on_connect(self, client, userdata, flags, rc):
             self.stop()
 
         return client
-
-    def on_socket_close(self, client, userdata, socket):
-        _LOGGER.error(f"Unexpected MQTT Socket disconnection : {str(socket)}")
+    #
+    # def on_socket_close(self, client, userdata, socket):
+    #     _LOGGER.error(f"Unexpected MQTT Socket disconnection : {str(socket)}")
 
     def on_disconnect(self, client, userdata, rc):
         if rc != 0:
@@ -115,21 +107,9 @@ def on_disconnect(self, client, userdata, rc):
 
     def on_message(self, client, userdata, message):
         try:
-            message_sn = None
             for (sn, device) in self.__devices.items():
-                TOPICS = [device.device_info.data_topic, device.device_info.set_topic, device.device_info.set_reply_topic, 
-                          device.device_info.get_topic, device.device_info.get_reply_topic,  device.device_info.status_topic]
-                match message.topic:
-                    case item if item in TOPICS:
-                        message_sn=sn
-                        break
-                    case _:
-                        pass
-            if message_sn:
-                _LOGGER.debug(f"Message for {message_sn} and Topic {message.payload}")
-                self.__devices[message_sn].update_data(message.payload, message.topic)
-            else:
-                _LOGGER.warn(f"No device for Topic {message.topic}")
+                if device.update_data(message.payload, message.topic):
+                    _LOGGER.debug(f"Message for {sn} and Topic {message.topic}")
         except UnicodeDecodeError as error:
             _LOGGER.error(f"UnicodeDecodeError: {error}. Ignoring message and waiting for the next one.")
 

custom_components/ecoflow_cloud/api/private_api.py

@@ -1,11 +1,10 @@
 import base64
 import logging
-import uuid
 
 import aiohttp
+from homeassistant.util import uuid
 
 from . import EcoflowException, EcoflowApiClient
-from .ecoflow_mqtt import EcoflowMQTTClient
 from ..devices import EcoflowDeviceInfo, DiagnosticDevice
 
 _LOGGER = logging.getLogger(__name__)
@@ -52,9 +51,11 @@ async def login(self):
             response = await self.__call_api("/iot-auth/app/certification")
             self._accept_mqqt_certification(response)
 
-    async def fetch_all_available_devices():
-        result = list()
-        return result
+            # Should be ANDROID_..str.._user_id
+            self.mqtt_info.client_id = f'ANDROID_-{str(uuid.random_uuid_hex()).upper()}_{self.user_id}'
+
+    async def fetch_all_available_devices(self):
+        return []
 
     async def quota_all(self, device_sn: str):
         self.mqtt_client.send_get_message(device_sn, {"version": "1.1", "moduleType": 0, "operateType": "latestQuotas", "params": {}})
@@ -64,16 +65,13 @@ def configure_device(self, device_sn: str, device_name: str, device_type: str):
 
         from ..devices.registry import devices
         if device_type in devices:
-            self.device = devices[device_type](info)
-        else:
-            self.device = DiagnosticDevice(info)
-        self.addOrUpdateDevice(self.device)
-        
-        if self.mqtt_client:
-            self.mqtt_client.reconnect()
+            device = devices[device_type](info)
         else:
-            self.mqtt_info.client_id = f'HomeAssistant-{self.installation_site}'
-            self.mqtt_client = EcoflowMQTTClient(self.mqtt_info, self.devices)
+            device = DiagnosticDevice(info)
+
+        self.add_device(device)
+
+        return device
 
     def __create_device_info(self, device_sn: str, device_name: str, device_type: str) -> EcoflowDeviceInfo:
         return EcoflowDeviceInfo(

custom_components/ecoflow_cloud/api/public_api.py

@@ -35,6 +35,7 @@ async def login(self):
         _LOGGER.info(f"Requesting IoT MQTT credentials")
         response = await self.call_api("/certification")
         self._accept_mqqt_certification(response)
+        self.mqtt_info.client_id = f'HomeAssistant-{self.installation_site}'
 
     async def fetch_all_available_devices(self) -> list[EcoflowDeviceInfo]:
         _LOGGER.info(f"Requesting all devices")
@@ -50,16 +51,12 @@ def configure_device(self, device_sn: str, device_name: str, device_type: str):
 
         from custom_components.ecoflow_cloud.devices.registry import device_by_product
         if device_type in device_by_product:
-            self.device = device_by_product[device_type](info)
+            device = device_by_product[device_type](info)
         else:
-            self.device = DiagnosticDevice(info)
+            device = DiagnosticDevice(info)
 
-        self.addOrUpdateDevice(self.device)
-        if self.mqtt_client:
-            self.mqtt_client.reconnect()
-        else:
-            self.mqtt_info.client_id = f'HomeAssistant-{self.installation_site}'
-            self.mqtt_client = EcoflowMQTTClient(self.mqtt_info, self.devices)
+        self.add_device(device)
+        return device
 
     async def quota_all(self, device_sn: str):
         raw = await self.call_api("/device/quota/all", {"sn": device_sn})

custom_components/ecoflow_cloud/devices/__init__.py

@@ -20,6 +20,7 @@ class EcoflowDeviceInfo:
     sn: str
     name: str
     device_type: str
+    client_id: str
     data_topic: str
     set_topic: str
     set_reply_topic: str
@@ -28,6 +29,17 @@ class EcoflowDeviceInfo:
     status_topic: str | None = None
     client_id: str | None = None
 
+    def topics(self) -> list[str]:
+        topics = [
+            self.data_topic,
+            self.get_topic,
+            self.get_reply_topic,
+            self.set_topic,
+            self.set_reply_topic,
+            self.status_topic
+        ]
+        return list(filter(lambda v: v is not None, topics))
+
 
 class BaseDevice(ABC):
 

custom_components/ecoflow_cloud/devices/internal/delta2.py

@@ -106,7 +106,7 @@ def numbers(self, client: EcoflowApiClient) -> list[BaseNumberEntity]:
                                   lambda value: {"moduleType": 2, "operateType": "dsgCfg",
                                                  "params": {"minDsgSoc": int(value)}}),
 
-            BatteryBackupLevel(client, "pd.bpPowerSoc", const.BACKUP_RESERVE_LEVEL, 5, 100,
+            BatteryBackupLevel(client, self, "pd.bpPowerSoc", const.BACKUP_RESERVE_LEVEL, 5, 100,
                                "bms_emsStatus.minDsgSoc", "bms_emsStatus.maxChargeSoc",
                                lambda value: {"moduleType": 1, "operateType": "watthConfig",
                                               "params": {"isConfig": 1, "bpPowerSoc": int(value), "minDsgSoc": 0,