fix http response and ds2413 bugs

custom_components/mega/entities.py

@@ -48,8 +48,9 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
             index=None,
     ):
         super().__init__(mega.updater)
-        if self.http_cmd == 'ds2413':
-            self.mega.ds2413_ports |= {self.port}
+
+        self.http_cmd = http_cmd
+
         self._state: State = None
         self.port = port
         self.config_entry = config_entry
@@ -62,9 +63,10 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
         self._name = name or f"{mega.id}_{port}" + \
                             (f"_{id_suffix}" if id_suffix else "")
         self._customize: dict = None
-        self.http_cmd = http_cmd
         self.index = index
         self.addr = addr
+        if self.http_cmd == 'ds2413':
+            self.mega.ds2413_ports |= {self.port}
 
     @property
     def customize(self):
@@ -251,24 +253,25 @@ class MegaOutPort(MegaPushEntity):
             return self._state == 'ON'
         elif val is not None:
             val = val.get("value")
-            if self.index and self.addr:
+            if not isinstance(val, str) and self.index is not None and self.addr is not None:
                 if not isinstance(val, dict):
-                    self.mega.lg.warning(f'{self.entity_id} has wrong state: {val}')
+                    self.mega.lg.warning(f'{self.entity_id}: {val} is not a dict')
                     return
-                _val = val.get(self.addr)
-                if not isinstance(val, str):
-                    self.mega.lg.warning(f'{self.entity_id} has wrong state: {val}')
+                _val = val.get(self.addr, val.get(self.addr.lower(), val.get(self.addr.upper())))
+                if not isinstance(_val, str):
+                    self.mega.lg.warning(f'{self.entity_id}: can not get {self.addr} from {val}, recieved {_val}')
                     return
                 _val = _val.split('/')
                 if len(_val) >= 2:
-                    val = val[self.index]
+                    self.mega.lg.debug('%s parsed values: %s[%s]="%s"', self.entity_id, _val, self.index, _val)
+                    val = _val[self.index]
                 else:
-                    self.mega.lg.warning(f'{self.entity_id} has wrong state: {val}')
+                    self.mega.lg.warning(f'{self.entity_id}: {_val} has wrong length')
                     return
-            elif self.index and self.addr is None:
+            elif self.index is not None and self.addr is None:
                 self.mega.lg.warning(f'{self.entity_id} does not has addr')
                 return
-
+            self.mega.lg.debug('%s.state = %s', self.entity_id, val)
             if not self.invert:
                 return val == 'ON' or str(val) == '1' or (safe_int(val) is not None and safe_int(val) > 0)
             else:

custom_components/mega/http.py

@@ -66,7 +66,7 @@ class MegaView(HomeAssistantView):
             update_all = False
             data['value'] = data.pop('v')
         data['mega_id'] = hub.id
-        ret = 'd'
+        ret = 'd' if hub.force_d else ''
         if port is not None:
             hub.values[port] = data
             for cb in self.callbacks[hub.id][port]:
@@ -78,7 +78,9 @@ class MegaView(HomeAssistantView):
                 template.hass = hass
                 ret = template.async_render(data)
         _LOGGER.debug('response %s', ret)
-        ret = Response(body=ret or 'd', content_type='text/plain', headers={'Server': 's', 'Date': 'n'})
+        Response(body='', content_type='text/plain', headers={'Server': 's', 'Date': 'n'})
+        if ret:
+            await hub.request(cmd=ret)
         return ret
 
     async def later_update(self, hub):

custom_components/mega/hub.py

@@ -198,14 +198,13 @@ class MegaD:
         :return:
         """
         for x in self.ds2413_ports:
-            if x.http_cmd == 'ds2413':
-                self.lg.debug(f'poll ds2413 for %s', x)
-                await self.get_port(
-                    port=x,
-                    force_http=True,
-                    http_cmd='list',
-                    conv=False
-                )
+            self.lg.debug(f'poll ds2413 for %s', x)
+            await self.get_port(
+                port=x,
+                force_http=True,
+                http_cmd='list',
+                conv=False
+            )
 
     async def poll(self):
         """